From abb6eb18b0b52d71e7cc7ed484e49ee5d4b88d67 Mon Sep 17 00:00:00 2001
From: voodoorai2000 <voodoorai2000@gmail.com>
Date: Thu, 7 Mar 2019 15:10:51 +0100
Subject: [PATCH] Order headings by name and group

Note that we are relying on the existing `sort_by_name`[1] method in the `Budget::Heading` class.

This method sorts by DESC group name first and then ASC heading name.

[1] https://github.com/AyuntamientoMadrid/consul/pull/1875
---
 app/controllers/budgets/results_controller.rb | 1 +
 app/controllers/budgets/stats_controller.rb   | 1 +
 app/views/budgets/results/show.html.erb       | 6 ++----
 app/views/budgets/stats/show.html.erb         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/budgets/results_controller.rb b/app/controllers/budgets/results_controller.rb
index 40586ed96..e8e80a234 100644
--- a/app/controllers/budgets/results_controller.rb
+++ b/app/controllers/budgets/results_controller.rb
@@ -8,6 +8,7 @@ module Budgets
     def show
       authorize! :read_results, @budget
       @investments = Budget::Result.new(@budget, @heading).investments
+      @headings = @budget.headings.sort_by_name
     end
 
     private
diff --git a/app/controllers/budgets/stats_controller.rb b/app/controllers/budgets/stats_controller.rb
index 558a00865..080bf0ef9 100644
--- a/app/controllers/budgets/stats_controller.rb
+++ b/app/controllers/budgets/stats_controller.rb
@@ -7,6 +7,7 @@ module Budgets
     def show
       authorize! :read_stats, @budget
       @stats = load_stats
+      @headings = @budget.headings.sort_by_name
     end
 
     private
diff --git a/app/views/budgets/results/show.html.erb b/app/views/budgets/results/show.html.erb
index 6e7f372f2..43e403090 100644
--- a/app/views/budgets/results/show.html.erb
+++ b/app/views/budgets/results/show.html.erb
@@ -46,10 +46,8 @@
     <h3 class="margin-bottom">
       <%= t("budgets.results.heading_selection_title") %>
     </h3>
-    <ul class="menu vertical no-margin-top no-padding-top">
-
-
-      <% @budget.headings.order("id ASC").each do |heading| %>
+    <ul id="headings" class="menu vertical no-margin-top no-padding-top">
+      <% @headings.each do |heading| %>
         <li>
           <%= link_to heading.name,
                       budget_results_path(@budget, heading_id: heading.to_param),
diff --git a/app/views/budgets/stats/show.html.erb b/app/views/budgets/stats/show.html.erb
index ea0c2acb6..51c12e292 100644
--- a/app/views/budgets/stats/show.html.erb
+++ b/app/views/budgets/stats/show.html.erb
@@ -199,8 +199,8 @@
               <th scope="col" class="tiny"><%= t("budgets.stats.percent_heading_census_html") %></th>
             </tr>
           </thead>
-          <tbody>
-            <% @budget.headings.order("id ASC").each do |heading| %>
+          <tbody id="headings">
+            <% @headings.each do |heading| %>
               <tr id="<%= heading.name.parameterize %>">
                 <td class="border-left">
                   <strong><%= heading.name %></strong>