From bbaec57c8a4ac735636d37cbadadf9329615d43b Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 13 Jul 2018 12:52:57 +0200 Subject: [PATCH 1/2] Adds message in budget investment show if project is winner --- .../investments/_investment_show.html.erb | 8 +++++ config/locales/en/budgets.yml | 2 ++ config/locales/es/budgets.yml | 2 ++ spec/features/budgets/investments_spec.rb | 35 +++++++++++++++++++ 4 files changed, 47 insertions(+) diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb index 0b0db9fa8..acca21a80 100644 --- a/app/views/budgets/investments/_investment_show.html.erb +++ b/app/views/budgets/investments/_investment_show.html.erb @@ -141,6 +141,14 @@
<%= t("budgets.investments.show.project_unfeasible_html") %>
+ <% elsif investment.winner? %> +
+ <%= t("budgets.investments.show.project_winner") %> +
+ <% elsif investment.selected? %> +
+ <%= t("budgets.investments.show.project_selected_html") %> +
<% elsif !investment.selected? %>
<%= t("budgets.investments.show.project_not_selected_html") %> diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index ffd2a50cd..8418dc65f 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -127,6 +127,8 @@ en: milestone_status_changed: Investment status changed to author: Author project_unfeasible_html: 'This investment project has been marked as not feasible and will not go to balloting phase.' + project_selected_html: 'This investment project has been selected for balloting phase.' + project_winner: 'Winning investment project' project_not_selected_html: 'This investment project has not been selected for balloting phase.' wrong_price_format: Only integer numbers investment: diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index 9ca162cf1..e3f7b52ae 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -127,6 +127,8 @@ es: milestone_status_changed: El proyecto ha cambiado al estado author: Autor project_unfeasible_html: 'Este proyecto de inversión ha sido marcado como inviable y no pasará a la fase de votación.' + project_selected_html: 'Este proyecto de gasto ha sido seleccionado para la fase de votación.' + project_winner: 'Proyecto de gasto ganador' project_not_selected_html: 'Este proyecto de inversión no ha sido seleccionado para la fase de votación.' wrong_price_format: Solo puede incluir caracteres numéricos investment: diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index 51445bccc..bb1286e7a 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -956,6 +956,41 @@ feature 'Budget Investments' do expect(page).to have_content("This investment project has been marked as not feasible and will not go to balloting phase") end + scenario "Show (selected budget investment)" do + user = create(:user) + login_as(user) + + investment = create(:budget_investment, + :feasible, + :finished, + :selected, + budget: budget, + group: group, + heading: heading) + + visit budget_investment_path(budget_id: budget.id, id: investment.id) + + expect(page).to have_content("This investment project has been selected for balloting phase") + end + + scenario "Show (winner budget investment)" do + user = create(:user) + login_as(user) + + investment = create(:budget_investment, + :feasible, + :finished, + :selected, + :winner, + budget: budget, + group: group, + heading: heading) + + visit budget_investment_path(budget_id: budget.id, id: investment.id) + + expect(page).to have_content("Winning investment project") + end + scenario "Show (not selected budget investment)" do user = create(:user) login_as(user) From 67385820298eb86906044c30eb008d8916efe817 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 13 Jul 2018 19:15:13 +0200 Subject: [PATCH 2/2] Removes unused i18n keys --- config/locales/en/admin.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index fdaaa9d39..34baa743b 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -29,8 +29,6 @@ en: title: Title description: Description target_url: Link - style: Style - image: Image post_started_at: Post started at post_ended_at: Post ended at sections_label: Sections where it will appear