diff --git a/app/models/scale.rb b/app/models/scale.rb index a33479c8..6abb6f9d 100644 --- a/app/models/scale.rb +++ b/app/models/scale.rb @@ -11,7 +11,7 @@ class Scale < ApplicationRecord items << collect_survey_item_average(student_survey_items(school:, academic_year:), school, academic_year) items << collect_survey_item_average(teacher_survey_items, school, academic_year) - items.remove_zeros.average + items.remove_blanks.average end end @score[[school, academic_year]] @@ -29,7 +29,7 @@ class Scale < ApplicationRecord def collect_survey_item_average(survey_items, school, academic_year) survey_items.map do |survey_item| survey_item.score(school:, academic_year:) - end.remove_zeros.average + end.remove_blanks.average end def teacher_survey_items diff --git a/config/initializers/array_monkey_patches.rb b/config/initializers/array_monkey_patches.rb index 2d5ade6c..6eeda8ef 100644 --- a/config/initializers/array_monkey_patches.rb +++ b/config/initializers/array_monkey_patches.rb @@ -3,7 +3,7 @@ module ArrayMonkeyPatches sum.to_f / size end - def remove_zeros + def remove_blanks reject { |item| item == 0 || item.to_f.nan? } end end