From e2bded66e8b6e0d9b1ccd289c9eb6cf5032068b3 Mon Sep 17 00:00:00 2001 From: rebuilt Date: Thu, 11 Aug 2022 11:39:02 -0700 Subject: [PATCH] Disable checkboxes that are irrelevant for the graph type --- app/views/analyze/_data_filters.html.erb | 4 +++- app/views/analyze/_school_years.html.erb | 3 ++- spec/views/analyze/index.html.erb_spec.rb | 2 -- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/analyze/_data_filters.html.erb b/app/views/analyze/_data_filters.html.erb index 76e35e29..bd4f1a6d 100644 --- a/app/views/analyze/_data_filters.html.erb +++ b/app/views/analyze/_data_filters.html.erb @@ -22,7 +22,9 @@ name="race-checkbox" value="<%= base_url %>" data-action="click->analyze#refresh" - <%= @selected_races.map(&:slug).include?(race.slug) ? "checked" : "" %>> + <%= @selected_races.map(&:slug).include?(race.slug) ? "checked" : "" %> + <%= @graph.value == 'students-and-teachers' ? "disabled" : "" %>> + <% end %> diff --git a/app/views/analyze/_school_years.html.erb b/app/views/analyze/_school_years.html.erb index 6565232d..d8f9145f 100644 --- a/app/views/analyze/_school_years.html.erb +++ b/app/views/analyze/_school_years.html.erb @@ -7,7 +7,8 @@ value="<%= analyze_subcategory_link(district: district, school: school, academic_year: academic_year, category: category, subcategory: subcategory) %>" <%= selected_academic_years.include?(year) ? "checked" : "" %> data-action="click->analyze#refresh" - <%= empty_dataset?(measures: measures, school: school, academic_year: year) ? "disabled" : "" %>> + <%= empty_dataset?(measures: measures, school: school, academic_year: year) ? "disabled" : "" %> + <%= @graph.value == 'students-by-group' && year.range != @available_academic_years.last.range ? "disabled" : "" %>>
diff --git a/spec/views/analyze/index.html.erb_spec.rb b/spec/views/analyze/index.html.erb_spec.rb index 7b3c9179..13015234 100644 --- a/spec/views/analyze/index.html.erb_spec.rb +++ b/spec/views/analyze/index.html.erb_spec.rb @@ -141,8 +141,6 @@ describe 'analyze/index' do race_slugs.each do |slug| expect(subject).to have_css("//input[@type='checkbox'][@id='#{slug}']") end - - expect(subject.css("//input[@type='checkbox'][@id='american-indian-or-alaskan-native']")).to have_checked_field end end