Add submission invalidation

Author: reppuli92

exercise/api/csv/views.py

@@ -282,6 +282,7 @@ def serialize_profiles(self, request: Request, profiles: QuerySet[UserProfile])
             .filter(exercise__in=ids, submitters__in=profiles)
             .exclude(status__in=(
                 Submission.STATUS.UNOFFICIAL, Submission.STATUS.ERROR, Submission.STATUS.REJECTED,
+                Submission.STATUS.INVALIDATED,
             ))
             .values('submitters__user_id', 'exercise_id')
             .annotate(count=Count('id'))
@@ -454,7 +455,11 @@ def serialize_profiles(self, request: Request, profiles: QuerySet[UserProfile])
         ids = [e.id for e in exercises]
         points = CachedPoints(self.instance, request.user, self.is_course_staff)
         revealed_ids = get_revealed_exercise_ids(search_args, points)
-        exclude_list = [Submission.STATUS.ERROR, Submission.STATUS.REJECTED]
+        exclude_list = [
+            Submission.STATUS.ERROR,
+            Submission.STATUS.REJECTED,
+            Submission.STATUS.INVALIDATED,
+        ]
         show_unofficial = request.GET.get('show_unofficial') == 'true'
         if not show_unofficial:
             exclude_list.append(Submission.STATUS.UNOFFICIAL)

exercise/management/commands/export_submissions.py

@@ -222,6 +222,7 @@ def handle(self, *args, **options): # noqa: MC0001
                     Submission.STATUS.UNOFFICIAL,
                     Submission.STATUS.ERROR,
                     Submission.STATUS.REJECTED,
+                    Submission.STATUS.INVALIDATED,
                 )).values(
                     'submitters__user_id',
                     'exercise_id',

exercise/migrations/0052_alter_submission_status.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.29 on 2026-07-02 09:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('exercise', '0051_revealrule_show_zero_points_immediately'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='submission',
+            name='status',
+            field=models.CharField(choices=[('error', 'STATUS_ERROR'), ('initialized', 'STATUS_INITIALIZED'), ('invalidated', 'STATUS_INVALIDATED'), ('ready', 'STATUS_READY'), ('rejected', 'STATUS_REJECTED'), ('unofficial', 'STATUS_UNOFFICIAL'), ('waiting', 'STATUS_WAITING')], default='initialized', max_length=32, verbose_name='LABEL_STATUS'),
+        ),
+    ]

exercise/staff_views.py

@@ -654,6 +654,36 @@ def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
         return self.redirect(self.submission.get_inspect_url())
 
 
