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

adds final recount/results shift for officers from Admin

Browse Source
This commit is contained in:
Juanjo Bazán
2017-01-30 13:29:53 +01:00
parent 26ae87c1f1
commit 05f054ece4
5 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/admin/poll/officer_assignments_controller.rb
View File

@@ -17,6 +17,7 @@ class Admin::Poll::OfficerAssignmentsController < Admin::BaseController
@officer_assignment = ::Poll::OfficerAssignment.new(booth_assignment: @booth_assignment,
officer_id: create_params[:officer_id],
date: create_params[:date])
@officer_assignment.final = true if @officer_assignment.date > @booth_assignment.poll.ends_at
if @officer_assignment.save
notice = t("admin.poll_officer_assignments.flash.create")
@@ -48,7 +49,7 @@ class Admin::Poll::OfficerAssignmentsController < Admin::BaseController
end
def load_booth_assignment
@booth_assignment = ::Poll::BoothAssignment.find_by(poll_id: create_params[:poll_id], booth_id: create_params[:booth_id])
@booth_assignment = ::Poll::BoothAssignment.includes(:poll).find_by(poll_id: create_params[:poll_id], booth_id: create_params[:booth_id])
end
def redirect_if_blank_required_params