diff --git a/app/models/category.rb b/app/models/category.rb index ad546a98..199133d4 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -10,4 +10,5 @@ class Category < ActiveRecord::Base has_many :measures, through: :subcategories has_many :admin_data_items, through: :measures has_many :scales, through: :subcategories + has_many :survey_items, through: :scales end diff --git a/app/views/overview/_harvey_ball_legend.html.erb b/app/views/overview/_harvey_ball_legend.html.erb new file mode 100644 index 00000000..ccc6fe15 --- /dev/null +++ b/app/views/overview/_harvey_ball_legend.html.erb @@ -0,0 +1,19 @@ +
+
Warning
+ + + + + + + + + + + + + + + +
Ideal
+
diff --git a/app/views/overview/_student_parent_toggle.html.erb b/app/views/overview/_student_parent_toggle.html.erb new file mode 100644 index 00000000..637db33e --- /dev/null +++ b/app/views/overview/_student_parent_toggle.html.erb @@ -0,0 +1,7 @@ +
+ + + + + +
diff --git a/app/views/overview/_svg_defs.html.erb b/app/views/overview/_svg_defs.html.erb new file mode 100644 index 00000000..20a7137d --- /dev/null +++ b/app/views/overview/_svg_defs.html.erb @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/views/overview/index.html.erb b/app/views/overview/index.html.erb index 4adcc49b..5950423c 100644 --- a/app/views/overview/index.html.erb +++ b/app/views/overview/index.html.erb @@ -3,98 +3,34 @@ - <% end %> - <% cache do %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <% end %> - <% cache [@school, @academic_year] do %> -
-
-

School Quality Framework Indicators

-
-
Warning
- - - - - - - - - - - - - - - -
Ideal
-
-
- <%= render partial: "quality_framework_indicators", locals: { category_presenters: @category_presenters } %> - -
- <%= render partial: "response_rate", locals: {response_rate_presenter: @student_response_rate_presenter} %> - <%= render partial: "response_rate", locals: {response_rate_presenter: @teacher_response_rate_presenter} %> -
- + <% end %> + +<% end %> +<% cache do %> + <%= render partial: "svg_defs" %> +<% end %> +<% cache [@school, @academic_year] do %> +
+
+

School Quality Framework Indicators

+ <%= render partial: "harvey_ball_legend" %> + <%= render partial: "student_parent_toggle" %>
-
-

Distance From Benchmark

- <%= render partial: "variance_chart", locals: { presenters: @variance_chart_row_presenters } %> + <%= render partial: "quality_framework_indicators", locals: { category_presenters: @category_presenters } %> + +
+ <%= render partial: "response_rate", locals: {response_rate_presenter: @student_response_rate_presenter} %> + <%= render partial: "response_rate", locals: {response_rate_presenter: @teacher_response_rate_presenter} %>
- <% if @district == District.find_by_name("Boston") %> - <%= render partial: 'layouts/boston_modal' %> - <% elsif @has_empty_dataset %> - <%= render partial: 'layouts/empty_dataset_modal' %> - <% end %> - <% end %> + +
+
+

Distance From Benchmark

+ <%= render partial: "variance_chart", locals: { presenters: @variance_chart_row_presenters } %> +
+ <% if @district == District.find_by_name("Boston") %> + <%= render partial: 'layouts/boston_modal' %> + <% elsif @has_empty_dataset %> + <%= render partial: 'layouts/empty_dataset_modal' %> + <% end %> +<% end %>