Merge pull request #395 from icefoganalytics/test

More WUP Updates

Author: datajohnson

db/2025_updates.sql

@@ -72,7 +72,10 @@ ALTER TABLE sfa.status ADD funding_application_type_id INT NULL REFERENCES sfa.f
 INSERT INTO sfa.status (funding_application_type_id, description, online_description, is_active, sort_order) 
 VALUES(2, 'Approved', 'Approved', 1, 1),
       (2, 'Completed', 'Completed', 1, 2),
-      (2, 'Incomplete', 'Incomplete', 1, 3)
+      (2, 'Incomplete', 'Incomplete', 1, 3),
+      (2, 'Cancelled', 'Cancelled', 1, 4),
+      (2, 'Qualified', 'Qualified', 1, 5),
+      (2, 'Wait', 'Wait', 1, 6),
 
 
 ALTER TABLE sfa.status_reason ADD funding_application_type_id INT NULL REFERENCES sfa.funding_application_type(id)
@@ -227,3 +230,19 @@ WHERE NOT s.vendor_id IS NULL
 
 INSERT INTO sfa.disbursement_type (description, is_active) VALUES ('Cheque - LMDA', 1), ('Cheque - WDA', 1)
 
+
+
+CREATE TABLE sfa.registered_trade (
+    id INT IDENTITY(1,1) PRIMARY KEY,
+    name NVARCHAR(200) NOT NULL,
+    is_active BIT NOT NULL DEFAULT 1
+)
+
+
+INSERT INTO sfa.status (funding_application_type_id, description, online_description, is_active, sort_order) 
+VALUES (2, 'Cancelled', 'Cancelled', 1, 4),
+      (2, 'Qualified', 'Qualified', 1, 5),
+      (2, 'Wait', 'Wait', 1, 6)
+
+INSERT INTO sfa.registered_trade (name) VALUES 
+('Electrical'), ('Plumbing')

src/api/routes/admin/index.ts

@@ -88,6 +88,7 @@ import { parentContributionFormulaRouter } from "./parent-contribution-formula-r
 import { transportationRouter } from "./transportation-router";
 
 import fundingApplicationRoutes from "./funding-application";
+import { registeredTradeRouter } from "./registered-trade-router";
 
 export const adminRouter = express.Router();
 //adminRouter.use("/", RequireServerAuth, RequireAdmin)
@@ -101,22 +102,22 @@ adminRouter.use("/funding-application", fundingApplicationRoutes);
 adminRouter.use("/funding-requests", pathFormatMiddleware);
 adminRouter.get(
   "/funding-requests/:fundingRequestId/letters/:letterSlug",
-  routedTo(FundingRequestsLettersController, "getLetter")
+  routedTo(FundingRequestsLettersController, "getLetter"),
 );
 adminRouter.get(
   "/funding-requests/:fundingRequestId/letters",
-  routedTo(FundingRequestsLettersController, "listLetters")
+  routedTo(FundingRequestsLettersController, "listLetters"),
 );
 adminRouter.post(
   "/funding-requests/:fundingRequestId/letters",
-  routedTo(FundingRequestsLettersController, "createLetters")
+  routedTo(FundingRequestsLettersController, "createLetters"),
 );
 
 adminRouter.use("/funding-requests", fundingRequestRouter);
 
 adminRouter.get(
   "/funding-request-letters",
-  routedTo(FundingRequestLettersController, "listLetters")
+  routedTo(FundingRequestLettersController, "listLetters"),
 );
 adminRouter.use("/assessment", assessmentRouter);
 adminRouter.use("/student", studentRouter);
@@ -132,6 +133,7 @@ adminRouter.use("/parental-relationship", parentalRelationshipRouter);
 adminRouter.use("/first-nation", firstNationRouter);
 adminRouter.use("/portal-status", portalStatusRouter);
 adminRouter.use("/sex", sexRouter);
+adminRouter.use("/registered-trade", registeredTradeRouter);
 adminRouter.use("/student-category", studentCategoryRouter);
 adminRouter.use("/institution-level", institutionLevelRouter);
 adminRouter.use("/age-distribution", ageDistributionRouter);
