diff --git a/app/views/analyze/index.html.erb b/app/views/analyze/index.html.erb index 909cd431..fc4342c7 100644 --- a/app/views/analyze/index.html.erb +++ b/app/views/analyze/index.html.erb @@ -1,27 +1,29 @@ -<% content_for :title do %> -

Analysis of <%= @school.name %>

-<% end %> -
- -
-
-
-
- <%= render partial: "focus_area", locals: {categories: @presenter.categories, district: @district, school: @school, academic_year: @academic_year, category: @presenter.category, subcategories: @presenter.subcategories} %> - <%= render partial: "school_years", locals: {available_academic_years: @presenter.academic_years, selected_academic_years: @presenter.selected_academic_years, district: @district, school: @school, academic_year: @academic_year, category: @presenter.category, subcategory: @presenter.subcategory, measures: @presenter.measures, graph: @presenter.graph} %> - <%= render partial: "data_filters", locals: {district: @district, school: @school, academic_year: @academic_year, category: @presenter.category, subcategory: @presenter.subcategory} %> +<%= turbo_frame_tag "results" do %> + <% content_for :title do %> +

Analysis of <%= @school.name %>

+ <% end %> +
+ +
- <% cache [@school, @presenter.cache_objects] do %> -
- <% @presenter.measures.each do |measure| %> -
-

Measure <%= measure.measure_id %>

-

<%= measure.name %>

- <%= render partial: "grouped_bar_chart" , locals: { measure: measure} %> -
- <% end %> +
+
+ <%= render partial: "focus_area", locals: {categories: @presenter.categories, district: @district, school: @school, academic_year: @academic_year, category: @presenter.category, subcategories: @presenter.subcategories} %> + <%= render partial: "school_years", locals: {available_academic_years: @presenter.academic_years, selected_academic_years: @presenter.selected_academic_years, district: @district, school: @school, academic_year: @academic_year, category: @presenter.category, subcategory: @presenter.subcategory, measures: @presenter.measures, graph: @presenter.graph} %> + <%= render partial: "data_filters", locals: {district: @district, school: @school, academic_year: @academic_year, category: @presenter.category, subcategory: @presenter.subcategory} %>
- <% end %> -
+ <% cache [@school, @presenter.cache_objects] do %> +
+ <% @presenter.measures.each do |measure| %> +
+ <%= link_to("MEASURE " + measure.measure_id.upcase, district_school_category_path( @district, @school, @presenter.category, {year: @presenter.selected_academic_years.last.range, anchor: "#{measure.measure_id}"}), class: "construct-id", data: {turbo_frame: "_top"}) %> +

<%= measure.name %>

+ <%= render partial: "grouped_bar_chart" , locals: { measure: measure} %> +
+ <% end %> +
+ <% end %> +
+<% end %>