From ea09fa06b774b62e0d4abf6a04aa7f0d2000b139 Mon Sep 17 00:00:00 2001 From: rebuilt Date: Thu, 7 Jul 2022 18:47:51 -0700 Subject: [PATCH] Add popup message on admin data exclamation point indicators --- app/models/measure.rb | 9 +++------ app/presenters/student_survey_presenter.rb | 4 +++- app/presenters/teacher_survey_presenter.rb | 4 +++- app/views/categories/_data_item_section.html.erb | 4 +++- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/models/measure.rb b/app/models/measure.rb index 4837607f..60d79470 100644 --- a/app/models/measure.rb +++ b/app/models/measure.rb @@ -204,10 +204,8 @@ class Measure < ActiveRecord::Base def sufficient_student_data?(school:, academic_year:) return @sufficient_student_data ||= false unless includes_student_survey_items? - return @sufficient_student_data ||= false if student_survey_items_by_survey_type(school:, - academic_year:).all? do |survey_item| - survey_item.survey_item_responses.where(school:, - academic_year:).none? + return @sufficient_student_data ||= false if student_survey_items_by_survey_type(school:, academic_year:).all? do |survey_item| + survey_item.survey_item_responses.where(school:, academic_year:).none? end @sufficient_student_data ||= subcategory.response_rate(school:, academic_year:).meets_student_threshold? @@ -216,8 +214,7 @@ class Measure < ActiveRecord::Base def sufficient_teacher_data?(school:, academic_year:) return @sufficient_teacher_data ||= false unless includes_teacher_survey_items? return @sufficient_teacher_data ||= false if teacher_survey_items.all? do |survey_item| - survey_item.survey_item_responses.where(school:, - academic_year:).none? + survey_item.survey_item_responses.where(school:, academic_year:).none? end @sufficient_teacher_data ||= subcategory.response_rate(school:, academic_year:).meets_teacher_threshold? diff --git a/app/presenters/student_survey_presenter.rb b/app/presenters/student_survey_presenter.rb index d219eb51..f607b7d0 100644 --- a/app/presenters/student_survey_presenter.rb +++ b/app/presenters/student_survey_presenter.rb @@ -1,4 +1,6 @@ class StudentSurveyPresenter < DataItemPresenter + attr_reader :survey_items + def initialize(measure_id:, survey_items:, has_sufficient_data:, school:, academic_year:) super(measure_id:, has_sufficient_data:, school:, academic_year:) @survey_items = survey_items @@ -21,7 +23,7 @@ class StudentSurveyPresenter < DataItemPresenter end def descriptions_and_availability - @survey_items.map do |survey_item| + survey_items.map do |survey_item| DataAvailability.new(survey_item.survey_item_id, survey_item.prompt, true) end end diff --git a/app/presenters/teacher_survey_presenter.rb b/app/presenters/teacher_survey_presenter.rb index e64e37ca..6f96994c 100644 --- a/app/presenters/teacher_survey_presenter.rb +++ b/app/presenters/teacher_survey_presenter.rb @@ -1,4 +1,6 @@ class TeacherSurveyPresenter < DataItemPresenter + attr_reader :survey_items + def initialize(measure_id:, survey_items:, has_sufficient_data:, school:, academic_year:) super(measure_id:, has_sufficient_data:, school:, academic_year:) @survey_items = survey_items @@ -23,7 +25,7 @@ class TeacherSurveyPresenter < DataItemPresenter end def descriptions_and_availability - @survey_items.map do |survey_item| + survey_items.map do |survey_item| DataAvailability.new(survey_item.survey_item_id, survey_item.prompt, true) end end diff --git a/app/views/categories/_data_item_section.html.erb b/app/views/categories/_data_item_section.html.erb index 4b903759..41fb7004 100644 --- a/app/views/categories/_data_item_section.html.erb +++ b/app/views/categories/_data_item_section.html.erb @@ -30,7 +30,9 @@ <% data_item_section.descriptions_and_availability.each do |data| %>
  • <%= data.description %> <% unless data.available? %> -   +   <% end %>
  • <% end %>