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

Implements #182

Browse Source 
Implements 182. resources are shown as cards in dashboard progress view.
Implements #182

Implements 182. resources are shown as cards in dashboard progress view.
This commit is contained in:
Juan Salvador Pérez García
2018-07-04 18:08:35 +02:00
parent 9f0ca0cec7
commit caffd97cc8
11 changed files with 123 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/models/proposal_dashboard_action.rb
View File

@@ -39,8 +39,6 @@ class ProposalDashboardAction < ActiveRecord::Base
greater_than_or_equal_to: 0
}
default_scope { order(order: :asc, title: :asc) }
scope :active, -> { where(active: true) }
scope :inactive, -> { where(active: false) }
scope :resources, -> { where(action_type: 1) }
@@ -53,20 +51,19 @@ class ProposalDashboardAction < ActiveRecord::Base
.where('day_offset <= ?', (Date.today - published_at).to_i)
end
def self.next_goal_for(proposal)
def active_for?(proposal)
published_at = proposal.published_at&.to_date || Date.today
required_supports <= proposal.votes_for.size && day_offset <= (Date.today - published_at).to_i
end
def self.next_goal_for(proposal)
active
.where(
'(required_supports > ? or day_offset > ?)',
proposal.votes_for.size,
(Date.today - published_at).to_i)
.where('required_supports > ?', proposal.votes_for.size)
.order(required_supports: :asc)
&.first
end
default_scope { order(order: :asc, title: :asc) }
def request_to_administrators?
request_to_administrators || false
end