From c557adab5a38426d9164071ad4583641d50900c8 Mon Sep 17 00:00:00 2001 From: Jared Cosulich Date: Fri, 9 Aug 2019 09:46:30 -0400 Subject: [PATCH] show all years --- app/controllers/schools_controller.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/schools_controller.rb b/app/controllers/schools_controller.rb index e8249545..e6d7fb58 100644 --- a/app/controllers/schools_controller.rb +++ b/app/controllers/schools_controller.rb @@ -10,17 +10,17 @@ class SchoolsController < ApplicationController @district = @school.district authenticate(@district.name.downcase, "#{@district.name.downcase}!") + @years = [2017, 2018, 2019] + @year = (params[:year] || @years.last).to_i + if @district.name == "Boston" @categories = Category.joins(:questions) - @school_categories = SchoolCategory.where(school: @school).where(category: @categories).to_a + @school_categories = SchoolCategory.where(school: @school).where(category: @categories).in(@year).to_a else @categories = Category.root - @school_categories = @school.school_categories.for_parent_category(@school, nil).valid.sort + @school_categories = @school.school_categories.for_parent_category(@school, nil).valid.in(@year).sort end - @years = @school_categories.map(&:year).map(&:to_i).sort.uniq - @year = (params[:year] || @years.last || "2019").to_i - missing_categories = @categories - @school_categories.map(&:category) missing_categories.each do |category| @school_categories << category.school_categories.new(school: @school, year: @year)