Merge pull request #527 from uw-it-aca/task/status-text

adjust status text placement
uw-it-aca · Oct 30, 2024 · 6cfc7c0 · 6cfc7c0
2 parents 8078799 + 8ccb508
commit 6cfc7c0
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 43 deletions.
diff --git a/course_grader_vue/components/grade/input.vue b/course_grader_vue/components/grade/input.vue
@@ -100,8 +100,8 @@
     Student will receive default grade
   </div>
 
-  <div :id="`status-${student.item_id}`">
-    <span v-if="student.import_source" class="imported-grade">
+  <div>
+    <span v-if="student.import_source" class="imported-grade small text-muted">
       {{ student.import_source }} grade: {{ student.import_grade }}
       <span
         v-if="student.is_override_grade"

diff --git a/course_grader_vue/components/workflow/confirm-grades.vue b/course_grader_vue/components/workflow/confirm-grades.vue
@@ -63,14 +63,6 @@
         >More info.
         </BLink>
       </div>
-
-      <div v-if="appState.graderoster.is_writing_section"
-        class="bg-body-secondary p-3 rounded-3"
-      >
-        <div class="small" role="status">
-          {{ gettext("writing_course_note_receipt") }}
-        </div>
-      </div>
     </template>
 
     <template v-if="appState.graderoster.is_submission_confirmation">
@@ -123,14 +115,17 @@
       </BLink>
     </BAlert>
 
-    <template>
-      <div v-if="appState.graderoster.has_duplicate_codes"
-        class="mb-2 pb-2 small text-muted border-bottom"
-      >
+    <div v-if="appState.graderoster.is_writing_section || appState.graderoster.has_duplicate_codes"
+      class="mb-2 pb-2 small text-muted border-bottom"
+    >
+      <div v-if="appState.graderoster.is_writing_section">
+        {{ gettext("writing_course_note_receipt") }}
+      </div>
+      <div v-if="appState.graderoster.has_duplicate_codes">
         {{ gettext("duplicate_code") }}
         <i class="bi bi-circle-fill text-secondary"></i>
       </div>
-    </template>
+    </div>
 
     <ul v-if="appState.graderoster.students"
       class="list-unstyled m-0">

diff --git a/course_grader_vue/components/workflow/edit-grades.vue b/course_grader_vue/components/workflow/edit-grades.vue
@@ -9,26 +9,23 @@
       </div>
 
       <SectionHeader :section="section" :title="gettext('enter_grades')" />
-
-      <div
-        v-if="appState.graderoster.is_writing_section"
-        class="bg-body-secondary p-3 rounded-3"
-      >
-        <div class="small" role="status">
-          {{ gettext("writing_course_note_receipt") }}
-        </div>
-      </div>
     </template>
 
     <template v-if="errorResponse">
       <Errors :error-response="errorResponse" />
     </template>
     <template v-else-if="appState.graderoster">
-      <div v-if="appState.graderoster.has_duplicate_codes"
+      <div
+        v-if="appState.graderoster.is_writing_section || appState.graderoster.has_duplicate_codes"
         class="mb-2 pb-2 small text-muted border-bottom"
       >
-        {{ gettext("duplicate_code") }}
-        <i class="bi bi-circle-fill text-secondary"></i>
+        <div v-if="appState.graderoster.is_writing_section"
+          v-html="gettext('writing_course_note')">
+        </div>
+        <div v-if="appState.graderoster.has_duplicate_codes">
+          {{ gettext("duplicate_code") }}
+          <i class="bi bi-circle-fill text-secondary"></i>
+        </div>
       </div>
     </template>
 

diff --git a/course_grader_vue/components/workflow/review-grades.vue b/course_grader_vue/components/workflow/review-grades.vue
@@ -11,24 +11,18 @@
       <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"
-        >
-        <div class="small" role="status">
+      <div class="mb-2 pb-2 small text-muted border-bottom">
+        <div>
+          {{ gettext("please_review_grades") }}
+        </div>
+        <div v-if="appState.graderoster.is_writing_section">
           {{ gettext("writing_course_note_receipt") }}
         </div>
-      </div>
-
-      <div>
-        {{ gettext("please_review_grades") }}
-      </div>
-
-      <div v-if="appState.graderoster.has_duplicate_codes"
-        class="mb-2 pb-2 small text-muted border-bottom"
-      >
-        {{ gettext("duplicate_code") }}
-        <i class="bi bi-circle-fill text-secondary"></i>
+        <div v-if="appState.graderoster.has_duplicate_codes"
+        >
+          {{ gettext("duplicate_code") }}
+          <i class="bi bi-circle-fill text-secondary"></i>
+        </div>
       </div>
 
       <ul v-if="appState.graderoster.students" class="list-unstyled m-0">