Merge pull request #394 from icefoganalytics/test

More updates in WUP

Author: datajohnson

db/2025_updates.sql

@@ -81,11 +81,10 @@ ALTER TABLE sfa.status_reason ADD funding_application_type_id INT NULL REFERENCE
 
 
 CREATE OR ALTER FUNCTION [sfa].[fn_financial_coding](@disbursement_id INT)
-RETURNS NVARCHAR
+RETURNS NVARCHAR(50)
 AS 
 BEGIN
-DECLARE @coding NVARCHAR = '';
-
+DECLARE @coding NVARCHAR(50) = '';
 
 SELECT @coding = CASE 
         WHEN app.funding_application_type_id = 2 AND d.disbursement_type_id = 11 THEN '031-500707-0301-8888'
@@ -226,4 +225,5 @@ WHERE NOT s.vendor_id IS NULL
 -- ORDER BY d.financial_batch_id_year, d.financial_batch_id, s.vendor_id;
 
 
-  INSERT INTO sfa.disbursement_type (description, is_active) VALUES ('Cheque - LMDA', 1), ('Cheque - WDA', 1)
+INSERT INTO sfa.disbursement_type (description, is_active) VALUES ('Cheque - LMDA', 1), ('Cheque - WDA', 1)
+

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

@@ -66,7 +66,7 @@ fundingApplicationRouter.post(
         ],
       });
     }
-  }
+  },
 );
 
 // GET /:id - Get funding application by ID
@@ -85,26 +85,26 @@ fundingApplicationRouter.get(
         .leftJoin(
           "sfa.academic_year",
           "funding_application.academic_year_id",
-          "academic_year.id"
+          "academic_year.id",
         )
         .leftJoin(
           "sfa.funding_application_type",
           "funding_application.funding_application_type_id",
-          "funding_application_type.id"
+          "funding_application_type.id",
         )
         .select(
           "funding_application.*",
           "person.first_name",
           "person.last_name",
           "academic_year.year as academic_year",
-          "funding_application_type.code AS type_code"
+          "funding_application_type.code AS type_code",
         )
         .where("funding_application.id", parseInt(id))
         .first();
 
       if (fundingApp) {
         fundingApp.application_data = JSON.parse(
-          fundingApp.application_data || "{}"
+          fundingApp.application_data || "{}",
         );
 
         fundingApp.institution = await db("sfa.institution_campus")
@@ -140,7 +140,7 @@ fundingApplicationRouter.get(
         ],
       });
     }
-  }
+  },
 );
 
 // GET /:id - Get funding application by ID
@@ -205,7 +205,7 @@ fundingApplicationRouter.put(
         ],
       });
     }
-  }
+  },
 );
 
 fundingApplicationRouter.post(
@@ -269,7 +269,7 @@ fundingApplicationRouter.post(
               .innerJoin(
                 "sfa.institution",
                 "institution.id",
-                "institution_campus.institution_id"
+                "institution_campus.institution_id",
               )
               .where({
                 "institution_campus.id": application.institution_campus_id,
@@ -327,7 +327,7 @@ fundingApplicationRouter.post(
         ],
       });
     }
-  }
+  },
 );
 
 // updates the status of a funding request
@@ -372,7 +372,7 @@ fundingApplicationRouter.put(
         ],
       });
     }
-  }
+  },
 );
 
 // deletes a funding request along with the disbursements and assessments
@@ -434,5 +434,5 @@ fundingApplicationRouter.delete(
         .status(409)
         .send({ messages: [{ variant: "error", text: "Error To Delete" }] });
     }
-  }
+  },
 );

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

