Merge pull request #485 from uw-it-aca/task/section-bug-fixes

fix loading bugs and receipt strings
uw-it-aca · Sep 5, 2024 · 2f4a4af · 2f4a4af
2 parents 09e8d83 + c6674bf
commit 2f4a4af
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 28 deletions.
diff --git a/course_grader_vue/components/graderoster/receipt.vue b/course_grader_vue/components/graderoster/receipt.vue
@@ -9,23 +9,23 @@
         <span class=""
           ><i class="fas fa-exclamation-circle"></i>
           {{
-            ngettext(
+            interpolate(ngettext(
               "Grades submitted, but one grade had an error.",
               "Grades submitted, but %(failed_submission_count)s grades had errors.",
               graderoster.failed_submission_count
-            )
+            ), graderoster, true)
           }}
         </span>
       </div>
       <div v-else class="alert alert-danger" role="status">
         <span class=""
           ><i class="fas fa-times-circle"></i>
           {{
-            ngettext(
+            interpolate(ngettext(
               "Grade submitted with error.",
               "Grades submitted with errors.",
               graderoster.failed_submission_count
-            )
+            ), graderoster, true)
           }}
         </span>
       </div>

diff --git a/course_grader_vue/pages/section.vue b/course_grader_vue/pages/section.vue
@@ -67,32 +67,33 @@
         <div v-if="errorResponse">
           <Errors :error-response="errorResponse" />
         </div>
-        <div v-else-if="reviewing">
-          {{ gettext("please_review_grades") }}
-        </div>
-        <div v-else-if="studentsLoaded && editing">
-          <span
-            v-if="graderoster.is_writing_section"
-            v-html="gettext('writing_course_note')"
-          />
-          <div class="text-end">
-            <GradeImport
-              :section="section"
-              :expected-grade-count="unsubmitted"
+        <div v-else-if="studentsLoaded">
+          <div v-if="reviewing">
+            {{ gettext("please_review_grades") }}
+          </div>
+          <div v-else-if="editing">
+            <span
+              v-if="graderoster.is_writing_section"
+              v-html="gettext('writing_course_note')"
             />
+            <div class="text-end">
+              <GradeImport
+                :section="section"
+                :expected-grade-count="unsubmitted"
+              />
+            </div>
+          </div>
+          <div v-else>
+            <Receipt :section="section" :graderoster="graderoster" />
           </div>
-        </div>
-        <div v-else>
-          <Receipt :section="section" :graderoster="graderoster" />
-        </div>
 
-        <!-- Duplicate code legend -->
-        <div
-          v-if="graderoster && graderoster.has_duplicate_codes"
-          class="mb-2 small text-muted"
-        >
-          {{ gettext("duplicate_code") }}
-          <i class="bi bi-circle-fill text-secondary"></i>
+          <div
+            v-if="graderoster.has_duplicate_codes"
+            class="mb-2 small text-muted"
+          >
+            {{ gettext("duplicate_code") }}
+            <i class="bi bi-circle-fill text-secondary"></i>
+          </div>
         </div>
 
         <!-- Student roster -->
@@ -131,7 +132,7 @@
             </div>
             <div class="text-nowrap">
               <BButton
-                :title="`Go back and edit grades for {{ section.section_name }}`"
+                :title="`Go back and edit grades for ${section.section_name}`"
                 variant="outline-primary"
                 @click="loadGraderoster"
                 >{{ gettext("btn_review_back") }}