Merge pull request #2089 from bcgov/feature/EAC-8

EAC-8 (Minor changes)
bcgov · Oct 28, 2024 · 0b6dad6 · 0b6dad6
2 parents cb9cfeb + 46fc3b2
commit 0b6dad6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/frontend/src/components/assessments/AssessmentSessions.vue b/frontend/src/components/assessments/AssessmentSessions.vue
@@ -64,7 +64,7 @@
       :scrollable="true"
       :persistent="true"
       max-width="40%"
-      min-height="35%"
+      min-height="28%"
     >
       <EditSession
         v-if="editSessionSheet"
@@ -99,8 +99,9 @@ export default {
       pageNumber: 1,
       allsessions: [],
       headers: [
-        { title: 'Month', key: 'courseMonth' },
-        { title: 'Year', key: 'courseYear' },
+        { title: 'School Year', key: 'schoolYear' },
+        { title: 'Course Month', key: 'courseMonth' },
+        { title: 'Course Year', key: 'courseYear' },        
         { title: 'Open Date', key: 'activeFromDate' },
         { title: 'Close Date', key: 'activeUntilDate' },
       ],
@@ -128,7 +129,7 @@ export default {
       return orderedSessions;
     },
     historicalSessions() {
-      return this.allsessions
+      const allsessions = this.allsessions
         .filter((session, index) => index >= this.topN)
         .map((session) => {
           return {
@@ -138,6 +139,8 @@ export default {
             courseMonth: this.formatMonth(session.courseMonth),
           };
         });
+        allsessions.sort((a, b) => new Date(b.activeUntilDate) - new Date(a.activeUntilDate));
+        return allsessions;
     },
     sessionHeaderSlotName() {
       return `column.${this.sessionid}`;

diff --git a/frontend/src/components/assessments/sessions/SessionEdit.vue b/frontend/src/components/assessments/sessions/SessionEdit.vue
@@ -24,7 +24,7 @@
             v-model="editSession.activeUntilDate"
             label="Close Date"
             model-type="yyyy-MM-dd'T'00:00:00"
-            :rules="[rules.endDateRule(editSession.activeFromDate, editSession.activeUntilDate)]"
+            :rules="[rules.endDateRule(editSession.activeFromDate, editSession.activeUntilDate), rules.required()]"
             :allow-teleport="true"
             @update:model-value="validateForm"
             @clear-date="clearCloseDate"