@@ -49,7 +49,7 @@ fundingRequestRouter.get(
         try {
           const builder = new AssessmentService(
             fundingRequest.application_id,
-            fundingRequest.id
+            fundingRequest.id,
           );
           await builder.load(true);
 
@@ -73,7 +73,7 @@ fundingRequestRouter.get(
     }
 
     res.json({ data: fundingRequest });
-  }
+  },
 );
 
 fundingRequestRouter.post("/", async (req: Request, res: Response) => {
@@ -133,7 +133,7 @@ fundingRequestRouter.post("/", async (req: Request, res: Response) => {
             .innerJoin(
               "sfa.institution",
               "institution.id",
-              "institution_campus.institution_id"
+              "institution_campus.institution_id",
             )
             .where({
               "institution_campus.id": application.institution_campus_id,
@@ -236,24 +236,27 @@ fundingRequestRouter.patch(
         ],
       });
     }
-  }
+  },
 );
 
 // deletes a funding request along with the disbursements and assessments
 fundingRequestRouter.delete(
-  "/:id/status",
+  "/:id",
   [param("id").isInt().notEmpty()],
   ReturnValidationErrors,
   async (req: Request, res: Response) => {
     const { id } = req.params;
+
+    console.log("DELETE FUNDING REQUEST:", id);
+
     try {
       const verifyRecord: any = await db("sfa.funding_request")
-        .where({ funding_application_id: id })
+        .where({ id })
         .first();
 
       if (!verifyRecord) {
         return res.status(404).send({
-          messages: [{ variant: "error", text: "The record does not exits" }],
+          messages: [{ variant: "error", text: "Teh record does not exits" }],
         });
       }
 
@@ -298,5 +301,5 @@ fundingRequestRouter.delete(
         .status(409)
         .send({ messages: [{ variant: "error", text: "Error To Delete" }] });
     }
-  }
+  },
 );

src/api/services/admin/assessments/wup-apprenticeship-service.ts

@@ -32,28 +32,26 @@ export class WUPApprenticeshipService {
     this.parent.assessment.parent_contribution_review = "NO";
 
     if (reload) {
-      const json_data = JSON.parse(
-        this.parent.application.application_data || "{}"
-      );
+      const json_data = this.parent.fundingRequest.json_data;
 
       this.parent.assessment.assessment_type_id =
         this.parent.assessment.assessment_type_id ?? 1;
-      this.parent.assessment.classes_start_date = json_data.classesStartDate;
-      this.parent.assessment.classes_end_date = json_data.classesEndDate;
+      this.parent.assessment.classes_start_date = json_data.classes_start_date;
+      this.parent.assessment.classes_end_date = json_data.classes_end_date;
       this.parent.assessment.weeks_allowed = weeksBetween(
-        json_data.classesStartDate,
-        json_data.classesEndDate
+        json_data.classes_start_date,
+        json_data.classes_end_date,
       );
 
-      this.parent.assessment.effective_rate_date = json_data.classesStartDate;
+      this.parent.assessment.effective_rate_date = json_data.classes_start_date;
       const data = (this.parent.assessment.json_data =
         this.parent.fundingRequest.json_data);
 
       const textbook = (data.textbook =
         cleanNumber(this.parent.fundingRequest.json_data.textbook) ?? 0);
       const transportation = (data.total_transportation =
         cleanNumber(
-          this.parent.fundingRequest.json_data.weekly_transportation
+          this.parent.fundingRequest.json_data.weekly_transportation,
         ) ?? 0);
 
       data.total_transportation =
@@ -157,7 +155,7 @@ export class WUPApprenticeshipService {
       for (const item of otherItems) {
         const hasItem =
           data.requested_supports.filter(
-            (d: any) => d.type === item.expense_type
+            (d: any) => d.type === item.expense_type,
           ).length > 0;
 
         if (!hasItem) {

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

@@ -439,9 +439,8 @@ export default {
         "Are you sure?",
         "Click 'Confirm' below to permanently remove this funding request.",
         async () => {
-          console.log("DOING DELETE", this.fundingRequest.id);
           try {
-            const resDelete = await axios.delete(FUNDING_APPLICATION_URL + `/${this.fundingRequest.id}/status`);
+            const resDelete = await axios.delete(FUNDING_APPLICATION_URL + `/requests/${this.fundingRequest.id}`);
 
             const message = resDelete.data.messages[0];