mirror of
https://github.com/edcommonwealth/sqm-dashboards.git
synced 2026-03-08 23:18:18 -07:00
Use public score_for_measure method instead of private 'for_measure' scope
This commit is contained in:
parent
f3c632ea2a
commit
f5e5abc27e
2 changed files with 2 additions and 6 deletions
|
|
@ -6,8 +6,6 @@ class SurveyItemResponse < ActiveRecord::Base
|
|||
belongs_to :school
|
||||
belongs_to :survey_item
|
||||
|
||||
scope :for_measure, ->(measure) { joins(:survey_item).where('survey_items.measure_id': measure.id) }
|
||||
|
||||
def self.score_for_subcategory(subcategory:, school:, academic_year:)
|
||||
measures = subcategory.measures.select { |measure| sufficient_data?(measure: measure, school: school, academic_year: academic_year) }
|
||||
|
||||
|
|
@ -26,6 +24,7 @@ class SurveyItemResponse < ActiveRecord::Base
|
|||
|
||||
private
|
||||
|
||||
scope :for_measure, ->(measure) { joins(:survey_item).where('survey_items.measure_id': measure.id) }
|
||||
scope :for_measures, ->(measures) { joins(:survey_item).where('survey_items.measure_id': measures.map(&:id)) }
|
||||
scope :teacher_responses_for_measure, ->(measure) { for_measure(measure).where("survey_items.survey_item_id LIKE 't-%'") }
|
||||
scope :student_responses_for_measure, ->(measure) { for_measure(measure).where("survey_items.survey_item_id LIKE 's-%'") }
|
||||
|
|
|
|||
|
|
@ -14,10 +14,7 @@ class MeasurePresenter
|
|||
end
|
||||
|
||||
def gauge_presenter
|
||||
average_score = SurveyItemResponse.for_measure(@measure)
|
||||
.where(academic_year: @academic_year, school: @school)
|
||||
.average(:likert_score)
|
||||
|
||||
average_score = SurveyItemResponse.score_for_measure(measure: @measure, academic_year: @academic_year, school: @school)
|
||||
GaugePresenter.new(scale: scale, score: average_score)
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue