diff --git a/app/presenters/subcategory_presenter.rb b/app/presenters/subcategory_presenter.rb index 71729e43..3bf9f3c8 100644 --- a/app/presenters/subcategory_presenter.rb +++ b/app/presenters/subcategory_presenter.rb @@ -3,8 +3,10 @@ class SubcategoryPresenter @subcategory = subcategory @academic_year = academic_year @school = school - @student_response_rate = StudentResponseRate.new(subcategory: @subcategory, school: @school, academic_year: @academic_year) - @teacher_response_rate = TeacherResponseRate.new(subcategory: @subcategory, school: @school, academic_year: @academic_year) + @student_response_rate = StudentResponseRate.new(subcategory: @subcategory, school: @school, + academic_year: @academic_year) + @teacher_response_rate = TeacherResponseRate.new(subcategory: @subcategory, school: @school, + academic_year: @academic_year) end def id @@ -40,6 +42,10 @@ class SubcategoryPresenter @teacher_response_rate.rate end + def admin_collection_rate + [0, @subcategory.measures.map { |measure| measure.admin_data_items.count }.sum] + end + def measure_presenters @subcategory.measures.includes([:admin_data_items]).sort_by(&:measure_id).map do |measure| MeasurePresenter.new(measure: measure, academic_year: @academic_year, school: @school) diff --git a/app/views/categories/_subcategory_section.html.erb b/app/views/categories/_subcategory_section.html.erb index 06708d08..20a16710 100644 --- a/app/views/categories/_subcategory_section.html.erb +++ b/app/views/categories/_subcategory_section.html.erb @@ -12,10 +12,14 @@
<%= subcategory.admin_collection_rate.first %> / <%= subcategory.admin_collection_rate.last %>
+school admin data sources
+<%= subcategory.student_response_rate %>%
of students responded
<%= subcategory.teacher_response_rate %>%
of teachers responded