Merge pull request #1023 from bcgov/feature/EDX-1272

Bug Fixes: EDX-1689, 1763, 1764
bcgov · Sep 11, 2023 · 7e8d0db · 7e8d0db
2 parents eb3953c + 1549e25
commit 7e8d0db
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/frontend/src/components/sdcCollection/StepTwoValidateData.vue b/frontend/src/components/sdcCollection/StepTwoValidateData.vue
@@ -843,7 +843,7 @@ const getSummaryCounts = () => {
 //sdc school collection student list pagination
 const headerSearchParams = ref({
   penNumber: '',
-  validationIssueSeverityCode: 'ERROR,INFO_WARNING,FUNDING_WARNING'
+  sdcSchoolCollectionStudentStatusCode: 'ERROR,INFOWARN,FUNDWARN'
 });
 
 const pageNumber = ref(1);
@@ -866,6 +866,9 @@ const getSDCSchoolCollectionStudentPaginated = () => {
       pageNumber: pageNumber.value - 1,
       pageSize: pageSize.value,
       searchParams: omitBy(headerSearchParams.value, isEmpty),
+      sort: {
+        sdcSchoolCollectionStudentStatusCode: 'ASC'
+    },
     }
   }).then(response => {
     studentListData.value = response.data.content;
@@ -1072,12 +1075,12 @@ const formatAndSortValidationIssues = (validationIssues = []) => {
 };
 
 const getStudentStatus = (student)  => {
-  let studentValidationIssues = student.sdcSchoolCollectionStudentValidationIssues;
-  if(studentValidationIssues.find(issue => issue.validationIssueSeverityCode === 'ERROR')) {
+  let studentValidationIssueStatus = student.sdcSchoolCollectionStudentStatusCode;
+  if(studentValidationIssueStatus === 'ERROR') {
     return 'ERROR';
-  } else if(studentValidationIssues.find(issue => issue.validationIssueSeverityCode === 'FUNDING_WARNING')) {
+  } else if(studentValidationIssueStatus === 'FUNDWARN') {
     return 'FUNDING_WARNING';
-  } else {
+  } else if(studentValidationIssueStatus === 'INFOWARN') {
     return 'INFO_WARNING';
   }
 };

diff --git a/frontend/src/components/sdcCollection/stepThreeVerifyData/DetailComponent.vue b/frontend/src/components/sdcCollection/stepThreeVerifyData/DetailComponent.vue
@@ -170,7 +170,7 @@ export default {
       searchText: '',
       filterSearchParams: {
         tabFilter: this.config.defaultFilter,
-        sdcSchoolCollectionStudentStatusCode: 'LOADED,ERROR,INFO_WARNING,FUNDING_WARNING,VERIFIED,FIXABLE',
+        sdcSchoolCollectionStudentStatusCode: 'LOADED,INFOWARN,FUNDWARN,VERIFIED,FIXABLE',
       },
     };
   },