Merge pull request #1304 from consul/polls-views

polls views

app/controllers/admin/poll/questions_controller.rb

@@ -9,6 +9,8 @@ class Admin::Poll::QuestionsController < Admin::BaseController
     @search = search_params[:search]
 
     @questions = @questions.search(search_params).page(params[:page]).order("created_at DESC")
+
+    @proposals = Proposal.successful.sort_by_confidence_score
   end
 
   def new

app/views/admin/poll/questions/_filter_subnav.html.erb

@@ -0,0 +1,12 @@
+<ul class="tabs" data-tabs id="questions-tabs">
+  <li class="tabs-title is-active">
+    <%= link_to "#tab-questions" do %>
+      <%= t("admin.questions.index.questions_tab") %>
+    <% end %>
+  </li>
+  <li class="tabs-title">
+    <%= link_to "#tab-successful-proposals" do %>
+      <%= t("admin.questions.index.successful_proposals_tab") %>
+    <% end %>
+  </li>
+</ul>

app/views/admin/poll/questions/_questions.html.erb

@@ -0,0 +1,23 @@
+<div class="small-12 medium-4 large-3">
+  <%= render 'filter' %>
+</div>
+
+<% if @questions.count == 0 %>
+  <div class="callout primary margin-top">
+    <%= t('admin.questions.index.no_questions') %>
+  </div>
+<% else %>
+  <table>
+  <% @questions.each do |question| %>
+    <tr id="<%= dom_id(question) %>">
+      <td><%= link_to question.title, admin_question_path(question) %></td>
+      <td class="text-right">
+        <%= link_to t('shared.edit'), edit_admin_question_path(question), class: "button hollow" %>
+        <%= link_to t('shared.delete'), admin_question_path(question), class: "button hollow alert", method: :delete %>
+      </td>
+    </tr>
+  <% end %>
+  </table>
+
+  <%= paginate @questions %>
+<% end %>

app/views/admin/poll/questions/_successful_proposals.html.erb

@@ -0,0 +1,20 @@
+<table>
+  <tbody>
+    <% @proposals.each do |proposal| %>
+      <tr id="<%= dom_id(proposal) %>">
+        <td>
+          <%= link_to proposal.title, proposal_path(proposal) %>
+          <p>
+            <%= proposal.summary %><br>
+            <strong><%= proposal.question %></strong>
+          </p>
+        </td>
+        <td class="text-right">
+          <%= link_to t("admin.questions.index.create_question"),
+                new_admin_question_path(proposal_id: proposal.id),
+                class: "button hollow" %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

app/views/admin/poll/questions/index.html.erb

@@ -9,26 +9,14 @@
   </div>
 </div>
 
-<div class="small-12 medium-4 large-3">
-  <%= render 'filter' %>
-</div>
+<div class="tabs-content" data-tabs-content="questions-tabs">
+  <%= render "filter_subnav" %>
 
-<% if @questions.count == 0 %>
-  <div class="callout primary margin-top">
-    <%= t('admin.questions.index.no_questions') %>
+  <div class="tabs-panel is-active" id="tab-questions">
+    <%= render "questions" %>
   </div>
-<% else %>
-  <table>
-  <% @questions.each do |question| %>
-    <tr id="<%= dom_id(question) %>">
-      <td><%= link_to question.title, admin_question_path(question) %></td>
-      <td class="text-right">
-        <%= link_to t('shared.edit'), edit_admin_question_path(question), class: "button hollow" %>
-        <%= link_to t('shared.delete'), admin_question_path(question), class: "button hollow alert", method: :delete %>
-      </td>
-    </tr>
-  <% end %>
-  </table>
 
-  <%= paginate @questions %>
-<% end %>
+  <div class="tabs-panel" id="tab-successful-proposals">
+    <%= render "successful_proposals" %>
+  </div>
+</div>

config/locales/admin.en.yml

@@ -106,7 +106,7 @@ en:
       valuators: Valuators
       poll_officers: Poll officers
       polls: Polls
-      poll_booths: Booths
+      poll_booths: Booths location
       officials: Officials
       organizations: Organisations
       settings: Configuration settings
@@ -200,6 +200,9 @@ en:
         no_questions: "There are no questions."
         filter_poll: Filter by Poll
         select_poll: Select Poll
+        questions_tab: "Questions"
+        successful_proposals_tab: "Successful proposals"
+        create_question: "Create question"
       edit:
         title: "Edit Question"
       new:

config/locales/admin.es.yml

@@ -106,7 +106,7 @@ es:
       valuators: Evaluadores
       poll_officers: Presidentes de mesa
       polls: Votaciones
-      poll_booths: Urnas
+      poll_booths: Ubicación de urnas
       officials: Cargos públicos
       organizations: Organizaciones
       settings: Configuración global
@@ -200,6 +200,9 @@ es:
         no_questions: "No hay ninguna pregunta ciudadana."
         filter_poll: "Filtrar por votación"
         select_poll: "Seleccionar votación"
+        questions_tab: "Preguntas ciudadanas"
+        successful_proposals_tab: "Propuestas que han superado el umbral"
+        create_question: "Crear pregunta para votación"
       edit:
         title: "Editar pregunta ciudadana"
       new:

spec/features/admin/poll/booths_spec.rb

@@ -11,7 +11,7 @@ feature 'Admin booths' do
     visit admin_root_path
 
     within('#side_menu') do
-      click_link "Booths"
+      click_link "Booths location"
     end
 
     expect(page).to have_content "There are no booths"
@@ -23,7 +23,7 @@ feature 'Admin booths' do
     visit admin_root_path
 
     within('#side_menu') do
-      click_link "Booths"
+      click_link "Booths location"
     end
 
     booths = Poll::Booth.all