diff --git a/app/views/budgets/results/_results_table.html.erb b/app/views/budgets/results/_results_table.html.erb index 7cc7a7d1a..ebd3c2b15 100644 --- a/app/views/budgets/results/_results_table.html.erb +++ b/app/views/budgets/results/_results_table.html.erb @@ -1,4 +1,4 @@ -
diff --git a/app/views/budgets/results/show.html.erb b/app/views/budgets/results/show.html.erb index 54b31e7ba..fe1fc876d 100644 --- a/app/views/budgets/results/show.html.erb +++ b/app/views/budgets/results/show.html.erb @@ -14,7 +14,7 @@
- <%= back_link_to budget_path(@budget) %> + <%= back_link_to budgets_path %>

<%= t("budgets.results.heading") %>
<%= @budget.name %>

@@ -55,16 +55,29 @@ <%= link_to t("budgets.results.show_all_link"), "#", class: "js-toggle-link button hollow margin-bottom", data: {'toggle-selector' => '.js-discarded', 'toggle-text' => t("budgets.results.hide_discarded_link")} %> - - <%= render 'results_table', results_type: :compatible, - title: @heading.name, - heading_price: @heading.price, - investments: @investments.compatible %> - - <% if @investments.incompatible.present? %> - <%= render 'results_table', results_type: :incompatible, - title: t("budgets.results.incompatibles"), +
+ <%= render 'results_table', results_type: :compatible, + title: @heading.name, heading_price: @heading.price, - investments: @investments.incompatible %> - <% end %> + investments: @investments.compatible %> + + <% if @investments.incompatible.present? %> + <%= render 'results_table', results_type: :incompatible, + title: t("budgets.results.incompatibles"), + heading_price: @heading.price, + investments: @investments.incompatible %> + <% end %> + +

+ <%= link_to budget_url(@budget) do %> + <%= t("budgets.results.investment_proyects") %> + <% end %>
+ <%= link_to budget_url(@budget, filter: 'unfeasible') do %> + <%= t("budgets.results.unfeasible_investment_proyects") %> + <% end %>
+ <%= link_to budget_url(@budget, filter: 'unselected') do %> + <%= t("budgets.results.not_selected_investment_proyects") %> + <% end %> +

+
diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index e41c07535..6e6481b28 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -166,6 +166,9 @@ en: accepted: "Accepted spending proposal: " discarded: "Discarded spending proposal: " incompatibles: Incompatibles + investment_proyects: List of all investment projects + unfeasible_investment_proyects: List of all unfeasible investment projects + not_selected_investment_proyects: List of all investment projects not selected for balloting phases: errors: dates_range_invalid: "Start date can't be equal or later than End date" diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index 827aaf3da..083249178 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -166,6 +166,9 @@ es: accepted: 'Proyecto de gasto aceptado: ' discarded: 'Proyecto de gasto descartado: ' incompatibles: Incompatibles + investment_proyects: Ver lista completa de proyectos de gasto + unfeasible_investment_proyects: Ver lista de proyectos de gasto inviables + not_selected_investment_proyects: Ver lista de proyectos de gasto no seleccionados para la votación final phases: errors: dates_range_invalid: "La fecha de comienzo no puede ser igual o superior a la de finalización"