-
+
+ <% if @proposal.successfull? %>
+
+ <%= t("proposal_ballots.successfull",
+ voting: link_to(t("proposal_ballots.voting"), proposal_ballots_path)).html_safe %>
+
+ <% elsif @proposal.archived? %>
+
+ <%= t("proposals.proposal.supports", count: @proposal.total_votes) %>
+
+
<%= t("proposals.proposal.archived") %>
+ <% else %>
+
<%= render 'votes',
{ proposal: @proposal, vote_url: vote_proposal_path(@proposal, value: 'yes') } %>
-
- <% end %>
+ <% end %>
+
<%= t("proposals.show.share") %>
diff --git a/app/views/shared/_subnavigation.html.erb b/app/views/shared/_subnavigation.html.erb
index cd025eaf2..9d87a0294 100644
--- a/app/views/shared/_subnavigation.html.erb
+++ b/app/views/shared/_subnavigation.html.erb
@@ -8,6 +8,9 @@
<%= link_to t("layouts.header.proposals"), proposals_path, class: ("active" if controller_name == "proposals"), accesskey: "p" %>
+
+ <%= link_to t("layouts.header.proposal_ballot"), proposal_ballots_path, class: ("active" if controller_name == "proposal_ballots"), accesskey: "v" %>
+
<% if feature?(:spending_proposals) %>
<%= link_to t("layouts.header.spending_proposals"), spending_proposals_path, class: ("active" if controller_name == "spending_proposals"), accesskey: "s" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 61bf57c63..233ebf735 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -209,6 +209,7 @@ en:
open_data: Open data
open_gov: Open government
proposals: Proposals
+ proposal_ballot: Voting
see_all: See proposals
spending_proposals: Spending proposals
legislation:
@@ -373,6 +374,17 @@ en:
update:
form:
submit_button: Save changes
+ proposal_ballots:
+ title: "Votings"
+ description_html: "The following citizen proposals that have reached the required supports and will be voted."
+ date_title: "Dates of participation"
+ date: "Soon we'll announce the date of vote these proposals."
+ successfull: "This proposal has reached the required supports and will be voted in the %{voting}."
+ voting: "next voting"
+ featured_title: "#NextVoting"
+ nothing_to_vote: "There is nothing to vote at the moment."
+ info: "New proposals that have reached the voting phase."
+ button: "I want to decide"
proposal_notifications:
new:
title: "Send message"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 04f844749..54aa483cd 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -209,6 +209,7 @@ es:
open_data: Datos abiertos
open_gov: Gobierno %{open}
proposals: Propuestas
+ proposal_ballot: Votaciones
see_all: Ver propuestas
spending_proposals: Presupuestos ciudadanos
legislation:
@@ -373,6 +374,17 @@ es:
update:
form:
submit_button: Guardar cambios
+ proposal_ballots:
+ title: "Votaciones"
+ description_html: "Las siguientes propuestas ciudadanas han alcanzado el número de apoyos necesarios y pasarán a votación."
+ date_title: "Fechas de participación"
+ date: "En breve anunciaremos la fecha de votación de estas propuestas."
+ successfull: "Esta propuesta ha alcanzado los apoyos necesarios y pasará a la %{voting}."
+ voting: "próxima votación"
+ featured_title: "#PróximaVotación"
+ nothing_to_vote: "No hay nada que votar en este momento."
+ info: "Nuevas propuestas ciudadanas han llegado a la fase de votación."
+ button: "Quiero decidir"
proposal_notifications:
new:
title: "Enviar mensaje"
diff --git a/config/routes.rb b/config/routes.rb
index 4f3eb94ec..df1a7c6fb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -61,6 +61,8 @@ Rails.application.routes.draw do
end
end
+ resources :proposal_ballots, only: [:index]
+
resources :comments, only: [:create, :show], shallow: true do
member do
post :vote
diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb
index 3f47980eb..0e0543695 100644
--- a/db/dev_seeds.rb
+++ b/db/dev_seeds.rb
@@ -150,7 +150,7 @@ tags = Faker::Lorem.words(25)
description = "#{Faker::Lorem.paragraphs.join('
')}
"
proposal = Proposal.create!(author: author,
title: Faker::Lorem.sentence(3).truncate(60),
- question: Faker::Lorem.sentence(3),
+ question: Faker::Lorem.sentence(3) + "?",
summary: Faker::Lorem.sentence(3),
responsible_name: Faker::Name.name,
external_url: Faker::Internet.url,
@@ -169,7 +169,7 @@ tags = ActsAsTaggableOn::Tag.where(kind: 'category')
description = "#{Faker::Lorem.paragraphs.join('
')}
"
proposal = Proposal.create!(author: author,
title: Faker::Lorem.sentence(3).truncate(60),
- question: Faker::Lorem.sentence(3),
+ question: Faker::Lorem.sentence(3) + "?",
summary: Faker::Lorem.sentence(3),
responsible_name: Faker::Name.name,
external_url: Faker::Internet.url,
diff --git a/db/schema.rb b/db/schema.rb
index becde4f8a..6124f31d0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -78,6 +78,91 @@ ActiveRecord::Schema.define(version: 20160803154011) do
add_index "banners", ["hidden_at"], name: "index_banners_on_hidden_at", using: :btree
+ create_table "budget_ballot_lines", force: :cascade do |t|
+ t.integer "ballot_id"
+ t.integer "investment_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.integer "budget_id"
+ t.integer "group_id"
+ t.integer "heading_id"
+ end
+
+ add_index "budget_ballot_lines", ["ballot_id"], name: "index_budget_ballot_lines_on_ballot_id", using: :btree
+ add_index "budget_ballot_lines", ["investment_id"], name: "index_budget_ballot_lines_on_investment_id", using: :btree
+
+ create_table "budget_ballots", force: :cascade do |t|
+ t.integer "user_id"
+ t.integer "budget_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
+ create_table "budget_groups", force: :cascade do |t|
+ t.integer "budget_id"
+ t.string "name", limit: 50
+ end
+
+ add_index "budget_groups", ["budget_id"], name: "index_budget_groups_on_budget_id", using: :btree
+
+ create_table "budget_headings", force: :cascade do |t|
+ t.integer "budget_id"
+ t.integer "geozone_id"
+ t.string "name", limit: 50
+ t.integer "price", limit: 8
+ end
+
+ create_table "budget_investments", force: :cascade do |t|
+ t.integer "author_id"
+ t.integer "administrator_id"
+ t.string "title"
+ t.text "description"
+ t.string "external_url"
+ t.integer "price", limit: 8
+ t.string "feasibility", limit: 15, default: "undecided"
+ t.text "price_explanation"
+ t.text "unfeasibility_explanation"
+ t.text "internal_comments"
+ t.boolean "valuation_finished", default: false
+ t.integer "valuator_assignments_count", default: 0
+ t.integer "price_first_year", limit: 8
+ t.string "duration"
+ t.datetime "hidden_at"
+ t.integer "cached_votes_up", default: 0
+ t.integer "comments_count", default: 0
+ t.integer "confidence_score", default: 0, null: false
+ t.integer "physical_votes", default: 0
+ t.tsvector "tsv"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.integer "heading_id"
+ t.string "responsible_name"
+ end
+
+ add_index "budget_investments", ["administrator_id"], name: "index_budget_investments_on_administrator_id", using: :btree
+ add_index "budget_investments", ["author_id"], name: "index_budget_investments_on_author_id", using: :btree
+ add_index "budget_investments", ["heading_id"], name: "index_budget_investments_on_heading_id", using: :btree
+ add_index "budget_investments", ["tsv"], name: "index_budget_investments_on_tsv", using: :gin
+
+ create_table "budget_valuator_assignments", force: :cascade do |t|
+ t.integer "valuator_id"
+ t.integer "investment_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
+ add_index "budget_valuator_assignments", ["investment_id"], name: "index_budget_valuator_assignments_on_investment_id", using: :btree
+
+ create_table "budgets", force: :cascade do |t|
+ t.string "name", limit: 30
+ t.text "description"
+ t.string "currency_symbol", limit: 10
+ t.string "phase", limit: 15, default: "on_hold"
+ t.boolean "valuating", default: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
create_table "campaigns", force: :cascade do |t|
t.string "name"
t.string "track_id"
@@ -378,6 +463,7 @@ ActiveRecord::Schema.define(version: 20160803154011) do
t.integer "proposals_count", default: 0
t.integer "spending_proposals_count", default: 0
t.string "kind"
+ t.integer "budget/investments_count", default: 0
end
add_index "tags", ["debates_count"], name: "index_tags_on_debates_count", using: :btree
@@ -484,6 +570,7 @@ ActiveRecord::Schema.define(version: 20160803154011) do
t.integer "user_id"
t.string "description"
t.integer "spending_proposals_count", default: 0
+ t.integer "budget_investments_count", default: 0
end
add_index "valuators", ["user_id"], name: "index_valuators_on_user_id", using: :btree
diff --git a/spec/features/proposal_ballots_spec.rb b/spec/features/proposal_ballots_spec.rb
new file mode 100644
index 000000000..0303544d1
--- /dev/null
+++ b/spec/features/proposal_ballots_spec.rb
@@ -0,0 +1,57 @@
+# coding: utf-8
+require 'rails_helper'
+
+feature 'Proposal ballots' do
+
+ scenario 'Banner shows in proposal index' do
+ create_featured_proposals
+
+ visit proposals_path
+ expect(page).to_not have_css("#next-voting")
+ expect(page).to have_css("#featured-proposals")
+
+ create_successfull_proposals
+
+ visit proposals_path
+
+ expect(page).to have_css("#next-voting")
+ expect(page).to_not have_css("#featured-proposals")
+ end
+
+ scenario 'Successfull proposals do not show support buttons in index' do
+ successfull_proposals = create_successfull_proposals
+
+ visit proposals_path
+
+ successfull_proposals.each do |proposal|
+ within("#proposal_#{proposal.id}_votes") do
+ expect(page).to_not have_css(".supports")
+ expect(page).to have_content "This proposal has reached the required supports"
+ end
+ end
+ end
+
+ scenario 'Successfull proposals do not show support buttons in show' do
+ successfull_proposals = create_successfull_proposals
+
+ successfull_proposals.each do |proposal|
+ visit proposal_path(proposal)
+ within("#proposal_#{proposal.id}_votes") do
+ expect(page).to_not have_css(".supports")
+ expect(page).to have_content "This proposal has reached the required supports"
+ end
+ end
+ end
+
+ scenario 'Successfull proposals are listed in the proposal ballots index' do
+ successfull_proposals = create_successfull_proposals
+
+ visit proposal_ballots_path
+
+ successfull_proposals.each do |proposal|
+ expect(page).to have_content(proposal.title)
+ end
+ end
+
+end
+
diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
index af57eb61c..d445ae890 100644
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -192,6 +192,11 @@ module CommonActions
create(:debate, :with_confidence_score, cached_votes_up: 80)]
end
+ def create_successfull_proposals
+ [create(:proposal, title: "Winter is coming", question: "Do you speak it?", cached_votes_up: Proposal.votes_needed_for_success + 100),
+ create(:proposal, title: "Fire and blood", question: "You talking to me?", cached_votes_up: Proposal.votes_needed_for_success + 1)]
+ end
+
def create_archived_proposals
[create(:proposal, title: "This is an expired proposal", created_at: Setting["months_to_archive_proposals"].to_i.months.ago),
create(:proposal, title: "This is an oldest expired proposal", created_at: (Setting["months_to_archive_proposals"].to_i + 2).months.ago)]