Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug Fixes: EDX-1689, 1763, 1764 #1023

Merged
merged 1 commit into from
Sep 11, 2023
Merged

Bug Fixes: EDX-1689, 1763, 1764 #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions frontend/src/components/sdcCollection/StepTwoValidateData.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down Expand Up @@ -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';
}
};
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/sdcCollection/stepThreeVerifyData/DetailComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
},
mixins: [alertMixin],
props: {
config: {

Check warning on line 155 in frontend/src/components/sdcCollection/stepThreeVerifyData/DetailComponent.vue

View workflow job for this annotation

GitHub Actions / test 

Prop "config" should define at least its type

Check warning on line 155 in frontend/src/components/sdcCollection/stepThreeVerifyData/DetailComponent.vue

View workflow job for this annotation

GitHub Actions / test 

Prop "config" should define at least its type
tabFilter: Object,
required: true,
default: null
Expand All @@ -170,7 +170,7 @@
searchText: '',
filterSearchParams: {
tabFilter: this.config.defaultFilter,
sdcSchoolCollectionStudentStatusCode: 'LOADED,ERROR,INFO_WARNING,FUNDING_WARNING,VERIFIED,FIXABLE',
sdcSchoolCollectionStudentStatusCode: 'LOADED,INFOWARN,FUNDWARN,VERIFIED,FIXABLE',
},
};
},
Expand Down
Loading