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

REFACTOR: Change dossier state 'Reply' To 'Replied'

Browse source
This commit is contained in:
Xavier J 2015-11-02 11:33:00 +01:00
parent c0733849d5
commit 4a05af89fc
11 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/decorators/dossier_decorator.rb
View file

@ -17,7 +17,7 @@ class DossierDecorator < Draper::Decorator
'Brouillon'
when 'submitted'
'Soumis'
when 'reply'
when 'replied'
'Répondu'
when 'updated'
'Mis à jour'

18
app/models/dossier.rb
View file

@ -1,7 +1,7 @@
class Dossier < ActiveRecord::Base
enum state: {draft: 'draft',
submitted: 'submitted', #-proposed
reply: 'reply', #replied
submitted: 'submitted',
replied: 'replied', #replied
updated: 'updated',
confirmed: 'confirmed', #validated
deposited: 'deposited', #submit_confirmed
@ -49,7 +49,7 @@ class Dossier < ActiveRecord::Base
end
def next_step! role, action
unless %w(submit reply update comment confirme depose process).include?(action)
unless %w(submit replied update comment confirme depose process).include?(action)
fail 'action is not valid'
end
@ -68,11 +68,11 @@ class Dossier < ActiveRecord::Base
deposited!
end
when 'update'
if reply?
if replied?
updated!
end
when 'comment'
if reply?
if replied?
updated!
end
end
@ -80,14 +80,14 @@ class Dossier < ActiveRecord::Base
case action
when 'comment'
if updated?
reply!
replied!
elsif submitted?
reply!
replied!
end
when 'confirme'
if updated?
confirmed!
elsif reply?
elsif replied?
confirmed!
elsif submitted?
confirmed!
@ -106,7 +106,7 @@ class Dossier < ActiveRecord::Base
end
def self.en_attente
Dossier.where("state='reply' OR state='confirmed'").order('updated_at ASC')
Dossier.where("state='replied' OR state='confirmed'").order('updated_at ASC')
end
def self.termine