gabehf/sqm-dashboards
1
0
Fork 0
mirror of https://github.com/edcommonwealth/sqm-dashboards.git synced 2026-03-09 07:28:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "fix: Fixes #187294757. Data is hidden when selecting multiple years if the default year has no student data to show"

Browse source 
This reverts commit b9bdd707b5.
This commit is contained in:
Nelson Jovel 2024-03-26 15:32:54 -07:00
parent 993fafcc0e
commit a191271504
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/presenters/analyze/graph/column/ell_column/ell_count.rb
View file

@ -8,7 +8,7 @@ module Analyze
end
def n_size(year_index)
SurveyItemResponse.where(ell:, survey_item: measure.student_survey_items, school:, grade: grades,
SurveyItemResponse.where(ell:, survey_item: measure.student_survey_items, school:, grade: grades(year_index),
academic_year: academic_years[year_index]).select(:response_id).distinct.count
end
end

2
app/presenters/analyze/graph/column/gender_column/gender_count.rb
View file

@ -8,7 +8,7 @@ module Analyze
end
def n_size(year_index)
SurveyItemResponse.where(gender:, survey_item: measure.student_survey_items, school:, grade: grades,
SurveyItemResponse.where(gender:, survey_item: measure.student_survey_items, school:, grade: grades(year_index),
academic_year: academic_years[year_index]).select(:response_id).distinct.count
end
end

6
app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb
View file

@ -114,7 +114,7 @@ module Analyze
end
def n_size(year_index)
SurveyItemResponse.where(survey_item: measure.student_survey_items, school:, grade: grades,
SurveyItemResponse.where(survey_item: measure.student_survey_items, school:, grade: grades(year_index),
academic_year: academic_years[year_index]).select(:response_id).distinct.count
end
@ -137,8 +137,8 @@ module Analyze
end
end
def grades
Respondent.by_school_and_year(school:, academic_year: academic_years)&.enrollment_by_grade&.keys
def grades(year_index)
Respondent.by_school_and_year(school:, academic_year: academic_years[year_index]).enrollment_by_grade.keys
end
private

2
app/presenters/analyze/graph/column/income_column/income_count.rb
View file

@ -8,7 +8,7 @@ module Analyze
end
def n_size(year_index)
SurveyItemResponse.where(income:, survey_item: measure.student_survey_items, school:, grade: grades,
SurveyItemResponse.where(income:, survey_item: measure.student_survey_items, school:, grade: grades(year_index),
academic_year: academic_years[year_index]).select(:response_id).distinct.count
end
end

2
app/presenters/analyze/graph/column/sped_column/sped_count.rb
View file

@ -8,7 +8,7 @@ module Analyze
end
def n_size(year_index)
SurveyItemResponse.where(sped:, survey_item: measure.student_survey_items, school:, grade: grades,
SurveyItemResponse.where(sped:, survey_item: measure.student_survey_items, school:, grade: grades(year_index),
academic_year: academic_years[year_index]).select(:response_id).distinct.count
end
end