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

Merge pull request #361 from sgmap/fix-319

Browse source 
[Fix #319] Include archived dossiers in the export
This commit is contained in:
gregoirenovel 2017-05-30 15:46:33 +02:00 committed by GitHub
commit 077e05e7d7
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/models/dossier.rb
View file

@ -54,7 +54,6 @@ class Dossier < ActiveRecord::Base
EN_INSTRUCTION = %w(received)
A_INSTRUIRE = %w(received)
TERMINE = %w(closed refused without_continuation)
ALL_STATE = %w(initiated updated replied received closed refused without_continuation)
def unreaded_notifications
@unreaded_notif ||= notifications.where(already_read: false)
@ -160,7 +159,7 @@ class Dossier < ActiveRecord::Base
end
def self.all_state order = 'ASC'
where(state: ALL_STATE, archived: false).order("updated_at #{order}")
not_brouillon.not_archived.order_by_updated_at(order)
end
def brouillon?
@ -168,29 +167,30 @@ class Dossier < ActiveRecord::Base
end
scope :brouillon, -> { where(state: BROUILLON) }
scope :not_brouillon, -> { where.not(state: BROUILLON) }
scope :order_by_updated_at, -> (order = :desc) { order(updated_at: order) }
def self.nouveaux order = 'ASC'
where(state: NOUVEAUX, archived: false).order("updated_at #{order}")
not_archived.where(state: NOUVEAUX).order_by_updated_at(order)
end
def self.waiting_for_gestionnaire order = 'ASC'
where(state: WAITING_FOR_GESTIONNAIRE, archived: false).order("updated_at #{order}")
not_archived.where(state: WAITING_FOR_GESTIONNAIRE).order_by_updated_at(order)
end
def self.waiting_for_user order = 'ASC'
where(state: WAITING_FOR_USER, archived: false).order("updated_at #{order}")
not_archived.where(state: WAITING_FOR_USER).order_by_updated_at(order)
end
scope :en_construction, -> { where(state: EN_CONSTRUCTION) }
def self.ouvert order = 'ASC'
where(state: OUVERT, archived: false).order("updated_at #{order}")
not_archived.where(state: OUVERT).order_by_updated_at(order)
end
def self.a_instruire order = 'ASC'
where(state: A_INSTRUIRE, archived: false).order("updated_at #{order}")
not_archived.where(state: A_INSTRUIRE).order_by_updated_at(order)
end
scope :en_instruction, -> { where(state: EN_INSTRUCTION) }
@ -200,7 +200,7 @@ class Dossier < ActiveRecord::Base
scope :archived, -> { where(archived: true) }
scope :not_archived, -> { where(archived: false) }
scope :downloadable, -> { all_state }
scope :downloadable, -> { not_brouillon.order_by_updated_at("ASC") }
def cerfa_available?
procedure.cerfa_flag? && cerfa.size != 0

2
spec/models/dossier_spec.rb
View file

@ -911,11 +911,13 @@ describe Dossier do
let!(:dossier) { create(:dossier, :with_entreprise, procedure: procedure, state: :draft) }
let!(:dossier2) { create(:dossier, :with_entreprise, procedure: procedure, state: :initiated) }
let!(:dossier3) { create(:dossier, :with_entreprise, procedure: procedure, state: :received) }
let!(:dossier4) { create(:dossier, :with_entreprise, procedure: procedure, state: :received, archived: true) }
subject { procedure.dossiers.downloadable }
it { is_expected.not_to include(dossier)}
it { is_expected.to include(dossier2)}
it { is_expected.to include(dossier3)}
it { is_expected.to include(dossier4)}
end
end