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

Bug fixes: EDX-2977, 2982 #2070

Merged
merged 1 commit into from
Oct 7, 2024
Merged

Bug fixes: EDX-2977, 2982 #2070

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
3 changes: 3 additions & 0 deletions backend/src/components/sdc/sdc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,9 @@ async function getSDCSchoolCollectionStudentDetail(req, res) {
if (sdcSchoolCollectionStudentData?.enrolledProgramCodes) {
sdcSchoolCollectionStudentData.enrolledProgramCodes = sdcSchoolCollectionStudentData?.enrolledProgramCodes.match(/.{1,2}/g);
}
if (sdcSchoolCollectionStudentData?.numberOfCourses) {
sdcSchoolCollectionStudentData.numberOfCourses = formatNumberOfCourses(sdcSchoolCollectionStudentData?.numberOfCourses);
}

let school = cacheService.getSchoolBySchoolID(sdcSchoolCollectionStudentData.schoolID);
sdcSchoolCollectionStudentData.schoolName = getSchoolName(school);
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/common/CustomTableSlice.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,5 +427,6 @@ tr:hover td {
justify-content: center;
gap: .5rem;
padding-bottom: .2rem;
padding-top: 1rem;
}
</style>
8 changes: 5 additions & 3 deletions frontend/src/components/common/Filters.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
id="searchFiltering"
class="filter-heading pb-0"
>
Name and ID Filtering
</v-col>
<v-tooltip content-class="customTooltip">
<span>Name and ID Filtering</span>

<v-tooltip content-class="customTooltip">
<template #activator="{ props: tooltipProps }">
<v-icon
v-bind="tooltipProps"
Expand All @@ -67,6 +67,8 @@
The search button must be used to apply changes to PEN or Local ID or Name searches. All other filters will apply on change without use of the search button.
</span>
</v-tooltip>
</v-col>

</v-row>
<v-row>
<v-col
Expand Down
Loading