diff --git a/app/views/admin/spending_proposals/show.html.erb b/app/views/admin/spending_proposals/show.html.erb index 121f28940..2f4697a9c 100644 --- a/app/views/admin/spending_proposals/show.html.erb +++ b/app/views/admin/spending_proposals/show.html.erb @@ -26,3 +26,12 @@ class: "button radius tiny warning" %> <% end %>

+ + +

<%= t("admin.spending_proposals.show.dossier") %>:

+ +

<%= t("admin.spending_proposals.show.price") %>: <%= @spending_proposal.price %>

+

<%= t("admin.spending_proposals.show.legality") %>: <%= t("admin.spending_proposals.show.#{@spending_proposal.legality}") %>

+

<%= t("admin.spending_proposals.show.feasibility") %>: <%= t("admin.spending_proposals.show.#{@spending_proposal.feasibility}") %>

+ +<%= safe_html_with_links(@spending_proposal.explanation.html_safe) if @spending_proposal.explanation %> diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index 296ad7167..56275c2c0 100755 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -150,6 +150,15 @@ en: show: by: Sent by geozone: Scope + dossier: Dossier + price: Price + legality: Legality + legal: Legal + no_legal: No legal + feasibility: Feasibility + feasible: Feasible + no_feasible: No feasible + undefined: Undefined stats: show: stats_title: Stats diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index 55df87412..cdb703e9f 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -149,7 +149,16 @@ es: title: Propuestas de gasto para presupuestos participativos show: by: Enviada por - geozone: "Ámbito" + geozone: Ámbito + dossier: Informe + price: Coste + legality: Legalidad + legal: Legal + no_legal: No legal + feasibility: Viabilidad + feasible: Viable + no_feasible: No viable + undefined: Sin definir stats: show: stats_title: Estadísticas diff --git a/spec/features/admin/spending_proposals_spec.rb b/spec/features/admin/spending_proposals_spec.rb index 7d608d0a5..311c7ded5 100644 --- a/spec/features/admin/spending_proposals_spec.rb +++ b/spec/features/admin/spending_proposals_spec.rb @@ -103,7 +103,12 @@ feature 'Admin spending proposals' do end scenario 'Show' do - spending_proposal = create(:spending_proposal, geozone: create(:geozone)) + spending_proposal = create(:spending_proposal, + geozone: create(:geozone), + price: 1234.56, + legal: true, + feasible: false, + explanation: "It's impossible") visit admin_spending_proposals_path click_link spending_proposal.title @@ -112,6 +117,10 @@ feature 'Admin spending proposals' do expect(page).to have_content(spending_proposal.description) expect(page).to have_content(spending_proposal.author.name) expect(page).to have_content(spending_proposal.geozone.name) + expect(page).to have_content("1234.56") + expect(page).to have_content("Legal") + expect(page).to have_content("No feasible") + expect(page).to have_content("It's impossible") end scenario 'Accept from show' do