diff --git a/app/controllers/overview_controller.rb b/app/controllers/overview_controller.rb index 9e15112a..cfd716a1 100644 --- a/app/controllers/overview_controller.rb +++ b/app/controllers/overview_controller.rb @@ -16,9 +16,9 @@ class OverviewController < SqmApplicationController end def check_empty_dataset - @has_empty_dataset = subcategories.all? do |subcategory| + @has_empty_dataset = !subcategories.any? do |subcategory| response_rate = subcategory.response_rate(school: @school, academic_year: @academic_year) - !response_rate.meets_student_threshold && !response_rate.meets_teacher_threshold + response_rate.meets_student_threshold || response_rate.meets_teacher_threshold end end diff --git a/app/helpers/analyze_helper.rb b/app/helpers/analyze_helper.rb index 3bfaa39d..e74607ca 100644 --- a/app/helpers/analyze_helper.rb +++ b/app/helpers/analyze_helper.rb @@ -73,9 +73,9 @@ module AnalyzeHelper def empty_dataset?(measures:, school:, academic_year:) @empty_dataset ||= Hash.new do |memo, (school, academic_year)| - memo[[school, academic_year]] = measures.all? do |measure| + memo[[school, academic_year]] = !measures.any? do |measure| response_rate = measure.subcategory.response_rate(school:, academic_year:) - !response_rate.meets_student_threshold && !response_rate.meets_teacher_threshold + response_rate.meets_student_threshold || response_rate.meets_teacher_threshold end end