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

Merge pull request #6729 from tchak/revert-fix

Browse source
This commit is contained in:
Pierre de La Morinerie 2021-12-07 15:09:36 +01:00 committed by GitHub
commit f1c267fe81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/dossier.rb
View file

@ -560,11 +560,12 @@ class Dossier < ApplicationRecord
approximative_expiration_date_reference, approximative_expiration_date_reference,
conservation_extension, conservation_extension,
procedure.duree_conservation_dossiers_dans_ds.months procedure.duree_conservation_dossiers_dans_ds.months
].compact.sum - REMAINING_WEEKS_BEFORE_EXPIRATION.weeks ].sum - REMAINING_WEEKS_BEFORE_EXPIRATION.weeks
end end
def close_to_expiration? def close_to_expiration?
return false return false if en_instruction?
approximative_expiration_date < Time.zone.now
end end
def expiration_date def expiration_date

2
lib/tasks/deployment/20211110093332_set_dossiers_processed_at.rake
View file

@ -7,7 +7,7 @@ namespace :after_party do
progress = ProgressReport.new(dossiers.count) progress = ProgressReport.new(dossiers.count)
dossiers.find_each do |dossier| dossiers.find_each do |dossier|
if dossier.processed_at != dossier.traitement.processed_at if dossier.read_attribute(:processed_at) != dossier.traitement.processed_at
dossier.update_column(:processed_at, dossier.traitement.processed_at) dossier.update_column(:processed_at, dossier.traitement.processed_at)
end end
progress.inc progress.inc