diff --git a/app/models/report/beyond_learning_loss.rb b/app/models/report/beyond_learning_loss.rb index f3a268c2..ed979820 100644 --- a/app/models/report/beyond_learning_loss.rb +++ b/app/models/report/beyond_learning_loss.rb @@ -20,7 +20,14 @@ module Report response_rate = scale.measure.subcategory.response_rate(school:, academic_year:) next unless response_rate.meets_student_threshold? || response_rate.meets_teacher_threshold? - score = scale.score(school:, academic_year:) + score = if scale.scale_id.starts_with?("a-") + AdminDataValue.where(admin_data_item: scale.admin_data_items, school:, + academic_year:).map do |item| + item.likert_score + end.average + else + scale.score(school:, academic_year:) + end begin_date = SurveyItemResponse.where(school:, academic_year:).where.not(recorded_date: nil).order(:recorded_date).first&.recorded_date&.to_date diff --git a/lib/tasks/report.rake b/lib/tasks/report.rake index e56fdeb3..be8a04a2 100644 --- a/lib/tasks/report.rake +++ b/lib/tasks/report.rake @@ -45,7 +45,9 @@ namespace :report do Report::Measure.create_report(filename: "measure_report_attleboro.csv", measures:, schools:) end + end + namespace :scale do task bll: :environment do measure_ids = %w[ 2A-i