Add 'current applied filters' message to investments partial

consuldemocracy · Jan 22, 2018 · 3f6a918 · 3f6a918
1 parent 1027896
commit 3f6a918
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/app/views/admin/budget_investments/_filters_description.html.erb b/app/views/admin/budget_investments/_filters_description.html.erb
@@ -0,0 +1,13 @@
+<% if params[:filter].present? && params[:second_filter].present? %>
+  <p class="inline-block"><%= t("#{i18n_namespace}.filters.two_filters_html",
+                              filter: t("#{i18n_namespace}.filters.#{params[:filter]}"),
+                              second_filter: t("#{i18n_namespace}.filters.#{params[:second_filter]}")) %></p>
+
+<% elsif params[:filter].present? %>
+  <p class="inline-block"><%= t("#{i18n_namespace}.filters.one_filter_html",
+                              filter: t("#{i18n_namespace}.filters.#{params[:filter]}")) %></p>
+
+<% elsif params[:second_filter].present? %>
+  <p class="inline-block"><%= t("#{i18n_namespace}.filters.one_filter_html",
+                              filter: t("#{i18n_namespace}.filters.#{params[:second_filter]}")) %></p>
+<% end %>
diff --git a/app/views/admin/budget_investments/_investments.html.erb b/app/views/admin/budget_investments/_investments.html.erb
@@ -3,7 +3,10 @@
             class: "float-right small" %>
 
 <% if @investments.any? %>
-  <h3 class="inline-block"><%= page_entries_info @investments %></h3>
+  <h3 class="inline-block"><%= page_entries_info @investments %></h3><br>
+
+  <%= render "filters_description", i18n_namespace: "admin.budget_investments.index" %>
+
   <table class="table-for-mobile">
     <thead>
       <tr>

diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
@@ -150,6 +150,8 @@ en:
           max_per_heading: Max. supports per heading
           winners: Winners
           button: Filter
+          one_filter_html: "Current applied filter: <b><em>%{filter}</em></b>"
+          two_filters_html: "Current applied filters: <b><em>%{filter}, %{second_filter}</em></b>"
         download_current_selection: "Download current selection"
         no_budget_investments: "There are no investment projects."
         title: Investment projects

diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
@@ -150,6 +150,8 @@ es:
           max_per_heading: Corte por partida
           winners: Ganadores
           button: Filtrar
+          one_filter_html: "Filtro en uso: <b><em>%{filter}</em></b>"
+          two_filters_html: "Filtros en uso: <b><em>%{filter}, %{second_filter}</em></b>"
         download_current_selection: "Descargar selección actual"
         no_budget_investments: "No hay proyectos de gasto."
         title: Proyectos de gasto