Merge branch 'test' of https://github.com/ytgov/sfa-client into test

Author: datajohnson

Dockerfile

@@ -7,6 +7,10 @@ RUN apk add --no-cache \
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
     PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 
+#RUN apk --no-cache add msttcorefonts-installer fontconfig && \
+#  update-ms-fonts && \
+#  fc-cache -f
+
 COPY fonts/*.ttf /usr/share/fonts/
 RUN fc-cache -fv
 

fonts/calibri.ttf

@@ -202,6 +202,94 @@ export default class ReportingController extends BaseController {
     );
   }
 
+  async runNars2023FTReport() {
+    return ReportingService.runNars2023FTReport({ 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_2324.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_2324.001.txt"`);
+        this.response.setHeader("Content-type", "text/plain");
+        this.response.send(reportData);
+      }
+    });
+  }
+
+  async runNars2023PTReport() {
+    return ReportingService.runNars2023PTReport({ 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_2324.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_2324.001.txt"`);
+        this.response.setHeader("Content-type", "text/plain");
+        this.response.send(reportData);
+      }
+    });
+  }
+
+  async runNars2023DisabilityReport() {
+    return ReportingService.runNars2023DisabilityReport({ format: this.format, academic_year_id: 2023 }).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_2324.${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_2324.${moment().format("YYYY-MM-DD")}.txt"`
+          );
+          this.response.setHeader("Content-type", "text/plain");
+          this.response.send(reportData);
+        }
+      }
+    );
+  }
+
+  async runNars2023DisabilityRCLReport() {
+    return ReportingService.runNars2023DisabilityRCLReport({ format: this.format, academic_year_id: 2023 }).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_2324.${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_2324.${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"));
 

fonts/calibrib.ttf

@@ -0,0 +1,22 @@
+import { Knex } from "knex";
+
+exports.up = async function (knex: Knex) {
+  await knex.schema.createTable("sfa.overaward", (t) => {
+    t.increments("id").primary();
+    t.integer("student_id").notNullable().references("id").inTable("sfa.student");
+    t.integer("academic_year_id").references("id").inTable("sfa.academic_year");
+    t.integer("application_id").references("id").inTable("sfa.application");
+    t.integer("funding_request_id").references("id").inTable("sfa.funding_request");
+    t.integer("assessment_id").references("id").inTable("sfa.assessment");
+    t.float("amount").notNullable();
+    t.string("created_by", 150).notNullable();
+    t.specificType("create_date", "DATETIME2(0)").notNullable().defaultTo(knex.fn.now(), {
+      constraintName: "sfa_overaward_create_date_default",
+    });
+    t.text("note");
+  });
+};
+
+exports.down = async function (knex: Knex) {
+  await knex.schema.dropTable("sfa.overaward");
+};

fonts/calibrii.ttf

@@ -4,7 +4,7 @@ export interface DisbursementDTO {
     assessment_id?: number;
     funding_request_id?: number;
     disbursed_amount?: number;
-    due_date?: Date | string;
+    due_date?: Date | string | null;
     tax_year?: number;
     issue_date?: Date | string;
     paid_amount?: number;