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

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

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