+class SubmissionInvalidateView(SubmissionMixin, BaseRedirectView):
+    """A POST-only view that marks a submission as invalidated."""
+    access_mode = ACCESS.TEACHER
+
+    def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
+        if self.submission.status == Submission.STATUS.INVALIDATED:
+            messages.info(self.request, _('Submission is already invalidated.'))
+        elif self.submission.status != Submission.STATUS.READY:
+            messages.error(self.request, _('Only ready submissions can be invalidated.'))
+        else:
+            self.submission.set_invalidated()
+            self.submission.save()
+            messages.success(self.request, _('Submission was invalidated.'))
+        return self.redirect(self.submission.get_inspect_url())
+
+
+class SubmissionRevalidateView(SubmissionMixin, BaseRedirectView):
+    """A POST-only view that restores an invalidated submission to ready."""
+    access_mode = ACCESS.TEACHER
+
+    def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
+        if self.submission.status != Submission.STATUS.INVALIDATED:
+            messages.info(self.request, _('Submission is not invalidated.'))
+        else:
+            self.submission.set_revalidated()
+            self.submission.save()
+            messages.success(self.request, _('Submission was re-validated.'))
+        return self.redirect(self.submission.get_inspect_url())
+
+
 class SubmissionApprovalByModuleView(CourseInstanceMixin, BaseRedirectView):
     """
     A POST-only view that approves a student's late or unofficial submissions

exercise/submission_models.py

@@ -46,6 +46,7 @@ def exclude_errors(self):
         return self.exclude(status__in=(
             Submission.STATUS.ERROR,
             Submission.STATUS.REJECTED,
+            Submission.STATUS.INVALIDATED,
         ))
 
     def exclude_unofficial(self):
@@ -285,6 +286,7 @@ def exclude_errors(self):
         return self.exclude(status__in=(
             Submission.STATUS.ERROR,
             Submission.STATUS.REJECTED,
+            Submission.STATUS.INVALIDATED,
         ))
 
     def exclude_unofficial(self):
@@ -361,6 +363,7 @@ class Submission(SubmissionProto, models.Model):
         ('READY', 'ready', _('STATUS_READY')), # graded normally
         ('ERROR', 'error', _('STATUS_ERROR')),
         ('REJECTED', 'rejected', _('STATUS_REJECTED')), # missing fields etc
+        ('INVALIDATED', 'invalidated', _('STATUS_INVALIDATED')),
         ('UNOFFICIAL', 'unofficial', _('STATUS_UNOFFICIAL')),
         # unofficial: graded after the deadline or after exceeding the submission limit
     ])
@@ -666,6 +669,18 @@ def set_error(self):
         self.status = self.STATUS.ERROR
         self.clear_pending()
 
+    def set_invalidated(self):
+        if self.status != self.STATUS.READY:
+            raise ValueError("Only ready submissions can be invalidated")
+        self.status = self.STATUS.INVALIDATED
+        self.clear_pending()
+
+    def set_revalidated(self):
+        if self.status != self.STATUS.INVALIDATED:
+            raise ValueError("Only invalidated submissions can be re-validated")
+        self.status = self.STATUS.READY
+        self.clear_pending()
+
     @property
     def is_assessed(self) -> bool:
         """Return whether the submission has been manually assessed"""

exercise/templates/exercise/staff/_assessment_panel.html

@@ -63,6 +63,30 @@
 								</button>
 							{% endif %}
 						{% endif %}
+						{% if is_teacher %}
+							{% if submission.status == submission.STATUS.INVALIDATED %}
+								<form class="d-flex flex-nowrap" method="post" action="{{ submission|url:'submission-revalidate' }}">
+									{% csrf_token %}
+									<button
+										class="aplus-button--secondary aplus-button--sm"
+										type="submit"
+									>
+										{% translate 'REVALIDATE_SUBMISSION' %}
+									</button>
+								</form>
+							{% elif submission.status == submission.STATUS.READY %}
+								<form class="d-flex flex-nowrap" method="post" action="{{ submission|url:'submission-invalidate' }}">
+									{% csrf_token %}
+									<button
+										class="aplus-button--danger aplus-button--sm"
+										type="submit"
+										onclick="return confirm('{% translate 'INVALIDATE_SUBMISSION_CONFIRM' %}');"
+									>
+										{% translate 'INVALIDATE_SUBMISSION' %}
+									</button>
+								</form>
+							{% endif %}
+						{% endif %}
 						<button
 							data-bs-toggle="modal"
 							data-bs-target="#details-modal"

exercise/tests.py

@@ -798,6 +798,56 @@ def test_exercise_staff_views(self) -> None:
         response = self.client.get(list_submissions_url)
         self.assertEqual(response.status_code, 403)
 
+    def test_submission_invalidate_view(self):
+        invalidate_submission_url = self.submission.get_url('submission-invalidate')
+        revalidate_submission_url = self.submission.get_url('submission-revalidate')
+        self.submission.feedback = "grader feedback"
+        self.submission.assistant_feedback = "assistant feedback"
+        self.submission.grading_data = {"source": "grader"}
+        self.submission.set_points(7, 10, no_penalties=True)
+        self.submission.set_ready()
+        self.submission.save()
+
+        self.client.login(username="testUser", password="testPassword")
+        response = self.client.post(invalidate_submission_url)
+        self.assertEqual(response.status_code, 403)
+
+        self.client.login(username="grader", password="graderPassword")
+        response = self.client.post(invalidate_submission_url)
+        self.assertEqual(response.status_code, 403)
+
+        self.client.login(username="staff", password="staffPassword")
+        response = self.client.post(invalidate_submission_url)
+        self.assertEqual(response.status_code, 302)
+
+        self.submission.refresh_from_db()
+        self.assertEqual(self.submission.status, Submission.STATUS.INVALIDATED)
+        self.assertEqual(self.submission.feedback, "grader feedback")
+        self.assertEqual(self.submission.assistant_feedback, "assistant feedback")
+        self.assertEqual(self.submission.grading_data, {"source": "grader"})
+
+        response = self.client.post(invalidate_submission_url)
+        self.assertEqual(response.status_code, 302)
+        self.submission.refresh_from_db()
+        self.assertEqual(self.submission.status, Submission.STATUS.INVALIDATED)
+
+        self.client.login(username="grader", password="graderPassword")
+        response = self.client.post(revalidate_submission_url)
+        self.assertEqual(response.status_code, 403)
+
+        self.client.login(username="staff", password="staffPassword")
+        response = self.client.post(revalidate_submission_url)
+        self.assertEqual(response.status_code, 302)
+        self.submission.refresh_from_db()
+        self.assertEqual(self.submission.status, Submission.STATUS.READY)
+
+        self.submission.set_error()
+        self.submission.save()
+        response = self.client.post(invalidate_submission_url)
+        self.assertEqual(response.status_code, 302)
+        self.submission.refresh_from_db()
+        self.assertEqual(self.submission.status, Submission.STATUS.ERROR)
+
     def test_uploading_and_viewing_file(self):
         exercise = BaseExercise.objects.create(
             order=4,

exercise/urls.py

@@ -67,6 +67,12 @@
     re_path(SUBMISSION_URL_PREFIX + r'approve/$',
         staff_views.SubmissionApprovalView.as_view(),
         name="submission-approve"),
+    re_path(SUBMISSION_URL_PREFIX + r'invalidate/$',
+        staff_views.SubmissionInvalidateView.as_view(),
+        name="submission-invalidate"),
+    re_path(SUBMISSION_URL_PREFIX + r'revalidate/$',
+        staff_views.SubmissionRevalidateView.as_view(),
+        name="submission-revalidate"),
     re_path(SUBMISSION_URL_PREFIX + r'inspect/$',
         staff_views.InspectSubmissionView.as_view(),
         name="submission-inspect"),

locale/en/LC_MESSAGES/django.po

@@ -706,6 +706,10 @@ msgstr "course hooks"
 msgid "STATUS_READY"
 msgstr "Ready"
 
+#: exercise/submission_models.py
+msgid "STATUS_INVALIDATED"
+msgstr "Invalidated"
+
 #: course/models.py exercise/exercise_models.py
 msgid "STATUS_UNLISTED"
 msgstr "Unlisted in table of contents"
@@ -4650,6 +4654,18 @@ msgstr "Add tagging"
 msgid "APPROVE_SUBMISSION"
 msgstr "Approve submission"
 
+#: exercise/templates/exercise/staff/_assessment_panel.html
+msgid "INVALIDATE_SUBMISSION"
+msgstr "Invalidate submission"
+
+#: exercise/templates/exercise/staff/_assessment_panel.html
+msgid "INVALIDATE_SUBMISSION_CONFIRM"
+msgstr "Are you sure you want to invalidate this submission?"
+
+#: exercise/templates/exercise/staff/_assessment_panel.html
+msgid "REVALIDATE_SUBMISSION"
+msgstr "Re-validate submission"
+
 #: exercise/templates/exercise/staff/_assessment_panel.html
 #: exercise/templates/exercise/staff/_submission_data_modal.html
 msgid "SUBMISSION_DETAILS"

locale/fi/LC_MESSAGES/django.po

@@ -711,6 +711,10 @@ msgstr "kurssikoukut"
 msgid "STATUS_READY"
 msgstr "Valmis"
 
+#: exercise/submission_models.py
+msgid "STATUS_INVALIDATED"
+msgstr "Mitätöity"
+
 #: course/models.py exercise/exercise_models.py
 msgid "STATUS_UNLISTED"
 msgstr "Näkymätön sisällysluettelossa"
@@ -4662,6 +4666,18 @@ msgstr "Lisää merkintä"
 msgid "APPROVE_SUBMISSION"
 msgstr "Hyväksy pisteytetyksi"
 
+#: exercise/templates/exercise/staff/_assessment_panel.html
+msgid "INVALIDATE_SUBMISSION"
+msgstr "Mitätöi palautus"
+
+#: exercise/templates/exercise/staff/_assessment_panel.html
+msgid "INVALIDATE_SUBMISSION_CONFIRM"
+msgstr "Haluatko varmasti mitätöidä tämän palautuksen?"
+
+#: exercise/templates/exercise/staff/_assessment_panel.html
+msgid "REVALIDATE_SUBMISSION"
+msgstr "Poista palautuksen mitätöinti"
+
 #: exercise/templates/exercise/staff/_assessment_panel.html
 #: exercise/templates/exercise/staff/_submission_data_modal.html
 msgid "SUBMISSION_DETAILS"