Add submision conversion feature for individual submission and by module

conversion

EDIT-767

Author: muhammadfaiz12

exercise/staff_views.py

@@ -19,12 +19,14 @@
 from authorization.permissions import ACCESS
 from course.viewbase import CourseInstanceBaseView, CourseInstanceMixin
 from course.models import (
+    CourseModule,
     Enrollment,
     USERTAG_EXTERNAL,
     USERTAG_INTERNAL,
 )
 from deviations.models import MaxSubmissionsRuleDeviation
 from exercise.cache.points import CachedPoints
+from exercise.exercise_models import BaseExercise
 from lib.helpers import settings_text, extract_form_errors
 from lib.viewbase import BaseRedirectView, BaseFormView, BaseView
 from notification.models import Notification
@@ -530,3 +532,61 @@ def form_valid(self, form):
     def form_invalid(self, form):
         messages.error(self.request, _('FAILURE_SAVING_CHANGES'))
         return super().form_invalid(form)
+
+class SubmissionConversion(SubmissionMixin, BaseRedirectView):
+    """
+    A POST-only view that updates a student's late or unofficial submission
+    to normal submission. Changed the status and remove the penalty
+    """
+    def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
+        self.submission = self.get_submission_object()
+        self.submission.convert_late_submission()
+        self.submission.save()        
+        return self.redirect(self.submission.get_inspect_url())
+
+
+class SubmissionConversionByModule(CourseInstanceMixin, BaseRedirectView):
+    """
+    A POST-only view that by module bulks updates a student's late or unofficial submission
+    to normal submission. Changed the status and remove the penalty
+    """
+
+    user_kw = 'user_id'
+    module_kw = 'module_id'
+    access_mode = ACCESS.ASSISTANT
+
+    def get_course_module_object(self):
+        return get_object_or_404(
+            CourseModule,
+            id=self.kwargs[self.module_kw],
+            course_instance=self.instance
+        )
+    
+    def get_resource_objects(self):
+        self.kwargs[self.user_kw] = self.request.POST[self.user_kw],
+        self.kwargs[self.user_kw] = self.kwargs[self.user_kw][0]
+        self.kwargs[self.module_kw] = self.request.POST[self.module_kw]  
+        super().get_resource_objects()
+
+        #getting module and user by id.
+        self.module = get_object_or_404(
+                        CourseModule,
+                        id=self.kwargs[self.module_kw])
+
+        self.student = get_object_or_404(
+            User,
+            id=self.kwargs[self.user_kw],
+        )
+    
+    def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
+        profile = self.student.userprofile
+        exercises = BaseExercise.objects.filter(course_module=self.module)
+        
+        for exercise in exercises:
+            submissions = exercise.get_submissions_for_student(self.student.userprofile, exclude_errors=True)
+            for submission in submissions:
+                submission.convert_late_submission()
+                submission.save()
+
+        link = reverse('user-results', kwargs={'user_id': profile.id, **self.instance.get_url_kwargs()})
+        return self.redirect(link)

exercise/submission_models.py

@@ -406,6 +406,16 @@ def clean_post_parameters(self):
         del self._files
         del self._data
 
