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

Add the not_brouillon scope on Dossier

Browse source
This commit is contained in:
gregoirenovel 2017-05-26 18:09:19 +02:00
parent a2693c2d77
commit f2fe06e86f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/dossier.rb
View file

@ -54,7 +54,6 @@ class Dossier < ActiveRecord::Base
EN_INSTRUCTION = %w(received) EN_INSTRUCTION = %w(received)
A_INSTRUIRE = %w(received) A_INSTRUIRE = %w(received)
TERMINE = %w(closed refused without_continuation) TERMINE = %w(closed refused without_continuation)
ALL_STATE = %w(initiated updated replied received closed refused without_continuation)
def unreaded_notifications def unreaded_notifications
@unreaded_notif ||= notifications.where(already_read: false) @unreaded_notif ||= notifications.where(already_read: false)
@ -160,7 +159,7 @@ class Dossier < ActiveRecord::Base
end end
def self.all_state order = 'ASC' def self.all_state order = 'ASC'
where(state: ALL_STATE, archived: false).order("updated_at #{order}") not_brouillon.where(archived: false).order("updated_at #{order}")
end end
def brouillon? def brouillon?
@ -168,6 +167,7 @@ class Dossier < ActiveRecord::Base
end end
scope :brouillon, -> { where(state: BROUILLON) } scope :brouillon, -> { where(state: BROUILLON) }
scope :not_brouillon, -> { where.not(state: BROUILLON) }
scope :order_by_updated_at, -> (order = :desc) { order(updated_at: order) } scope :order_by_updated_at, -> (order = :desc) { order(updated_at: order) }