More fixes

openassessment/templates/openassessmentblock/staff_area/oa_student_info.html

@@ -19,10 +19,11 @@
             </h2>
             <div class="ui-toggle-visibility__content">
                 {% if workflow_cancellation %}
-                    {% blocktrans with removed_by_username=workflow_cancellation.cancelled_by removed_datetime=workflow_cancellation.created_at|utc|date:"N j, Y H:i e" %}
-                        Learner submission removed by {{ removed_by_username }} on {{ removed_datetime }}
-                    {% endblocktrans %}
-                    <br>
+                    <p>
+                        {% blocktrans with removed_by_username=workflow_cancellation.cancelled_by removed_datetime=workflow_cancelled_at|utc|date:"F j, Y H:i e" %}
+                            Learner submission removed by {{ removed_by_username }} on {{ removed_datetime }}
+                        {% endblocktrans %}
+                    </p>
                     <!-- Comments: Reason for Cancellation-->
                     {% blocktrans with comments=workflow_cancellation.comments %}
                         Comments: {{ comments }}
@@ -239,27 +240,27 @@
         </div>
     </div>
 
-    <div class="staff-info__staff-override ui-staff__content__section wrapper--ui--collapse">
-        <div class="ui-staff ui-toggle-visibility {% if expanded_view != 'staff-override' %}is--collapsed {% endif %}">
-            <h2 class="staff-info__title ui-staff__subtitle ui-toggle-visibility__control">
-                <i class="icon fa fa-caret-right"></i>
-                <span>{% trans "Submit Assessment Grade Override" %}</span>
-            </h2>
+    {% if not workflow_cancellation %}
+        <div class="staff-info__staff-override ui-staff__content__section wrapper--ui--collapse">
+            <div class="ui-staff ui-toggle-visibility {% if expanded_view != 'staff-override' %}is--collapsed {% endif %}">
+                <h2 class="staff-info__title ui-staff__subtitle ui-toggle-visibility__control">
+                    <i class="icon fa fa-caret-right"></i>
+                    <span>{% trans "Submit Assessment Grade Override" %}</span>
+                </h2>
 
-            <div class="staff-info__staff-override__content ui-toggle-visibility__content">
-                <div class="wrapper--input">
-                    {% include "openassessmentblock/staff_area/oa_staff_assessment.html" %}
+                <div class="staff-info__staff-override__content ui-toggle-visibility__content">
+                    <div class="wrapper--input">
+                        {% include "openassessmentblock/staff_area/oa_staff_assessment.html" %}
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
 
-    {% if not workflow_cancellation %}
         <div class="staff-info__workflow-cancellation ui-staff__content__section wrapper--ui--collapse">
             <div class="ui-staff ui-toggle-visibility is--collapsed">
                 <h2 class="staff-info__title ui-staff__subtitle ui-toggle-visibility__control">
                     <i class="icon fa fa-caret-right"></i>
-                    <span>{% trans "Remove submission from peer grading" %}</span>
+                    <span>{% trans "Remove Submission From Peer Grading" %}</span>
                 </h2>
 
                 <div class="staff-info__cancel-submission__content ui-toggle-visibility__content">

openassessment/workflow/api.py

@@ -6,14 +6,9 @@ import logging
 
 from django.db import DatabaseError
 
-from openassessment.assessment.api import peer as peer_api
-from openassessment.assessment.api import ai as ai_api
-from openassessment.assessment.api import student_training as training_api
-from openassessment.assessment.errors import (
-    PeerAssessmentError, StudentTrainingInternalError, AIError,
-    PeerAssessmentInternalError)
+from openassessment.assessment.errors import PeerAssessmentError, PeerAssessmentInternalError
 from submissions import api as sub_api
-from .models import AssessmentWorkflow, AssessmentWorkflowCancellation, AssessmentWorkflowStep
+from .models import AssessmentWorkflow, AssessmentWorkflowCancellation
 from .serializers import AssessmentWorkflowSerializer, AssessmentWorkflowCancellationSerializer
 from .errors import (
     AssessmentWorkflowError, AssessmentWorkflowInternalError,

openassessment/xblock/staff_area_mixin.py

@@ -24,6 +24,7 @@ from openassessment.assessment.api import self as self_api
 from openassessment.assessment.api import ai as ai_api
 from openassessment.fileupload import api as file_api
 from openassessment.workflow import api as workflow_api
+from openassessment.workflow.models import AssessmentWorkflowCancellation
 from openassessment.fileupload import exceptions as file_exceptions
 
 
@@ -288,11 +289,18 @@ class StaffAreaMixin(object):
         if workflow_cancellation:
             workflow_cancellation['cancelled_by'] = self.get_username(workflow_cancellation['cancelled_by_id'])
 
+            # Get the date that the workflow was cancelled to use in preference to the serialized date string
+            cancellation_model = AssessmentWorkflowCancellation.get_latest_workflow_cancellation(submission_uuid)
+            workflow_cancelled_at = cancellation_model.created_at
+        else:
+            workflow_cancelled_at = None
+
         context = {
             'submission': create_submission_dict(submission, self.prompts) if submission else None,
             'score': workflow.get('score'),
             'workflow_status': workflow.get('status'),
             'workflow_cancellation': workflow_cancellation,
+            'workflow_cancelled_at': workflow_cancelled_at,
             'peer_assessments': peer_assessments,
             'submitted_assessments': submitted_assessments,
             'self_assessment': self_assessment,

openassessment/xblock/static/sass/oa/utilities/_developer.scss

@@ -115,6 +115,10 @@ $link-hover: $edx-blue-l1 !default; // from our Pattern Library http://ux.edx.or
   .label {
     color: $heading-staff-color;
     margin-bottom: ($baseline-v/2);
+
+    input {
+      display: block;
+    }
   }
 
   .action--submit {