add logic for showing submitted date

uw-it-aca · Oct 28, 2024 · 25080f9 · 25080f9
1 parent e3b2900
commit 25080f9
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/course_grader_vue/components/grade/static.vue b/course_grader_vue/components/grade/static.vue
@@ -40,17 +40,25 @@
 </template>
 
 <script>
+import { useWorkflowStateStore } from "@/stores/state";
+
 export default {
   props: {
     student: {
       type: Object,
       required: true,
     },
   },
-  data() {
+  setup() {
+    const appState = useWorkflowStateStore();
     return {
-      showDateGraded: false,
+      appState,
     };
   },
+  computed: {
+    showDateGraded() {
+      return this.appState.unsubmittedCount > 0 ? true : false;
+    },
+  },
 };
 </script>
diff --git a/course_grader_vue/components/import/upload.vue b/course_grader_vue/components/import/upload.vue
@@ -231,6 +231,7 @@ export default {
   },
   methods: {
     fileSelected(files) {
+      this.errorResponse = null;
       this.file = files[0];
     },
     uploadFile() {

diff --git a/course_grader_vue/components/student.vue b/course_grader_vue/components/student.vue
@@ -3,16 +3,16 @@
     <div>
       <div class="fs-4 text-uppercase">{{ student.student_lastname }}, {{ student.student_firstname }}</div>
       <div class="small text-muted">
-        <span class="visually-hidden">Section:</span> {{ student.section_id }},
+        <span class="visually-hidden">{{ gettext("section") }}:</span> {{ student.section_id }},
         <span v-if="student.student_credits">
-          <span class="visually-hidden">Student credits:</span>
+          <span class="visually-hidden">{{ gettext("student_credits") }}:</span>
           {{ student.student_credits }} CR,
         </span>
-        <span class="visually-hidden">Student number:</span>
+        <span class="visually-hidden">{{ gettext("student_number") }}:</span>
         {{ student.student_number }}
         <template v-if="student.duplicate_code">
-          <span class="visually-hidden">Duplicate code:</span>
-          <abbr title="Duplicate Code" class="badge rounded-pill text-bg-secondary">
+          <span class="visually-hidden">{{ gettext("duplicate_code") }}:</span>
+          <abbr :title="gettext('duplicate_code')" class="badge rounded-pill text-bg-secondary">
           {{ student.duplicate_code }}</abbr>
         </template>
       </div>

diff --git a/course_grader_vue/components/workflow/edit-grades.vue b/course_grader_vue/components/workflow/edit-grades.vue
@@ -4,7 +4,7 @@
       <div v-if="section">
         <GradeImportOptions
           :section="section"
-          :expected-grade-count="appState.unsubmitted"
+          :expected-grade-count="appState.unsubmittedCount"
         />
       </div>
 

diff --git a/course_grader_vue/stores/state.js b/course_grader_vue/stores/state.js
@@ -14,7 +14,7 @@ export const useWorkflowStateStore = defineStore({
       name: "workflowState",
       _workflowState: null,
       graderoster: null,
-      unsubmitted: 0,
+      unsubmittedCount: 0,
       gradeImport: null,
     };
   },
@@ -63,11 +63,11 @@ export const useWorkflowStateStore = defineStore({
     },
     setGraderoster (graderoster) {
       this.graderoster = graderoster;
-      this.unsubmitted = graderoster.students.filter(
+      this.unsubmittedCount = graderoster.students.filter(
           (s) => s.grade_url !== null).length
 
       // Initialize workflow state
-      if (this.unsubmitted > 0) {
+      if (this.unsubmittedCount > 0) {
         this.editGrades();
       } else {
         this.confirmGrades();