diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/overview.scss
similarity index 100%
rename from app/assets/stylesheets/dashboard.scss
rename to app/assets/stylesheets/overview.scss
diff --git a/app/assets/stylesheets/sqm_application.scss b/app/assets/stylesheets/sqm_application.scss
index 1661ee95..23dbc579 100644
--- a/app/assets/stylesheets/sqm_application.scss
+++ b/app/assets/stylesheets/sqm_application.scss
@@ -3,7 +3,7 @@
@import "colors";
@import "fonts";
@import "borders";
-@import "dashboard";
+@import "overview";
@import "navigation";
@import "buttons";
@import "@fortawesome/fontawesome-free/scss/fontawesome";
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/overview_controller.rb
similarity index 89%
rename from app/controllers/dashboard_controller.rb
rename to app/controllers/overview_controller.rb
index d4f1fc35..2c72f748 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/overview_controller.rb
@@ -1,4 +1,4 @@
-class DashboardController < SqmApplicationController
+class OverviewController < SqmApplicationController
def index
@variance_chart_row_presenters = Measure.all.map(&method(:presenter_for_measure))
diff --git a/app/helpers/header_helper.rb b/app/helpers/header_helper.rb
index 3fa8a1e9..5e5e43c5 100644
--- a/app/helpers/header_helper.rb
+++ b/app/helpers/header_helper.rb
@@ -1,7 +1,7 @@
module HeaderHelper
- def link_to_dashboard(district:, school:, academic_year:)
- "/districts/#{district.slug}/schools/#{school.slug}/dashboard?year=#{academic_year.range}"
+ def link_to_overview(district:, school:, academic_year:)
+ "/districts/#{district.slug}/schools/#{school.slug}/overview?year=#{academic_year.range}"
end
def link_to_browse(district:, school:, academic_year:)
@@ -9,18 +9,18 @@ module HeaderHelper
end
def district_url_for(district:, academic_year:)
- dashboard_link(district_slug: district.slug, school_slug: district.schools.alphabetic.first.slug, academic_year_range: academic_year.range, uri_path: request.fullpath)
+ overview_link(district_slug: district.slug, school_slug: district.schools.alphabetic.first.slug, academic_year_range: academic_year.range, uri_path: request.fullpath)
end
def school_url_for(school:, academic_year:)
- dashboard_link(district_slug: school.district.slug, school_slug: school.slug, academic_year_range: academic_year.range, uri_path: request.fullpath)
+ overview_link(district_slug: school.district.slug, school_slug: school.slug, academic_year_range: academic_year.range, uri_path: request.fullpath)
end
def school_mapper(school)
{
name: school.name,
district_id: school.district_id,
- url: district_school_dashboard_index_path(school.district, school, {year: AcademicYear.first.range})
+ url: district_school_overview_index_path(school.district, school, {year: AcademicYear.first.range})
}
end
@@ -30,9 +30,9 @@ module HeaderHelper
private
- def dashboard_link(district_slug:, school_slug:, academic_year_range:, uri_path:)
- if uri_path.include?("dashboard")
- return "/districts/#{district_slug}/schools/#{school_slug}/dashboard?year=#{academic_year_range}"
+ def overview_link(district_slug:, school_slug:, academic_year_range:, uri_path:)
+ if uri_path.include?("overview")
+ return "/districts/#{district_slug}/schools/#{school_slug}/overview?year=#{academic_year_range}"
end
"/districts/#{district_slug}/schools/#{school_slug}/browse/teachers-and-leadership?year=#{academic_year_range}"
end
diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/overview_helper.rb
similarity index 83%
rename from app/helpers/dashboard_helper.rb
rename to app/helpers/overview_helper.rb
index 51414b5c..a99b7be7 100644
--- a/app/helpers/dashboard_helper.rb
+++ b/app/helpers/overview_helper.rb
@@ -1,4 +1,4 @@
-module DashboardHelper
+module OverviewHelper
def format_academic_year(ay)
years = ay.range.split('-')
"#{years.first} – 20#{years.second}"
diff --git a/app/javascript/application.js b/app/javascript/application.js
index 50788622..2bd5047e 100644
--- a/app/javascript/application.js
+++ b/app/javascript/application.js
@@ -7,7 +7,7 @@ import * as ActiveStorage from "@rails/activestorage"
Rails.start()
Turbolinks.start()
ActiveStorage.start()
-import { initializeListenersForNavDropdowns, initializePopovers } from "./dashboard"
+import { initializeListenersForNavDropdowns, initializePopovers } from "./overview"
import { initializeListenersForHomeDropdowns } from "./home"
import { showEmptyDatasetModal } from "./modal"
diff --git a/app/javascript/dashboard.js b/app/javascript/overview.js
similarity index 100%
rename from app/javascript/dashboard.js
rename to app/javascript/overview.js
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 7335e27a..1360f50f 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -3,7 +3,7 @@
<%= link_to image_tag('sqm_logo.png', alt: 'MCIEA School Quality Measures Dashboard', class: 'height-56'), welcome_path, class: 'me-7' %>
-
+
diff --git a/app/views/dashboard/_quality_framework_indicators.erb b/app/views/overview/_quality_framework_indicators.erb
similarity index 100%
rename from app/views/dashboard/_quality_framework_indicators.erb
rename to app/views/overview/_quality_framework_indicators.erb
diff --git a/app/views/dashboard/_subcategory_card.html.erb b/app/views/overview/_subcategory_card.html.erb
similarity index 100%
rename from app/views/dashboard/_subcategory_card.html.erb
rename to app/views/overview/_subcategory_card.html.erb
diff --git a/app/views/dashboard/_variance_chart.html.erb b/app/views/overview/_variance_chart.html.erb
similarity index 100%
rename from app/views/dashboard/_variance_chart.html.erb
rename to app/views/overview/_variance_chart.html.erb
diff --git a/app/views/dashboard/index.html.erb b/app/views/overview/index.html.erb
similarity index 100%
rename from app/views/dashboard/index.html.erb
rename to app/views/overview/index.html.erb
diff --git a/config/routes.rb b/config/routes.rb
index 5fbde97e..a680b19b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -24,7 +24,7 @@ Rails.application.routes.draw do
resources :districts do
resources :schools, only: [:index, :show] do
- resources :dashboard, only: [:index]
+ resources :overview, only: [:index]
resources :categories, only: [:show], path: 'browse'
end
end
diff --git a/spec/controllers/dashboard_controller_spec.rb b/spec/controllers/overview_controller_spec.rb
similarity index 90%
rename from spec/controllers/dashboard_controller_spec.rb
rename to spec/controllers/overview_controller_spec.rb
index 1e40f1b8..051cf2ed 100644
--- a/spec/controllers/dashboard_controller_spec.rb
+++ b/spec/controllers/overview_controller_spec.rb
@@ -1,6 +1,6 @@
require 'rails_helper'
-describe DashboardController, type: :controller do
+describe OverviewController, type: :controller do
include BasicAuthHelper
let(:school) { create(:school) }
let(:district) { create(:district) }
diff --git a/spec/system/authentication_spec.rb b/spec/system/authentication_spec.rb
index 33db2b18..258a3707 100644
--- a/spec/system/authentication_spec.rb
+++ b/spec/system/authentication_spec.rb
@@ -10,7 +10,7 @@ describe 'authentication' do
page.driver.browser.basic_authorize('wrong username', 'wrong password')
end
it 'does not show any information' do
- visit dashboard_path
+ visit overview_path
expect(page).not_to have_text(school.name)
end
@@ -21,7 +21,7 @@ describe 'authentication' do
page.driver.browser.basic_authorize(username, password)
end
it 'does show information' do
- visit dashboard_path
+ visit overview_path
expect(page).to have_text(school.name)
end
@@ -37,7 +37,7 @@ describe 'authentication' do
"#{username}!"
end
- def dashboard_path
- district_school_dashboard_index_path(district, school, year: academic_year.range)
+ def overview_path
+ district_school_overview_index_path(district, school, year: academic_year.range)
end
end
diff --git a/spec/system/journey_spec.rb b/spec/system/journey_spec.rb
index 17a2934a..43db772b 100644
--- a/spec/system/journey_spec.rb
+++ b/spec/system/journey_spec.rb
@@ -65,15 +65,15 @@ describe 'District Admin', js: true do
visit '/welcome'
expect(page).to have_text("Teachers & Leadership")
- go_to_school_dashboard_from_welcome_page(district, school)
+ go_to_school_overview_from_welcome_page(district, school)
- district_admin_sees_dashboard_content
+ district_admin_sees_overview_content
click_on 'Teachers & Leadership'
district_admin_sees_browse_content
- click_on 'Dashboard'
- district_admin_sees_dashboard_content
+ click_on 'Overview'
+ district_admin_sees_overview_content
click_on 'Browse'
district_admin_sees_browse_content
@@ -106,7 +106,7 @@ def district_admin_sees_problem_solving_emphasis
expect(page).to have_css("[data-for-measure-id='4C-i'][width='60.0%'][x='0.0%']")
end
-def go_to_school_dashboard_from_welcome_page(district, school)
+def go_to_school_overview_from_welcome_page(district, school)
select district.name, from: 'district-dropdown'
select school.name, from: 'school-dropdown'
click_on 'Go'
@@ -125,8 +125,8 @@ def go_to_browse_page_for_school_without_data(school)
select school.name, from: 'select-school'
end
-def go_to_dashboard_page_for_school_without_data(school)
- click_on 'Dashboard'
+def go_to_overview_page_for_school_without_data(school)
+ click_on 'Overview'
select school.name, from: 'select-school'
end
@@ -140,7 +140,7 @@ def district_admin_sees_district_change
expect(page).to have_current_path(expected_path)
end
-def district_admin_sees_dashboard_content
+def district_admin_sees_overview_content
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')
diff --git a/spec/system/sqm_application_spec.rb b/spec/system/sqm_application_spec.rb
index f53b1bfd..928f4fd1 100644
--- a/spec/system/sqm_application_spec.rb
+++ b/spec/system/sqm_application_spec.rb
@@ -13,8 +13,8 @@ describe 'SQM Application' do
end
context 'when no measures meet their threshold' do
- it 'shows a modal on dashboard page' do
- visit dashboard_path
+ it 'shows a modal on overview page' do
+ visit overview_path
expect(page).to have_css '.modal'
end
@@ -32,7 +32,7 @@ describe 'SQM Application' do
end
it 'does not show a modal on any page' do
- [dashboard_path, browse_path].each do |path|
+ [overview_path, browse_path].each do |path|
visit path
expect(page).not_to have_css '.modal'
end
@@ -49,8 +49,8 @@ describe 'SQM Application' do
"#{username}!"
end
- def dashboard_path
- district_school_dashboard_index_path(district, school, year: academic_year.range)
+ def overview_path
+ district_school_overview_index_path(district, school, year: academic_year.range)
end
def browse_path
diff --git a/spec/views/dashboard/index.html.erb_spec.rb b/spec/views/dashboard/index.html.erb_spec.rb
index de1995a3..33b2505a 100644
--- a/spec/views/dashboard/index.html.erb_spec.rb
+++ b/spec/views/dashboard/index.html.erb_spec.rb
@@ -1,6 +1,6 @@
require 'rails_helper'
-describe 'dashboard/index.html.erb' do
+describe 'overview/index.html.erb' do
subject { Nokogiri::HTML(rendered) }
let(:support_for_teaching) { create(:measure, name: 'Support For Teaching Development & Growth') }
diff --git a/spec/views/dashboard/variance_chart.html.erb_spec.rb b/spec/views/dashboard/variance_chart.html.erb_spec.rb
index 2918309c..d2546f64 100644
--- a/spec/views/dashboard/variance_chart.html.erb_spec.rb
+++ b/spec/views/dashboard/variance_chart.html.erb_spec.rb
@@ -1,6 +1,6 @@
require 'rails_helper'
-describe 'dashboard/_variance_chart.html.erb' do
+describe 'overview/_variance_chart.html.erb' do
subject { Nokogiri::HTML(rendered) }
let(:higher_scoring_measure) { create(:measure) }