+    def convert_late_submission(self):
+        """
+        Removes penalty and Sets the points for this submission object based on original score.
+        Then this will set the status of submission to ready
+
+        The method is used to convert late submission to fully graded one.
+        """
+        self.set_points(self.service_points, self.service_max_points, no_penalties=True)
+        self.set_ready()
+        
     def set_points(self, points, max_points, no_penalties=False):
         """
         Sets the points and maximum points for this submissions. If the given

exercise/templates/exercise/_user_results.html

@@ -85,6 +85,22 @@ <h3 class="panel-title">
 
 		{% points_progress module %}
 		{{ module.introduction|safe }}
+		
+		{% if module.late_allowed and module.late_percent > 0 %}
+
+		<form method="post" action="{% url 'submission-conversion-module' course_slug=course.url instance_slug=instance.url %}" style="display: inline-block">
+			{% csrf_token %}
+			<input type="hidden" id="module_id" name="module_id" value="{{ module.id }}"> 
+			<input type="hidden" id="user_id" name="user_id" value="{{ student.id }}"> 
+			<button
+				class="aplus-button--secondary aplus-button--xs"
+				type="submit"
+			>
+			{% translate "CONVERT_SUBMISSION_BY_MODULE" %}
+		</button>
+		</form>		
+		{% endif %}
+		
 	</div>
 	{% if not exercise_accessible and not is_course_staff %}
 	<div class="alert alert-warning clearfix site-message">

exercise/templates/exercise/staff/_assessment_panel.html

@@ -19,7 +19,23 @@
 				{% endif %}
 			</div>
 			<div>
-				<button
+				{% if submission.late_penalty_applied %}
+				<form method="post" action="{{ submission|url:'submission-conversion' }}" style="display: inline-block">
+					{% csrf_token %}
+					<button
+						class="aplus-button--secondary aplus-button--sm aplus-button--left"
+						type="submit"
+					>
+						{% translate 'CONVERT_SUBMISSION' %}
+					</button><button
+						data-toggle="modal"
+						data-target="#resubmit-modal"
+						class="aplus-button--secondary aplus-button--sm aplus-button--right"
+						type="button"
+						title="{% translate 'HELP' %}"
+					>?</button>
+				{% endif %}
+				</form>				<button
 					data-toggle="modal"
 					data-target="#details-modal"
 					class="aplus-button--secondary aplus-button--sm"

exercise/tests.py

@@ -571,6 +571,13 @@ def test_submission_late_penalty_applied(self):
         deviation.save()
         self.late_late_submission_when_late_allowed.set_points(5, 10)
         self.assertAlmostEqual(self.late_late_submission_when_late_allowed.late_penalty_applied, 0.2)
+    
+    def test_submission_late_conversion(self):
+        convert_submission_url = self.late_submission.get_url('submission-conversion')
+        response = self.client.get(convert_submission_url)
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(self.late_submission.late_penalty_applied is None)
+        
 
     def test_early_submission(self):
         self.course_module_with_late_submissions_allowed.opening_time = self.tomorrow

exercise/urls.py

@@ -55,6 +55,10 @@
     url(EXERCISE_URL_PREFIX + r'submitters/next-unassessed/$',
         staff_views.NextUnassessedSubmitterView.as_view(),
         name="submission-next-unassessed"),
+    url(SUBMISSION_URL_PREFIX + r'convert/$',
+        staff_views.SubmissionConversion.as_view(),
+        name="submission-conversion"
+    ),
     url(SUBMISSION_URL_PREFIX + r'inspect/$',
         staff_views.InspectSubmissionView.as_view(),
         name="submission-inspect"),
@@ -79,7 +83,9 @@
     url(EDIT_URL_PREFIX + r'fetch-metadata/$',
         staff_views.FetchMetadataView.as_view(),
         name="exercise-metadata"),
-
+    url(EDIT_URL_PREFIX+r'convert/module/$',
+        staff_views.SubmissionConversionByModule.as_view(),
+        name="submission-conversion-module"),
     url(EXERCISE_URL_PREFIX + r'plain/$',
         views.ExercisePlainView.as_view(),
         name="exercise-plain"),

locale/en/LC_MESSAGES/django.po

@@ -3711,6 +3711,10 @@ msgstr "%(points)s points required to pass the module. "
 msgid "CHANGES_ARE_POSSIBLE_IN_EXERCISES_BEFORE_MODULE_OPENING"
 msgstr "There may be changes in the assignments before the module opens!"
 
+#: exercise/templates/exercise/_user_results.html
+msgid "CONVERT_SUBMISSION_BY_MODULE"
+msgstr "Convert Late Submissions"
+
 #: exercise/templates/exercise/_user_results.html
 #: exercise/templates/exercise/staff/_submitters_table.html
 #: exercise/templates/exercise/staff/inspect_submission.html
@@ -3838,6 +3842,10 @@ msgstr "Submission details"
 msgid "REGRADE_AUTOMATICALLY"
 msgstr "Regrade automatically"
 
+#: exercise/templates/exercise/staff/_assessment_panel.html
+msgid "CONVERT_SUBMISSION"
+msgstr "Convert Submission"
+
 #: exercise/templates/exercise/staff/_assessment_panel.html
 msgid "HELP"
 msgstr "Help"

locale/fi/LC_MESSAGES/django.po

@@ -3721,6 +3721,10 @@ msgstr "Moduulin suorittamiseen vaaditaan %(points)s pistettä."
 msgid "CHANGES_ARE_POSSIBLE_IN_EXERCISES_BEFORE_MODULE_OPENING"
 msgstr "Tehtäviin saattaa tulla muutoksia ennen kierroksen avautumista!"
 
+#: exercise/templates/exercise/_user_results.html
+msgid "CONVERT_SUBMISSION_BY_MODULE"
+msgstr "Convert Late Submissions in Finnish"
+
 #: exercise/templates/exercise/_user_results.html
 #: exercise/templates/exercise/staff/_submitters_table.html
 #: exercise/templates/exercise/staff/inspect_submission.html
@@ -3848,6 +3852,10 @@ msgstr "Palautuksen lisätiedot"
 msgid "REGRADE_AUTOMATICALLY"
 msgstr "Lähetä uudelleenarviointiin"
 
+#: exercise/templates/exercise/staff/_assessment_panel.html
+msgid "CONVERT_SUBMISSION"
+msgstr "Convert Submission(FI)"
+
 #: exercise/templates/exercise/staff/_assessment_panel.html
 msgid "HELP"
 msgstr "Ohjeet"