Added logic to insert district number , renamed report name

bcgov · Sep 19, 2024 · c95d408 · c95d408
1 parent a05b6b4
commit c95d408
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 17 deletions.
diff --git a/backend/src/components/sdc/sdc.js b/backend/src/components/sdc/sdc.js
@@ -864,6 +864,7 @@ async function downloadSdcReport(req, res) {
     ['csv_dis', 'ALL_STUDENT_DIS_CSV']
   ];
   const REPORT_TYPE_CODE_MAP = Object.freeze(new Map(reportTypeValues));
+  const districtOrSchoolNumber= req.params.districtOrSchoolNumber;
 
   try {
     const reportType = REPORT_TYPE_CODE_MAP.get(req.params.reportTypeCode);
@@ -872,6 +873,11 @@ async function downloadSdcReport(req, res) {
         message: 'Invalid report type provided'
       });
     }
+    if (!districtOrSchoolNumber) {
+      return res.status(HttpStatus.BAD_REQUEST).json({
+        message: 'Invalid report district or school code provided'
+      });
+    }
     let url;
     if(req.params.sdcDistrictCollectionID){
       url = `${config.get('sdc:rootURL')}/reportGeneration/sdcDistrictCollection/${req.params.sdcDistrictCollectionID}/${reportType}`;
@@ -880,7 +886,7 @@ async function downloadSdcReport(req, res) {
     }
 
     const resData = await getData(url);
-    const fileDetails = getFileDetails(reportType);
+    const fileDetails = getFileDetails(reportType, districtOrSchoolNumber);
 
     setResponseHeaders(res, fileDetails);
     const buffer = Buffer.from(resData.documentData, 'base64');
@@ -916,9 +922,9 @@ async function getDistrictHeadcounts(req, res) {
   }
 }
 
-function getFileDetails(reportType) {
+function getFileDetails(reportType, districtOrSchoolNumber) {
   const mappings = {
-    'ALL_STUDENT_DIS_CSV': { filename: 'AllDistrictStudents.csv', contentType: 'text/csv' },
+    'ALL_STUDENT_DIS_CSV': { filename: `AllStudents_District_${districtOrSchoolNumber}.csv`, contentType: 'text/csv' },
     'ALL_STUDENT_SCHOOL_CSV': { filename: 'AllSchoolStudents.csv', contentType: 'text/csv' },
     'DEFAULT': { filename: 'download.pdf', contentType: 'application/pdf' }
   };

diff --git a/backend/src/routes/sdc.js b/backend/src/routes/sdc.js
diff --git a/frontend/src/components/data-collection/AllStudents/DetailComponent.vue b/frontend/src/components/data-collection/AllStudents/DetailComponent.vue
@@ -212,10 +212,10 @@ export default {
     },
     downloadReportURL() {
       if (this.indySchoolDistrictObject != null) {
-        if (this.indySchoolDistrictObject.type === 'indy') return `${Routes.sdc.BASE_URL}/${this.indySchoolDistrictObject.id}/report/csv_school/download`;
-        if (this.indySchoolDistrictObject.type === 'district') return `${Routes.sdc.SDC_DISTRICT_COLLECTION}/${this.indySchoolDistrictObject.id}/report/csv_dis/download`;
+        if (this.indySchoolDistrictObject.type === 'indy') return `${Routes.sdc.BASE_URL}/${this.indySchoolDistrictObject.id}/${this.indySchoolDistrictObject.code}/report/csv_school/download`;
+        if (this.indySchoolDistrictObject.type === 'district') return `${Routes.sdc.SDC_DISTRICT_COLLECTION}/${this.indySchoolDistrictObject.id}/${this.indySchoolDistrictObject.code}/report/csv_dis/download`;
       }
-      return `${Routes.sdc.SDC_DISTRICT_COLLECTION}/${this.$route.params.sdcDistrictCollectionID}/report/csv_dis/download`;
+      return `${Routes.sdc.SDC_DISTRICT_COLLECTION}/${this.$route.params.sdcDistrictCollectionID}/-1/report/csv_dis/download`;
     },
     editStudent($event) {
       const selectedStudent = cloneDeep($event);

diff --git a/frontend/src/components/data-collection/FundingPolicyReports.vue b/frontend/src/components/data-collection/FundingPolicyReports.vue
@@ -14,7 +14,7 @@
           single-line
           :clearable="true"
           item-title="codeName"
-          item-value="id"
+          item-value="school"
           autocomplete="off"
           @update:model-value="setIndySchoolsDistrictsNameNumberFilter('indy', $event)"
         />
@@ -34,7 +34,7 @@
           single-line
           :clearable="true"
           item-title="codeName"
-          item-value="id"
+          item-value="district"
           autocomplete="off"
           @update:model-value="setIndySchoolsDistrictsNameNumberFilter('district', $event)"
         />
@@ -98,7 +98,7 @@ export default {
   methods: {
     setIndySchoolsDistrictsNameNumberFilter(key, $event) {
       if ($event) {
-        this.indySchoolDistrictObject = { type: key, id: $event };
+        this.indySchoolDistrictObject = { type: key, id: $event.id, code :$event.code };
       } else {
         this.indySchoolDistrictObject = null;
       }
@@ -115,13 +115,15 @@ export default {
             if (school && school.authorityID != null) {
               let schoolItem = {
                 codeName: school.schoolName + ' - ' + school.mincode,
-                id: schoolCollection.sdcSchoolCollectionID,
-                mincode: school.mincode
+                school: {
+                  id: schoolCollection.sdcSchoolCollectionID,
+                  code: school.mincode
+                }
               };
               this.indySchoolNames.push(schoolItem);
             }
           });
-          this.indySchoolNames = sortBy(this.indySchoolNames, ['mincode']);
+          this.indySchoolNames = sortBy(this.indySchoolNames, ['school.mincode']);
         })
         .catch(error => {
           console.error(error);
@@ -134,13 +136,14 @@ export default {
             if (district) {
               let districtItem = {
                 codeName: district.name + ' - ' + district.districtNumber,
-                id: districtCollection.sdcDistrictCollectionID,
-                districtNumber: district.districtNumber
+                district: {
+                  id: districtCollection.sdcDistrictCollectionID,
+                  code: district.districtNumber}
               };
               this.districtNames.push(districtItem);
             }
           });
-          this.districtNames = sortBy(this.districtNames, ['districtNumber']);
+          this.districtNames = sortBy(this.districtNames, ['district.districtNumber']);
         })
         .catch(error => {
           console.error(error);