Add officer email on admin poll shifts table
This commit is contained in:
@@ -4,6 +4,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<th><%= t("admin.poll_shifts.new.date") %></th>
|
<th><%= t("admin.poll_shifts.new.date") %></th>
|
||||||
<th><%= t("admin.poll_shifts.new.officer") %></th>
|
<th><%= t("admin.poll_shifts.new.officer") %></th>
|
||||||
|
<th><%= t("admin.poll_shifts.new.table_email") %></th>
|
||||||
<th><%= t("admin.poll_shifts.new.task") %></th>
|
<th><%= t("admin.poll_shifts.new.task") %></th>
|
||||||
<th class="small-3"><%= t("admin.poll_shifts.new.shift") %></th>
|
<th class="small-3"><%= t("admin.poll_shifts.new.shift") %></th>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -13,6 +14,7 @@
|
|||||||
<tr id="shift_<%= shift.id %>" class="shift">
|
<tr id="shift_<%= shift.id %>" class="shift">
|
||||||
<td><%= l(shift.date.to_date, format: :long) %></td>
|
<td><%= l(shift.date.to_date, format: :long) %></td>
|
||||||
<td><%= shift.officer_name %></td>
|
<td><%= shift.officer_name %></td>
|
||||||
|
<td><%= shift.officer_email %></td>
|
||||||
<td><%= t("admin.poll_shifts.#{shift.task}") %></td>
|
<td><%= t("admin.poll_shifts.#{shift.task}") %></td>
|
||||||
<td>
|
<td>
|
||||||
<%= link_to t("admin.poll_shifts.new.remove_shift"),
|
<%= link_to t("admin.poll_shifts.new.remove_shift"),
|
||||||
|
|||||||
@@ -22,12 +22,14 @@ feature "Admin shifts" do
|
|||||||
expect(page).to have_css(".shift", count: 1)
|
expect(page).to have_css(".shift", count: 1)
|
||||||
expect(page).to have_content I18n.l(Date.current, format: :long)
|
expect(page).to have_content I18n.l(Date.current, format: :long)
|
||||||
expect(page).to have_content officer.name
|
expect(page).to have_content officer.name
|
||||||
|
expect(page).to have_content officer.email
|
||||||
|
|
||||||
visit new_admin_booth_shift_path(booth2)
|
visit new_admin_booth_shift_path(booth2)
|
||||||
|
|
||||||
expect(page).to have_css(".shift", count: 1)
|
expect(page).to have_css(".shift", count: 1)
|
||||||
expect(page).to have_content I18n.l(Time.zone.tomorrow, format: :long)
|
expect(page).to have_content I18n.l(Time.zone.tomorrow, format: :long)
|
||||||
expect(page).to have_content officer.name
|
expect(page).to have_content officer.name
|
||||||
|
expect(page).to have_content officer.email
|
||||||
end
|
end
|
||||||
|
|
||||||
scenario "Create Vote Collection Shift and Recount & Scrutiny Shift on same date", :js do
|
scenario "Create Vote Collection Shift and Recount & Scrutiny Shift on same date", :js do
|
||||||
@@ -229,6 +231,7 @@ feature "Admin shifts" do
|
|||||||
|
|
||||||
expect(page).to have_css(".shift", count: 1)
|
expect(page).to have_css(".shift", count: 1)
|
||||||
expect(page).to have_content(officer.name)
|
expect(page).to have_content(officer.name)
|
||||||
|
expect(page).to have_content(officer.email)
|
||||||
end
|
end
|
||||||
|
|
||||||
scenario "Empty" do
|
scenario "Empty" do
|
||||||
|
|||||||
Reference in New Issue
Block a user