diff --git a/backend/src/components/ministrySDCReports.js b/backend/src/components/ministrySDCReports.js index ab81a3aa..8041bb3f 100644 --- a/backend/src/components/ministrySDCReports.js +++ b/backend/src/components/ministrySDCReports.js @@ -3,7 +3,7 @@ const { logApiError, errorResponse, getData } = require('./utils'); const config = require('../config/index'); const HttpStatus = require('http-status-codes'); let reportTypes = ['indy-inclusive-ed-enrollment-headcounts', 'school-enrollment-headcounts', 'indy-school-enrollment-headcounts', 'school-address-report', 'fsa-registration-report', - 'offshore-enrollment-headcounts', 'offshore-languages-headcounts', 'indy-inclusive-ed-funding-headcounts', 'inclusive-education-variance-headcounts']; + 'offshore-enrollment-headcounts', 'offshore-languages-headcounts', 'indy-inclusive-ed-funding-headcounts', 'indy-funding-report', 'online-indy-funding-report', 'non-graduated-adult-indy-funding-report']; async function getMinistrySDCReport(req, res) { try { @@ -50,6 +50,9 @@ function getFileDetails(reportType) { 'offshore-enrollment-headcounts': { filename: 'OffshoreSchoolsHeadcounts.csv', contentType: 'text/csv' }, 'offshore-languages-headcounts': { filename: 'OffshoreSpokenLanguageHeadcounts.csv', contentType: 'text/csv' }, 'indy-inclusive-ed-funding-headcounts': { filename: 'IndependentSchoolsInclusiveEdFundingHeadcounts.csv', contentType: 'text/csv' }, + 'indy-funding-report': { filename: 'IndependentSchoolsFundingReportStandardStudent.csv', contentType: 'text/csv' }, + 'online-indy-funding-report': { filename: 'IndependentSchoolsFundingReportOnlineLearning.csv', contentType: 'text/csv' }, + 'non-graduated-adult-indy-funding-report': { filename: 'IndependentSchoolsFundingReportNonGraduatedAdult.csv', contentType: 'text/csv' }, 'DEFAULT': { filename: 'download.pdf', contentType: 'application/pdf' } }; return mappings[reportType] || mappings['DEFAULT']; diff --git a/backend/src/components/sdc/sdc.js b/backend/src/components/sdc/sdc.js index 42f07ce1..c966c0f7 100644 --- a/backend/src/components/sdc/sdc.js +++ b/backend/src/components/sdc/sdc.js @@ -281,7 +281,7 @@ async function getSDCSchoolCollectionStudentPaginatedSlice(req, res) { if (e?.status === 404) { res.status(HttpStatus.OK).json(null); } else { - await logApiError(e, 'Error getting sdc school collection student paginated list'); + await logApiError(e, 'Error getting sdc school collection student paginated slice list'); return errorResponse(res); } } @@ -310,7 +310,9 @@ function createSchoolOrDistrictCriteria(searchParams) { function createTabFilter(searchParams) { let searchCriteriaList = []; let tableKey = 'sdcStudentEnrolledProgramEntities.enrolledProgramCode'; - + if (searchParams.label === 'NOT_DELETED') { + searchCriteriaList.push({ key: 'sdcSchoolCollectionStudentStatusCode', operation: FILTER_OPERATION.NOT_IN, value: 'DELETED', valueType: VALUE_TYPE.STRING, condition: CONDITION.AND }); + } if (searchParams.label === 'FRENCH_PR') { searchCriteriaList.push({ key: tableKey, operation: FILTER_OPERATION.IN, value: '05,08,11,14', valueType: VALUE_TYPE.STRING, condition: CONDITION.AND }); } diff --git a/frontend/src/components/data-collection/ReportSection.vue b/frontend/src/components/data-collection/ReportSection.vue index 439de3b2..fce9b294 100644 --- a/frontend/src/components/data-collection/ReportSection.vue +++ b/frontend/src/components/data-collection/ReportSection.vue @@ -28,7 +28,7 @@ @@ -49,7 +49,7 @@ - +