when re-opening an attempt, save a RemarkedScormElement

So in the attempt timeline, you can see who re-opened it.

Author: christianp

numbas_lti/models.py

@@ -897,8 +897,8 @@ class Meta:
         ordering = ['-time',]
 
 COMPLETION_STATUSES = [
-    ('not attempted',_('Not attempted')),
-    ('incomplete',_('Incomplete')),
+    ('not attempted',_('Not started')),
+    ('incomplete',_('In progress')),
     ('completed',_('Complete')),
 ]
 
@@ -1293,6 +1293,23 @@ def finalise(self):
                 'completion_status':'completed',
             })
 
+    def reopen(self, reopened_by=None):
+        e = ScormElement.objects.create(
+                attempt=self,
+                key='cmi.completion_status',
+                value='incomplete',
+                time=timezone.now(),
+                counter=1
+            )
+
+        if reopened_by:
+            RemarkedScormElement.objects.create(element=e, user=reopened_by)
+
+        self.completion_status = 'incomplete'
+        self.sent_receipt = False
+        self.receipt_time = None
+        self.save(update_fields=('completion_status', 'sent_receipt', 'receipt_time',))
+
     @property
     def raw_score(self):
         if self.remarked_parts.exists() or self.resource.discounted_parts.exists():

numbas_lti/static/attempt_timeline.js

@@ -237,7 +237,7 @@ const app = createApp({
             if(key=='cmi.completion_status') {
                 this.completion_status = element.value;
                 var messages = {
-                    'incomplete': _('Started the attempt.'),
+                    'incomplete': element.remarked ? _('Re-opened the attempt.') : _('Started the attempt.'),
                     'completed': _('Ended the attempt.'),
                 };
                 var message = messages[element.value];

numbas_lti/templates/numbas_lti/management/attempt_timeline.html

@@ -49,7 +49,7 @@
                             <span v-else><time :datetime="item.time_iso">[[item.time_string]]</time></span>
                             </p>
                             <p v-if="group.remarked_by" class="remarked-by small">
-                                {% translate "Re-marked by" %}
+                                {% translate "Changed by" %}
                                 <span>[[group.remarked_by]]</span>
                             </p>
                         </td>

numbas_lti/templates/numbas_lti/show_attempts.html

@@ -38,14 +38,15 @@ <h1>
             <thead>
                 <tr>
                     <th scope="col">{% translate "Start time" %}</th>
+                    <th scope="col">{% translate "Status" %}</th>
                     <th scope="col">{% translate "Score" %}</th>
-                    <th scope="col"></th>
+                    <th scope="col"><span class="sr-only">{% translate "Controls" %}</span></th>
                 </tr>
             </thead>
             <tbody>
                 {% if can_start_new_attempt %}
                 <tr>
-                    <td colspan="2">
+                    <td colspan="3">
                     <td>
                         <a class="button warning" href="{% url_with_lti 'new_attempt' %}">{% icon 'plus' %} {% translate "Start a new attempt" %}</a>
                     </td>
@@ -54,15 +55,10 @@ <h1>
                 {% for attempt in object_list %}
                 <tr>
                     <td>{% time_tag attempt.start_time %}</td>
+                    <td>{{attempt.get_completion_status_display}}</td>
                     <td>
                         {% if attempt.should_show_scores %}
                             {{attempt.raw_score}} / {{attempt.max_score}} ({{attempt.scaled_score|percentage}})
-                        {% else %}
-                            {% if attempt.completed %}
-                                {% translate "Completed" %}
-                            {% else %}
-                                <em>{% translate "In progress" %}</em>
-                            {% endif %}
                         {% endif %}
                         {% if attempt.is_remarked %}
                             <br>

numbas_lti/views/attempt.py

@@ -99,15 +99,16 @@ class ReopenAttemptView(MustBeInstructorMixin,generic.detail.DetailView):
 
     def get(self, request, *args, **kwargs):
         attempt = self.get_object()
-        e = ScormElement.objects.create(
-                attempt=attempt,
-                key='cmi.completion_status',
-                value='incomplete',
-                time=timezone.now(),
-                counter=1
-            )
-        messages.add_message(self.request,messages.SUCCESS,_('{}\'s attempt has been reopened.'.format(attempt.user.get_full_name())))
-        return redirect(self.reverse_with_lti('manage_attempts',args=(attempt.resource.pk,)))
+
+        attempt.reopen(reopened_by=self.request.user)
+
+        if self.request.user != attempt.user:
+            messages.add_message(self.request,messages.SUCCESS,_('{}\'s attempt has been reopened.'.format(attempt.user.get_full_name())))
+            next_url = self.reverse_with_lti('manage_attempts',args=(attempt.resource.pk,)) 
+        else:
+            next_url = self.reverse_with_lti('show_attempts')
+
+        return redirect(next_url)
 
 class AttemptSCORMListing(MustHaveExamMixin,MustBeInstructorMixin,ResourceManagementViewMixin,generic.detail.DetailView):
     model = Attempt