-
<%= t('admin.budgets.show.groups') %>
- <% if groups.blank? %>
-
- <%= t("admin.budgets.form.no_groups") %>
- <%= link_to t("admin.budgets.form.add_group"), "#",
- class: "js-toggle-link",
- data: { "toggle-selector" => "#new-group-form" } %>
-
- <% else %>
- <%= link_to t("admin.budgets.form.add_group"), "#", class: "button float-right js-toggle-link", data: { "toggle-selector" => "#new-group-form" } %>
- <% end %>
+
<%= t('admin.budgets.show.groups', count: groups.count) %>
+<% if groups.blank? %>
+
+ <%= t("admin.budgets.form.no_groups") %>
+ <%= link_to t("admin.budgets.form.add_group"), "#",
+ class: "js-toggle-link",
+ data: { "toggle-selector" => "#new-group-form" } %>
+
+<% else %>
+ <%= link_to t("admin.budgets.form.add_group"), "#", class: "button float-right js-toggle-link", data: { "toggle-selector" => "#new-group-form" } %>
+<% end %>
- <%= form_for [:admin, @budget, Budget::Group.new], html: {id: "new-group-form", style: "display:none"}, remote: true do |f| %>
-
\ No newline at end of file
+<% groups.each do |group| %>
+
+ <%= render "admin/budgets/group", group: group, headings: group.headings %>
+
+<% end %>
diff --git a/app/views/admin/budgets/edit.html.erb b/app/views/admin/budgets/edit.html.erb
index 6fd1e3e1f..34672bf7a 100644
--- a/app/views/admin/budgets/edit.html.erb
+++ b/app/views/admin/budgets/edit.html.erb
@@ -1,3 +1,8 @@
+<%= link_to admin_budgets_path do %>
+
+ <%= t('shared.back') %>
+<% end %>
+
<%= t("admin.budgets.edit.title") %>
diff --git a/app/views/admin/budgets/index.html.erb b/app/views/admin/budgets/index.html.erb
index d4de771db..7bf4b0659 100644
--- a/app/views/admin/budgets/index.html.erb
+++ b/app/views/admin/budgets/index.html.erb
@@ -6,23 +6,39 @@
<%= render 'shared/filter_subnav', i18n_namespace: "admin.budgets.index" %>
-
<%= page_entries_info @budgets %>
- <% @budgets.each do |budget| %>
-
- |
- <%= link_to budget.name, admin_budget_budget_investments_path(budget_id: budget.id) %>
- |
-
- <%= t("budget.phase.#{budget.phase}") %>
- |
-
- <%= link_to t("admin.budgets.index.info_link"), admin_budget_path(budget) %>
- |
+
+
+ | <%= t("admin.budgets.index.table_name") %> |
+ <%= t("admin.budgets.index.table_phase") %> |
+ <%= t("admin.budgets.index.table_investments") %> |
+ <%= t("admin.budgets.index.table_edit_groups") %> |
+ <%= t("admin.budgets.index.table_edit_budget") %> |
- <% end %>
+
+
+ <% @budgets.each do |budget| %>
+
+ |
+ <%= budget.name %>
+ |
+
+ <%= t("budget.phase.#{budget.phase}") %>
+ |
+
+ <%= link_to t("admin.budgets.index.budget_investments"), admin_budget_budget_investments_path(budget_id: budget.id) %>
+ |
+
+ <%= link_to t("admin.budgets.index.edit_groups"), admin_budget_path(budget) %>
+ |
+
+ <%= link_to t("admin.budgets.index.edit_budget"), edit_admin_budget_path(budget) %>
+ |
+
+ <% end %>
+
<%= paginate @budgets %>
\ No newline at end of file
diff --git a/app/views/admin/budgets/show.html.erb b/app/views/admin/budgets/show.html.erb
index 4468f7599..1f3292019 100644
--- a/app/views/admin/budgets/show.html.erb
+++ b/app/views/admin/budgets/show.html.erb
@@ -1,16 +1,10 @@
-
-
-
<%= @budget.name %> <%= link_to(t('shared.edit'), edit_admin_budget_path(@budget)) %>
+<%= link_to admin_budgets_path do %>
+
+ <%= t('shared.back') %>
+<% end %>
- <%= @budget.description %>
+
<%= @budget.name %>
-
- <%= t('admin.budgets.show.phase') %>: <%= t("budget.phase.#{@budget.phase}") %> |
- <%= t('admin.budgets.show.currency') %>: <%= @budget.currency_symbol %>
-
-
-
-
-
+
<%= render "groups", groups: @budget.groups %>
diff --git a/app/views/budgets/groups/show.html.erb b/app/views/budgets/groups/show.html.erb
index e77311e07..9a1976ff2 100644
--- a/app/views/budgets/groups/show.html.erb
+++ b/app/views/budgets/groups/show.html.erb
@@ -1,12 +1,18 @@
-
+
+
+
+ <%= link_to budget_path(@budget), class: "back" do %>
+
+ <%= t('shared.back') %>
+ <% end %>
+
+
<%= t("budgets.groups.show.title") %>
+
+
+
+
+
- <%= link_to budget_path(@budget), class: "back" do %>
-
- <%= t('shared.back') %>
- <% end %>
-
-
<%= t("budgets.groups.show.title") %>
-
<% @group.headings.each_slice(7) do |slice| %>
diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb
index 63d0287ab..509e79d65 100644
--- a/app/views/budgets/index.html.erb
+++ b/app/views/budgets/index.html.erb
@@ -7,8 +7,8 @@
-
-
+
+
| <%= t('budget.index.name') %> |
<%= t('budget.index.phase') %> |
diff --git a/app/views/budgets/investments/_form.html.erb b/app/views/budgets/investments/_form.html.erb
index 724aae086..61d7b83c8 100644
--- a/app/views/budgets/investments/_form.html.erb
+++ b/app/views/budgets/investments/_form.html.erb
@@ -2,8 +2,9 @@
<%= render 'shared/errors', resource: @investment %>
-
- <%= f.select :heading_id, budget_heading_select_options(@budget), include_blank: true %>
+
+ <%= f.label :heading_id, t("budget.investments.form.heading") %>
+ <%= f.select :heading_id, budget_heading_select_options(@budget), {include_blank: true, label: false} %>
@@ -58,8 +59,8 @@
<% end %>
-
- <%= f.submit(nil, class: "button") %>
+
+ <%= f.submit(class: "button expanded", value: t("budget.investments.form.submit_buttons.#{action_name}")) %>
<% end %>
diff --git a/app/views/budgets/investments/_header.html.erb b/app/views/budgets/investments/_header.html.erb
index 1074fdf70..ba3e8d5b8 100644
--- a/app/views/budgets/investments/_header.html.erb
+++ b/app/views/budgets/investments/_header.html.erb
@@ -20,7 +20,7 @@
-
<%= @filter_geozone_name %>
+
<%= @heading.name %>
<% if can? :show, @ballot %>
<%= link_to t("budget.investments.header.check_ballot"),
diff --git a/app/views/budgets/investments/_votes.html.erb b/app/views/budgets/investments/_votes.html.erb
index 77a95a221..e1dd2860c 100644
--- a/app/views/budgets/investments/_votes.html.erb
+++ b/app/views/budgets/investments/_votes.html.erb
@@ -21,7 +21,7 @@
method: "post",
remote: true,
"aria-hidden" => css_for_aria_hidden(reason) do %>
- <%= t("budget.investments.investment.vote") %>
+ <%= t("budget.investments.investment.give_support") %>
<% end %>
<% end %>
diff --git a/app/views/budgets/investments/new.html.erb b/app/views/budgets/investments/new.html.erb
index 7695afdec..457fbd550 100644
--- a/app/views/budgets/investments/new.html.erb
+++ b/app/views/budgets/investments/new.html.erb
@@ -1,7 +1,6 @@
-
-
-
-
<%= t("management.budget_investments.create") %>
+
+
+
<%= t("management.budget_investments.create") %>
<%= render '/budgets/investments/form', form_url: budget_investments_path(@budget) %>
diff --git a/app/views/budgets/show.html.erb b/app/views/budgets/show.html.erb
index ce4e46c71..22096a526 100644
--- a/app/views/budgets/show.html.erb
+++ b/app/views/budgets/show.html.erb
@@ -1,23 +1,38 @@
-
-
-
- <%= link_to budgets_path do %>
+
+
+
+ <%= link_to budgets_path, class: "back" do %>
<%= t('shared.back') %>
<% end %>
-
<%= @budget.name %>
- <%= t("budgets.phases.#{@budget.phase}") %>
-
+ <%= @budget.name %>
<%= @budget.description %>
+
+
+
+ <%= t('budget.show.phase') %>
+
+ <%= t("budgets.phases.#{@budget.phase}") %>
+
+ <% if @budget.accepting? %>
+ <% if current_user && current_user.level_two_or_three_verified? %>
+ <%= link_to t("budget.investments.index.sidebar.create"), new_budget_investment_path(@budget), class: "button margin-top" %>
+ <% else %>
+
+ <%= t("budget.investments.index.sidebar.verified_only",
+ verify: link_to(t("budget.investments.index.sidebar.verify_account"), verification_path)).html_safe %>
+
+ <% end %>
+ <% end %>
-
+
| <%= t('budget.show.group') %> |
diff --git a/app/views/valuation/budget_investments/edit.html.erb b/app/views/valuation/budget_investments/edit.html.erb
index e03d850a4..16dc3b59d 100644
--- a/app/views/valuation/budget_investments/edit.html.erb
+++ b/app/views/valuation/budget_investments/edit.html.erb
@@ -1,4 +1,8 @@
-<%= link_to "#{t('valuation.budget_investments.show.title')} #{@investment.id}", valuation_budget_budget_investment_path(@budget, @investment), class: 'back' %>
+<%= link_to valuation_budget_budget_investment_path(@budget, @investment), class: 'back' do %>
+
+ <%= "#{t('valuation.budget_investments.show.title')} #{@investment.id}"%>
+<% end %>
+
<%= t("valuation.budget_investments.edit.dossier") %>
<%= form_for(@investment, url: valuate_valuation_budget_budget_investment_path(@budget, @investment), html: {id: "valuation_budget_investment_edit_form"}) do |f| %>
diff --git a/app/views/valuation/budget_investments/index.html.erb b/app/views/valuation/budget_investments/index.html.erb
index 9b82f7f5a..1eea49493 100644
--- a/app/views/valuation/budget_investments/index.html.erb
+++ b/app/views/valuation/budget_investments/index.html.erb
@@ -1,4 +1,7 @@
-<%= @budget.name %> - <%= t("valuation.budget_investments.index.title") %>
+
+ <%= @budget.name %> - <%= t("valuation.budget_investments.index.title") %>
+ <%= t('valuation.budget_investments.index.assigned_to', valuator: current_user.name) %>
+
<% @heading_filters.each_slice(8) do |slice| %>
@@ -18,25 +21,34 @@
<%= page_entries_info @investments %>
- <% @investments.each do |investment| %>
-
- |
- <%= investment.id %>
- |
-
- <%= link_to investment.title, valuation_budget_budget_investment_path(@budget, investment) %>
- |
-
- <%= link_to t("valuation.budget_investments.index.edit"), edit_valuation_budget_budget_investment_path(@budget, investment) %>
- |
-
- <%= assigned_valuators_info(investment.valuators) %>
- |
-
- <%= investment.heading.name %>
- |
+
+
+ | <%= t("valuation.budget_investments.index.table_id") %> |
+ <%= t("valuation.budget_investments.index.table_title") %> |
+ <%= t("valuation.budget_investments.index.table_heading_name") %> |
+ <%= t("valuation.budget_investments.index.table_actions") %> |
- <% end %>
+
+
+ <% @investments.each do |investment| %>
+
+ |
+ <%= investment.id %>
+ |
+
+ <%= link_to investment.title, valuation_budget_budget_investment_path(@budget, investment) %>
+ |
+
+ <%= investment.heading.name %>
+ |
+
+ <%= link_to t("valuation.budget_investments.index.edit"),
+ edit_valuation_budget_budget_investment_path(@budget, investment),
+ class: "button hollow expanded" %>
+ |
+
+ <% end %>
+
<%= paginate @investments %>
diff --git a/app/views/valuation/budget_investments/show.html.erb b/app/views/valuation/budget_investments/show.html.erb
index 602c53dda..f0eaed2c8 100644
--- a/app/views/valuation/budget_investments/show.html.erb
+++ b/app/views/valuation/budget_investments/show.html.erb
@@ -1,4 +1,7 @@
-<%= render "shared/back_link" %>
+<%= link_to valuation_budget_budget_investments_path do %>
+
+ <%= t('shared.back') %>
+<% end %>
<%= t("valuation.budget_investments.show.title") %> <%= @investment.id %>
<%= @investment.title %>
diff --git a/app/views/valuation/budgets/index.html.erb b/app/views/valuation/budgets/index.html.erb
index 014633373..5df21fc3e 100644
--- a/app/views/valuation/budgets/index.html.erb
+++ b/app/views/valuation/budgets/index.html.erb
@@ -1,17 +1,36 @@
<%= t("valuation.budgets.index.title") %>
-<%= render 'shared/filter_subnav', i18n_namespace: "valuation.budgets.index" %>
-
<%= page_entries_info @budgets %>
- <% @budgets.each do |budget| %>
-
- |
- <%= link_to budget.name, valuation_budget_budget_investments_path(budget_id: budget.id) %>
- |
+
+
+ | <%= t("valuation.budgets.index.table_name") %> |
+ <%= t("valuation.budgets.index.table_phase") %> |
+ <%= t("valuation.budgets.index.table_assigned_investments_valuation_open") %> |
+ <%= t("valuation.budgets.index.table_actions") %> |
- <% end %>
+
+
+ <% @budgets.each do |budget| %>
+
+ |
+ <%= budget.name %>
+ |
+
+ <%= t("budget.phase.#{budget.phase}") %>
+ |
+
+ <%= @investments_with_valuation_open[budget.id] %>
+ |
+
+ <%= link_to t("valuation.budgets.index.evaluate"),
+ valuation_budget_budget_investments_path(budget_id: budget.id),
+ class: "button hollow expanded" %>
+ |
+
+ <% end %>
+
-<%= paginate @budgets %>
\ No newline at end of file
+<%= paginate @budgets %>
diff --git a/app/views/verification/letter/new.html.erb b/app/views/verification/letter/new.html.erb
index 01d0f0e01..648de7478 100644
--- a/app/views/verification/letter/new.html.erb
+++ b/app/views/verification/letter/new.html.erb
@@ -50,7 +50,7 @@
-
<%= t("verification.letter.new.office",
- office: link_to(t("verification.letter.new.offices"), t("verification.letter.new.offices_url"),
+ office: link_to(t("verification.letter.new.offices"), setting['verification_offices_url'],
target: "blank")).html_safe %>
-
diff --git a/app/views/verification/letter/show.html.erb b/app/views/verification/letter/show.html.erb
index e5189a476..372e1a8d1 100644
--- a/app/views/verification/letter/show.html.erb
+++ b/app/views/verification/letter/show.html.erb
@@ -12,7 +12,7 @@
<%= t("verification.letter.create.flash.success_html",
offices: link_to(t("verification.letter.create.flash.offices"),
- t("verification.letter.create.flash.offices_url"),
+ setting['verification_offices_url'],
title: t('shared.target_blank_html'),
target: "_blank")).html_safe
%>
diff --git a/app/views/verification/residence/_errors.html.erb b/app/views/verification/residence/_errors.html.erb
index dd4112d7c..7b97e6085 100644
--- a/app/views/verification/residence/_errors.html.erb
+++ b/app/views/verification/residence/_errors.html.erb
@@ -6,7 +6,7 @@
<%= t("verification.residence.new.error_verifying_census",
offices: link_to( t("verification.residence.new.error_verifying_census_offices"),
- t("verification.residence.new.error_verifying_census_offices_url"), title: t('shared.target_blank_html'), target: "_blank")).html_safe %>
+ setting['verification_offices_url'], title: t('shared.target_blank_html'), target: "_blank")).html_safe %>
<% else %>
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index b947a5468..2cc09084f 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -13,7 +13,7 @@ Devise.setup do |config|
# note that it will be overwritten if you use your own mailer class
# with default "from" parameter.
if Rails.env.test? || !ActiveRecord::Base.connection.table_exists?('settings')
- config.mailer_sender = "noreply@example.org"
+ config.mailer_sender = "noreply@consul.dev"
else
config.mailer_sender = "#{Setting['mailer_from_name']} <#{Setting['mailer_from_address']}>"
end
diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index b781de267..3299e86eb 100644
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -47,7 +47,7 @@ es:
description_reviewing: "Descripción durante la fase de revisión"
description_selecting: "Descripción durante la fase de selección"
description_valuating: "Descripción durante la fase de evaluación"
- description_balloting: "Descripción duratne la fase de votación"
+ description_balloting: "Descripción durante la fase de votación"
description_reviewing_ballots: "Descripción durante la fase de revisión de votos"
description_finished: "Descripción cuando el presupuesto ha finalizado"
phase: "Fase"
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index 8f27677e7..dadcb7745 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -62,10 +62,17 @@ en:
index:
title: Participatory budgets
new_link: Create new budget
- info_link: Info
filters:
- open: Open
+ current: Open
finished: Finished
+ budget_investments: See budget investments
+ table_name: Name
+ table_phase: Phase
+ table_investments: Investments
+ table_edit_groups: Headings groups
+ table_edit_budget: Edit
+ edit_groups: Edit headings groups
+ edit_budget: Edit budget
create:
notice: New participatory budget created successfully!
update:
@@ -75,9 +82,9 @@ en:
new:
title: New participatory budget
show:
- phase: Current phase
- currency: Currency
- groups: Groups of budget headings
+ groups:
+ one: 1 Group of budget headings
+ other: "%{count} Groups of budget headings"
form:
group: Group name
no_groups: No groups created yet. Each user will be able to vote in only one heading per group.
@@ -88,10 +95,8 @@ en:
amount: Amount
save_heading: Save heading
no_heading: This group has no assigned heading.
- geozone: Scope of operation
table_heading: Heading
table_amount: Amount
- table_geozone: Scope of operation
budget_investments:
index:
heading_filter_all: All headings
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index 5f7f66ab6..09959cfde 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -62,10 +62,17 @@ es:
index:
title: Presupuestos participativos
new_link: Crear nuevo presupuesto
- info_link: Info
filters:
- open: Abiertos
+ current: Abiertos
finished: Terminados
+ budget_investments: Ver propuestas de inversión
+ table_name: Nombre
+ table_phase: Fase
+ table_investments: Propuestas de inversión
+ table_edit_groups: Grupos de partidas
+ table_edit_budget: Editar
+ edit_groups: Editar grupos de partidas
+ edit_budget: Editar presupuesto
create:
notice: ¡Nueva campaña de presupuestos participativos creada con éxito!
update:
@@ -75,9 +82,9 @@ es:
new:
title: Nuevo presupuesto ciudadano
show:
- phase: Fase actual
- currency: Divisa
- groups: Grupos de partidas presupuestarias
+ groups:
+ one: 1 Grupo de partidas presupuestarias
+ other: "%{count} Grupos de partidas presupuestarias"
form:
group: Nombre del grupo
no_groups: No hay grupos creados todavía. Cada usuario podrá votar en una sola partida de cada grupo.
@@ -88,10 +95,8 @@ es:
amount: Cantidad
save_heading: Guardar partida
no_heading: Este grupo no tiene ninguna partida asignada.
- geozone: Ámbito de actuación
table_heading: Partida
table_amount: Cantidad
- table_geozone: Ámbito de actuación
budget_investments:
index:
heading_filter_all: Todas las partidas
diff --git a/config/locales/budgets.en.yml b/config/locales/budgets.en.yml
index 974f412eb..fa3aa3dd9 100644
--- a/config/locales/budgets.en.yml
+++ b/config/locales/budgets.en.yml
@@ -118,7 +118,7 @@ en:
one: 1 support
other: "%{count} supports"
zero: No supports
- vote: Vote
+ give_support: Support
header:
check_ballot: Check my ballot
different_heading_assigned_html: "You have active votes in another heading: %{heading_link}"
@@ -127,3 +127,4 @@ en:
heading: Heading
price: Price
no_heading: No Heading
+ phase: Actual phase
diff --git a/config/locales/budgets.es.yml b/config/locales/budgets.es.yml
index e3b7269b1..5b28a3b25 100644
--- a/config/locales/budgets.es.yml
+++ b/config/locales/budgets.es.yml
@@ -117,7 +117,7 @@ es:
one: 1 apoyo
other: "%{count} apoyos"
zero: Sin apoyos
- vote: Votar
+ give_support: Apoyar
header:
check_ballot: Revisar mis votos
different_heading_assigned_html: "Ya apoyaste propuestas de otra sección del presupuesto: %{heading_link}"
@@ -126,3 +126,4 @@ es:
heading: Partida
price: Cantidad
no_heading: Sin línea
+ phase: Fase actual
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 83988ab85..adfec0e84 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -441,7 +441,6 @@ en:
collective: Collective
flag: Flag as inappropriate
hide: Hide
- edit: Editar
print:
print_button: Print this info
search: Search
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 8fd9b2c37..06a68286b 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -445,7 +445,6 @@ es:
print_button: Imprimir esta información
search: Buscar
show: Mostrar
- edit: Editar
suggest:
debate:
found:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index b70c4648d..ef0f5a419 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1497,7 +1497,6 @@ fr:
create:
flash:
offices: Bureaux de soutien aux citoyens
- offices_url: http://offices.consul
success_html: Merci d'avoir demandé votre code de sécurité maximum (uniquement
requis pour le vote final). Dans quelques jours, nous vous enverrons
un courrier vers votre adresse postale. Vous pouvez le réclamer dans n'importe
@@ -1512,7 +1511,6 @@ fr:
go_to_index: Voir les propositions
office: Vérifier dans n'importe quel %{office}
offices: Bureaux de soutien aux citoyens
- offices_url: http://offices.consul
send_letter: Envoyer une lettre avec le code
title: Félicitations
user_permission_info: Avec votre compte, vous pouvez
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 831c9a556..2254e6e94 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1518,7 +1518,6 @@ pt-BR:
create:
flash:
offices: Escritórios de Apoio ao Cidadão
- offices_url: http://offices.consul
success_html: Obrigado por solicitar seu código de segurança máxima (somente
solicitado em votações finais). Em poucos dias nós lhe enviaremos
para seu endereço relacionado nos dados que temos em arquivo. Por favor
@@ -1534,7 +1533,6 @@ pt-BR:
go_to_index: Ver propostas
office: Verificar em qualquer %{office}
offices: Escritórios de Apoio ao Cidadão
- offices_url: http://offices.consul
send_letter: Envie-me uma carta com o código
title: Parabéns!
user_permission_info: Com a sua conta você pode...
diff --git a/config/locales/settings.en.yml b/config/locales/settings.en.yml
index 6c4ace44e..b2a4f85c8 100755
--- a/config/locales/settings.en.yml
+++ b/config/locales/settings.en.yml
@@ -35,4 +35,5 @@ en:
mailer_from_name: Origin email name
mailer_from_address: Origin email address
meta_description: "Site description (SEO)"
- meta_keywords: "Keywords (SEO)"
\ No newline at end of file
+ meta_keywords: "Keywords (SEO)"
+ verification_offices_url: Verification offices URL
diff --git a/config/locales/settings.es.yml b/config/locales/settings.es.yml
index ebb237dc8..c89861b85 100644
--- a/config/locales/settings.es.yml
+++ b/config/locales/settings.es.yml
@@ -35,4 +35,5 @@ es:
mailer_from_name: Nombre email remitente
mailer_from_address: Dirección email remitente
meta_description: "Descripción del sitio (SEO)"
- meta_keywords: "Palabras clave (SEO)"
\ No newline at end of file
+ meta_keywords: "Palabras clave (SEO)"
+ verification_offices_url: URL oficinas verificación
diff --git a/config/locales/valuation.en.yml b/config/locales/valuation.en.yml
index a5195deca..de19fea09 100644
--- a/config/locales/valuation.en.yml
+++ b/config/locales/valuation.en.yml
@@ -9,8 +9,13 @@ en:
index:
title: Participatory budgets
filters:
- open: Open
+ current: Open
finished: Finished
+ table_name: Name
+ table_phase: Phase
+ table_assigned_investments_valuation_open: Investment projects assigned with valuation open
+ table_actions: Actions
+ evaluate: Evaluate
budget_investments:
index:
headings_filter_all: All headings
@@ -18,12 +23,17 @@ en:
valuation_open: Open
valuating: Under valuation
valuation_finished: Valuation finished
+ assigned_to: "Assigned to %{valuator}"
title: Investment projects
- edit: Edit
+ edit: Edit dossier
valuators_assigned:
one: Assigned valuator
other: "%{count} valuators assigned"
no_valuators_assigned: No valuators assigned
+ table_id: ID
+ table_title: Title
+ table_heading_name: Heading name
+ table_actions: Actions
show:
back: Back
title: Investment project
diff --git a/config/locales/valuation.es.yml b/config/locales/valuation.es.yml
index 67302437b..b588c8521 100644
--- a/config/locales/valuation.es.yml
+++ b/config/locales/valuation.es.yml
@@ -9,8 +9,13 @@ es:
index:
title: Presupuestos participativos
filters:
- open: Abiertos
+ current: Abiertos
finished: Terminados
+ table_name: Nombre
+ table_phase: Fase
+ table_assigned_investments_valuation_open: Prop. Inv. asignadas en evaluación
+ table_actions: Acciones
+ evaluate: Evaluar
budget_investments:
index:
headings_filter_all: Todas las partidas
@@ -19,11 +24,16 @@ es:
valuating: En evaluación
valuation_finished: Evaluación finalizada
title: Propuestas de inversión
- edit: Editar
+ assigned_to: "Asignadas a %{valuator}"
+ edit: Editar informe
valuators_assigned:
one: Evaluador asignado
other: "%{count} evaluadores asignados"
no_valuators_assigned: Sin evaluador
+ table_id: ID
+ table_title: Título
+ table_heading_name: Nombre de la partida
+ table_actions: Acciones
show:
back: Volver
title: Propuesta de inversión
diff --git a/config/locales/verification.en.yml b/config/locales/verification.en.yml
index e47e5a6b3..b6a89f939 100755
--- a/config/locales/verification.en.yml
+++ b/config/locales/verification.en.yml
@@ -21,7 +21,6 @@ en:
create:
flash:
offices: Citizen Support Offices
- offices_url: http://offices.consul
success_html: Thank you for requesting your maximum security code (only required for the final votes). In a few days we will send it to the address featuring in the data we have on file. Please remember that, if you prefer, you can collect your code from any of the %{offices}.
edit:
see_all: See proposals
@@ -33,7 +32,6 @@ en:
go_to_index: See proposals
office: Verify in any %{office}
offices: Citizen Support Offices
- offices_url: http://offices.consul
send_letter: Send me a letter with the code
title: Congratulations!
user_permission_info: With your account you can...
@@ -65,7 +63,6 @@ en:
error_not_allowed_postal_code: In order to be verified, you must be registered.
error_verifying_census: The Census was unable to verify your information. Please confirm that your census details are correct by calling to City Council or visit one %{offices}.
error_verifying_census_offices: Citizen Support Office
- error_verifying_census_offices_url: http://offices.consul
form_errors: prevented the verification of your residence
postal_code: Postcode
postal_code_note: To verify your account you must be registered
diff --git a/config/locales/verification.es.yml b/config/locales/verification.es.yml
index a8e41ea09..65cfead6b 100644
--- a/config/locales/verification.es.yml
+++ b/config/locales/verification.es.yml
@@ -21,7 +21,6 @@ es:
create:
flash:
offices: Oficinas de Atención al Ciudadano
- offices_url: http://offices.consul
success_html: Antes de las votaciones recibirás una carta con las instrucciones para verificar tu cuenta.
Recuerda que puedes ahorrar el envío verificándote presencialmente en cualquiera de las %{offices}.
edit:
see_all: Ver propuestas
@@ -33,7 +32,6 @@ es:
go_to_index: Ver propuestas
office: Verificarte presencialmente en cualquier %{office}
offices: Oficina de Atención al Ciudadano
- offices_url: http://offices.consul
send_letter: Solicitar una carta por correo postal
title: "¡Felicidades!"
user_permission_info: Con tu cuenta ya puedes...
@@ -65,7 +63,6 @@ es:
error_not_allowed_postal_code: Para verificarte debes estar empadronado.
error_verifying_census: El Padrón no pudo verificar tu información. Por favor, confirma que tus datos de empadronamiento sean correctos llamando al Ayuntamiento o visitando una %{offices}.
error_verifying_census_offices: oficina de Atención al ciudadano
- error_verifying_census_offices_url: http://offices.consul
form_errors: evitaron verificar tu residencia
postal_code: Código postal
postal_code_note: Para verificar tus datos debes estar empadronado
diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb
index ee7d1a471..3acc1154a 100644
--- a/db/dev_seeds.rb
+++ b/db/dev_seeds.rb
@@ -38,6 +38,7 @@ Setting.create(key: 'mailer_from_name', value: 'Consul')
Setting.create(key: 'mailer_from_address', value: 'noreply@consul.dev')
Setting.create(key: 'meta_description', value: 'Citizen Participation and Open Government Application')
Setting.create(key: 'meta_keywords', value: 'citizen participation, open government')
+Setting.create(key: 'verification_offices_url', value: 'http://oficinas-atencion-ciudadano.url/')
puts "Creating Geozones"
('A'..'Z').each { |i| Geozone.create(name: "District #{i}", external_code: i.ord, census_code: i.ord) }
@@ -372,7 +373,7 @@ tags = Faker::Lorem.words(10)
description: "#{Faker::Lorem.paragraphs.join('
')}
",
created_at: rand((Time.now - 1.week) .. Time.now),
feasibility: %w{undecided unfeasible feasible feasible feasible feasible}.sample,
- unfeasibility_explanation: "#{Faker::Lorem.paragraphs.join('
')}
",
+ unfeasibility_explanation: Faker::Lorem.paragraph,
valuation_finished: [false, true].sample,
tag_list: tags.sample(3).join(','),
price: rand(1 .. 100) * 100000,
diff --git a/db/migrate/20170103170147_remove_geozone_id_from_budget_headings.rb b/db/migrate/20170103170147_remove_geozone_id_from_budget_headings.rb
new file mode 100644
index 000000000..bc8a9729c
--- /dev/null
+++ b/db/migrate/20170103170147_remove_geozone_id_from_budget_headings.rb
@@ -0,0 +1,5 @@
+class RemoveGeozoneIdFromBudgetHeadings < ActiveRecord::Migration
+ def change
+ remove_column :budget_headings, :geozone_id
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 98a2659dd..7ebc5f684 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20170102080432) do
+ActiveRecord::Schema.define(version: 20170103170147) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -107,9 +107,8 @@ ActiveRecord::Schema.define(version: 20170102080432) do
create_table "budget_headings", force: :cascade do |t|
t.integer "group_id"
- t.integer "geozone_id"
- t.string "name", limit: 50
- t.integer "price", limit: 8
+ t.string "name", limit: 50
+ t.integer "price", limit: 8
end
add_index "budget_headings", ["group_id"], name: "index_budget_headings_on_group_id", using: :btree
diff --git a/db/seeds.rb b/db/seeds.rb
index e460ce1cb..041a4c931 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -91,3 +91,6 @@ Setting['direct_message_max_per_day'] = 3
# Email settings
Setting['mailer_from_name'] = 'Consul'
Setting['mailer_from_address'] = 'noreply@consul.dev'
+
+# Verification settings
+Setting['verification_offices_url'] = 'http://oficinas-atencion-ciudadano.url/'
diff --git a/spec/features/admin/budgets_spec.rb b/spec/features/admin/budgets_spec.rb
index fccbd7785..8f17c27d4 100644
--- a/spec/features/admin/budgets_spec.rb
+++ b/spec/features/admin/budgets_spec.rb
@@ -47,7 +47,7 @@ feature 'Admin budgets' do
expect(page).to_not have_content(budget4.name)
expect(page).to have_content(budget5.name)
- click_link 'Current'
+ click_link 'Open'
expect(page).to have_content(budget1.name)
expect(page).to have_content(budget2.name)
expect(page).to have_content(budget3.name)
@@ -55,8 +55,8 @@ feature 'Admin budgets' do
expect(page).to_not have_content(budget5.name)
end
- scenario 'Current filter is properly highlighted' do
- filters_links = {'current' => 'Current', 'finished' => 'Finished'}
+ scenario 'Open filter is properly highlighted' do
+ filters_links = {'current' => 'Open', 'finished' => 'Finished'}
visit admin_budgets_path
@@ -110,22 +110,29 @@ feature 'Admin budgets' do
visit admin_budgets_path
within("#budget_#{budget.id}") do
- click_link 'Info'
+ click_link 'Edit headings groups'
end
+ expect(page).to have_content '0 Groups of budget headings'
expect(page).to have_content 'No groups created yet.'
click_link 'Add new group'
- fill_in 'budget_group_name', with: 'General improvments'
+ fill_in 'budget_group_name', with: 'Health'
click_button 'Create group'
+ expect(page).to have_content '1 Group of budget headings'
+ expect(page).to have_content 'Health'
expect(page).to have_content 'Yearly participatory budget'
expect(page).to_not have_content 'No groups created yet.'
visit admin_budgets_path
- click_link 'Yearly participatory budget'
+ within("#budget_#{budget.id}") do
+ click_link 'Edit headings groups'
+ end
+ expect(page).to have_content '1 Group of budget headings'
+ expect(page).to have_content 'Health'
expect(page).to have_content 'Yearly participatory budget'
expect(page).to_not have_content 'No groups created yet.'
end
@@ -153,7 +160,6 @@ feature 'Admin budgets' do
expect(page).to have_content 'District 9 reconstruction'
expect(page).to have_content '6785'
- expect(page).to have_content 'All city'
end
end
diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb
index 92b568373..4c745a9c1 100644
--- a/spec/features/budgets/investments_spec.rb
+++ b/spec/features/budgets/investments_spec.rb
@@ -344,10 +344,8 @@ feature 'Budget Investments' do
global_group = create(:budget_group, budget: budget, name: 'Global Group')
global_heading = create(:budget_heading, group: global_group, name: 'Global Heading')
- carabanchel = create(:geozone, name: "Carabanchel")
- new_york = create(:geozone, name: "New York")
- carabanchel_heading = create(:budget_heading, group: group, geozone: carabanchel, name: carabanchel.name)
- new_york_heading = create(:budget_heading, group: group, geozone: new_york, name: new_york.name)
+ carabanchel_heading = create(:budget_heading, group: group, name: "Carabanchel")
+ new_york_heading = create(:budget_heading, group: group, name: "New York")
sp1 = create(:budget_investment, :selected, price: 1, heading: global_heading)
diff --git a/spec/features/valuation/budget_investments_spec.rb b/spec/features/valuation/budget_investments_spec.rb
index 627d6a391..bac7d1fe2 100644
--- a/spec/features/valuation/budget_investments_spec.rb
+++ b/spec/features/valuation/budget_investments_spec.rb
@@ -54,34 +54,6 @@ feature 'Valuation budget investments' do
expect(investment10.title).to appear_before(investment1.title)
end
- scenario 'Index shows assignments info' do
- investment1 = create(:budget_investment, budget: @budget)
- investment2 = create(:budget_investment, budget: @budget)
- investment3 = create(:budget_investment, budget: @budget)
-
- valuator1 = create(:valuator, user: create(:user))
- valuator2 = create(:valuator, user: create(:user))
- valuator3 = create(:valuator, user: create(:user))
-
- investment1.valuator_ids = [@valuator.id]
- investment2.valuator_ids = [@valuator.id, valuator1.id, valuator2.id]
- investment3.valuator_ids = [@valuator.id, valuator3.id]
-
- visit valuation_budget_budget_investments_path(@budget)
-
- within("#budget_investment_#{investment1.id}") do
- expect(page).to have_content("Rachel")
- end
-
- within("#budget_investment_#{investment2.id}") do
- expect(page).to have_content("3 valuators assigned")
- end
-
- within("#budget_investment_#{investment3.id}") do
- expect(page).to have_content("2 valuators assigned")
- end
- end
-
scenario "Index filtering by heading", :js do
group = create(:budget_group, budget: @budget)
heading1 = create(:budget_heading, name: "District 9", group: group)
@@ -262,7 +234,7 @@ feature 'Valuation budget investments' do
scenario 'Edit dossier' do
visit valuation_budget_budget_investments_path(@budget)
within("#budget_investment_#{@investment.id}") do
- click_link "Edit"
+ click_link "Edit dossier"
end
fill_in 'budget_investment_price', with: '12345'
@@ -381,7 +353,7 @@ feature 'Valuation budget investments' do
scenario 'Validates price formats' do
visit valuation_budget_budget_investments_path(@budget)
within("#budget_investment_#{@investment.id}") do
- click_link "Edit"
+ click_link "Edit dossier"
end
fill_in 'budget_investment_price', with: '12345,98'
diff --git a/spec/features/valuation/budgets_spec.rb b/spec/features/valuation/budgets_spec.rb
index 11c20f26e..23de4c9e9 100644
--- a/spec/features/valuation/budgets_spec.rb
+++ b/spec/features/valuation/budgets_spec.rb
@@ -34,39 +34,6 @@ feature 'Valuation budgets' do
expect(page).to have_content(budget3.name)
expect(page).to have_content(budget4.name)
expect(page).to_not have_content(budget5.name)
-
- click_link 'Finished'
- expect(page).to_not have_content(budget1.name)
- expect(page).to_not have_content(budget2.name)
- expect(page).to_not have_content(budget3.name)
- expect(page).to_not have_content(budget4.name)
- expect(page).to have_content(budget5.name)
-
- click_link 'Current'
- expect(page).to have_content(budget1.name)
- expect(page).to have_content(budget2.name)
- expect(page).to have_content(budget3.name)
- expect(page).to have_content(budget4.name)
- expect(page).to_not have_content(budget5.name)
- end
-
- scenario 'Current filter is properly highlighted' do
- filters_links = {'current' => 'Current', 'finished' => 'Finished'}
-
- visit valuation_budgets_path
-
- expect(page).to_not have_link(filters_links.values.first)
- filters_links.keys.drop(1).each { |filter| expect(page).to have_link(filters_links[filter]) }
-
- filters_links.each_pair do |current_filter, link|
- visit valuation_budgets_path(filter: current_filter)
-
- expect(page).to_not have_link(link)
-
- (filters_links.keys - [current_filter]).each do |filter|
- expect(page).to have_link(filters_links[filter])
- end
- end
end
end
diff --git a/spec/features/verification/letter_spec.rb b/spec/features/verification/letter_spec.rb
index 3d5d14fd3..828dde908 100644
--- a/spec/features/verification/letter_spec.rb
+++ b/spec/features/verification/letter_spec.rb
@@ -20,6 +20,7 @@ feature 'Verify Letter' do
end
scenario 'Go to office instead of send letter' do
+ Setting["verification_offices_url"] = "http://offices.consul"
user = create(:user, residence_verified_at: Time.current,
confirmed_phone: "611111111")
diff --git a/spec/models/abilities/administrator_spec.rb b/spec/models/abilities/administrator_spec.rb
index 8f48153a8..8c4e8a1ef 100644
--- a/spec/models/abilities/administrator_spec.rb
+++ b/spec/models/abilities/administrator_spec.rb
@@ -66,6 +66,6 @@ describe "Abilities::Administrator" do
it { should be_able_to(:hide, Budget::Investment) }
it { should be_able_to(:valuate, create(:budget_investment, budget: create(:budget, phase: 'valuating'))) }
- it { should_not be_able_to(:valuate, create(:budget_investment, budget: create(:budget, phase: 'finished'))) }
+ it { should be_able_to(:valuate, create(:budget_investment, budget: create(:budget, phase: 'finished'))) }
end
diff --git a/spec/models/abilities/valuator_spec.rb b/spec/models/abilities/valuator_spec.rb
index fee24f6a8..c3735b43b 100644
--- a/spec/models/abilities/valuator_spec.rb
+++ b/spec/models/abilities/valuator_spec.rb
@@ -10,8 +10,8 @@ describe "Abilities::Valuator" do
let(:assigned_investment) { create(:budget_investment, budget: create(:budget, phase: 'valuating')) }
before(:each) { assigned_investment.valuators << valuator }
- let(:assigned_investment_not_valuating) { create(:budget_investment, budget: create(:budget, phase: 'finished')) }
- before(:each) { assigned_investment_not_valuating.valuators << valuator }
+ let(:finished_assigned_investment) { create(:budget_investment, budget: create(:budget, phase: 'finished')) }
+ before(:each) { finished_assigned_investment.valuators << valuator }
it { should be_able_to(:read, SpendingProposal) }
it { should be_able_to(:update, SpendingProposal) }
@@ -23,6 +23,6 @@ describe "Abilities::Valuator" do
it { should be_able_to(:update, assigned_investment) }
it { should be_able_to(:valuate, assigned_investment) }
- it { should_not be_able_to(:update, assigned_investment_not_valuating) }
- it { should_not be_able_to(:valuate, assigned_investment_not_valuating) }
+ it { should_not be_able_to(:update, finished_assigned_investment) }
+ it { should_not be_able_to(:valuate, finished_assigned_investment) }
end
diff --git a/spec/models/budget/ballot_spec.rb b/spec/models/budget/ballot_spec.rb
index e99a2276d..259a4a4f4 100644
--- a/spec/models/budget/ballot_spec.rb
+++ b/spec/models/budget/ballot_spec.rb
@@ -23,29 +23,35 @@ describe Budget::Ballot do
end
it "returns the amount spent on all investments assigned to a specific heading" do
- heading = create(:budget_heading)
- budget = heading.group.budget
- inv1 = create(:budget_investment, :selected, price: 10000, heading: heading)
- inv2 = create(:budget_investment, :selected, price: 20000, heading: create(:budget_heading, group: heading.group))
- inv3 = create(:budget_investment, :selected, price: 40000, heading: heading)
+ budget = create(:budget)
+ group1 = create(:budget_group, budget: budget)
+ group2 = create(:budget_group, budget: budget)
+ heading1 = create(:budget_heading, group: group1, price: 100000)
+ heading2 = create(:budget_heading, group: group2, price: 200000)
+ inv1 = create(:budget_investment, :selected, price: 10000, heading: heading1)
+ inv2 = create(:budget_investment, :selected, price: 20000, heading: heading2)
+ inv3 = create(:budget_investment, :selected, price: 40000, heading: heading1)
ballot = create(:budget_ballot, budget: budget)
ballot.investments << inv1 << inv2
- expect(ballot.amount_spent(heading)).to eq 10000
+ expect(ballot.amount_spent(heading1)).to eq 10000
+ expect(ballot.amount_spent(heading2)).to eq 20000
ballot.investments << inv3
- expect(ballot.amount_spent(heading)).to eq 50000
+ expect(ballot.amount_spent(heading1)).to eq 50000
+ expect(ballot.amount_spent(heading2)).to eq 20000
end
end
describe "#amount_available" do
it "returns how much is left after taking some investments" do
budget = create(:budget)
- group = create(:budget_group, budget: budget)
- heading1 = create(:budget_heading, group: group, price: 1000)
- heading2 = create(:budget_heading, group: group, price: 300)
+ group1 = create(:budget_group, budget: budget)
+ group2 = create(:budget_group, budget: budget)
+ heading1 = create(:budget_heading, group: group1, price: 1000)
+ heading2 = create(:budget_heading, group: group2, price: 300)
inv1 = create(:budget_investment, :selected, price: 100, heading: heading1)
inv2 = create(:budget_investment, :selected, price: 200, heading: heading2)
inv3 = create(:budget_investment, :selected, price: 400, heading: heading1)