Merge pull request #525 from uw-it-aca/task/submission-inprogress

add submission inprogress hook
uw-it-aca · Oct 30, 2024 · d9115e1 · d9115e1
2 parents f9849b4 + 4f3acaa
commit d9115e1
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 30 deletions.
diff --git a/course_grader_vue/components/workflow/convert-import.vue b/course_grader_vue/components/workflow/convert-import.vue
@@ -1,9 +1,7 @@
 <template>
   <BCard class="shadow-sm rounded-3" header-class="p-3" header="Default">
     <template #header>
-
       <SectionHeader :section="section" :title="gettext('convert_grades')" />
-
     </template>
 
     <h3>{{ gettext("conversion_header") }}</h3>

diff --git a/course_grader_vue/components/workflow/review-grades.vue b/course_grader_vue/components/workflow/review-grades.vue
@@ -2,7 +2,15 @@
   <BCard class="shadow-sm rounded-3" header-class="p-3" header="Default">
     <template #header>
       <SectionHeader :section="section" :title="gettext('review_submit_grades')" />
+    </template>
 
+    <template v-if="isLoading">
+      Grade submission in progress...
+    </template>
+    <template v-else-if="errorResponse">
+      <Errors :error-response="errorResponse" />
+    </template>
+    <template v-else-if="appState.graderoster">
       <div
         v-if="appState.graderoster.is_writing_section"
         class="bg-body-secondary p-3 rounded-3"
@@ -11,12 +19,7 @@
           {{ gettext("writing_course_note_receipt") }}
         </div>
       </div>
-    </template>
 
-    <template v-if="errorResponse">
-      <Errors :error-response="errorResponse" />
-    </template>
-    <template v-else-if="appState.graderoster">
       <div>
         {{ gettext("please_review_grades") }}
       </div>
@@ -27,29 +30,31 @@
         {{ gettext("duplicate_code") }}
         <i class="bi bi-circle-fill text-secondary"></i>
       </div>
-    </template>
 
-    <ul v-if="appState.graderoster.students" class="list-unstyled m-0">
-      <li
-        v-for="(student, index) in appState.graderoster.students"
-        :key="student.item_id"
-        class="bpt-2 mt-2"
-        :class="index != 0 ? 'border-top' : ''"
-      >
-        <Student :student="student" />
-      </li>
-    </ul>
-    <ul v-else-if="!errorResponse" class="list-unstyled m-0">
-      <li v-for="index in 8" class="border-top pt-2 mt-2" :key="index">
-        <BPlaceholder
-          class="d-block bg-body-secondary"
-          style="height: 60px"
-          animation="glow"
-        />
-      </li>
-    </ul>
+      <ul v-if="appState.graderoster.students" class="list-unstyled m-0">
+        <li
+          v-for="(student, index) in appState.graderoster.students"
+          :key="student.item_id"
+          class="bpt-2 mt-2"
+          :class="index != 0 ? 'border-top' : ''"
+        >
+          <Student :student="student" />
+        </li>
+      </ul>
+    </template>
+    <template v-else>
+      <ul class="list-unstyled m-0">
+        <li v-for="index in 8" class="border-top pt-2 mt-2" :key="index">
+          <BPlaceholder
+            class="d-block bg-body-secondary"
+            style="height: 60px"
+            animation="glow"
+          />
+        </li>
+      </ul>
+    </template>
 
-    <template #footer>
+    <template v-if="!isLoading && !errorResponse" #footer>
       <div class="d-flex">
         <div class="flex-fill align-self-center text-end me-2 small">
           {{ gettext("review_warning") }}

diff --git a/docker/settings.py b/docker/settings.py
@@ -8,7 +8,6 @@
     'userservice',
     'persistent_message',
     'rc_django',
-    'grade_conversion_calculator',
     'django.contrib.humanize',
 ]
 

diff --git a/setup.py b/setup.py
@@ -35,7 +35,6 @@
         'uw-restclients-canvas~=1.2',
         'uw-restclients-graderoster~=1.1',
         'uw-restclients-django-utils~=2.3',
-        'uw-grade-conversion-calculator~=1.4',
         'chardet~=5.0'
     ],
     license='Apache License, Version 2.0',