consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extracts officer_assignments from admin's poll/show

Browse Source
This commit is contained in:
Juanjo Bazán
2017-02-14 13:47:33 +01:00
parent 20e31133a8
commit 19ec7f93b3
13 changed files with 225 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/poll/polls/_filter_subnav.html.erb
View File

@@ -12,7 +12,7 @@
<% end %>
</li>
<li>
<%= link_to "#tab-officers" do %>
<%= link_to admin_poll_officer_assignments_path(@poll) do %>
<%= t("admin.polls.show.officers_tab") %>
(<%= @poll.officer_assignments.select(:officer_id).distinct.count %>)
<% end %>

34
app/views/admin/poll/polls/_officers.html.erb
View File

@@ -1,34 +0,0 @@
<h3><%= t("admin.polls.show.officers_title") %></h3>
<% if @poll.officers.empty? %>
<div class="callout primary margin-top">
<%= t("admin.polls.show.no_officers") %>
</div>
<% else %>
<table class="fixed margin">
<thead>
<th><%= t("admin.polls.show.table_name") %></th>
<th><%= t("admin.polls.show.table_email") %></th>
<th class="text-right"><%= t("admin.actions.actions") %></th>
</thead>
<tbody>
<% @poll.officers.uniq.each do |officer| %>
<tr id="officer_<%= officer.id %>" class="officer">
<td>
<strong>
<%= link_to officer.name, admin_officer_assignments_path(officer: officer, poll: @poll) %>
</strong>
</td>
<td>
<%= officer.email %>
</td>
<td class="text-right">
<%= link_to t("admin.polls.show.edit_officer_assignments"),
admin_officer_assignments_path(officer: officer, poll: @poll),
class: "button hollow" %>
</td>
</tr>
<% end %>
</tbody>
</table>
<% end %>

16
app/views/admin/poll/polls/_search_officers.html.erb
View File

@@ -1,16 +0,0 @@
<div class="row">
<div class="small-12 medium-6 column">
<%= form_tag(search_officers_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
<div class="input-group">
<%= text_field_tag :search,
@search,
placeholder: t("admin.shared.poll_officers_search.placeholder"), id: "search-officers" %>
<div class="input-group-button">
<%= submit_tag t("admin.shared.poll_officers_search.button"), class: "button" %>
</div>
</div>
<% end %>
</div>
</div>
<div id="search-officers-results"></div>

42
app/views/admin/poll/polls/_search_officers_results.html.erb
View File

@@ -1,42 +0,0 @@
<% if @officers.blank? %>
<div class="callout alert margin-bottom">
<%= t('admin.shared.no_search_results') %>
</div>
<% else %>
<h3><%= t('admin.shared.search_results') %></h3>
<% end %>
<% if @officers.any? %>
<table>
<thead>
<tr>
<th><%= t("admin.polls.show.table_name") %></th>
<th><%= t("admin.polls.show.table_email") %></th>
<th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
</tr>
</thead>
<tbody>
<% @officers.each do |user| %>
<tr>
<td>
<%= user.name %>
</td>
<td>
<%= user.email %>
</td>
<td class="text-center">
<% if @poll.officer_ids.include?(user.poll_officer.id) %>
<%= link_to t("admin.polls.show.edit_officer_assignments"),
admin_officer_assignments_path(poll: @poll, officer: user.poll_officer),
class: "button hollow alert" %>
<% else %>
<%= link_to t("admin.polls.show.add_officer_assignments"),
admin_officer_assignments_path(poll: @poll, officer: user.poll_officer),
class: "button hollow" %>
<% end %>
</td>
</tr>
<% end %>
</tbody>
</table>
<% end %>

1
app/views/admin/poll/polls/search_officers.js.erb
View File

@@ -1 +0,0 @@
$("#search-officers-results").html("<%= j render 'search_officers_results' %>");

5
app/views/admin/poll/polls/show.html.erb
View File

@@ -8,11 +8,6 @@
<%= render "questions" %>
</div>
<div class="tabs-panel" id="tab-officers">
<%= render "search_officers" %>
<%= render 'officers' %>
</div>
<div class="tabs-panel" id="tab-recounts">
<%= render 'recounting' %>
</div>