From 589c0f7e11df96b52c07d8f8a7c2dcd57c3bd901 Mon Sep 17 00:00:00 2001
From: Nelson Jovel <memoryman51@hotmail.com>
Date: Thu, 18 Jan 2024 14:13:17 -0800
Subject: [PATCH] chore: get overview page to show without errors

---
 app/helpers/dashboard/header_helper.rb           |  6 +++---
 app/models/dashboard/score.rb                    |  7 -------
 .../overview/_subcategory_card.html.erb          |  8 +++++++-
 app/views/dashboard/overview/index.html.erb      |  2 ++
 app/views/layouts/dashboard/_header.html.erb     |  4 ++--
 app/views/layouts/dashboard/application.html.erb | 16 +++++++++++++++-
 config/routes.rb                                 |  4 ++--
 7 files changed, 31 insertions(+), 16 deletions(-)

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 @@
 <div class="subcategory-card__benchmark-item">
-  <svg class="subcategory-card__circle" width="24" height="24" xmlns="http://www.w3.org/2000/svg" <%= "data-bs-toggle=popover" if subcategory_card.insufficient_data? %>  data-bs-placement="top" data-bs-content="This subcategory is not displayed due to limited availability of school admin data and/or low survey response rates.">
+  <svg class="subcategory-card__circle" 
+    width="24" 
+    height="24" 
+    xmlns="http://www.w3.org/2000/svg" 
+    <%= "data-bs-toggle=popover" if subcategory_card.insufficient_data? %>  
+    data-bs-placement="top" 
+    data-bs-content="This subcategory is not displayed due to limited availability of school admin data and/or low survey response rates.">
     <use class="harvey-ball harvey-ball--<%= subcategory_card.color %>" xlink:href="#<%= subcategory_card.harvey_ball_icon %>"></use>
   </svg>
 
diff --git a/app/views/dashboard/overview/index.html.erb b/app/views/dashboard/overview/index.html.erb
index 4c3122e..f4bd934 100644
--- a/app/views/dashboard/overview/index.html.erb
+++ b/app/views/dashboard/overview/index.html.erb
@@ -81,6 +81,8 @@
         </div>
       </div>
 
+      <%= render partial: "quality_framework_indicators", locals: { category_presenters: @category_presenters } %>
+
       <div class="overall-response-rate-row">
         <%= render partial: "response_rate", locals: {response_rate_presenter: @student_response_rate_presenter} %>
         <%= render partial: "response_rate", locals: {response_rate_presenter: @teacher_response_rate_presenter} %>
diff --git a/app/views/layouts/dashboard/_header.html.erb b/app/views/layouts/dashboard/_header.html.erb
index d23e73c..52f34e8 100644
--- a/app/views/layouts/dashboard/_header.html.erb
+++ b/app/views/layouts/dashboard/_header.html.erb
@@ -2,14 +2,14 @@
   <div class="container">
     <div class="row py-4 justify-content-between align-items-center">
       <div class="col d-flex justify-content-start align-items-center">
-        <%= link_to image_tag('logo.svg', alt: 'School Quality Measures Dashboard', size: "100x100"), welcome_path, class: 'me-7' %>
+        <%= link_to image_tag('dashboard/logo.svg', alt: 'School Quality Measures Dashboard', size: "100x100"), welcome_path, class: 'me-7' %>
         <a class="sub-header-3 link me-4 <%= link_weight(path: 'overview') %>" href="<%= link_to_overview(district: @district, school: @school, academic_year: @academic_year) %>">Overview</a>
         <a class="sub-header-3 link me-4 <%= link_weight(path: 'browse') %>" href="<%= link_to_browse(district: @district, school: @school, academic_year: @academic_year) %>">Browse</a>
         <a class="sub-header-3 link <%= link_weight(path: 'analyze') %>" href="<%= link_to_analyze(district: @district, school: @school, academic_year: @academic_year) %>">Analyze</a>
       </div>
 
       <div class="col d-flex justify-content-end">
-        <select id="select-district" class="form-select" name="district" <%= District.count == 1 ? "hidden": ""  %> >
+        <select id="select-district" class="form-select" name="district" <%= @districts.size == 1 ? "hidden": ""  %> >
           <% @districts.each do |district| %>
             <option class="district-options" value="<%= district_url_for(district: district, academic_year: @academic_year) %>" <%= @district.slug == district.slug ? "selected" : nil %>>
             <%= district.name %>
diff --git a/app/views/layouts/dashboard/application.html.erb b/app/views/layouts/dashboard/application.html.erb
index 55e3c27..9b7d6d2 100644
--- a/app/views/layouts/dashboard/application.html.erb
+++ b/app/views/layouts/dashboard/application.html.erb
@@ -21,8 +21,22 @@
     <%= render partial: 'layouts/dashboard/google_analytics', locals: { google_analytics_id: @google_analytics_id } %>
 </head>
 <body>
+  <div>
+    <%= render partial: 'layouts/dashboard/header' %>
+  </div>
 
-<%= yield %>
+  <div class="bg-color-light-blue">
+    <div class="container">
+      <div class="row">
+        <div class="col mt-7">
+          <%= yield %>
+        </div>
+      </div>
+    </div>
+  </div>
 
+  <div>
+    <%= render partial: 'layouts/dashboard/footer' %>
+  </div>
 </body>
 </html>
diff --git a/config/routes.rb b/config/routes.rb
index aa2d70c..6098bcd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,8 +2,8 @@ Dashboard::Engine.routes.draw do
   resources :districts do
     resources :schools, only: %i[index show] do
       resources :overview, only: [:index]
-      # resources :categories, only: [:show], path: "browse"
-      # resources :analyze, only: [:index]
+      resources :categories, only: [:show], path: "browse"
+      resources :analyze, only: [:index]
     end
   end
   get "/welcome", to: "home#index"