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

mciea-main
Nelson Jovel 2 years ago
parent 4da1aef59b
commit 49a838c060

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

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

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

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

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

Loading…
Cancel
Save