DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Time.zone.parse(_, options) => Time.zone.strptime(_, options)

Browse source
This commit is contained in:
simon lehericey 2018-10-25 17:48:50 +02:00
parent f620e4aee2
commit 4b25d16f5a
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/decorators/champ_decorator.rb
View file

@ -24,7 +24,7 @@ class ChampDecorator < Draper::Decorator
if type_champ == TypeDeChamp.type_champs.fetch(:date) if type_champ == TypeDeChamp.type_champs.fetch(:date)
object.value object.value
elsif type_champ == TypeDeChamp.type_champs.fetch(:datetime) && object.value != ' 00:00' elsif type_champ == TypeDeChamp.type_champs.fetch(:datetime) && object.value != ' 00:00'
Time.zone.parse(object.value, "%Y-%m-%d %H:%M").strftime("%Y-%m-%d") Time.zone.strptime(object.value, "%Y-%m-%d %H:%M").strftime("%Y-%m-%d")
end end
end end
end end

2
app/models/champs/datetime_champ.rb
View file

@ -30,7 +30,7 @@ class Champs::DatetimeChamp < Champ
nil nil
end end
elsif /^\d{2}\/\d{2}\/\d{4}\s\d{2}:\d{2}$/.match?(value) # old browsers can send with dd/mm/yyyy hh:mm format elsif /^\d{2}\/\d{2}\/\d{4}\s\d{2}:\d{2}$/.match?(value) # old browsers can send with dd/mm/yyyy hh:mm format
self.value = Time.zone.parse(value, "%d/%m/%Y %H:%M").strftime("%Y-%m-%d %H:%M") self.value = Time.zone.strptime(value, "%d/%m/%Y %H:%M").strftime("%Y-%m-%d %H:%M")
elsif !(/^\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}$/.match?(value)) # a datetime not correctly formatted should not be stored elsif !(/^\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}$/.match?(value)) # a datetime not correctly formatted should not be stored
self.value = nil self.value = nil
end end

2
lib/tasks/2018_01_18_clean_datetime_in_champs.rake
View file

@ -12,7 +12,7 @@ namespace :'2018_01_18_clean_datetime_in_champs' do
# Match "dd/mm/YYYY HH:MM" => "YYYY-mm-dd HH:MM" # Match "dd/mm/YYYY HH:MM" => "YYYY-mm-dd HH:MM"
datetime_champs.select { |c| /^\d{2}\/\d{2}\/\d{4}\s\d{2}:\d{2}$/ =~ c.value }.each do |c| datetime_champs.select { |c| /^\d{2}\/\d{2}\/\d{4}\s\d{2}:\d{2}$/ =~ c.value }.each do |c|
formated_date = Time.zone.parse(c.value, "%d/%m/%Y %H:%M").strftime("%Y-%m-%d %H:%M") formated_date = Time.zone.strptime(c.value, "%d/%m/%Y %H:%M").strftime("%Y-%m-%d %H:%M")
rake_puts "cleaning #{c.value} => #{formated_date}" rake_puts "cleaning #{c.value} => #{formated_date}"
c.update_columns(value: formated_date) c.update_columns(value: formated_date)
end end