Merge pull request #378 from icefoganalytics/test

datajohnson · web-flow · commit 11e51b685510 · 2025-11-24T16:41:32.000-07:00
Standing docs and letters
diff --git a/db/2025_updates.sql b/db/2025_updates.sql
@@ -6,4 +6,11 @@ CREATE TABLE sfa.noc_codes (
     noc_2021_code               NVARCHAR(10) ,
     noc_2021_title              NVARCHAR(255),
     notes                       NVARCHAR(max)   
-);
+);
+
+
+ALTER TABLE sfa.student
+ADD json_data NVARCHAR(MAX);
+
+ALTER TABLE sfa.application
+ADD json_data NVARCHAR(MAX);
diff --git a/src/api/models/request-type.ts b/src/api/models/request-type.ts
@@ -32,6 +32,7 @@ export enum RequestTypes {
   GRANT_FOR_STUDENTS_WITH_PERMANENT_DISABILITIES_PT = 34,
   GRANT_FOR_FULL_TIME_STUDENTS = 35,
   MATURE = 41,
+  STUDENT_TRAINING_ALLOWANCE_OTHER = 46,
 }
 
 interface RequestTypeRecord {
diff --git a/src/api/models/student.ts b/src/api/models/student.ts
@@ -51,6 +51,8 @@ interface StudentRecord {
   kinCountryId?: number;
   kinPostalCode?: string;
 
+  json_data?: any;
+
   // Relations
   dependents?: Dependent[];
   person?: Person;
diff --git a/src/api/routes/admin/student-router.ts b/src/api/routes/admin/student-router.ts
@@ -1,4 +1,4 @@
-import express, { Request, Response } from "express";
+import express, { json, Request, Response } from "express";
 import { body, param } from "express-validator";
 import moment from "moment";
 import knex from "knex";
@@ -55,6 +55,26 @@ studentRouter.post(
   }
 );
 
+studentRouter.patch(
+  "/:id",
+  [param("id").isInt().notEmpty()],
+  ReturnValidationErrors,
+  async (req: Request, res: Response) => {
+    const { id } = req.params;
+    const student = await db("sfa.student").where({ id }).first();
+
+    if (req.body.json_data) req.body.json_data = JSON.stringify(req.body.json_data);
+
+    if (!isNil(student)) {
+      await db("sfa.student")
+        .where({ id })
+        .update({ ...req.body });
+
+      res.json({ messages: [{ variant: "success", text: "Student saved" }] });
+    } else res.status(404).send({ messages: [{ variant: "error", text: "Student not found" }] });
+  }
+);
+
 studentRouter.put(
   "/:student_id",
   [param("student_id").isInt().notEmpty()],
@@ -515,6 +535,7 @@ ${item.address_display}`;
           csl_warn_code: student.csl_warn_code,
           csl_letter_date: student.csl_letter_date,
           pre_over_award_amount: student.pre_over_award_amount,
+          json_data: JSON.parse(student.json_data),
         };
 
         return res.status(200).json({ data });
diff --git a/src/api/serializers/funding-requests/letters/student-training-allowance-alkan-air-approval-template-serializer.ts b/src/api/serializers/funding-requests/letters/student-training-allowance-alkan-air-approval-template-serializer.ts
@@ -138,6 +138,7 @@ export default class StudentTrainingAllowanceAlkanAirApprovalTemplateSerializer
         name: studyArea.description,
         startDate: assessment.classesStartDate,
         endDate: assessment.classesEndDate,
+        effectiveRateDate: assessment.effectiveRateDate,
         institutionName,
         ratePerWeekInCents,
         travelAllowanceInCents,
diff --git a/src/api/serializers/funding-requests/letters/student-training-allowance-yukon-university-approval-template-serializer.ts b/src/api/serializers/funding-requests/letters/student-training-allowance-yukon-university-approval-template-serializer.ts
@@ -138,6 +138,7 @@ export default class StudentTrainingAllowanceYukonUniversityApprovalTemplateSeri
         name: studyArea.description,
         startDate: assessment.classesStartDate,
         endDate: assessment.classesEndDate,
+        effectiveRateDate: assessment.effectiveRateDate,
         institutionName,
         ratePerWeekInCents,
         travelAllowanceInCents,
diff --git a/src/api/services/admin/funding-requests/letters/create-service.ts b/src/api/services/admin/funding-requests/letters/create-service.ts
@@ -67,27 +67,12 @@ export default class CreateService {
         currentUser,
       });
     } else if (requestType === RequestType.Types.STUDENT_TRAINING_ALLOWANCE && requestStatus === Status.Types.AWARDED) {
-      // FUTURE: this could become a separate service
-      const institutionName = this.#getInstitutionName(fundingRequest);
-      if (institutionName === Institution.Names.YUKON_UNIVERSITY) {
-        return this.#generateStudentTrainingAllowanceYukonUniversityApprovalLetter({
-          director,
-          uploader,
-          fundingRequest,
-          currentUser,
-        });
-      } else if (institutionName === Institution.Names.ALKAN_AIR_FLIGHT_TRAINING) {
-        return this.#generateStudentTrainingAllowanceAlkanAirApprovalLetter({
-          director,
-          uploader,
-          fundingRequest,
-          currentUser,
-        });
-      } else {
-        throw new Error(
-          `Could not generate Student Training Allowance letter for institution name: ${institutionName}`
-        );
-      }
+      return this.#generateStudentTrainingAllowanceYukonUniversityApprovalLetter({
+        director,
+        uploader,
+        fundingRequest,
+        currentUser,
+      });
     } else if (
       requestType === RequestType.Types.STUDENT_TRAINING_ALLOWANCE &&
       requestStatus === Status.Types.REJECTED
@@ -98,6 +83,26 @@ export default class CreateService {
         fundingRequest,
         currentUser,
       });
+    } else if (
+      requestType === RequestType.Types.STUDENT_TRAINING_ALLOWANCE_OTHER &&
+      requestStatus === Status.Types.AWARDED
+    ) {
+      return this.#generateStudentTrainingAllowanceAlkanAirApprovalLetter({
+        director,
+        uploader,
+        fundingRequest,
+        currentUser,
+      });
+    } else if (
+      requestType === RequestType.Types.STUDENT_TRAINING_ALLOWANCE_OTHER &&
+      requestStatus === Status.Types.REJECTED
+    ) {
+      return this.#generateStudentTrainingAllowanceRejectionLetter({
+        director,
+        uploader,
+        fundingRequest,
+        currentUser,
+      });
     } else if (
       requestType === RequestType.Types.CANADA_STUDENT_LOAN_FULL_TIME &&
       requestStatus === Status.Types.AWARDED
diff --git a/src/api/templates/admin/application-letter/approval/student-training-allowance-alkan-air.handlebars b/src/api/templates/admin/application-letter/approval/student-training-allowance-alkan-air.handlebars
@@ -27,8 +27,7 @@
   </p>
 
   <p>
-    I am pleased to inform you that your Student Training Allowance (STA) application has been
-    approved as follows:
+    I am pleased to inform you that your Student Training Allowance (STA) application has been approved as follows:
   </p>
 
   <p>
@@ -41,6 +40,13 @@
     </span>
     <span class="flex justify-between">
       <strong>Institution: {{program.institutionName}}</strong>
+      <span>
+        <strong>Effective Rate Date:</strong>
+        <span class="ml-4">{{momentDateFormat program.effectiveRateDate "MMM Do, YYYY"}}</span>
+      </span>
+    </span>
+    <span class="flex justify-between">
+      <strong>&nbsp;</strong>
       <span>
         <strong>End Date:</strong>
         <span class="ml-4">{{momentDateFormat program.endDate "MMM Do, YYYY"}}</span>
@@ -64,29 +70,28 @@
   </p>
 
   <p>
-    This funding covers the study period indicated above, up to a maximum of 40 weeks per academic
-    year. If your application was received more than 14 days after the start of your classes, your
-    start date above will reflect the date that your completed application was received.
+    This funding covers the study period indicated above, up to a maximum of 40 weeks per academic year. If your
+    application was received more than 14 days after the start of your classes, the effective rate date above will
+    reflect the date that your completed application was received.
   </p>
 
   <div>
     <strong>Your responsibilities:</strong>
 
     <ul>
       <li>Ensure the information above regarding your funding is accurate.</li>
-      <li>Before your program begins, provide banking information for direct deposit to Yukon
-        Student Financial Assistance (SFA) by submitting a Direct Deposit Authorization Form
-        including your direct deposit information to
+      <li>Before your program begins, provide banking information for direct deposit to Yukon Student Financial
+        Assistance (SFA) by submitting a Direct Deposit Authorization Form including your direct deposit information to
         <a href="mailto:sfa@yukon.ca">sfa@yukon.ca</a>. You can download the Authorization Form at
         <a
           href="http://yukon.ca/en/direct-deposit-authorziation-form"
         >http://yukon.ca/en/direct-deposit-authorziation-form</a>.</li>
-      <li>If you stop attending classes, drop to part-time, or withdraw from classes, inform our
-        office or Alkan Air to avoid having to pay back any STA.</li>
-      <li>If you are or will be receiving financial assistance from any other source, check with our
-        office to avoid having to pay back any STA.</li>
-      <li>Yukon SFA will send you an email with the process required for confirming your regular
-        attendance at {{program.institutionName}}.
+      <li>If you stop attending classes, drop to part-time, or withdraw from classes, inform our office or Alkan Air to
+        avoid having to pay back any STA.</li>
+      <li>If you are or will be receiving financial assistance from any other source, check with our office to avoid
+        having to pay back any STA.</li>
+      <li>Yukon SFA will send you an email with the process required for confirming your regular attendance at
+        {{program.institutionName}}.
       </li>
     </ul>
   </div>
@@ -106,4 +111,4 @@
     <br />
     Department of Education, Government of Yukon
   </p>
-</div>
+</div>
diff --git a/src/api/templates/admin/application-letter/approval/student-training-allowance-yukon-university.handlebars b/src/api/templates/admin/application-letter/approval/student-training-allowance-yukon-university.handlebars
@@ -27,8 +27,7 @@
   </p>
 
   <p>
-    I am pleased to inform you that your Student Training Allowance (STA) application has been
-    approved as follows:
+    I am pleased to inform you that your Student Training Allowance (STA) application has been approved as follows:
   </p>
 
   <p>
@@ -41,6 +40,13 @@
     </span>
     <span class="flex justify-between">
       <strong>Institution: {{program.institutionName}}</strong>
+      <span>
+        <strong>Effective Rate Date:</strong>
+        <span class="ml-4">{{momentDateFormat program.effectiveRateDate "MMM Do, YYYY"}}</span>
+      </span>
+    </span>
+    <span class="flex justify-between">
+      <strong>&nbsp;</strong>
       <span>
         <strong>End Date:</strong>
         <span class="ml-4">{{momentDateFormat program.endDate "MMM Do, YYYY"}}</span>
@@ -64,29 +70,28 @@
   </p>
 
   <p>
-    This funding covers the study period indicated above, up to a maximum of 40 weeks per academic
-    year. If your application was received more than 14 days after the start of your classes, your
-    start date above will reflect the date that your completed application was received.
+    This funding covers the study period indicated above, up to a maximum of 40 weeks per academic year. If your
+    application was received more than 14 days after the start of your classes, the effective rate date above will
+    reflect the date that your completed application was received.
   </p>
 
   <div>
     <strong>Your responsibilities:</strong>
 
     <ul>
       <li>Ensure the information above regarding your funding is accurate.</li>
-      <li>Before your program begins, provide banking information for direct deposit to Yukon
-        University. The payroll clerk can be reached at
+      <li>Before your program begins, provide banking information for direct deposit to Yukon University. The payroll
+        clerk can be reached at
         <a href="tel:867-668-8717">867-668-8717</a>
         (toll free at
         <a href="1-800-661-0504;8717">1-800-661-0504 extension 8717</a>).</li>
-      <li>If you stop attending classes, drop to part-time, or withdraw from classes, inform our
-        office or the Institution to avoid having to pay back any STA.</li>
-      <li>If you are or will be receiving financial assistance from any other source, check with our
-        office to avoid having to pay back any STA.</li>
+      <li>If you stop attending classes, drop to part-time, or withdraw from classes, inform our office or the
+        Institution to avoid having to pay back any STA.</li>
+      <li>If you are or will be receiving financial assistance from any other source, check with our office to avoid
+        having to pay back any STA.</li>
       <li>You will be required to sign in regularly to receive STA.</li>
-      <li>The Financial Aid Advisor with the Office of the Registrar at Yukon University will send
-        an email to your Yukon University email with the process required for confirming your
-        regular attendance at the University.
+      <li>The Financial Aid Advisor with the Office of the Registrar at Yukon University will send an email to your
+        Yukon University email with the process required for confirming your regular attendance at the University.
       </li>
     </ul>
   </div>
@@ -106,4 +111,4 @@
     <br />
     Department of Education, Government of Yukon
   </p>
-</div>
+</div>
diff --git a/src/web/src/components/DateInput.vue b/src/web/src/components/DateInput.vue
diff --git a/src/web/src/components/student/StandingDocuments.vue b/src/web/src/components/student/StandingDocuments.vue
diff --git a/src/web/src/store/index.js b/src/web/src/store/index.js

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ export enum RequestTypes {`
`32`	`32`	`GRANT_FOR_STUDENTS_WITH_PERMANENT_DISABILITIES_PT = 34,`
`33`	`33`	`GRANT_FOR_FULL_TIME_STUDENTS = 35,`
`34`	`34`	`MATURE = 41,`
	`35`	`+ STUDENT_TRAINING_ALLOWANCE_OTHER = 46,`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`interface RequestTypeRecord {`