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

Switch all Time.curren.to_date for Date.current, same result but better syntax

Browse Source
This commit is contained in:
Bertocq
2017-06-11 10:40:41 +02:00
parent e14a5b2eaf
commit b79df113cd
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ class Officing::ResidenceController < Officing::BaseController
@officer_assignments = current_user.poll_officer. @officer_assignments = current_user.poll_officer.
officer_assignments. officer_assignments.
voting_days. voting_days.
where(date: Time.current.to_date) where(date: Date.current)
end end
def validate_officer_assignment def validate_officer_assignment

2
app/models/poll/voter.rb
View File

@@ -50,7 +50,7 @@ class Poll
if dob.blank? if dob.blank?
nil nil
else else
now = Time.current.to_date now = Date.current
now.year - dob.year - (now.month > dob.month || (now.month == dob.month && now.day >= dob.day) ? 0 : 1) now.year - dob.year - (now.month > dob.month || (now.month == dob.month && now.day >= dob.day) ? 0 : 1)
end end
end end

2
lib/age.rb
View File

@@ -1,5 +1,5 @@
module Age module Age
def self.in_years(dob, now = Time.current.to_date) def self.in_years(dob, now = Date.current)
return nil if dob.blank? return nil if dob.blank?
# reference: http://stackoverflow.com/questions/819263/get-persons-age-in-ruby#comment21200772_819263 # reference: http://stackoverflow.com/questions/819263/get-persons-age-in-ruby#comment21200772_819263
now.year - dob.year - (now.month > dob.month || (now.month == dob.month && now.day >= dob.day) ? 0 : 1) now.year - dob.year - (now.month > dob.month || (now.month == dob.month && now.day >= dob.day) ? 0 : 1)

2
spec/factories.rb
View File

@@ -429,7 +429,7 @@ FactoryGirl.define do
factory :poll_officer_assignment, class: 'Poll::OfficerAssignment' do factory :poll_officer_assignment, class: 'Poll::OfficerAssignment' do
association :officer, factory: :poll_officer association :officer, factory: :poll_officer
association :booth_assignment, factory: :poll_booth_assignment association :booth_assignment, factory: :poll_booth_assignment
date Time.current.to_date date Date.current
trait :final do trait :final do
final true final true

2
spec/features/admin/poll/booth_assigments_spec.rb
View File

@@ -144,7 +144,7 @@ feature 'Admin booths assignments' do
poll = create(:poll) poll = create(:poll)
booth = create(:poll_booth) booth = create(:poll_booth)
booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth) booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
today = Time.current.to_date today = Date.current
officer_assignment = create(:poll_officer_assignment, booth_assignment: booth_assignment, date: today) officer_assignment = create(:poll_officer_assignment, booth_assignment: booth_assignment, date: today)
recount = create(:poll_recount, recount = create(:poll_recount,