Monitor registrations.

backend/src/components/cache-service.js

@@ -32,6 +32,9 @@ let specialEducationCodesMap = new Map();
 let duplicateResolutionCodesMap = new Map();
 let programDuplicateTypeCodesMap = new Map();
 
+let assessmentTypeCodesMap = new Map();
+let assessmentSpecialCaseTypeCodesMap = new Map();
+
 const cacheService = {
 
   async loadAllSchoolsToMap() {
@@ -231,6 +234,40 @@ const cacheService = {
     };
   },
 
+  async loadAllAssessmentTypeCodesToMap() {
+    log.debug('Loading all assessment Type Codes during start up');
+    await retry(async () => {
+      const assessmentTypeCodesResponse = await getData(config.get('server:eas:assessmentTypeCodeURL'));
+      assessmentTypeCodesResponse.forEach(entry => {
+        assessmentTypeCodesMap.set(entry.assessmentTypeCode, entry.label);   
+      });      
+      log.info(`Loaded ${assessmentTypeCodesMap.size} assessmentTypeCodes.`);
+    }, {
+      retries: 50
+    });
+  },
+
+  async loadAllSpecialCaseTypeCodesToMap() {
+    log.debug('Loading all specialcase Type Codes during start up');
+    await retry(async () => {
+      const provincialSpecialCaseTypeCodesResponse = await getData(config.get('server:eas:assessmentSpecialCaseTypeCodeURL'));
+      provincialSpecialCaseTypeCodesResponse.forEach(entry => {
+        assessmentSpecialCaseTypeCodesMap.set(entry.provincialSpecialCaseCode, entry.label);   
+      });       
+      log.info(`Loaded ${assessmentSpecialCaseTypeCodesMap.size} assessmentSpecialCaseTypeCodes.`);
+    }, {
+      retries: 50
+    });
+  },
+
+  getAssessmentTypeLabelByCode(assessmentTypeCode) {
+    return assessmentTypeCodesMap.get(assessmentTypeCode);
+  },
+
+  getSpecialCaseTypeLabelByCode(specialCaseTypeCode) {
+    return assessmentSpecialCaseTypeCodesMap.get(specialCaseTypeCode);
+  },
+
   async loadDataToCache(cacheKey,url){
     log.debug(` loading all ${cacheKey} during start up`);
     await retry(async () => {

backend/src/components/eas/eas.js

@@ -2,8 +2,10 @@
 const { logApiError, getData, errorResponse, handleExceptionResponse } = require('../utils');
 const HttpStatus = require('http-status-codes');
 const utils = require('../utils');
-
 const config = require('../../config');
+const cacheService = require('../cache-service');
+const { createMoreFiltersSearchCriteria } = require('./studentFilters');
+const moment = require('moment');
 
 async function getAssessmentSessions(req, res) {
   try {
@@ -16,6 +18,17 @@ async function getAssessmentSessions(req, res) {
   }
 }
 
+async function getAssessmentSessionsBySchoolYear(req, res) {
+  try {
+    const url = `${config.get('server:eas:assessmentSessionsURL')}/school-year/${req.params.schoolYear}`;
+    const data = await getData(url);
+    return res.status(200).json(data);
+  } catch (e) {
+    logApiError(e, 'getSessions', 'Error occurred while attempting to GET sessions.');
+    return handleExceptionResponse(e, res);
+  }
+}
+
 async function updateAssessmentSession(req, res) {
   if (req.params.sessionID !== req.body.sessionID) {
     return res.status(HttpStatus.BAD_REQUEST).json({
@@ -37,7 +50,73 @@ async function updateAssessmentSession(req, res) {
     return errorResponse(res);
   }
 }
+
+async function getAssessmentStudentsPaginated(req, res) {
+  try {
+    const search = [];
+
+    if (req.query.searchParams?.['moreFilters']) {
+      let criteriaArray = createMoreFiltersSearchCriteria(req.query.searchParams['moreFilters']);
+      criteriaArray.forEach(criteria => {
+        search.push(criteria);
+      });
+    }
+
+    const params = {
+      params: {
+        pageNumber: req.query.pageNumber,
+        pageSize: req.query.pageSize,
+        sort: JSON.stringify(req.query.sort),
+        searchCriteriaList: JSON.stringify(search),
+      }
+    };
+
+
+    let data = await getData(`${config.get('server:eas:assessmentStudentsURL')}/paginated`, params);
+
+    if (req?.query?.returnKey) {
+      let result = data?.content.map((student) => student[req?.query?.returnKey]);
+      return res.status(HttpStatus.OK).json(result);
+    }
+
+    data?.content.forEach(value => {
+      let school = cacheService.getSchoolBySchoolID(value.schoolID);
+      let assessmentCenter = cacheService.getSchoolBySchoolID(value.assessmentCenter);
+      let district = cacheService.getDistrictJSONByDistrictId(school.districtID);
+      value.schoolNumber = school.mincode;
+      value.schoolName = getSchoolName(school);
+      value.districtName = getDistrictName(district);
+      value.districtNumber = district.districtNumber;
+      value.districtID = school.districtID;
+      value.mincode = cacheService.getSchoolBySchoolID(value.schoolID)?.mincode;
+      value.assessmentCenterNumber = assessmentCenter.mincode;
+      value.assessmentCenterName = getSchoolName(assessmentCenter);
+      value.assessmentTypeName = cacheService.getAssessmentTypeLabelByCode(value.assessmentTypeCode)+' ('+value.assessmentTypeCode+')';
+      value.provincialSpecialCaseName = cacheService.getSpecialCaseTypeLabelByCode(value.provincialSpecialCaseCode);
+      value.sessionName = moment(value.courseMonth, 'MM').format('MMMM') +' '+value.courseYear;
+    });
+    return res.status(200).json(data);
+  } catch (e) {
+    if (e?.status === 404) {
+      res.status(HttpStatus.OK).json(null);
+    } else {
+      await logApiError(e, 'Error getting eas assessment student paginated list');
+      return errorResponse(res);
+    }
+  }
+}
+
+function getSchoolName(school) {
+  return school.mincode + ' - ' + school.schoolName;
+}
+
+function getDistrictName(district) {
+  return district.districtNumber + ' - ' + district.name;
+}
+
 module.exports = {
   getAssessmentSessions,
-  updateAssessmentSession
+  getAssessmentSessionsBySchoolYear,
+  updateAssessmentSession,
+  getAssessmentStudentsPaginated
 };

backend/src/components/eas/studentFilters.js

@@ -0,0 +1,32 @@
+'use strict';
+const { FILTER_OPERATION, VALUE_TYPE, CONDITION} = require('../../util/constants');
+
+
+function createMoreFiltersSearchCriteria(searchFilter = []) {
+  let searchCriteriaList = [];
+  for (const [key, filter] of Object.entries(searchFilter)) {
+    let pValue = filter ? filter.map(filter => filter.value) : null;
+    if (key === 'specialCaseCode' && pValue) {
+      searchCriteriaList.push({ key: 'provincialSpecialCaseCode', value: pValue.toString(), operation: FILTER_OPERATION.IN, valueType: VALUE_TYPE.STRING, condition: CONDITION.AND });
+    }
+    if (key === 'sessionID' && pValue) {
+      searchCriteriaList.push({ key: 'assessmentEntity.sessionEntity.sessionID', value: pValue[0], operation: FILTER_OPERATION.IN, valueType: VALUE_TYPE.UUID, condition: CONDITION.AND });
+    }
+
+    if (key === 'schoolYear' && pValue) {
+      searchCriteriaList.push({ key: 'assessmentEntity.sessionEntity.schoolYear', value: pValue[0].replace('-', '/'), operation: FILTER_OPERATION.EQUAL, valueType: VALUE_TYPE.STRING, condition: CONDITION.AND });
+    }
+  }
+  const search = [];
+  if (searchCriteriaList.length > 0) {
+    search.push({
+      condition: CONDITION.AND,
+      searchCriteriaList: searchCriteriaList
+    });
+  }
+  return search;
+}
+
+module.exports = {
+  createMoreFiltersSearchCriteria
+};

backend/src/config/index.js

@@ -153,7 +153,9 @@ nconf.defaults({
     },
     eas:{
       rootURL: process.env.EAS_API_URL,
-      assessmentSessionsURL: process.env.EAS_API_URL+ '/sessions'
+      assessmentSessionsURL: process.env.EAS_API_URL+ '/sessions',
+      assessmentTypesURL: process.env.EAS_API_URL+ '/assessments',
+      assessmentStudentsURL: process.env.EAS_API_URL+ '/students',
     }
   },
   oidc: {

backend/src/routes/eas.js

@@ -1,15 +1,20 @@
 const passport = require('passport');
 const express = require('express');
 const router = express.Router();
-const { getAssessmentSessions, updateAssessmentSession } = require('../components/eas/eas');
+const { getAssessmentSessions, getAssessmentSessionsBySchoolYear, updateAssessmentSession, getAssessmentStudentsPaginated } = require('../components/eas/eas');
 const utils = require('../components/utils');
 const extendSession = utils.extendSession();
 const permUtils = require('../components/permissionUtils');
 const perm = require('../util/Permission');
 
 const PERMISSION = perm.PERMISSION;
 
+
 router.get('/assessment-sessions', passport.authenticate('jwt', {session: false}, undefined), permUtils.checkUserHasPermission(PERMISSION.MANAGE_EAS_SESSIONS_PERMISSION), extendSession, getAssessmentSessions);
+router.get('/assessment-sessions/school-year/:schoolYear', passport.authenticate('jwt', {session: false}, undefined), permUtils.checkUserHasPermission(PERMISSION.MANAGE_EAS_SESSIONS_PERMISSION), extendSession, getAssessmentSessionsBySchoolYear);
 router.put('/assessment-sessions/:sessionID', passport.authenticate('jwt', {session: false}, undefined), permUtils.checkUserHasPermission(PERMISSION.MANAGE_EAS_SESSIONS_PERMISSION), extendSession, updateAssessmentSession);
 
+router.get('/assessment-registrations/paginated', passport.authenticate('jwt', {session: false}, undefined), permUtils.checkUserHasPermission(PERMISSION.MANAGE_EAS_SESSIONS_PERMISSION), extendSession, getAssessmentStudentsPaginated);
+
+
 module.exports = router;

backend/src/server.js

@@ -175,6 +175,18 @@ if(!config.get('frontendConfig').disableSdcFunctionality) {
   });
 }
 
+cacheService.loadAllAssessmentTypeCodesToMap().then(() => {
+  log.info('Loaded AssessmentTypeCodes data to memory');
+}).catch((e) => {
+  log.error('Error loading AssessmentTypeCodes during boot .', e);
+});
+cacheService.loadAllSpecialCaseTypeCodesToMap().then(() => {
+  log.info('Loaded SpecialCaseTypeCodes data to memory');
+}).catch((e) => {
+  log.error('Error loading SpecialCaseTypeCodes during boot .', e);
+});
+
+
 cacheService.loadAllAuthoritiesToMap().then(() => {
   log.info('Loaded authorities data to memory');
 }).catch((e) => {

frontend/src/components/assessments/AssessmentSessions.vue

@@ -2,7 +2,25 @@
   <v-container class="containerSetup mb-5">
     <v-row class="pr-4">
       <v-col class="pb-0 mt-4">
-        <h2>Open Assessment Sessions</h2>
+        <div style="display: flex;">
+          <h2>School Year: {{ schoolYear }}</h2>
+          <v-btn
+              variant="text"
+              @click="goToSchoolYearRegistrations()"
+            >
+              <span
+                class="ml-1 pr-2"
+                style="color: #003366"
+              >Continue</span>
+              <v-icon
+                color="#003366"
+                class="ml-n1 mr-1"
+                right
+                icon="mdi-arrow-right"
+                dark
+              />
+            </v-btn>
+        </div>
       </v-col>
     </v-row>
     <v-row 
@@ -93,6 +111,7 @@ export default {
   data() {
     return {
       topN: 4,
+      schoolYear:null,
       search: null,
       currentYear: LocalDate.now().year(),
       itemsPerPage: 5,
@@ -123,6 +142,7 @@ export default {
           };
         });
       allsessions.sort((a, b) => new Date(a.activeUntilDate) - new Date(b.activeUntilDate));
+      this.schoolYear = allsessions[0]?.schoolYear;
       for (let i = 0; i < allsessions.length; i += 2) {
         orderedSessions.push(allsessions.slice(i, i + 2));
       }
@@ -176,6 +196,9 @@ export default {
     },
     formatMonth(month) {
       return moment(month, 'MM').format('MMMM');
+    },
+    goToSchoolYearRegistrations() {
+      this.$router.push({name: 'assessment-session-detail', params: {schoolYear:  this.schoolYear.replace(/\//g, '-'), sessionID: null}});
     }
   },
 };