From eac0389d34d8aa760aeb1890174f821b1cff169d Mon Sep 17 00:00:00 2001 From: keithrbennett Date: Sun, 28 Jul 2019 12:17:04 -0400 Subject: [PATCH 1/4] #156 Added "Not Provided" for fields with missing information. --- app/views/partners/show.html.erb | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/views/partners/show.html.erb b/app/views/partners/show.html.erb index 0e588990..d230f407 100644 --- a/app/views/partners/show.html.erb +++ b/app/views/partners/show.html.erb @@ -207,48 +207,48 @@
Ethnic Composition of Those Served
African American
-
<%= @partner.population_black %>
+
<%= @partner.population_black || 'Not Provided' %>
Caucasian
-
<%= @partner.population_white %>
+
<%= @partner.population_white || 'Not Provided' %>
Hispanic
-
<%= @partner.population_hispanic %>
+
<%= @partner.population_hispanic || 'Not Provided' %>
Asian
-
<%= @partner.population_asian %>
+
<%= @partner.population_asian || 'Not Provided' %>
American Indian
-
<%= @partner.population_american_indian %>
+
<%= @partner.population_american_indian || 'Not Provided' %>
Pacific Islander
-
<%= @partner.population_island %>
+
<%= @partner.population_island || 'Not Provided' %>
Multi-racial
-
<%= @partner.population_multi_racial %>
+
<%= @partner.population_multi_racial || 'Not Provided' %>
Other
-
<%= @partner.population_other %>
+
<%= @partner.population_other || 'Not Provided' %>
Zip Codes Served
<%= @partner.zips_served %>
Poverty Information of Those Served
At FPL or below
-
<%= @partner.at_fpl_or_below %>
+
<%= @partner.at_fpl_or_below || 'Not Provided' %>
Above 1-2 times FPL
-
<%= @partner.above_1_2_times_fpl %>
+
<%= @partner.above_1_2_times_fpl || 'Not Provided' %>
Greater than 2 times FPL
-
<%= @partner.greater_2_times_fpl %>
+
<%= @partner.greater_2_times_fpl || 'Not Provided' %>
Poverty Unknown
-
<%= @partner.poverty_unknown %>
+
<%= @partner.poverty_unknown || 'Not Provided' %>
Ages Served
Ages
-
<%= @partner.ages_served %>
+
<%= @partner.ages_served || 'Not Provided' %>
From 528654441d086da7ab78f447d26e8f346471140b Mon Sep 17 00:00:00 2001 From: keithrbennett Date: Sun, 28 Jul 2019 12:26:16 -0400 Subject: [PATCH 2/4] Use instance variable so that 'Not Provided' is defined only once, to prevent misspelling and simplify modification. --- app/views/partners/show.html.erb | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/app/views/partners/show.html.erb b/app/views/partners/show.html.erb index d230f407..978521e0 100644 --- a/app/views/partners/show.html.erb +++ b/app/views/partners/show.html.erb @@ -1,3 +1,4 @@ +<% @not_provided = 'Not Provided' %>
<% if @partner.partner_status == "Recertification Required" %> @@ -207,48 +208,48 @@
Ethnic Composition of Those Served
African American
-
<%= @partner.population_black || 'Not Provided' %>
+
<%= @partner.population_black || @not_provided %>
Caucasian
-
<%= @partner.population_white || 'Not Provided' %>
+
<%= @partner.population_white || @not_provided %>
Hispanic
-
<%= @partner.population_hispanic || 'Not Provided' %>
+
<%= @partner.population_hispanic || @not_provided %>
Asian
-
<%= @partner.population_asian || 'Not Provided' %>
+
<%= @partner.population_asian || @not_provided %>
American Indian
-
<%= @partner.population_american_indian || 'Not Provided' %>
+
<%= @partner.population_american_indian || @not_provided %>
Pacific Islander
-
<%= @partner.population_island || 'Not Provided' %>
+
<%= @partner.population_island || @not_provided %>
Multi-racial
-
<%= @partner.population_multi_racial || 'Not Provided' %>
+
<%= @partner.population_multi_racial || @not_provided %>
Other
-
<%= @partner.population_other || 'Not Provided' %>
+
<%= @partner.population_other || @not_provided %>
Zip Codes Served
<%= @partner.zips_served %>
Poverty Information of Those Served
At FPL or below
-
<%= @partner.at_fpl_or_below || 'Not Provided' %>
+
<%= @partner.at_fpl_or_below || @not_provided %>
Above 1-2 times FPL
-
<%= @partner.above_1_2_times_fpl || 'Not Provided' %>
+
<%= @partner.above_1_2_times_fpl || @not_provided %>
Greater than 2 times FPL
-
<%= @partner.greater_2_times_fpl || 'Not Provided' %>
+
<%= @partner.greater_2_times_fpl || @not_provided %>
Poverty Unknown
-
<%= @partner.poverty_unknown || 'Not Provided' %>
+
<%= @partner.poverty_unknown || @not_provided %>
Ages Served
Ages
-
<%= @partner.ages_served || 'Not Provided' %>
+
<%= @partner.ages_served || @not_provided %>
From 6bec533f8390ba2c2bd075614d92c7baf821f34f Mon Sep 17 00:00:00 2001 From: keithrbennett Date: Mon, 29 Jul 2019 13:15:33 -0400 Subject: [PATCH 3/4] Use Rails internationalization for string "Not Provided". --- app/views/partners/show.html.erb | 26 +++++++++++++------------- config/locales/en.yml | 1 + 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/views/partners/show.html.erb b/app/views/partners/show.html.erb index 978521e0..fc143a4d 100644 --- a/app/views/partners/show.html.erb +++ b/app/views/partners/show.html.erb @@ -208,48 +208,48 @@
Ethnic Composition of Those Served
African American
-
<%= @partner.population_black || @not_provided %>
+
<%= @partner.population_black || t(:not_provided) %>
Caucasian
-
<%= @partner.population_white || @not_provided %>
+
<%= @partner.population_white || t(:not_provided) %>
Hispanic
-
<%= @partner.population_hispanic || @not_provided %>
+
<%= @partner.population_hispanic || t(:not_provided) %>
Asian
-
<%= @partner.population_asian || @not_provided %>
+
<%= @partner.population_asian || t(:not_provided) %>
American Indian
-
<%= @partner.population_american_indian || @not_provided %>
+
<%= @partner.population_american_indian || t(:not_provided) %>
Pacific Islander
-
<%= @partner.population_island || @not_provided %>
+
<%= @partner.population_island || t(:not_provided) %>
Multi-racial
-
<%= @partner.population_multi_racial || @not_provided %>
+
<%= @partner.population_multi_racial || t(:not_provided) %>
Other
-
<%= @partner.population_other || @not_provided %>
+
<%= @partner.population_other || t(:not_provided) %>
Zip Codes Served
<%= @partner.zips_served %>
Poverty Information of Those Served
At FPL or below
-
<%= @partner.at_fpl_or_below || @not_provided %>
+
<%= @partner.at_fpl_or_below || t(:not_provided) %>
Above 1-2 times FPL
-
<%= @partner.above_1_2_times_fpl || @not_provided %>
+
<%= @partner.above_1_2_times_fpl || t(:not_provided) %>
Greater than 2 times FPL
-
<%= @partner.greater_2_times_fpl || @not_provided %>
+
<%= @partner.greater_2_times_fpl || t(:not_provided) %>
Poverty Unknown
-
<%= @partner.poverty_unknown || @not_provided %>
+
<%= @partner.poverty_unknown || t(:not_provided) %>
Ages Served
Ages
-
<%= @partner.ages_served || @not_provided %>
+
<%= @partner.ages_served || t(:not_provided) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 2c5c77fa..c0e46007 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -30,6 +30,7 @@ # available at http://guides.rubyonrails.org/i18n.html. en: + not_provided: "Not Provided" hello: "Hello world" :true: 'Yes' :false: 'No' From a799cde31067daaa93a6a5287639bc25667f59b3 Mon Sep 17 00:00:00 2001 From: Keith Bennett Date: Tue, 30 Jul 2019 11:58:43 -0400 Subject: [PATCH 4/4] Removed @not_provided variable assignment no longer needed. --- app/views/partners/show.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/partners/show.html.erb b/app/views/partners/show.html.erb index fc143a4d..6de533f6 100644 --- a/app/views/partners/show.html.erb +++ b/app/views/partners/show.html.erb @@ -1,4 +1,3 @@ -<% @not_provided = 'Not Provided' %>
<% if @partner.partner_status == "Recertification Required" %>