@@ -181,7 +183,7 @@ adminRouter.use("/csl-msfaa-receive", cslMsfaaReceiveRouter);
 adminRouter.use("/csl-entitlement-feedback", cslEntitlementFeedbackRouter);
 adminRouter.use(
   "/csl-certificate-audit-report",
-  cslCertificateAuditReportRouter
+  cslCertificateAuditReportRouter,
 );
 adminRouter.use("/csl-msfaa-send", cslMsfaaSendRouter);
 adminRouter.use("/csl-restricted-data", cslRestrictedData);
@@ -192,7 +194,7 @@ adminRouter.use("/standard-of-living", standardOfLivingRouter);
 adminRouter.use("/child-care-ceiling", childCareCeilingRouter);
 adminRouter.use(
   "/parent-contribution-formula",
-  parentContributionFormulaRouter
+  parentContributionFormulaRouter,
 );
 adminRouter.use("/transportation", transportationRouter);
 
@@ -201,86 +203,86 @@ adminRouter.use("/overaward", overawardRouter);
 adminRouter.use("/reporting", pathFormatMiddleware);
 adminRouter.use(
   "/reporting/fundingStatus/:years",
-  routedTo(ReportingController, "runFundingStatusReport")
+  routedTo(ReportingController, "runFundingStatusReport"),
 );
 adminRouter.use(
   "/reporting/staYukonUniversity/:academic_year_id",
-  routedTo(ReportingController, "runSTAYukonUniversityReport")
+  routedTo(ReportingController, "runSTAYukonUniversityReport"),
 );
 adminRouter.use(
   "/reporting/scholarshipQualified/:academic_year_id",
-  routedTo(ReportingController, "runScholarshipReport")
+  routedTo(ReportingController, "runScholarshipReport"),
 );
 adminRouter.use(
   "/reporting/nars2022",
-  routedTo(ReportingController, "runNars2022FTReport")
+  routedTo(ReportingController, "runNars2022FTReport"),
 );
 adminRouter.use(
   "/reporting/nars2022pt",
-  routedTo(ReportingController, "runNars2022PTReport")
+  routedTo(ReportingController, "runNars2022PTReport"),
 );
 adminRouter.use(
   "/reporting/nars2022dis/:academic_year_id",
-  routedTo(ReportingController, "runNars2022DisabilityReport")
+  routedTo(ReportingController, "runNars2022DisabilityReport"),
 );
 adminRouter.use(
   "/reporting/nars2022disrcl/:academic_year_id",
-  routedTo(ReportingController, "runNars2022DisabilityRCLReport")
+  routedTo(ReportingController, "runNars2022DisabilityRCLReport"),
 );
 
 adminRouter.use(
   "/reporting/nars2023",
-  routedTo(ReportingController, "runNars2023FTReport")
+  routedTo(ReportingController, "runNars2023FTReport"),
 );
 adminRouter.use(
   "/reporting/nars2023pt",
-  routedTo(ReportingController, "runNars2023PTReport")
+  routedTo(ReportingController, "runNars2023PTReport"),
 );
 adminRouter.use(
   "/reporting/nars2023dis",
-  routedTo(ReportingController, "runNars2023DisabilityReport")
+  routedTo(ReportingController, "runNars2023DisabilityReport"),
 );
 adminRouter.use(
   "/reporting/nars2023disrcl",
-  routedTo(ReportingController, "runNars2023DisabilityRCLReport")
+  routedTo(ReportingController, "runNars2023DisabilityRCLReport"),
 );
 
 adminRouter.use(
   "/reporting/nars2024",
-  routedTo(ReportingController, "runNars2024FTReport")
+  routedTo(ReportingController, "runNars2024FTReport"),
 );
 adminRouter.use(
   "/reporting/nars2024pt",
-  routedTo(ReportingController, "runNars2024PTReport")
+  routedTo(ReportingController, "runNars2024PTReport"),
 );
 adminRouter.use(
   "/reporting/nars2024dis",
-  routedTo(ReportingController, "runNars2024DisabilityReport")
+  routedTo(ReportingController, "runNars2024DisabilityReport"),
 );
 adminRouter.use(
   "/reporting/nars2024disrcl",
-  routedTo(ReportingController, "runNars2024DisabilityRCLReport")
+  routedTo(ReportingController, "runNars2024DisabilityRCLReport"),
 );
 
 adminRouter.use(
   "/reporting/step/:academic_year_id",
-  routedTo(ReportingController, "runStepReport")
+  routedTo(ReportingController, "runStepReport"),
 );
 adminRouter.use(
   "/reporting/approvedFunding/:academic_year_id",
-  routedTo(ReportingController, "runApprovedFundingReport")
+  routedTo(ReportingController, "runApprovedFundingReport"),
 );
 adminRouter.use(
   "/reporting/t4a/:tax_year",
-  routedTo(ReportingController, "runT4AReport")
+  routedTo(ReportingController, "runT4AReport"),
 );
 adminRouter.use(
   "/reporting/vendor-update",
-  routedTo(ReportingController, "runVendorUpdateReport")
+  routedTo(ReportingController, "runVendorUpdateReport"),
 );
 adminRouter.use(
   "/reporting/wup-report/:academic_year_id",
-  routedTo(ReportingController, "runWUPReport")
+  routedTo(ReportingController, "runWUPReport"),
 );
 
 adminRouter.use("/csg-threshold", csgThresholdRouter);

