From 85ba1218e364c3f87c7614fe6f6a33600324a4e5 Mon Sep 17 00:00:00 2001
From: rebuilt <memoryman51@hotmail.com>
Date: Mon, 31 Jul 2023 16:47:34 -0700
Subject: [PATCH] feat: Rename income labels to 'Economically Disadvantaged'
 and 'Not Economically Disadvantaged'

---
 app/models/income.rb                                  | 11 +++++++++++
 app/presenters/analyze/graph/column/grade/two.rb      |  2 --
 .../graph/column/grouped_bar_column_presenter.rb      |  4 ----
 .../graph/column/income_column/not_disadvantaged.rb   |  2 +-
 .../analyze/graph/column/income_column/unknown.rb     |  2 +-
 app/views/analyze/_group_selectors.html.erb           |  2 +-
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/models/income.rb b/app/models/income.rb
index eb1caa33..c3cf706b 100644
--- a/app/models/income.rb
+++ b/app/models/income.rb
@@ -16,4 +16,15 @@ class Income < ApplicationRecord
       "Unknown"
     end
   end
+
+  def label
+    case designation
+    when "Economically Disadvantaged - Y"
+      "Economically Disadvantaged"
+    when "Economically Disadvantaged - N"
+      "Not Economically Disadvantaged"
+    when "Unknown"
+      "Unknown"
+    end
+  end
 end
diff --git a/app/presenters/analyze/graph/column/grade/two.rb b/app/presenters/analyze/graph/column/grade/two.rb
index a32a1965..195661e1 100644
--- a/app/presenters/analyze/graph/column/grade/two.rb
+++ b/app/presenters/analyze/graph/column/grade/two.rb
@@ -5,8 +5,6 @@ module Analyze
     module Column
       module Grade
         class Two < GroupedBarColumnPresenter
-          attr_reader :sufficient_responses
-
           include Analyze::Graph::Column::Grade::ScoreForGrade
           include Analyze::Graph::Column::Grade::GradeCount
           def label
diff --git a/app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb b/app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb
index 02af5551..97fc65ac 100644
--- a/app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb
+++ b/app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb
@@ -38,10 +38,6 @@ module Analyze
           %w[All Data]
         end
 
-        def basis
-          ""
-        end
-
         def show_irrelevancy_message?
           false
         end
diff --git a/app/presenters/analyze/graph/column/income_column/not_disadvantaged.rb b/app/presenters/analyze/graph/column/income_column/not_disadvantaged.rb
index 18d8118b..cfca2baf 100644
--- a/app/presenters/analyze/graph/column/income_column/not_disadvantaged.rb
+++ b/app/presenters/analyze/graph/column/income_column/not_disadvantaged.rb
@@ -8,7 +8,7 @@ module Analyze
           include Analyze::Graph::Column::IncomeColumn::ScoreForIncome
           include Analyze::Graph::Column::IncomeColumn::IncomeCount
           def label
-            %w[Not Disadvantaged]
+            ["Not Economically", "Disadvantaged"]
           end
 
           def show_irrelevancy_message?
diff --git a/app/presenters/analyze/graph/column/income_column/unknown.rb b/app/presenters/analyze/graph/column/income_column/unknown.rb
index ba769e19..7a03580e 100644
--- a/app/presenters/analyze/graph/column/income_column/unknown.rb
+++ b/app/presenters/analyze/graph/column/income_column/unknown.rb
@@ -8,7 +8,7 @@ module Analyze
           include Analyze::Graph::Column::IncomeColumn::ScoreForIncome
           include Analyze::Graph::Column::IncomeColumn::IncomeCount
           def label
-            %w[Unknown]
+            ["Unknown"]
           end
 
           def show_irrelevancy_message?
diff --git a/app/views/analyze/_group_selectors.html.erb b/app/views/analyze/_group_selectors.html.erb
index b051e122..e8bbd84c 100644
--- a/app/views/analyze/_group_selectors.html.erb
+++ b/app/views/analyze/_group_selectors.html.erb
@@ -19,7 +19,7 @@
 <% end %>
 
 <% @presenter.incomes.each do |income| %>
-  <%= render(partial: "checkboxes", locals: {id: "income-#{income.slug}", item: income, selected_items: @presenter.selected_incomes, name: "income", label_text: income.designation})  %>
+  <%= render(partial: "checkboxes", locals: {id: "income-#{income.slug}", item: income, selected_items: @presenter.selected_incomes, name: "income", label_text: income.label})  %>
 <% end %>
 
 <% @presenter.ells.each do |ell| %>