Merge pull request #2057 from bcgov/fix/EDX-2931

fix grade filter validation
bcgov · Sep 13, 2024 · 02d8fea · 02d8fea
2 parents 08fafff + 0985018
commit 02d8fea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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`, {