diff --git a/app/models/income.rb b/app/models/income.rb
index 447f8465..f92b73b5 100644
--- a/app/models/income.rb
+++ b/app/models/income.rb
@@ -4,4 +4,15 @@ class Income < ApplicationRecord
include FriendlyId
friendly_id :designation, use: [:slugged]
+
+ 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/all_admin.rb b/app/presenters/analyze/graph/column/all_admin.rb
index 57fe7799..d63c9276 100644
--- a/app/presenters/analyze/graph/column/all_admin.rb
+++ b/app/presenters/analyze/graph/column/all_admin.rb
@@ -5,7 +5,7 @@ module Analyze
module Column
class AllAdmin < GroupedBarColumnPresenter
def label
- "All Admin"
+ %w[All Admin]
end
def basis
diff --git a/app/presenters/analyze/graph/column/all_student.rb b/app/presenters/analyze/graph/column/all_student.rb
index ed133d34..788dca38 100644
--- a/app/presenters/analyze/graph/column/all_student.rb
+++ b/app/presenters/analyze/graph/column/all_student.rb
@@ -5,7 +5,7 @@ module Analyze
module Column
class AllStudent < GroupedBarColumnPresenter
def label
- "All Students"
+ %w[All Students]
end
def show_irrelevancy_message?
diff --git a/app/presenters/analyze/graph/column/all_survey_data.rb b/app/presenters/analyze/graph/column/all_survey_data.rb
index 1e4d5e2c..c3e42c94 100644
--- a/app/presenters/analyze/graph/column/all_survey_data.rb
+++ b/app/presenters/analyze/graph/column/all_survey_data.rb
@@ -5,7 +5,7 @@ module Analyze
module Column
class AllSurveyData < GroupedBarColumnPresenter
def label
- "Survey Data"
+ %w[Survey Data]
end
def show_irrelevancy_message?
diff --git a/app/presenters/analyze/graph/column/all_teacher.rb b/app/presenters/analyze/graph/column/all_teacher.rb
index 1b7b7ddc..dc3a8443 100644
--- a/app/presenters/analyze/graph/column/all_teacher.rb
+++ b/app/presenters/analyze/graph/column/all_teacher.rb
@@ -5,7 +5,7 @@ module Analyze
module Column
class AllTeacher < GroupedBarColumnPresenter
def label
- "All Teachers"
+ %w[All Teachers]
end
def basis
diff --git a/app/presenters/analyze/graph/column/gender_column/female.rb b/app/presenters/analyze/graph/column/gender_column/female.rb
index e55691bf..54941fbf 100644
--- a/app/presenters/analyze/graph/column/gender_column/female.rb
+++ b/app/presenters/analyze/graph/column/gender_column/female.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::GenderColumn::ScoreForGender
include Analyze::Graph::Column::GenderColumn::GenderCount
def label
- "Female"
+ %w[Female]
end
def basis
diff --git a/app/presenters/analyze/graph/column/gender_column/male.rb b/app/presenters/analyze/graph/column/gender_column/male.rb
index 7158d2d8..031b91e6 100644
--- a/app/presenters/analyze/graph/column/gender_column/male.rb
+++ b/app/presenters/analyze/graph/column/gender_column/male.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::GenderColumn::ScoreForGender
include Analyze::Graph::Column::GenderColumn::GenderCount
def label
- "Male"
+ %w[Male]
end
def basis
diff --git a/app/presenters/analyze/graph/column/gender_column/non_binary.rb b/app/presenters/analyze/graph/column/gender_column/non_binary.rb
index c9e4cda0..8b3c8547 100644
--- a/app/presenters/analyze/graph/column/gender_column/non_binary.rb
+++ b/app/presenters/analyze/graph/column/gender_column/non_binary.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::GenderColumn::ScoreForGender
include Analyze::Graph::Column::GenderColumn::GenderCount
def label
- "Non-Binary"
+ %w[Non-Binary]
end
def basis
diff --git a/app/presenters/analyze/graph/column/gender_column/unknown.rb b/app/presenters/analyze/graph/column/gender_column/unknown.rb
index f8e119cd..d954cece 100644
--- a/app/presenters/analyze/graph/column/gender_column/unknown.rb
+++ b/app/presenters/analyze/graph/column/gender_column/unknown.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::GenderColumn::ScoreForGender
include Analyze::Graph::Column::GenderColumn::GenderCount
def label
- "Unknown"
+ %w[Unknown]
end
def basis
diff --git a/app/presenters/analyze/graph/column/grade/eight.rb b/app/presenters/analyze/graph/column/grade/eight.rb
index ca31d21d..8d4bf62f 100644
--- a/app/presenters/analyze/graph/column/grade/eight.rb
+++ b/app/presenters/analyze/graph/column/grade/eight.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::Grade::ScoreForGrade
include Analyze::Graph::Column::Grade::GradeCount
def label
- "Grade 8"
+ %w[Grade 8]
end
def basis
diff --git a/app/presenters/analyze/graph/column/grade/eleven.rb b/app/presenters/analyze/graph/column/grade/eleven.rb
index 5a6a2e41..dba11366 100644
--- a/app/presenters/analyze/graph/column/grade/eleven.rb
+++ b/app/presenters/analyze/graph/column/grade/eleven.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::Grade::ScoreForGrade
include Analyze::Graph::Column::Grade::GradeCount
def label
- "Grade 11"
+ %w[Grade 11]
end
def basis
diff --git a/app/presenters/analyze/graph/column/grade/five.rb b/app/presenters/analyze/graph/column/grade/five.rb
index 5eb75d15..30033e31 100644
--- a/app/presenters/analyze/graph/column/grade/five.rb
+++ b/app/presenters/analyze/graph/column/grade/five.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::Grade::ScoreForGrade
include Analyze::Graph::Column::Grade::GradeCount
def label
- "Grade 5"
+ %w[Grade 5]
end
def basis
diff --git a/app/presenters/analyze/graph/column/grade/four.rb b/app/presenters/analyze/graph/column/grade/four.rb
index 6477ec4e..1f563742 100644
--- a/app/presenters/analyze/graph/column/grade/four.rb
+++ b/app/presenters/analyze/graph/column/grade/four.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::Grade::ScoreForGrade
include Analyze::Graph::Column::Grade::GradeCount
def label
- "Grade 4"
+ %w[Grade 4]
end
def basis
diff --git a/app/presenters/analyze/graph/column/grade/nine.rb b/app/presenters/analyze/graph/column/grade/nine.rb
index ebdff840..9c3a9397 100644
--- a/app/presenters/analyze/graph/column/grade/nine.rb
+++ b/app/presenters/analyze/graph/column/grade/nine.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::Grade::ScoreForGrade
include Analyze::Graph::Column::Grade::GradeCount
def label
- "Grade 9"
+ %w[Grade 9]
end
def basis
diff --git a/app/presenters/analyze/graph/column/grade/one.rb b/app/presenters/analyze/graph/column/grade/one.rb
index a2163a1d..b1e3bcde 100644
--- a/app/presenters/analyze/graph/column/grade/one.rb
+++ b/app/presenters/analyze/graph/column/grade/one.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::Grade::ScoreForGrade
include Analyze::Graph::Column::Grade::GradeCount
def label
- "Grade 1"
+ %w[Grade 1]
end
def basis
diff --git a/app/presenters/analyze/graph/column/grade/seven.rb b/app/presenters/analyze/graph/column/grade/seven.rb
index 729c6301..6aa5a818 100644
--- a/app/presenters/analyze/graph/column/grade/seven.rb
+++ b/app/presenters/analyze/graph/column/grade/seven.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::Grade::ScoreForGrade
include Analyze::Graph::Column::Grade::GradeCount
def label
- "Grade 7"
+ %w[Grade 7]
end
def basis
diff --git a/app/presenters/analyze/graph/column/grade/six.rb b/app/presenters/analyze/graph/column/grade/six.rb
index b30d8fd0..1e40703b 100644
--- a/app/presenters/analyze/graph/column/grade/six.rb
+++ b/app/presenters/analyze/graph/column/grade/six.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::Grade::ScoreForGrade
include Analyze::Graph::Column::Grade::GradeCount
def label
- "Grade 6"
+ %w[Grade 6]
end
def basis
diff --git a/app/presenters/analyze/graph/column/grade/ten.rb b/app/presenters/analyze/graph/column/grade/ten.rb
index 86e94930..45839d31 100644
--- a/app/presenters/analyze/graph/column/grade/ten.rb
+++ b/app/presenters/analyze/graph/column/grade/ten.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::Grade::ScoreForGrade
include Analyze::Graph::Column::Grade::GradeCount
def label
- "Grade 10"
+ %w[Grade 10]
end
def basis
diff --git a/app/presenters/analyze/graph/column/grade/three.rb b/app/presenters/analyze/graph/column/grade/three.rb
index c5ce994f..44a32772 100644
--- a/app/presenters/analyze/graph/column/grade/three.rb
+++ b/app/presenters/analyze/graph/column/grade/three.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::Grade::ScoreForGrade
include Analyze::Graph::Column::Grade::GradeCount
def label
- "Grade 3"
+ %w[Grade 3]
end
def basis
diff --git a/app/presenters/analyze/graph/column/grade/twelve.rb b/app/presenters/analyze/graph/column/grade/twelve.rb
index 6d1defc3..0a8f7a26 100644
--- a/app/presenters/analyze/graph/column/grade/twelve.rb
+++ b/app/presenters/analyze/graph/column/grade/twelve.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::Grade::ScoreForGrade
include Analyze::Graph::Column::Grade::GradeCount
def label
- "Grade 12"
+ %w[Grade 12]
end
def basis
diff --git a/app/presenters/analyze/graph/column/grade/two.rb b/app/presenters/analyze/graph/column/grade/two.rb
index 9bb80df3..195661e1 100644
--- a/app/presenters/analyze/graph/column/grade/two.rb
+++ b/app/presenters/analyze/graph/column/grade/two.rb
@@ -5,12 +5,10 @@ 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
- "Grade 2"
+ %w[Grade 2]
end
def basis
diff --git a/app/presenters/analyze/graph/column/grade/zero.rb b/app/presenters/analyze/graph/column/grade/zero.rb
index 64e213ae..611f9d3a 100644
--- a/app/presenters/analyze/graph/column/grade/zero.rb
+++ b/app/presenters/analyze/graph/column/grade/zero.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::Grade::ScoreForGrade
include Analyze::Graph::Column::Grade::GradeCount
def label
- "Kindergarten"
+ %w[Kindergarten]
end
def basis
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 e59a9257..37713a6d 100644
--- a/app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb
+++ b/app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb
@@ -39,7 +39,7 @@ module Analyze
end
def label
- "All Data"
+ %w[All Data]
end
def basis
diff --git a/app/presenters/analyze/graph/column/income_column/disadvantaged.rb b/app/presenters/analyze/graph/column/income_column/disadvantaged.rb
index ad304ce9..ea079577 100644
--- a/app/presenters/analyze/graph/column/income_column/disadvantaged.rb
+++ b/app/presenters/analyze/graph/column/income_column/disadvantaged.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::IncomeColumn::ScoreForIncome
include Analyze::Graph::Column::IncomeColumn::IncomeCount
def label
- "Economically Disadvantaged"
+ %w[Economically Disadvantaged]
end
def show_irrelevancy_message?
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 4a1d4c21..aea9ce83 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
- "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 e6e0ba8b..bc8c6d2c 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
- "Unknown"
+ ["Unknown"]
end
def show_irrelevancy_message?
diff --git a/app/presenters/analyze/graph/column/race_column/american_indian.rb b/app/presenters/analyze/graph/column/race_column/american_indian.rb
index 25e46da6..b5d2af8d 100644
--- a/app/presenters/analyze/graph/column/race_column/american_indian.rb
+++ b/app/presenters/analyze/graph/column/race_column/american_indian.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::ScoreForRace
include Analyze::Graph::Column::RaceColumn::RaceCount
def label
- "American Indian"
+ %w[American Indian]
end
def show_irrelevancy_message?
diff --git a/app/presenters/analyze/graph/column/race_column/asian.rb b/app/presenters/analyze/graph/column/race_column/asian.rb
index c60b012e..7b0af7f8 100644
--- a/app/presenters/analyze/graph/column/race_column/asian.rb
+++ b/app/presenters/analyze/graph/column/race_column/asian.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::ScoreForRace
include Analyze::Graph::Column::RaceColumn::RaceCount
def label
- "Asian"
+ %w[Asian]
end
def show_irrelevancy_message?
diff --git a/app/presenters/analyze/graph/column/race_column/black.rb b/app/presenters/analyze/graph/column/race_column/black.rb
index 6433068e..72046c97 100644
--- a/app/presenters/analyze/graph/column/race_column/black.rb
+++ b/app/presenters/analyze/graph/column/race_column/black.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::ScoreForRace
include Analyze::Graph::Column::RaceColumn::RaceCount
def label
- "Black"
+ %w[Black]
end
def show_irrelevancy_message?
diff --git a/app/presenters/analyze/graph/column/race_column/hispanic.rb b/app/presenters/analyze/graph/column/race_column/hispanic.rb
index 1a902d90..6f92a77e 100644
--- a/app/presenters/analyze/graph/column/race_column/hispanic.rb
+++ b/app/presenters/analyze/graph/column/race_column/hispanic.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::ScoreForRace
include Analyze::Graph::Column::RaceColumn::RaceCount
def label
- "Hispanic"
+ %w[Hispanic]
end
def show_irrelevancy_message?
diff --git a/app/presenters/analyze/graph/column/race_column/middle_eastern.rb b/app/presenters/analyze/graph/column/race_column/middle_eastern.rb
index 80e5089e..36955bf2 100644
--- a/app/presenters/analyze/graph/column/race_column/middle_eastern.rb
+++ b/app/presenters/analyze/graph/column/race_column/middle_eastern.rb
@@ -9,7 +9,7 @@ module Analyze
include Analyze::Graph::Column::RaceColumn::RaceCount
def label
- "Middle Eastern"
+ %w[Middle Eastern]
end
def show_irrelevancy_message?
diff --git a/app/presenters/analyze/graph/column/race_column/multiracial.rb b/app/presenters/analyze/graph/column/race_column/multiracial.rb
index 85b359fb..c150cea1 100644
--- a/app/presenters/analyze/graph/column/race_column/multiracial.rb
+++ b/app/presenters/analyze/graph/column/race_column/multiracial.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::ScoreForRace
include Analyze::Graph::Column::RaceColumn::RaceCount
def label
- "Multiracial"
+ %w[Multiracial]
end
def show_irrelevancy_message?
diff --git a/app/presenters/analyze/graph/column/race_column/unknown.rb b/app/presenters/analyze/graph/column/race_column/unknown.rb
index 25e130c0..8c6b786f 100644
--- a/app/presenters/analyze/graph/column/race_column/unknown.rb
+++ b/app/presenters/analyze/graph/column/race_column/unknown.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::ScoreForRace
include Analyze::Graph::Column::RaceColumn::RaceCount
def label
- "Not Listed"
+ %w[Not Listed]
end
def show_irrelevancy_message?
diff --git a/app/presenters/analyze/graph/column/race_column/white.rb b/app/presenters/analyze/graph/column/race_column/white.rb
index 3dbf3695..221ecc8b 100644
--- a/app/presenters/analyze/graph/column/race_column/white.rb
+++ b/app/presenters/analyze/graph/column/race_column/white.rb
@@ -8,7 +8,7 @@ module Analyze
include Analyze::Graph::Column::ScoreForRace
include Analyze::Graph::Column::RaceColumn::RaceCount
def label
- "White"
+ %w[White]
end
def show_irrelevancy_message?
diff --git a/app/services/survey_item_values.rb b/app/services/survey_item_values.rb
index 80a56e63..f47e3038 100644
--- a/app/services/survey_item_values.rb
+++ b/app/services/survey_item_values.rb
@@ -110,7 +110,6 @@ class SurveyItemValues
@raw_income ||= disaggregation.income
end
- # TODO: - rename these cases
def income
@income ||= value_from(pattern: /^Income$/i)
return @income if @income.present?
@@ -234,4 +233,3 @@ class SurveyItemValues
end
end
end
-
diff --git a/app/views/analyze/_group_selectors.html.erb b/app/views/analyze/_group_selectors.html.erb
index 72bd8d38..61f21184 100644
--- a/app/views/analyze/_group_selectors.html.erb
+++ b/app/views/analyze/_group_selectors.html.erb
@@ -19,5 +19,5 @@
<% 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 %>
diff --git a/app/views/analyze/_grouped_bar_column.html.erb b/app/views/analyze/_grouped_bar_column.html.erb
index 2f7fa614..65f1fc21 100644
--- a/app/views/analyze/_grouped_bar_column.html.erb
+++ b/app/views/analyze/_grouped_bar_column.html.erb
@@ -25,7 +25,7 @@
<% end %>
- <% words = column.label.split("\s") %>
+ <% words = column.label %>
<% words.each_with_index do | line, index | %>