Merge pull request #3349 from pengfeidong/fix_3342_show_date_in_dossier_with_format_letter

[fix #3342] show date with format letter
This commit is contained in:
Mathieu Magnin 2019-03-27 16:52:00 +01:00 committed by GitHub
commit 73168f3046
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 86 additions and 8 deletions

View file

@ -119,4 +119,20 @@ module ApplicationHelper
{}
end
end
def try_format_date(date)
begin
date.is_a?(String) ? Date.parse(date).strftime("%d %B %Y") : date.strftime("%d %B %Y")
rescue
date
end
end
def try_format_datetime(datetime)
begin
datetime.is_a?(String) ? Time.zone.parse(datetime).strftime("%d %B %Y %R") : datetime.strftime("%d %B %Y %R")
rescue
datetime
end
end
end

View file

@ -30,6 +30,10 @@
= render partial: "shared/champs/siret/show", locals: { champ: c, profile: profile }
- when TypeDeChamp.type_champs.fetch(:textarea)
= render partial: "shared/champs/textarea/show", locals: { champ: c }
- when TypeDeChamp.type_champs.fetch(:date)
= try_format_date(c.to_s)
- when TypeDeChamp.type_champs.fetch(:datetime)
= try_format_datetime(c.to_s)
- else
= sanitize(c.to_s)

View file

@ -22,7 +22,7 @@
%td= etablissement.naf
%tr
%th.libelle Date de création :
%td= etablissement.entreprise.date_creation&.strftime("%d/%m/%Y")
%td= try_format_date(etablissement.entreprise.date_creation)
%tr
%th.libelle Effectif de l'organisation :
%td= effectif(etablissement)
@ -64,10 +64,10 @@
%td= etablissement.association_objet
%tr
%th.libelle Date de création :
%td= etablissement.association_date_creation&.strftime("%d/%m/%Y")
%td= try_format_date(etablissement.association_date_creation)
%tr
%th.libelle Date de publication :
%td= etablissement.association_date_publication&.strftime("%d/%m/%Y")
%td= try_format_date(etablissement.association_date_publication)
%tr
%th.libelle Date de déclaration :
%td= etablissement.association_date_declaration&.strftime("%d/%m/%Y")
%td= try_format_date(etablissement.association_date_declaration)

View file

@ -13,12 +13,12 @@
%li
Date de création :
= etablissement.association_date_creation&.strftime('%d/%m/%Y')
= try_format_date(etablissement.association_date_creation)
%li
Date de déclaration :
= etablissement.association_date_declaration&.strftime('%d/%m/%Y')
= try_format_date(etablissement.association_date_declaration)
%li
Date de publication :
= etablissement.association_date_publication&.strftime('%d/%m/%Y')
= try_format_date(etablissement.association_date_publication)

View file

@ -22,7 +22,7 @@
%li
Date de création :
= etablissement.entreprise.date_creation&.strftime('%d/%m/%Y')
= try_format_date(etablissement.entreprise.date_creation)
%li
Effectif organisation :

View file

@ -17,4 +17,62 @@ describe ApplicationHelper do
it { is_expected.to be_nil }
end
end
describe "#try_format_date" do
subject { try_format_date(date) }
describe 'try formatting 2019-01-24' do
let(:date) { "2019-01-24" }
it { is_expected.to eq("24 January 2019") }
end
describe 'try formatting 24/01/2019' do
let(:date) { "24/01/2019" }
it { is_expected.to eq("24 January 2019") }
end
describe 'try formatting 2019-01-32' do
let(:date) { "2019-01-32" }
it { is_expected.to eq("2019-01-32") }
end
describe 'try formatting a blank string' do
let(:date) { "" }
it { is_expected.to eq("") }
end
describe 'try formatting a nil string' do
let(:date) { nil }
it { is_expected.to be_nil }
end
end
describe "#try_format_datetime" do
subject { try_format_datetime(datetime) }
describe 'try formatting 31/01/2019 11:25' do
let(:datetime) { "31/01/2019 11:25" }
it { is_expected.to eq("31 January 2019 11:25") }
end
describe 'try formatting 2019-01-31 11:25' do
let(:datetime) { "2019-01-31 11:25" }
it { is_expected.to eq("31 January 2019 11:25") }
end
describe 'try formatting 2019-01-32 11:25' do
let(:datetime) { "2019-01-32 11:25" }
it { is_expected.to eq("2019-01-32 11:25") }
end
describe 'try formatting a blank string' do
let(:datetime) { "" }
it { is_expected.to eq("") }
end
describe 'try formatting a nil string' do
let(:datetime) { nil }
it { is_expected.to be_nil }
end
end
end