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.

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

fix(KUI-1196): add orderedSchoolsOptions to have charts in alphabetical order #358

Merged
merged 1 commit into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion public/js/app/components/statistics/Chart.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function splitIntoLines(label) {
}

function getChartData(numberName, schools, allSchoolsLabels) {
const orderedSchools = schoolsLib.orderedSchoolsFormOptions()
const orderedSchools = schoolsLib.orderedSchoolsOptions()

let schoolCodes = Object.keys(schools)

Expand Down
3 changes: 2 additions & 1 deletion public/js/app/components/statistics/domain/schools.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const ORDERED_SCHOOLS_FORM = [SCHOOLS.ABE, SCHOOLS.ITM, SCHOOLS.CBH, SCHOOLS.SCI
const ORDERED_SCHOOLS = [SCHOOLS.ABE, SCHOOLS.CBH, SCHOOLS.EECS, SCHOOLS.ITM, SCHOOLS.SCI]

const orderedSchoolsFormOptions = () => [...ORDERED_SCHOOLS_FORM, 'allSchools']
const orderedSchoolsOptions = () => [...ORDERED_SCHOOLS, 'allSchools']
const DEPARTMENT_TO_SCHOOL_MAP = {
ABE: SCHOOLS.ABE,
CBH: SCHOOLS.CBH,
Expand All @@ -23,4 +24,4 @@ const DEPARTMENT_TO_SCHOOL_MAP = {
ITM: SCHOOLS.ITM,
SCI: SCHOOLS.SCI,
}
export default { DEPARTMENT_TO_SCHOOL_MAP, ORDERED_SCHOOLS, orderedSchoolsFormOptions, SCHOOLS }
export default { DEPARTMENT_TO_SCHOOL_MAP, ORDERED_SCHOOLS, orderedSchoolsFormOptions, orderedSchoolsOptions, SCHOOLS }
Loading