From 2614a0f1271f48d2a2b72328a132c38e68f4fdc7 Mon Sep 17 00:00:00 2001 From: Jared Cosulich Date: Thu, 28 Feb 2019 15:42:38 -0500 Subject: [PATCH] fixing bug --- app/controllers/categories_controller.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index 6e5770a6..77e1c6c1 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -13,14 +13,17 @@ class CategoriesController < ApplicationController def show district = @school.district authenticate(district.name.downcase, "#{district.name.downcase}!") + school_categories = SchoolCategory.for(@school, @category) + @years = school_categories.map(&:year).map(&:to_i).sort + @year = (params[:year] || @years.first || "2018").to_i + @years.delete(@year) + if school_categories.empty? school_categories = [SchoolCategory.new(school: @school, category: @category, year: @year)] end - @years = school_categories.map(&:year).map(&:to_i).sort - @year = (params[:year] || @years.first).to_i - @years.delete(@year) - @school_category = school_categories.in(@year).first + + @school_category = school_categories.select { |sc| sc.year.to_s == @year.to_s }.first @child_school_categories = SchoolCategory.for_parent_category(@school, @category).in(@year).valid.to_a missing_categories = Category.for_parent(@category) - @child_school_categories.map(&:category) missing_categories.each do |category|