Merge pull request #338 from icefoganalytics/test

Update nars-disft-reporting-service.ts

Author: datajohnson

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

@@ -53,12 +53,14 @@ export class NarsDisabilityRCLReportingService {
       INNER JOIN sfa.institution ON (institution.id = institution_campus.institution_id)
       INNER JOIN sfa.study_field ON (study_area.study_field_id = study_field.id)
       INNER JOIN sfa.field_program ON (application.program_id = field_program.program_id AND study_field.id = field_program.study_field_id)
-      INNER JOIN (SELECT SUM(COALESCE(disbursed_amount, 0)) disbursed, max(issue_date) issue_date, funding_request_id, assessment_id 
+      LEFT OUTER 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
       funding_request.request_type_id IN (4) AND application.academic_year_id = ${this.year} AND
-      (application.is_perm_disabled = 1 OR application.permanent_disability = 1 OR application.pers_or_prolong_disability = 1 OR application.is_persist_disabled = 1)
+      (application.is_perm_disabled = 1 OR application.permanent_disability = 1 OR application.pers_or_prolong_disability = 1 OR application.is_persist_disabled = 1) AND
+      application.student_id IN (select student_id from sfa.funding_request INNER JOIN sfa.application on funding_request.application_id = application.id 
+        where request_type_id = 30 and academic_year_id = ${this.year} and status_id = 7)
     ORDER BY sin`);
 
     for (let student of this.allApplications) {