src/api/routes/admin/registered-trade-router.ts

@@ -0,0 +1,58 @@
+import express, { Request, Response } from "express";
+import knex from "knex";
+import { DB_CONFIG } from "@/config";
+
+const db = knex(DB_CONFIG);
+
+export const registeredTradeRouter = express.Router();
+
+registeredTradeRouter.get("/", async (req: Request, res: Response) => {
+  const { activeOnly = false } = req.query;
+  let results = await db("sfa.registered_trade").orderBy("name");
+
+  if (activeOnly === "true")
+    return res.json({ data: results.filter((c) => c.is_active) });
+
+  res.json({ data: results });
+});
+
+registeredTradeRouter.post("/", async (req: Request, res: Response) => {
+  const { name, is_active } = req.body;
+
+  const verify = await db("sfa.registered_trade")
+    .select("name")
+    .where({ name: name });
+
+  if (verify?.length)
+    return res.status(400).send({
+      success: false,
+      message: `"${name}" already exists`,
+    });
+
+  await db("sfa.registered_trade").insert({ name, is_active });
+  return res.status(201).json({ success: true });
+});
+
+registeredTradeRouter.patch("/:id", async (req: Request, res: Response) => {
+  const { id } = req.params;
+  const { name, is_active } = req.body;
+
+  if (name) {
+    const verify = await db("sfa.registered_trade").where({ name });
+
+    if (verify?.length)
+      return res.status(400).send({
+        success: false,
+        message: `"${name}" already exists`,
+      });
+  }
+
+  await db("sfa.registered_trade").where({ id }).update(req.body);
+  return res.status(201).json({ success: true });
+});
+
+registeredTradeRouter.delete("/:id", async (req: Request, res: Response) => {
+  const { id = null } = req.params;
+  await db("sfa.registered_trade").where({ id: id }).delete();
+  return res.status(201).json({ success: true });
+});

src/web/src/components/SelectedAppHeader.vue

@@ -48,9 +48,13 @@ export default {
     },
   },
   methods: {
-    ...mapActions(["saveApplicationFlags"]),
+    ...mapActions(["saveApplicationFlags", "saveFundingApplicationFlags"]),
     saveFlags() {
-      this.saveApplicationFlags(this.flags);
+
+      if (this.$route.path.includes("funding-application"))
+        this.saveFundingApplicationFlags(this.flags);
+      else
+        this.saveApplicationFlags(this.flags);
     },
   },
 };

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

@@ -36,6 +36,7 @@ export default {
     },
     { title: "Institution Search", path: "/administration/institution-search" },
     { title: "Institution Level", path: "/administration/institution-level" },
