diff --git a/app/assets/stylesheets/sqm.sass.scss b/app/assets/stylesheets/sqm.sass.scss index 8e169b24..6914d7bc 100644 --- a/app/assets/stylesheets/sqm.sass.scss +++ b/app/assets/stylesheets/sqm.sass.scss @@ -68,6 +68,7 @@ .measure-description { text-align: center; + color: $gray-1; } .measure-card { diff --git a/app/presenters/parent_scale_presenter.rb b/app/presenters/parent_scale_presenter.rb index 0ff4d31b..26706c12 100644 --- a/app/presenters/parent_scale_presenter.rb +++ b/app/presenters/parent_scale_presenter.rb @@ -40,6 +40,10 @@ class ParentScalePresenter .values.average end + def measure + scale.measure + end + private def scale_id diff --git a/app/views/analyze/index.html.erb b/app/views/analyze/index.html.erb index ba623754..dbb47265 100644 --- a/app/views/analyze/index.html.erb +++ b/app/views/analyze/index.html.erb @@ -19,7 +19,7 @@
<% @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, columns: @presenter.graph.columns} %> @@ -27,6 +27,9 @@ <% if @presenter.show_secondary_graph?(measure:) %>
+ <% measure.scales.parent_scales.each do | scale| %> + + <% end %> <%= link_to("Parent Survey", 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.subcategory.name %>

<%= render partial: "grouped_bar_chart" , locals: { measure: measure, columns: @presenter.columns_for_measure(measure:)} %> diff --git a/app/views/categories/_measures_section.html.erb b/app/views/categories/_measures_section.html.erb index 183e36fd..7aa00bed 100644 --- a/app/views/categories/_measures_section.html.erb +++ b/app/views/categories/_measures_section.html.erb @@ -1,6 +1,8 @@

<%= measure_presenter.title %>

-

<%= measure_presenter.name %>

+ <%= link_to(district_school_analyze_index_path(@district, @school, { academic_year: @academic_year.range, category: measure_presenter.measure.subcategory.category.category_id, subcategory: measure_presenter.measure.subcategory.subcategory_id, anchor: measure_presenter.id}), class: "measure-description sub-header-4 mb-5") do %> +

<%= measure_presenter.name %>

+ <% end %>
<%= render partial: "gauge_graph", locals: { gauge: measure_presenter.gauge_presenter, gauge_class: 'gauge-graph-sm', font_class: 'weight-700' } %>
diff --git a/app/views/categories/_subcategory_section.html.erb b/app/views/categories/_subcategory_section.html.erb index 0a5084ad..7102d542 100644 --- a/app/views/categories/_subcategory_section.html.erb +++ b/app/views/categories/_subcategory_section.html.erb @@ -1,6 +1,9 @@
-

Subcategory <%= subcategory.id %>

+ <%= link_to(district_school_analyze_index_path(@district, @school, { academic_year: @academic_year.range, category: subcategory.subcategory.category.category_id, subcategory: subcategory.id})) do %> +

Subcategory <%= subcategory.id %>

+ <% end %> +

<%= subcategory.name %>

@@ -15,8 +18,8 @@ data-bs-trigger="hover focus" data-bs-content="The number of publicly available school data sources, often collected from the MA Department of Elementary and Secondary Education." data-bs-placement="bottom" - > -

<%= subcategory.admin_collection_rate.first %> / <%= subcategory.admin_collection_rate.last %>

+ > +

<%= subcategory.admin_collection_rate.first %> / <%= subcategory.admin_collection_rate.last %>

school data sources

+ >

<%= subcategory.student_response_rate %>

of students responded

@@ -48,10 +51,10 @@
<% if subcategory.show_scale_presenters? %> -
- <% subcategory.scale_presenters.each do |scale_presenter| %> - <%= render partial: "measures_section", locals: { measure_presenter: scale_presenter } %> - <% end %> -
-<% end %> +
+ <% subcategory.scale_presenters.each do |scale_presenter| %> + <%= render partial: "measures_section", locals: { measure_presenter: scale_presenter } %> + <% end %> +
+ <% end %>