Changes to remove the courseSession + config change.

bcgov · Oct 22, 2024 · 4acf7b0 · 4acf7b0
1 parent c630635
commit 4acf7b0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/backend/src/config/index.js b/backend/src/config/index.js
@@ -151,6 +151,10 @@ nconf.defaults({
       rootURL: process.env.MACRO_API_URL,
       penMacroURL: process.env.MACRO_API_URL + '/pen'
     },
+    eas:{
+      rootURL: process.env.EAS_API_URL,
+      assessmentSessionsURL: process.env.EAS_API_URL+ '/sessions'
+    }
   },
   oidc: {
     publicKey: process.env.SOAM_PUBLIC_KEY,
@@ -215,10 +219,6 @@ nconf.defaults({
     programEligibilityTypeCodesURL: process.env.SDC_API_URL + '/program-eligibility-issue-codes',
     zeroFteReasonCodesURL: process.env.SDC_API_URL + '/zero-fte-reason-codes',
     sdcDuplicateURL: process.env.SDC_API_URL + '/sdc-duplicate'
-  },
-  eas:{
-    rootURL: process.env.EAS_API_URL,
-    assessmentSessionsURL: process.env.EAS_API_URL+ '/sessions'
   }
 });
 module.exports = nconf;
diff --git a/frontend/src/components/assessments/AssessmentSessions.vue b/frontend/src/components/assessments/AssessmentSessions.vue
@@ -99,7 +99,6 @@ export default {
       pageNumber: 1,
       allsessions: [],
       headers: [
-        { title: 'Session ID', key: 'courseSession' },
         { title: 'Month', key: 'courseMonth' },
         { title: 'Year', key: 'courseYear' },
         { title: 'Open Date', key: 'activeFromDate' },
@@ -122,7 +121,7 @@ export default {
             courseMonth: this.formatMonth(session.courseMonth)
           };
         });
-      allsessions.sort((a, b) => a.courseSession - b.courseSession);
+      allsessions.sort((a, b) => new Date(a.activeUntilDate) - new Date(b.activeUntilDate));
       for (let i = 0; i < allsessions.length; i += 2) {
         orderedSessions.push(allsessions.slice(i, i + 2));
       }

diff --git a/frontend/src/components/assessments/sessions/SessionEdit.vue b/frontend/src/components/assessments/sessions/SessionEdit.vue
@@ -4,17 +4,7 @@
       Edit Assessment Session
     </v-card-title>
     <v-divider />
-    <v-card-text>
-        <v-row class="pt-3 px-8">
-          <v-text-field
-            id="sessionId"
-            v-model="session.courseSession"
-            label="Session Id"
-            variant="underlined"
-            disabled
-            hide-details="auto"
-          />
-        </v-row>      
+    <v-card-text>              
         <v-form ref="editSessionForm" v-model="isFormValid">  
         <v-row class="pt-5 px-8">
           <DatePicker