Merge pull request #385 from icefoganalytics/test

NARS Fixes

Author: datajohnson

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

@@ -48,7 +48,7 @@ export class NarsDisabilityReportingService {
       INNER JOIN sfa.assessment ON (funding_request.id = assessment.funding_request_id)
       INNER JOIN sfa.institution_campus ON (application.institution_campus_id = institution_campus.id)
       INNER JOIN sfa.institution ON (institution.id = institution_campus.institution_id)
-      INNER JOIN (SELECT SUM(COALESCE(disbursed_amount, 0)) disbursed, max(issue_date) issue_date, funding_request_id, assessment_id 
+      LEFT JOIN (SELECT SUM(COALESCE(disbursed_amount, 0)) disbursed, max(issue_date) issue_date, funding_request_id, assessment_id 
         FROM sfa.disbursement GROUP BY assessment_id, funding_request_id) d ON (funding_request.id = d.funding_request_id and assessment.id = d.assessment_id)
       INNER JOIN (SELECT funding_request_id, MAX(id) last_id FROM sfa.assessment GROUP BY funding_request_id) maxid ON assessment.id = maxid.last_id
     where
@@ -270,13 +270,19 @@ function getCodeForService(service: number): number {
       return 6;
     case 6:
       return 7;
+    case 10:
+      return 1;
+    case 9:
+      return 19;
     default:
       return 8;
   }
 }
 function getCodeForEqipment(equipment: number): number {
   switch (equipment) {
     case 1:
+      return 12;
+    case 9:
       return 13;
     case 2:
       return 20;
@@ -288,6 +294,12 @@ function getCodeForEqipment(equipment: number): number {
       return 21;
     case 6:
       return 16;
+    case 10:
+      return 14;
+    case 11:
+      return 17;
+    case 12:
+      return 15;
     default:
       return 11;
   }

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

@@ -123,7 +123,9 @@ export class NarsDisabilityRCLReportingService {
     row.push(new Column("sin", app.sin, " ", 9));
     row.push(new Column("prov_issue", "YT", " ", 2));
     row.push(new Column("dob", moment.utc(app.birth_date).format("YYYYMMDD"), " ", 8));
-    row.push(new Column("gender", app.sex_id == 1 ? "M" : app.sex_id == 2 ? "F" : "U", " ", 1));
+    row.push(
+      new Column("gender", app.sex_id == 1 ? "M" : app.sex_id == 2 ? "F" : app.sex_id == -1 ? "O" : "U", " ", 1)
+    );
     row.push(new Column("cat_code", cat_code, " ", 1));
     row.push(new Column("ei_code", app.institution_code, " ", 4));
     row.push(new Column("fos", app.field_program_code, " ", 2));

src/api/services/admin/nars-v17-2-reporting-service.ts

@@ -181,7 +181,14 @@ export class NarsV17_2ReportingService {
         .groupBy("request_type_id")
         .sum("disbursed_amount as disbursed_amount");
 
-      let ftLoan = otherFunds.find((f) => f.request_type_id == 4);
+      let otherFunds2 = await db("sfa.funding_request")
+        .where({ application_id: applicationId, assessment_id: app.id })
+        .join("sfa.disbursement", "disbursement.funding_request_id", "funding_request.id")
+        .select("request_type_id")
+        .groupBy("request_type_id")
+        .sum("disbursed_amount as disbursed_amount");
+
+      let ftLoan = otherFunds2.find((f) => f.request_type_id == 4);
       let ftGrant = otherFunds.find((f) => f.request_type_id == 35);
       let ftDepGrant = otherFunds.find((f) => f.request_type_id == 32);
       let disGrant = otherFunds.find((f) => f.request_type_id == 29);
@@ -275,7 +282,7 @@ export class NarsV17_2ReportingService {
     row.push(new Column("app_status", app_status, " ", 1));
 
     row.push(new Column("assess_date", moment.utc(app.assessed_date).format("YYYYMMDD"), " ", 8));
-    row.push(new Column("reasess_indicator", app.assessment_type_id == 1 ? "0" : "4", " ", 1));
+    row.push(new Column("reasess_indicator", app.assessment_type_id == 1 ? "0" : "8", " ", 1));
     row.push(new Column("csl_auth_date", moment.utc(app.assessed_date).format("YYYYMMDD"), " ", 8));
 
     row.push(new Column("sin", app.sin, " ", 9));