feat: Rename income labels to 'Economically Disadvantaged' and 'Not Economically Disadvantaged'

2026-03-13 09:20:38 -07:00 · 2023-07-31 16:47:34 -07:00 · 2023-07-31 16:47:34 -07:00 · 6db93cb116
commit 6db93cb116
parent be1dd7cdff
38 changed files with 119 additions and 112 deletions
--- 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
--- 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
--- 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?
--- 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?
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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?
--- 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?
--- 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?
--- 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?
--- 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?
--- 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?
--- 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?
--- 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?
--- 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?
--- 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?
--- 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?
--- 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
-
--- 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 %>
--- a/app/views/analyze/_grouped_bar_column.html.erb
+++ b/app/views/analyze/_grouped_bar_column.html.erb
@ -25,7 +25,7 @@
  <% end %>

  <line x1="<%= column.column_start_x %>%" y1="0" x2="<%= column.column_start_x %>%" y2="85%" stroke="grey" stroke-width="1" stroke-dasharray="5,2" />
-      <% words = column.label.split("\s") %>
+      <% words = column.label %>
      <% words.each_with_index do | line, index | %>
        <text class="graph-footer" x="<%= column.column_midpoint %>%" y="<%= column.bar_label_height + (index * 5) %>%" text-anchor="middle" dominant-baseline="middle" data-grouped-bar-label="<%= column.label %>">
          <%= line %>