diff --git a/app/helpers/dashboard/header_helper.rb b/app/helpers/dashboard/header_helper.rb index 3d2847f..c19d6bc 100644 --- a/app/helpers/dashboard/header_helper.rb +++ b/app/helpers/dashboard/header_helper.rb @@ -42,15 +42,15 @@ module Dashboard private def overview_link(district_slug:, school_slug:, academic_year_range:) - "/districts/#{district_slug}/schools/#{school_slug}/overview?year=#{academic_year_range}" + "/dashboard/districts/#{district_slug}/schools/#{school_slug}/overview?year=#{academic_year_range}" end def analyze_link(district_slug:, school_slug:, academic_year_range:) - "/districts/#{district_slug}/schools/#{school_slug}/analyze?year=#{academic_year_range}&academic_years=#{academic_year_range}" + "/dashboard/districts/#{district_slug}/schools/#{school_slug}/analyze?year=#{academic_year_range}&academic_years=#{academic_year_range}" end def browse_link(district_slug:, school_slug:, academic_year_range:) - "/districts/#{district_slug}/schools/#{school_slug}/browse/teachers-and-leadership?year=#{academic_year_range}" + "/dashboard/districts/#{district_slug}/schools/#{school_slug}/browse/teachers-and-leadership?year=#{academic_year_range}" end def active?(path:) diff --git a/app/models/dashboard/score.rb b/app/models/dashboard/score.rb index 9dd5d4e..82f1e97 100644 --- a/app/models/dashboard/score.rb +++ b/app/models/dashboard/score.rb @@ -7,13 +7,6 @@ module Dashboard NIL_SCORE = Score.new(average: nil, meets_teacher_threshold: false, meets_student_threshold: false, meets_admin_data_threshold: false) - enum group: { - all_students: 0, - race: 1, - grade: 2, - gender: 3 - } - def in_zone?(zone:) return false if average.nil? || average.is_a?(Float) && average.nan? diff --git a/app/views/dashboard/overview/_subcategory_card.html.erb b/app/views/dashboard/overview/_subcategory_card.html.erb index 728484e..c105286 100644 --- a/app/views/dashboard/overview/_subcategory_card.html.erb +++ b/app/views/dashboard/overview/_subcategory_card.html.erb @@ -1,5 +1,11 @@