+    { title: "Registered Trades", path: "/administration/registered-trade" },
   ],
   application: [
     { title: "Study Area", path: "/administration/study-area" },

src/web/src/components/application/assessments/views/WUP-Apprenticeship.vue

@@ -210,15 +210,11 @@ export default {
     this.applicationId = this.$route.params.id;
     this.fundingRequestId = this.$route.params.fundingRequestId;
     this.assessmentId = this.$route.params.assessmentId;
-    store.dispatch("setAppSidebar", true);
 
     let storeApp = store.getters.selectedApplication;
     if (this.applicationId != storeApp.HISTORY_DETAIL_ID) {
       await store.dispatch("loadFundingApplication", this.applicationId);
     }
-    store.dispatch("setAppSidebar", true);
-
-
     this.loadStatus()
     this.loadReasons()
 

src/web/src/components/application/wup-funding-requests/apprenticeship-training-support/ApprenticeshipTrainingForm.vue

@@ -61,8 +61,9 @@
 
           <v-row>
             <v-col cols="12" md="6">
-              <v-select v-model="fundingRequest.json_data.registered_trade" :items="['In-class', 'Online']"
-                label="Registered trade" dense outlined background-color="white" hide-details @change="saveItem" />
+              <v-select v-model="fundingRequest.json_data.registered_trade" :items="registeredTrades" item-text="name"
+                item-value="name" label="Registered trade" dense outlined background-color="white" hide-details
+                @change="saveItem" />
 
             </v-col>
             <v-col cols="12" md="6" class="d-flex">
@@ -143,11 +144,11 @@
             class="mt-0 mb-5" hide-details @change="saveItem" />
           <v-row class="mb-1">
             <v-col cols="12" md="3">
-              <v-text-field :value="formatDate(fundingRequest.json_data.from_date)" label="From" dense outlined
+              <v-text-field :value="formatDate(fundingRequest.json_data.classes_start_date)" label="From" dense outlined
                 background-color="#ddd" append-icon="mdi-lock" hide-details readonly />
             </v-col>
             <v-col cols="12" md="3">
-              <v-text-field :value="formatDate(fundingRequest.json_data.to_date)" label="To" dense outlined
+              <v-text-field :value="formatDate(fundingRequest.json_data.classes_end_date)" label="To" dense outlined
                 background-color="#ddd" append-icon="mdi-lock" hide-details readonly />
             </v-col>
             <v-col cols="12" md="3">
@@ -275,7 +276,7 @@ import { mapGetters } from "vuex";
 import store from "@/store";
 import axios from "axios";
 import moment from "moment";
-import { FUNDING_APPLICATION_URL, INSTITUTION_URL } from "@/urls";
+import { FUNDING_APPLICATION_URL, INSTITUTION_URL, REGISTERED_TRADE_URL } from "@/urls";
 import { weeksBetween } from "@/components/application/assessments/store/utils";
 
 export default {
@@ -291,6 +292,7 @@ export default {
       hasFundingRequest: false,
       travelOptions: ["Flying", "Driving personal vehicle"],
       otherExpenseOptions: ["Living Allowance", "Program Material", "Disability Support", "Tutoring"],
+      registeredTrades: [],
 
       dateMenu1: false,
       dateMenu2: false,
@@ -314,15 +316,6 @@ export default {
     fundingRequest() {
       const myRequest = this.application?.funding_requests?.find((fr) => fr.request_type_id === 51);
 
-      if (myRequest && myRequest.json_data != null) {
-        myRequest.json_data.from_date = this.application.classes_start_date;
-        myRequest.json_data.to_date = this.application.classes_end_date;
-        myRequest.json_data.weeks = weeksBetween(
-          this.application.classes_start_date,
-          this.application.classes_end_date
-        );
-      }
-
       this.hasFundingRequest = !!myRequest;
       return myRequest;
     },
@@ -332,15 +325,18 @@ export default {
     },
   },
   watch: {
-    /*  "fundingRequest.json_data": {
+    "fundingRequest.json_data": {
       deep: true,
       handler(newVal) {
-        console.log("Funding request JSON data changed:", newVal);
+        if (newVal && newVal.classes_start_date && newVal.classes_end_date) {
+          newVal.weeks = weeksBetween(newVal.classes_start_date, newVal.classes_end_date);
+        }
       },
-    }, */
+    },
   },
   async mounted() {
     await this.loadInstitutions();
+    await this.loadRegisteredTrades();
     store.dispatch("setCountries");
     store.dispatch("setProvinces");
     store.dispatch("setCities");
@@ -374,6 +370,16 @@ export default {
           console.log(err);
         });
     },
+    loadRegisteredTrades() {
+      axios
+        .get(`${REGISTERED_TRADE_URL}?activeOnly=true`)
+        .then((resp) => {
+          this.registeredTrades = resp.data.data
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
     formatDate(input) {
       if (input) return moment.utc(input).format("YYYY-MM-DD");
       return "";