devilry 6.5.2__tar.gz → 6.6.0__tar.gz

{devilry-6.5.2 → devilry-6.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devilry
-Version: 6.5.2
+Version: 6.6.0
 Summary: A system for handling electronic deliveries. See https://github.com/devilry/devilry-django.
 Author: Tor Johansen, Bendik Opstad, Vegard Angell, Magne Westlie, Ilya Kostolomov, Christian Tryti, Rebekka Mørken, Stian Julseth, Åsmund J. Rosendahl
 Author-email: Espen Angell Kristiansen <post@appresso.no>
@@ -38,7 +38,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Requires-Python: >=3.10.0
 Requires-Dist: arrow<0.13.0,>=0.12.0
-Requires-Dist: cradmin-legacy<7.0.0,>=6.2.0
+Requires-Dist: cradmin-legacy<7.0.0,>=6.3.1
 Requires-Dist: django-allauth[socialaccount]>=0.62.0
 Requires-Dist: django-crispy-forms<1.15.0,>=1.14.0
 Requires-Dist: django-rq
@@ -48,7 +48,7 @@ Requires-Dist: gunicorn>=23.0.0
 Requires-Dist: html-sanitizer
 Requires-Dist: html2text
 Requires-Dist: ievv-opensource<13.0.0,>=12.0.0
-Requires-Dist: markdown<3.4.0,>=3.3.0
+Requires-Dist: markdown
 Requires-Dist: psycopg
 Requires-Dist: pycountry>=18
 Requires-Dist: pygments<2.16.0,>=2.15.0
@@ -260,6 +260,7 @@ nvm use 14    # May need to run "nvm install 14" first
 ievv buildstatic --npm-clean-node-modules
 ```
 
+
 ### Build docs
 Docs are built on https://readthedocs.org/projects/devilry/ each time a branch is pushed,
 but if you are making larger changes or need to debug build issues, you can build it

{devilry-6.5.2 → devilry-6.6.0}/README.md

@@ -170,6 +170,7 @@ nvm use 14    # May need to run "nvm install 14" first
 ievv buildstatic --npm-clean-node-modules
 ```
 
+
 ### Build docs
 Docs are built on https://readthedocs.org/projects/devilry/ each time a branch is pushed,
 but if you are making larger changes or need to debug build issues, you can build it

devilry-6.6.0/devilry/__init__.py

@@ -0,0 +1 @@
+__version__ = "6.6.0"

{devilry-6.5.2 → devilry-6.6.0}/devilry/devilry_admin/templates/devilry_admin/period/examiners/overview.django.html

@@ -50,8 +50,3 @@
 
     {{ block.super }}
 {% endblock content %}
-
-
-{% block no-items-paragraph-contents %}
-    {% trans "You have no examiners. Use the buttons above to add examiners." %}
-{% endblock no-items-paragraph-contents %}

{devilry-6.5.2 → devilry-6.6.0}/devilry/devilry_admin/templates/devilry_admin/period/students/overview.django.html

@@ -51,7 +51,3 @@
     {{ block.super }}
 {% endblock content %}
 
-
-{% block no-items-paragraph-contents %}
-    {% trans "You have no students. Use the buttons above to add students." %}
-{% endblock no-items-paragraph-contents %}

{devilry-6.5.2 → devilry-6.6.0}/devilry/devilry_admin/tests/period/test_examiners.py

@@ -1,9 +1,10 @@
 from unittest import mock
+
+from cradmin_legacy import cradmin_testhelpers
 from django import test
 from django.conf import settings
 from django.contrib import messages
 from django.http import Http404
-from cradmin_legacy import cradmin_testhelpers
 from model_bakery import baker
 
 from devilry.apps.core.models import RelatedExaminer
@@ -118,8 +119,10 @@ class TestOverview(test.TestCase, cradmin_testhelpers.TestCaseMixin):
         testperiod = baker.make("core.Period")
         mockresponse = self.mock_http200_getrequest_htmls(cradmin_role=testperiod)
         self.assertEqual(
-            "You have no examiners. Use the buttons above to add examiners.",
-            mockresponse.selector.one(".cradmin-legacy-listing-no-items-message").alltext_normalized,
+            "Found 0 of 0 examiners",
+            mockresponse.selector.one(
+                ".devilry-with-match-result-listbuilder-itemvalue-titledescription-title"
+            ).alltext_normalized,
         )
 
     def test_default_ordering(self):
@@ -203,7 +206,7 @@ class TestOverview(test.TestCase, cradmin_testhelpers.TestCaseMixin):
     def test_querycount(self):
         testperiod = baker.make("core.Period")
         baker.make("core.RelatedExaminer", period=testperiod, _quantity=30)
-        with self.assertNumQueries(4):
+        with self.assertNumQueries(6):
             self.mock_getrequest(cradmin_role=testperiod)
 
 

{devilry-6.5.2 → devilry-6.6.0}/devilry/devilry_admin/tests/period/test_manage_tags/test_manage_tags.py

@@ -1,19 +1,17 @@
 # -*- coding: utf-8 -*-
 
 
+from unittest import mock
+
+from cradmin_legacy import cradmin_testhelpers
 from django import test
-from django.contrib import messages
 from django.conf import settings
+from django.contrib import messages
 from django.http import Http404
-
-from cradmin_legacy import cradmin_testhelpers
-
-from unittest import mock
 from model_bakery import baker
 
-from devilry.apps.core.models import RelatedExaminer
+from devilry.apps.core.models import PeriodTag, RelatedExaminer
 from devilry.devilry_admin.views.period.manage_tags import manage_tags
-from devilry.apps.core.models import PeriodTag
 from devilry.devilry_dbcache.customsql import AssignmentGroupDbCacheCustomSql
 
 
@@ -418,7 +416,7 @@ class TestPeriodTagListbuilderView(test.TestCase, cradmin_testhelpers.TestCaseMi
         testperiodtag1.relatedexaminers.add(baker.make("core.RelatedExaminer", period=testperiod))
         testperiodtag2.relatedexaminers.add(baker.make("core.RelatedExaminer", period=testperiod))
         testperiodtag3.relatedexaminers.add(baker.make("core.RelatedExaminer", period=testperiod))
-        with self.assertNumQueries(4):
+        with self.assertNumQueries(6):
             self.mock_http200_getrequest_htmls(cradmin_role=testperiod, requestuser=testuser)
 
 

{devilry-6.5.2 → devilry-6.6.0}/devilry/devilry_admin/tests/period/test_students.py

@@ -1,9 +1,10 @@
 from unittest import mock
+
+from cradmin_legacy import cradmin_testhelpers
 from django import test
 from django.conf import settings
 from django.contrib import messages
 from django.http import Http404
-from cradmin_legacy import cradmin_testhelpers
 from model_bakery import baker
 
 from devilry.apps.core.models import RelatedStudent
@@ -114,8 +115,10 @@ class TestOverview(test.TestCase, cradmin_testhelpers.TestCaseMixin):
         testperiod = baker.make("core.Period")
         mockresponse = self.mock_http200_getrequest_htmls(cradmin_role=testperiod)
         self.assertEqual(
-            "You have no students. Use the buttons above to add students.",
-            mockresponse.selector.one(".cradmin-legacy-listing-no-items-message").alltext_normalized,
+            "Found 0 of 0 students",
+            mockresponse.selector.one(
+                ".devilry-with-match-result-listbuilder-itemvalue-titledescription-title"
+            ).alltext_normalized,
         )
 
     def test_default_ordering(self):
@@ -200,7 +203,7 @@ class TestOverview(test.TestCase, cradmin_testhelpers.TestCaseMixin):
     def test_querycount(self):
         testperiod = baker.make("core.Period")
         baker.make("core.RelatedStudent", period=testperiod, _quantity=30)
-        with self.assertNumQueries(5):
+        with self.assertNumQueries(7):
             self.mock_getrequest(cradmin_role=testperiod)
 
 

{devilry-6.5.2 → devilry-6.6.0}/devilry/devilry_admin/views/period/examiners.py

@@ -1,15 +1,18 @@
+from cradmin_legacy import crapp
+from cradmin_legacy.crispylayouts import DangerSubmit
+from cradmin_legacy.viewhelpers.listbuilder.itemframe import DefaultSpacingItemFrame
+from cradmin_legacy.viewhelpers.listbuilder.lists import RowList
 from django.contrib import messages
 from django.http import Http404
 from django.utils.translation import gettext_lazy
-from cradmin_legacy import crapp
-from cradmin_legacy.crispylayouts import DangerSubmit
 
 from devilry.apps.core.models import RelatedExaminer
-from devilry.devilry_account.models import User, PermissionGroup
+from devilry.devilry_account.models import PermissionGroup, User
 from devilry.devilry_admin.cradminextensions.listbuilder import listbuilder_relatedexaminer
 from devilry.devilry_admin.cradminextensions.listfilter import listfilter_relateduser
 from devilry.devilry_admin.views.common import bulkimport_users_common
 from devilry.devilry_cradmin import devilry_multiselect2
+from devilry.devilry_cradmin.devilry_listfilter.utils import WithResultValueRenderable
 from devilry.devilry_cradmin.viewhelpers import devilry_confirmview
 
 
@@ -25,7 +28,33 @@ class OverviewItemValue(listbuilder_relatedexaminer.OnPeriodItemValue):
     template_name = "devilry_admin/period/examiners/overview-itemvalue.django.html"
 
 
+class ExaminerUserListMatchResultRenderable(WithResultValueRenderable):
+    def get_object_name_singular(self, num_matches):
+        return gettext_lazy("examiner")
+
+    def get_object_name_plural(self, num_matches):
+        return gettext_lazy("examiners")
+
+
+class RowListWithMatchResults(RowList):
+    def append_results_renderable(self):
+        result_info_renderable = ExaminerUserListMatchResultRenderable(
+            value=None, num_matches=self.num_matches, num_total=self.num_total
+        )
+        self.renderable_list.insert(0, DefaultSpacingItemFrame(inneritem=result_info_renderable))
+
+    def __init__(self, num_matches, num_total, page):
+        self.num_matches = num_matches
+        self.num_total = num_total
+        self.page = page
+        super().__init__()
+
+        if page == 1:
+            self.append_results_renderable()
+
+
 class Overview(listbuilder_relatedexaminer.VerticalFilterListView):
+    listbuilder_class = RowListWithMatchResults
     value_renderer_class = OverviewItemValue
     template_name = "devilry_admin/period/examiners/overview.django.html"
 
@@ -39,9 +68,25 @@ class Overview(listbuilder_relatedexaminer.VerticalFilterListView):
     def get_filterlist_url(self, filters_string):
         return self.request.cradmin_app.reverse_appurl("filter", kwargs={"filters_string": filters_string})
 
+    def get_listbuilder_list_kwargs(self):
+        kwargs = super().get_listbuilder_list_kwargs()
+        kwargs["num_matches"] = self.num_matches or 0
+        kwargs["num_total"] = self.num_total or 0
+        kwargs["page"] = self.request.GET.get("page", 1)
+        return kwargs
+
+    def get_queryset_for_role(self, role):
+        queryset = super().get_queryset_for_role(role=role)
+
+        # Set filtered count on self.
+        self.num_matches = queryset.count()
+        return queryset
+
     def get_unfiltered_queryset_for_role(self, role):
         period = role
-        return self.model.objects.filter(period=period).select_related("user")
+        queryset = self.model.objects.filter(period=period).select_related("user")
+        self.num_total = queryset.count()
+        return queryset
 
     def __user_is_department_admin(self):
         requestuser_devilryrole = self.request.cradmin_instance.get_devilryrole_for_requestuser()

{devilry-6.5.2 → devilry-6.6.0}/devilry/devilry_admin/views/period/manage_tags/manage_tags.py

@@ -1,35 +1,34 @@
 # -*- coding: utf-8 -*-
 
 
-import re
-
+from cradmin_legacy import crapp
+from cradmin_legacy.crinstance import reverse_cradmin_url
+from cradmin_legacy.crispylayouts import PrimarySubmit
+from cradmin_legacy.viewhelpers import (
+    crudbase,
+    delete,
+    formbase,
+    listbuilderview,
+    multiselect2,
+    multiselect2view,
+    update,
+)
+from cradmin_legacy.viewhelpers.listbuilder import itemvalue
+from cradmin_legacy.viewhelpers.listbuilder.itemframe import DefaultSpacingItemFrame
+from cradmin_legacy.viewhelpers.listbuilder.lists import RowList
+from crispy_forms import layout
 from django import forms
-from django.db import models
 from django.contrib import messages
 from django.core.exceptions import ValidationError
-from django.db import transaction
-from django.http import Http404
-from django.http import HttpResponseRedirect
+from django.db import models, transaction
+from django.http import Http404, HttpResponseRedirect
 from django.utils import timezone
 from django.utils.translation import gettext_lazy, pgettext_lazy
-from django.views.generic import TemplateView
-from django.views.generic import View
-
-from crispy_forms import layout
+from django.views.generic import TemplateView, View
 
-from cradmin_legacy import crapp
-from cradmin_legacy.crinstance import reverse_cradmin_url
-from cradmin_legacy.crispylayouts import PrimarySubmit
-from cradmin_legacy.viewhelpers import formbase
-from cradmin_legacy.viewhelpers import update, delete, crudbase
-from cradmin_legacy.viewhelpers import listbuilderview
-from cradmin_legacy.viewhelpers.listbuilder import itemvalue
-from cradmin_legacy.viewhelpers import multiselect2view
-from cradmin_legacy.viewhelpers import multiselect2
-
-from devilry.apps.core.models import PeriodTag
-from devilry.apps.core.models import RelatedStudent, RelatedExaminer
-from devilry.devilry_admin.cradminextensions.listfilter import listfilter_tags, listfilter_relateduser
+from devilry.apps.core.models import PeriodTag, RelatedExaminer, RelatedStudent
+from devilry.devilry_admin.cradminextensions.listfilter import listfilter_relateduser, listfilter_tags
+from devilry.devilry_cradmin.devilry_listfilter.utils import WithResultValueRenderable
 
 
 class TagItemValue(itemvalue.EditDelete):
@@ -65,10 +64,34 @@ class HideShowPeriodTag(TemplateView):
         return period_tag
 
 
-class TagListBuilderListView(listbuilderview.FilterListMixin, listbuilderview.View):
-    """ """
+class TagListMatchResultRenderable(WithResultValueRenderable):
+    def get_object_name_singular(self, num_matches):
+        return gettext_lazy("tag")
 
+    def get_object_name_plural(self, num_matches):
+        return gettext_lazy("tags")
+
+
+class RowListWithMatchResults(RowList):
+    def append_results_renderable(self):
+        result_info_renderable = TagListMatchResultRenderable(
+            value=None, num_matches=self.num_matches, num_total=self.num_total
+        )
+        self.renderable_list.insert(0, DefaultSpacingItemFrame(inneritem=result_info_renderable))
+
+    def __init__(self, num_matches, num_total, page):
+        self.num_matches = num_matches
+        self.num_total = num_total
+        self.page = page
+        super().__init__()
+
+        if page == 1:
+            self.append_results_renderable()
+
+
+class TagListBuilderListView(listbuilderview.FilterListMixin, listbuilderview.View):
     template_name = "devilry_admin/period/manage_tags/manage-tags-list-view.django.html"
+    listbuilder_class = RowListWithMatchResults
     model = PeriodTag
     value_renderer_class = TagItemValue
     paginate_by = 10
@@ -84,6 +107,20 @@ class TagListBuilderListView(listbuilderview.FilterListMixin, listbuilderview.Vi
     def get_filterlist_url(self, filters_string):
         return self.request.cradmin_app.reverse_appurl("filter", kwargs={"filters_string": filters_string})
 
+    def get_listbuilder_list_kwargs(self):
+        kwargs = super().get_listbuilder_list_kwargs()
+        kwargs["num_matches"] = self.num_matches or 0
+        kwargs["num_total"] = self.num_total or 0
+        kwargs["page"] = self.request.GET.get("page", 1)
+        return kwargs
+
+    def get_queryset_for_role(self, role):
+        queryset = super().get_queryset_for_role(role=role)
+
+        # Set filtered count on self.
+        self.num_matches = queryset.count()
+        return queryset
+
     def get_unfiltered_queryset_for_role(self, role):
         queryset = (
             self.model.objects.filter(period=role)
@@ -100,6 +137,7 @@ class TagListBuilderListView(listbuilderview.FilterListMixin, listbuilderview.Vi
                 )
             )
         )
+        self.num_total = queryset.count()
         return queryset
 
     def get_no_items_message(self):

{devilry-6.5.2 → devilry-6.6.0}/devilry/devilry_admin/views/period/students.py

@@ -1,16 +1,19 @@
 from cradmin_legacy import crapp
 from cradmin_legacy.crispylayouts import DangerSubmit
+from cradmin_legacy.viewhelpers.listbuilder.itemframe import DefaultSpacingItemFrame
+from cradmin_legacy.viewhelpers.listbuilder.lists import RowList
 from django.contrib import messages
 from django.http import Http404
 from django.template.loader import render_to_string
 from django.utils.translation import gettext_lazy
 
-from devilry.apps.core.models import RelatedStudent, Assignment
+from devilry.apps.core.models import Assignment, RelatedStudent
 from devilry.devilry_account.models import PermissionGroup, User
 from devilry.devilry_admin.cradminextensions.listbuilder import listbuilder_relatedstudent
 from devilry.devilry_admin.cradminextensions.listfilter import listfilter_relateduser
 from devilry.devilry_admin.views.common import bulkimport_users_common
 from devilry.devilry_cradmin import devilry_multiselect2
+from devilry.devilry_cradmin.devilry_listfilter.utils import WithResultValueRenderable
 from devilry.devilry_cradmin.viewhelpers import devilry_confirmview
 
 
@@ -26,7 +29,33 @@ class OverviewItemValue(listbuilder_relatedstudent.ReadOnlyItemValue):
     template_name = "devilry_admin/period/students/overview-itemvalue.django.html"
 
 
+class StudentUserListMatchResultRenderable(WithResultValueRenderable):
+    def get_object_name_singular(self, num_matches):
+        return gettext_lazy("student")
+
+    def get_object_name_plural(self, num_matches):
+        return gettext_lazy("students")
+
+
+class RowListWithMatchResults(RowList):
+    def append_results_renderable(self):
+        result_info_renderable = StudentUserListMatchResultRenderable(
+            value=None, num_matches=self.num_matches, num_total=self.num_total
+        )
+        self.renderable_list.insert(0, DefaultSpacingItemFrame(inneritem=result_info_renderable))
+
+    def __init__(self, num_matches, num_total, page):
+        self.num_matches = num_matches
+        self.num_total = num_total
+        self.page = page
+        super().__init__()
+
+        if page == 1:
+            self.append_results_renderable()
+
+
 class Overview(listbuilder_relatedstudent.VerticalFilterListView):
+    listbuilder_class = RowListWithMatchResults
     value_renderer_class = OverviewItemValue
     template_name = "devilry_admin/period/students/overview.django.html"
 
@@ -40,14 +69,30 @@ class Overview(listbuilder_relatedstudent.VerticalFilterListView):
     def get_filterlist_url(self, filters_string):
         return self.request.cradmin_app.reverse_appurl("filter", kwargs={"filters_string": filters_string})
 
+    def get_listbuilder_list_kwargs(self):
+        kwargs = super().get_listbuilder_list_kwargs()
+        kwargs["num_matches"] = self.num_matches or 0
+        kwargs["num_total"] = self.num_total or 0
+        kwargs["page"] = self.request.GET.get("page", 1)
+        return kwargs
+
+    def get_queryset_for_role(self, role):
+        queryset = super().get_queryset_for_role(role=role)
+
+        # Set filtered count on self.
+        self.num_matches = queryset.count()
+        return queryset
+
     def get_unfiltered_queryset_for_role(self, role):
         period = role
-        return (
+        queryset = (
             self.model.objects.filter(period=period)
             .prefetch_syncsystemtag_objects()
             .select_related("user")
             .order_by("user__shortname")
         )
+        self.num_total = queryset.count()
+        return queryset
 
     def __user_is_department_admin(self):
         requestuser_devilryrole = self.request.cradmin_instance.get_devilryrole_for_requestuser()

devilry-6.6.0/devilry/devilry_dataporten_allauth/callback.py

@@ -0,0 +1,5 @@
+from allauth.socialaccount.providers.oauth2.views import OAuth2CallbackView
+
+
+class DevilryOAuth2CallbackView(OAuth2CallbackView):
+    pass

{devilry-6.5.2 → devilry-6.6.0}/devilry/devilry_markup/markdown_extensions/code_diff.py

@@ -2,9 +2,10 @@ import difflib
 import re
 import typing
 import uuid
+
 from django.template.loader import render_to_string
-from markdown.preprocessors import Preprocessor
 from markdown import Extension
+from markdown.preprocessors import Preprocessor
 
 
 class CodeDiffPreprocessor(Preprocessor):
@@ -110,6 +111,5 @@ class CodeDiffPreprocessor(Preprocessor):
 
 
 class CodeDiffExtension(Extension):
-    def extendMarkdown(self, md, md_globals):
-        # md.registerExtension(self)
+    def extendMarkdown(self, md):
         md.preprocessors.register(CodeDiffPreprocessor(md), "codediff", 25)

{devilry-6.5.2 → devilry-6.6.0}/devilry/devilry_markup/markdown_extensions/latex_math.py

@@ -1,9 +1,10 @@
 import re
+from xml.sax.saxutils import quoteattr
+
 from django.template.loader import render_to_string
-from markdown.preprocessors import Preprocessor
-from markdown import Extension
 from django.utils.safestring import mark_safe
-from xml.sax.saxutils import quoteattr
+from markdown import Extension
+from markdown.preprocessors import Preprocessor
 
 
 class LatexMathPreprocessor(Preprocessor):
@@ -54,10 +55,10 @@ class LatexMathInlinePreprocessor(LatexMathPreprocessor):
 
 
 class LatexMathExtension(Extension):
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         md.preprocessors.register(LatexMathPreprocessor(md), "latexmath", 20)
 
 
 class LatexMathInlineExtension(Extension):
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         md.preprocessors.register(LatexMathInlinePreprocessor(md), "latexmathinline", 21)

devilry-6.6.0/devilry/devilry_qualifiesforexam/admin.py

@@ -0,0 +1,113 @@
+import json
+
+from django.contrib import admin
+from django.utils.html import format_html
+
+from devilry.devilry_qualifiesforexam.models import (
+    DraftQualifiesForFinalExam,
+    DraftStatus,
+    QualifiesForFinalExam,
+    Status,
+)
+
+
+class QualifiesForFinalExamInline(admin.TabularInline):
+    model = QualifiesForFinalExam
+    raw_id_fields = ["relatedstudent"]
+    fields = ["relatedstudent", "qualifies"]
+    readonly_fields = ["relatedstudent", "qualifies"]
+    extra = 0
+
+
+class StatusAdmin(admin.ModelAdmin):
+    raw_id_fields = ["period"]
+    inlines = [QualifiesForFinalExamInline]
+    list_display = (
+        "id",
+        "period",
+        "get_status_text",
+        "createtime",
+        "message",
+    )
+    search_fields = [
+        "id",
+        "period__short_name",
+        "period__long_name",
+        "period__parentnode__short_name",
+        "period__parentnode__long_name",
+        "message",
+    ]
+    readonly_fields = ["period", "createtime", "message", "user", "plugin", "exported_timestamp", "status"]
+
+    def get_queryset(self, request):
+        return super(StatusAdmin, self).get_queryset(request).select_related("period", "period__parentnode")
+
+
+admin.site.register(Status, StatusAdmin)
+
+
+class QualifiesForFinalExamAdmin(admin.ModelAdmin):
+    raw_id_fields = ["relatedstudent"]
+    list_display = ("id", "qualifies")
+    search_fields = ["id"]
+
+
+admin.site.register(QualifiesForFinalExam, QualifiesForFinalExamAdmin)
+
+
+class DraftQualifiesForFinalExamInline(admin.TabularInline):
+    model = DraftQualifiesForFinalExam
+    raw_id_fields = ["relatedstudent"]
+    readonly_fields = ["relatedstudent", "qualifies"]
+    extra = 0
+
+
+class DraftStatusAdmin(admin.ModelAdmin):
+    raw_id_fields = ["period", "created_by"]
+    inlines = [DraftQualifiesForFinalExamInline]
+    list_display = (
+        "id",
+        "period",
+        "created_datetime",
+        "processing_started_datetime",
+        "processing_completed_datetime",
+        "processing_status",
+    )
+    search_fields = [
+        "id",
+        "period__short_name",
+        "period__long_name",
+        "period__parentnode__short_name",
+        "period__parentnode__long_name",
+    ]
+    readonly_fields = [
+        "created_datetime",
+        "created_by",
+        "period",
+        "plugin",
+        "plugin_data",
+        "processing_started_datetime",
+        "processing_completed_datetime",
+        "processing_status",
+        "processing_status_data",
+        "get_processing_status_pretty"
+    ]
+
+    @admin.display(description="Summary json")
+    def get_processing_status_pretty(self, obj):
+        return format_html("<pre>{}</pre>", json.dumps(obj.processing_status_data, indent=2, sort_keys=True))
+
+    def get_queryset(self, request):
+        return super(DraftStatusAdmin, self).get_queryset(request).select_related("period", "period__parentnode")
+
+
+admin.site.register(DraftStatus, DraftStatusAdmin)
+
+
+class DraftQualifiesForFinalExamAdmin(admin.ModelAdmin):
+    raw_id_fields = ["relatedstudent"]
+    list_display = ("id", "relatedstudent__user__shortname", "qualifies")
+    search_fields = ["id"]
+
+
+admin.site.register(DraftQualifiesForFinalExam, DraftQualifiesForFinalExamAdmin)

{devilry-6.5.2 → devilry-6.6.0}/devilry/devilry_qualifiesforexam/cradmin_app.py

@@ -5,10 +5,7 @@
 from cradmin_legacy import crapp
 
 # Devilry imports
-from .views import pluginselection_view
-from .views import list_statuses_view
-from .views import proxyview
-from .views import qualification_preview_view
+from .views import list_statuses_view, pluginselection_view, proxyview, qualification_preview_view
 
 
 class App(crapp.App):
@@ -21,7 +18,7 @@ class App(crapp.App):
             proxyview.PluginProxyView.as_view(),
             name="configure-plugin",
         ),
-        crapp.Url(r"preview$", qualification_preview_view.QualificationPreviewView.as_view(), name="preview"),
+        crapp.Url(r"preview/(?P<draft_statusid>\d+)$", qualification_preview_view.QualificationPreviewView.as_view(), name="preview"),
         crapp.Url(
             r"showstatus/(?P<statusid>\d+)$",
             qualification_preview_view.QualificationStatusView.as_view(),

devilry-6.6.0/devilry/devilry_qualifiesforexam/management/commands/delete_old_draft_statuses.py

@@ -0,0 +1,22 @@
+
+from django.core.management.base import BaseCommand
+from django.db import transaction
+from django.utils import timezone
+
+from devilry.devilry_qualifiesforexam.models import DraftStatus
+
+
+class Command(BaseCommand):
+    help = "Remove DraftStatus entries from the database."
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--hours-old", dest="hours_old", type=int, default=1, required=False, help="Only delete DraftStatus entries that are older than this many hours."
+        )
+
+    def handle(self, *args, **options):
+        threshold_datetime = timezone.now() - timezone.timedelta(
+            hours=options["hours_old"]
+        )
+        with transaction.atomic():
+            DraftStatus.objects.filter(created_datetime__lt=threshold_datetime).delete()