From 688ec05ea25066664829fb7b8afd01bc6683e1bf Mon Sep 17 00:00:00 2001
From: Bertocq <bertocq@gmail.com>
Date: Mon, 3 Jul 2017 23:59:15 +0200
Subject: [PATCH] Replace winner column for incompatible on admin investment
 list filter by selected

---
 .../admin/budget_investments/_investments.html.erb   | 12 ++++++++----
 config/locales/admin.en.yml                          |  2 +-
 config/locales/admin.es.yml                          |  2 +-
 config/locales/admin.fr.yml                          |  2 +-
 config/locales/admin.nl.yml                          |  2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/views/admin/budget_investments/_investments.html.erb b/app/views/admin/budget_investments/_investments.html.erb
index 0c56e579c..fca3560a4 100644
--- a/app/views/admin/budget_investments/_investments.html.erb
+++ b/app/views/admin/budget_investments/_investments.html.erb
@@ -12,7 +12,9 @@
       <th><%= t("admin.budget_investments.index.table_feasibility") %></th>
       <th class="text-center"><%= t("admin.budget_investments.index.table_valuation_finished") %></th>
       <th class="text-center"><%= t("admin.budget_investments.index.table_selection") %></th>
-      <th class="text-center"><%= t("admin.budget_investments.index.table_winner") %></th>
+      <% if params[:filter] == 'selected' %>
+        <th class="text-center"><%= t("admin.budget_investments.index.table_incompatible") %></th>
+      <% end %>
     </tr>
   </thead>
 
@@ -75,9 +77,11 @@
           <% end %>
         <% end %>
       </td>
-      <td class="small text-center">
-        <%= investment.winner? ? t('shared.yes'): t('shared.no') %>
-      </td>
+      <% if params[:filter] == 'selected' %>
+        <td class="small text-center">
+          <%= investment.incompatible? ? t('shared.yes'): t('shared.no') %>
+        </td>
+      <% end %>
     </tr>
   <% end %>
 </table>
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index 6f72defa5..437638d84 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -141,7 +141,7 @@ en:
         table_feasibility: "Feasibility"
         table_valuation_finished: "Val. Fin."
         table_selection: "Selection"
-        table_winner: "Winner"
+        table_incompatible: "Incompatible"
       show:
         assigned_admin: Assigned administrator
         assigned_valuators: Assigned valuators
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index 773520629..39c6878fe 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -141,7 +141,7 @@ es:
         table_feasibility: "Viabilidad"
         table_valuation_finished: "Ev. Fin."
         table_selection: "Selección"
-        table_winner: "Ganadora"
+        table_incompatible: "Incompatible"
       show:
         assigned_admin: Administrador asignado
         assigned_valuators: Evaluadores asignados
diff --git a/config/locales/admin.fr.yml b/config/locales/admin.fr.yml
index 2c3b84786..76bd7655d 100644
--- a/config/locales/admin.fr.yml
+++ b/config/locales/admin.fr.yml
@@ -140,7 +140,7 @@ fr:
         table_feasibility: "Faisabilité"
         table_valuation_finished: "Ev. Ter."
         table_selection: "Sélection"
-        table_winner: "Winner"
+        table_incompatible: "Incompatible"
       show:
         assigned_admin: Administrateur assigné
         assigned_valuators: Évaluateur assigné
diff --git a/config/locales/admin.nl.yml b/config/locales/admin.nl.yml
index 4e35e5ace..e18087e60 100755
--- a/config/locales/admin.nl.yml
+++ b/config/locales/admin.nl.yml
@@ -140,7 +140,7 @@ nl:
         table_feasibility: "Feasibility"
         table_valuation_finished: "Val. Fin."
         table_selection: "Selection"
-        table_winner: "Winner"
+        table_incompatible: "Incompatible"
       show:
         assigned_admin: Assigned administrator
         assigned_valuators: Assigned valuators