diff --git a/backend/src/validations/eas.js b/backend/src/validations/eas.js index e2518a59..88f79cf8 100644 --- 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 index 24399793..926209f4 100644 --- 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 index a18f20aa..f34fd737 100644 --- a/frontend/src/components/assessments/registrations/StudentRegistrations.vue +++ b/frontend/src/components/assessments/registrations/StudentRegistrations.vue @@ -69,13 +69,12 @@ /> - - +