<%= form_for @user, url: management_users_path do |f| %>
<%= f.hidden_field :document_type %>
@@ -15,7 +15,13 @@
<%= f.text_field :email,
label: t('management.email_label'),
placeholder: t('management.email_label') %>
-
+
+ <%= f.label t("management.date_of_birth") %>
+ <%= f.date_select :date_of_birth,
+ prompt: true,
+ start_year: 1900, end_year: 16.years.ago.year,
+ label: false %>
+
<%= f.submit t("management.users.create_user_submit"), class: "button success" %>
<% end %>
diff --git a/app/views/shared/_admin_login_items.html.erb b/app/views/shared/_admin_login_items.html.erb
index 013320f38..1d7c7f188 100644
--- a/app/views/shared/_admin_login_items.html.erb
+++ b/app/views/shared/_admin_login_items.html.erb
@@ -11,7 +11,8 @@
<% end %>
- <% if feature?(:spending_proposals) && (current_user.administrator? || current_user.valuator?) %>
+ <% if (feature?(:spending_proposals) || feature?(:budgets)) &&
+ (current_user.administrator? || current_user.valuator?) %>
<%= link_to t("layouts.header.valuation"), valuation_root_path %>
diff --git a/config/deploy.rb b/config/deploy.rb
index 52fa7a255..5b842cef6 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -15,7 +15,6 @@ set :full_app_name, deploysecret(:full_app_name)
set :server_name, deploysecret(:server_name)
set :repo_url, 'https://github.com/consul/consul.git'
-set :scm, :git
set :revision, `git rev-parse --short #{fetch(:branch)}`.strip
set :log_level, :info
diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index aa7e05875..a6f233efd 100644
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -58,13 +58,13 @@ es:
attributes:
budget:
name: "Nombre"
- description_accepting: "Descripción durante la fase de aceptación"
- description_reviewing: "Descripción durante la fase de revisión"
- description_selecting: "Descripción durante la fase de selección"
+ description_accepting: "Descripción durante la fase de presentación de proyectos"
+ description_reviewing: "Descripción durante la fase de revisión interna"
+ description_selecting: "Descripción durante la fase de apoyos"
description_valuating: "Descripción durante la fase de evaluació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"
+ description_finished: "Descripción cuando el presupuesto ha finalizado / Resultados"
phase: "Fase"
currency_symbol: "Divisa"
budget/investment:
diff --git a/config/locales/budgets.en.yml b/config/locales/budgets.en.yml
index 5e4861a16..7b3251ad4 100644
--- a/config/locales/budgets.en.yml
+++ b/config/locales/budgets.en.yml
@@ -25,11 +25,11 @@ en:
unfeasible_title: Unfeasible investments
unfeasible: See unfeasible investments
phase:
- accepting: Accepting proposals
- reviewing: Reviewing proposals
- selecting: Selecting proposals
- valuating: Valuating proposals
- balloting: Balloting proposals
+ accepting: Accepting projects
+ reviewing: Reviewing projects
+ selecting: Selecting projects
+ valuating: Valuating projects
+ balloting: Balloting projects
reviewing_ballots: Reviewing Ballots
finished: Finished budget
index:
diff --git a/config/locales/budgets.es.yml b/config/locales/budgets.es.yml
index 08a33bde8..44b748698 100644
--- a/config/locales/budgets.es.yml
+++ b/config/locales/budgets.es.yml
@@ -25,13 +25,13 @@ es:
unfeasible_title: Propuestas inviables
unfeasible: Ver propuestas inviables
phase:
- accepting: Aceptando propuestas
- reviewing: Revisando propuestas
- selecting: Selección de propuestas
- valuating: Evaluación de propuestas
- balloting: Votación de propuestas
- reviewing_ballots: Contando resultados
- finished: Presupuesto terminado
+ accepting: Presentación de proyectos
+ reviewing: Revisión interna de proyectos
+ selecting: Fase de apoyos
+ valuating: Evaluación de proyectos
+ balloting: Votación final
+ reviewing_ballots: Votación finalizada
+ finished: Resultados
index:
title: Presupuestos participativos
investments:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1c854bb7e..cd4fa1a15 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -391,6 +391,7 @@ en:
share: Share
send_notification: Send notification
no_notifications: "This proposal has any notifications."
+ embed_video_title: "Video on %{proposal}"
update:
form:
submit_button: Save changes
diff --git a/config/locales/es.yml b/config/locales/es.yml
index fa1f5264a..dd65131a1 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -391,6 +391,7 @@ es:
send_notification: Enviar notificación
share: Compartir
no_notifications: "Esta propuesta no tiene notificaciones."
+ embed_video_title: "Vídeo en %{proposal}"
update:
form:
submit_button: Guardar cambios
diff --git a/config/locales/management.en.yml b/config/locales/management.en.yml
index 25032010e..d8aaf826c 100644
--- a/config/locales/management.en.yml
+++ b/config/locales/management.en.yml
@@ -32,6 +32,7 @@ en:
under_age: "You don't have the required age to verify your account."
verify: Verify
email_label: Email
+ date_of_birth: Date of birth
email_verifications:
already_verified: This user account is already verified.
choose_options: 'Please choose one of the following options:'
diff --git a/config/locales/management.es.yml b/config/locales/management.es.yml
index 9ac276f3a..10543798a 100644
--- a/config/locales/management.es.yml
+++ b/config/locales/management.es.yml
@@ -32,6 +32,7 @@ es:
under_age: No tienes edad suficiente para verificar tu cuenta.
verify: Verificar usuario
email_label: Email
+ date_of_birth: Fecha de nacimiento
email_verifications:
already_verified: Esta cuenta de usuario ya está verificada.
choose_options: 'Elige una de las opciones siguientes:'
diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb
index d14fc57aa..fb42d71af 100644
--- a/db/dev_seeds.rb
+++ b/db/dev_seeds.rb
@@ -392,7 +392,7 @@ end
puts "Creating Valuation Assignments"
-(1..17).to_a.sample.times do
+(1..50).to_a.sample.times do
Budget::Investment.reorder("RANDOM()").first.valuators << valuator.valuator
end
diff --git a/spec/features/admin/budgets_spec.rb b/spec/features/admin/budgets_spec.rb
index 3b34878af..c93aebea1 100644
--- a/spec/features/admin/budgets_spec.rb
+++ b/spec/features/admin/budgets_spec.rb
@@ -84,7 +84,7 @@ feature 'Admin budgets' do
fill_in 'budget_name', with: 'M30 - Summer campaign'
fill_in 'budget_description_accepting', with: 'Budgeting for summer 2017 maintenance and improvements of the road M-30'
- select 'Accepting proposals', from: 'budget[phase]'
+ select 'Accepting projects', from: 'budget[phase]'
click_button 'Create Participatory budget'
diff --git a/spec/features/management/users_spec.rb b/spec/features/management/users_spec.rb
index 694720cc0..5d08ce711 100644
--- a/spec/features/management/users_spec.rb
+++ b/spec/features/management/users_spec.rb
@@ -18,6 +18,7 @@ feature 'Users' do
fill_in 'user_username', with: 'pepe'
fill_in 'user_email', with: 'pepe@gmail.com'
+ select_date '31-December-1980', from: 'user_date_of_birth'
click_button 'Create user'
@@ -28,6 +29,7 @@ feature 'Users' do
expect(user).to be_level_three_verified
expect(user).to be_residence_verified
expect(user).to_not be_confirmed
+ expect(user.date_of_birth).to have_content (Date.new(1980,12,31))
sent_token = /.*confirmation_token=(.*)".*/.match(ActionMailer::Base.deliveries.last.body.to_s)[1]
visit user_confirmation_path(confirmation_token: sent_token)
diff --git a/spec/features/valuation/budget_investments_spec.rb b/spec/features/valuation/budget_investments_spec.rb
index bac7d1fe2..f6e930cc6 100644
--- a/spec/features/valuation/budget_investments_spec.rb
+++ b/spec/features/valuation/budget_investments_spec.rb
@@ -13,6 +13,12 @@ feature 'Valuation budget investments' do
expect{ visit valuation_budget_budget_investments_path(create(:budget)) }.to raise_exception(FeatureFlags::FeatureDisabled)
end
+ scenario 'Display link to valuation section' do
+ Setting['feature.budgets'] = true
+ visit root_path
+ expect(page).to have_link "Valuation", href: valuation_root_path
+ end
+
scenario 'Index shows budget investments assigned to current valuator' do
investment1 = create(:budget_investment, budget: @budget)
investment2 = create(:budget_investment, budget: @budget)
diff --git a/spec/models/budget/investment_spec.rb b/spec/models/budget/investment_spec.rb
index e36a1c062..3ab97c574 100644
--- a/spec/models/budget/investment_spec.rb
+++ b/spec/models/budget/investment_spec.rb
@@ -304,6 +304,45 @@ describe Budget::Investment do
expect(salamanca_investment.valid_heading?(user)).to eq(false)
end
+
+ it "allows votes in a group with a single heading" do
+ all_city_investment = create(:budget_investment, heading: heading)
+ expect(all_city_investment.valid_heading?(user)).to eq(true)
+ end
+
+ it "allows votes in a group with a single heading after voting in that heading" do
+ all_city_investment1 = create(:budget_investment, heading: heading)
+ all_city_investment2 = create(:budget_investment, heading: heading)
+
+ create(:vote, votable: all_city_investment1, voter: user)
+
+ expect(all_city_investment2.valid_heading?(user)).to eq(true)
+ end
+
+ it "allows votes in a group with a single heading after voting in another group" do
+ districts = create(:budget_group, budget: budget)
+ carabanchel = create(:budget_heading, group: districts)
+
+ all_city_investment = create(:budget_investment, heading: heading)
+ carabanchel_investment = create(:budget_investment, heading: carabanchel)
+
+ create(:vote, votable: carabanchel_investment, voter: user)
+
+ expect(all_city_investment.valid_heading?(user)).to eq(true)
+ end
+
+ it "allows votes in a group with multiple headings after voting in group with a single heading" do
+ districts = create(:budget_group, budget: budget)
+ carabanchel = create(:budget_heading, group: districts)
+ salamanca = create(:budget_heading, group: districts)
+
+ all_city_investment = create(:budget_investment, heading: heading)
+ carabanchel_investment = create(:budget_investment, heading: carabanchel)
+
+ create(:vote, votable: all_city_investment, voter: user)
+
+ expect(carabanchel_investment.valid_heading?(user)).to eq(true)
+ end
end
end