From c7e9a60e103ae37b9205fda385b50e9989ddadaa Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Mon, 5 Mar 2018 14:02:38 +0100
Subject: [PATCH 1/5] Adds heading link on different heading message

---
 app/models/budget/investment.rb               | 10 +++---
 .../budgets/investments/_ballot.html.erb      | 34 +++++++++++++------
 .../budgets/investments/_header.html.erb      |  2 +-
 config/locales/en/budgets.yml                 |  2 +-
 config/locales/es/budgets.yml                 |  2 +-
 spec/features/ballots_spec.rb                 |  2 +-
 spec/features/budgets/ballots_spec.rb         |  4 +--
 spec/models/budget/investment_spec.rb         |  2 +-
 8 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb
index 1b63ff07443..4e1709f6670 100644
--- a/app/models/budget/investment.rb
+++ b/app/models/budget/investment.rb
@@ -220,11 +220,11 @@ def reason_for_not_being_selectable_by(user)
     end
 
     def reason_for_not_being_ballotable_by(user, ballot)
-      return permission_problem(user)    if permission_problem?(user)
-      return :not_selected               unless selected?
-      return :no_ballots_allowed         unless budget.balloting?
-      return :different_heading_assigned unless ballot.valid_heading?(heading)
-      return :not_enough_money_html      if ballot.present? && !enough_money?(ballot)
+      return permission_problem(user)         if permission_problem?(user)
+      return :not_selected                    unless selected?
+      return :no_ballots_allowed              unless budget.balloting?
+      return :different_heading_assigned_html unless ballot.valid_heading?(heading)
+      return :not_enough_money_html           if ballot.present? && !enough_money?(ballot)
     end
 
     def permission_problem(user)
diff --git a/app/views/budgets/investments/_ballot.html.erb b/app/views/budgets/investments/_ballot.html.erb
index 605caebc7ce..f65ec6c7498 100644
--- a/app/views/budgets/investments/_ballot.html.erb
+++ b/app/views/budgets/investments/_ballot.html.erb
@@ -42,17 +42,31 @@
 
   <% if reason.present? && !ballot.has_investment?(investment) %>
 
-    <div class="js-participation-not-allowed participation-not-allowed" style='display:none'>
+    <div class="js-participation-not-allowed participation-not-allowed" style="display:none">
+
+      <% verify_account = link_to(t("votes.verify_account"), verification_path) %>
+      <% signin = link_to(t("votes.signin"), new_user_session_path) %>
+      <% signup = link_to(t("votes.signup"), new_user_registration_path) %>
+      <% my_heading = link_to(investment.heading.name,
+                      budget_investments_path(budget_id: investment.budget_id,
+                                              heading_id: investment.heading_id)) %>
+      <% change_ballot = link_to(t("budgets.ballots.reasons_for_not_balloting.change_ballot"),
+                                          budget_ballot_path(@budget))%>
+
+      <% if @assigned_heading.present? %>
+        <% heading_link = link_to(@assigned_heading.name,
+                                  budget_investments_path(@budget,
+                                  heading_id: @assigned_heading.try(:id))) %>
+      <% end %>
+
       <p>
-        <%= t("budgets.ballots.reasons_for_not_balloting.#{reason}",
-              verify_account: link_to(t("votes.verify_account"), verification_path),
-              signin: link_to(t("votes.signin"), new_user_session_path),
-              signup: link_to(t("votes.signup"), new_user_registration_path),
-              my_heading: link_to(investment.heading.name,
-                                  budget_investments_path(budget_id: investment.budget_id,
-                                                          heading_id: investment.heading_id)),
-              change_ballot: link_to(t("budgets.ballots.reasons_for_not_balloting.change_ballot"),
-                                    budget_ballot_path(@budget))).html_safe %>
+        <small>
+          <%= t("budgets.ballots.reasons_for_not_balloting.#{reason}",
+                verify_account: verify_account, signin: signin,
+                signup: signup, my_heading: my_heading,
+                change_ballot: change_ballot,
+                heading_link: heading_link).html_safe %>
+        </small>
       </p>
     </div>
 
