diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 30fb8771..fde360fa 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -24,7 +24,7 @@ class DashboardController < ApplicationController end def academic_year - params[:year] + @academic_year ||= params[:year] end end diff --git a/app/helpers/categories_helper.rb b/app/helpers/categories_helper.rb deleted file mode 100644 index e06f3155..00000000 --- a/app/helpers/categories_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module CategoriesHelper -end diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb new file mode 100644 index 00000000..eb720a1b --- /dev/null +++ b/app/helpers/dashboard_helper.rb @@ -0,0 +1,6 @@ +module DashboardHelper + def format_academic_year(ay) + years = ay.split('-') + "#{years.first} – 20#{years.second}" + end +end diff --git a/app/helpers/districts_helper.rb b/app/helpers/districts_helper.rb deleted file mode 100644 index 3029f2c9..00000000 --- a/app/helpers/districts_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module DistrictsHelper -end diff --git a/app/helpers/question_lists_helper.rb b/app/helpers/question_lists_helper.rb deleted file mode 100644 index 61134f41..00000000 --- a/app/helpers/question_lists_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module QuestionListsHelper -end diff --git a/app/helpers/questions_helper.rb b/app/helpers/questions_helper.rb deleted file mode 100644 index c6bba990..00000000 --- a/app/helpers/questions_helper.rb +++ /dev/null @@ -1,3 +0,0 @@ -module QuestionsHelper - -end diff --git a/app/helpers/recipient_lists_helper.rb b/app/helpers/recipient_lists_helper.rb deleted file mode 100644 index 21b39b5e..00000000 --- a/app/helpers/recipient_lists_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module RecipientListsHelper -end diff --git a/app/helpers/recipients_helper.rb b/app/helpers/recipients_helper.rb deleted file mode 100644 index 0595f089..00000000 --- a/app/helpers/recipients_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module RecipientsHelper -end diff --git a/app/helpers/schools_helper.rb b/app/helpers/schools_helper.rb deleted file mode 100644 index e1893f43..00000000 --- a/app/helpers/schools_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module SchoolsHelper -end diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index d1e5b86b..ecb8c708 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -1,5 +1,25 @@

<%= @school.name %>

+
+

Areas Of Interest

+ + + + + + +
+ +
+

Top & Bottom 5 Distance From Benchmark

+
+ <% heading_gutter = 30 %> <% graph_height = @construct_graph_row_presenters.length * ConstructGraphParameters::CONSTRUCT_ROW_HEIGHT + heading_gutter %> height=<%= graph_height %> xmlns="http://www.w3.org/2000/svg"> diff --git a/spec/features/school_dashboard_feature_spec.rb b/spec/features/school_dashboard_feature_spec.rb index 3f9a9683..10063f20 100644 --- a/spec/features/school_dashboard_feature_spec.rb +++ b/spec/features/school_dashboard_feature_spec.rb @@ -31,6 +31,10 @@ feature "School dashboard", type: feature do visit "/districts/winchester/schools/#{school.slug}/dashboard?year=#{ay_2020_21}" + expect(page).to have_select('academic-year', selected: '2020 – 2021') + expect(page).to have_select('district', selected: 'Winchester') + expect(page).to have_select('school', selected: 'Winchester High School') + expect(page).to have_text(school.name) expect(page).to have_text('Professional Qualifications') first_row_bar = construct_row_bars.first