Fix the results display and display the budget amount for each budget

mainio · Feb 27, 2024 · 0093eb4 · 0093eb4
1 parent b94d39b
commit 0093eb4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 31 deletions.
diff --git a/app/helpers/decidim/budgets/results_helper.rb b/app/helpers/decidim/budgets/results_helper.rb
@@ -9,28 +9,6 @@ def winning_projects(budget)
         selected = selected_projects(budget)
         return selected.order_by_most_voted.to_a if selected.any?
 
-        if budget.settings.vote_rule_selected_projects_enabled
-          winning_projects_by_votes_rule(budget)
-        else
-          winning_projects_by_budget_rule(budget)
-        end
-      end
-
-      def winning_projects_by_votes_rule(budget)
-        total_available = budget.settings.vote_selected_projects_maximum
-
-        [].tap do |projects|
-          projects_with_votes(budget).each do |project|
-            break if project.votes_count < 1
-
-            projects << project
-            total_available -= 1
-            break if total_available < 1
-          end
-        end
-      end
-
-      def winning_projects_by_budget_rule(budget)
         total_available = budget.total_budget
 
         [].tap do |projects|

diff --git a/app/views/decidim/budgets/results/_budget_results.html.erb b/app/views/decidim/budgets/results/_budget_results.html.erb
@@ -2,15 +2,6 @@
 projects = projects_with_votes(budget)
 extra_projects = []
 
-# if budget.settings.respond_to?(:vote_rule_selected_projects_enabled) && budget.settings.vote_rule_selected_projects_enabled && budget.total_budget.zero?
-#   winning = winning_projects(budget) if voting_finished?
-#   if winning && winning.any? && winning.first.selected?
-#     extra_projects = projects.where.not(id: winning.map(&:id))
-#     projects = winning
-#   end
-# else
-# end
-
 if voting_finished?
   winning = winning_projects(budget)
   extra_projects = projects.where.not(id: winning.map(&:id))
@@ -30,6 +21,9 @@ end
     </span>
   </a>
   <div class="accordion-content" data-tab-content>
+    <div class="margin-bottom-2">
+      <p class="lead"><%= t(".budget", amount: budget_to_currency(budget.total_budget)) %></p>
+    </div>
     <% if projects.any? || extra_projects.any? %>
       <%= render partial: "projects_table", locals: { budget: budget, winning: projects, others: extra_projects } %>
     <% else %>