diff --git a/app/views/budgets/investments/_header.html.erb b/app/views/budgets/investments/_header.html.erb
index c664abc01e0..d9f21523ad3 100644
--- a/app/views/budgets/investments/_header.html.erb
+++ b/app/views/budgets/investments/_header.html.erb
@@ -35,7 +35,7 @@
                 <%= t("budgets.investments.index.by_heading", heading: @heading.name) %>
               </h2>
               <div class="small-12 medium-9">
-                <div class="callout warning">
+                <div class="callout warning margin-top">
                   <%= t("budgets.investments.header.different_heading_assigned_html",
                         heading_link: link_to(
                           @assigned_heading.name,
diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml
index 524757f5424..c263590d2b7 100644
--- a/config/locales/en/budgets.yml
+++ b/config/locales/en/budgets.yml
@@ -19,7 +19,7 @@ en:
         not_selected: Unselected investment projects can not be supported
         not_enough_money_html: "You have already assigned the available budget.<br><small>Remember you can %{change_ballot} at any time</small>"
         no_ballots_allowed: Selecting phase is closed
-        different_heading_assigned: You have already voted a different heading
+        different_heading_assigned_html: "You have already voted a different heading: %{heading_link}"
         change_ballot: change your votes
     groups:
       show:
diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml
index 6e5f960badd..0d1cbbd63a6 100644
--- a/config/locales/es/budgets.yml
+++ b/config/locales/es/budgets.yml
@@ -19,7 +19,7 @@ es:
         not_selected: No se pueden votar proyectos inviables.
         not_enough_money_html: "Ya has asignado el presupuesto disponible.<br><small>Recuerda que puedes %{change_ballot} en cualquier momento</small>"
         no_ballots_allowed: El periodo de votación está cerrado.
-        different_heading_assigned: Ya has votado proyectos de otro distrito.
+        different_heading_assigned_html: "Ya has votado proyectos de otro distrito: %{heading_link}"
         change_ballot: cambiar tus votos
     groups:
       show:
diff --git a/spec/features/ballots_spec.rb b/spec/features/ballots_spec.rb
index fcae3299b92..8a01936d26f 100644
--- a/spec/features/ballots_spec.rb
+++ b/spec/features/ballots_spec.rb
@@ -293,7 +293,7 @@
       visit spending_proposals_path(geozone: new_york)
 
       expect(page).not_to have_css "#progressbar"
-      expect(page).to have_content "You have active votes in another district:"
+      expect(page).to have_content "You have active votes in another district: California"
       expect(page).to have_link california.name, href: spending_proposals_path(geozone: california)
     end
 
diff --git a/spec/features/budgets/ballots_spec.rb b/spec/features/budgets/ballots_spec.rb
index ce4fe194fe4..ba568715915 100644
--- a/spec/features/budgets/ballots_spec.rb
+++ b/spec/features/budgets/ballots_spec.rb
@@ -226,7 +226,7 @@
         click_link "Districts"
         click_link "District 2"
 
-        expect(page).to have_content("You have active votes in another heading")
+        expect(page).to have_content("You have active votes in another heading: District 1")
       end
     end
 
@@ -296,7 +296,7 @@
       visit budget_investments_path(budget, heading_id: new_york.id)
 
       expect(page).not_to have_css "#progressbar"
-      expect(page).to have_content "You have active votes in another heading:"
+      expect(page).to have_content "You have active votes in another heading: California"
       expect(page).to have_link california.name, href: budget_investments_path(budget, heading_id: california.id)
     end
 
diff --git a/spec/models/budget/investment_spec.rb b/spec/models/budget/investment_spec.rb
index 9314b718fdf..8160fa89776 100644
--- a/spec/models/budget/investment_spec.rb
+++ b/spec/models/budget/investment_spec.rb
@@ -948,7 +948,7 @@
           ballot = create(:budget_ballot, user: user, budget: budget)
           ballot.investments << inv1
 
-          expect(inv2.reason_for_not_being_ballotable_by(user, ballot)).to eq(:different_heading_assigned)
+          expect(inv2.reason_for_not_being_ballotable_by(user, ballot)).to eq(:different_heading_assigned_html)
         end
 
         it "rejects proposals with price higher than current available money" do

From 31c0773ab75c4ede392fd74745036195cdbb20d0 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Mon, 5 Mar 2018 19:01:11 +0100
Subject: [PATCH 2/5] Extract BudgetHeadingsHelper#heading_link & use it

Why:

The logic to construct the link to a heading (if it exists) is in three
different places, this is a clear candidate for a helper method.

How:

Just checking at the helper method if `assigned_heading` and `budget`
has values and composing the link if so.
---
 app/helpers/budget_headings_helper.rb           | 6 ++++++
 app/views/budgets/investments/_ballot.html.erb  | 8 +-------
 app/views/budgets/investments/_header.html.erb  | 5 +----
 app/views/budgets/investments/_sidebar.html.erb | 4 +---
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/helpers/budget_headings_helper.rb b/app/helpers/budget_headings_helper.rb
index 3fa1eac89bc..22eabfe11e9 100644
--- a/app/helpers/budget_headings_helper.rb
+++ b/app/helpers/budget_headings_helper.rb
@@ -6,4 +6,10 @@ def budget_heading_select_options(budget)
     end
   end
 
+  def heading_link(assigned_heading = nil, budget = nil)
+    return nil unless assigned_heading && budget
+    heading_path = budget_investments_path(budget, heading_id: assigned_heading.try(:id))
+    link_to(assigned_heading.name, heading_path)
+  end
+
 end
diff --git a/app/views/budgets/investments/_ballot.html.erb b/app/views/budgets/investments/_ballot.html.erb
index f65ec6c7498..c12103a0a3b 100644
--- a/app/views/budgets/investments/_ballot.html.erb
+++ b/app/views/budgets/investments/_ballot.html.erb
@@ -53,19 +53,13 @@
       <% change_ballot = link_to(t("budgets.ballots.reasons_for_not_balloting.change_ballot"),
                                           budget_ballot_path(@budget))%>
 
-      <% if @assigned_heading.present? %>
-        <% heading_link = link_to(@assigned_heading.name,
-                                  budget_investments_path(@budget,
-                                  heading_id: @assigned_heading.try(:id))) %>
-      <% end %>
-
       <p>
         <small>
           <%= t("budgets.ballots.reasons_for_not_balloting.#{reason}",
                 verify_account: verify_account, signin: signin,
                 signup: signup, my_heading: my_heading,
                 change_ballot: change_ballot,
-                heading_link: heading_link).html_safe %>
+                heading_link: heading_link(@assigned_heading, @budget)).html_safe %>
         </small>
       </p>
     </div>
diff --git a/app/views/budgets/investments/_header.html.erb b/app/views/budgets/investments/_header.html.erb
index d9f21523ad3..90d2edfd458 100644
--- a/app/views/budgets/investments/_header.html.erb
+++ b/app/views/budgets/investments/_header.html.erb
@@ -37,10 +37,7 @@
               <div class="small-12 medium-9">
                 <div class="callout warning margin-top">
                   <%= t("budgets.investments.header.different_heading_assigned_html",
-                        heading_link: link_to(
-                          @assigned_heading.name,
-                          budget_investments_path(@budget, heading_id: @assigned_heading.try(:id)))
-                       ) %>
+                        heading_link: heading_link(@assigned_heading, @budget)) %>
                   <br>
                   <small>
                     <%= t("budgets.investments.header.change_ballot",
diff --git a/app/views/budgets/investments/_sidebar.html.erb b/app/views/budgets/investments/_sidebar.html.erb
index 210d0815b58..15632aa2b6c 100644
--- a/app/views/budgets/investments/_sidebar.html.erb
+++ b/app/views/budgets/investments/_sidebar.html.erb
@@ -44,9 +44,7 @@
   <% elsif @assigned_heading.present? %>
     <p>
       <%= t("budgets.investments.index.sidebar.different_heading_assigned_html",
-              heading_link: link_to(
-                @assigned_heading.name,
-                budget_investments_path(@budget, heading_id: @assigned_heading.try(:id)))
+              heading_link: heading_link(@assigned_heading, @budget)
             ) %>
       <br>
       <small>

From 30015522f836af7d233ecb638ae209654bf80759 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Wed, 7 Mar 2018 16:56:32 +0100
Subject: [PATCH 3/5] Makes smaller text on participation not allowed div

---
 app/views/budgets/investments/_votes.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/budgets/investments/_votes.html.erb b/app/views/budgets/investments/_votes.html.erb
index f89d989f66e..4b41470334b 100644
--- a/app/views/budgets/investments/_votes.html.erb
+++ b/app/views/budgets/investments/_votes.html.erb
@@ -29,11 +29,13 @@
   <% if reason.present? && !user_voted_for %>
     <div class="js-participation-not-allowed participation-not-allowed" style='display:none' aria-hidden="false">
       <p>
+        <small>
           <%= t("votes.budget_investments.#{reason}",
                 verify_account: link_to(t("votes.verify_account"), verification_path),
                 signin: link_to(t("votes.signin"), new_user_session_path),
                 signup: link_to(t("votes.signup"), new_user_registration_path)
            ).html_safe %>
+        </small>
       </p>
     </div>
   <% end %>

From cde299fe4502040c2bd3e93bfc8212dc5c737e05 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Wed, 7 Mar 2018 16:56:38 +0100
Subject: [PATCH 4/5] Adds custom message for different heading assigned

---
 config/locales/custom/en/budgets.yml | 3 +++
 config/locales/custom/es/budgets.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/config/locales/custom/en/budgets.yml b/config/locales/custom/en/budgets.yml
index 458041a8e27..56a32253564 100644
--- a/config/locales/custom/en/budgets.yml
+++ b/config/locales/custom/en/budgets.yml
@@ -37,3 +37,6 @@ en:
       no_demographic_data: "* There is no demographic data for %{total} participants."
       participatory_disclaimer: "** The numbers of total participation refer to persons that created, supported or voted investment proposals."
       heading_disclaimer: "*** Data about headings refer to the heading where each user voted, not necessarily the one that person is registered on."
+  votes:
+    budget_investments:
+      different_heading_assigned: "You can only support investment projects in one district"
diff --git a/config/locales/custom/es/budgets.yml b/config/locales/custom/es/budgets.yml
index b5a74eacb38..3ae420e5f7f 100644
--- a/config/locales/custom/es/budgets.yml
+++ b/config/locales/custom/es/budgets.yml
@@ -58,3 +58,6 @@ es:
       no_demographic_data: "* No se dispone de los datos demográficos de %{total} participantes."
       participatory_disclaimer: "** Las cifras de participación total se refieren a personas que han creado, apoyado o votado propuestas."
       heading_disclaimer: "*** Los datos de distrito se refieren al distrito en el que el usuario ha votado, no necesariamente en el que está empadronado."
+  votes:
+    budget_investments:
+      different_heading_assigned: "Sólo puedes apoyar proyectos de gasto de un distrito"

From 0ee567697db7b785d22243c001a8003465329d72 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Wed, 7 Mar 2018 21:18:39 +0100
Subject: [PATCH 5/5] Removes unused i18n keys

---
 config/locales/en/admin.yml | 1 -
 config/locales/es/admin.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 4c9d9dd9cc8..24d064f977d 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -163,7 +163,6 @@ en:
           one_filter_html: "Current applied filters: <b><em>%{filter}</em></b>"
           two_filters_html: "Current applied filters: <b><em>%{filter}, %{advanced_filters}</em></b>"
         buttons:
-          search: Search
           filter: Filter
         download_current_selection: "Download current selection"
         no_budget_investments: "There are no investment projects."
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index cf087f67e89..0f95ddde31b 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -163,7 +163,6 @@ es:
           one_filter_html: "Filtros en uso: <b><em>%{filter}</em></b>"
           two_filters_html: "Filtros en uso: <b><em>%{filter}, %{advanced_filters}</em></b>"
         buttons:
-          search: Buscar
           filter: Filtrar
         download_current_selection: "Descargar selección actual"
         no_budget_investments: "No hay proyectos de gasto."