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

fixes specs

Browse Source
This commit is contained in:
rgarcia
2017-02-08 12:21:28 +01:00
committed by Javi Martín
parent ac58b87036
commit cc4eed3500
5 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/officing/residence_controller.rb
View File

@@ -1,7 +1,6 @@
class Officing::ResidenceController < Officing::BaseController class Officing::ResidenceController < Officing::BaseController
before_action :load_officer_assignment before_action :validate_officer_assignment
before_action :validate_officer_assignment, only: :create
def new def new
@residence = Officing::Residence.new @residence = Officing::Residence.new
@@ -23,13 +22,14 @@ class Officing::ResidenceController < Officing::BaseController
end end
def load_officer_assignment def load_officer_assignment
@officer_assignments = current_user.poll_officer. @officer_assignments ||= current_user.poll_officer.
officer_assignments. officer_assignments.
voting_days. voting_days.
where(date: Date.current) where(date: Date.current)
end end
def validate_officer_assignment def validate_officer_assignment
load_officer_assignment
if @officer_assignments.blank? if @officer_assignments.blank?
redirect_to officing_root_path, notice: t("officing.residence.flash.not_allowed") redirect_to officing_root_path, notice: t("officing.residence.flash.not_allowed")
end end

39
app/views/officing/residence/new.html.erb
View File

@@ -1,32 +1,25 @@
<h2><%= t("officing.residence.new.title") %></h2> <h2><%= t("officing.residence.new.title") %></h2>
<% if @officer_assignments.present? %> <div class="row verification account">
<div class="row verification account"> <div class="small-12 medium-8 column">
<div class="small-12 medium-8 column"> <%= form_for @residence, as: "residence", url: officing_residence_path do |f| %>
<%= form_for @residence, as: "residence", url: officing_residence_path do |f| %> <%= render "errors" %>
<%= render "errors" %>
<div class="small-12 medium-6"> <div class="small-12 medium-6">
<%= f.select :document_type, document_types, prompt: "" %> <%= f.select :document_type, document_types, prompt: "" %>
<%= f.text_field :document_number,
<%= f.text_field :document_number,
placeholder: t("officing.residence.new.document_number"), placeholder: t("officing.residence.new.document_number"),
autocomplete: "off" %> autocomplete: "off" %>
</div> </div>
<div class="date-of-birth small-12 medium-6"> <div class="date-of-birth small-12 medium-6">
<%= f.text_field :year_of_birth, type: "number", autocomplete: "off" %> <%= f.text_field :year_of_birth, type: "number", autocomplete: "off" %>
</div> </div>
<div class="small-12 medium-6"> <div class="small-12 medium-6">
<input type="submit" value="<%= t("officing.residence.new.submit") %>" class="button expanded"> <input type="submit" value="<%= t("officing.residence.new.submit") %>" class="button expanded">
</div> </div>
<% end %> <% end %>
</div>
</div> </div>
<% else %> </div>
<div class="callout primary">
<%= t("officing.residence.new.no_assignments") %>
</div>
<% end %>

1
config/locales/en/officing.yml
View File

@@ -51,7 +51,6 @@ en:
submit: Validate document submit: Validate document
error_verifying_census: "The Census was unable to verify this document." error_verifying_census: "The Census was unable to verify this document."
form_errors: prevented the verification of this document form_errors: prevented the verification of this document
no_assignments: "You don't have officing shifts today"
voters: voters:
new: new:
title: Polls title: Polls

1
config/locales/es/officing.yml
View File

@@ -51,7 +51,6 @@ es:
submit: Validar documento submit: Validar documento
error_verifying_census: "El Padrón no pudo verificar este documento." error_verifying_census: "El Padrón no pudo verificar este documento."
form_errors: evitaron verificar este documento form_errors: evitaron verificar este documento
no_assignments: "Hoy no tienes turno de presidente de mesa"
voters: voters:
new: new:
title: Votaciones title: Votaciones

5
spec/support/common_actions.rb
View File

@@ -21,4 +21,9 @@ module CommonActions
check "user_terms_of_service" check "user_terms_of_service"
end end
def validate_officer
allow_any_instance_of(Officing::ResidenceController).
to receive(:validate_officer_assignment).and_return(true)
end
end end