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

Merge pull request #10698 from colinux/fix-strftime-on-non-numeric-field

Browse source 
ETQ instructeur, ne plante pas en essayant de formater une date quand c'est pas une date
This commit is contained in:
Colin Darie 2024-08-20 15:59:02 +00:00 committed by GitHub
commit 6b9af51e31
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/services/dossier_projection_service.rb
View file

@ -75,10 +75,11 @@ class DossierProjectionService
.pluck(:id, *fields.map { |f| f[COLUMN].to_sym }) .pluck(:id, *fields.map { |f| f[COLUMN].to_sym })
.each do |id, *columns| .each do |id, *columns|
fields.zip(columns).each do |field, value| fields.zip(columns).each do |field, value|
if [state_field, archived_field, hidden_by_user_at_field, hidden_by_administration_at_field, hidden_by_reason_field, for_tiers_field, batch_operation_field, sva_svr_decision_on_field].include?(field) # SVA must remain a date: in other column we compute remaining delay with it
field[:id_value_h][id] = value field[:id_value_h][id] = if value.respond_to?(:strftime) && field != sva_svr_decision_on_field
I18n.l(value.to_date)
else else
field[:id_value_h][id] = value&.strftime('%d/%m/%Y') # other fields are datetime value
end end
end end
end end