diff --git a/app/controllers/analyze_controller.rb b/app/controllers/analyze_controller.rb index 49292472..3fd5b5be 100644 --- a/app/controllers/analyze_controller.rb +++ b/app/controllers/analyze_controller.rb @@ -5,5 +5,8 @@ class AnalyzeController < SqmApplicationController @subcategory ||= Subcategory.find_by_subcategory_id(params[:subcategory_id]) @subcategory ||= Subcategory.find_by_subcategory_id('1A') + + @measure = @subcategory.measures.first + @academic_year ||= AcademicYear.order('range DESC').first end end diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index 8ba4ebd3..ad84a669 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -1,4 +1,5 @@ class CategoriesController < SqmApplicationController + helper GaugeHelper def show @categories = Category.sorted.map { |category| CategoryPresenter.new(category:) } diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 744ec810..4e02ecb6 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,4 +1,5 @@ class HomeController < ApplicationController + helper HeaderHelper def index @districts = District.all.order(:name) @schools = School.all.includes([:district]).order(:name) diff --git a/app/controllers/overview_controller.rb b/app/controllers/overview_controller.rb index 346fefbe..b05c6413 100644 --- a/app/controllers/overview_controller.rb +++ b/app/controllers/overview_controller.rb @@ -1,5 +1,6 @@ class OverviewController < SqmApplicationController before_action :check_empty_dataset, only: [:index] + helper VarianceHelper def index @variance_chart_row_presenters = Measure.all.map(&method(:presenter_for_measure)) diff --git a/app/controllers/sqm_application_controller.rb b/app/controllers/sqm_application_controller.rb index 3422e325..c0061866 100644 --- a/app/controllers/sqm_application_controller.rb +++ b/app/controllers/sqm_application_controller.rb @@ -1,6 +1,7 @@ class SqmApplicationController < ApplicationController protect_from_forgery with: :exception, prepend: true before_action :set_schools_and_districts + helper HeaderHelper private diff --git a/app/helpers/analyze_helper.rb b/app/helpers/analyze_helper.rb new file mode 100644 index 00000000..25b5cfd7 --- /dev/null +++ b/app/helpers/analyze_helper.rb @@ -0,0 +1,57 @@ +module AnalyzeHelper + def zone_label_width + 15 + end + + def zone_label_x + 2 + end + + def graph_height + 85 + end + + def svg_height + 400 + end + + def graph_width + 85 + end + + def benchmark_y + (zone_height * 2) - (benchmark_height / 2.0) + end + + def benchmark_height + 1 + end + + def grouped_chart_width + graph_width / data_sources + end + + def grouped_chart_divider_x(position) + zone_label_width + (grouped_chart_width * position) + end + + def bar_label_height + (100 - ((100 - graph_height) / 2)) + end + + def bar_label_x(position) + zone_label_width + (grouped_chart_width * position) - (grouped_chart_width / 2) + end + + def zone_height + graph_height / 5 + end + + def zone_label_y(position) + 8.5 * (position + position - 1) + end + + def data_sources + 3 + end +end diff --git a/app/models/measure.rb b/app/models/measure.rb index f50df8d2..5cd0b3e0 100644 --- a/app/models/measure.rb +++ b/app/models/measure.rb @@ -135,7 +135,6 @@ class Measure < ActiveRecord::Base averages << student_survey_items.first.send(name) if includes_student_survey_items? averages << teacher_survey_items.first.send(name) if includes_teacher_survey_items? (averages << admin_data_items.map(&name)).flatten! if includes_admin_data_items? - averages.average end end diff --git a/app/models/survey_item_response.rb b/app/models/survey_item_response.rb index 966a5aaa..13e685dc 100644 --- a/app/models/survey_item_response.rb +++ b/app/models/survey_item_response.rb @@ -7,7 +7,7 @@ class SurveyItemResponse < ActiveRecord::Base belongs_to :survey_item scope :exclude_boston, lambda { - boston = District.where(name: 'Boston').first + boston = District.find_by_name('Boston') where.not(school: boston.schools) if boston.present? } end diff --git a/app/presenters/grouped_bar_chart_presenter.rb b/app/presenters/grouped_bar_chart_presenter.rb new file mode 100644 index 00000000..2a7fcb4d --- /dev/null +++ b/app/presenters/grouped_bar_chart_presenter.rb @@ -0,0 +1,59 @@ +class GroupedBarChartPresenter + attr_reader :score + + def initialize(measure:, score:) + @measure = measure + @score = score.average + @meets_teacher_threshold = score.meets_teacher_threshold? + @meets_student_threshold = score.meets_student_threshold? + @measure_name = @measure.name + @measure_id = @measure.measure_id + @category = @measure.subcategory.category + end + + IDEAL_ZONE_WIDTH_PERCENTAGE = 0.17 + APPROVAL_ZONE_WIDTH_PERCENTAGE = 0.17 + GROWTH_ZONE_WIDTH_PERCENTAGE = 0.17 + WATCH_ZONE_WIDTH_PERCENTAGE = 0.17 + WARNING_ZONE_WIDTH_PERCENTAGE = 0.17 + + def y_offset + case zone.type + when :ideal, :approval + 34 - bar_height_percentage * 100 + else + 34 + end + end + + def bar_height_percentage + case zone.type + when :ideal + percentage * IDEAL_ZONE_WIDTH_PERCENTAGE + APPROVAL_ZONE_WIDTH_PERCENTAGE + when :approval + percentage * APPROVAL_ZONE_WIDTH_PERCENTAGE + when :growth + (1 - percentage) * GROWTH_ZONE_WIDTH_PERCENTAGE + when :watch + (1 - percentage) * WATCH_ZONE_WIDTH_PERCENTAGE + GROWTH_ZONE_WIDTH_PERCENTAGE + when :warning + (1 - percentage) * WARNING_ZONE_WIDTH_PERCENTAGE + WATCH_ZONE_WIDTH_PERCENTAGE + GROWTH_ZONE_WIDTH_PERCENTAGE + else + 0.0 + end + end + + def percentage + (@score - zone.low_benchmark) / (zone.high_benchmark - zone.low_benchmark) + end + + def zone + zones = Zones.new( + watch_low_benchmark: @measure.watch_low_benchmark, + growth_low_benchmark: @measure.growth_low_benchmark, + approval_low_benchmark: @measure.approval_low_benchmark, + ideal_low_benchmark: @measure.ideal_low_benchmark + ) + zones.zone_for_score(@score) + end +end diff --git a/app/views/analyze/index.html.erb b/app/views/analyze/index.html.erb index c80be234..a4c5073b 100644 --- a/app/views/analyze/index.html.erb +++ b/app/views/analyze/index.html.erb @@ -1,9 +1,74 @@ <% content_for :title do %>
Analysis of <%= @school.name %>
<% end %> - +<% presenter = GroupedBarChartPresenter.new(measure: @measure, score: @measure.score(school: @school, academic_year: @academic_year)) %>
-
+
<%= @category.category_id %>:<%= @category.name %> > <%= @subcategory.subcategory_id %>:<%= @subcategory.name %>
+
+ +
+

