REFACTOR: Change dossier state 'Processed' To 'Closed'

This commit is contained in:
Xavier J 2015-11-02 15:00:28 +01:00
parent 76d87c7f79
commit c09fe8e7f6
13 changed files with 37 additions and 32 deletions

View file

@ -28,12 +28,12 @@ class Backoffice::DossiersController < ApplicationController
render 'show'
end
def process_end
def close
params[:id] = params[:dossier_id]
show
@dossier.next_step! 'gestionnaire', 'process'
@dossier.next_step! 'gestionnaire', 'close'
flash.notice = 'Dossier traité avec succès.'
render 'show'

View file

@ -25,7 +25,7 @@ class DossierDecorator < Draper::Decorator
'Validé'
when 'submit_validated'
'Déposé'
when 'processed'
when 'closed'
'Traité'
else
fail 'State not valid'

View file

@ -4,8 +4,8 @@ class Dossier < ActiveRecord::Base
replied: 'replied',
updated: 'updated',
validated: 'validated',
submit_validated: 'submit_validated', #deposited
processed: 'processed'} #closed
submit_validated: 'submit_validated',
closed: 'closed'} #-processed
has_one :etablissement, dependent: :destroy
has_one :entreprise, dependent: :destroy
@ -49,7 +49,7 @@ class Dossier < ActiveRecord::Base
end
def next_step! role, action
unless %w(submit replied update comment valid submit_validate process).include?(action)
unless %w(submit replied update comment valid submit_validate close).include?(action)
fail 'action is not valid'
end
@ -92,9 +92,9 @@ class Dossier < ActiveRecord::Base
elsif submitted?
validated!
end
when 'process'
when 'close'
if submit_validated?
processed!
closed!
end
end
end
@ -110,7 +110,7 @@ class Dossier < ActiveRecord::Base
end
def self.termine
Dossier.where("state='processed'").order('updated_at ASC')
Dossier.where("state='closed'").order('updated_at ASC')
end
private

View file

@ -39,17 +39,17 @@
%div.row{style: 'text-align:right'}
-unless gestionnaire_signed_in?
-if !@dossier.validated? && !@dossier.submit_validated? && !@dossier.processed?
-if !@dossier.validated? && !@dossier.submit_validated? && !@dossier.closed?
%a#maj_infos.btn.btn-info{href: "/users/dossiers/#{@dossier.id}/description?back_url=recapitulatif"}
= 'Editer mon dossier'
-unless user_signed_in?
-if !@dossier.validated? && !@dossier.submit_validated? && !@dossier.processed?
-if !@dossier.validated? && !@dossier.submit_validated? && !@dossier.closed?
= form_tag(url_for({controller: 'backoffice/dossiers', action: :valid, dossier_id: @dossier.id}), class: 'form-inline', method: 'POST') do
%button#action_button.btn.btn-success
= 'Valider le dossier'
-elsif @dossier.submit_validated?
= form_tag(url_for({controller: 'backoffice/dossiers', action: :process_end, dossier_id: @dossier.id}), class: 'form-inline', method: 'POST') do
= form_tag(url_for({controller: 'backoffice/dossiers', action: :close, dossier_id: @dossier.id}), class: 'form-inline', method: 'POST') do
%button#action_button.btn.btn-success
= 'Traiter le dossier'