Merge pull request #374 from icefoganalytics/test

WUP and NARS

Author: datajohnson

db/2025_updates.sql

@@ -0,0 +1,9 @@
+
+CREATE TABLE sfa.noc_codes (
+    noc_2016_code               NVARCHAR(10),
+    noc_2016_title              NVARCHAR(255),
+    gsim_type_of_change         NVARCHAR(255),
+    noc_2021_code               NVARCHAR(10) ,
+    noc_2021_title              NVARCHAR(255),
+    notes                       NVARCHAR(max)   
+);

src/api/controllers/admin/reporting-controller.ts

@@ -290,6 +290,94 @@ export default class ReportingController extends BaseController {
     );
   }
 
+  async runNars2024FTReport() {
+    return ReportingService.runNars2024FTReport({ format: this.format }).then((reportData) => {
+      if (this.format == "html") {
+        this.response.send(reportData);
+      } else if (this.format == "csv") {
+        this.response.setHeader("Content-disposition", `attachment; filename="PPYT.CSLS.NARS_2425.001.csv"`);
+        this.response.setHeader("Content-type", "text/csv");
+        this.response.send(reportData);
+      } else if (this.format == "json") {
+        this.response.json(reportData);
+      } else {
+        this.response.setHeader("Content-disposition", `attachment; filename="PPYT.CSLS.NARS_2425.001.txt"`);
+        this.response.setHeader("Content-type", "text/plain");
+        this.response.send(reportData);
+      }
+    });
+  }
+
+  async runNars2024PTReport() {
+    return ReportingService.runNars2024PTReport({ format: this.format }).then((reportData) => {
+      if (this.format == "html") {
+        this.response.send(reportData);
+      } else if (this.format == "csv") {
+        this.response.setHeader("Content-disposition", `attachment; filename="PPYT.CSLS.PT_NARS_2425.001.csv"`);
+        this.response.setHeader("Content-type", "text/csv");
+        this.response.send(reportData);
+      } else if (this.format == "json") {
+        this.response.json(reportData);
+      } else {
+        this.response.setHeader("Content-disposition", `attachment; filename="PPYT.CSLS.PT_NARS_2425.001.txt"`);
+        this.response.setHeader("Content-type", "text/plain");
+        this.response.send(reportData);
+      }
+    });
+  }
+
+  async runNars2024DisabilityReport() {
+    return ReportingService.runNars2024DisabilityReport({ format: this.format, academic_year_id: 2024 }).then(
+      (reportData) => {
+        if (this.format == "html") {
+          this.response.send(reportData);
+        } else if (this.format == "csv") {
+          this.response.setHeader(
+            "Content-disposition",
+            `attachment; filename="PPYT.CSLS.PDEXPAND_2425.${moment().format("YYYY-MM-DD")}.csv"`
+          );
+          this.response.setHeader("Content-type", "text/csv");
+          this.response.send(reportData);
+        } else if (this.format == "json") {
+          this.response.json(reportData);
+        } else {
+          this.response.setHeader(
+            "Content-disposition",
+            `attachment; filename="PPYT.CSLS.PDEXPAND_2425.${moment().format("YYYY-MM-DD")}.txt"`
+          );
+          this.response.setHeader("Content-type", "text/plain");
+          this.response.send(reportData);
+        }
+      }
+    );
+  }
+
+  async runNars2024DisabilityRCLReport() {
+    return ReportingService.runNars2024DisabilityRCLReport({ format: this.format, academic_year_id: 2024 }).then(
+      (reportData) => {
+        if (this.format == "html") {
+          this.response.send(reportData);
+        } else if (this.format == "csv") {
+          this.response.setHeader(
+            "Content-disposition",
+            `attachment; filename="PPYT.CSLS.PDReducedCourseLoad_2425.${moment().format("YYYY-MM-DD")}.csv"`
+          );
+          this.response.setHeader("Content-type", "text/csv");
+          this.response.send(reportData);
+        } else if (this.format == "json") {
+          this.response.json(reportData);
+        } else {
+          this.response.setHeader(
+            "Content-disposition",
+            `attachment; filename="PPYT.CSLS.PDReducedCourseLoad_2425.${moment().format("YYYY-MM-DD")}.txt"`
+          );
+          this.response.setHeader("Content-type", "text/plain");
+          this.response.send(reportData);
+        }
+      }
+    );
+  }
+
   async runStepReport() {
     let academic_year_id = parseInt(this.request.params.academic_year_id ?? moment().format("YYYY"));
 

src/api/routes/admin/assessment/assessment-yukon-grant-router.ts

@@ -4,6 +4,7 @@ import knex from "knex";
 import { ReturnValidationErrors } from "@/middleware";
 import { DB_CONFIG } from "@/config";
 import { AssessmentService } from "@/services/admin/assessments/assessment-service";
+import { writeAuditLog } from "@/services/audit-service";
 
 const db = knex(DB_CONFIG);
 export const assessmentYukonGrantRouter = express.Router();
@@ -57,7 +58,16 @@ assessmentYukonGrantRouter.post(
       delete updatedItem.extras;
       delete updatedItem.id;
 
-      const updated = await db("sfa.assessment").insert(updatedItem);
+      const updated = await db("sfa.assessment").insert(updatedItem).returning("id");
+
+      await writeAuditLog({
+        application_id: fundingRequest.application_id,
+        funding_request_id: fundingRequest.id,
+        assessment_id: updated[0].id,
+        user_id: req.user.id,
+        user_name: req.user.display_name.replace(".", " "),
+        title: `Assessment Created`,
+      });
 
       if (updated) {
         return res.status(200).json({ messages: [{ variant: "success", text: "Assessment saved" }] });
@@ -102,15 +112,23 @@ assessmentYukonGrantRouter.patch(
         await builder.load(true);
 
         const updatedItem = builder.assessment;
-        
+
         if (doDisburse) {
           const travel = updatedItem.travel_allowance + updatedItem.airfare_amount;
           let netAmount = updatedItem.extras.netAmount - travel;
           let transDisburseNum = updatedItem.air_travel_disbursement_period;
+
+          // this only applies when disburseCount > 1
+          // for first disbursement, 16 weeks
+          // optional for second disbursement, up to 20 weeks
+          // last disbursement, remainder
+          // transDisburseNum works to put travel in right spot
+
           const disburseCount = updatedItem.disbursements_required;
 
           if (transDisburseNum > disburseCount) transDisburseNum = disburseCount;
 
+          // this is the problem line
           let disburseAmount = Math.ceil(netAmount / disburseCount);
           let disburseRemaining = netAmount;
 

src/api/routes/admin/csg-threshold-router.ts

@@ -162,12 +162,6 @@ csgThresholdRouter.put(
 
       delete (recalc as any).id;
       delete (recalc as any).assessment_type_id;
-      (recalc as any).student_contribution_override = null;
-      (recalc as any).spouse_contribution_override = null;
-      (recalc as any).parent_contribution_override = null;
-      (recalc as any).return_uncashable_cert = null;
-      (recalc as any).csl_non_reason_id = null;
-      (recalc as any).csl_over_reason_id = null;
 
       await db("sfa.assessment").where({ id: assessment_id }).update(recalc);
       return res.status(200).json({ data: "Assessment Saved" });

src/api/routes/admin/index.ts

@@ -198,6 +198,11 @@ adminRouter.use("/reporting/nars2023pt", routedTo(ReportingController, "runNars2
 adminRouter.use("/reporting/nars2023dis", routedTo(ReportingController, "runNars2023DisabilityReport"));
 adminRouter.use("/reporting/nars2023disrcl", routedTo(ReportingController, "runNars2023DisabilityRCLReport"));
 
+adminRouter.use("/reporting/nars2024", routedTo(ReportingController, "runNars2023FTReport"));
+adminRouter.use("/reporting/nars2024pt", routedTo(ReportingController, "runNars2024PTReport"));
+adminRouter.use("/reporting/nars2024dis", routedTo(ReportingController, "runNars2024DisabilityReport"));
+adminRouter.use("/reporting/nars2024disrcl", routedTo(ReportingController, "runNars2024DisabilityRCLReport"));
+
 adminRouter.use("/reporting/step/:academic_year_id", routedTo(ReportingController, "runStepReport"));
 adminRouter.use(
   "/reporting/approvedFunding/:academic_year_id",

src/api/routes/reference-router.ts

@@ -1,28 +1,69 @@
 import express, { Request, Response } from "express";
 import knex from "knex";
+import { parse } from "papaparse";
 
 import { DB_CONFIG } from "../config";
+import { isArray } from "lodash";
 
 const db = knex(DB_CONFIG);
 
 export const referenceRouter = express.Router();
 
 referenceRouter.get("/city", async (req: Request, res: Response) => {
-    let list = await db("sfa.city").orderBy("description");
-    res.json({ data: list })
+  let list = await db("sfa.city").orderBy("description");
+  res.json({ data: list });
 });
 
 referenceRouter.get("/province", async (req: Request, res: Response) => {
-    let list = await db("sfa.province").orderBy("description");
-    res.json({ data: list })
+  let list = await db("sfa.province").orderBy("description");
+  res.json({ data: list });
 });
 
 referenceRouter.get("/country", async (req: Request, res: Response) => {
-    let list = await db("sfa.country").orderBy("description");
-    res.json({ data: list })
+  let list = await db("sfa.country").orderBy("description");
+  res.json({ data: list });
 });
 
 referenceRouter.get("/institution_level", async (req: Request, res: Response) => {
-    let levels = await db("sfa.institution_level");
-    res.json({ data: levels })
+  let levels = await db("sfa.institution_level");
+  res.json({ data: levels });
+});
+
+referenceRouter.get("/noc_codes", async (req: Request, res: Response) => {
+  let codes = await db("sfa.noc_codes").select("noc_2021_code", "noc_2021_title");
+  res.json({ data: codes });
+});
+
+referenceRouter.post("/noc_codes", async (req: Request, res: Response) => {
+  if (!req.files || !req.files.file) return res.status(400).json({ message: "No file provided" });
+
+  const file = isArray(req.files.file) ? req.files.file[0] : req.files.file; // Expecting an array of NOC code objects
+  const contents = file.data.toString("utf-8");
+  const csv = parse<{
+    noc2016v13code: string;
+    noc2016v13title: string;
+    gsimtypeofchange: string;
+    noc2021v10code: string;
+    noc2021v10title: string;
+    notes: string;
+  }>(contents, {
+    header: true,
+    skipEmptyLines: true,
+    transformHeader: (header) => header.toLowerCase().replace(/\s/g, "").replace(".", "").trim(), // remove spaces and dots
+  });
+
+  await db("sfa.noc_codes").delete();
+
+  for (const line of csv.data) {
+    await db("sfa.noc_codes").insert({
+      noc_2016_code: line.noc2016v13code,
+      noc_2016_title: line.noc2016v13title,
+      gsim_type_of_change: line.gsimtypeofchange,
+      noc_2021_code: line.noc2021v10code,
+      noc_2021_title: line.noc2021v10title,
+      notes: line.notes,
+    });
+  }
+
+  res.json({ message: "NOC codes updated successfully" });
 });

src/api/services/admin/assessments/yukon-grant-service.ts

@@ -58,8 +58,9 @@ export class YukonGrantService {
 
       if (!institutionCampus) throw new Error("Institution Campus not found");
 
-      this.parent.assessment.home_city_id = homeAddress.city_id;
-      this.parent.assessment.destination_city_id = institutionCampus.address_city_id;
+      this.parent.assessment.home_city_id = this.parent.assessment.home_city_id ?? homeAddress.city_id;
+      this.parent.assessment.destination_city_id =
+        this.parent.assessment.destination_city_id ?? institutionCampus.address_city_id;
 
       if (!this.parent.assessment.home_city_id) throw new Error("Home City not found for Student Address");
 

src/api/services/admin/reporting-service.ts

@@ -304,6 +304,102 @@ export default class ReportingService {
     return lines.join("\n");
   }
 
+  static async runNars2024FTReport({ format = "json" }: { format: string | undefined }): Promise<any> {
+    let service = new NarsV17_2ReportingService({
+      startDate: new Date("2024-06-01"),
+      endDate: new Date("2025-05-31"),
+      year: 2024,
+    });
+
+    let results = await service.runReport();
+
+    if (format == "json") {
+      return results.map((r) => r.toJson());
+    } else if (format == "csv") {
+      let lines = results.map((r) => r.toCsv());
+      lines.unshift(results[0].columns.map((c) => c.field).join(","));
+      return lines.join("\n");
+    }
+
+    let lines = results.map((r) => r.toString());
+    return lines.join("\n");
+  }
+
+  static async runNars2024PTReport({ format = "json" }: { format: string | undefined }): Promise<any> {
+    let service = new NarsPTReportingService({
+      startDate: new Date("2024-06-01"),
+      endDate: new Date("2025-05-31"),
+      year: 2024,
+    });
+
+    let results = await service.runReport();
+
+    if (format == "json") {
+      return results.map((r) => r.toJson());
+    } else if (format == "csv") {
+      let lines = results.map((r) => r.toCsv());
+      lines.unshift(results[0].columns.map((c) => c.field).join(","));
+      return lines.join("\n");
+    }
+
+    let lines = results.map((r) => r.toString());
+    return lines.join("\n");
+  }
+
+  static async runNars2024DisabilityReport({
+    format = "json",
+    academic_year_id,
+  }: {
+    format: string | undefined;
+    academic_year_id: number;
+  }): Promise<any> {
+    let service = new NarsDisabilityReportingService({
+      startDate: new Date("2024-06-01"),
+      endDate: new Date("2025-05-31"),
+      year: academic_year_id,
+    });
+
+    let results = await service.runReport();
+
+    if (format == "json") {
+      return results.map((r) => r.toJson());
+    } else if (format == "csv") {
+      let lines = results.map((r) => r.toCsv());
+      lines.unshift(results[0].columns.map((c) => c.field).join(","));
+      return lines.join("\n");
+    }
+
+    let lines = results.map((r) => r.toString());
+    return lines.join("\n");
+  }
+
+  static async runNars2024DisabilityRCLReport({
+    format = "json",
+    academic_year_id,
+  }: {
+    format: string | undefined;
+    academic_year_id: number;
+  }): Promise<any> {
+    let service = new NarsDisabilityRCLReportingService({
+      startDate: new Date("2024-06-01"),
+      endDate: new Date("2025-05-31"),
+      year: academic_year_id,
+    });
+
+    let results = await service.runReport();
+
+    if (format == "json") {
+      return results.map((r) => r.toJson());
+    } else if (format == "csv") {
+      let lines = results.map((r) => r.toCsv());
+      lines.unshift(results[0].columns.map((c) => c.field).join(","));
+      return lines.join("\n");
+    }
+
+    let lines = results.map((r) => r.toString());
+    return lines.join("\n");
+  }
+
   static async runStepReport({
     academic_year_id,
     format = "json",

src/web/src/components/adminHome/SubRoutesSideBar.js

@@ -47,6 +47,7 @@ export default {
         {title:"Funding Group", path: "/administration/funding-group"},
         {title:"Status", path: "/administration/status"},
         {title:"Status Reason", path: "/administration/status-reason"},
+        {title:"NOC Codes", path: "/administration/noc-code"},
     ],
     ecerts_reports:[
         {title:"CSL MSFAA Receive", path: "/administration/csl-msfaa-receive"},

src/web/src/components/application/assessments/views/YukonGrant.vue

@@ -568,7 +568,7 @@
                 :fundingRequestId="assessment?.funding_request_id"
                 :disbursementTypeId="1"
                 @disbursementChanged="disbursementChanged"
-                :showCert="false"
+                :showCert="true"
                 :showBatch="true"
               />
             </v-card-text>