Measure <%= @measure.measure_id %>

+ + <%= @measure.name %> + +
+ +
+ + + + + + + + + + + + + + + + + + + Ideal + + + Approval + + + Growth + + + Watch + + + Warning + + + + + + All Students + + + All Teachers + + + All Survey Data + + + + + + + + <%= presenter.score %> + + + +
diff --git a/config/environments/development.rb b/config/environments/development.rb index 596af92c..a73fd411 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -69,4 +69,6 @@ Rails.application.configure do # Use an evented file watcher to asynchronously detect changes in source code, # routes, locales, etc. This feature depends on the listen gem. config.file_watcher = ActiveSupport::EventedFileUpdateChecker + + config.action_controller.include_all_helpers = false end diff --git a/config/environments/production.rb b/config/environments/production.rb index 1e1b5e1b..6609cef7 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -109,4 +109,6 @@ Rails.application.configure do # config.active_record.database_selector = { delay: 2.seconds } # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session + + config.action_controller.include_all_helpers = false end diff --git a/config/environments/test.rb b/config/environments/test.rb index 1dee5d8f..c591b948 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -52,4 +52,6 @@ Rails.application.configure do # Raises error for missing translations. # config.action_view.raise_on_missing_translations = true + + config.action_controller.include_all_helpers = false end diff --git a/spec/controllers/overview_controller_spec.rb b/spec/controllers/overview_controller_spec.rb index 27bb939f..577ca11d 100644 --- a/spec/controllers/overview_controller_spec.rb +++ b/spec/controllers/overview_controller_spec.rb @@ -1,4 +1,5 @@ require 'rails_helper' +include VarianceHelper describe OverviewController, type: :controller do include BasicAuthHelper diff --git a/spec/views/categories/show.html.erb_spec.rb b/spec/views/categories/show.html.erb_spec.rb index 3d0beb37..c1b91ae6 100644 --- a/spec/views/categories/show.html.erb_spec.rb +++ b/spec/views/categories/show.html.erb_spec.rb @@ -1,4 +1,5 @@ require 'rails_helper' +include GaugeHelper describe 'categories/show' do before :each do diff --git a/spec/views/legacy/schedules/edit.html.erb_spec.rb b/spec/views/legacy/schedules/edit.html.erb_spec.rb index 04dc35ab..bf49bcb8 100644 --- a/spec/views/legacy/schedules/edit.html.erb_spec.rb +++ b/spec/views/legacy/schedules/edit.html.erb_spec.rb @@ -1,4 +1,5 @@ require 'rails_helper' +include SchedulesHelper module Legacy RSpec.describe 'legacy/schedules/edit', type: :view do diff --git a/spec/views/legacy/schedules/new.html.erb_spec.rb b/spec/views/legacy/schedules/new.html.erb_spec.rb index 8cbdf2bf..faa885a5 100644 --- a/spec/views/legacy/schedules/new.html.erb_spec.rb +++ b/spec/views/legacy/schedules/new.html.erb_spec.rb @@ -1,4 +1,5 @@ require 'rails_helper' +include SchedulesHelper module Legacy RSpec.describe 'legacy/schedules/new', type: :view do diff --git a/spec/views/legacy/schedules/show.html.erb_spec.rb b/spec/views/legacy/schedules/show.html.erb_spec.rb index 4711ab93..0fd4b07a 100644 --- a/spec/views/legacy/schedules/show.html.erb_spec.rb +++ b/spec/views/legacy/schedules/show.html.erb_spec.rb @@ -1,4 +1,5 @@ require 'rails_helper' +include SchedulesHelper module Legacy RSpec.describe 'legacy/schedules/show', type: :view do diff --git a/spec/views/overview/index.html.erb_spec.rb b/spec/views/overview/index.html.erb_spec.rb index 58968f48..2fd00a8d 100644 --- a/spec/views/overview/index.html.erb_spec.rb +++ b/spec/views/overview/index.html.erb_spec.rb @@ -1,4 +1,5 @@ require 'rails_helper' +include VarianceHelper describe 'overview/index' do subject { Nokogiri::HTML(rendered) } diff --git a/spec/views/overview/variance_chart.html.erb_spec.rb b/spec/views/overview/variance_chart.html.erb_spec.rb index d4ea21e5..082927f5 100644 --- a/spec/views/overview/variance_chart.html.erb_spec.rb +++ b/spec/views/overview/variance_chart.html.erb_spec.rb @@ -1,4 +1,5 @@ require 'rails_helper' +include VarianceHelper describe 'overview/_variance_chart.html.erb' do before do