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

[Fix #503] Dossier: Remove waiting for user scope

Browse source
This commit is contained in:
Simon Lehericey 2017-09-21 15:24:16 +02:00
parent 3a77822241
commit 460cd3e237
4 changed files with 0 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/facades/admin_procedures_show_facades.rb
View file

@ -36,10 +36,6 @@ class AdminProceduresShowFacades
dossiers.waiting_for_gestionnaire.size dossiers.waiting_for_gestionnaire.size
end end
def dossiers_waiting_user_total
dossiers.waiting_for_user.size
end
def dossiers_termine_total def dossiers_termine_total
dossiers.where(state: :termine).size dossiers.where(state: :termine).size
end end

3
app/models/dossier.rb
View file

@ -14,7 +14,6 @@ class Dossier < ActiveRecord::Base
NOUVEAUX = %w(initiated) NOUVEAUX = %w(initiated)
OUVERT = %w(updated replied) OUVERT = %w(updated replied)
WAITING_FOR_GESTIONNAIRE = %w(updated) WAITING_FOR_GESTIONNAIRE = %w(updated)
WAITING_FOR_USER = %w(replied)
EN_CONSTRUCTION = %w(initiated updated replied) EN_CONSTRUCTION = %w(initiated updated replied)
EN_INSTRUCTION = %w(received) EN_INSTRUCTION = %w(received)
EN_CONSTRUCTION_OU_INSTRUCTION = EN_CONSTRUCTION + EN_INSTRUCTION EN_CONSTRUCTION_OU_INSTRUCTION = EN_CONSTRUCTION + EN_INSTRUCTION
@ -52,7 +51,6 @@ class Dossier < ActiveRecord::Base
scope :state_nouveaux, -> { where(state: NOUVEAUX) } scope :state_nouveaux, -> { where(state: NOUVEAUX) }
scope :state_ouvert, -> { where(state: OUVERT) } scope :state_ouvert, -> { where(state: OUVERT) }
scope :state_waiting_for_gestionnaire, -> { where(state: WAITING_FOR_GESTIONNAIRE) } scope :state_waiting_for_gestionnaire, -> { where(state: WAITING_FOR_GESTIONNAIRE) }
scope :state_waiting_for_user, -> { where(state: WAITING_FOR_USER) }
scope :state_en_construction, -> { where(state: EN_CONSTRUCTION) } scope :state_en_construction, -> { where(state: EN_CONSTRUCTION) }
scope :state_en_instruction, -> { where(state: EN_INSTRUCTION) } scope :state_en_instruction, -> { where(state: EN_INSTRUCTION) }
scope :state_en_construction_ou_instruction, -> { where(state: EN_CONSTRUCTION_OU_INSTRUCTION) } scope :state_en_construction_ou_instruction, -> { where(state: EN_CONSTRUCTION_OU_INSTRUCTION) }
@ -68,7 +66,6 @@ class Dossier < ActiveRecord::Base
scope :nouveaux, -> { not_archived.state_nouveaux.order_by_updated_at(:asc) } scope :nouveaux, -> { not_archived.state_nouveaux.order_by_updated_at(:asc) }
scope :ouvert, -> { not_archived.state_ouvert.order_by_updated_at(:asc) } scope :ouvert, -> { not_archived.state_ouvert.order_by_updated_at(:asc) }
scope :waiting_for_gestionnaire, -> { not_archived.state_waiting_for_gestionnaire.order_by_updated_at(:asc) } scope :waiting_for_gestionnaire, -> { not_archived.state_waiting_for_gestionnaire.order_by_updated_at(:asc) }
scope :waiting_for_user, -> { not_archived.state_waiting_for_user.order_by_updated_at(:asc) }
scope :a_instruire, -> { not_archived.state_a_instruire.order_by_updated_at(:asc) } scope :a_instruire, -> { not_archived.state_a_instruire.order_by_updated_at(:asc) }
scope :termine, -> { not_archived.state_termine.order_by_updated_at(:asc) } scope :termine, -> { not_archived.state_termine.order_by_updated_at(:asc) }
scope :downloadable, -> { state_not_brouillon.order_by_updated_at(:asc) } scope :downloadable, -> { state_not_brouillon.order_by_updated_at(:asc) }

4
app/views/admin/procedures/show.html.haml
View file

@ -102,10 +102,6 @@
%div %div
= @facade.dossiers_waiting_gestionnaire_total = @facade.dossiers_waiting_gestionnaire_total
%h4.text-info Attente Usager
%div
= @facade.dossiers_waiting_user_total
%h4.text-success Terminé %h4.text-success Terminé
%div %div
= @facade.dossiers_termine_total = @facade.dossiers_termine_total

6
spec/facades/admin_procedures_show_facades_spec.rb
View file

@ -56,12 +56,6 @@ describe AdminProceduresShowFacades do
it { is_expected.to eq(1) } it { is_expected.to eq(1) }
end end
describe 'dossiers_waiting_user_total' do
subject { super().dossiers_waiting_user_total }
it { is_expected.to eq(1) }
end
describe 'dossiers_termine_total' do describe 'dossiers_termine_total' do
subject { super().dossiers_termine_total } subject { super().dossiers_termine_total }