Merge pull request #2348 from bcgov/feature/screenAdjust

UI trim up for assessments registrations pages

Author: SodhiA1

frontend/src/components/assessments/AssessmentSessionDetail.vue

@@ -21,13 +21,13 @@
             :value="1"
             prepend-icon="mdi-account-multiple-outline"
           >
-            Registrations and Results 
+            Registrations
           </v-tab>
           <v-tab 
             :value="2"
             prepend-icon="mdi-finance"
           >
-            Reports
+            Reports & Results
           </v-tab>
         </v-tabs>
         <v-window v-model="tab">
@@ -37,11 +37,22 @@
             reverse-transition="false"
           >
             <StudentRegistrations
-              v-if="schoolYearSessions.length > 0"
+              v-if="schoolYearSessions.length > 5"
               :school-year="schoolYear"
               :school-year-sessions="schoolYearSessions"
               :session-i-d="sessionID"
             />
+            <v-row v-else>
+              <v-col class="mt-5">
+                <v-alert
+                  density="compact"
+                  type="info"
+                  variant="tonal"
+                >
+                  <span>Assessment registrations are unavailable until new sessions open in the fall.</span>
+                </v-alert>
+              </v-col>
+            </v-row>
           </v-window-item>
           <v-window-item
             :value="2"
@@ -96,10 +107,14 @@ export default {
   },
   async created() {    
     this.loading = true;
-    easStore().getActiveSchoolYear(this.userInfo.activeInstituteType).then(() => this.getAllSessionsforYear());
+    easStore().getActiveSchoolYear(this.userInfo.activeInstituteType).then(() => {
+      if(this.schoolYear.length > 0) {
+        this.getAllSessionsforYear();
+      }
+    });
   },
   methods: {
-    async  getAllSessionsforYear() {
+    async getAllSessionsforYear() {
       this.loading = true;
       ApiService.apiAxios
         .get(

frontend/src/components/assessments/registrations/StudentRegistrations.vue

@@ -3,18 +3,18 @@
     id="enrollmentTab"
     fluid
   >
-  <v-row v-if="activeSession.assessmentRegistrationsExportDate !== null">
-    <v-col>
-      <v-alert
-        density="compact"
-        type="info"
-        variant="tonal"
-      >
-        <span>Registrations for the {{ activeSession?.courseYear }}/{{ activeSession?.courseMonth }} session were transferred to e-Assessments System on 
-          {{activeSession?.assessmentRegistrationsExportDate.substring(0,19).replaceAll('-', '/').replaceAll('T', ' ') }}. Any changes made here or through XAM file submissions after that date will not appear in e-Assessments System unless schools enter them directly.</span>
-      </v-alert>
-    </v-col>
-  </v-row>
+    <v-row v-if="activeSession.assessmentRegistrationsExportDate !== null">
+      <v-col>
+        <v-alert
+          density="compact"
+          type="info"
+          variant="tonal"
+        >
+          <span>Registrations for the {{ activeSession?.courseYear }}/{{ activeSession?.courseMonth }} session were transferred to e-Assessments System on 
+            {{ activeSession?.assessmentRegistrationsExportDate.substring(0,19).replaceAll('-', '/').replaceAll('T', ' ') }}. Any changes made here or through XAM file submissions after that date will not appear in e-Assessments System unless schools enter them directly.</span>
+        </v-alert>
+      </v-col>
+    </v-row>
     <v-row>
       <v-col cols="12">
         <v-row justify="space-between">

frontend/src/utils/eas/StudentRegistrationTableConfiguration.js

@@ -125,16 +125,11 @@ export const SCHOOL_YEAR_REGISTRATIONS_VIEW_DISTRICT = Object.freeze(
       { title: 'PEN', key: 'pen' },
       { title: 'Local ID', key: 'localID' },
       { title: 'Surname, Given Name', key: 'name' },
-      { title: 'Assessment Center', key: 'assessmentCenterName_desc' },
-      { title: 'Score', key: 'proficiencyScore' },
-      { title: 'Special Case', key: 'provincialSpecialCaseName_desc' },
-      { title: 'ISR', key: 'isr' },
+      { title: 'Assessment Center', key: 'assessmentCenterName_desc' }
     ],
     allowedFilters: {
       session: SESSION_CODE_FILTER,
       assessmentTypeCode: ASSESSMENT_TYPE_CODE_FILTER,
-      proficiencyScoreValue: PROFICIENCY_SCORE_RANGE_FILTER,
-      provincialSpecialCaseCode: SPECIAL_CASE_FILTER,
       transfer: REGISTRATIONS_TRANSFER_FILTER
     }
   });
@@ -149,16 +144,11 @@ export const SCHOOL_YEAR_REGISTRATIONS_VIEW_SCHOOL = Object.freeze(
       { title: 'PEN', key: 'pen' },
       { title: 'Local ID', key: 'localID' },
       { title: 'Surname, Given Name', key: 'name' },
-      { title: 'Assessment Center', key: 'assessmentCenterName_desc' },
-      { title: 'Score', key: 'proficiencyScore' },
-      { title: 'Special Case', key: 'provincialSpecialCaseName_desc' },
-      { title: 'ISR', key: 'isr' },
+      { title: 'Assessment Center', key: 'assessmentCenterName_desc' }
     ],
     allowedFilters: {
       session: SESSION_CODE_FILTER,
       assessmentTypeCode: ASSESSMENT_TYPE_CODE_FILTER,
-      proficiencyScoreValue: PROFICIENCY_SCORE_RANGE_FILTER,
-      provincialSpecialCaseCode: SPECIAL_CASE_FILTER,
       transfer: REGISTRATIONS_TRANSFER_FILTER
     }
   });