Fixed new report links

Author: arcshiftsolutions

backend/src/components/sdc.js

@@ -628,6 +628,8 @@ async function downloadSdcReport(req, res) {
 
 function getFileDetails(reportType, mincode) {
   const mappings = {
+    'ALL_STUDENT_ERRORS_WARNS_SCHOOL_CSV': { filename: `AllSchoolStudentsWithErrorsWarns_${mincode}.csv`, contentType: 'text/csv' },
+    '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' },
     'ELL_HEADCOUNT': { filename: `ELLHeadcount_${mincode}.pdf`, contentType: 'application/pdf' },

backend/src/util/constants.js

@@ -204,6 +204,8 @@ const reportTypeValues = [
   ['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_dis_errors_warns', 'ALL_STUDENT_ERRORS_WARNS_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/SDCDistrictCollectionView.vue

@@ -299,7 +299,6 @@ import {authStore} from '../../../store/modules/auth';
 import StepSevenFinalSubmission from './StepSevenFinalSubmission.vue';
 import ApiService from '../../../common/apiService';
 import {ApiRoutes} from '../../../utils/constants';
-import {LocalDate, LocalDateTime} from '@js-joda/core';
 
 export default defineComponent({
   name: 'SDCDistrictCollectionView',
@@ -413,11 +412,10 @@ export default defineComponent({
     async getActiveSdcDistrictCollection() {
       await ApiService.apiAxios.get(ApiRoutes.sdc.SDC_COLLECTION_BY_DISTRICT_ID + '/' + this.districtID)
         .then(response => {
-          const isMigratedCollection = response.data.createDate ? LocalDateTime.parse(response.data.createDate).toLocalDate().isBefore(LocalDate.parse(this.config.SLD_MIGRATION_DATE)) : false;
           this.setCurrentCollectionSubmissionDueDate(response.data.submissionDueDate);
           this.setCurrentCollectionResolveDupDueDate(response.data.duplicationResolutionDueDate);
           this.setCurrentCollectionSignOffDueDate(response.data.signOffDueDate);
-          this.isSdcDistrictCollectionActive = response.data.sdcDistrictCollectionID === this.districtCollectionObject?.sdcDistrictCollectionID && !isMigratedCollection;
+          this.isSdcDistrictCollectionActive = response.data.sdcDistrictCollectionID === this.districtCollectionObject?.sdcDistrictCollectionID;
 
           this.submissionDueDate = 'Due: ' + formatSubmissionDate(sdcCollectionStore().currentCollectionSubmissionDueDate);
           this.duplicationResolutionDueDate = 'Due: ' + formatSubmissionDate(sdcCollectionStore().currentCollectionResolveDupDueDate);

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

@@ -11,26 +11,20 @@
             class="bold"
           >Students Found:  {{ totalElements }}
           </span>
-          <router-link
-            v-if="showExportBtn"
-            class="ml-2"
-            :to="{ path: downloadReportURL() }"
-            target="_blank"
-          >
-            <v-icon
-              small
-              class="ml-1"
-              color="#003366"
-            >
-              mdi-tray-arrow-down
-            </v-icon>
-            <span class="export">Export All Student Records</span>
-          </router-link>
         </v-col>
         <v-col
           cols="8"
           class="d-flex justify-end"
         >
+          <v-btn
+            id="export"
+            color="#003366"
+            text="Export"
+            class="mr-2 mb-1"
+            prepend-icon="mdi-tray-arrow-down"
+            variant="elevated"
+            @click="showExportDialog = true"
+          />
           <v-btn
             id="filters"
             color="#003366"
@@ -101,6 +95,32 @@
       @close="closeAndLoadStudents"
     />
   </v-bottom-sheet>
+  <v-dialog
+    v-model="showExportDialog"
+    :max-width="443"
+  >
+    <v-card>
+      <v-card-title>
+        Export Student Records
+      </v-card-title>
+      <v-card-actions>
+        <v-btn
+          color="#003366"
+          variant="elevated"
+          style="white-space: pre-wrap;"
+          text="Students Only"
+          @click="downloadStudentReport"
+        />
+        <v-btn
+          color="#003366"
+          variant="elevated"
+          style="white-space: pre-wrap;"
+          text="Students with Errors & Warnings"
+          @click="downloadStudentWithErrorsReport"
+        />
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
 </template>
 
 <script>
@@ -149,6 +169,7 @@ export default {
       chip: true,
       pageNumber: 1,
       pageSize: 15,
+      showExportDialog: false,
       studentList: [],
       isLoading: false,
       totalElements: 0,
@@ -185,9 +206,22 @@ export default {
       }
       this.reloadStudentsFlag = false;
     },
-    downloadReportURL() {
+    downloadStudentReport(){
+      const routeData = this.$router.resolve({path: this.downloadStudentOnlyReportURL()});
+      window.open(routeData.href, '_blank');
+      this.showExportDialog = false;
+    },
+    downloadStudentWithErrorsReport(){
+      const routeData = this.$router.resolve({path: this.downloadStudentErrorsReportURL()});
+      window.open(routeData.href, '_blank');
+      this.showExportDialog = false;
+    },
+    downloadStudentOnlyReportURL() {
       return `${ApiRoutes.sdc.SDC_DISTRICT_COLLECTION}/${this.$route.params.sdcDistrictCollectionID}/report/csv_dis/download`;
     },
+    downloadStudentErrorsReportURL() {
+      return `${ApiRoutes.sdc.SDC_DISTRICT_COLLECTION}/${this.$route.params.sdcDistrictCollectionID}/report/csv_dis_errors_warns/download`;
+    },
     editStudent($event) {
       const selectedStudent = cloneDeep($event);
       this.studentForEdit.splice(0);

frontend/src/components/sdcCollection/sdcSchoolCollection/stepTwoValidateData/StepTwoViewDataIssues.vue

@@ -202,6 +202,22 @@
         <v-row
           class="pt-3 pb-3"
         >
+          <v-col class="mt-4">
+            <router-link
+              class="ml-2"
+              :to="{ path: downloadReportURL() }"
+              target="_blank"
+            >
+              <v-icon
+                small
+                class="ml-1"
+                color="#003366"
+              >
+                mdi-tray-arrow-down
+              </v-icon>
+              <span class="export ml-1">Export Student Records With Errors/Warnings</span>
+            </router-link>
+          </v-col>
           <v-col
             v-if="studentListData?.length > 0"
             class="text-right"
@@ -453,6 +469,9 @@ export default {
     canMoveForward(){
       return this.isStepComplete || this.hasEditPermission;
     },
+    downloadReportURL() {
+      return `${ApiRoutes.sdc.BASE_URL}/${this.$route.params.schoolCollectionID}/report/csv_school_errors_warns/download`;
+    },
     applyFilters($event) {
       this.filterSearchParams.moreFilters = cloneDeep($event);
       this.getSummaryCounts();

frontend/src/components/sdcCollection/sdcSchoolCollection/steppers/SchoolSteps.vue

@@ -95,7 +95,7 @@ import StepTwoViewDataIssues from '../stepTwoValidateData/StepTwoViewDataIssues.
 import StepThreeVerifyData from '../stepThreeVerifyData/StepThreeVerifyData.vue';
 
 export default defineComponent({
-  name: 'IndySchoolSteps',
+  name: 'SchoolSteps',
   components: {
     StepThreeVerifyData,
     StepTwoViewDataIssues,