consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/budget_phases

Browse Source
This commit is contained in:
BertoCQ
2018-01-16 17:47:47 +01:00
committed by GitHub
parent 005d08e718 a215c9c603
commit d44db9cec4
26 changed files with 166 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/budget.rb
View File

@@ -29,7 +29,12 @@ class Budget < ActiveRecord::Base
scope :balloting, -> { where(phase: "balloting") }
scope :reviewing_ballots, -> { where(phase: "reviewing_ballots") }
scope :finished, -> { where(phase: "finished") }
scope :current, -> { where.not(phase: "finished") }
scope :open, -> { where.not(phase: "finished") }
def self.current
where.not(phase: "drafting").last
end
def current_phase
phases.send(phase)
@@ -99,10 +104,6 @@ class Budget < ActiveRecord::Base
balloting_process? || finished?
end
def current?
!finished?
end
def heading_price(heading)
heading_ids.include?(heading.id) ? heading.price : -1
end