From 1595c3a58ca0484eec68e80167f6a58da4e0432d Mon Sep 17 00:00:00 2001 From: rebuilt Date: Tue, 21 Mar 2023 15:43:25 -0700 Subject: [PATCH] rename admin data to school data --- app/presenters/admin_data_presenter.rb | 6 +- .../analyze/graph/column/all_admin.rb | 6 +- .../variance_chart_row_presenter.rb | 2 +- .../layouts/_empty_dataset_modal.html.erb | 2 +- app/views/overview/_variance_chart.html.erb | 6 +- spec/presenters/measure_presenter_spec.rb | 88 ++++---- .../variance_chart_row_presenter_spec.rb | 190 +++++++++--------- spec/views/overview/index.html.erb_spec.rb | 88 ++++---- 8 files changed, 194 insertions(+), 194 deletions(-) diff --git a/app/presenters/admin_data_presenter.rb b/app/presenters/admin_data_presenter.rb index 294d9f0c..db92b05a 100644 --- a/app/presenters/admin_data_presenter.rb +++ b/app/presenters/admin_data_presenter.rb @@ -7,7 +7,7 @@ class AdminDataPresenter < DataItemPresenter end def title - 'School admin data' + "School data" end def id @@ -15,13 +15,13 @@ class AdminDataPresenter < DataItemPresenter end def reason_for_insufficiency - 'limited availability' + "limited availability" end def descriptions_and_availability @admin_data_items.map do |admin_data_item| DataAvailability.new(admin_data_item.admin_data_item_id, admin_data_item.description, - admin_data_item.admin_data_values.where(school:, academic_year:).count > 0) + admin_data_item.admin_data_values.where(school:, academic_year:).count > 0) end end end diff --git a/app/presenters/analyze/graph/column/all_admin.rb b/app/presenters/analyze/graph/column/all_admin.rb index 7cdb59be..b166ecf5 100644 --- a/app/presenters/analyze/graph/column/all_admin.rb +++ b/app/presenters/analyze/graph/column/all_admin.rb @@ -5,11 +5,11 @@ module Analyze module Column class AllAdmin < GroupedBarColumnPresenter def label - 'All Admin' + "School data" end def basis - 'admin data' + "school data" end def show_irrelevancy_message? @@ -23,7 +23,7 @@ module Analyze end def insufficiency_message - ['data not', 'available'] + ["data not", "available"] end def score(year_index) diff --git a/app/presenters/variance_chart_row_presenter.rb b/app/presenters/variance_chart_row_presenter.rb index 52cce6e1..122d71fc 100644 --- a/app/presenters/variance_chart_row_presenter.rb +++ b/app/presenters/variance_chart_row_presenter.rb @@ -59,7 +59,7 @@ class VarianceChartRowPresenter [].tap do |sources| sources << 'teacher survey results' if @measure.includes_teacher_survey_items? && !@meets_teacher_threshold sources << 'student survey results' if @measure.includes_student_survey_items? && !@meets_student_threshold - sources << 'administrative data' if @measure.includes_admin_data_items? + sources << 'school data' if @measure.includes_admin_data_items? end end diff --git a/app/views/layouts/_empty_dataset_modal.html.erb b/app/views/layouts/_empty_dataset_modal.html.erb index 1d0f4c01..7059d613 100644 --- a/app/views/layouts/_empty_dataset_modal.html.erb +++ b/app/views/layouts/_empty_dataset_modal.html.erb @@ -8,7 +8,7 @@