diff --git a/app/helpers/budget_executions_helper.rb b/app/helpers/budget_executions_helper.rb new file mode 100644 index 000000000..1681da6f4 --- /dev/null +++ b/app/helpers/budget_executions_helper.rb @@ -0,0 +1,20 @@ +module BudgetExecutionsHelper + + def winner_investments(heading) + if params[:status].present? + heading.investments + .selected + .sort_by_ballots + .joins(:milestones) + .distinct + .where('budget_investment_milestones.status_id = ?', params[:status]) + else + heading.investments + .selected + .sort_by_ballots + .joins(:milestones) + .distinct + end + end + +end diff --git a/app/views/budgets/executions/_investments.html.erb b/app/views/budgets/executions/_investments.html.erb index d8d74d593..bbcd50409 100644 --- a/app/views/budgets/executions/_investments.html.erb +++ b/app/views/budgets/executions/_investments.html.erb @@ -3,7 +3,7 @@ <%= heading.name %>
- <% heading.investments.selected.sort_by_ballots.joins(:milestones).each do |investment| %> + <% winner_investments(heading).each do |investment| %>
<%= link_to budget_investment_path(@budget, investment, anchor: "tab-milestones"), data: { 'equalizer-watch': true } do %>