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

dossier: remove "Birthdate" column from export

Browse source
This commit is contained in:
Pierre de La Morinerie 2020-05-13 15:57:56 +02:00 committed by GitHub Action
parent 00adb006b4
commit b63fa0e6b8
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/dossier.rb
View file

@ -626,9 +626,11 @@ class Dossier < ApplicationRecord
columns += [ columns += [
['Civilité', individual&.gender], ['Civilité', individual&.gender],
['Nom', individual&.nom], ['Nom', individual&.nom],
['Prénom', individual&.prenom], ['Prénom', individual&.prenom]
['Date de naissance', individual&.birthdate]
] ]
if procedure.ask_birthday
columns += [['Date de naissance', individual&.birthdate]]
end
elsif with_etablissement elsif with_etablissement
columns += [ columns += [
['Établissement SIRET', etablissement&.siret], ['Établissement SIRET', etablissement&.siret],

14
spec/services/procedure_export_service_spec.rb
View file

@ -41,7 +41,6 @@ describe ProcedureExportService do
"Civilité", "Civilité",
"Nom", "Nom",
"Prénom", "Prénom",
"Date de naissance",
"Archivé", "Archivé",
"État du dossier", "État du dossier",
"Dernière mise à jour le", "Dernière mise à jour le",
@ -88,12 +87,21 @@ describe ProcedureExportService do
# SimpleXlsxReader is transforming datetimes in utc... It is only used in test so we just hack around. # SimpleXlsxReader is transforming datetimes in utc... It is only used in test so we just hack around.
offset = dossier.en_construction_at.utc_offset offset = dossier.en_construction_at.utc_offset
en_construction_at = Time.zone.at(dossiers_sheet.data[0][9] - offset.seconds) en_construction_at = Time.zone.at(dossiers_sheet.data[0][8] - offset.seconds)
en_instruction_at = Time.zone.at(dossiers_sheet.data[0][10] - offset.seconds) en_instruction_at = Time.zone.at(dossiers_sheet.data[0][9] - offset.seconds)
expect(en_construction_at).to eq(dossier.en_construction_at.round) expect(en_construction_at).to eq(dossier.en_construction_at.round)
expect(en_instruction_at).to eq(dossier.en_instruction_at.round) expect(en_instruction_at).to eq(dossier.en_instruction_at.round)
end end
context 'with a birthdate' do
before { procedure.update(ask_birthday: true) }
let(:birthdate_headers) { nominal_headers.insert(nominal_headers.index('Archivé'), 'Date de naissance') }
it { expect(dossiers_sheet.headers).to match(birthdate_headers) }
it { expect(dossiers_sheet.data[0][dossiers_sheet.headers.index('Date de naissance')]).to be_a(Date) }
end
context 'with a procedure routee' do context 'with a procedure routee' do
before { procedure.groupe_instructeurs.create(label: '2') } before { procedure.groupe_instructeurs.create(label: '2') }