From 7091e15f1bd0aa8e74024ab5f256691cb036e01f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= <jjbazan@gmail.com>
Date: Wed, 1 Feb 2017 17:01:09 +0100
Subject: [PATCH] separates polls in poll index based on geozone restriction

---
 app/views/polls/index.html.erb | 75 ++++++++++++++++++++++++----------
 1 file changed, 53 insertions(+), 22 deletions(-)

diff --git a/app/views/polls/index.html.erb b/app/views/polls/index.html.erb
index 9b490f3e2..f606aaef9 100644
--- a/app/views/polls/index.html.erb
+++ b/app/views/polls/index.html.erb
@@ -15,30 +15,61 @@
   </div>
 
   <div class="small-12 medium-9 column margin-top">
-    <h3 class="section-title-divider"><%= t("polls.index.no_geozone_restricted") %></h3>
-    <h3 class="section-title-divider"><%= t("polls.index.geozone_restricted") %></h3>
-    <% @polls.each do |poll| %>
-      <div class="poll">
-        <div class="row">
-          <div class="small-12 column">
-            <div class="dates"><%= poll_dates(poll) %></div>
-            <h4 class="inline-block"><%= link_to poll.name, poll %></h4>
-            <ul>
-              <% poll.questions.each do |question| %>
-                <li><%= link_to question.title, question_path(question) %></li>
-              <% end %>
-            </ul>
-            <ul class="no-bullet margin-top tags">
-              <% poll.geozones.each do |g| %>
-                <li class="inline-block"><span><%= g.name %></span></li>
-              <% end %>
-            </ul>
-          </div>
-          <div class="small-12 column">
-            <%= link_to t("polls.index.participate_button"), poll, class: "button" %>
+    <% polls_by_geozone_restriction = @polls.group_by(&:geozone_restricted) %>
+
+    <% if polls_by_geozone_restriction[false].any? %>
+      <h3 class="section-title-divider"><%= t("polls.index.no_geozone_restricted") %></h3>
+
+      <% polls_by_geozone_restriction[false].each do |poll| %>
+        <div class="poll">
+          <div class="row">
+            <div class="small-12 column">
+              <div class="dates"><%= poll_dates(poll) %></div>
+              <h4 class="inline-block"><%= link_to poll.name, poll %></h4>
+              <ul>
+                <% poll.questions.each do |question| %>
+                  <li><%= link_to question.title, question_path(question) %></li>
+                <% end %>
+              </ul>
+              <ul class="no-bullet margin-top tags">
+                <% poll.geozones.each do |g| %>
+                  <li class="inline-block"><span><%= g.name %></span></li>
+                <% end %>
+              </ul>
+            </div>
+            <div class="small-12 column">
+              <%= link_to t("polls.index.participate_button"), poll, class: "button" %>
+            </div>
           </div>
         </div>
-      </div>
+      <% end %>
+    <% end %>
+
+    <% if polls_by_geozone_restriction[true].any? %>
+      <h3 class="section-title-divider"><%= t("polls.index.geozone_restricted") %></h3>
+      <% polls_by_geozone_restriction[true].each do |poll| %>
+        <div class="poll">
+          <div class="row">
+            <div class="small-12 column">
+              <div class="dates"><%= poll_dates(poll) %></div>
+              <h4 class="inline-block"><%= link_to poll.name, poll %></h4>
+              <ul>
+                <% poll.questions.each do |question| %>
+                  <li><%= link_to question.title, question_path(question) %></li>
+                <% end %>
+              </ul>
+              <ul class="no-bullet margin-top tags">
+                <% poll.geozones.each do |g| %>
+                  <li class="inline-block"><span><%= g.name %></span></li>
+                <% end %>
+              </ul>
+            </div>
+            <div class="small-12 column">
+              <%= link_to t("polls.index.participate_button"), poll, class: "button" %>
+            </div>
+          </div>
+        </div>
+      <% end %>
     <% end %>
 
     <%= paginate @polls %>