diff --git a/backend/src/components/studentFilters.js b/backend/src/components/studentFilters.js index 983b520b..6a992bad 100644 --- a/backend/src/components/studentFilters.js +++ b/backend/src/components/studentFilters.js @@ -351,7 +351,7 @@ function validateFteZeroFilter(filters) { } function validateGradeFilter(filterGrades = []) { - const activeGradeCodes = cacheService.getActiveEnrolledGradeCodes(); + const activeGradeCodes = cacheService.getActiveEnrolledGradeCodes().map(grade => grade.enrolledGradeCode); if (filterGrades.length > 0) { if (!filterGrades.every(value => activeGradeCodes.includes(value))) { log.error('Invalid grade filter.'); diff --git a/frontend/src/components/data-collection/AllStudents/DetailComponent.vue b/frontend/src/components/data-collection/AllStudents/DetailComponent.vue index 9e84ad13..67b02a01 100644 --- a/frontend/src/components/data-collection/AllStudents/DetailComponent.vue +++ b/frontend/src/components/data-collection/AllStudents/DetailComponent.vue @@ -243,7 +243,7 @@ export default { const filterKey = this.indySchoolDistrictObject.type === 'indy' ? 'schoolNameNumber' : 'districtNameNumber'; this.filterSearchParams.schoolOrDistrictId = {key: filterKey, value: this.indySchoolDistrictObject.id}; if (this.indySchoolDistrictObject.type === 'district') { - sort = { sdcSchoolCollection: 'DESC' }; + sort = { sdcSchoolCollection: 'ASC' }; } } ApiService.apiAxios.get(`${Routes.sdc.BASE_URL}/collection/${this.collectionObject.collectionID}/students-paginated-slice?tableFormat=true`, {