From b7a16c391703867fb487714f9984607fe9048fd8 Mon Sep 17 00:00:00 2001 From: Julian Herrero Date: Mon, 30 Apr 2018 13:46:05 +0700 Subject: [PATCH 1/7] add message views for unfeasible and not selected bugets investments --- app/views/budgets/investments/_investment_show.html.erb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb index 2ca4af278..2466d95d9 100644 --- a/app/views/budgets/investments/_investment_show.html.erb +++ b/app/views/budgets/investments/_investment_show.html.erb @@ -137,6 +137,15 @@
+ <% if investment.unfeasible? %> +
+ <%= t("budgets.investments.show.project_unfeasible_html") %> +
+ <% elsif !investment.selected? %> +
+ <%= t("budgets.investments.show.project_not_selected_html") %> +
+ <% end %> <% end %> <% if investment.should_show_price? %>
From 9a353892223b5677aa4f4a59b03e8697d3fcbe94 Mon Sep 17 00:00:00 2001 From: Julian Herrero Date: Mon, 30 Apr 2018 13:49:41 +0700 Subject: [PATCH 2/7] add locales (en) for unfeasible and not selected bugets investments --- config/locales/en/budgets.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index b50e122a8..293352d84 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -125,6 +125,8 @@ en: no_milestones: Don't have defined milestones milestone_publication_date: "Published %{publication_date}" author: Author + project_unfeasible_html: 'This investment project has been marked as not feasible and will not go to balloting phase' + project_not_selected_html: 'This investment project has not been selected for balloting phase' wrong_price_format: Only integer numbers investment: add: Vote From 3a643f3c29904e9414f57ec0845f7375d4c19552 Mon Sep 17 00:00:00 2001 From: Julian Herrero Date: Mon, 30 Apr 2018 13:55:48 +0700 Subject: [PATCH 3/7] add test for unfeasible bugets investments --- spec/features/budgets/investments_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index d2ea73390..6e6947882 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -922,6 +922,7 @@ feature 'Budget Investments' do expect(page).to have_content("Unfeasibility explanation") expect(page).to have_content("Local government is not competent in this matter") + expect(page).to have_content("This investment project has been marked as not feasible and will not go to balloting phase") end scenario "Show (unfeasible budget investment with valuation not finished)" do From 833670117ea47197b0d88d9f7b7c2310919274a5 Mon Sep 17 00:00:00 2001 From: Julian Herrero Date: Mon, 30 Apr 2018 13:59:57 +0700 Subject: [PATCH 4/7] add test for not selected bugets investments --- spec/features/budgets/investments_spec.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index 6e6947882..68145ac30 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -925,6 +925,23 @@ 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 (not selected budget investment)" do + user = create(:user) + login_as(user) + + investment = create(:budget_investment, + :feasible, + :finished, + budget: budget, + group: group, + heading: heading, + unfeasibility_explanation: 'Local government is not competent in this matter') + + visit budget_investment_path(budget_id: budget.id, id: investment.id) + + expect(page).to have_content("This investment project has not been selected for balloting phase") + end + scenario "Show (unfeasible budget investment with valuation not finished)" do user = create(:user) login_as(user) From ba588543ed090a389bfcc660632424172e4184bc Mon Sep 17 00:00:00 2001 From: Julian Herrero Date: Mon, 30 Apr 2018 18:41:59 +0700 Subject: [PATCH 5/7] add missing dots (.) to config/locales --- config/locales/en/budgets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index 293352d84..450c70522 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -125,8 +125,8 @@ en: no_milestones: Don't have defined milestones milestone_publication_date: "Published %{publication_date}" author: Author - project_unfeasible_html: 'This investment project has been marked as not feasible and will not go to balloting phase' - project_not_selected_html: 'This investment project has not been selected for balloting phase' + project_unfeasible_html: 'This investment project has been marked as not feasible and will not go to balloting phase.' + project_not_selected_html: 'This investment project has not been selected for balloting phase.' wrong_price_format: Only integer numbers investment: add: Vote From acedb3ee3a890054d1babc4d877d91fcad0267c2 Mon Sep 17 00:00:00 2001 From: Julian Herrero Date: Mon, 30 Apr 2018 18:46:49 +0700 Subject: [PATCH 6/7] add locales (es) for unfeasible and not selected bugets investments --- config/locales/es/budgets.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index 2bf7cf85a..16dbccdd2 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -125,6 +125,8 @@ es: no_milestones: No hay hitos definidos milestone_publication_date: "Publicado el %{publication_date}" 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_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: add: Votar From 353c808dd23d930fedf23131163ba1574d034fb2 Mon Sep 17 00:00:00 2001 From: Julian Herrero Date: Tue, 1 May 2018 00:02:43 +0700 Subject: [PATCH 7/7] fix dentation --- app/views/budgets/investments/_investment_show.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb index 2466d95d9..bf9a5b727 100644 --- a/app/views/budgets/investments/_investment_show.html.erb +++ b/app/views/budgets/investments/_investment_show.html.erb @@ -137,13 +137,13 @@
- <% if investment.unfeasible? %> + <% if investment.unfeasible? %>
- <%= t("budgets.investments.show.project_unfeasible_html") %> + <%= t("budgets.investments.show.project_unfeasible_html") %>
- <% elsif !investment.selected? %> + <% elsif !investment.selected? %>
- <%= t("budgets.investments.show.project_not_selected_html") %> + <%= t("budgets.investments.show.project_not_selected_html") %>
<% end %> <% end %>