| <%= officer_assignment.final? ? t('polls.final_date') : l(officer_assignment.date.to_date) %> |
<%= booth_name_with_location(officer_assignment.booth_assignment.booth) %> |
-
+ |
<%= link_to t("admin.poll_officer_assignments.index.remove_assignment"),
admin_officer_assignment_path(officer_assignment),
method: :delete,
@@ -68,12 +68,12 @@
<% voting_days_officer_assignments = @officer_assignments.select{|oa| oa.final == false} %>
<% if voting_days_officer_assignments.any? %>
<%= t("admin.poll_officer_assignments.index.recounts") %>
-
+
| <%= t("admin.poll_officer_assignments.index.date") %> |
<%= t("admin.poll_officer_assignments.index.booth") %> |
- <%= t("admin.poll_officer_assignments.index.recount") %> |
+ <%= t("admin.poll_officer_assignments.index.recount") %> |
@@ -81,11 +81,13 @@
| <%= l(officer_assignment.date.to_date) %> |
<%= booth_name_with_location(officer_assignment.booth_assignment.booth) %> |
- <% if officer_assignment.recount.present? %>
- <%= officer_assignment.recount.count %> |
- <% else %>
- - |
- <% end %>
+
+ <% if officer_assignment.recount.present? %>
+ <%= officer_assignment.recount.count %>
+ <% else %>
+ -
+ <% end %>
+ |
<% end %>
@@ -95,12 +97,12 @@
<% final_officer_assignments = @officer_assignments.select{|oa| oa.final == true} %>
<% if final_officer_assignments.any? %>
<%= t("admin.poll_officer_assignments.index.final_recounts") %>
-
+
| <%= t("admin.poll_officer_assignments.index.date") %> |
<%= t("admin.poll_officer_assignments.index.booth") %> |
- <%= t("admin.poll_officer_assignments.index.final_recount") %> |
+ <%= t("admin.poll_officer_assignments.index.final_recount") %> |
@@ -108,11 +110,13 @@
| <%= l(officer_assignment.date.to_date) %> |
<%= booth_name_with_location(officer_assignment.booth_assignment.booth) %> |
- <% if officer_assignment.final_recounts.any? %>
- <%= officer_assignment.final_recounts.to_a.sum(&:count) %> |
- <% else %>
- - |
- <% end %>
+
+ <% if officer_assignment.final_recounts.any? %>
+ <%= officer_assignment.final_recounts.to_a.sum(&:count) %>
+ <% else %>
+ -
+ <% end %>
+ |
<% end %>
diff --git a/app/views/admin/poll/polls/_booths.html.erb b/app/views/admin/poll/polls/_booths.html.erb
index 6672b72cb..bea23b874 100644
--- a/app/views/admin/poll/polls/_booths.html.erb
+++ b/app/views/admin/poll/polls/_booths.html.erb
@@ -5,11 +5,11 @@
<%= t("admin.polls.show.no_booths") %>
<% else %>
-
+
| <%= t("admin.polls.show.table_name") %> |
<%= t("admin.polls.show.table_location") %> |
- <%= t("admin.polls.show.table_assignment") %> |
+ <%= t("admin.polls.show.table_assignment") %> |
<% @poll.booth_assignments.each do |booth_assignment| %>
@@ -22,7 +22,7 @@
<%= booth_assignment.booth.location %>
|
-
+ |
<%= link_to t("admin.polls.show.remove_booth"),
admin_booth_assignment_path(booth_assignment),
method: :delete,
diff --git a/app/views/admin/poll/polls/_officers.html.erb b/app/views/admin/poll/polls/_officers.html.erb
index a3c78c656..7acb7568b 100644
--- a/app/views/admin/poll/polls/_officers.html.erb
+++ b/app/views/admin/poll/polls/_officers.html.erb
@@ -5,10 +5,11 @@
<%= t("admin.polls.show.no_officers") %>
<% else %>
-
+
| <%= t("admin.polls.show.table_name") %> |
<%= t("admin.polls.show.table_email") %> |
+ <%= t("admin.actions.actions") %> |
<% @poll.officers.each do |officer| %>
@@ -21,6 +22,11 @@
<%= officer.email %>
|
+
+ <%= link_to t("admin.polls.show.edit_officer_assignments"),
+ admin_officer_assignments_path(officer: officer, poll: @poll),
+ class: "button hollow" %>
+ |
<% end %>
diff --git a/app/views/admin/poll/polls/_questions.html.erb b/app/views/admin/poll/polls/_questions.html.erb
index c4dadba49..e41d2017e 100644
--- a/app/views/admin/poll/polls/_questions.html.erb
+++ b/app/views/admin/poll/polls/_questions.html.erb
@@ -5,11 +5,11 @@
<%= t('admin.polls.show.no_questions') %>
<% else %>
-
+
| <%= t('admin.polls.show.table_title') %> |
- <%= t('admin.polls.show.table_assignment') %> |
+ <%= t('admin.polls.show.table_assignment') %> |
<% @poll.questions.each do |question| %>
@@ -19,7 +19,7 @@
<%= link_to question.title, admin_question_path(question) %>
-
+ |
<%= link_to t('admin.polls.show.remove_question'),
remove_question_admin_poll_path(poll_id: @poll.id, question_id: question.id),
class: "button hollow alert",
diff --git a/app/views/admin/poll/polls/_recounting.html.erb b/app/views/admin/poll/polls/_recounting.html.erb
index ed5680936..8fb7651ce 100644
--- a/app/views/admin/poll/polls/_recounting.html.erb
+++ b/app/views/admin/poll/polls/_recounting.html.erb
@@ -5,7 +5,7 @@
<%= t("admin.polls.show.no_recounts") %>
<% else %>
-
+
| <%= t("admin.polls.show.table_booth_name") %> |
<%= t("admin.polls.show.table_recounts") %> |
@@ -19,16 +19,20 @@
<%= link_to booth_assignment.booth.name, admin_poll_booth_assignment_path(@poll, booth_assignment, anchor: 'tab-recounts') %>
- <% if booth_assignment.recounts.any? %>
- <%= booth_assignment.recounts.to_a.sum(&:count) %> |
- <% else %>
- - |
- <% end %>
- <% if booth_assignment.final_recounts.any? %>
- <%= booth_assignment.final_recounts.to_a.sum(&:count) %> |
- <% else %>
- - |
- <% end %>
+
+ <% if booth_assignment.recounts.any? %>
+ <%= booth_assignment.recounts.to_a.sum(&:count) %>
+ <% else %>
+ -
+ <% end %>
+ |
+
+ <% if booth_assignment.final_recounts.any? %>
+ <%= booth_assignment.final_recounts.to_a.sum(&:count) %>
+ <% else %>
+ -
+ <% end %>
+ |
<% end %>
| | |