Merge pull request #322 from icefoganalytics/test

NARS fixes and documentation link

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

@@ -75,7 +75,8 @@ export class NarsPTReportingService {
       LEFT JOIN (SELECT SUM(COALESCE(paid_amount, 0)) disbursed, max(issue_date) issue_date, funding_request_id, assessment_id 
         FROM sfa.disbursement WHERE financial_batch_serial_no IS NOT NULL GROUP BY assessment_id, funding_request_id) d ON (funding_request.id = d.funding_request_id and assessment.id = d.assessment_id)
     where
-      funding_request.request_type_id = 5`);
+      funding_request.request_type_id = 5
+      and application.academic_year_id = ${this.year}`);
 
     for (let student of this.allApplications) {
       let rows = await this.makeRows(student);

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

@@ -70,7 +70,8 @@ export class NarsV17_2ReportingService {
       LEFT JOIN (SELECT SUM(COALESCE(paid_amount, 0)) disbursed, max(issue_date) issue_date, funding_request_id, assessment_id 
         FROM sfa.disbursement WHERE financial_batch_serial_no IS NOT NULL GROUP BY assessment_id, funding_request_id) d ON (funding_request.id = d.funding_request_id and assessment.id = d.assessment_id)
     where
-      funding_request.request_type_id = 4`);
+      funding_request.request_type_id = 4
+      and application.academic_year_id = ${this.year}`);
 
     for (let student of this.allApplications) {
       let rows = await this.makeRows(student);

src/web/src/components/application/Documentation.vue

@@ -308,6 +308,9 @@ export default {
     this.loadRequirementTypes();
     this.applicationId = this.$route.params.id;
     let storeApp = store.getters.selectedApplication;
+    
+    await store.dispatch("clearApplication");
+    await store.dispatch("clearStudent");
 
     if (this.$route.path.indexOf("/application/") >= 0) {
       await store.dispatch("loadApplication", this.applicationId);