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

Update active resources count for proposal

Browse Source 
Fix: Sum default resources (mail, poster, poll) to actives resources for a proposal.
This commit is contained in:
taitus
2019-03-14 11:36:01 +01:00
parent a1de5b2334
commit 6342d598f7
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/helpers/proposals_dashboard_helper.rb
View File

@@ -91,4 +91,14 @@ module ProposalsDashboardHelper
def new_resources_since_last_login?(resources, new_actions_since_last_login) def new_resources_since_last_login?(resources, new_actions_since_last_login)
resources.pluck(:id).any? {|id| new_actions_since_last_login.include?(id) } if resources.present? resources.pluck(:id).any? {|id| new_actions_since_last_login.include?(id) } if resources.present?
end end
def active_resources_for(proposal)
default_resources_count = 3 #resources: mail, poster, poll
Dashboard::Action.active.resources.active_for(proposal).count + default_resources_count
end
def active_resources_count(proposal)
default_resources_count = 3 #resources: mail, poster, poll
Dashboard::Action.active.resources.by_proposal(proposal).count + default_resources_count
end
end end

4
app/views/layouts/dashboard/_proposal_totals.html.erb
View File

@@ -3,9 +3,9 @@
<div class="small-12 medium-6 large-2 column"> <div class="small-12 medium-6 large-2 column">
<div class="counter"> <div class="counter">
<div class="counter-value"> <div class="counter-value">
<%= Dashboard::Action.active.resources.active_for(proposal).count %> <%= active_resources_for(proposal) %>
/ /
<%= Dashboard::Action.active.resources.count %> <%= active_resources_count(proposal) %>
</div> </div>
<span class="counter-label"><%= t("layouts.dashboard.proposal_totals.active_resources") %></span> <span class="counter-label"><%= t("layouts.dashboard.proposal_totals.active_resources") %></span>
</div> </div>