Merge pull request #2266 from bcgov/feature/addProjNonGradReports

Add Non-graduated projection reports

Author: arcshiftsolutions

backend/src/components/gradReports.js

@@ -76,6 +76,14 @@ async function handleReportDownload(req, res, reportType) {
         url += 'DISTREP_YE_SD';
         fileName = `${instituteMincode}_YearEnd_${formattedDate}.pdf`;
         break;
+      case 'historicalProjNonGrad':
+        url+= 'NONGRADPRJARC';
+        fileName = `${instituteMincode}_HistoricalNotGraduatedProjection_${formattedDate}.pdf`;
+        break;
+      case 'projNonGrad':
+        url+= 'NONGRADPRJ';
+        fileName = `${instituteMincode}_NotGraduatedProjection_${formattedDate}.pdf`;
+        break;
       default:
         return res.status(HttpStatus.BAD_REQUEST).json({ message: 'Invalid docType' });
       }

frontend/src/components/graduation/district/reports/GradDistrictReportsAndTranscripts.vue

@@ -210,7 +210,7 @@
               <v-col cols="12">
                 <DownloadLink
                   label="Projected Non-Graduates"
-                  :download-action="downloadGradProjections"
+                  :download-action="() => downloadGradProjections('projNonGrad')"
                 />
               </v-col>
             </v-row>
@@ -239,7 +239,7 @@
               <v-col cols="12">
                 <DownloadLink
                   label="Projected Non-Graduates"
-                  :download-action="downloadGradProjections"
+                  :download-action="() => downloadGradProjections('historicalProjNonGrad')"
                 />
               </v-col>
             </v-row>
@@ -463,8 +463,11 @@ export default {
       await fetchAndDownloadGradReport(this, schoolID, reportType, docTypeFilename(reportType), docTypeName(reportType), true, false);
       this.isLoading = false;
     },
-    downloadGradProjections(){
-      return;
+    async downloadGradProjections(reportType){
+      this.isLoading = true;
+      const schoolID = this.schoolCodeNameFilter;
+      await fetchAndDownloadGradReport(this, schoolID, reportType, docTypeFilename(reportType), docTypeName(reportType), true, true);
+      this.isLoading = false;
     },
     close() {
       this.studentForSearch = {};
@@ -480,13 +483,6 @@ export default {
 
 <style scoped>
 
-.border {
-  border: 2px solid grey;
-  border-radius: 5px;
-  padding: 35px;
-  margin: 2em;
-}
-
 h3 {
   color: #38598a;
 }

frontend/src/components/graduation/school/reports/GradSchoolReportsAndTranscripts.vue

@@ -182,7 +182,7 @@
             <v-col cols="12">
               <DownloadLink
                 label="Projected Non-Graduates"
-                :download-action="downloadProjectedGradReport"
+                :download-action="() => downloadGradProjections('projNonGrad')"
               />
             </v-col>
           </v-row>
@@ -208,7 +208,7 @@
             <v-col cols="12">
               <DownloadLink
                 label="Projected Non-Graduates"
-                :download-action = "downloadProjectedGradReport"
+                :download-action = "() => downloadGradProjections('historicalProjNonGrad')"
               />
             </v-col>
           </v-row>
@@ -399,11 +399,13 @@ export default {
       const schoolID = this.userInfo.activeInstituteIdentifier;
       await fetchAndDownloadGradReport(this, schoolID, reportType, docTypeFilename(reportType), docTypeName(reportType), true, false);
     },
-    downloadProjectedGradReport(){
-      return;
+    async downloadGradProjections(reportType){
+      this.isLoading = true;
+      const schoolID = this.userInfo.activeInstituteIdentifier;
+      await fetchAndDownloadGradReport(this, schoolID, reportType, docTypeFilename(reportType), docTypeName(reportType), true, true);
+      this.isLoading = false;
     },
     close() {
-      this.showPENSearchDialog = false;
       this.studentForSearch = {};
       this.studentPENXML = null;
       this.studentPENTranscript = null;

frontend/src/utils/gdc/gradReports.js

@@ -149,7 +149,9 @@ export function docTypeFilename(summaryDownloadType) {
   case 'transcript': return 'Transcript';
   case 'xml': return 'XML';
   case 'tvr': return 'TVR';
-  case 'yearEnd': return 'Year-End Report';
+  case 'yearEnd': return 'YearEndReport';
+  case 'projNonGrad': return 'ProjectedNotGraduated';
+  case 'historicalProjNonGrad': return 'HistoricalProjectedNotGraduated';
   default: return '';
   }
 }
@@ -163,6 +165,8 @@ export function docTypeName(summaryDownloadType) {
   case 'historicalGraduated': return 'Historical Graduated Students Summary';
   case 'historicalNonGraduated': return 'Historical Not Yet Graduated Students Summary';
   case 'yearEnd': return 'Year-End District Credential and Transcript Distribution Reports';
+  case 'projNonGrad': return 'Not Yet Graduated Projection Report';
+  case 'historicalProjNonGrad': return 'Historical Not Yet Graduated Projection Report';
   default: return '';
   }
 }