From 151239924b6c34781ee04239a8faa4568fdb7288 Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Thu, 21 Jun 2018 15:36:39 +0200
Subject: [PATCH] Display 'validate document' menu item only when applicable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We are trying to avoid Officers from forgetting to click the “Confirm
vote” button, which is necessary to keep track of who has voted a Poll

To do that, we are not displaying the menu item to go back to the next
person that wants to vote, until the Officer clicks the “Confirm Vote”
button or the “The user has decided not to vote” button

Note: Due to mobile version we have duplicate ids, so using classes for
the menu items to hide them without errors

Note2: We are only hidding the menu item, if there are votable polls,
otherwise the “Confirm vote” button does not appear, and there is no
way of going back to help the next person that wants to vote
---
 app/views/officing/_menu.html.erb       |  4 ++-
 app/views/officing/voters/create.js.erb |  3 +-
 spec/features/polls/voter_spec.rb       | 44 ++++++++++++++++++++++++-
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/app/views/officing/_menu.html.erb b/app/views/officing/_menu.html.erb
index 173c72582..17b57a087 100644
--- a/app/views/officing/_menu.html.erb
+++ b/app/views/officing/_menu.html.erb
@@ -1,7 +1,9 @@
 <div class="admin-sidebar" data-equalizer-watch>
   <ul id="officing_menu">
     <% if vote_collection_shift? %>
-      <li <%= "class=is-active" if controller_name == "voters" %>>
+      <li class="<%= "js-vote-collection" %>
+                 <%= " is-active" if controller_name == "voters" %>
+                 <%= " is-hidden" if controller_name == "voters" && Poll.votable_by(@user).any? %>">
         <%= link_to new_officing_residence_path do %>
           <span class="icon-user"></span>
           <%= t("officing.menu.voters") %>
diff --git a/app/views/officing/voters/create.js.erb b/app/views/officing/voters/create.js.erb
index 3837f017e..7a9a4cf03 100644
--- a/app/views/officing/voters/create.js.erb
+++ b/app/views/officing/voters/create.js.erb
@@ -1,2 +1,3 @@
 $("#<%= dom_id(@poll) %> #actions").html('<%= j render("voted") %>');
-$("#<%= dom_id(@poll) %> #can_vote_callout").hide();
\ No newline at end of file
+$("#<%= dom_id(@poll) %> #can_vote_callout").hide();
+$(".js-vote-collection").removeClass("is-hidden");
diff --git a/spec/features/polls/voter_spec.rb b/spec/features/polls/voter_spec.rb
index ae0022302..8e0271f8f 100644
--- a/spec/features/polls/voter_spec.rb
+++ b/spec/features/polls/voter_spec.rb
@@ -164,6 +164,48 @@ feature "Voter" do
       expect(Poll::Voter.count).to eq(1)
     end
 
-  end
+    context "Side menu" do
+      scenario "'Validate document' menu item with votable polls", :js do
+        login_through_form_as_officer(officer.user)
 
+        visit new_officing_residence_path
+        officing_verify_residence
+
+        expect(page).to have_content poll.name
+
+        within("#side_menu") do
+          expect(page).not_to have_content("Validate document")
+        end
+
+        within("#poll_#{poll.id}") do
+          click_button("Confirm vote")
+          expect(page).to have_content "Vote introduced!"
+        end
+
+        within("#side_menu") do
+          expect(page).to have_content("Validate document")
+        end
+      end
+
+      scenario "'Validate document' menu item without votable polls", :js do
+        create(:poll_voter, poll: poll, user: create(:user, :in_census))
+
+        login_through_form_as_officer(officer.user)
+
+        visit new_officing_residence_path
+        officing_verify_residence
+
+        expect(page).to have_content poll.name
+
+        within("#poll_#{poll.id}") do
+          expect(page).to have_content "Has already participated in this poll"
+        end
+
+        within("#side_menu") do
+          expect(page).to have_content("Validate document")
+        end
+      end
+
+    end
+  end
 end