diff --git a/CHANGELOG.md b/CHANGELOG.md
index c23a378f..dfeba1ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,35 @@
# Changelog
+
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Released]
+
### Added
- - short description to Category
+
+- short description to Category
+- Show benchmark boundaries on gauge graph
+- Add bullet gem to optimize sql queries
+- Add rubocop for formatting
+- Upgrade to rails 7
+- Add parallel test gem for to run tests faster
+- Add simplecov gem to see test coverage
+- Show survey response rate for students and teachers
+- Cap teacher response rate at 100
+- Show admin data collection rate
## [Unreleased]
+
### Added
- - Add student response rate
- `bundle exec rake db:migrate`
+- Bump ruby version to 3.1.0
+- Add previous year data.
+ remove AcademicYear "2021-22"
+ `ay = AcademicYear.find_by_range("2021-22") `
+ `ay.destroy`
+ seed database with new AcademicYear
+ `bundle exec rake db:seed`
+ load previous year survey responses
+ `bundle exec rake data:load_survey_responses`
diff --git a/app/controllers/sqm_application_controller.rb b/app/controllers/sqm_application_controller.rb
index 1a4beb5b..2edf5f57 100644
--- a/app/controllers/sqm_application_controller.rb
+++ b/app/controllers/sqm_application_controller.rb
@@ -15,6 +15,7 @@ class SqmApplicationController < ApplicationController
@school = School.find_by_slug(school_slug)
@schools = School.includes([:district]).where(district: @district).order(:name)
@academic_year = AcademicYear.find_by_range params[:year]
+ @academic_years = AcademicYear.all.order(range: :desc)
@has_empty_dataset = Measure.none_meet_threshold? school: @school, academic_year: @academic_year
end
diff --git a/app/helpers/overview_helper.rb b/app/helpers/overview_helper.rb
deleted file mode 100644
index a99b7be7..00000000
--- a/app/helpers/overview_helper.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module OverviewHelper
- def format_academic_year(ay)
- years = ay.range.split('-')
- "#{years.first} – 20#{years.second}"
- end
-end
diff --git a/app/javascript/overview.js b/app/javascript/overview.js
index 70cbad5d..27b0daa6 100644
--- a/app/javascript/overview.js
+++ b/app/javascript/overview.js
@@ -15,12 +15,18 @@ export function initializeListenersForNavDropdowns() {
window.location = event.target.value;
});
}
+ const academicYearDropdown = document.querySelector("#select-academic-year");
+ if (academicYearDropdown) {
+ academicYearDropdown.addEventListener("change", (event) => {
+ window.location = event.target.value;
+ });
+ }
}
export function initializePopovers() {
document
.querySelectorAll('[data-bs-toggle="popover"]')
- .forEach(popoverElement => {
- new Popover(popoverElement, { trigger: 'hover focus' })
- })
+ .forEach((popoverElement) => {
+ new Popover(popoverElement, { trigger: "hover focus" });
+ });
}
diff --git a/app/models/academic_year.rb b/app/models/academic_year.rb
index 99a8f449..08ddd2da 100644
--- a/app/models/academic_year.rb
+++ b/app/models/academic_year.rb
@@ -9,4 +9,10 @@ class AcademicYear < ActiveRecord::Base
end
AcademicYear.find_by_range("#{ay_range_start}-#{ay_range_end.to_s[2, 3]}")
end
+
+ def formatted_range
+ years = range.split('-')
+ "#{years.first} – 20#{years.second}"
+ end
+
end
diff --git a/app/views/categories/show.html.erb b/app/views/categories/show.html.erb
index fcc0b38d..4c4faec8 100644
--- a/app/views/categories/show.html.erb
+++ b/app/views/categories/show.html.erb
@@ -9,6 +9,12 @@
<% end %>
+
+
<% end %>
Category <%= @category.id %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 1360f50f..3e680bd6 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -11,7 +11,7 @@
@@ -19,7 +19,7 @@
@@ -32,10 +32,6 @@
<% if content_for?(:navigation) %>
<%= yield(:navigation) %>
<% end %>
-
-
diff --git a/app/views/overview/index.html.erb b/app/views/overview/index.html.erb
index 51da426c..b91cd068 100644
--- a/app/views/overview/index.html.erb
+++ b/app/views/overview/index.html.erb
@@ -1,5 +1,11 @@
<% content_for :navigation do %>
+
+
<% end %>