From 91ab2dd82eaee1ffed86bab0c601254b35a5fd31 Mon Sep 17 00:00:00 2001 From: rebuilt Date: Fri, 27 Oct 2023 15:39:50 -0700 Subject: [PATCH] feat: instead of the analyze graph label being a simple string, turn it into an array of strings where each item will be placed on a new line --- app/presenters/analyze/graph/all_data.rb | 2 +- app/presenters/analyze/graph/column/all_admin.rb | 2 +- app/presenters/analyze/graph/column/all_student.rb | 2 +- app/presenters/analyze/graph/column/all_survey_data.rb | 2 +- app/presenters/analyze/graph/column/all_teacher.rb | 2 +- app/presenters/analyze/graph/column/gender_column/female.rb | 2 +- app/presenters/analyze/graph/column/gender_column/male.rb | 2 +- app/presenters/analyze/graph/column/gender_column/non_binary.rb | 2 +- app/presenters/analyze/graph/column/gender_column/unknown.rb | 2 +- app/presenters/analyze/graph/column/grade/eight.rb | 2 +- app/presenters/analyze/graph/column/grade/eleven.rb | 2 +- app/presenters/analyze/graph/column/grade/five.rb | 2 +- app/presenters/analyze/graph/column/grade/four.rb | 2 +- app/presenters/analyze/graph/column/grade/nine.rb | 2 +- app/presenters/analyze/graph/column/grade/one.rb | 2 +- app/presenters/analyze/graph/column/grade/seven.rb | 2 +- app/presenters/analyze/graph/column/grade/six.rb | 2 +- app/presenters/analyze/graph/column/grade/ten.rb | 2 +- app/presenters/analyze/graph/column/grade/three.rb | 2 +- app/presenters/analyze/graph/column/grade/twelve.rb | 2 +- app/presenters/analyze/graph/column/grade/two.rb | 2 +- app/presenters/analyze/graph/column/grade/zero.rb | 2 +- .../analyze/graph/column/grouped_bar_column_presenter.rb | 2 +- .../analyze/graph/column/income_column/disadvantaged.rb | 2 +- .../analyze/graph/column/income_column/not_disadvantaged.rb | 2 +- app/presenters/analyze/graph/column/income_column/unknown.rb | 2 +- .../analyze/graph/column/race_column/american_indian.rb | 2 +- app/presenters/analyze/graph/column/race_column/asian.rb | 2 +- app/presenters/analyze/graph/column/race_column/black.rb | 2 +- app/presenters/analyze/graph/column/race_column/hispanic.rb | 2 +- .../analyze/graph/column/race_column/middle_eastern.rb | 2 +- app/presenters/analyze/graph/column/race_column/multiracial.rb | 2 +- app/presenters/analyze/graph/column/race_column/unknown.rb | 2 +- app/presenters/analyze/graph/column/race_column/white.rb | 2 +- app/views/analyze/_grouped_bar_column.html.erb | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/app/presenters/analyze/graph/all_data.rb b/app/presenters/analyze/graph/all_data.rb index 3d6e738d..7bd83ef2 100644 --- a/app/presenters/analyze/graph/all_data.rb +++ b/app/presenters/analyze/graph/all_data.rb @@ -5,7 +5,7 @@ module Analyze class AllData include Analyze::Graph::Column def to_s - "All Data" + %w[All Data] end def slug diff --git a/app/presenters/analyze/graph/column/all_admin.rb b/app/presenters/analyze/graph/column/all_admin.rb index f1a9951c..74af6ed0 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 - "School Data" + %w[School Data] 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 14dfbf82..d4bbdf7b 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..a32a1965 100644 --- a/app/presenters/analyze/graph/column/grade/two.rb +++ b/app/presenters/analyze/graph/column/grade/two.rb @@ -10,7 +10,7 @@ module Analyze 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 e796af97..02af5551 100644 --- a/app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb +++ b/app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb @@ -35,7 +35,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 c6569611..6765d641 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 e48c653f..18d8118b 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" + %w[Not 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 eee7c8be..ba769e19 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" + %w[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/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 | %> <%= line %>