Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EAC-25 #2087

Merged
merged 1 commit into from
Oct 22, 2024
+6 −17
Merged

EAC-25 #2087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions backend/src/config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
3 changes: 1 addition & 2 deletions frontend/src/components/assessments/AssessmentSessions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
Expand All @@ -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));
}
Expand Down
12 changes: 1 addition & 11 deletions frontend/src/components/assessments/sessions/SessionEdit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading