Changes to include assessmentValidationIssues + Changes from dialog t…

…o bottom sheet + filtering of records at top panel.
bcgov · Dec 10, 2024 · 3490c9f · 3490c9f
1 parent 22b2a0d
commit 3490c9f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/backend/src/validations/eas.js b/backend/src/validations/eas.js
@@ -1,4 +1,4 @@
-const { object, string, boolean, number } = require('yup');
+const { object, string, boolean, number, array } = require('yup');
 const { baseRequestSchema } = require('./base');
 
 const putStudentAssessmentSchema = object({
@@ -22,6 +22,13 @@ const putStudentAssessmentSchema = object({
     numberOfAttempts: number().nullable().optional(),
     courseMonth: number().optional(),
     courseYear: number().optional(),
+    assessmentStudentValidationIssues: array().of(object({
+      assessmentStudentValidationIssueID:string().nullable().optional(),
+      assessmentStudentID:string().nullable().optional(),
+      validationIssueSeverityCode:string().nullable().optional(),
+      validationIssueCode:string().nullable().optional(),
+      validationIssueFieldCode:string().nullable().optional()
+    }).concat(baseRequestSchema)).nullable().optional()
   }).concat(baseRequestSchema).noUnknown(),
   params: object({
     studentAssessmentID: string().nonNullable(),

diff --git a/frontend/src/components/assessments/AssessmentSessions.vue b/frontend/src/components/assessments/AssessmentSessions.vue
@@ -131,7 +131,7 @@ export default {
     activeSessions() {
       const orderedSessions = [];
       const allsessions = this.allsessions
-        .filter(session => session.isOpen)
+        .filter(session => session.schoolYear === this.schoolYear)
         .map((session) => {
           return {
             ...session,
@@ -146,7 +146,7 @@ export default {
     },
     historicalSessions() {
       const allsessions = this.allsessions
-        .filter(session => !session.isOpen)
+        .filter(session => session.schoolYear !== this.schoolYear)
         .map((entry) => {
           return {
             ...entry,

diff --git a/frontend/src/components/assessments/registrations/StudentRegistrations.vue b/frontend/src/components/assessments/registrations/StudentRegistrations.vue
@@ -69,21 +69,20 @@
         />
       </v-navigation-drawer>
     </v-row>
-    <v-dialog
+    <v-bottom-sheet
       v-model="editStudentRegistrationSheet"
       :inset="true"
       :no-click-animation="true"
       :scrollable="true"
       :persistent="true"
-      width="40%"
     >
       <StudentRegistrationDetail        
         :selected-student-registration-id="studentRegistrationForEdit?.assessmentStudentID"
         :school-year-sessions="schoolYearSessions"
         @reload-student-registrations="reloadStudentRegistrationsFlag = true"
         @close-student-registration="closeEditAndLoadStudentRegistrations"
       />
-    </v-dialog>
+    </v-bottom-sheet>
   </v-container>
 </template>