diff --git a/backend/src/config/index.js b/backend/src/config/index.js index 3952103a..cfbbe0a8 100644 --- 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 index ac4188c1..5db07af5 100644 --- 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 index 3c417001..23edb5cb 100644 --- a/frontend/src/components/assessments/sessions/SessionEdit.vue +++ b/frontend/src/components/assessments/sessions/SessionEdit.vue @@ -4,17 +4,7 @@ Edit Assessment Session - - - - +