From 6e8a310ee1d6058e15ebd6e3420d336764b3d835 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Mon, 25 Apr 2016 18:33:18 +0200
Subject: [PATCH 1/2] Sorts spending proposals by votes and creation in admin

---
 app/controllers/admin/spending_proposals_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/admin/spending_proposals_controller.rb b/app/controllers/admin/spending_proposals_controller.rb
index bd139dc9a..9826ab17f 100644
--- a/app/controllers/admin/spending_proposals_controller.rb
+++ b/app/controllers/admin/spending_proposals_controller.rb
@@ -7,7 +7,7 @@ class Admin::SpendingProposalsController < Admin::BaseController
   load_and_authorize_resource
 
   def index
-    @spending_proposals = SpendingProposal.scoped_filter(params, @current_filter).order(created_at: :desc).page(params[:page])
+    @spending_proposals = SpendingProposal.scoped_filter(params, @current_filter).order(cached_votes_up: :desc, created_at: :desc).page(params[:page])
   end
 
   def show

From 73ffd3e18920705f71462ebdaf61a8b47eae2485 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Mon, 25 Apr 2016 18:35:28 +0200
Subject: [PATCH 2/2] adds feasibility column to sp admin

---
 app/views/admin/spending_proposals/index.html.erb | 4 ++++
 config/locales/admin.en.yml                       | 4 ++++
 config/locales/admin.es.yml                       | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/app/views/admin/spending_proposals/index.html.erb b/app/views/admin/spending_proposals/index.html.erb
index cd30f121d..5bbcee57f 100644
--- a/app/views/admin/spending_proposals/index.html.erb
+++ b/app/views/admin/spending_proposals/index.html.erb
@@ -29,6 +29,7 @@
                        label: false,
                        class: "js-submit-on-change" } %>
     </div>
+
     <div class="small-12 medium-3 column">
       <%= select_tag :tag_name,
                      options_for_select(spending_proposal_tags_select_options, params[:tag_name]),
@@ -69,6 +70,9 @@
       <td class="small">
         <%= geozone_name(spending_proposal) %>
       </td>
+      <td class="small">
+        <%= t("admin.spending_proposals.index.feasibility.#{spending_proposal.feasibility}", price: spending_proposal.price) %>
+      </td>
     </tr>
   <% end %>
 </table>
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index d24991654..2f4fe46a7 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -168,6 +168,10 @@ en:
         no_admin_assigned: No admin assigned
         no_valuators_assigned: No valuators assigned
         summary_link: "Summary"
+        feasibility:
+          feasible: "Feasible (%{price})"
+          not_feasible: "Not feasible"
+          undefined: "Undefined"
       show:
         assigned_admin: Assigned administrator
         assigned_valuators: Assigned valuators
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index b5466a080..e93eb4902 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -168,6 +168,10 @@ es:
         no_admin_assigned: Sin admin asignado
         no_valuators_assigned: Sin evaluador
         summary_link: "Resumen"
+        feasibility:
+          feasible: "Viable (%{price})"
+          not_feasible: "Inviable"
+          undefined: "Sin definir"
       show:
         assigned_admin: Administrador asignado
         assigned_valuators: Evaluadores asignados