Merge remote-tracking branch 'origin/master'

Author: arcshiftsolutions

backend/src/components/sdc.js

@@ -672,6 +672,18 @@ function getFileDetails(reportType, mincode) {
     'ALL_STUDENT_ERRORS_WARNS_DIS_CSV': { filename: `AllDistrictStudentsWithErrorsWarns_${mincode}.csv`, contentType: 'text/csv' },
     'ALL_STUDENT_DIS_CSV': { filename: `AllDistrictStudents_${mincode}.csv`, contentType: 'text/csv' },
     'ALL_STUDENT_SCHOOL_CSV': { filename: `AllSchoolStudents_${mincode}.csv`, contentType: 'text/csv' },
+    'ALL_STUDENT_FRENCH_DIS_CSV': { filename: `AllDistrictFrenchProgramStudents_${mincode}.csv`, contentType: 'text/csv' },
+    'ALL_STUDENT_CAREER_DIS_CSV': { filename: `AllDistrictCareerProgramStudents_${mincode}.csv`, contentType: 'text/csv' },
+    'ALL_STUDENT_INDIGENOUS_DIS_CSV': { filename: `AllDistrictIndigenousAndSupportProgramStudents_${mincode}.csv`, contentType: 'text/csv' },
+    'ALL_STUDENT_INCLUSIVE_DIS_CSV': { filename: `AllDistrictInclusiveEducationProgramStudents_${mincode}.csv`, contentType: 'text/csv' },
+    'ALL_STUDENT_ELL_DIS_CSV': { filename: `AllDistrictEnglishLanguageLearningProgramStudents_${mincode}.csv`, contentType: 'text/csv' },
+    'ALL_STUDENT_REFUGEE_DIS_CSV': { filename: `AllDistrictRefugeeStudents_${mincode}.csv`, contentType: 'text/csv' },
+    'ALL_STUDENT_FRENCH_SCHOOL_CSV': { filename: `AllSchoolFrenchStudents_${mincode}.csv`, contentType: 'text/csv' },
+    'ALL_STUDENT_CAREER_SCHOOL_CSV': { filename: `AllSchoolCareerStudents_${mincode}.csv`, contentType: 'text/csv' },
+    'ALL_STUDENT_INDIGENOUS_SCHOOL_CSV': { filename: `AllSchoolIndigenousAndSupportProgramStudents_${mincode}.csv`, contentType: 'text/csv' },
+    'ALL_STUDENT_INCLUSIVE_SCHOOL_CSV': { filename: `AllSchoolInclusiveEducationProgramStudents_${mincode}.csv`, contentType: 'text/csv' },
+    'ALL_STUDENT_ELL_SCHOOL_CSV': { filename: `AllSchoolEnglishLanguageLearningProgramStudents_${mincode}.csv`, contentType: 'text/csv' },
+    'ALL_STUDENT_REFUGEE_SCHOOL_CSV': { filename: `AllSchoolRefugeeStudents_${mincode}.csv`, contentType: 'text/csv' },
     'ELL_HEADCOUNT': { filename: `ELLHeadcount_School_${mincode}.pdf`, contentType: 'application/pdf' },
     'DIS_ELL_HEADCOUNT': { filename: `ELLHeadcount_District_${mincode}.pdf`, contentType: 'application/pdf' },
     'DIS_ELL_HEADCOUNT_PER_SCHOOL': { filename: `ELLHeadcountPerSchool_District_${mincode}.pdf`, contentType: 'application/pdf' },

backend/src/util/constants.js

@@ -215,9 +215,21 @@ const reportTypeValues = [
   ['career_dis', 'DIS_CAREER_HEADCOUNT'],
   ['career-per-school_dis', 'DIS_CAREER_HEADCOUNT_PER_SCHOOL'],
   ['csv_school', 'ALL_STUDENT_SCHOOL_CSV'],
-  ['csv_dis', 'ALL_STUDENT_DIS_CSV'],
   ['csv_school_errors_warns', 'ALL_STUDENT_ERRORS_WARNS_SCHOOL_CSV'],
+  ['csv_school_french', 'ALL_STUDENT_FRENCH_SCHOOL_CSV'],
+  ['csv_school_career', 'ALL_STUDENT_CAREER_SCHOOL_CSV'],
+  ['csv_school_indigenous', 'ALL_STUDENT_INDIGENOUS_SCHOOL_CSV'],
+  ['csv_school_inclusive', 'ALL_STUDENT_INCLUSIVE_SCHOOL_CSV'],
+  ['csv_school_ell', 'ALL_STUDENT_ELL_SCHOOL_CSV'],
+  ['csv_school_refugee', 'ALL_STUDENT_REFUGEE_SCHOOL_CSV'],
+  ['csv_dis', 'ALL_STUDENT_DIS_CSV'],
   ['csv_dis_errors_warns', 'ALL_STUDENT_ERRORS_WARNS_DIS_CSV'],
+  ['csv_dis_french', 'ALL_STUDENT_FRENCH_DIS_CSV'],
+  ['csv_dis_career', 'ALL_STUDENT_CAREER_DIS_CSV'],
+  ['csv_dis_indigenous', 'ALL_STUDENT_INDIGENOUS_DIS_CSV'],
+  ['csv_dis_inclusive', 'ALL_STUDENT_INCLUSIVE_DIS_CSV'],
+  ['csv_dis_ell', 'ALL_STUDENT_ELL_DIS_CSV'],
+  ['csv_dis_refugee', 'ALL_STUDENT_REFUGEE_DIS_CSV'],
   ['zero-fte-summary_dis','DIS_ZERO_FTE_SUMMARY']
 ];
 const REPORT_TYPE_CODE_MAP = Object.freeze(new Map(reportTypeValues));

frontend/src/components/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/AllStudentsComponent.vue

@@ -31,6 +31,7 @@
         :config="config"
         :district="district"
         :show-export-btn="true"
+        :export-type="'all-students'"
         :is-final-sign-off="isFinalSignOff"
         :is-collection-active="isCollectionActive"
       />

frontend/src/components/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/CareerProgramsComponent.vue

@@ -30,6 +30,8 @@
       <DetailComponent
         :config="config"
         :district="district"
+        :show-export-btn="true"
+        :export-type="'csv_dis_career'"
         :is-final-sign-off="isFinalSignOff"
         :is-collection-active="isCollectionActive"
       />

frontend/src/components/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/DetailComponent.vue

@@ -24,7 +24,7 @@
             class="mr-2 mb-1"
             prepend-icon="mdi-tray-arrow-down"
             variant="elevated"
-            @click="showExportDialog = true"
+            @click="handleExportClick"
           />
           <v-btn
             id="filters"
@@ -128,7 +128,11 @@
 <script>
 import alertMixin from '../../../../mixins/alertMixin';
 import CustomTable from '../../common/SDCCustomTable.vue';
-import {downloadStudentOnlyReportURL,downloadStudentErrorsReportURL} from '../../../../utils/common';
+import {
+  downloadStudentOnlyReportURL,
+  downloadStudentErrorsReportURL,
+  downloadStudentProgramReportURL
+} from '../../../../utils/common';
 import ApiService from '../../../../common/apiService';
 import {ApiRoutes} from '../../../../utils/constants';
 import {cloneDeep, isEmpty, omitBy} from 'lodash';
@@ -161,6 +165,11 @@ export default {
       type: Boolean,
       default: false
     },
+    exportType: {
+      type: String,
+      required: false,
+      default: 'all-students'
+    },
     isFinalSignOff: {
       type: Boolean,
       required: false
@@ -216,13 +225,25 @@ export default {
     });
   },
   methods: {
+    handleExportClick() {
+      if (this.exportType === 'all-students') {
+        this.showExportDialog = true;
+      } else {
+        this.downloadStudentProgramReport();
+      }
+    },
     closeAndLoadStudents() {
       this.editStudentSheet = !this.editStudentSheet;
       if (this.reloadStudentsFlag === true) {
         this.loadStudents();
       }
       this.reloadStudentsFlag = false;
     },
+    downloadStudentProgramReport(){
+      const routeData = this.$router.resolve({path: downloadStudentProgramReportURL(this.$route, this.exportType)});
+      window.open(routeData.href, '_blank');
+      this.showExportDialog = false;
+    },
     downloadStudentReport(){
       const routeData = this.$router.resolve({path: downloadStudentOnlyReportURL(this.$route)});
       window.open(routeData.href, '_blank');

frontend/src/components/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/EnglishLangComponent.vue

@@ -30,6 +30,8 @@
       <DetailComponent
         :config="config"
         :district="district"
+        :show-export-btn="true"
+        :export-type="'csv_dis_ell'"
         :is-final-sign-off="isFinalSignOff"
         :is-collection-active="isCollectionActive"
       />

frontend/src/components/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/FrenchProgramsComponent.vue

@@ -30,6 +30,8 @@
       <DetailComponent
         :config="config"
         :district="district"
+        :show-export-btn="true"
+        :export-type="'csv_dis_french'"
         :is-final-sign-off="isFinalSignOff"
         :is-collection-active="isCollectionActive"
       />

frontend/src/components/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/IndSupportProgramsComponent.vue

@@ -30,6 +30,8 @@
       <DetailComponent
         :config="config"
         :district="district"
+        :show-export-btn="true"
+        :export-type="'csv_dis_indigenous'"
         :is-final-sign-off="isFinalSignOff"
         :is-collection-active="isCollectionActive"
       />

frontend/src/components/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/RefugeeComponent.vue

@@ -30,6 +30,8 @@
       <DetailComponent
         :config="config"
         :district="district"
+        :show-export-btn="true"
+        :export-type="'csv_dis_refugee'"
         :is-final-sign-off="isFinalSignOff"
         :is-collection-active="isCollectionActive"
       />

frontend/src/components/sdcCollection/sdcDistrictCollection/stepThreeVerifyData/SpecialEduComponent.vue

@@ -31,6 +31,8 @@
       <DetailComponent
         :config="config"
         :district="district"
+        :show-export-btn="true"
+        :export-type="'csv_dis_inclusive'"
         :is-final-sign-off="isFinalSignOff"
         :is-collection-active="isCollectionActive"
       />