fixes specs

This commit is contained in:
rgarcia
2016-03-08 16:26:02 +01:00
parent 3b0cec5587
commit 0eca4d5d48
4 changed files with 21 additions and 45 deletions

View File

@@ -31,4 +31,5 @@
<hr>
<%= render 'valuation/spending_proposals/written_by_valuators' %>
<h2><%= t("admin.spending_proposals.show.dossier") %></h2>
<%= render 'valuation/spending_proposals/written_by_valuators' %>

View File

@@ -1,46 +1,53 @@
<h2><%= t("admin.spending_proposals.show.dossier") %></h2>
<p id="price">
<strong>
<%= t("admin.spending_proposals.show.price") %>
(<%= t("admin.spending_proposals.show.currency") %>):
<%= t("valuation.spending_proposals.show.price") %>
(<%= t("valuation.spending_proposals.show.currency") %>):
</strong>
<% if @spending_proposal.price.present? %>
<%= @spending_proposal.price %>
<% else %>
<%= t("admin.spending_proposals.show.undefined") %>
<%= t("valuation.spending_proposals.show.undefined") %>
<% end %>
</p>
<p id="price_first_year">
<strong>
<%= t("admin.spending_proposals.show.price_first_year") %>
(<%= t("admin.spending_proposals.show.currency") %>):
<%= t("valuation.spending_proposals.show.price_first_year") %>
(<%= t("valuation.spending_proposals.show.currency") %>):
</strong>
<% if @spending_proposal.price_first_year.present? %>
<%= @spending_proposal.price_first_year %>
<% else %>
<%= t("admin.spending_proposals.show.undefined") %>
<%= t("valuation.spending_proposals.show.undefined") %>
<% end %>
</p>
<%= explanation_field @spending_proposal.price_explanation %>
<p id="time_scope">
<strong><%= t("valuation.spending_proposals.show.time_scope") %>:</strong>
<% if @spending_proposal.time_scope.present? %>
<%= @spending_proposal.time_scope %>
<% else %>
<%= t("valuation.spending_proposals.show.undefined") %>
<% end %>
</p>
<p id="feasibility">
<strong><%= t("admin.spending_proposals.show.feasibility") %>:</strong>
<%= t("admin.spending_proposals.show.#{@spending_proposal.feasibility}") %>
<strong><%= t("valuation.spending_proposals.show.feasibility") %>:</strong>
<%= t("valuation.spending_proposals.show.#{@spending_proposal.feasibility}") %>
</p>
<%= explanation_field @spending_proposal.feasible_explanation %>
<% if @spending_proposal.valuation_finished %>
<p id="valuation">
<strong><%= t("admin.spending_proposals.show.valuation_finished") %></strong>
<strong><%= t("valuation.spending_proposals.show.valuation_finished") %></strong>
</p>
<% end %>
<% if @spending_proposal.internal_comments.present? %>
<h2><%= t("admin.spending_proposals.show.internal_comments") %></h2>
<h2><%= t("valuation.spending_proposals.show.internal_comments") %></h2>
<%= explanation_field @spending_proposal.internal_comments %>
<% end %>

View File

@@ -173,22 +173,6 @@ en:
sent: Sent
geozone: Scope
dossier: Dossier
price: Price
price_first_year: Cost during the first year
currency: "€"
feasibility: Feasibility
feasible: Feasible
not_feasible: Not feasible
undefined: Undefined
valuation_finished: Valuation finished
internal_comments: Internal comments
classification: Clasificación
assigned_admin: Assigned admin
assigned_valuators: Assigned valuators
assign_valuators: Assign valuators
no_valuators: There is not any valuator user
assign: Assign
tags: Tags
edit:
classification: Clasification
assigned_valuators: Valuators

View File

@@ -173,22 +173,6 @@ es:
sent: Fecha
geozone: Ámbito
dossier: Informe
price: Coste
price_first_year: Coste en el primer año
currency: "€"
feasibility: Viabilidad
feasible: Viable
not_feasible: No viable
undefined: Sin definir
valuation_finished: Informe finalizado
internal_comments: Commentarios internos
classification: Clasificación
assigned_admin: Administrador asignado
assigned_valuators: Evaluadores asignados
assign_valuators: Asignar evaluadores
no_valuators: No hay ningún usuario evaluador
assign: Asignar
tags: Etiquetas
edit:
classification: Clasificación
assigned_valuators: Evaluadores