gabehf/sqm-dashboards
1
0
Fork 0
mirror of https://github.com/edcommonwealth/sqm-dashboards.git synced 2026-03-07 21:48:16 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

From the analyze page, selecting a different school should not navigate

Browse source 
away from analyze page.   Finishes story #182178876
This commit is contained in:
Nelson Jovel 2022-05-13 11:24:58 -07:00
parent cb5fe56c30
commit 8c7c73bc72
2 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -42,3 +42,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Add Analyze page
- From analyze page, selecting a different school from the dropdown. Changed behavior so user remains on analyze page

30
app/helpers/header_helper.rb
View file

@ -12,13 +12,23 @@ module HeaderHelper
end
def district_url_for(district:, academic_year:)
overview_link(district_slug: district.slug, school_slug: district.schools.alphabetic.first.slug,
academic_year_range: academic_year.range, uri_path: request.fullpath)
pages = %w[overview browse analyze]
pages.each do |page|
if request.fullpath.include? page
return send("#{page}_link", district_slug: district.slug, school_slug: district.schools.alphabetic.first.slug,
academic_year_range: academic_year.range)
end
end
end
def school_url_for(school:, academic_year:)
overview_link(district_slug: school.district.slug, school_slug: school.slug,
academic_year_range: academic_year.range, uri_path: request.fullpath)
pages = %w[overview browse analyze]
pages.each do |page|
if request.fullpath.include? page
return send("#{page}_link", district_slug: school.district.slug, school_slug: school.slug,
academic_year_range: academic_year.range)
end
end
end
def school_mapper(school)
@ -35,11 +45,15 @@ module HeaderHelper
private
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
def overview_link(district_slug:, school_slug:, academic_year_range:)
"/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}"
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}"
end