Skip to content

Commit bfcf3c4

Browse files
committed
Making STA Other create/remove
1 parent 09ed7b1 commit bfcf3c4

File tree

2 files changed

+30
-9
lines changed

2 files changed

+30
-9
lines changed

src/api/routes/admin/application-router.ts

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -537,13 +537,18 @@ applicationRouter.post(
537537
const checkIsActive = await db("sfa.request_type").where("id", request_type_id).first();
538538

539539
if (checkIsActive?.is_active) {
540-
if (newRecord.request_type_id === 1) {
541-
const isSTACandidate = await db("sfa.institution_campus")
542-
.where({ id: application.institution_campus_id })
543-
.whereIn("institution_id", [30, 811, 852]) // Alkan, Yukon College, Yukon University
540+
if (newRecord.request_type_id === 1 || newRecord.request_type_id === 46) {
541+
const institution = await db("sfa.institution_campus")
542+
.innerJoin("sfa.institution", "institution.id", "institution_campus.institution_id")
543+
.where({ "institution_campus.id": application.institution_campus_id })
544+
.select("institution.*")
544545
.first();
545546

546-
if (!isSTACandidate?.id) {
547+
// Yukon U and Alkan or Elements
548+
const isSTACandidate =
549+
[30, 811, 852].includes(institution?.id) || institution?.name === "Elements Esthetics Academy";
550+
551+
if (!isSTACandidate) {
547552
return res.json({
548553
messages: [{ variant: "error", text: "Only available for Yukon University or Alkan Air" }],
549554
});
@@ -567,6 +572,7 @@ applicationRouter.post(
567572

568573
return res.json({ messages: [{ text: "Application does not exist", variant: "error" }] });
569574
} catch (error) {
575+
console.log(error);
570576
return res.json({ messages: [{ text: "Failed to insert Funding Request", variant: "error" }] });
571577
}
572578
}

src/web/src/components/application/sfa-funding-requests/student-training-allowance/StudentTrainingAllowance.vue

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,28 @@ export default {
215215
return store.getters.selectedApplication;
216216
},
217217
STARequest: function() {
218-
const request = this.application?.funding_requests?.find((fr) => fr.request_type_id === 1);
218+
const request = this.application?.funding_requests?.find(
219+
(fr) => fr.request_type_id === 1 || fr.request_type_id === 46
220+
);
219221
220222
this.checkSTARequest = !!request;
221223
222224
return request || {};
223225
},
226+
227+
staEligibleInstitutions: function() {
228+
const baseCampusIds = [4664, 5326, 3488, 5648]; // YukonU and Alkan campuses
229+
230+
if (
231+
this.application &&
232+
this.application.main_institution &&
233+
this.application.main_institution.name.startsWith("Elements Esthetics Academy")
234+
) {
235+
baseCampusIds.push(this.application.institution_campus_id);
236+
}
237+
238+
return baseCampusIds;
239+
},
224240
},
225241
data: () => ({
226242
itemOptions: [
@@ -229,7 +245,6 @@ export default {
229245
],
230246
otherFunding: true,
231247
checkSTARequest: false,
232-
staEligibleInstitutions: [4664, 5326, 3488, 5648],
233248
}),
234249
async created() {
235250
store.dispatch("setCslClassifications");
@@ -282,8 +297,8 @@ export default {
282297
283298
try {
284299
// if alkan campus, then request_type_id = 46
285-
let request_type_id = 1;
286-
if (this.application.institution_campus_id == 4664) request_type_id = 46;
300+
let request_type_id = 46;
301+
if ([5326, 3488, 5648].includes(this.application.institution_campus_id)) request_type_id = 1;
287302
288303
const resInsert = await axios.post(APPLICATION_URL + `/${this.application.id}/status`, {
289304
status_id: 3,

0 commit comments

Comments
 (0)