From 3b2ed08b54061de324e57b05674d124040b8849a Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Fri, 21 Jul 2017 16:36:42 +0200 Subject: [PATCH 001/765] Add recommended partials. --- app/views/welcome/_recommended.html.erb | 138 ++++++++++++++++++ .../welcome/_recommended_no_image.html.erb | 129 ++++++++++++++++ 2 files changed, 267 insertions(+) create mode 100644 app/views/welcome/_recommended.html.erb create mode 100644 app/views/welcome/_recommended_no_image.html.erb diff --git a/app/views/welcome/_recommended.html.erb b/app/views/welcome/_recommended.html.erb new file mode 100644 index 000000000..3c6e17294 --- /dev/null +++ b/app/views/welcome/_recommended.html.erb @@ -0,0 +1,138 @@ +
+

Recomendaciones que te pueden interesar

+
+
+

Debates recomendados

+
+
+
    +
  • +
    + +
    +
    Titulo debate 1
    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    +
    +
    +
    • + + + + +
+
+
+ + +
+
+
+
+ +
+ +
+

Propuestas recomendadas

+
+
+
    +
  • +
    + +
    +
    Titulo propuesta 1
    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    +
    +
    +
    • + + + +
+
+
+ + +
+
+
+
+ +
+ +
+

Presupuestos recomendados

+
+
+
    +
  • +
    + +
    +
    Titulo presupuesto 1
    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    +
    +
    +
    • + + + +
+
+
+ + +
+
+
+
+ +
diff --git a/app/views/welcome/_recommended_no_image.html.erb b/app/views/welcome/_recommended_no_image.html.erb new file mode 100644 index 000000000..8fc04488c --- /dev/null +++ b/app/views/welcome/_recommended_no_image.html.erb @@ -0,0 +1,129 @@ +
+

Recomendaciones que te pueden interesar

+
+
+

Debates recomendados

+
+
+
    +
  • +
    +
    +
    Titulo debate 1
    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    +
    +
    +
    • + + + + +
+
+
+ + +
+
+
+
+ +
+ +
+

Propuestas recomendadas

+
+
+
    +
  • +
    +
    +
    Titulo propuesta 1
    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    +
    +
    +
    • + + + +
+
+
+ + +
+
+
+
+ +
+ +
+

Presupuestos recomendados

+
+
+
    +
  • +
    +
    +
    Titulo presupuesto 1
    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    +
    +
    +
    • + + + +
+
+
+ + +
+
+
+
+ +
From ff6471982c1a8f58cb301bc8f48871a6017a024f Mon Sep 17 00:00:00 2001 From: taitus Date: Fri, 21 Jul 2017 20:06:33 +0200 Subject: [PATCH 002/765] Add recommended debates, proposals and investement to Home page. --- app/controllers/welcome_controller.rb | 3 - app/helpers/welcome_helper.rb | 11 ++ app/models/user.rb | 18 ++ app/views/proposals/index.html.erb | 14 +- .../welcome/_recommended_no_image.html.erb | 157 ++++++++---------- app/views/welcome/index.html.erb | 2 + config/locales/en/general.yml | 8 + config/locales/es/general.yml | 8 + 8 files changed, 122 insertions(+), 99 deletions(-) create mode 100644 app/helpers/welcome_helper.rb diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index d0c650fa3..5aec4a456 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -4,9 +4,6 @@ class WelcomeController < ApplicationController layout "devise", only: [:welcome, :verification] def index - if current_user - redirect_to :proposals - end end def welcome diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb new file mode 100644 index 000000000..78c01b141 --- /dev/null +++ b/app/helpers/welcome_helper.rb @@ -0,0 +1,11 @@ +module WelcomeHelper + + def active_class(index) + "is-active is-in" if index == 0 + end + + def slide_display(index) + "display: none;" if index > 0 + end + +end diff --git a/app/models/user.rb b/app/models/user.rb index 60536195b..1a26030ea 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -313,6 +313,24 @@ class User < ActiveRecord::Base follows.map{|follow| follow.followable.tags.map(&:name)}.flatten.compact.uniq end + def recommended_debates + Debate.tagged_with(interests, any: true). + where("author_id != ?", self). + order("cached_votes_total DESC").limit(3) + end + + def recommended_proposals + Proposal.tagged_with(interests, any: true). + where("author_id != ?", self). + order("cached_votes_up DESC").limit(3) + end + + def recommended_budget_investments + Budget::Investment.tagged_with(interests, any: true). + where("author_id != ?", self). + order("cached_votes_up DESC").limit(3) + end + private def clean_document_number diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index e1c04c607..5d51ad279 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -16,13 +16,13 @@
<% if @search_terms || @advanced_search_terms %> -

<%= t("shared.search_results") %>

-

- <%= page_entries_info @proposals %> - <% if !@advanced_search_terms %> - <%= t("proposals.index.search_results_html", count: @proposals.size, search_term: @search_terms) %> - <% end %> -

+

<%= t("shared.search_results") %>

+

+ <%= page_entries_info @proposals %> + <% if !@advanced_search_terms %> + <%= t("proposals.index.search_results_html", count: @proposals.size, search_term: @search_terms) %> + <% end %> +

<% elsif @tag_filter %>

<%= t("shared.search_results") %>

diff --git a/app/views/welcome/_recommended_no_image.html.erb b/app/views/welcome/_recommended_no_image.html.erb index 8fc04488c..495bccc5c 100644 --- a/app/views/welcome/_recommended_no_image.html.erb +++ b/app/views/welcome/_recommended_no_image.html.erb @@ -1,128 +1,107 @@

-

Recomendaciones que te pueden interesar

-
+

<%= t("welcome.recommended.title") %>

+ +
-

Debates recomendados

+ +

<%= t("welcome.recommended.debates.title") %>

+
+
    -
  • -
    -
    -
    Titulo debate 1
    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    -
    -
    -
    • + <% current_user.recommended_debates.each_with_index do |debate, index| %> -
  • +
    +
    +
    <%= debate.title %>
    +

    <%= debate.description %>

    + +
    -
- + - + <% end %> + +
+ +
+ +
-
- - -
-
- +
-

Propuestas recomendadas

+ +

<%= t("welcome.recommended.proposals.title") %>

+
-
    -
  • -
    -
    -
    Titulo propuesta 1
    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    -
    -
    -
    • - - + + + <% end %>
+
-
+ +
-
+
+
-
+
+
+ +

<%= t("welcome.recommended.budget_investments.title") %>

-
-

Presupuestos recomendados

-
    -
  • -
    -
    -
    Titulo presupuesto 1
    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua

    -
    -
    -
    • - - + + + <% end %>
+
-
+ +
-
-
+
+ +
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 727ec67b7..a9b2d455c 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -45,3 +45,5 @@
<% end %> + +<%= render "recommended_no_image" %> diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index aea5c65c8..28e294c03 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -713,6 +713,14 @@ en: proposal: description: Open space for citizen proposals about the kind of city we want to live in. title: You propose + recommended: + title: Recommendations that may interest you + debates: + title: Recommended debates + proposals: + title: Recommended proposals + budget_investments: + title: Recommended investments verification: i_dont_have_an_account: I don't have an account i_have_an_account: I already have an account diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 3f21ed55f..47aae4544 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -713,6 +713,14 @@ es: proposal: description: Espacio abierto para propuestas ciudadanas sobre el tipo de ciudad en el que queremos vivir. title: Propones + recommended: + title: Recomendaciones que te pueden interesar + debates: + title: Debates recomendados + proposals: + title: Propuestas recomendados + budget_investments: + title: Presupuestos recomendados verification: i_dont_have_an_account: No tengo cuenta, quiero crear una y verificarla i_have_an_account: Ya tengo una cuenta que quiero verificar From a4e12ea8018c1d286e176d99187cb2a77be41674 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Sat, 22 Jul 2017 00:31:10 +0200 Subject: [PATCH 003/765] Added style to recommended section. Added orbit bullet. For each title of the recommended added truncate horizontal with css. Added link for each recommended. Adjusted for responsive. Passed scss-lint. --- app/assets/stylesheets/layout.scss | 101 +++++++++++ app/assets/stylesheets/mixins.scss | 28 +++ .../welcome/_recommended_no_image.html.erb | 170 +++++++++--------- db/schema.rb | 2 +- 4 files changed, 215 insertions(+), 86 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 7a5705f60..5c4dcb567 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -18,6 +18,7 @@ // 16. Flags // 17. Activity // 18. Banners +// 19. Recommended Section Home // // 01. Global styles @@ -319,6 +320,14 @@ a { background: $brand; } +.truncate-horizontal-text { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + -ms-text-overflow: ellipsis; +} + // 02. Header // ---------- @@ -2128,3 +2137,95 @@ table { text-decoration: none; } } + +// 19. Recommended Section Home +// ----------- +.section-recommended { + padding-top: $line-height * 2; + + h2 { + margin-bottom: $line-height * 2; + } + + .debates, + .proposals, + .budget-investments { + + @include breakpoint(medium) { + margin-bottom: 0; + } + + @include breakpoint(small) { + margin-bottom: $line-height; + } + } + + .card { + + .card-section { + padding: $line-height; + + p { + font-size: rem-calc(15); + } + } + + .orbit { + height: 300px; + + .orbit-wrapper { + max-height: 250px; + overflow: hidden; + position: relative; + } + + .orbit-bullets { + @include orbit-bullets; + width: 100%; + } + } + } + + .card .orbit .orbit-wrapper .truncate { + background: image-url('truncate.png'); + background-repeat: repeat-x; + bottom: 0; + height: 20px; + position: absolute; + width: 100%; + } + + .debates-inner { + border-top: 4px solid $debates; + } + + .proposals-inner { + border-top: 4px solid $proposals; + } + + .budget-investments-inner { + border-top: 4px solid $budget; + } + + .debates-inner, + .proposals-inner, + .budget-investments-inner { + background: #fff; + max-height: 350px; + + @include breakpoint(small) { + max-height: 400px; + } + + h4 { + margin-top: $line-height; + margin-bottom: 0; + font-size: rem-calc(18); + min-height: 50px; + } + + h5 { + font-size: rem-calc(14); + } + } +} diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index 401a2ec81..70f4c179d 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -1,6 +1,7 @@ // Table of Contents // // 01. Logo +// 02. Orbit bullets // // 01. Logo @@ -30,3 +31,30 @@ } } } + + +//02. Orbit bullet +@mixin orbit-bullets { + @include disable-mouse-outline; + position: relative; + margin-top: $orbit-bullet-margin-top; + margin-bottom: $orbit-bullet-margin-bottom; + text-align: center; + + button { + width: $orbit-bullet-diameter; + height: $orbit-bullet-diameter; + margin: $orbit-bullet-margin; + + border-radius: 50%; + background-color: $orbit-bullet-background; + + &:hover { + background-color: $orbit-bullet-background-active; + } + + &.is-active { + background-color: $orbit-bullet-background-active; + } + } +} diff --git a/app/views/welcome/_recommended_no_image.html.erb b/app/views/welcome/_recommended_no_image.html.erb index 495bccc5c..e151c06c0 100644 --- a/app/views/welcome/_recommended_no_image.html.erb +++ b/app/views/welcome/_recommended_no_image.html.erb @@ -1,108 +1,108 @@ -
-

<%= t("welcome.recommended.title") %>

+
+
+

<%= t("welcome.recommended.title") %>

-
-
+
+
-

<%= t("welcome.recommended.debates.title") %>

+

<%= t("welcome.recommended.debates.title") %>

-
-
+
+
+
    + <% current_user.recommended_debates.each_with_index do |debate, index| %> +
  • +
    +
    + <%= link_to debate_path(debate) do %> +
    <%= debate.title %>
    + <% end %> +

    <%= debate.description %>

    +
    +
    +
    • + <% end %> +
+
+
-
    +
- -
- -
- - -
-
+ +
+
-
-
-
+
+
-

<%= t("welcome.recommended.proposals.title") %>

+

<%= t("welcome.recommended.proposals.title") %>

-
-
- -
    +
    +
    +
      + <% current_user.recommended_proposals.each_with_index do |proposal, index| %> +
    • +
      +
      + <%= link_to proposal_path(proposal) do %> +
      <%= proposal.title %>
      + <% end %> +

      <%= proposal.description %>

      +
      +
      +
      • + <% end %> +
    +
    +
    +
- -
- -
- - -
- -
+ +
+
-
-
-
+
+
-

<%= t("welcome.recommended.budget_investments.title") %>

+

<%= t("welcome.recommended.budget_investments.title") %>

-
-
- -
    - <% current_user.recommended_budget_investments.each_with_index do |budget_investment, index| %> - -
  • -
    -
    -
    <%= budget_investment.title %>
    -

    <%= budget_investment.description %>

    - +
    +
    +
      + <% current_user.recommended_budget_investments.each_with_index do |budget_investment, index| %> +
    • +
      +
      + <%= link_to budget_path(budget_investment) do %> +
      <%= budget_investment.title %>
      + <% end %> +

      <%= budget_investment.description %>

      +
      -
    -
    • - + + <% end %> +
+
+
+
- -
- - -
-
-
diff --git a/db/schema.rb b/db/schema.rb index 91a26adeb..f12afd6a6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -919,7 +919,7 @@ ActiveRecord::Schema.define(version: 20170719174326) do t.boolean "email_digest", default: true t.boolean "email_on_direct_message", default: true t.boolean "official_position_badge", default: false - t.datetime "password_changed_at", default: '2017-06-22 11:21:30', null: false + t.datetime "password_changed_at", default: '2017-07-21 18:09:48', null: false t.boolean "created_from_signature", default: false t.integer "failed_email_digests_count", default: 0 t.text "former_users_data_log", default: "" From e82e8f5787176bf2daae41c986febce6d7a86ce4 Mon Sep 17 00:00:00 2001 From: taitus Date: Fri, 21 Jul 2017 22:58:49 +0200 Subject: [PATCH 004/765] Do not show proposals and investments as recommended when already followed --- app/models/user.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 1a26030ea..fb27d9532 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -320,14 +320,18 @@ class User < ActiveRecord::Base end def recommended_proposals + already_followed_proposals_ids = Proposal.joins(:follows).where("follows.user_id = ?", id).pluck(:id) + Proposal.tagged_with(interests, any: true). - where("author_id != ?", self). + where("author_id != ? AND id NOT IN (?)", id, already_followed_proposals_ids). order("cached_votes_up DESC").limit(3) end def recommended_budget_investments + already_followed_investments_ids = Budget::Investment.joins(:follows).where("follows.user_id = ?", id).pluck(:id) + Budget::Investment.tagged_with(interests, any: true). - where("author_id != ?", self). + where("author_id != ? AND id NOT IN (?)", id, already_followed_investments_ids). order("cached_votes_up DESC").limit(3) end From 36c76996e3c70c78fa6c4d8bdc3f56561aed0458 Mon Sep 17 00:00:00 2001 From: taitus Date: Fri, 21 Jul 2017 23:28:04 +0200 Subject: [PATCH 005/765] Display proposals and debates recommended when user have not interests. --- app/models/user.rb | 23 ++++++++++++++----- .../welcome/_recommended_no_image.html.erb | 12 +++++----- app/views/welcome/index.html.erb | 6 ++++- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index fb27d9532..973d46d2f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -321,18 +321,29 @@ class User < ActiveRecord::Base def recommended_proposals already_followed_proposals_ids = Proposal.joins(:follows).where("follows.user_id = ?", id).pluck(:id) + proposals_list = [] - Proposal.tagged_with(interests, any: true). - where("author_id != ? AND id NOT IN (?)", id, already_followed_proposals_ids). - order("cached_votes_up DESC").limit(3) + if already_followed_proposals_ids.any? + proposals_list = Proposal.tagged_with(interests, any: true). + where("author_id != ? AND id NOT IN (?)", id, already_followed_proposals_ids) + else + proposals_list = Proposal.where("author_id != ?", id) + end + + proposals_list.order("cached_votes_up DESC").limit(3) end def recommended_budget_investments already_followed_investments_ids = Budget::Investment.joins(:follows).where("follows.user_id = ?", id).pluck(:id) + investments_list = [] + if already_followed_investments_ids.any? + investments_list = Budget::Investment.tagged_with(interests, any: true). + where("author_id != ? AND id NOT IN (?)", id, already_followed_investments_ids) + else + investments_list = Budget::Investment.where("author_id != ?", id) + end - Budget::Investment.tagged_with(interests, any: true). - where("author_id != ? AND id NOT IN (?)", id, already_followed_investments_ids). - order("cached_votes_up DESC").limit(3) + investments_list.order("cached_votes_up DESC").limit(3) end private diff --git a/app/views/welcome/_recommended_no_image.html.erb b/app/views/welcome/_recommended_no_image.html.erb index e151c06c0..5bf08cc44 100644 --- a/app/views/welcome/_recommended_no_image.html.erb +++ b/app/views/welcome/_recommended_no_image.html.erb @@ -10,7 +10,7 @@
    - <% current_user.recommended_debates.each_with_index do |debate, index| %> + <% recommended_debates.each_with_index do |debate, index| %>
  • @@ -27,7 +27,7 @@
    - <%= render partial: 'proposals/proposal', collection: @proposals %> + <% if @proposals.any? %> + <%= render partial: 'proposals/proposal', collection: @proposals %> + <% else %> + <%= empty_recommended_proposals_message_text(current_user) %> + <% end %> <%= paginate @proposals %>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index c6adeb22b..7937c06bf 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -109,6 +109,9 @@ en: most_commented: most commented relevance: relevance recommendations: recommendations + recommendations: + without_results: There are not debates related to your interests + without_interests: Follow proposals so we can give you recommendations search_form: button: Search placeholder: Search debates... @@ -331,6 +334,9 @@ en: relevance: relevance archival_date: Archived recommendations: recommendations + recommendations: + without_results: There are not proposals related to your interests + without_interests: Follow proposals so we can give you recommendations retired_proposals: Retired proposals retired_proposals_link: "Proposals retired by the author" retired_links: diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index fb9167087..0c8b69057 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -109,6 +109,9 @@ es: most_commented: Más comentados relevance: Más relevantes recommendations: Recomendaciones + recommendations: + without_results: No existen debates relacionados con tus intereses + without_interests: Sigue propuestas para que podamos darte recomendaciones search_form: button: Buscar placeholder: Buscar debates... @@ -330,7 +333,10 @@ es: most_commented: Más comentadas relevance: Más relevantes archival_date: Archivadas - recommendations: Recomendaciones + recommendations: Recomendaciones + recommendations: + without_results: No existen propuestas relacionadas con tus intereses + without_interests: Sigue propuestas para que podamos darte recomendaciones retired_proposals: Propuestas retiradas retired_proposals_link: "Propuestas retiradas por sus autores" retired_links: diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb index f5cde8d7d..e418d5100 100644 --- a/spec/features/debates_spec.rb +++ b/spec/features/debates_spec.rb @@ -371,6 +371,28 @@ feature 'Debates' do expect(page).not_to have_selector('a', text: 'recommendations') end + scenario 'Should display text when there are not recommendeds results', :js do + user = create(:user) + proposal = create(:proposal, tag_list: "Distinct_to_sport") + create(:follow, followable: proposal, user: user) + login_as(user) + visit debates_path + + click_link 'recommendations' + + expect(page).to have_content "There are not debates related to your interests" + end + + scenario 'Should display text when user has not related interests', :js do + user = create(:user) + login_as(user) + visit debates_path + + click_link 'recommendations' + + expect(page).to have_content "Follow proposals so we can give you recommendations" + end + scenario 'Debates are ordered by recommendations when there is a user logged', :js do proposal = create(:proposal, tag_list: "Sport" ) user = create(:user) diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 7aeb20c1c..353bcfecb 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -632,11 +632,11 @@ feature 'Proposals' do context 'Recommendations' do - background do + before do Setting['feature.user.recommendations'] = true - create(:proposal, title: 'Best', cached_votes_up: 10) - create(:proposal, title: 'Medium', cached_votes_up: 5) - create(:proposal, title: 'Worst', cached_votes_up: 1) + create(:proposal, title: 'Best', cached_votes_up: 10, tag_list: "Sport") + create(:proposal, title: 'Medium', cached_votes_up: 5, tag_list: "Sport") + create(:proposal, title: 'Worst', cached_votes_up: 1, tag_list: "Sport") end after do @@ -649,8 +649,32 @@ feature 'Proposals' do expect(page).not_to have_selector('a', text: 'recommendations') end + scenario 'Should display text when there are not recommendeds results', :js do + user = create(:user) + proposal = create(:proposal, tag_list: "Distinct_to_sport") + create(:follow, followable: proposal, user: user) + login_as(user) + visit proposals_path + + click_link 'recommendations' + + expect(page).to have_content "There are not proposals related to your interests" + end + + scenario 'Should display text when user has not related interests', :js do + user = create(:user) + login_as(user) + visit proposals_path + + click_link 'recommendations' + + expect(page).to have_content "Follow proposals so we can give you recommendations" + end + scenario 'Proposals are ordered by recommendations when there is an user logged', :js do user = create(:user) + proposal = create(:proposal, tag_list: "Sport") + create(:follow, followable: proposal, user: user) login_as(user) visit proposals_path @@ -659,7 +683,7 @@ feature 'Proposals' do expect(page).to have_selector('a.active', text: 'recommendations') - within '#proposals' do + within '#proposals-list' do expect('Best').to appear_before('Medium') expect('Medium').to appear_before('Worst') end From fda2d8202fd3167b0e916d935b73aae892aa60eb Mon Sep 17 00:00:00 2001 From: taitus Date: Fri, 4 Aug 2017 14:18:20 +0200 Subject: [PATCH 036/765] Do not display empty recommended text when user is not logged --- app/views/debates/index.html.erb | 2 +- app/views/proposals/index.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb index 816225b9e..eddcccd21 100644 --- a/app/views/debates/index.html.erb +++ b/app/views/debates/index.html.erb @@ -54,7 +54,7 @@ <%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button expanded' %>
- <% if @debates.any? %> + <% if @debates.any? || current_user.blank? %> <%= render @debates %> <% else %> <%= empty_recommended_debates_message_text(current_user) %> diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index a9f1c3975..10b2ee382 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -66,7 +66,7 @@
- <% if @proposals.any? %> + <% if @proposals.any? || current_user.blank? %> <%= render partial: 'proposals/proposal', collection: @proposals %> <% else %> <%= empty_recommended_proposals_message_text(current_user) %> From 5ddeff217a915b99d746faaf69298df2abe2a5fb Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 5 Sep 2017 14:31:51 +0200 Subject: [PATCH 037/765] fixes css syntax error --- app/assets/stylesheets/layout.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 920d37323..2170387df 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -2282,6 +2282,7 @@ table { margin: 0 auto; } } +} // 20. Documents .document-form form { @@ -2403,4 +2404,4 @@ table { } } -} +} \ No newline at end of file From b4a6f664bb3adebe69a5124857083f9e380d9136 Mon Sep 17 00:00:00 2001 From: taitus Date: Tue, 5 Sep 2017 18:51:19 +0200 Subject: [PATCH 038/765] Remove image by default on carousel. Remove duplicate code. Add background when user recomendations is actived --- app/helpers/welcome_helper.rb | 4 ++ app/views/welcome/_recommended.html.erb | 4 +- app/views/welcome/index.html.erb | 65 ++++++++----------------- 3 files changed, 25 insertions(+), 48 deletions(-) diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index fcc70250f..76ae62d81 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -55,4 +55,8 @@ module WelcomeHelper end end + def highlight_background + (feature?("user.recommendations") && current_user) ? "highlight" : "" + end + end diff --git a/app/views/welcome/_recommended.html.erb b/app/views/welcome/_recommended.html.erb index 99de4ec17..3c0088448 100644 --- a/app/views/welcome/_recommended.html.erb +++ b/app/views/welcome/_recommended.html.erb @@ -9,7 +9,7 @@ key: "debates", image_field: nil, image_version: nil, - image_default: "https://dummyimage.com/600x400/000/fff", + image_default: nil, carousel_size: carousel_size, btn_text_link: t("welcome.recommended.debates.btn_text_link"), btn_path_link: debates_path(order: "recommendations") %> @@ -21,7 +21,7 @@ key: "proposals", image_field: nil, image_version: nil, - image_default: "https://dummyimage.com/600x400/000/fff", + image_default: nil, carousel_size: carousel_size, btn_text_link: t("welcome.recommended.proposals.btn_text_link"), btn_path_link: proposals_path(order: "recommendations") %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 2291c2f2f..0ea0f748d 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -26,54 +26,27 @@ <% cache [locale_and_user_status, @featured_debates, @featured_proposals, 'featured'] do %>
- -
-
-

<%= t("welcome.debates.title") %>

-

<%= t("welcome.debates.description") %>

-
-
-

<%= t("welcome.proposal.title") %>

-

<%= t("welcome.proposal.description") %>

-
-
-

<%= t("welcome.decide.title") %>

-

<%= t("welcome.decide.description") %>

-
-
-

<%= t("welcome.do.title") %>

-

<%= t("welcome.do.description") %>

+ +
+
+
+

<%= t("welcome.debates.title") %>

+

<%= t("welcome.debates.description") %>

+
+
+

<%= t("welcome.proposal.title") %>

+

<%= t("welcome.proposal.description") %>

+
+
+

<%= t("welcome.decide.title") %>

+

<%= t("welcome.decide.description") %>

+
+
+

<%= t("welcome.do.title") %>

+

<%= t("welcome.do.description") %>

+
-
-
-

- <%= t("welcome.debates.title") %>
- <%= t("welcome.debates.description") %> -

-
-
-

- <%= t("welcome.proposal.title") %>
- <%= t("welcome.proposal.description") %> -

-
-
- -
-
-

- <%= t("welcome.decide.title") %>
- <%= t("welcome.decide.description") %> -

-
-
-

- <%= t("welcome.do.title") %>
- <%= t("welcome.do.description") %> -

-
-
<% end %> From ea4d46f786396bbae20f6d12961c0a8706c06ece Mon Sep 17 00:00:00 2001 From: taitus Date: Wed, 6 Sep 2017 11:28:27 +0200 Subject: [PATCH 039/765] Fix specs --- spec/features/budgets/investments_spec.rb | 2 ++ spec/features/proposals_spec.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index ef2c1bf5b..4040717f1 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -340,6 +340,8 @@ feature 'Budget Investments' do end scenario 'Can not access the community' do + Setting['feature.community'] = false + investment = create(:budget_investment, heading: heading) visit budget_investment_path(budget_id: budget.id, id: investment.id) expect(page).not_to have_content "Access the community" diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index b7492e19c..e7d000f94 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -101,6 +101,8 @@ feature 'Proposals' do end scenario 'Can not access the community' do + Setting['feature.community'] = false + proposal = create(:proposal) visit proposal_path(proposal) expect(page).not_to have_content "Access the community" From bc218531b051dd35e59655264d6cc25722343f35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 13 Sep 2017 12:31:42 +0200 Subject: [PATCH 040/765] Proposals phase migration --- ...3101029_add_proposals_phase_to_legislation_processes.rb | 7 +++++++ db/schema.rb | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20170913101029_add_proposals_phase_to_legislation_processes.rb diff --git a/db/migrate/20170913101029_add_proposals_phase_to_legislation_processes.rb b/db/migrate/20170913101029_add_proposals_phase_to_legislation_processes.rb new file mode 100644 index 000000000..b3ecfe3f1 --- /dev/null +++ b/db/migrate/20170913101029_add_proposals_phase_to_legislation_processes.rb @@ -0,0 +1,7 @@ +class AddProposalsPhaseToLegislationProcesses < ActiveRecord::Migration + def change + add_column :legislation_processes, :proposals_phase_start_date, :date + add_column :legislation_processes, :proposals_phase_end_date, :date + add_column :legislation_processes, :proposals_phase_enabled, :boolean + end +end diff --git a/db/schema.rb b/db/schema.rb index ba856107c..578a0bc25 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: 20170908175149) do +ActiveRecord::Schema.define(version: 20170913101029) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -470,6 +470,9 @@ ActiveRecord::Schema.define(version: 20170908175149) do t.boolean "draft_publication_enabled", default: false t.boolean "result_publication_enabled", default: false t.boolean "published", default: true + t.date "proposals_phase_start_date" + t.date "proposals_phase_end_date" + t.boolean "proposals_phase_enabled" end add_index "legislation_processes", ["allegations_end_date"], name: "index_legislation_processes_on_allegations_end_date", using: :btree From dc9fe973f49f7c4a9c7d57b06190a3bea4a7c5b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 13 Sep 2017 12:33:16 +0200 Subject: [PATCH 041/765] Added proposals phase attributes to legislation processes form Also added them to the list of accepted params and completed translations. --- .../admin/legislation/processes_controller.rb | 3 ++ app/models/legislation/process.rb | 6 +++- .../legislation/processes/_form.html.erb | 33 +++++++++++++++++++ config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 1 + 5 files changed, 43 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/legislation/processes_controller.rb b/app/controllers/admin/legislation/processes_controller.rb index 5d8d828cd..da27f9955 100644 --- a/app/controllers/admin/legislation/processes_controller.rb +++ b/app/controllers/admin/legislation/processes_controller.rb @@ -47,9 +47,12 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll :draft_publication_date, :allegations_start_date, :allegations_end_date, + :proposals_phase_start_date, + :proposals_phase_end_date, :result_publication_date, :debate_phase_enabled, :allegations_phase_enabled, + :proposals_phase_enabled, :draft_publication_enabled, :result_publication_enabled, :published diff --git a/app/models/legislation/process.rb b/app/models/legislation/process.rb index b6043df57..0f596b8f8 100644 --- a/app/models/legislation/process.rb +++ b/app/models/legislation/process.rb @@ -2,7 +2,7 @@ class Legislation::Process < ActiveRecord::Base acts_as_paranoid column: :hidden_at include ActsAsParanoidAliases - PHASES_AND_PUBLICATIONS = %i(debate_phase allegations_phase draft_publication result_publication).freeze + PHASES_AND_PUBLICATIONS = %i(debate_phase allegations_phase proposals_phase draft_publication result_publication).freeze has_many :draft_versions, -> { order(:id) }, class_name: 'Legislation::DraftVersion', foreign_key: 'legislation_process_id', dependent: :destroy @@ -33,6 +33,10 @@ class Legislation::Process < ActiveRecord::Base Legislation::Process::Phase.new(allegations_start_date, allegations_end_date, allegations_phase_enabled) end + def proposals_phase + Legislation::Process::Phase.new(proposals_phase_start_date, proposals_phase_end_date, proposals_phase_enabled) + end + def draft_publication Legislation::Process::Publication.new(draft_publication_date, draft_publication_enabled) end diff --git a/app/views/admin/legislation/processes/_form.html.erb b/app/views/admin/legislation/processes/_form.html.erb index 205d97361..ed034544b 100644 --- a/app/views/admin/legislation/processes/_form.html.erb +++ b/app/views/admin/legislation/processes/_form.html.erb @@ -114,6 +114,39 @@
+
+
+ +
+
+ <%= t('admin.legislation.processes.form.start') %> +
+
+ <%= f.text_field :proposals_phase_start_date, + label: false, + value: format_date_for_calendar_form(@process.proposals_phase_start_date), + class: "js-calendar-full", + id: "proposals_phase_start_date" %> +
+
+ <%= t('admin.legislation.processes.form.end') %> +
+
+ <%= f.text_field :proposals_phase_end_date, + label: false, + value: format_date_for_calendar_form(@process.proposals_phase_end_date), + class: "js-calendar-full", + id: "proposals_phase_end_date" %> +
+
+ <%= f.check_box :proposals_phase_enabled, checked: @process.proposals_phase.enabled?, label: t('admin.legislation.processes.form.enabled') %> +
+ +
+
+
+
+
<%= f.label :draft_publication_date %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 3f1b12189..3793b75a8 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -258,6 +258,7 @@ en: process: Process debate_phase: Debate phase allegations_phase: Allegations phase + proposals_phase: Proposals phase start: Start end: End use_markdown: Use Markdown to format the text diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 9872baa0d..27262845d 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -258,6 +258,7 @@ es: process: Proceso debate_phase: Fase previa allegations_phase: Fase de alegaciones + proposals_phase: Fase de propuestas start: Inicio end: Fin use_markdown: Usa Markdown para formatear el texto From f521a9023b39ec08fa2c5cdffd997be10a98fb9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 13 Sep 2017 15:43:36 +0200 Subject: [PATCH 042/765] Added Proposal model to Legislation This new Legislation::Proposal model inherits from the original Proposal, as it will behave in a very similar way. --- app/controllers/admin/legislation/proposals_controller.rb | 7 +++++++ app/models/legislation/process.rb | 1 + app/models/legislation/proposal.rb | 8 ++++++++ config/routes.rb | 5 +++-- 4 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 app/controllers/admin/legislation/proposals_controller.rb create mode 100644 app/models/legislation/proposal.rb diff --git a/app/controllers/admin/legislation/proposals_controller.rb b/app/controllers/admin/legislation/proposals_controller.rb new file mode 100644 index 000000000..7f4441bce --- /dev/null +++ b/app/controllers/admin/legislation/proposals_controller.rb @@ -0,0 +1,7 @@ +class Admin::Legislation::ProposalsController < Admin::Legislation::BaseController + load_and_authorize_resource :process, class: "Legislation::Process" + load_and_authorize_resource :proposal, class: "Legislation::Proposal", through: :process + + def index + end +end diff --git a/app/models/legislation/process.rb b/app/models/legislation/process.rb index 0f596b8f8..6a37aeef2 100644 --- a/app/models/legislation/process.rb +++ b/app/models/legislation/process.rb @@ -9,6 +9,7 @@ class Legislation::Process < ActiveRecord::Base has_one :final_draft_version, -> { where final_version: true, status: 'published' }, class_name: 'Legislation::DraftVersion', foreign_key: 'legislation_process_id' has_many :questions, -> { order(:id) }, class_name: 'Legislation::Question', foreign_key: 'legislation_process_id', dependent: :destroy + has_many :proposals, -> { order(:id) }, class_name: 'Legislation::Proposal', foreign_key: 'legislation_process_id', dependent: :destroy validates :title, presence: true validates :start_date, presence: true diff --git a/app/models/legislation/proposal.rb b/app/models/legislation/proposal.rb new file mode 100644 index 000000000..2c187d302 --- /dev/null +++ b/app/models/legislation/proposal.rb @@ -0,0 +1,8 @@ +class Legislation::Proposal < Proposal + acts_as_paranoid column: :hidden_at + include ActsAsParanoidAliases + + belongs_to :process, class_name: 'Legislation::Process', foreign_key: 'legislation_process_id' + + scope :sorted, -> { order('id ASC') } +end diff --git a/config/routes.rb b/config/routes.rb index a41e8d429..f0276f290 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -287,11 +287,11 @@ Rails.application.routes.draw do end resources :booths do - get :available, on: :collection + get :available, on: :collection resources :shifts do get :search_officers, on: :collection - end + end end resources :questions @@ -313,6 +313,7 @@ Rails.application.routes.draw do namespace :legislation do resources :processes do resources :questions + resources :proposals resources :draft_versions end end From c811fd46f07c678a8077e031f291d1bd89b24abf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 13 Sep 2017 15:48:07 +0200 Subject: [PATCH 043/765] Proposals description migration and form - Added to legislation processes a new attribute called `proposals_description`. - Then created new views to show a form for the `@process` to edit this attribute **from in the proposals section**. - Completed translations for new views. --- .../admin/legislation/processes_controller.rb | 5 +-- .../legislation/processes/_subnav.html.erb | 5 ++- .../legislation/proposals/_form.html.erb | 36 +++++++++++++++++++ .../legislation/proposals/index.html.erb | 16 +++++++++ config/locales/en/admin.yml | 9 +++++ config/locales/es/admin.yml | 9 +++++ ...ls_description_to_legislation_processes.rb | 5 +++ db/schema.rb | 3 +- 8 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 app/views/admin/legislation/proposals/_form.html.erb create mode 100644 app/views/admin/legislation/proposals/index.html.erb create mode 100644 db/migrate/20170913130803_add_proposals_description_to_legislation_processes.rb diff --git a/app/controllers/admin/legislation/processes_controller.rb b/app/controllers/admin/legislation/processes_controller.rb index da27f9955..f316d9b65 100644 --- a/app/controllers/admin/legislation/processes_controller.rb +++ b/app/controllers/admin/legislation/processes_controller.rb @@ -20,7 +20,7 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll def update if @process.update(process_params) link = legislation_process_path(@process).html_safe - redirect_to edit_admin_legislation_process_path(@process), notice: t('admin.legislation.processes.update.notice', link: link) + redirect_to :back, notice: t('admin.legislation.processes.update.notice', link: link) else flash.now[:error] = t('admin.legislation.processes.update.error') render :edit @@ -55,7 +55,8 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll :proposals_phase_enabled, :draft_publication_enabled, :result_publication_enabled, - :published + :published, + :proposals_description ) end end diff --git a/app/views/admin/legislation/processes/_subnav.html.erb b/app/views/admin/legislation/processes/_subnav.html.erb index 97640c4f4..56b668641 100644 --- a/app/views/admin/legislation/processes/_subnav.html.erb +++ b/app/views/admin/legislation/processes/_subnav.html.erb @@ -2,9 +2,12 @@
  • > <%= link_to t("admin.legislation.processes.subnav.info"), edit_admin_legislation_process_path(process) %>
    • -
  • > +
  • > <%= link_to t("admin.legislation.processes.subnav.questions"), admin_legislation_process_questions_path(process) %>
    • +
  • > + <%= link_to t("admin.legislation.processes.subnav.proposals"), admin_legislation_process_proposals_path(process) %> +
  • > <%= link_to t("admin.legislation.processes.subnav.draft_texts"), admin_legislation_process_draft_versions_path(process) %>
    • diff --git a/app/views/admin/legislation/proposals/_form.html.erb b/app/views/admin/legislation/proposals/_form.html.erb new file mode 100644 index 000000000..30f7f4950 --- /dev/null +++ b/app/views/admin/legislation/proposals/_form.html.erb @@ -0,0 +1,36 @@ +<%= form_for [:admin, @process], html: {data: {watch_changes: true}} do |f| %> + + <% if @process.errors.any? %> + +
    + + + + <%= @process.errors.count %> + <%= t("admin.legislation.processes.errors.form.error", count: @process.errors.count) %> + +
    + + <% end %> + +
    +
    + <%= label_tag t('admin.legislation.proposals.form.header_information') %> + <%= t('admin.legislation.proposals.form.header_information_description') %> +
    +
    + <%= f.text_area :proposals_description, + label: false, + rows: 5, + placeholder: t('admin.legislation.proposals.form.header_information_placeholder') %> +
    +
    + +
    +
    + <%= f.submit(class: "button expanded", value: t("admin.legislation.processes.#{admin_submit_action(@process)}.submit_button")) %> +
    +
    +<% end %> diff --git a/app/views/admin/legislation/proposals/index.html.erb b/app/views/admin/legislation/proposals/index.html.erb new file mode 100644 index 000000000..162f3c8dd --- /dev/null +++ b/app/views/admin/legislation/proposals/index.html.erb @@ -0,0 +1,16 @@ +<% provide :title do %> + Admin - <%= t("admin.menu.legislation") %> - <%= @process.title %> - <%= t("admin.legislation.proposals.index.title") %> +<% end %> + +
    +
    + <%= back_link_to admin_legislation_processes_path, t("admin.legislation.proposals.index.back") %> + +

    <%= @process.title %>

    + + <%= render 'admin/legislation/processes/subnav', process: @process, active: 'proposals' %> + + <%= render "form" %> + +
    +
    diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 3793b75a8..275d628e5 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -291,6 +291,15 @@ en: info: Information draft_texts: Text questions: Debate + proposals: Proposals + proposals: + index: + title: Proposals + back: Back + form: + header_information: Information header + header_information_description: Provide information about the proposals. This text will be displayed as an alert in the Proposals section inside this Process. Use Markdown to format the text. + header_information_placeholder: Add information for the proposals' header draft_versions: create: notice: 'Draft created successfully. Click to visit' diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 27262845d..54ab2ce8f 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -291,6 +291,15 @@ es: info: Información draft_texts: Texto questions: Debate + proposals: Propuestas + proposals: + index: + title: Propuestas + back: Volver + form: + header_information: Encabezado de información + header_information_description: Proporciona información sobre el recorrido de las propuestas. Este texto se mostrará como una alerta en el encabezado de la sección de Propuestas dentro de este proceso. Usa Markdown para formatear el texto. + header_information_placeholder: Añade información para el encabezado de las las propuestas draft_versions: create: notice: 'Borrador creado correctamente. Haz click para verlo' diff --git a/db/migrate/20170913130803_add_proposals_description_to_legislation_processes.rb b/db/migrate/20170913130803_add_proposals_description_to_legislation_processes.rb new file mode 100644 index 000000000..d5e4f9c5d --- /dev/null +++ b/db/migrate/20170913130803_add_proposals_description_to_legislation_processes.rb @@ -0,0 +1,5 @@ +class AddProposalsDescriptionToLegislationProcesses < ActiveRecord::Migration + def change + add_column :legislation_processes, :proposals_description, :text + end +end diff --git a/db/schema.rb b/db/schema.rb index 578a0bc25..5b84833a7 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: 20170913101029) do +ActiveRecord::Schema.define(version: 20170913130803) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -473,6 +473,7 @@ ActiveRecord::Schema.define(version: 20170913101029) do t.date "proposals_phase_start_date" t.date "proposals_phase_end_date" t.boolean "proposals_phase_enabled" + t.text "proposals_description" end add_index "legislation_processes", ["allegations_end_date"], name: "index_legislation_processes_on_allegations_end_date", using: :btree From fb44a931df25c90b964b94b3c51b2e8ad8dbbf59 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 13 Sep 2017 17:45:56 +0200 Subject: [PATCH 044/765] fixes legislation key dates with new proposal dates --- app/assets/stylesheets/legislation_process.scss | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/legislation_process.scss b/app/assets/stylesheets/legislation_process.scss index 2ec9f8ee9..f31d02ef6 100644 --- a/app/assets/stylesheets/legislation_process.scss +++ b/app/assets/stylesheets/legislation_process.scss @@ -109,16 +109,13 @@ $border-dark: darken($border, 10%); li { cursor: pointer; display: inline-block; - margin: 0 1rem 1rem 0; + margin-bottom: $line-height; + margin-right: $line-height; transition: all 0.4s; border-bottom: 2px solid transparent; @include breakpoint(medium) { - margin-left: $line-height * 2; - } - - &:first-of-type { - margin-left: 0; + margin-bottom: 0; } &:hover, From 929e81a878246ea55144ef365b1976e8117ff0a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 14 Sep 2017 12:49:13 +0200 Subject: [PATCH 045/765] Added proposals phase to key dates --- .../legislation/processes/_key_dates.html.erb | 17 +++++++++++++---- .../legislation/processes/_process.html.erb | 7 +++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app/views/legislation/processes/_key_dates.html.erb b/app/views/legislation/processes/_key_dates.html.erb index f1198c2e3..0bc95bef5 100644 --- a/app/views/legislation/processes/_key_dates.html.erb +++ b/app/views/legislation/processes/_key_dates.html.erb @@ -6,7 +6,7 @@
      <% if process.debate_phase.enabled? %> -
    • > +
    • > <%= link_to debate_legislation_process_path(process) do %>

      <%= t('legislation.processes.shared.debate_dates') %>

      <%= format_date(process.debate_start_date) %> - <%= format_date(process.debate_end_date) %>

      @@ -14,8 +14,17 @@
      • <% end %> + <% if process.proposals_phase.enabled? %> +
    • > + <%= link_to proposals_legislation_process_path(process) do %> +

      <%= t('legislation.processes.shared.proposals_dates') %>

      +

      <%= format_date(process.proposals_phase_start_date) %> - <%= format_date(process.proposals_phase_end_date) %>

      + <% end %> +
      • + <% end %> + <% if process.draft_publication.enabled? %> -
    • > +
    • > <%= link_to draft_publication_legislation_process_path(process) do %>

      <%= t('legislation.processes.shared.draft_publication_date') %>

      <%= format_date(process.draft_publication_date) %>

      @@ -24,7 +33,7 @@ <% end %> <% if process.allegations_phase.enabled? %> -
    • > +
    • > <%= link_to allegations_legislation_process_path(process) do %>

      <%= t('legislation.processes.shared.allegations_dates') %>

      <%= format_date(process.allegations_start_date) %> - <%= format_date(process.allegations_end_date) %>

      @@ -33,7 +42,7 @@ <% end %> <% if process.result_publication.enabled? %> -
    • > +
    • > <%= link_to result_publication_legislation_process_path(process) do %>

      <%= t('legislation.processes.shared.result_publication_date') %>

      <%= format_date(process.result_publication_date) %>

      diff --git a/app/views/legislation/processes/_process.html.erb b/app/views/legislation/processes/_process.html.erb index d5e44076a..a41fdbe4a 100644 --- a/app/views/legislation/processes/_process.html.erb +++ b/app/views/legislation/processes/_process.html.erb @@ -40,6 +40,13 @@
    <% end %> + <% if process.proposals_phase.enabled? %> +
    +
    <%= t('legislation.processes.shared.proposals_dates') %>
    +

    <%= format_date(process.proposals_phase_start_date) %> - <%= format_date(process.proposals_phase_end_date) %>

    +
    + <% end %> + <% if process.allegations_phase.enabled? %>
    <%= t('legislation.processes.shared.allegations_dates') %>
    From 335399e571b8a0ae451737c8d4f8526e3db88ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 14 Sep 2017 12:50:48 +0200 Subject: [PATCH 046/765] Created Legislation Proposals model --- app/models/legislation/process.rb | 1 + app/models/legislation/proposal.rb | 191 +++++++++++++++++- ...0914102634_create_legislation_proposals.rb | 32 +++ db/schema.rb | 33 ++- 4 files changed, 253 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20170914102634_create_legislation_proposals.rb diff --git a/app/models/legislation/process.rb b/app/models/legislation/process.rb index 6a37aeef2..7e1e884cb 100644 --- a/app/models/legislation/process.rb +++ b/app/models/legislation/process.rb @@ -18,6 +18,7 @@ class Legislation::Process < ActiveRecord::Base validates :debate_end_date, presence: true, if: :debate_start_date? validates :allegations_start_date, presence: true, if: :allegations_end_date? validates :allegations_end_date, presence: true, if: :allegations_start_date? + validates :proposals_phase_end_date, presence: true, if: :proposals_phase_start_date? validate :valid_date_ranges scope :open, -> { where("start_date <= ? and end_date >= ?", Date.current, Date.current).order('id DESC') } diff --git a/app/models/legislation/proposal.rb b/app/models/legislation/proposal.rb index 2c187d302..1eb82e70a 100644 --- a/app/models/legislation/proposal.rb +++ b/app/models/legislation/proposal.rb @@ -1,8 +1,193 @@ -class Legislation::Proposal < Proposal - acts_as_paranoid column: :hidden_at +class Legislation::Proposal < ActiveRecord::Base include ActsAsParanoidAliases + include Flaggable + include Taggable + include Conflictable + include Measurable + include Sanitizable + include Searchable + include Filterable + include HasPublicAuthor + include Graphqlable + include Followable + include Communitable + include Documentable + + documentable max_documents_allowed: 3, + max_file_size: 3.megabytes, + accepted_content_types: [ "application/pdf" ] + accepts_nested_attributes_for :documents, allow_destroy: true + + acts_as_votable + acts_as_paranoid column: :hidden_at + + RETIRE_OPTIONS = %w(duplicated started unfeasible done other) belongs_to :process, class_name: 'Legislation::Process', foreign_key: 'legislation_process_id' + belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' + belongs_to :geozone + has_many :comments, as: :commentable + has_many :proposal_notifications - scope :sorted, -> { order('id ASC') } + validates :title, presence: true + validates :question, presence: true + validates :summary, presence: true + validates :author, presence: true + validates :responsible_name, presence: true + + validates :title, length: { in: 4..Legislation::Proposal.title_max_length } + validates :description, length: { maximum: Legislation::Proposal.description_max_length } + validates :question, length: { in: 10..Legislation::Proposal.question_max_length } + validates :responsible_name, length: { in: 6..Legislation::Proposal.responsible_name_max_length } + validates :retired_reason, inclusion: {in: RETIRE_OPTIONS, allow_nil: true} + + validates :terms_of_service, acceptance: { allow_nil: false }, on: :create + + before_validation :set_responsible_name + + before_save :calculate_hot_score, :calculate_confidence_score + + scope :for_render, -> { includes(:tags) } + scope :sort_by_hot_score, -> { reorder(hot_score: :desc) } + scope :sort_by_confidence_score, -> { reorder(confidence_score: :desc) } + scope :sort_by_created_at, -> { reorder(created_at: :desc) } + scope :sort_by_most_commented, -> { reorder(comments_count: :desc) } + scope :sort_by_random, -> { reorder("RANDOM()") } + scope :sort_by_relevance, -> { all } + scope :sort_by_flags, -> { order(flags_count: :desc, updated_at: :desc) } + scope :sort_by_archival_date, -> { archived.sort_by_confidence_score } + scope :archived, -> { where("proposals.created_at <= ?", Setting["months_to_archive_proposals"].to_i.months.ago) } + scope :not_archived, -> { where("proposals.created_at > ?", Setting["months_to_archive_proposals"].to_i.months.ago) } + scope :last_week, -> { where("proposals.created_at >= ?", 7.days.ago)} + scope :retired, -> { where.not(retired_at: nil) } + scope :not_retired, -> { where(retired_at: nil) } + scope :successful, -> { where("cached_votes_up >= ?", Legislation::Proposal.votes_needed_for_success) } + scope :public_for_api, -> { all } + + def to_param + "#{id}-#{title}".parameterize + end + + def searchable_values + { title => 'A', + question => 'B', + author.username => 'B', + tag_list.join(' ') => 'B', + geozone.try(:name) => 'B', + summary => 'C', + description => 'D' + } + end + + def self.search(terms) + by_code = search_by_code(terms.strip) + by_code.present? ? by_code : pg_search(terms) + end + + def self.search_by_code(terms) + matched_code = match_code(terms) + results = where(id: matched_code[1]) if matched_code + return results if (results.present? && results.first.code == terms) + end + + def self.match_code(terms) + /\A#{Setting["proposal_code_prefix"]}-\d\d\d\d-\d\d-(\d*)\z/.match(terms) + end + + def self.for_summary + summary = {} + categories = ActsAsTaggableOn::Tag.category_names.sort + geozones = Geozone.names.sort + + groups = categories + geozones + groups.each do |group| + summary[group] = search(group).last_week.sort_by_confidence_score.limit(3) + end + summary + end + + def total_votes + cached_votes_up + end + + def voters + User.active.where(id: votes_for.voters) + end + + def editable? + total_votes <= Setting["max_votes_for_proposal_edit"].to_i + end + + def editable_by?(user) + author_id == user.id && editable? + end + + def votable_by?(user) + user && user.level_two_or_three_verified? + end + + def retired? + retired_at.present? + end + + def register_vote(user, vote_value) + if votable_by?(user) && !archived? + vote_by(voter: user, vote: vote_value) + end + end + + def code + "#{Setting['proposal_code_prefix']}-#{created_at.strftime('%Y-%m')}-#{id}" + end + + def after_commented + save # updates the hot_score because there is a before_save + end + + def calculate_hot_score + self.hot_score = ScoreCalculator.hot_score(created_at, + total_votes, + total_votes, + comments_count) + end + + def calculate_confidence_score + self.confidence_score = ScoreCalculator.confidence_score(total_votes, total_votes) + end + + def after_hide + tags.each{ |t| t.decrement_custom_counter_for('Proposal') } + end + + def after_restore + tags.each{ |t| t.increment_custom_counter_for('Proposal') } + end + + def self.votes_needed_for_success + Setting['votes_for_proposal_success'].to_i + end + + def successful? + total_votes >= Legislation::Proposal.votes_needed_for_success + end + + def archived? + created_at <= Setting["months_to_archive_proposals"].to_i.months.ago + end + + def notifications + proposal_notifications + end + + def users_to_notify + (voters + followers).uniq + end + + protected + + def set_responsible_name + if author && author.document_number? + self.responsible_name = author.document_number + end + end end diff --git a/db/migrate/20170914102634_create_legislation_proposals.rb b/db/migrate/20170914102634_create_legislation_proposals.rb new file mode 100644 index 000000000..defe9f1dd --- /dev/null +++ b/db/migrate/20170914102634_create_legislation_proposals.rb @@ -0,0 +1,32 @@ +class CreateLegislationProposals < ActiveRecord::Migration + def change + create_table :legislation_proposals do |t| + t.references :legislation_process, index: true, foreign_key: true + t.string :title, limit: 80 + t.text :description + t.string :question + t.string :external_url + t.integer :author_id + t.datetime :hidden_at + t.integer :flags_count, default: 0 + t.datetime :ignored_flag_at + t.integer :cached_votes_up, default: 0 + t.integer :comments_count, default: 0 + t.datetime :confirmed_hide_at + t.integer :hot_score, limit: 8, default: 0 + t.integer :confidence_score, default: 0 + t.string :responsible_name, limit: 60 + t.text :summary + t.string :video_url + t.tsvector :tsv + t.integer :geozone_id + t.datetime :retired_at + t.string :retired_reason + t.text :retired_explanation + t.integer :community_id + + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 5b84833a7..8a33adfc8 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: 20170913130803) do +ActiveRecord::Schema.define(version: 20170914102634) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -486,6 +486,36 @@ ActiveRecord::Schema.define(version: 20170913130803) do add_index "legislation_processes", ["result_publication_date"], name: "index_legislation_processes_on_result_publication_date", using: :btree add_index "legislation_processes", ["start_date"], name: "index_legislation_processes_on_start_date", using: :btree + create_table "legislation_proposals", force: :cascade do |t| + t.integer "legislation_process_id" + t.string "title", limit: 80 + t.text "description" + t.string "question" + t.string "external_url" + t.integer "author_id" + t.datetime "hidden_at" + t.integer "flags_count", default: 0 + t.datetime "ignored_flag_at" + t.integer "cached_votes_up", default: 0 + t.integer "comments_count", default: 0 + t.datetime "confirmed_hide_at" + t.integer "hot_score", limit: 8, default: 0 + t.integer "confidence_score", default: 0 + t.string "responsible_name", limit: 60 + t.text "summary" + t.string "video_url" + t.tsvector "tsv" + t.integer "geozone_id" + t.datetime "retired_at" + t.string "retired_reason" + t.text "retired_explanation" + t.integer "community_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_index "legislation_proposals", ["legislation_process_id"], name: "index_legislation_proposals_on_legislation_process_id", using: :btree + create_table "legislation_question_options", force: :cascade do |t| t.integer "legislation_question_id" t.string "value" @@ -1083,6 +1113,7 @@ ActiveRecord::Schema.define(version: 20170913130803) do add_foreign_key "geozones_polls", "polls" add_foreign_key "identities", "users" add_foreign_key "legislation_draft_versions", "legislation_processes" + add_foreign_key "legislation_proposals", "legislation_processes" add_foreign_key "locks", "users" add_foreign_key "managers", "users" add_foreign_key "moderators", "users" From 0245605f19be78bc42faae19bef0c4f548499d0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 14 Sep 2017 12:51:36 +0200 Subject: [PATCH 047/765] Added Legislation Proposals controller --- .../legislation/processes_controller.rb | 13 ++ .../legislation/proposals_controller.rb | 131 ++++++++++++++++++ config/routes.rb | 17 +++ 3 files changed, 161 insertions(+) create mode 100644 app/controllers/legislation/proposals_controller.rb diff --git a/app/controllers/legislation/processes_controller.rb b/app/controllers/legislation/processes_controller.rb index 588ffdf9e..6c12cea5b 100644 --- a/app/controllers/legislation/processes_controller.rb +++ b/app/controllers/legislation/processes_controller.rb @@ -14,6 +14,8 @@ class Legislation::ProcessesController < Legislation::BaseController redirect_to legislation_process_draft_version_path(@process, draft_version) elsif @process.debate_phase.enabled? redirect_to debate_legislation_process_path(@process) + elsif @process.proposals_phase.enabled? + redirect_to proposals_legislation_process_path(@process) else redirect_to allegations_legislation_process_path(@process) end @@ -81,6 +83,17 @@ class Legislation::ProcessesController < Legislation::BaseController end end + def proposals + set_process + @phase = :proposals_phase + + if @process.proposals_phase.started? + render :proposals + else + render :phase_not_open + end + end + private def member_method? diff --git a/app/controllers/legislation/proposals_controller.rb b/app/controllers/legislation/proposals_controller.rb new file mode 100644 index 000000000..a275a061d --- /dev/null +++ b/app/controllers/legislation/proposals_controller.rb @@ -0,0 +1,131 @@ +class Legislation::ProposalsController < ApplicationController + include CommentableActions + include FlagActions + + load_and_authorize_resource :process + load_and_authorize_resource :proposal, through: :process + + before_action :parse_tag_filter, only: :index + before_action :load_categories, only: [:index, :new, :create, :edit, :map, :summary] + before_action :load_geozones, only: [:edit, :map, :summary] + before_action :authenticate_user!, except: [:index, :show, :map, :summary] + + invisible_captcha only: [:create, :update], honeypot: :subtitle + + has_orders %w{hot_score confidence_score created_at relevance archival_date}, only: :index + has_orders %w{most_voted newest oldest}, only: :show + + load_and_authorize_resource + helper_method :resource_model, :resource_name + respond_to :html, :js + + def show + super + @notifications = @proposal.notifications + @document = Document.new(documentable: @proposal) + redirect_to proposal_path(@proposal), status: :moved_permanently if request.path != proposal_path(@proposal) + end + + def create + @proposal = Legislation::Proposal.new(proposal_params.merge(author: current_user)) + recover_documents_from_cache(@proposal) + + if @proposal.save + redirect_to share_proposal_path(@proposal), notice: I18n.t('flash.actions.create.proposal') + else + render :new + end + end + + def index_customization + discard_archived + load_retired + load_successful_proposals + load_featured unless @proposal_successful_exists + end + + def vote + @proposal.register_vote(current_user, 'yes') + set_proposal_votes(@proposal) + end + + def retire + if valid_retired_params? && @proposal.update(retired_params.merge(retired_at: Time.current)) + redirect_to proposal_path(@proposal), notice: t('proposals.notice.retired') + else + render action: :retire_form + end + end + + def retire_form + end + + def share + if Setting['proposal_improvement_path'].present? + @proposal_improvement_path = Setting['proposal_improvement_path'] + end + end + + def vote_featured + @proposal.register_vote(current_user, 'yes') + set_featured_proposal_votes(@proposal) + end + + def summary + @proposals = Legislation::Proposal.for_summary + @tag_cloud = tag_cloud + end + + private + + def proposal_params + params.require(:proposal).permit(:legislation_process_id, :title, :question, :summary, :description, :external_url, :video_url, + :responsible_name, :tag_list, :terms_of_service, :geozone_id, + documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id] ) + end + + def retired_params + params.require(:proposal).permit(:retired_reason, :retired_explanation) + end + + def valid_retired_params? + @proposal.errors.add(:retired_reason, I18n.t('errors.messages.blank')) if params[:proposal][:retired_reason].blank? + @proposal.errors.add(:retired_explanation, I18n.t('errors.messages.blank')) if params[:proposal][:retired_explanation].blank? + @proposal.errors.empty? + end + + def resource_model + Legislation::Proposal + end + + def set_featured_proposal_votes(proposals) + @featured_proposals_votes = current_user ? current_user.proposal_votes(proposals) : {} + end + + def discard_archived + @resources = @resources.not_archived unless @current_order == "archival_date" + end + + def load_retired + if params[:retired].present? + @resources = @resources.retired + @resources = @resources.where(retired_reason: params[:retired]) if Legislation::Proposal::RETIRE_OPTIONS.include?(params[:retired]) + else + @resources = @resources.not_retired + end + end + + def load_featured + return unless !@advanced_search_terms && @search_terms.blank? && @tag_filter.blank? && params[:retired].blank? + @featured_proposals = Legislation::Proposal.not_archived.sort_by_confidence_score.limit(3) + if @featured_proposals.present? + set_featured_proposal_votes(@featured_proposals) + @resources = @resources.where('proposals.id NOT IN (?)', @featured_proposals.map(&:id)) + end + end + + def load_successful_proposals + @proposal_successful_exists = Legislation::Proposal.successful.exists? + end + +end diff --git a/config/routes.rb b/config/routes.rb index f0276f290..e2ccb51ed 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -124,10 +124,27 @@ Rails.application.routes.draw do get :draft_publication get :allegations get :result_publication + get :proposals end resources :questions, only: [:show] do resources :answers, only: [:create] end + resources :proposals do + member do + post :vote + post :vote_featured + put :flag + put :unflag + get :retire_form + get :share + patch :retire + end + collection do + get :map + get :suggest + get :summary + end + end resources :draft_versions, only: [:show] do get :go_to_version, on: :collection get :changes From 0ed6b0da6b1b714c64fa1c9bcbd526b8e5b98f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 14 Sep 2017 12:52:03 +0200 Subject: [PATCH 048/765] Added Legislation Proposals views --- .../legislation/processes/proposals.html.erb | 29 +++ .../legislation/proposals/_actions.html.erb | 10 + .../proposals/_categories.html.erb | 12 ++ .../legislation/proposals/_comments.html.erb | 24 +++ .../proposals/_featured_proposal.html.erb | 27 +++ .../proposals/_featured_votes.html.erb | 44 +++++ .../proposals/_filter_subnav.html.erb | 30 +++ .../proposals/_flag_actions.html.erb | 21 ++ .../legislation/proposals/_form.html.erb | 103 ++++++++++ .../legislation/proposals/_geozones.html.erb | 6 + .../proposals/_notifications.html.erb | 17 ++ .../legislation/proposals/_popular.html.erb | 6 + .../legislation/proposals/_proposal.html.erb | 81 ++++++++ .../proposals/_refresh_flag_actions.js.erb | 1 + .../legislation/proposals/_retired.html.erb | 13 ++ .../legislation/proposals/_votes.html.erb | 66 +++++++ app/views/legislation/proposals/edit.html.erb | 14 ++ .../legislation/proposals/index.html.erb | 102 ++++++++++ app/views/legislation/proposals/map.html.erb | 1 + app/views/legislation/proposals/new.html.erb | 24 +++ .../proposals/retire_form.html.erb | 38 ++++ .../legislation/proposals/share.html.erb | 51 +++++ app/views/legislation/proposals/show.html.erb | 183 ++++++++++++++++++ .../legislation/proposals/suggest.js.erb | 1 + .../legislation/proposals/summary.html.erb | 53 +++++ app/views/legislation/proposals/vote.js.erb | 1 + .../proposals/vote_featured.js.erb | 1 + config/locales/es/legislation.yml | 1 + 28 files changed, 960 insertions(+) create mode 100644 app/views/legislation/processes/proposals.html.erb create mode 100644 app/views/legislation/proposals/_actions.html.erb create mode 100644 app/views/legislation/proposals/_categories.html.erb create mode 100644 app/views/legislation/proposals/_comments.html.erb create mode 100644 app/views/legislation/proposals/_featured_proposal.html.erb create mode 100644 app/views/legislation/proposals/_featured_votes.html.erb create mode 100644 app/views/legislation/proposals/_filter_subnav.html.erb create mode 100644 app/views/legislation/proposals/_flag_actions.html.erb create mode 100644 app/views/legislation/proposals/_form.html.erb create mode 100644 app/views/legislation/proposals/_geozones.html.erb create mode 100644 app/views/legislation/proposals/_notifications.html.erb create mode 100644 app/views/legislation/proposals/_popular.html.erb create mode 100644 app/views/legislation/proposals/_proposal.html.erb create mode 100644 app/views/legislation/proposals/_refresh_flag_actions.js.erb create mode 100644 app/views/legislation/proposals/_retired.html.erb create mode 100644 app/views/legislation/proposals/_votes.html.erb create mode 100644 app/views/legislation/proposals/edit.html.erb create mode 100644 app/views/legislation/proposals/index.html.erb create mode 100644 app/views/legislation/proposals/map.html.erb create mode 100644 app/views/legislation/proposals/new.html.erb create mode 100644 app/views/legislation/proposals/retire_form.html.erb create mode 100644 app/views/legislation/proposals/share.html.erb create mode 100644 app/views/legislation/proposals/show.html.erb create mode 100644 app/views/legislation/proposals/suggest.js.erb create mode 100644 app/views/legislation/proposals/summary.html.erb create mode 100644 app/views/legislation/proposals/vote.js.erb create mode 100644 app/views/legislation/proposals/vote_featured.js.erb diff --git a/app/views/legislation/processes/proposals.html.erb b/app/views/legislation/processes/proposals.html.erb new file mode 100644 index 000000000..9e54ba46e --- /dev/null +++ b/app/views/legislation/processes/proposals.html.erb @@ -0,0 +1,29 @@ +<% provide :title do %><%= @process.title %><% end %> + +<%= render 'legislation/processes/header', process: @process, header: :full %> + +<%= render 'key_dates', process: @process, phase: :proposals %> + +
    +
    +
    +
    +
    + <% if @process.proposals.empty? %> +
    +

    <%= t('.empty_questions') %>

    +
    + <% else %> + <%= render @process.proposals %> + <% end %> +
    +
    + +
    +
    +

    <%= t('.participate') %>

    +
    +
    +
    +
    +
    diff --git a/app/views/legislation/proposals/_actions.html.erb b/app/views/legislation/proposals/_actions.html.erb new file mode 100644 index 000000000..b2bc9f111 --- /dev/null +++ b/app/views/legislation/proposals/_actions.html.erb @@ -0,0 +1,10 @@ +<% if can? :hide, proposal %> + <%= link_to t("admin.actions.hide").capitalize, hide_moderation_proposal_path(proposal), + method: :put, remote: true, data: { confirm: t('admin.actions.confirm') } %> +<% end %> + +<% if can? :hide, proposal.author %> +  |  + <%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(proposal.author_id), + method: :put, data: { confirm: t('admin.actions.confirm') } %> +<% end %> diff --git a/app/views/legislation/proposals/_categories.html.erb b/app/views/legislation/proposals/_categories.html.erb new file mode 100644 index 000000000..a694eb555 --- /dev/null +++ b/app/views/legislation/proposals/_categories.html.erb @@ -0,0 +1,12 @@ +
    +

    <%= t("shared.tags_cloud.categories") %>

    +
    + +
      + <% @categories.each do |category| %> +
    • + <% css_class = { class: 'active' } if params[:search] == category.name %> + <%= link_to category.name, proposals_path(search: category.name), css_class || {} %> +
      • + <% end %> +
    diff --git a/app/views/legislation/proposals/_comments.html.erb b/app/views/legislation/proposals/_comments.html.erb new file mode 100644 index 000000000..c304bc4dd --- /dev/null +++ b/app/views/legislation/proposals/_comments.html.erb @@ -0,0 +1,24 @@ +<% cache [locale_and_user_status, @current_order, commentable_cache_key(@proposal), @comment_tree.comments, @comment_tree.comment_authors, @proposal.comments_count, @comment_flags] do %> +
    +
    + <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %> + + <% if user_signed_in? %> + <%= render 'comments/form', {commentable: @proposal, parent_id: nil, toggeable: false} %> + <% else %> +
    + +
    + <%= t("proposals.show.login_to_comment", + signin: link_to(t("votes.signin"), new_user_session_path), + signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %> +
    + <% end %> + + <% @comment_tree.root_comments.each do |comment| %> + <%= render 'comments/comment', comment: comment %> + <% end %> + <%= paginate @comment_tree.root_comments %> +
    +
    +<% end %> diff --git a/app/views/legislation/proposals/_featured_proposal.html.erb b/app/views/legislation/proposals/_featured_proposal.html.erb new file mode 100644 index 000000000..5500b2418 --- /dev/null +++ b/app/views/legislation/proposals/_featured_proposal.html.erb @@ -0,0 +1,27 @@ + diff --git a/app/views/legislation/proposals/_featured_votes.html.erb b/app/views/legislation/proposals/_featured_votes.html.erb new file mode 100644 index 000000000..3177812a4 --- /dev/null +++ b/app/views/legislation/proposals/_featured_votes.html.erb @@ -0,0 +1,44 @@ +
    +
    + <% if voted_for?(@featured_proposals_votes, proposal) %> +
    + <%= t("proposals.proposal.already_supported") %> +
    + <% else %> + <%= link_to vote_featured_proposal_path(proposal, value: 'yes'), + class: "button button-support small expanded", + title: t('proposals.proposal.support_title'), method: "post", remote: true do %> + <%= t("proposals.proposal.support") %> + <% end %> + <% end %> +
    + + <% if user_signed_in? && current_user.organization? %> + + <% elsif user_signed_in? && !proposal.votable_by?(current_user)%> + + <% elsif !user_signed_in? %> + + <% end %> + + <% if voted_for?(@featured_proposals_votes, proposal) %> + <% if setting['twitter_handle'] %> + + <% end %> + <% end %> +
    diff --git a/app/views/legislation/proposals/_filter_subnav.html.erb b/app/views/legislation/proposals/_filter_subnav.html.erb new file mode 100644 index 000000000..fece62a17 --- /dev/null +++ b/app/views/legislation/proposals/_filter_subnav.html.erb @@ -0,0 +1,30 @@ +
    +
    +
      +
    • + <%= link_to "#tab-comments" do %> +

      + <%= t("proposals.show.comments_tab") %> + (<%= @proposal.comments_count %>) +

      + <% end %> +
      • +
    • + <%= link_to "#tab-notifications" do %> +

      + <%= t("proposals.show.notifications_tab") %> + (<%= @notifications.count %>) +

      + <% end %> +
      • +
    • + <%= link_to "#tab-documents" do %> +

      + <%= t("documents.tab") %> + (<%= @proposal.documents.count %>) +

      + <% end %> +
      • +
    +
    +
    diff --git a/app/views/legislation/proposals/_flag_actions.html.erb b/app/views/legislation/proposals/_flag_actions.html.erb new file mode 100644 index 000000000..3e776de66 --- /dev/null +++ b/app/views/legislation/proposals/_flag_actions.html.erb @@ -0,0 +1,21 @@ + + + <% if show_flag_action? proposal %> + + + + + <%= link_to t('shared.flag'), flag_proposal_path(proposal), method: :put, remote: true, id: "flag-proposal-#{ proposal.id }" %> + + <% end %> + + <% if show_unflag_action? proposal %> + + + + + <%= link_to t('shared.unflag'), unflag_proposal_path(proposal), method: :put, remote: true, id: "unflag-proposal-#{ proposal.id }" %> + + <% end %> + + diff --git a/app/views/legislation/proposals/_form.html.erb b/app/views/legislation/proposals/_form.html.erb new file mode 100644 index 000000000..73b39dfdb --- /dev/null +++ b/app/views/legislation/proposals/_form.html.erb @@ -0,0 +1,103 @@ +<%= form_for(@proposal, url: form_url) do |f| %> + <%= render 'shared/errors', resource: @proposal %> + +
    +
    + <%= f.label :title, t("proposals.form.proposal_title") %> + <%= f.text_field :title, maxlength: Proposal.title_max_length, placeholder: t("proposals.form.proposal_title"), label: false, data: {js_suggest_result: "js_suggest_result", js_suggest: "#js-suggest", js_url: suggest_proposals_path}%> +
    +
    + + <%= f.invisible_captcha :subtitle %> + +
    + <%= f.label :question, t("proposals.form.proposal_question") %> +

    + <%= t("proposals.form.proposal_question_example_html") %> +

    + <%= f.text_field :question, maxlength: Proposal.question_max_length, + placeholder: t("proposals.form.proposal_question"), + label: false, + aria: {describedby: "question-help-text"} %> +
    + +
    + <%= f.label :summary, t("proposals.form.proposal_summary") %> +

    <%= t("proposals.form.proposal_summary_note") %>

    + <%= f.text_area :summary, rows: 4, maxlength: 200, label: false, + placeholder: t('proposals.form.proposal_summary'), + aria: {describedby: "summary-help-text"} %> +
    + +
    + <%= f.label :description, t("proposals.form.proposal_text") %> + <%= f.cktext_area :description, maxlength: Proposal.description_max_length, ckeditor: { language: I18n.locale }, label: false %> +
    + +
    + <%= f.label :video_url, t("proposals.form.proposal_video_url") %> +

    <%= t("proposals.form.proposal_video_url_note") %>

    + <%= f.text_field :video_url, placeholder: t("proposals.form.proposal_video_url"), label: false, + aria: {describedby: "video-url-help-text"} %> +
    + +
    + <%= f.label :external_url, t("proposals.form.proposal_external_url") %> + <%= f.text_field :external_url, placeholder: t("proposals.form.proposal_external_url"), label: false %> +
    + +
    + <%= render 'documents/nested_documents', documentable: @proposal %> +
    + +
    + <%= f.label :geozone_id, t("proposals.form.geozone") %> + <%= f.select :geozone_id, geozone_select_options, {include_blank: t("geozones.none"), label: false} %> +
    + +
    + <%= f.label :tag_list, t("proposals.form.tags_label") %> +

    <%= t("proposals.form.tags_instructions") %>

    + +
    + <%= f.label :category_tag_list, t("proposals.form.tag_category_label") %> + <% @categories.each do |tag| %> + <%= tag.name %> + <% end %> +
    + +
    + <%= f.text_field :tag_list, value: @proposal.tag_list.to_s, + label: false, + placeholder: t("proposals.form.tags_placeholder"), + class: 'js-tag-list', + aria: {describedby: "tag-list-help-text"} %> +
    + + <% if current_user.unverified? %> +
    + <%= f.label :responsible_name, t("proposals.form.proposal_responsible_name") %> +

    <%= t("proposals.form.proposal_responsible_name_note") %>

    + <%= f.text_field :responsible_name, placeholder: t("proposals.form.proposal_responsible_name"), label: false, + aria: {describedby: "responsible-name-help-text"} %> +
    + <% end %> + +
    + <% if @proposal.new_record? %> + <%= f.label :terms_of_service do %> + <%= f.check_box :terms_of_service, title: t('form.accept_terms_title'), label: false %> + + <%= t("form.accept_terms", + policy: link_to(t("form.policy"), "/privacy", target: "blank"), + conditions: link_to(t("form.conditions"), "/conditions", target: "blank")).html_safe %> + + <% end %> + <% end %> +
    + +
    + <%= f.submit(class: "button", value: t("proposals.#{action_name}.form.submit_button")) %> +
    +
    +<% end %> diff --git a/app/views/legislation/proposals/_geozones.html.erb b/app/views/legislation/proposals/_geozones.html.erb new file mode 100644 index 000000000..7e4dbcaa4 --- /dev/null +++ b/app/views/legislation/proposals/_geozones.html.erb @@ -0,0 +1,6 @@ +
    +

    <%= t("shared.tags_cloud.districts") %>

    +
    +<%= link_to map_proposals_path, id: 'map', title: t("shared.tags_cloud.districts_list") do %> + <%= image_tag("map.jpg", alt: t("shared.tags_cloud.districts_list")) %> +<% end %> diff --git a/app/views/legislation/proposals/_notifications.html.erb b/app/views/legislation/proposals/_notifications.html.erb new file mode 100644 index 000000000..69389b2c5 --- /dev/null +++ b/app/views/legislation/proposals/_notifications.html.erb @@ -0,0 +1,17 @@ +
    +
    +
    + <% if @notifications.blank? %> +
    + <%= t('proposals.show.no_notifications') %> +
    + <% end %> + + <% @notifications.each do |notification| %> +

    <%= notification.title %>

    +

    <%= notification.created_at.to_date %>

    +

    <%= notification.body %>

    + <% end %> +
    +
    +
    diff --git a/app/views/legislation/proposals/_popular.html.erb b/app/views/legislation/proposals/_popular.html.erb new file mode 100644 index 000000000..7f46ea802 --- /dev/null +++ b/app/views/legislation/proposals/_popular.html.erb @@ -0,0 +1,6 @@ +
    +

    <%= t("proposals.index.top") %>

    + +

    + <%= link_to t("proposals.index.top_link_proposals"), summary_proposals_path, class: "small" %>
    +

    diff --git a/app/views/legislation/proposals/_proposal.html.erb b/app/views/legislation/proposals/_proposal.html.erb new file mode 100644 index 000000000..c269146ab --- /dev/null +++ b/app/views/legislation/proposals/_proposal.html.erb @@ -0,0 +1,81 @@ +
    Proposal.votes_needed_for_success) %>" + data-type="proposal"> +
    +
    +
    + +
    +
    + <% cache [locale_and_user_status(proposal), 'index', proposal, proposal.author] do %> +

    <%= link_to proposal.title, namespaced_proposal_path(proposal) %>

    +

    +   + <%= link_to t("proposals.proposal.comments", count: proposal.comments_count), namespaced_proposal_path(proposal, anchor: "comments") %> + +  •  + <%= l proposal.created_at.to_date %> + + <% if proposal.author.hidden? || proposal.author.erased? %> +  •  + + <%= t("proposals.show.author_deleted") %> + + <% else %> +  •  + + <%= proposal.author.name %> + + <% if proposal.author.display_official_position_badge? %> +  •  + + <%= proposal.author.official_position %> + + <% end %> + <% end %> + + <% if proposal.author.verified_organization? %> +  •  + + <%= t("shared.collective") %> + + <% end %> +

    +
    +

    <%= proposal.summary %>

    +
    +
    + <%= render "shared/tags", taggable: proposal, limit: 5 %> + <% end %> +
    +
    + +
    + <% if proposal.successful? %> +
    + +

    + <%= t("proposals.proposal.successful", + voting: link_to(t("proposals.proposal.voting"), polls_path)).html_safe %> +

    +
    + <% if can? :create, Poll::Question %> +

    + <%= link_to t('poll_questions.create_question'), + new_admin_question_path(proposal_id: proposal.id), + class: "button hollow" %> +

    + <% end %> + <% 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 %> +
    +
    +
    +
    diff --git a/app/views/legislation/proposals/_refresh_flag_actions.js.erb b/app/views/legislation/proposals/_refresh_flag_actions.js.erb new file mode 100644 index 000000000..0e20636ae --- /dev/null +++ b/app/views/legislation/proposals/_refresh_flag_actions.js.erb @@ -0,0 +1 @@ +$("#<%= dom_id(@proposal) %> .js-flag-actions").html('<%= j render("proposals/flag_actions", proposal: @proposal) %>'); diff --git a/app/views/legislation/proposals/_retired.html.erb b/app/views/legislation/proposals/_retired.html.erb new file mode 100644 index 000000000..2167b14af --- /dev/null +++ b/app/views/legislation/proposals/_retired.html.erb @@ -0,0 +1,13 @@ +
    +

    <%= t("proposals.index.retired_proposals") %>

    + +<% if params[:retired].blank? %> +

    <%= link_to t("proposals.index.retired_proposals_link"), proposals_path(retired: 'all'), class: "small" %>

    +<% else %> +
    + <%= link_to t("proposals.index.retired_links.all"), proposals_path(retired: 'all') %> + <% Proposal::RETIRE_OPTIONS.each do |option| %> + <%= link_to t("proposals.index.retired_links.#{option}"), proposals_path(retired: option) %> + <% end %> +
    +<% end %> diff --git a/app/views/legislation/proposals/_votes.html.erb b/app/views/legislation/proposals/_votes.html.erb new file mode 100644 index 000000000..fb41357af --- /dev/null +++ b/app/views/legislation/proposals/_votes.html.erb @@ -0,0 +1,66 @@ +
    +
    + + + <%= supports_percentage(proposal) %> / <%= t("proposals.proposal.total_percent") %> + +
    + + + <%= t("proposals.proposal.supports", count: proposal.total_votes) %>  + + "> + <%= t("proposals.proposal.supports_necessary", number: number_with_delimiter(Proposal.votes_needed_for_success)) %> + + + + +
    + <% if voted_for?(@proposal_votes, proposal) %> +
    + <%= t("proposals.proposal.already_supported") %> +
    + <% elsif user_signed_in? && proposal.votable_by?(current_user) %> + <%= link_to vote_url, + class: "button button-support small expanded", + title: t('proposals.proposal.support_title'), method: "post", remote: true do %> + <%= t("proposals.proposal.support") %> + <% end %> + <% else %> +
    + <%= t("proposals.proposal.support") %> +
    + <% end %> +
    + + <% if user_signed_in? && current_user.organization? %> + + <% elsif user_signed_in? && !proposal.votable_by?(current_user) %> +
    + +
    + <% elsif !user_signed_in? %> +
    + +
    + <% end %> + + <% if voted_for?(@proposal_votes, proposal) && setting['twitter_handle'] %> + + <% end %> +
    diff --git a/app/views/legislation/proposals/edit.html.erb b/app/views/legislation/proposals/edit.html.erb new file mode 100644 index 000000000..6e5b14a08 --- /dev/null +++ b/app/views/legislation/proposals/edit.html.erb @@ -0,0 +1,14 @@ +
    + +
    + <%= back_link_to %> + +
    + <%= link_to t("proposals.edit.show_link"), @proposal %> +
    + +

    <%= t("proposals.edit.editing") %>

    + + <%= render "form", form_url: proposal_url(@proposal) %> +
    +
    diff --git a/app/views/legislation/proposals/index.html.erb b/app/views/legislation/proposals/index.html.erb new file mode 100644 index 000000000..69a8df4a3 --- /dev/null +++ b/app/views/legislation/proposals/index.html.erb @@ -0,0 +1,102 @@ +<% provide :title do %><%= t('proposals.index.title') %><% end %> +<% content_for :header_addon do %> + <%= render "shared/search_form", + search_path: proposals_path(page: 1), + i18n_namespace: "proposals.index.search_form" %> +<% end %> +<% content_for :canonical do %> + <%= render "shared/canonical", href: proposals_url %> +<% end %> + +
    + <% if @search_terms || @advanced_search_terms || @tag_filter || params[:retired].present? %> +
    +
    +
    + <% if @search_terms || @advanced_search_terms %> +

    <%= t("shared.search_results") %>

    +

    + <%= page_entries_info @proposals %> + <% if !@advanced_search_terms %> + <%= t("proposals.index.search_results_html", count: @proposals.size, search_term: @search_terms) %> + <% end %> +

    + <% elsif @tag_filter %> +

    <%= t("shared.search_results") %>

    +

    + <%= page_entries_info @proposals %> + <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %> +

    + <% elsif params[:retired].present? %> +

    <%= t("proposals.index.retired_proposals") %>

    + <% end %> +
    +
    +
    + <% else %> + <%= render "shared/section_header", i18n_namespace: "proposals.index.section_header", image: "proposals" %> + <% end %> + +
    +
    + + <% if has_banners? %> + <%= render "shared/banner" %> + <% end %> + + <% if @featured_proposals.present? %> + + <% end %> + + <%= render("shared/advanced_search", search_path: proposals_path(page: 1)) unless params[:retired].present? %> + + <%= render 'shared/order_links', i18n_namespace: "proposals.index" %> + + <% if @proposals.any? %> +
    + <%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button expanded' %> +
    + <% end %> + +
    + <%= render partial: 'proposals/proposal', collection: @proposals %> + <%= paginate @proposals %> + + <% unless @search_terms || @advanced_search_terms || @tag_filter %> +
    +

    + <%= t("proposals.index.section_footer.title") %> +

    +

    <%= t("proposals.index.section_footer.help_text_1") %>

    +

    <%= t("proposals.index.section_footer.help_text_2", + org: link_to(setting['org_name'], new_user_registration_path)).html_safe %>

    +

    <%= t("proposals.index.section_footer.help_text_3") %>

    +
    + <% end %> +
    +
    + +
    + +
    + +
    +
    diff --git a/app/views/legislation/proposals/map.html.erb b/app/views/legislation/proposals/map.html.erb new file mode 100644 index 000000000..84c7721f2 --- /dev/null +++ b/app/views/legislation/proposals/map.html.erb @@ -0,0 +1 @@ +<%= render 'shared/map', new_url_path: new_proposal_path %> diff --git a/app/views/legislation/proposals/new.html.erb b/app/views/legislation/proposals/new.html.erb new file mode 100644 index 000000000..95249e36e --- /dev/null +++ b/app/views/legislation/proposals/new.html.erb @@ -0,0 +1,24 @@ +
    + +
    + <%= back_link_to %> + +

    <%= t("proposals.new.start_new") %>

    +
    + <%= link_to more_info_path(anchor: "proposals") ,title: t('shared.target_blank_html'), target: "_blank" do %> + <%= t("proposals.new.more_info")%> + <% end %> +
    + <%= render "proposals/form", form_url: proposals_url %> +
    + +
    + +

    <%= t("proposals.new.recommendations_title") %>

    +
      +
    • <%= t("proposals.new.recommendation_one") %>
      • +
    • <%= t("proposals.new.recommendation_two") %>
      • +
    • <%= t("proposals.new.recommendation_three") %>
      • +
    +
    +
    diff --git a/app/views/legislation/proposals/retire_form.html.erb b/app/views/legislation/proposals/retire_form.html.erb new file mode 100644 index 000000000..d56277cb3 --- /dev/null +++ b/app/views/legislation/proposals/retire_form.html.erb @@ -0,0 +1,38 @@ +
    + +
    + +

    <%= t("proposals.retire_form.title") %>

    + +

    <%= link_to @proposal.title, @proposal %>

    + +
    + <%= t("proposals.retire_form.warning") %> +
    + + <%= form_for(@proposal, url: retire_proposal_path(@proposal)) do |f| %> + <%= render 'shared/errors', resource: @proposal %> +
    +
    + <%= f.label :retired_reason, t("proposals.retire_form.retired_reason_label") %> + <%= f.select :retired_reason, retire_proposals_options, {include_blank: t("proposals.retire_form.retired_reason_blank"), label: false} %> +
    +
    + +
    +
    + <%= f.label :retired_explanation, t("proposals.retire_form.retired_explanation_label") %> + <%= f.text_area :retired_explanation, rows: 4, maxlength: 500, label: false, + placeholder: t('proposals.retire_form.retired_explanation_placeholder') %> +
    +
    + +
    +
    + <%= f.submit(class: "button expanded", value: t("proposals.retire_form.submit_button")) %> +
    +
    + <% end %> + +
    +
    \ No newline at end of file diff --git a/app/views/legislation/proposals/share.html.erb b/app/views/legislation/proposals/share.html.erb new file mode 100644 index 000000000..f86882401 --- /dev/null +++ b/app/views/legislation/proposals/share.html.erb @@ -0,0 +1,51 @@ +<% provide :title do %><%= @proposal.title %><% end %> +<% provide :social_media_meta_tags do %> +<%= render "shared/social_media_meta_tags", + social_url: proposal_url(@proposal), + social_title: @proposal.title, + social_description: @proposal.summary %> +<% end %> +<% content_for :canonical do %> + <%= render "shared/canonical", href: proposal_url(@proposal) %> +<% end %> + +<% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @proposal_votes] do %> +
    +
    +
    + +

    <%= t("proposals.proposal.created") %>

    + +

    + <%= t("proposals.proposal.share.guide") %>
    + <%= t("proposals.proposal.share.edit") %> +

    + + <%= render partial: 'shared/social_share', locals: { + title: @proposal.title, + url: proposal_url(@proposal) + } %> + + <% if @proposal_improvement_path.present? %> +
    +

    <%= t("proposals.proposal.improve_info") %>

    + <%= link_to t("proposals.proposal.improve_info_link"), @proposal_improvement_path, class: "button" %> +
    + <% end %> + +
    + <%= link_to t("proposals.proposal.share.view_proposal"), proposal_path(@proposal) %> +
    +
    + +
    +
    +

    + <%= @proposal.title %>
    + <%= t("proposals.show.code") %> <%= @proposal.code %> +

    +
    +
    +
    +
    +<% end %> diff --git a/app/views/legislation/proposals/show.html.erb b/app/views/legislation/proposals/show.html.erb new file mode 100644 index 000000000..1dc918e8e --- /dev/null +++ b/app/views/legislation/proposals/show.html.erb @@ -0,0 +1,183 @@ +<% provide :title do %><%= @proposal.title %><% end %> +<% content_for :meta_description do %><%= @proposal.summary %><% end %> +<% provide :social_media_meta_tags do %> +<%= render "shared/social_media_meta_tags", + social_url: proposal_url(@proposal), + social_title: @proposal.title, + social_description: @proposal.summary %> +<% end %> +<% content_for :canonical do %> + <%= render "shared/canonical", href: proposal_url(@proposal) %> +<% end %> + +<% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @proposal_votes] do %> +
    +
    +
    + <%= back_link_to %> + + <% if can?(:create, @document) && @proposal.documents.size < Proposal.max_documents_allowed %> + <%= link_to t("documents.upload_document"), + new_document_path(documentable_id: @proposal, documentable_type: @proposal.class.name, from: request.url), + class: 'button hollow float-right' %> + <% end %> + + <% if author_of?(@proposal, current_user) %> + <%= link_to t("proposals.show.send_notification"), + new_proposal_notification_path(proposal_id: @proposal.id), + class: 'button hollow float-right' %> + <% end %> + + <% if current_user && @proposal.editable_by?(current_user) %> + <%= link_to edit_proposal_path(@proposal), class: 'edit-proposal button hollow float-right' do %> + <%= t("proposals.show.edit_proposal_link") %> + <% end %> + <% end %> + +

    <%= @proposal.title %>

    + <% if @proposal.retired? %> +
    + + <%= t("proposals.show.retired_warning") %>
    + <%= link_to t("proposals.show.retired_warning_link_to_explanation"), "#retired_explanation" %> +     +
    + <% elsif @proposal.conflictive? %> +
    + <%= t("proposals.show.flag") %> +
    + <% end %> + +
    + <%= render '/shared/author_info', resource: @proposal %> + +  •  + <%= l @proposal.created_at.to_date %> +  •  +   + <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %> + + <% if current_user %> +  •  + <%= render 'proposals/flag_actions', proposal: @proposal %> + <% end %> + +
    + +
    +

    + <%= t("proposals.show.code") %> + <%= @proposal.code %> +

    + +
    <%= @proposal.summary %>
    + + <% if @proposal.video_url.present? %> +
    +
    +
    +
    +
    + <% end %> + + <%= safe_html_with_links @proposal.description %> + + <% if @proposal.external_url.present? %> +
    +

    +   + <%= t('proposals.show.title_external_url') %> +

    + <%= text_with_links @proposal.external_url %> +
    + <% end %> + + <% if @proposal.video_url.present? %> +
    +

    +   + <%= t('proposals.show.title_video_url') %> +

    + <%= text_with_links @proposal.video_url %> +
    + + <% end %> + +

    <%= @proposal.question %>

    + + <% if @proposal.retired? %> +
    +

    <%= t('proposals.show.retired') %>: <%= t("proposals.retire_options.#{@proposal.retired_reason}") unless @proposal.retired_reason == 'other' %>

    + <%= simple_format text_with_links(@proposal.retired_explanation), {}, sanitize: false %> +
    + <% end %> + + <%= render 'shared/tags', taggable: @proposal %> + + <%= render 'shared/geozone', geozonable: @proposal %> + +
    + <%= render 'proposals/actions', proposal: @proposal %> +
    +
    + + +
    +
    +<% end %> + +
    + <%= render "proposals/filter_subnav" %> + <%= render "proposals/notifications" %> + +
    + <%= render "proposals/comments" %> +
    + +
    + <%= render 'documents/documents', + documents: @proposal.documents, + max_documents_allowed: Proposal.max_documents_allowed %> +
    +
    diff --git a/app/views/legislation/proposals/suggest.js.erb b/app/views/legislation/proposals/suggest.js.erb new file mode 100644 index 000000000..819af2b16 --- /dev/null +++ b/app/views/legislation/proposals/suggest.js.erb @@ -0,0 +1 @@ +<%= render "shared/suggest" %> \ No newline at end of file diff --git a/app/views/legislation/proposals/summary.html.erb b/app/views/legislation/proposals/summary.html.erb new file mode 100644 index 000000000..a28cf8750 --- /dev/null +++ b/app/views/legislation/proposals/summary.html.erb @@ -0,0 +1,53 @@ +
    +
    +
    + <%= back_link_to %> + + <% @proposals.each do |group_name, proposals| %> +
    +

    <%= group_name %>

    + + <% proposals[0..2].each do |proposal| %> +
    +
    +
    +
    +
    +

    <%= link_to proposal.title, namespaced_proposal_path(proposal) %>

    + +

    + <% if proposal.author.hidden? || proposal.author.erased? %> + <%= t("proposals.show.author_deleted") %> + <% else %> + <%= proposal.author.name %> + <% if proposal.author.display_official_position_badge? %> + + <%= proposal.author.official_position %> + + <% end %> + <% end %> +

    + +
    +

    <%= proposal.summary %>

    +
    +
    +
    +
    +
    +
    + <% end %> +
    + <% end %> +
    + +
    + +
    +
    +
    \ No newline at end of file diff --git a/app/views/legislation/proposals/vote.js.erb b/app/views/legislation/proposals/vote.js.erb new file mode 100644 index 000000000..4a5ca6b6b --- /dev/null +++ b/app/views/legislation/proposals/vote.js.erb @@ -0,0 +1 @@ +$("#<%= dom_id(@proposal) %>_votes").html('<%= j render("proposals/votes", proposal: @proposal) %>'); \ No newline at end of file diff --git a/app/views/legislation/proposals/vote_featured.js.erb b/app/views/legislation/proposals/vote_featured.js.erb new file mode 100644 index 000000000..52619282b --- /dev/null +++ b/app/views/legislation/proposals/vote_featured.js.erb @@ -0,0 +1 @@ +$("#<%= dom_id(@proposal) %>_votes").html('<%= j render("proposals/featured_votes", proposal: @proposal) %>'); \ No newline at end of file diff --git a/config/locales/es/legislation.yml b/config/locales/es/legislation.yml index 454422046..2e8b6e201 100644 --- a/config/locales/es/legislation.yml +++ b/config/locales/es/legislation.yml @@ -86,6 +86,7 @@ es: draft_publication_date: Publicación borrador allegations_dates: Alegaciones result_publication_date: Publicación resultados + proposals_dates: Propuestas questions: comments: comment_button: Publicar respuesta From 393e9f2b6a7dcaca236eabdfd6a4761011a42485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 14 Sep 2017 17:38:42 +0200 Subject: [PATCH 049/765] Added permissions for Legislation:Proposal --- app/models/abilities/administrator.rb | 11 +++++++++-- app/models/abilities/common.rb | 14 ++++++++++++++ app/models/abilities/everyone.rb | 1 + app/models/abilities/moderation.rb | 9 +++++++++ app/models/abilities/moderator.rb | 2 +- 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/app/models/abilities/administrator.rb b/app/models/abilities/administrator.rb index 773dabf34..9d2335f9d 100644 --- a/app/models/abilities/administrator.rb +++ b/app/models/abilities/administrator.rb @@ -14,6 +14,9 @@ module Abilities can :restore, Proposal cannot :restore, Proposal, hidden_at: nil + can :restore, Legislation::Proposal + cannot :restore, Legislation::Proposal, hidden_at: nil + can :restore, User cannot :restore, User, hidden_at: nil @@ -26,6 +29,9 @@ module Abilities can :confirm_hide, Proposal cannot :confirm_hide, Proposal, hidden_at: nil + can :confirm_hide, Legislation::Proposal + cannot :confirm_hide, Legislation::Proposal, hidden_at: nil + can :confirm_hide, User cannot :confirm_hide, User, hidden_at: nil @@ -33,7 +39,7 @@ module Abilities can :unmark_featured, Debate can :comment_as_administrator, [Debate, Comment, Proposal, Poll::Question, Budget::Investment, - Legislation::Question, Legislation::Annotation, Topic] + Legislation::Question, Legislation::Proposal, Legislation::Annotation, Topic] can [:search, :create, :index, :destroy], ::Administrator can [:search, :create, :index, :destroy], ::Moderator @@ -71,7 +77,8 @@ module Abilities can [:manage], ::Legislation::Process can [:manage], ::Legislation::DraftVersion can [:manage], ::Legislation::Question - cannot :comment_as_moderator, [::Legislation::Question, Legislation::Annotation] + can [:manage], ::Legislation::Proposal + cannot :comment_as_moderator, [::Legislation::Question, Legislation::Annotation, ::Legislation::Proposal] can [:create, :destroy], Document end diff --git a/app/models/abilities/common.rb b/app/models/abilities/common.rb index 620cfb212..459b779c7 100644 --- a/app/models/abilities/common.rb +++ b/app/models/abilities/common.rb @@ -18,12 +18,20 @@ module Abilities end can [:retire_form, :retire], Proposal, author_id: user.id + can :read, Legislation::Proposal + can :update, Legislation::Proposal do |proposal| + proposal.editable_by?(user) + end + can [:retire_form, :retire], Legislation::Proposal, author_id: user.id + can :create, Comment can :create, Debate can :create, Proposal + can :create, Legislation::Proposal can :suggest, Debate can :suggest, Proposal + can :suggest, Legislation::Proposal can [:flag, :unflag], Comment cannot [:flag, :unflag], Comment, user_id: user.id @@ -34,6 +42,9 @@ module Abilities can [:flag, :unflag], Proposal cannot [:flag, :unflag], Proposal, author_id: user.id + can [:flag, :unflag], Legislation::Proposal + cannot [:flag, :unflag], Legislation::Proposal, author_id: user.id + can [:create, :destroy], Follow can [:create, :destroy, :new], Document, documentable: { author_id: user.id } @@ -50,6 +61,9 @@ module Abilities can :vote, SpendingProposal can :create, SpendingProposal + can :vote, Legislation::Proposal + can :vote_featured, Legislation::Proposal + can :create, Budget::Investment, budget: { phase: "accepting" } can :suggest, Budget::Investment, budget: { phase: "accepting" } can :destroy, Budget::Investment, budget: { phase: ["accepting", "reviewing"] }, author_id: user.id diff --git a/app/models/abilities/everyone.rb b/app/models/abilities/everyone.rb index 3004ca8ad..d0cef4846 100644 --- a/app/models/abilities/everyone.rb +++ b/app/models/abilities/everyone.rb @@ -22,6 +22,7 @@ module Abilities can [:read, :changes, :go_to_version], Legislation::DraftVersion can [:read], Legislation::Question can [:create], Legislation::Answer + can [:read, :map, :summary, :share], Legislation::Proposal can [:search, :comments, :read, :create, :new_comment], Legislation::Annotation end end diff --git a/app/models/abilities/moderation.rb b/app/models/abilities/moderation.rb index e9a1da2ac..f0f823de1 100644 --- a/app/models/abilities/moderation.rb +++ b/app/models/abilities/moderation.rb @@ -38,6 +38,15 @@ module Abilities can :moderate, Proposal cannot :moderate, Proposal, author_id: user.id + can :hide, Legislation::Proposal, hidden_at: nil + cannot :hide, Legislation::Proposal, author_id: user.id + + can :ignore_flag, Legislation::Proposal, ignored_flag_at: nil, hidden_at: nil + cannot :ignore_flag, Legislation::Proposal, author_id: user.id + + can :moderate, Legislation::Proposal + cannot :moderate, Legislation::Proposal, author_id: user.id + can :hide, User cannot :hide, User, id: user.id diff --git a/app/models/abilities/moderator.rb b/app/models/abilities/moderator.rb index 4e1427c12..eac434f22 100644 --- a/app/models/abilities/moderator.rb +++ b/app/models/abilities/moderator.rb @@ -6,7 +6,7 @@ module Abilities merge Abilities::Moderation.new(user) can :comment_as_moderator, [Debate, Comment, Proposal, Budget::Investment, Poll::Question, - Legislation::Question, Legislation::Annotation, Topic] + Legislation::Question, Legislation::Annotation, Legislation::Proposal, Topic] end end end From 8805037e2fad1671fbb3139341ea5b3f5ae82d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 19 Sep 2017 10:08:01 +0200 Subject: [PATCH 050/765] Legislation proposal views changes --- app/views/legislation/proposals/_form.html.erb | 10 ++++++---- app/views/legislation/proposals/_proposal.html.erb | 4 ++-- app/views/legislation/proposals/new.html.erb | 2 +- app/views/legislation/proposals/share.html.erb | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/views/legislation/proposals/_form.html.erb b/app/views/legislation/proposals/_form.html.erb index 73b39dfdb..dec8e56d2 100644 --- a/app/views/legislation/proposals/_form.html.erb +++ b/app/views/legislation/proposals/_form.html.erb @@ -1,10 +1,12 @@ <%= form_for(@proposal, url: form_url) do |f| %> <%= render 'shared/errors', resource: @proposal %> + <%= f.hidden_field(:legislation_process_id, :value => params[:process_id]) %> +
    <%= f.label :title, t("proposals.form.proposal_title") %> - <%= f.text_field :title, maxlength: Proposal.title_max_length, placeholder: t("proposals.form.proposal_title"), label: false, data: {js_suggest_result: "js_suggest_result", js_suggest: "#js-suggest", js_url: suggest_proposals_path}%> + <%= f.text_field :title, maxlength: Legislation::Proposal.title_max_length, placeholder: t("proposals.form.proposal_title"), label: false, data: {js_suggest_result: "js_suggest_result", js_suggest: "#js-suggest", js_url: suggest_proposals_path}%>
    @@ -15,7 +17,7 @@

    <%= t("proposals.form.proposal_question_example_html") %>

    - <%= f.text_field :question, maxlength: Proposal.question_max_length, + <%= f.text_field :question, maxlength: Legislation::Proposal.question_max_length, placeholder: t("proposals.form.proposal_question"), label: false, aria: {describedby: "question-help-text"} %> @@ -31,7 +33,7 @@
    <%= f.label :description, t("proposals.form.proposal_text") %> - <%= f.cktext_area :description, maxlength: Proposal.description_max_length, ckeditor: { language: I18n.locale }, label: false %> + <%= f.cktext_area :description, maxlength: Legislation::Proposal.description_max_length, ckeditor: { language: I18n.locale }, label: false %>
    @@ -46,7 +48,7 @@ <%= f.text_field :external_url, placeholder: t("proposals.form.proposal_external_url"), label: false %>
    -
    +
    <%= render 'documents/nested_documents', documentable: @proposal %>
    diff --git a/app/views/legislation/proposals/_proposal.html.erb b/app/views/legislation/proposals/_proposal.html.erb index c269146ab..996be8f95 100644 --- a/app/views/legislation/proposals/_proposal.html.erb +++ b/app/views/legislation/proposals/_proposal.html.erb @@ -72,8 +72,8 @@

    <%= t("proposals.proposal.archived") %>

    <% else %> - <%= render 'votes', - { proposal: proposal, vote_url: vote_proposal_path(proposal, value: 'yes') } %> + <%= render 'legislation/proposals/votes', + { proposal: proposal, vote_url: vote_legislation_process_proposal_path(proposal.legislation_process_id, proposal, value: 'yes') } %> <% end %>
    diff --git a/app/views/legislation/proposals/new.html.erb b/app/views/legislation/proposals/new.html.erb index 95249e36e..f6f31bff5 100644 --- a/app/views/legislation/proposals/new.html.erb +++ b/app/views/legislation/proposals/new.html.erb @@ -9,7 +9,7 @@ <%= t("proposals.new.more_info")%> <% end %>
    - <%= render "proposals/form", form_url: proposals_url %> + <%= render "legislation/proposals/form", form_url: legislation_process_proposals_url, id: @proposal.id %>
    diff --git a/app/views/legislation/proposals/share.html.erb b/app/views/legislation/proposals/share.html.erb index f86882401..5faa9d985 100644 --- a/app/views/legislation/proposals/share.html.erb +++ b/app/views/legislation/proposals/share.html.erb @@ -34,7 +34,7 @@ <% end %>
    - <%= link_to t("proposals.proposal.share.view_proposal"), proposal_path(@proposal) %> + <%= link_to t("proposals.proposal.share.view_proposal"), legislation_process_proposal_path(@proposal.legislation_process_id, @proposal) %>
    From d83bb9e31fcb5ee9e5a58ce154b9b4563e4bb5f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 19 Sep 2017 10:08:36 +0200 Subject: [PATCH 051/765] Legislation proposal controller adaptation --- app/controllers/application_controller.rb | 4 ++++ .../legislation/proposals_controller.rb | 20 +++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 495a25314..318777314 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -76,6 +76,10 @@ class ApplicationController < ActionController::Base @proposal_votes = current_user ? current_user.proposal_votes(proposals) : {} end + def set_legislation_proposal_votes(proposals) + @proposal_votes = current_user ? current_user.legislation_proposal_votes(proposals) : {} + end + def set_spending_proposal_votes(spending_proposals) @spending_proposal_votes = current_user ? current_user.spending_proposal_votes(spending_proposals) : {} end diff --git a/app/controllers/legislation/proposals_controller.rb b/app/controllers/legislation/proposals_controller.rb index a275a061d..1eab07047 100644 --- a/app/controllers/legislation/proposals_controller.rb +++ b/app/controllers/legislation/proposals_controller.rb @@ -1,9 +1,9 @@ -class Legislation::ProposalsController < ApplicationController +class Legislation::ProposalsController < Legislation::BaseController include CommentableActions include FlagActions - load_and_authorize_resource :process - load_and_authorize_resource :proposal, through: :process + load_and_authorize_resource :process, class: "Legislation::Process" + load_and_authorize_resource :proposal, class: "Legislation::Proposal", through: :process before_action :parse_tag_filter, only: :index before_action :load_categories, only: [:index, :new, :create, :edit, :map, :summary] @@ -15,7 +15,6 @@ class Legislation::ProposalsController < ApplicationController has_orders %w{hot_score confidence_score created_at relevance archival_date}, only: :index has_orders %w{most_voted newest oldest}, only: :show - load_and_authorize_resource helper_method :resource_model, :resource_name respond_to :html, :js @@ -23,7 +22,8 @@ class Legislation::ProposalsController < ApplicationController super @notifications = @proposal.notifications @document = Document.new(documentable: @proposal) - redirect_to proposal_path(@proposal), status: :moved_permanently if request.path != proposal_path(@proposal) + redirect_to legislation_process_proposal_path(params[:process_id], @proposal), + status: :moved_permanently if request.path != legislation_process_proposal_path(params[:process_id], @proposal) end def create @@ -31,7 +31,7 @@ class Legislation::ProposalsController < ApplicationController recover_documents_from_cache(@proposal) if @proposal.save - redirect_to share_proposal_path(@proposal), notice: I18n.t('flash.actions.create.proposal') + redirect_to share_legislation_process_proposal_path(params[:process_id], @proposal), notice: I18n.t('flash.actions.create.proposal') else render :new end @@ -46,7 +46,7 @@ class Legislation::ProposalsController < ApplicationController def vote @proposal.register_vote(current_user, 'yes') - set_proposal_votes(@proposal) + set_legislation_proposal_votes(@proposal) end def retire @@ -98,7 +98,11 @@ class Legislation::ProposalsController < ApplicationController Legislation::Proposal end - def set_featured_proposal_votes(proposals) + def resource_name + 'proposal' + end + + def set_legislation_proposal_votes(proposals) @featured_proposals_votes = current_user ? current_user.proposal_votes(proposals) : {} end From 08d1e96575467159f6e13185f8b39185d46682f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 19 Sep 2017 10:09:43 +0200 Subject: [PATCH 052/765] Added migration to include `legislation/proposals_count` in tags table --- ...19_add_legislation_proposals_count_to_tags.rb | 6 ++++++ db/schema.rb | 16 +++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20170915101519_add_legislation_proposals_count_to_tags.rb diff --git a/db/migrate/20170915101519_add_legislation_proposals_count_to_tags.rb b/db/migrate/20170915101519_add_legislation_proposals_count_to_tags.rb new file mode 100644 index 000000000..9ce6ace89 --- /dev/null +++ b/db/migrate/20170915101519_add_legislation_proposals_count_to_tags.rb @@ -0,0 +1,6 @@ +class AddLegislationProposalsCountToTags < ActiveRecord::Migration + def change + add_column :tags, "legislation/proposals_count", :integer, default: 0 + add_index :tags, "legislation/proposals_count" + end +end diff --git a/db/schema.rb b/db/schema.rb index 8a33adfc8..41952607e 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: 20170914102634) do +ActiveRecord::Schema.define(version: 20170915101519) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -927,16 +927,18 @@ ActiveRecord::Schema.define(version: 20170914102634) do add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree create_table "tags", force: :cascade do |t| - t.string "name", limit: 40 - t.integer "taggings_count", default: 0 - t.integer "debates_count", default: 0 - t.integer "proposals_count", default: 0 - t.integer "spending_proposals_count", default: 0 + t.string "name", limit: 40 + t.integer "taggings_count", default: 0 + t.integer "debates_count", default: 0 + t.integer "proposals_count", default: 0 + t.integer "spending_proposals_count", default: 0 t.string "kind" - t.integer "budget/investments_count", default: 0 + t.integer "budget/investments_count", default: 0 + t.integer "legislation/proposals_count", default: 0 end add_index "tags", ["debates_count"], name: "index_tags_on_debates_count", using: :btree + add_index "tags", ["legislation/proposals_count"], name: "index_tags_on_legislation/proposals_count", using: :btree add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree add_index "tags", ["proposals_count"], name: "index_tags_on_proposals_count", using: :btree add_index "tags", ["spending_proposals_count"], name: "index_tags_on_spending_proposals_count", using: :btree From c1672bdbf415c9ec4e94793b9eb6ee46dc945c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 19 Sep 2017 10:10:10 +0200 Subject: [PATCH 053/765] Legislation proposals adaptation in some models and initializers --- app/models/legislation/proposal.rb | 4 ++-- app/models/user.rb | 6 ++++++ app/models/vote.rb | 6 ++++-- config/initializers/acts_as_taggable_on.rb | 5 +++-- config/initializers/vote_extensions.rb | 4 ++++ 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/models/legislation/proposal.rb b/app/models/legislation/proposal.rb index 1eb82e70a..5f6706339 100644 --- a/app/models/legislation/proposal.rb +++ b/app/models/legislation/proposal.rb @@ -156,11 +156,11 @@ class Legislation::Proposal < ActiveRecord::Base end def after_hide - tags.each{ |t| t.decrement_custom_counter_for('Proposal') } + tags.each{ |t| t.decrement_custom_counter_for('LegislationProposal') } end def after_restore - tags.each{ |t| t.increment_custom_counter_for('Proposal') } + tags.each{ |t| t.increment_custom_counter_for('LegislationProposal') } end def self.votes_needed_for_success diff --git a/app/models/user.rb b/app/models/user.rb index ef6ab7832..b34897688 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -97,6 +97,12 @@ class User < ActiveRecord::Base voted.each_with_object({}) { |v, h| h[v.votable_id] = v.value } end + def legislation_proposal_votes(proposals) + voted = votes.for_proposals(proposals) + voted.each_with_object({}) { |v, h| h[v.votable_id] = v.value } + end + + def spending_proposal_votes(spending_proposals) voted = votes.for_spending_proposals(spending_proposals) voted.each_with_object({}) { |v, h| h[v.votable_id] = v.value } diff --git a/app/models/vote.rb b/app/models/vote.rb index 14b11a68d..4d4d07be0 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -5,10 +5,12 @@ class Vote < ActsAsVotable::Vote scope :public_for_api, -> do where(%{(votes.votable_type = 'Debate' and votes.votable_id in (?)) or (votes.votable_type = 'Proposal' and votes.votable_id in (?)) or - (votes.votable_type = 'Comment' and votes.votable_id in (?))}, + (votes.votable_type = 'Comment' and votes.votable_id in (?)) or + (votes.votable_type = 'LegislationProposal' and votes.votable_id in (?))}, Debate.public_for_api.pluck(:id), Proposal.public_for_api.pluck(:id), - Comment.public_for_api.pluck(:id)) + Comment.public_for_api.pluck(:id), + Legislation::Proposal.public_for_api.pluck(:id)) end end diff --git a/config/initializers/acts_as_taggable_on.rb b/config/initializers/acts_as_taggable_on.rb index 57766c8c9..9db832bef 100644 --- a/config/initializers/acts_as_taggable_on.rb +++ b/config/initializers/acts_as_taggable_on.rb @@ -8,10 +8,11 @@ module ActsAsTaggableOn scope :public_for_api, -> do where(%{taggings.tag_id in (?) and (taggings.taggable_type = 'Debate' and taggings.taggable_id in (?)) or - (taggings.taggable_type = 'Proposal' and taggings.taggable_id in (?))}, + (taggings.taggable_type = 'Proposal' and taggings.taggable_id in (?)) or taggings.taggable_type = 'LegislationProposal' and taggings.taggable_id in (?))}, Tag.where('kind IS NULL or kind = ?', 'category').pluck(:id), Debate.public_for_api.pluck(:id), - Proposal.public_for_api.pluck(:id)) + Proposal.public_for_api.pluck(:id), + Legislation::Proposal.public_for_api.pluck(:id)) end def touch_taggable diff --git a/config/initializers/vote_extensions.rb b/config/initializers/vote_extensions.rb index 06d3dde5b..1b6ae7252 100644 --- a/config/initializers/vote_extensions.rb +++ b/config/initializers/vote_extensions.rb @@ -13,6 +13,10 @@ ActsAsVotable::Vote.class_eval do where(votable_type: 'SpendingProposal', votable_id: spending_proposals) end + def self.for_spending_proposals(spending_proposals) + where(votable_type: 'LegislationProposal', votable_id: legislation_proposals) + end + def self.for_budget_investments(budget_investments) where(votable_type: 'Budget::Investment', votable_id: budget_investments) end From 049967649e82ba6d5699c1e1a3f00d246490dc60 Mon Sep 17 00:00:00 2001 From: iagirre Date: Tue, 19 Sep 2017 17:37:31 +0200 Subject: [PATCH 054/765] Selection of multiple tags separated by ',' works for hardcoded array of tags. --- app/assets/javascripts/application.js | 3 ++ .../javascripts/tag_autocomplete.js.coffee | 29 +++++++++++++ app/assets/stylesheets/application.scss | 2 + .../stylesheets/autocomplete_overrides.scss | 41 +++++++++++++++++++ app/views/debates/_form.html.erb | 3 +- config/routes.rb | 4 ++ 6 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/tag_autocomplete.js.coffee create mode 100644 app/assets/stylesheets/autocomplete_overrides.scss diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 2ff87100a..01c5dbaff 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,6 +14,7 @@ //= require jquery_ujs //= require jquery-ui/widgets/datepicker //= require jquery-ui/i18n/datepicker-es +//= require jquery-ui/widgets/autocomplete //= require jquery-fileupload/basic //= require foundation //= require turbolinks @@ -63,6 +64,7 @@ //= require documentable //= require tree_navigator //= require custom +//= require tag_autocomplete var initialize_modules = function() { App.Comments.initialize(); @@ -97,6 +99,7 @@ var initialize_modules = function() { App.WatchFormChanges.initialize(); App.TreeNavigator.initialize(); App.Documentable.initialize(); + App.TagAutocomplete.initialize(); }; $(function(){ diff --git a/app/assets/javascripts/tag_autocomplete.js.coffee b/app/assets/javascripts/tag_autocomplete.js.coffee new file mode 100644 index 000000000..9e10c100e --- /dev/null +++ b/app/assets/javascripts/tag_autocomplete.js.coffee @@ -0,0 +1,29 @@ +App.TagAutocomplete = + + split: ( val ) -> + return (val.split( /,\s*/ )) + + extractLast: ( term ) -> + return (App.TagAutocomplete.split( term ).pop()) + + init_autocomplete: -> + $('.js-tag-list').autocomplete + source: (request, response) -> + response( $.ui.autocomplete.filter(["Arbol", "Becerro", "Caracol"], App.TagAutocomplete.extractLast( request.term ) ) ); + minLength: 0, + search: -> + console.log(this.value); + console.log(App.TagAutocomplete.extractLast( this.value )); + App.TagAutocomplete.extractLast( this.value ); + focus: -> + return false; + select: ( event, ui ) -> ( + terms = App.TagAutocomplete.split( this.value ); + terms.pop(); + terms.push( ui.item.value ); + terms.push( "" ); + this.value = terms.join( ", " ); + return false;); + + initialize: -> + App.TagAutocomplete.init_autocomplete(); \ No newline at end of file diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 19c73de32..e4dd4ea1c 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -16,4 +16,6 @@ @import 'annotator_overrides'; @import 'jquery-ui/datepicker'; @import 'datepicker_overrides'; +@import 'jquery-ui/autocomplete'; +@import 'autocomplete_overrides'; @import 'documentable'; diff --git a/app/assets/stylesheets/autocomplete_overrides.scss b/app/assets/stylesheets/autocomplete_overrides.scss new file mode 100644 index 000000000..68537fd8a --- /dev/null +++ b/app/assets/stylesheets/autocomplete_overrides.scss @@ -0,0 +1,41 @@ +// Overrides styles of jquery-ui/autocomplete +// + +/* Autocomplete +----------------------------------*/ +.ui-autocomplete { position: absolute; cursor: default; } +.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; } + +/* workarounds */ +* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ + +/* Menu +----------------------------------*/ +.ui-menu { + list-style:none; + padding: 0px 5px; + margin: 0; + display:block; + /*width:227px;*/ + background: white; + border: 1px solid $border; +} +.ui-menu .ui-menu { + margin-top: -3px; +} +.ui-menu .ui-menu-item { + margin:0; + padding: 0; + width: 200px; +} +.ui-menu .ui-menu-item a { + /* text-decoration:none; + display:block;*/ + padding:.2em .4em; + /* line-height:1.5; + zoom:1;*/ +} +.ui-menu .ui-menu-item a.ui-state-hover, +.ui-menu .ui-menu-item a.ui-state-active { + margin: -1px; +} \ No newline at end of file diff --git a/app/views/debates/_form.html.erb b/app/views/debates/_form.html.erb index 96a5337ca..28ef69804 100644 --- a/app/views/debates/_form.html.erb +++ b/app/views/debates/_form.html.erb @@ -22,7 +22,8 @@ <%= f.text_field :tag_list, value: @debate.tag_list.to_s, label: false, placeholder: t("debates.form.tags_placeholder"), - aria: {describedby: "tag-list-help-text"} %> + aria: {describedby: "tag-list-help-text"}, + data: {js_url: tags_search_path}%>
    <% if @debate.new_record? %> diff --git a/config/routes.rb b/config/routes.rb index a02384ced..666285496 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -167,6 +167,10 @@ Rails.application.routes.draw do resource :email, controller: "email", only: [:new, :show, :create] resource :letter, controller: "letter", only: [:new, :create, :show, :edit, :update] end + + namespace :tags do + get :search + end namespace :admin do From 28a658319918fe62eb2cfb3e2d36c817871cf9ab Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 15 Sep 2017 13:04:14 +0200 Subject: [PATCH 055/765] removes untranslated texts on admin dashboard index --- app/views/admin/dashboard/index.html.erb | 87 ------------------------ 1 file changed, 87 deletions(-) diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb index 2a2ed1c56..3d56b1f14 100644 --- a/app/views/admin/dashboard/index.html.erb +++ b/app/views/admin/dashboard/index.html.erb @@ -10,90 +10,3 @@

    <%= t("admin.dashboard.index.title") %>

    -

    Desde aquí puedes administrar el sistema, a través de las siguientes acciones:

    - -
    -
      - -
    • - Temas de debate -
      -

      Los temas (también llamadas tags, o etiquetas) de debate son palabras que definen los usuarios al crear debates, para catalogarlos (ej: sanidad, movilidad, arganzuela, ...). Aquí se pueden eliminar temas inapropiados, o marcarlos para ser propuestos al crear debates (cada usuario puede definir los que quiera, pero se le sugieren algunos que nos parecen útiles como catalogación por defecto; aquí se puede cambiar cuáles se sugieren)

      -
      -
      • - -
    • - Propuestas/Debates/Comentarios ocultos -
      -

      Cuando un moderador o un administrador oculta una Propuesta/Debate/Comentario aparecerá en esta lista. De esta forma los administradores pueden revisar que se ha ocultado el elemento adecuado.

      - -
        -
      • Al pulsar Confirmar se acepta el que se haya ocultado, se considera que se ha hecho correctamente.
        • -
      • Al pulsar Volver a mostrar se revierte la acción de ocultar y vuelve a ser una Propuesta/Debate/Comentario visible, en el caso de que se considere - que ha sido una acción errónea el haberlo ocultado.
        • -
      - -

      Para facilitar la gestión, arriba encontramos un filtro con las secciones: "pendientes" (los elementos sobre los que todavía no se ha pulsado "confirmar" o "volver a mostrar", que deberían ser revisados todavía), "confirmados" y "todos".

      - -

      Es recomendable revisar regularmente la sección "pendientes".

      -
      -
      • - -
    • - Usuarios bloqueados -
      -

      Cuando un moderador o un administrador bloquea a un usuario aparecerá en esta lista. Al bloquear a un usuario, éste deja de poder utilizarlo para ninguna acción de la web. Los administradores pueden desbloquearlos pulsando el botón al lado del nombre del usuario en la lista.

      -
      -
      • - -
    • - Organizaciones -
      -

      En la web hay dos tipos de usuarios: individuales y organizaciones. Cualquier persona puede crear usuarios de un tipo o de otro en la propia web. Los usuarios de organizaciones pueden ser verificados por parte de los administradores, confirmando que quien gestiona el usuario efectivamente representa a esa organización. Una vez se haya realizado el proceso de verificación, por el proceso externo a la web que se haya definido para ello, se pulsa el botón "Verificar" para confimarlo; lo que hará que al lado del nombre de la organización aparezca una etiqueta señalando que es una organización verificada.

      - -

      En caso de que el proceso de verificación haya sido negativo, se pulsa el botón "Rechazar". Para editar alguno de los datos de la organización, se pulsa el botón "Editar".

      - -

      En caso de que el proceso de verificación haya sido negativo, se pulsa el botón "Rechazar". Para editar alguno de los datos de la organización, se pulsa el botón "Editar".

      - -

      Las organizaciones que no aparecen en la lista pueden ser encontradas para actuar sobre ellas por medio del buscador en la parte superior. Para facilitar la gestión, arriba - encontramos un filtro con las secciones: "pendientes" (las organizaciones que todavía no han sido verificadas o rechazadas), "verificadas", "rechazadas" y "todas".

      -

      Es recomendable revisar regularmente la sección "pendientes".

      -
      -
      • - -
    • - Cargos Públicos -
      -

      En la web, los usuarios individuales pueden ser usuarios normales, o cargos públicos. Estos últimos se diferencian de los primeros únicamente en que al lado de sus nombres aparece una etiqueta que les identifica, y cambia ligeramente el estilo de sus comentarios. Esto permite que los usuarios les identifiquen más fácilmente. Al lado de cada usuario vemos la identificación que aparece en su etiqueta, y su nivel (la manera que internamente usa la web para diferenciar entre un tipo de cargos y otros). Pulsando el botón "Editar" al lado del usuario, se puede modificar su información. Los cargos públicos que no aparecen en la lista pueden ser encontrados para actuar sobre ellos por medio del buscador en la parte superior.

      -
      -
      • - -
    • - Moderadores -
      -

      Mediante el buscador de la parte superior se pueden buscar usuarios, para activarlos o desactivarlos como moderadores de la web. Los moderadores al acceder a la web con su usuario ven en la parte superior una nueva sección llamada "Moderar"

      -
      -
      • - -
    • - Actividad de moderadores -
      -

      En esta sección se va guardando todas las acciones que realizan los moderadores o los administradores respecto a la moderación: ocultar/mostrar Propuestas/Debates/Comentarios y bloquear usuarios. En la columna "Acción" comprobamos si la acción corresponde con ocultar o con volver a mostrar (restaurar) elementos o con bloquear usuarios. En las demás columnas tenemos el tipo de elemento, el contenido del elemento y el moderador o administrador que ha realizado la acción. Esta sección permite que los administradores detecten comportamientos irregulares por parte de moderadores específicos y que por lo tanto puedan corregirlos.

      -
      -
      • - -
    • - Configuración Global -
      -

      Opciones generales de configuración del sistema.

      -
      -
      • - -
    • - Estadísticas -
      -

      Estadísticas generales del sistema.

      -
      -
      • -
    -
    From 8ed791e86023b14a12c0acbee25aecb01ee9306b Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 15 Sep 2017 13:04:52 +0200 Subject: [PATCH 056/765] includes description text on admin dashboard index --- app/views/admin/dashboard/index.html.erb | 6 ++++++ config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 1 + 3 files changed, 8 insertions(+) diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb index 3d56b1f14..94f7c767b 100644 --- a/app/views/admin/dashboard/index.html.erb +++ b/app/views/admin/dashboard/index.html.erb @@ -7,6 +7,12 @@ <%= t("admin.menu.stats") %> <% end %> +
    + <%= link_to root_path do %> + <%= t("admin.dashboard.index.back") + " " + setting['org_name'] %> + <% end %> +

    <%= t("admin.dashboard.index.title") %>

    +

    <%= t("admin.dashboard.index.description", org: setting['org_name']) %>

    diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 91b493ffa..ca9a543e9 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -216,6 +216,7 @@ en: index: back: Go back to title: Administration + description: Welcome to the %{org} admin panel. debates: index: filter: Filter diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 2db094999..7d768e4d9 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -216,6 +216,7 @@ es: index: back: Volver a title: Administración + description: Bienvenido al panel de administración de %{org}. debates: index: filter: Filtro From 90f2b848562a1cc212f39a30967a2edc43c86036 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 15 Sep 2017 13:05:46 +0200 Subject: [PATCH 057/765] improves admin header layout --- app/views/layouts/_admin_header.html.erb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb index bd4f09074..c7dba228f 100644 --- a/app/views/layouts/_admin_header.html.erb +++ b/app/views/layouts/_admin_header.html.erb @@ -2,31 +2,27 @@
    <%= render 'shared/locale_switcher' %> - <%= link_to t("admin.dashboard.index.back") + " " + setting['org_name'], - root_path, class: "float-right back-web" %>
    - <%= link_to setting['org_name'], namespaced_root_path, class: "logo show-for-small-only" %> - <%= t("application.menu")%> -
    +

    - <%= link_to namespaced_root_path, class: "hide-for-small-only" do %> - <%= image_tag(image_path_for('logo_header.png'), class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %> + <%= link_to namespaced_root_path do %> <%= setting['org_name'] %> -  | <%= namespaced_header_title %> +
    <%= namespaced_header_title %> <% end %>

    +
      From 3e2c639137d1132231892e33122ad0ca8a513522 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 15 Sep 2017 13:30:06 +0200 Subject: [PATCH 058/765] moves stats and setting links to header into a partial --- app/views/admin/dashboard/index.html.erb | 9 --------- app/views/admin/shared/_admin_shortcuts.html.erb | 11 +++++++++++ app/views/layouts/_admin_header.html.erb | 1 + 3 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 app/views/admin/shared/_admin_shortcuts.html.erb diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb index 94f7c767b..e73a37b57 100644 --- a/app/views/admin/dashboard/index.html.erb +++ b/app/views/admin/dashboard/index.html.erb @@ -1,12 +1,3 @@ -<%= link_to admin_settings_path, class: "button float-right" do %> - - <%= t("admin.menu.settings") %> -<% end %> - -<%= link_to admin_stats_path, class: "button float-right" do %> - - <%= t("admin.menu.stats") %> -<% end %>
      <%= link_to root_path do %> <%= t("admin.dashboard.index.back") + " " + setting['org_name'] %> diff --git a/app/views/admin/shared/_admin_shortcuts.html.erb b/app/views/admin/shared/_admin_shortcuts.html.erb new file mode 100644 index 000000000..5ce0bf9b7 --- /dev/null +++ b/app/views/admin/shared/_admin_shortcuts.html.erb @@ -0,0 +1,11 @@ +
    • + <%= link_to admin_stats_path, title: t("admin.menu.stats") do %> + + + <% end %> +
      • +
    • + <%= link_to admin_settings_path, title: t("admin.menu.settings") do %> + + <% end %> +
      • diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb index c7dba228f..e9ccdd998 100644 --- a/app/views/layouts/_admin_header.html.erb +++ b/app/views/layouts/_admin_header.html.erb @@ -26,6 +26,7 @@
        + <%= render "admin/shared/admin_shortcuts" %> <%= render "shared/admin_login_items" %> <%= render "devise/menu/login_items" %>
      From 3e5b4f2e4498f0ee24eea9b507daf243575bc893 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 15 Sep 2017 13:38:29 +0200 Subject: [PATCH 059/765] removes important declaration on layout.scss --- app/assets/stylesheets/layout.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 7e41026f1..77dccfc6e 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -371,7 +371,11 @@ header { .top-bar-title a { @include logo; - line-height: rem-calc(80) !important; + line-height: rem-calc(80); + + @include breakpoint(medium) { + line-height: rem-calc(80); + } &:hover { text-decoration: none; From 3fe1c21d7f7592e4107294df5ab9ab3ce63408ab Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 15 Sep 2017 13:42:36 +0200 Subject: [PATCH 060/765] includes new css styles --- app/assets/stylesheets/admin.scss | 114 +++++++++++++++++++++++------- 1 file changed, 90 insertions(+), 24 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 6ac728e2c..48614cd38 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -13,33 +13,96 @@ // 01. Global styles // ----------------- -$admin-color: #cf3638; +$admin-color: #245b80; +$sidebar: #245b80; +$sidebar-hover: #25597c; +$sidebar-active: #f4fcd0; .admin { + h2 { + font-weight: 100; + margin-bottom: $line-height; + text-transform: uppercase; + } + + .back { + float: none; + } + .header { border: 0; } .top-links { - background: darken($admin-color, 15%); - } - - .back-web { - padding-top: $line-height / 4; - text-decoration: underline; + background: #000; } .top-bar { - background: $admin-color !important; + background: #fff !important; + border-bottom: 1px solid #eee; + box-shadow: 0 2px 2px #eee; + color: #000; height: auto; + + span { + padding-top: $line-height / 2; + } + + [class^="icon-"] { + font-size: $base-font-size; + } } .top-bar-title { h1 { margin-bottom: 0; + margin-top: $line-height / 2; + + @include breakpoint(medium) { + margin-left: $line-height / 2; + } + + small { + color: #000; + text-transform: uppercase; + } } + + a { + color: #000 !important; + line-height: $line-height !important; + + @include breakpoint(medium) { + line-height: $line-height !important; + } + } + } + + .top-bar .menu > li { + + @include breakpoint(medium) { + height: auto !important; + padding-top: $line-height / 2; + } + + a { + color: #000 !important; + } + } + + .menu-icon.dark { + + &::after, + &:hover::after { + background: #000 !important; + box-shadow: 0 7px 0 #000, 0 14px 0 #000 !important; + } + } + + .dropdown.menu > .is-dropdown-submenu-parent > a::after { + border-color: #000 transparent transparent; } .fieldset { @@ -54,7 +117,8 @@ $admin-color: #cf3638; } } - th, td { + th, + td { text-align: left; &.text-center { @@ -110,6 +174,7 @@ $admin-color: #cf3638; .menu.simple .active { border-bottom: 2px solid $admin-color; color: $admin-color; + font-weight: bold; } .tabs-panel { @@ -195,6 +260,8 @@ $admin-color: #cf3638; // ----------- .admin-sidebar { + background: $sidebar; + background: linear-gradient(to bottom, #245b80 0%, #488fb5 100%); border-right: 1px solid $border; @include breakpoint(medium) { @@ -208,7 +275,7 @@ $admin-color: #cf3638; padding: 0; [class^="icon-"] { - color: $admin-color; + color: #fff; display: inline-block; font-size: rem-calc(24); line-height: $line-height; @@ -219,39 +286,32 @@ $admin-color: #cf3638; } li { - background: #fff; margin: 0; outline: 0; ul { margin-left: $line-height / 1.5; - border-left: 1px solid $border; + border-left: 1px solid $sidebar-hover; padding-left: $line-height / 2; } - &.section-title { - border-bottom: 1px solid $border; - } - &.active a { - background: #f3f6f7; - border-radius: rem-calc(6); - color: $admin-color; + background: $sidebar-hover; + border-left: 2px solid $sidebar-active; font-weight: bold; } } li a { - color: $text; + color: #fff; display: block; line-height: rem-calc(48); padding-left: rem-calc(12); vertical-align: top; &:hover { - background: #f3f6f7; - border-radius: rem-calc(6); - color: $admin-color; + background: $sidebar-hover; + color: #fff; text-decoration: none; } } @@ -259,7 +319,13 @@ $admin-color: #cf3638; .is-accordion-submenu-parent { > a::after { - border-color: $admin-color transparent transparent; + border: 0; + content: '\61' !important; + font-family: "icons" !important; + height: auto; + position: absolute !important; + right: 30px; + top: 6px !important; } } From 5ffac1d1fbc868f8a7f3f168abbb383b11a8aef6 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 15 Sep 2017 14:53:37 +0200 Subject: [PATCH 061/765] =?UTF-8?q?remove=20extra=20line=20break=20?= =?UTF-8?q?=F0=9F=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admin/shared/_admin_shortcuts.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/admin/shared/_admin_shortcuts.html.erb b/app/views/admin/shared/_admin_shortcuts.html.erb index 5ce0bf9b7..7ead6d419 100644 --- a/app/views/admin/shared/_admin_shortcuts.html.erb +++ b/app/views/admin/shared/_admin_shortcuts.html.erb @@ -1,7 +1,6 @@
    • <%= link_to admin_stats_path, title: t("admin.menu.stats") do %> - <% end %>
    • From 1b3292690adf5115081012a526498af01dc6f3eb Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 20 Sep 2017 11:02:13 +0200 Subject: [PATCH 062/765] updates spec of admin logo_header --- spec/features/admin/site_customization/images_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/admin/site_customization/images_spec.rb b/spec/features/admin/site_customization/images_spec.rb index 6d180fe8e..fc81bf246 100644 --- a/spec/features/admin/site_customization/images_spec.rb +++ b/spec/features/admin/site_customization/images_spec.rb @@ -20,7 +20,7 @@ feature "Admin custom images" do end expect(page).to have_css("tr.logo_header img[src*='logo_header.png']") - expect(page).to have_css("img[src*='logo_header.png']", count: 2) # one in the admin form an one in the page header + expect(page).to have_css("img[src*='logo_header.png']", count: 1) end scenario "Upload invalid image" do From 12658e33a92f6197599767317fa4e80fc95235bc Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 20 Sep 2017 16:07:19 +0200 Subject: [PATCH 063/765] Use %w string array syntax to comply with the 140 char line limit --- app/helpers/admin_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index f9c2e8c69..2cefcdf27 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -25,7 +25,7 @@ module AdminHelper end def menu_polls? - ["polls", "questions", "officers", "booths", "officer_assignments", "booth_assignments", "recounts", "results", "shifts"].include? controller_name + %w[polls questions officers booths officer_assignments booth_assignments recounts results shifts].include? controller_name end def menu_profiles? @@ -39,7 +39,7 @@ module AdminHelper def menu_customization? ["pages", "images", "content_blocks"].include? controller_name end - + def official_level_options options = [["", 0]] (1..5).each do |i| From 03ee43bfee0bd63e3474f8e66da01032462869b8 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 20 Sep 2017 16:07:53 +0200 Subject: [PATCH 064/765] Use weeks instead of week for more than one --- app/controllers/officing/polls_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/officing/polls_controller.rb b/app/controllers/officing/polls_controller.rb index 46bcf9f37..5ba94e024 100644 --- a/app/controllers/officing/polls_controller.rb +++ b/app/controllers/officing/polls_controller.rb @@ -7,7 +7,7 @@ class Officing::PollsController < Officing::BaseController def final @polls = if current_user.poll_officer? - current_user.poll_officer.final_days_assigned_polls.select {|poll| poll.ends_at > 2.week.ago && poll.expired?} + current_user.poll_officer.final_days_assigned_polls.select {|poll| poll.ends_at > 2.weeks.ago && poll.expired?} else [] end From c2d154b1ac72a231d221c2e0d30f51433d896e3d Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 20 Sep 2017 16:12:28 +0200 Subject: [PATCH 065/765] Comply with Style/PredicateName rule for ? method names --- lib/census_api.rb | 2 +- lib/document_parser.rb | 2 +- lib/local_census.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/census_api.rb b/lib/census_api.rb index 066c0be95..931781c6d 100644 --- a/lib/census_api.rb +++ b/lib/census_api.rb @@ -119,7 +119,7 @@ class CensusApi {get_habita_datos_response: {get_habita_datos_return: {datos_habitante: {}, datos_vivienda: {}}}} end - def is_dni?(document_type) + def dni?(document_type) document_type.to_s == "1" end diff --git a/lib/document_parser.rb b/lib/document_parser.rb index c60b180dc..9e59c6b75 100644 --- a/lib/document_parser.rb +++ b/lib/document_parser.rb @@ -5,7 +5,7 @@ module DocumentParser document_number = document_number.to_s.gsub(/[^0-9A-Za-z]/i, '') variants = [] - if is_dni?(document_type) + if dni?(document_type) document_number, letter = split_letter_from(document_number) number_variants = get_number_variants_with_leading_zeroes_from(document_number) letter_variants = get_letter_variants(number_variants, letter) diff --git a/lib/local_census.rb b/lib/local_census.rb index 6c6e8fe12..1a0428787 100644 --- a/lib/local_census.rb +++ b/lib/local_census.rb @@ -63,7 +63,7 @@ class LocalCensus LocalCensusRecord.find_by(document_type: document_type, document_number: document_number) end - def is_dni?(document_type) + def dni?(document_type) document_type.to_s == "1" end From 6aba5de8017ee2e54cb16a6e99f5b2fb33947b1a Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 20 Sep 2017 16:13:08 +0200 Subject: [PATCH 066/765] Make rubocop display cop name and style guide link to improve output --- .rubocop.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index e2cc2bf93..49de3550b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,6 +1,8 @@ inherit_from: .rubocop_todo.yml AllCops: + DisplayCopNames: true + DisplayStyleGuide: true Include: - '**/Rakefile' - '**/config.ru' From 38ba5e159bbce7e8bf4a0823daa96e32c724ab1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 20 Sep 2017 17:45:17 +0200 Subject: [PATCH 067/765] Legislation proposals show and edit views available --- app/controllers/application_controller.rb | 4 ---- app/controllers/legislation/base_controller.rb | 4 ++++ app/controllers/legislation/processes_controller.rb | 1 + app/controllers/legislation/proposals_controller.rb | 11 ++++++----- app/views/legislation/proposals/_proposal.html.erb | 4 ++-- app/views/legislation/proposals/_votes.html.erb | 4 ++-- app/views/legislation/proposals/edit.html.erb | 4 ++-- app/views/legislation/proposals/share.html.erb | 2 +- app/views/legislation/proposals/show.html.erb | 6 +++--- 9 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 318777314..495a25314 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -76,10 +76,6 @@ class ApplicationController < ActionController::Base @proposal_votes = current_user ? current_user.proposal_votes(proposals) : {} end - def set_legislation_proposal_votes(proposals) - @proposal_votes = current_user ? current_user.legislation_proposal_votes(proposals) : {} - end - def set_spending_proposal_votes(spending_proposals) @spending_proposal_votes = current_user ? current_user.spending_proposal_votes(spending_proposals) : {} end diff --git a/app/controllers/legislation/base_controller.rb b/app/controllers/legislation/base_controller.rb index ca609ecba..c08ffc444 100644 --- a/app/controllers/legislation/base_controller.rb +++ b/app/controllers/legislation/base_controller.rb @@ -2,4 +2,8 @@ class Legislation::BaseController < ApplicationController include FeatureFlags feature_flag :legislation + + def set_legislation_proposal_votes(proposals) + @legislation_proposal_votes = current_user ? current_user.legislation_proposal_votes(proposals) : {} + end end diff --git a/app/controllers/legislation/processes_controller.rb b/app/controllers/legislation/processes_controller.rb index 6c12cea5b..d788d3bf3 100644 --- a/app/controllers/legislation/processes_controller.rb +++ b/app/controllers/legislation/processes_controller.rb @@ -88,6 +88,7 @@ class Legislation::ProcessesController < Legislation::BaseController @phase = :proposals_phase if @process.proposals_phase.started? + set_legislation_proposal_votes(@process.proposals) render :proposals else render :phase_not_open diff --git a/app/controllers/legislation/proposals_controller.rb b/app/controllers/legislation/proposals_controller.rb index 1eab07047..c65315ddf 100644 --- a/app/controllers/legislation/proposals_controller.rb +++ b/app/controllers/legislation/proposals_controller.rb @@ -20,6 +20,7 @@ class Legislation::ProposalsController < Legislation::BaseController def show super + set_legislation_proposal_votes(@process.proposals) @notifications = @proposal.notifications @document = Document.new(documentable: @proposal) redirect_to legislation_process_proposal_path(params[:process_id], @proposal), @@ -79,18 +80,18 @@ class Legislation::ProposalsController < Legislation::BaseController private def proposal_params - params.require(:proposal).permit(:legislation_process_id, :title, :question, :summary, :description, :external_url, :video_url, + params.require(:legislation_proposal).permit(:legislation_process_id, :title, :question, :summary, :description, :external_url, :video_url, :responsible_name, :tag_list, :terms_of_service, :geozone_id, documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id] ) end def retired_params - params.require(:proposal).permit(:retired_reason, :retired_explanation) + params.require(:legislation_proposal).permit(:retired_reason, :retired_explanation) end def valid_retired_params? - @proposal.errors.add(:retired_reason, I18n.t('errors.messages.blank')) if params[:proposal][:retired_reason].blank? - @proposal.errors.add(:retired_explanation, I18n.t('errors.messages.blank')) if params[:proposal][:retired_explanation].blank? + @proposal.errors.add(:retired_reason, I18n.t('errors.messages.blank')) if params[:legislation_proposal][:retired_reason].blank? + @proposal.errors.add(:retired_explanation, I18n.t('errors.messages.blank')) if params[:legislation_proposal][:retired_explanation].blank? @proposal.errors.empty? end @@ -102,7 +103,7 @@ class Legislation::ProposalsController < Legislation::BaseController 'proposal' end - def set_legislation_proposal_votes(proposals) + def set_featured_proposal_votes(proposals) @featured_proposals_votes = current_user ? current_user.proposal_votes(proposals) : {} end diff --git a/app/views/legislation/proposals/_proposal.html.erb b/app/views/legislation/proposals/_proposal.html.erb index 996be8f95..f3b603aa5 100644 --- a/app/views/legislation/proposals/_proposal.html.erb +++ b/app/views/legislation/proposals/_proposal.html.erb @@ -8,10 +8,10 @@
      <% cache [locale_and_user_status(proposal), 'index', proposal, proposal.author] do %> -

      <%= link_to proposal.title, namespaced_proposal_path(proposal) %>

      +

      <%= link_to proposal.title, legislation_process_proposal_path(proposal.legislation_process_id, proposal) %>

        - <%= link_to t("proposals.proposal.comments", count: proposal.comments_count), namespaced_proposal_path(proposal, anchor: "comments") %> + <%= link_to t("proposals.proposal.comments", count: proposal.comments_count), legislation_process_proposal_path(proposal.legislation_process_id, proposal, anchor: "comments") %>  •  <%= l proposal.created_at.to_date %> diff --git a/app/views/legislation/proposals/_votes.html.erb b/app/views/legislation/proposals/_votes.html.erb index fb41357af..b44c4d6cb 100644 --- a/app/views/legislation/proposals/_votes.html.erb +++ b/app/views/legislation/proposals/_votes.html.erb @@ -16,7 +16,7 @@

      - <% if voted_for?(@proposal_votes, proposal) %> + <% if voted_for?(@legislation_proposal_votes, proposal) %>
      <%= t("proposals.proposal.already_supported") %>
      @@ -58,7 +58,7 @@
      <% end %> - <% if voted_for?(@proposal_votes, proposal) && setting['twitter_handle'] %> + <% if voted_for?(@legislation_proposal_votes, proposal) && setting['twitter_handle'] %> diff --git a/app/views/legislation/proposals/edit.html.erb b/app/views/legislation/proposals/edit.html.erb index 6e5b14a08..6d4761524 100644 --- a/app/views/legislation/proposals/edit.html.erb +++ b/app/views/legislation/proposals/edit.html.erb @@ -4,11 +4,11 @@ <%= back_link_to %>
      - <%= link_to t("proposals.edit.show_link"), @proposal %> + <%= link_to t("proposals.edit.show_link"), legislation_process_proposal_path(@proposal.legislation_process_id, @proposal) %>

      <%= t("proposals.edit.editing") %>

      - <%= render "form", form_url: proposal_url(@proposal) %> + <%= render "form", form_url: legislation_process_proposal_url(@proposal.legislation_process_id, @proposal) %>
      diff --git a/app/views/legislation/proposals/share.html.erb b/app/views/legislation/proposals/share.html.erb index 5faa9d985..8ea0f7e98 100644 --- a/app/views/legislation/proposals/share.html.erb +++ b/app/views/legislation/proposals/share.html.erb @@ -9,7 +9,7 @@ <%= render "shared/canonical", href: proposal_url(@proposal) %> <% end %> -<% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @proposal_votes] do %> +<% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @legislation_proposal_votes] do %>
      diff --git a/app/views/legislation/proposals/show.html.erb b/app/views/legislation/proposals/show.html.erb index 1dc918e8e..b17464a04 100644 --- a/app/views/legislation/proposals/show.html.erb +++ b/app/views/legislation/proposals/show.html.erb @@ -10,7 +10,7 @@ <%= render "shared/canonical", href: proposal_url(@proposal) %> <% end %> -<% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @proposal_votes] do %> +<% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @legislation_proposal_votes] do %>
      @@ -29,7 +29,7 @@ <% end %> <% if current_user && @proposal.editable_by?(current_user) %> - <%= link_to edit_proposal_path(@proposal), class: 'edit-proposal button hollow float-right' do %> + <%= link_to edit_legislation_process_proposal_path(@proposal.legislation_process_id, @proposal), class: 'edit-proposal button hollow float-right' do %> <%= t("proposals.show.edit_proposal_link") %> <% end %> <% end %> @@ -147,7 +147,7 @@
      <% else %> <%= render 'votes', - { proposal: @proposal, vote_url: vote_proposal_path(@proposal, value: 'yes') } %> + { proposal: @proposal, vote_url: vote_legislation_process_proposal_path(@proposal.legislation_process_id, @proposal, value: 'yes') } %> <% end %>
      <%= render partial: 'shared/social_share', locals: { From 80e24d6c1311e5e0a255631166cc68383b267cbf Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 21 Sep 2017 00:58:39 +0200 Subject: [PATCH 068/765] changes h2 titles upcase to prevent broke specs --- app/assets/stylesheets/admin.scss | 5 ++++- app/views/admin/dashboard/index.html.erb | 4 ++-- config/locales/en/admin.yml | 2 +- config/locales/es/admin.yml | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 48614cd38..964e1348e 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -23,7 +23,10 @@ $sidebar-active: #f4fcd0; h2 { font-weight: 100; margin-bottom: $line-height; - text-transform: uppercase; + + &.title { + text-transform: uppercase; + } } .back { diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb index e73a37b57..ca64da28d 100644 --- a/app/views/admin/dashboard/index.html.erb +++ b/app/views/admin/dashboard/index.html.erb @@ -1,9 +1,9 @@
      <%= link_to root_path do %> - <%= t("admin.dashboard.index.back") + " " + setting['org_name'] %> + <%= t("admin.dashboard.index.back", org: setting['org_name']) %> <% end %>
      -

      <%= t("admin.dashboard.index.title") %>

      +

      <%= t("admin.dashboard.index.title") %>

      <%= t("admin.dashboard.index.description", org: setting['org_name']) %>

      diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index ca9a543e9..09f9dd84c 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -214,7 +214,7 @@ en: title: Hidden comments dashboard: index: - back: Go back to + back: Go back to %{org} title: Administration description: Welcome to the %{org} admin panel. debates: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 7d768e4d9..ae61b9d58 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -214,7 +214,7 @@ es: title: Comentarios ocultos dashboard: index: - back: Volver a + back: Volver a %{org} title: Administración description: Bienvenido al panel de administración de %{org}. debates: From ba041f90c857daf5dfa55c520c96dfabd5c2e8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 21 Sep 2017 16:17:11 +0200 Subject: [PATCH 069/765] Removed unnecessary parts in Legislation Proposals --- .../legislation/proposals_controller.rb | 57 +------------------ app/models/abilities/everyone.rb | 2 +- app/models/legislation/proposal.rb | 50 ---------------- app/models/user.rb | 2 +- app/models/vote.rb | 6 +- .../proposals/_filter_subnav.html.erb | 8 --- .../legislation/proposals/_proposal.html.erb | 26 +-------- .../legislation/proposals/_votes.html.erb | 12 ---- app/views/legislation/proposals/show.html.erb | 53 ++--------------- config/initializers/acts_as_taggable_on.rb | 5 +- config/initializers/vote_extensions.rb | 6 +- config/routes.rb | 4 -- 12 files changed, 17 insertions(+), 214 deletions(-) diff --git a/app/controllers/legislation/proposals_controller.rb b/app/controllers/legislation/proposals_controller.rb index c65315ddf..f924cb25f 100644 --- a/app/controllers/legislation/proposals_controller.rb +++ b/app/controllers/legislation/proposals_controller.rb @@ -12,7 +12,7 @@ class Legislation::ProposalsController < Legislation::BaseController invisible_captcha only: [:create, :update], honeypot: :subtitle - has_orders %w{hot_score confidence_score created_at relevance archival_date}, only: :index + has_orders %w{confidence_score created_at}, only: :index has_orders %w{most_voted newest oldest}, only: :show helper_method :resource_model, :resource_name @@ -21,7 +21,6 @@ class Legislation::ProposalsController < Legislation::BaseController def show super set_legislation_proposal_votes(@process.proposals) - @notifications = @proposal.notifications @document = Document.new(documentable: @proposal) redirect_to legislation_process_proposal_path(params[:process_id], @proposal), status: :moved_permanently if request.path != legislation_process_proposal_path(params[:process_id], @proposal) @@ -39,8 +38,6 @@ class Legislation::ProposalsController < Legislation::BaseController end def index_customization - discard_archived - load_retired load_successful_proposals load_featured unless @proposal_successful_exists end @@ -50,28 +47,12 @@ class Legislation::ProposalsController < Legislation::BaseController set_legislation_proposal_votes(@proposal) end - def retire - if valid_retired_params? && @proposal.update(retired_params.merge(retired_at: Time.current)) - redirect_to proposal_path(@proposal), notice: t('proposals.notice.retired') - else - render action: :retire_form - end - end - - def retire_form - end - def share if Setting['proposal_improvement_path'].present? @proposal_improvement_path = Setting['proposal_improvement_path'] end end - def vote_featured - @proposal.register_vote(current_user, 'yes') - set_featured_proposal_votes(@proposal) - end - def summary @proposals = Legislation::Proposal.for_summary @tag_cloud = tag_cloud @@ -85,16 +66,6 @@ class Legislation::ProposalsController < Legislation::BaseController documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id] ) end - def retired_params - params.require(:legislation_proposal).permit(:retired_reason, :retired_explanation) - end - - def valid_retired_params? - @proposal.errors.add(:retired_reason, I18n.t('errors.messages.blank')) if params[:legislation_proposal][:retired_reason].blank? - @proposal.errors.add(:retired_explanation, I18n.t('errors.messages.blank')) if params[:legislation_proposal][:retired_explanation].blank? - @proposal.errors.empty? - end - def resource_model Legislation::Proposal end @@ -103,32 +74,6 @@ class Legislation::ProposalsController < Legislation::BaseController 'proposal' end - def set_featured_proposal_votes(proposals) - @featured_proposals_votes = current_user ? current_user.proposal_votes(proposals) : {} - end - - def discard_archived - @resources = @resources.not_archived unless @current_order == "archival_date" - end - - def load_retired - if params[:retired].present? - @resources = @resources.retired - @resources = @resources.where(retired_reason: params[:retired]) if Legislation::Proposal::RETIRE_OPTIONS.include?(params[:retired]) - else - @resources = @resources.not_retired - end - end - - def load_featured - return unless !@advanced_search_terms && @search_terms.blank? && @tag_filter.blank? && params[:retired].blank? - @featured_proposals = Legislation::Proposal.not_archived.sort_by_confidence_score.limit(3) - if @featured_proposals.present? - set_featured_proposal_votes(@featured_proposals) - @resources = @resources.where('proposals.id NOT IN (?)', @featured_proposals.map(&:id)) - end - end - def load_successful_proposals @proposal_successful_exists = Legislation::Proposal.successful.exists? end diff --git a/app/models/abilities/everyone.rb b/app/models/abilities/everyone.rb index d0cef4846..e16a53cec 100644 --- a/app/models/abilities/everyone.rb +++ b/app/models/abilities/everyone.rb @@ -22,7 +22,7 @@ module Abilities can [:read, :changes, :go_to_version], Legislation::DraftVersion can [:read], Legislation::Question can [:create], Legislation::Answer - can [:read, :map, :summary, :share], Legislation::Proposal + can [:read, :map, :share], Legislation::Proposal can [:search, :comments, :read, :create, :new_comment], Legislation::Annotation end end diff --git a/app/models/legislation/proposal.rb b/app/models/legislation/proposal.rb index 5f6706339..d1339cabc 100644 --- a/app/models/legislation/proposal.rb +++ b/app/models/legislation/proposal.rb @@ -7,8 +7,6 @@ class Legislation::Proposal < ActiveRecord::Base include Sanitizable include Searchable include Filterable - include HasPublicAuthor - include Graphqlable include Followable include Communitable include Documentable @@ -21,13 +19,10 @@ class Legislation::Proposal < ActiveRecord::Base acts_as_votable acts_as_paranoid column: :hidden_at - RETIRE_OPTIONS = %w(duplicated started unfeasible done other) - belongs_to :process, class_name: 'Legislation::Process', foreign_key: 'legislation_process_id' belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' belongs_to :geozone has_many :comments, as: :commentable - has_many :proposal_notifications validates :title, presence: true validates :question, presence: true @@ -39,7 +34,6 @@ class Legislation::Proposal < ActiveRecord::Base validates :description, length: { maximum: Legislation::Proposal.description_max_length } validates :question, length: { in: 10..Legislation::Proposal.question_max_length } validates :responsible_name, length: { in: 6..Legislation::Proposal.responsible_name_max_length } - validates :retired_reason, inclusion: {in: RETIRE_OPTIONS, allow_nil: true} validates :terms_of_service, acceptance: { allow_nil: false }, on: :create @@ -53,16 +47,8 @@ class Legislation::Proposal < ActiveRecord::Base scope :sort_by_created_at, -> { reorder(created_at: :desc) } scope :sort_by_most_commented, -> { reorder(comments_count: :desc) } scope :sort_by_random, -> { reorder("RANDOM()") } - scope :sort_by_relevance, -> { all } scope :sort_by_flags, -> { order(flags_count: :desc, updated_at: :desc) } - scope :sort_by_archival_date, -> { archived.sort_by_confidence_score } - scope :archived, -> { where("proposals.created_at <= ?", Setting["months_to_archive_proposals"].to_i.months.ago) } - scope :not_archived, -> { where("proposals.created_at > ?", Setting["months_to_archive_proposals"].to_i.months.ago) } scope :last_week, -> { where("proposals.created_at >= ?", 7.days.ago)} - scope :retired, -> { where.not(retired_at: nil) } - scope :not_retired, -> { where(retired_at: nil) } - scope :successful, -> { where("cached_votes_up >= ?", Legislation::Proposal.votes_needed_for_success) } - scope :public_for_api, -> { all } def to_param "#{id}-#{title}".parameterize @@ -94,18 +80,6 @@ class Legislation::Proposal < ActiveRecord::Base /\A#{Setting["proposal_code_prefix"]}-\d\d\d\d-\d\d-(\d*)\z/.match(terms) end - def self.for_summary - summary = {} - categories = ActsAsTaggableOn::Tag.category_names.sort - geozones = Geozone.names.sort - - groups = categories + geozones - groups.each do |group| - summary[group] = search(group).last_week.sort_by_confidence_score.limit(3) - end - summary - end - def total_votes cached_votes_up end @@ -126,10 +100,6 @@ class Legislation::Proposal < ActiveRecord::Base user && user.level_two_or_three_verified? end - def retired? - retired_at.present? - end - def register_vote(user, vote_value) if votable_by?(user) && !archived? vote_by(voter: user, vote: vote_value) @@ -163,26 +133,6 @@ class Legislation::Proposal < ActiveRecord::Base tags.each{ |t| t.increment_custom_counter_for('LegislationProposal') } end - def self.votes_needed_for_success - Setting['votes_for_proposal_success'].to_i - end - - def successful? - total_votes >= Legislation::Proposal.votes_needed_for_success - end - - def archived? - created_at <= Setting["months_to_archive_proposals"].to_i.months.ago - end - - def notifications - proposal_notifications - end - - def users_to_notify - (voters + followers).uniq - end - protected def set_responsible_name diff --git a/app/models/user.rb b/app/models/user.rb index b34897688..36ac7d153 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -98,7 +98,7 @@ class User < ActiveRecord::Base end def legislation_proposal_votes(proposals) - voted = votes.for_proposals(proposals) + voted = votes.for_legislation_proposals(proposals) voted.each_with_object({}) { |v, h| h[v.votable_id] = v.value } end diff --git a/app/models/vote.rb b/app/models/vote.rb index 4d4d07be0..14b11a68d 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -5,12 +5,10 @@ class Vote < ActsAsVotable::Vote scope :public_for_api, -> do where(%{(votes.votable_type = 'Debate' and votes.votable_id in (?)) or (votes.votable_type = 'Proposal' and votes.votable_id in (?)) or - (votes.votable_type = 'Comment' and votes.votable_id in (?)) or - (votes.votable_type = 'LegislationProposal' and votes.votable_id in (?))}, + (votes.votable_type = 'Comment' and votes.votable_id in (?))}, Debate.public_for_api.pluck(:id), Proposal.public_for_api.pluck(:id), - Comment.public_for_api.pluck(:id), - Legislation::Proposal.public_for_api.pluck(:id)) + Comment.public_for_api.pluck(:id)) end end diff --git a/app/views/legislation/proposals/_filter_subnav.html.erb b/app/views/legislation/proposals/_filter_subnav.html.erb index fece62a17..986af6463 100644 --- a/app/views/legislation/proposals/_filter_subnav.html.erb +++ b/app/views/legislation/proposals/_filter_subnav.html.erb @@ -9,14 +9,6 @@ <% end %>
      • -
    • - <%= link_to "#tab-notifications" do %> -

      - <%= t("proposals.show.notifications_tab") %> - (<%= @notifications.count %>) -

      - <% end %> -
    • <%= link_to "#tab-documents" do %>

      diff --git a/app/views/legislation/proposals/_proposal.html.erb b/app/views/legislation/proposals/_proposal.html.erb index f3b603aa5..92becc805 100644 --- a/app/views/legislation/proposals/_proposal.html.erb +++ b/app/views/legislation/proposals/_proposal.html.erb @@ -51,30 +51,8 @@

      • - <% if proposal.successful? %> -
      - -

      - <%= t("proposals.proposal.successful", - voting: link_to(t("proposals.proposal.voting"), polls_path)).html_safe %> -

      -
      - <% if can? :create, Poll::Question %> -

      - <%= link_to t('poll_questions.create_question'), - new_admin_question_path(proposal_id: proposal.id), - class: "button hollow" %> -

      - <% end %> - <% elsif proposal.archived? %> -
      - <%= t("proposals.proposal.supports", count: proposal.total_votes) %> -

      <%= t("proposals.proposal.archived") %>

      -
      - <% else %> - <%= render 'legislation/proposals/votes', - { proposal: proposal, vote_url: vote_legislation_process_proposal_path(proposal.legislation_process_id, proposal, value: 'yes') } %> - <% end %> + <%= render 'legislation/proposals/votes', + { proposal: proposal, vote_url: vote_legislation_process_proposal_path(proposal.legislation_process_id, proposal, value: 'yes') } %>
    diff --git a/app/views/legislation/proposals/_votes.html.erb b/app/views/legislation/proposals/_votes.html.erb index b44c4d6cb..b294acf45 100644 --- a/app/views/legislation/proposals/_votes.html.erb +++ b/app/views/legislation/proposals/_votes.html.erb @@ -1,18 +1,6 @@
    -
    - - - <%= supports_percentage(proposal) %> / <%= t("proposals.proposal.total_percent") %> - -
    - <%= t("proposals.proposal.supports", count: proposal.total_votes) %>  - - "> - <%= t("proposals.proposal.supports_necessary", number: number_with_delimiter(Proposal.votes_needed_for_success)) %> - -
    diff --git a/app/views/legislation/proposals/show.html.erb b/app/views/legislation/proposals/show.html.erb index b17464a04..f3692e3c7 100644 --- a/app/views/legislation/proposals/show.html.erb +++ b/app/views/legislation/proposals/show.html.erb @@ -22,12 +22,6 @@ class: 'button hollow float-right' %> <% end %> - <% if author_of?(@proposal, current_user) %> - <%= link_to t("proposals.show.send_notification"), - new_proposal_notification_path(proposal_id: @proposal.id), - class: 'button hollow float-right' %> - <% end %> - <% if current_user && @proposal.editable_by?(current_user) %> <%= link_to edit_legislation_process_proposal_path(@proposal.legislation_process_id, @proposal), class: 'edit-proposal button hollow float-right' do %> <%= t("proposals.show.edit_proposal_link") %> @@ -35,14 +29,7 @@ <% end %>

    <%= @proposal.title %>

    - <% if @proposal.retired? %> -
    - - <%= t("proposals.show.retired_warning") %>
    - <%= link_to t("proposals.show.retired_warning_link_to_explanation"), "#retired_explanation" %> -     -
    - <% elsif @proposal.conflictive? %> + <% if @proposal.conflictive? %>
    <%= t("proposals.show.flag") %>
    @@ -105,13 +92,6 @@

    <%= @proposal.question %>

    - <% if @proposal.retired? %> -
    -

    <%= t('proposals.show.retired') %>: <%= t("proposals.retire_options.#{@proposal.retired_reason}") unless @proposal.retired_reason == 'other' %>

    - <%= simple_format text_with_links(@proposal.retired_explanation), {}, sanitize: false %> -
    - <% end %> - <%= render 'shared/tags', taggable: @proposal %> <%= render 'shared/geozone', geozonable: @proposal %> @@ -125,30 +105,8 @@

    <%= t("votes.supports") %>

    - - <% if @proposal.successful? %> -

    - <%= t("proposals.proposal.successful", - voting: link_to(t("proposals.proposal.voting"), polls_path)).html_safe %> -

    - <% if can? :create, Poll::Question %> -

    - <%= link_to t('poll_questions.create_question'), - new_admin_question_path(proposal_id: @proposal.id), - class: "button hollow expanded" %> -

    - <% end %> - <% elsif @proposal.archived? %> -
    -

    - <%= t("proposals.proposal.supports", count: @proposal.total_votes) %> -

    -

    <%= t("proposals.proposal.archived") %>

    -
    - <% else %> - <%= render 'votes', - { proposal: @proposal, vote_url: vote_legislation_process_proposal_path(@proposal.legislation_process_id, @proposal, value: 'yes') } %> - <% end %> + <%= render 'votes', + { proposal: @proposal, vote_url: vote_legislation_process_proposal_path(@proposal.legislation_process_id, @proposal, value: 'yes') } %>
    <%= render partial: 'shared/social_share', locals: { share_title: t("proposals.show.share"), @@ -168,11 +126,10 @@ <% end %>
    - <%= render "proposals/filter_subnav" %> - <%= render "proposals/notifications" %> + <%= render "legislation/proposals/filter_subnav" %>
    - <%= render "proposals/comments" %> + <%= render "legislation/proposals/comments" %>
    diff --git a/config/initializers/acts_as_taggable_on.rb b/config/initializers/acts_as_taggable_on.rb index 9db832bef..57766c8c9 100644 --- a/config/initializers/acts_as_taggable_on.rb +++ b/config/initializers/acts_as_taggable_on.rb @@ -8,11 +8,10 @@ module ActsAsTaggableOn scope :public_for_api, -> do where(%{taggings.tag_id in (?) and (taggings.taggable_type = 'Debate' and taggings.taggable_id in (?)) or - (taggings.taggable_type = 'Proposal' and taggings.taggable_id in (?)) or taggings.taggable_type = 'LegislationProposal' and taggings.taggable_id in (?))}, + (taggings.taggable_type = 'Proposal' and taggings.taggable_id in (?))}, Tag.where('kind IS NULL or kind = ?', 'category').pluck(:id), Debate.public_for_api.pluck(:id), - Proposal.public_for_api.pluck(:id), - Legislation::Proposal.public_for_api.pluck(:id)) + Proposal.public_for_api.pluck(:id)) end def touch_taggable diff --git a/config/initializers/vote_extensions.rb b/config/initializers/vote_extensions.rb index 1b6ae7252..effec12ea 100644 --- a/config/initializers/vote_extensions.rb +++ b/config/initializers/vote_extensions.rb @@ -9,12 +9,12 @@ ActsAsVotable::Vote.class_eval do where(votable_type: 'Proposal', votable_id: proposals) end - def self.for_spending_proposals(spending_proposals) - where(votable_type: 'SpendingProposal', votable_id: spending_proposals) + def self.for_legislation_proposals(proposals) + where(votable_type: 'Legislation::Proposal', votable_id: proposals) end def self.for_spending_proposals(spending_proposals) - where(votable_type: 'LegislationProposal', votable_id: legislation_proposals) + where(votable_type: 'SpendingProposal', votable_id: spending_proposals) end def self.for_budget_investments(budget_investments) diff --git a/config/routes.rb b/config/routes.rb index e2ccb51ed..851ff0cdf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -132,17 +132,13 @@ Rails.application.routes.draw do resources :proposals do member do post :vote - post :vote_featured put :flag put :unflag - get :retire_form get :share - patch :retire end collection do get :map get :suggest - get :summary end end resources :draft_versions, only: [:show] do From 6c1c71fcc9623ce7902e024060a123d697edaa81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 21 Sep 2017 16:18:08 +0200 Subject: [PATCH 070/765] Minor fixes Fixed subnavigation active links and button to create new proposal. --- app/helpers/tags_helper.rb | 2 ++ app/views/legislation/processes/proposals.html.erb | 4 +--- app/views/shared/_subnavigation.html.erb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb index 4cabae278..eb34a64f2 100644 --- a/app/helpers/tags_helper.rb +++ b/app/helpers/tags_helper.rb @@ -8,6 +8,8 @@ module TagsHelper proposals_path(search: tag_name) when 'budget/investment' budget_investments_path(@budget, search: tag_name) + when 'legislation/proposal' + legislation_process_proposals_path(@process, search: tag_name) else '#' end diff --git a/app/views/legislation/processes/proposals.html.erb b/app/views/legislation/processes/proposals.html.erb index 9e54ba46e..5883658b7 100644 --- a/app/views/legislation/processes/proposals.html.erb +++ b/app/views/legislation/processes/proposals.html.erb @@ -20,9 +20,7 @@
    -
    -

    <%= t('.participate') %>

    -
    +

    <%= link_to t("proposals.index.start_proposal"), new_legislation_process_proposal_path(@process), class: 'button expanded' %>

    diff --git a/app/views/shared/_subnavigation.html.erb b/app/views/shared/_subnavigation.html.erb index dd9809dd3..fbcdfebf3 100644 --- a/app/views/shared/_subnavigation.html.erb +++ b/app/views/shared/_subnavigation.html.erb @@ -12,7 +12,7 @@
  • <%= layout_menu_link_to t("layouts.header.proposals"), proposals_path, - controller_name == 'proposals', + controller_name == 'proposals' && !controller.class.parent == Legislation, accesskey: "2", title: t("shared.go_to_page") + t("layouts.header.proposals") %>
    • From 5ae8cda0d5079ba559cf545005e9c7d009498ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 21 Sep 2017 16:23:34 +0200 Subject: [PATCH 071/765] Fixed legislation proposal vote action --- app/models/legislation/proposal.rb | 2 +- app/views/legislation/proposals/vote.js.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/legislation/proposal.rb b/app/models/legislation/proposal.rb index d1339cabc..5ced1529d 100644 --- a/app/models/legislation/proposal.rb +++ b/app/models/legislation/proposal.rb @@ -101,7 +101,7 @@ class Legislation::Proposal < ActiveRecord::Base end def register_vote(user, vote_value) - if votable_by?(user) && !archived? + if votable_by?(user) vote_by(voter: user, vote: vote_value) end end diff --git a/app/views/legislation/proposals/vote.js.erb b/app/views/legislation/proposals/vote.js.erb index 4a5ca6b6b..1a0d6d4ed 100644 --- a/app/views/legislation/proposals/vote.js.erb +++ b/app/views/legislation/proposals/vote.js.erb @@ -1 +1 @@ -$("#<%= dom_id(@proposal) %>_votes").html('<%= j render("proposals/votes", proposal: @proposal) %>'); \ No newline at end of file +$("#<%= dom_id(@proposal) %>_votes").html('<%= j render("legislation/proposals/votes", proposal: @proposal) %>'); From 57c48fe596e041a412a0c81c1eb663b470df95a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 21 Sep 2017 17:13:12 +0200 Subject: [PATCH 072/765] Legislation proposals comments working --- app/models/comment.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/comment.rb b/app/models/comment.rb index 8b68e11ad..a0cb343d7 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -3,7 +3,7 @@ class Comment < ActiveRecord::Base include HasPublicAuthor include Graphqlable - COMMENTABLE_TYPES = %w(Debate Proposal Budget::Investment Poll::Question Legislation::Question Legislation::Annotation Topic).freeze + COMMENTABLE_TYPES = %w(Debate Proposal Budget::Investment Poll::Question Legislation::Question Legislation::Annotation Topic Legislation::Proposal).freeze acts_as_paranoid column: :hidden_at include ActsAsParanoidAliases From 536ee520e89d9338d4deec30cabe18768c29ebf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 21 Sep 2017 17:13:22 +0200 Subject: [PATCH 073/765] Removed unnecessary views --- .../legislation/proposals/_retired.html.erb | 13 ----- .../proposals/retire_form.html.erb | 38 ------------- .../legislation/proposals/summary.html.erb | 53 ------------------- .../proposals/vote_featured.js.erb | 1 - 4 files changed, 105 deletions(-) delete mode 100644 app/views/legislation/proposals/_retired.html.erb delete mode 100644 app/views/legislation/proposals/retire_form.html.erb delete mode 100644 app/views/legislation/proposals/summary.html.erb delete mode 100644 app/views/legislation/proposals/vote_featured.js.erb diff --git a/app/views/legislation/proposals/_retired.html.erb b/app/views/legislation/proposals/_retired.html.erb deleted file mode 100644 index 2167b14af..000000000 --- a/app/views/legislation/proposals/_retired.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -
    -

    <%= t("proposals.index.retired_proposals") %>

    - -<% if params[:retired].blank? %> -

    <%= link_to t("proposals.index.retired_proposals_link"), proposals_path(retired: 'all'), class: "small" %>

    -<% else %> -
    - <%= link_to t("proposals.index.retired_links.all"), proposals_path(retired: 'all') %> - <% Proposal::RETIRE_OPTIONS.each do |option| %> - <%= link_to t("proposals.index.retired_links.#{option}"), proposals_path(retired: option) %> - <% end %> -
    -<% end %> diff --git a/app/views/legislation/proposals/retire_form.html.erb b/app/views/legislation/proposals/retire_form.html.erb deleted file mode 100644 index d56277cb3..000000000 --- a/app/views/legislation/proposals/retire_form.html.erb +++ /dev/null @@ -1,38 +0,0 @@ -
    - -
    - -

    <%= t("proposals.retire_form.title") %>

    - -

    <%= link_to @proposal.title, @proposal %>

    - -
    - <%= t("proposals.retire_form.warning") %> -
    - - <%= form_for(@proposal, url: retire_proposal_path(@proposal)) do |f| %> - <%= render 'shared/errors', resource: @proposal %> -
    -
    - <%= f.label :retired_reason, t("proposals.retire_form.retired_reason_label") %> - <%= f.select :retired_reason, retire_proposals_options, {include_blank: t("proposals.retire_form.retired_reason_blank"), label: false} %> -
    -
    - -
    -
    - <%= f.label :retired_explanation, t("proposals.retire_form.retired_explanation_label") %> - <%= f.text_area :retired_explanation, rows: 4, maxlength: 500, label: false, - placeholder: t('proposals.retire_form.retired_explanation_placeholder') %> -
    -
    - -
    -
    - <%= f.submit(class: "button expanded", value: t("proposals.retire_form.submit_button")) %> -
    -
    - <% end %> - -
    -
    \ No newline at end of file diff --git a/app/views/legislation/proposals/summary.html.erb b/app/views/legislation/proposals/summary.html.erb deleted file mode 100644 index a28cf8750..000000000 --- a/app/views/legislation/proposals/summary.html.erb +++ /dev/null @@ -1,53 +0,0 @@ -
    -
    -
    - <%= back_link_to %> - - <% @proposals.each do |group_name, proposals| %> -
    -

    <%= group_name %>

    - - <% proposals[0..2].each do |proposal| %> -
    -
    -
    -
    -
    -

    <%= link_to proposal.title, namespaced_proposal_path(proposal) %>

    - -

    - <% if proposal.author.hidden? || proposal.author.erased? %> - <%= t("proposals.show.author_deleted") %> - <% else %> - <%= proposal.author.name %> - <% if proposal.author.display_official_position_badge? %> - - <%= proposal.author.official_position %> - - <% end %> - <% end %> -

    - -
    -

    <%= proposal.summary %>

    -
    -
    -
    -
    -
    -
    - <% end %> -
    - <% end %> -
    - -
    - -
    -
    -
    \ No newline at end of file diff --git a/app/views/legislation/proposals/vote_featured.js.erb b/app/views/legislation/proposals/vote_featured.js.erb deleted file mode 100644 index 52619282b..000000000 --- a/app/views/legislation/proposals/vote_featured.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#<%= dom_id(@proposal) %>_votes").html('<%= j render("proposals/featured_votes", proposal: @proposal) %>'); \ No newline at end of file From 4db2584f87d4b535aa9b6c39de15e14413fd926f Mon Sep 17 00:00:00 2001 From: iagirre Date: Thu, 21 Sep 2017 18:21:45 +0200 Subject: [PATCH 074/765] The tags are suggested based on the entries the user makes. Cambios para hacer commit: modificado: app/assets/javascripts/tag_autocomplete.js.coffee modificado: app/assets/stylesheets/autocomplete_overrides.scss nuevo archivo: app/controllers/tags_controller.rb modificado: app/models/abilities/common.rb modificado: app/views/debates/_form.html.erb modificado: app/views/proposals/_form.html.erb modificado: config/initializers/acts_as_taggable_on.rb modificado: config/routes.rb modificado: spec/lib/acts_as_taggable_on_spec.rb --- .../javascripts/tag_autocomplete.js.coffee | 13 +++++-- .../stylesheets/autocomplete_overrides.scss | 39 ++++++++----------- app/controllers/tags_controller.rb | 11 ++++++ app/models/abilities/common.rb | 1 + app/views/debates/_form.html.erb | 3 +- app/views/proposals/_form.html.erb | 5 ++- config/initializers/acts_as_taggable_on.rb | 13 +++++++ config/routes.rb | 33 ++++++++-------- spec/lib/acts_as_taggable_on_spec.rb | 15 +++++++ 9 files changed, 86 insertions(+), 47 deletions(-) create mode 100644 app/controllers/tags_controller.rb diff --git a/app/assets/javascripts/tag_autocomplete.js.coffee b/app/assets/javascripts/tag_autocomplete.js.coffee index 9e10c100e..be27cd81c 100644 --- a/app/assets/javascripts/tag_autocomplete.js.coffee +++ b/app/assets/javascripts/tag_autocomplete.js.coffee @@ -7,13 +7,18 @@ App.TagAutocomplete = return (App.TagAutocomplete.split( term ).pop()) init_autocomplete: -> - $('.js-tag-list').autocomplete + $('.tag-autocomplete').autocomplete source: (request, response) -> - response( $.ui.autocomplete.filter(["Arbol", "Becerro", "Caracol"], App.TagAutocomplete.extractLast( request.term ) ) ); + $.ajax + url: $('.tag-autocomplete').data('js-url'), + data: {search: App.TagAutocomplete.extractLast( request.term )}, + type: 'GET', + dataType: 'json' + success: ( data ) -> + response( data ); + minLength: 0, search: -> - console.log(this.value); - console.log(App.TagAutocomplete.extractLast( this.value )); App.TagAutocomplete.extractLast( this.value ); focus: -> return false; diff --git a/app/assets/stylesheets/autocomplete_overrides.scss b/app/assets/stylesheets/autocomplete_overrides.scss index 68537fd8a..9eac7162b 100644 --- a/app/assets/stylesheets/autocomplete_overrides.scss +++ b/app/assets/stylesheets/autocomplete_overrides.scss @@ -4,7 +4,6 @@ /* Autocomplete ----------------------------------*/ .ui-autocomplete { position: absolute; cursor: default; } -.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; } /* workarounds */ * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ @@ -13,29 +12,23 @@ ----------------------------------*/ .ui-menu { list-style:none; - padding: 0px 5px; - margin: 0; + padding: $line-height / 4 $line-height / 3; display:block; - /*width:227px;*/ background: white; border: 1px solid $border; -} -.ui-menu .ui-menu { - margin-top: -3px; -} -.ui-menu .ui-menu-item { - margin:0; - padding: 0; - width: 200px; -} -.ui-menu .ui-menu-item a { - /* text-decoration:none; - display:block;*/ - padding:.2em .4em; - /* line-height:1.5; - zoom:1;*/ -} -.ui-menu .ui-menu-item a.ui-state-hover, -.ui-menu .ui-menu-item a.ui-state-active { - margin: -1px; + font-size: $small-font-size; + + .ui-menu-item { + + .ui-menu-item-wrapper { + padding: $line-height / 4 $line-height / 3; + position: relative; + } + + .ui-state-hover, .ui-state-active { + background: #ececec; + border-radius: rem-calc(6); + } + } + } \ No newline at end of file diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb new file mode 100644 index 000000000..c58067048 --- /dev/null +++ b/app/controllers/tags_controller.rb @@ -0,0 +1,11 @@ +class TagsController < ApplicationController + + load_and_authorize_resource class: ActsAsTaggableOn::Tag + respond_to :json + + def suggest + @tags = ActsAsTaggableOn::Tag.search(params[:search]).map(&:name) + respond_with @tags + end + +end diff --git a/app/models/abilities/common.rb b/app/models/abilities/common.rb index 620cfb212..0df92616d 100644 --- a/app/models/abilities/common.rb +++ b/app/models/abilities/common.rb @@ -24,6 +24,7 @@ module Abilities can :suggest, Debate can :suggest, Proposal + can :suggest, ActsAsTaggableOn::Tag can [:flag, :unflag], Comment cannot [:flag, :unflag], Comment, user_id: user.id diff --git a/app/views/debates/_form.html.erb b/app/views/debates/_form.html.erb index 28ef69804..a98611011 100644 --- a/app/views/debates/_form.html.erb +++ b/app/views/debates/_form.html.erb @@ -23,7 +23,8 @@ label: false, placeholder: t("debates.form.tags_placeholder"), aria: {describedby: "tag-list-help-text"}, - data: {js_url: tags_search_path}%> + data: {js_url: suggest_tags_path}, + class: 'tag-autocomplete'%>
    <% if @debate.new_record? %> diff --git a/app/views/proposals/_form.html.erb b/app/views/proposals/_form.html.erb index 73b39dfdb..b46dbc69e 100644 --- a/app/views/proposals/_form.html.erb +++ b/app/views/proposals/_form.html.erb @@ -70,8 +70,9 @@ <%= f.text_field :tag_list, value: @proposal.tag_list.to_s, label: false, placeholder: t("proposals.form.tags_placeholder"), - class: 'js-tag-list', - aria: {describedby: "tag-list-help-text"} %> + class: 'js-tag-list tag-autocomplete', + aria: {describedby: "tag-list-help-text"}, + data: {js_url: suggest_tags_path} %>
    <% if current_user.unverified? %> diff --git a/config/initializers/acts_as_taggable_on.rb b/config/initializers/acts_as_taggable_on.rb index 57766c8c9..018319442 100644 --- a/config/initializers/acts_as_taggable_on.rb +++ b/config/initializers/acts_as_taggable_on.rb @@ -43,6 +43,18 @@ module ActsAsTaggableOn Tagging.public_for_api.pluck('DISTINCT taggings.tag_id')) end + include PgSearch + + pg_search_scope :pg_search, against: :name, + using: { + tsearch: {prefix: true} + }, + ignoring: :accents + + def self.search(term) + pg_search(term) + end + def increment_custom_counter_for(taggable_type) Tag.increment_counter(custom_counter_field_name_for(taggable_type), id) end @@ -78,6 +90,7 @@ module ActsAsTaggableOn end private + def custom_counter_field_name_for(taggable_type) "#{taggable_type.underscore.pluralize}_count" end diff --git a/config/routes.rb b/config/routes.rb index 666285496..7b1c1cac0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,17 +6,17 @@ Rails.application.routes.draw do end devise_for :users, controllers: { - registrations: 'users/registrations', - sessions: 'users/sessions', - confirmations: 'users/confirmations', - omniauth_callbacks: 'users/omniauth_callbacks' - } + registrations: 'users/registrations', + sessions: 'users/sessions', + confirmations: 'users/confirmations', + omniauth_callbacks: 'users/omniauth_callbacks' + } devise_for :organizations, class_name: 'User', - controllers: { - registrations: 'organizations/registrations', - sessions: 'devise/sessions', - }, - skip: [:omniauth_callbacks] + controllers: { + registrations: 'organizations/registrations', + sessions: 'devise/sessions' + }, + skip: [:omniauth_callbacks] devise_scope :organization do get 'organizations/sign_up/success', to: 'organizations/registrations#success' @@ -167,11 +167,12 @@ Rails.application.routes.draw do resource :email, controller: "email", only: [:new, :show, :create] resource :letter, controller: "letter", only: [:new, :create, :show, :edit, :update] end - - namespace :tags do - get :search - end + resources :tags do + collection do + get :suggest + end + end namespace :admin do root to: "dashboard#index" @@ -435,9 +436,7 @@ Rails.application.routes.draw do get '/graphql', to: 'graphql#query' post '/graphql', to: 'graphql#query' - if Rails.env.development? - mount LetterOpenerWeb::Engine, at: "/letter_opener" - end + mount LetterOpenerWeb::Engine, at: "/letter_opener" if Rails.env.development? mount GraphiQL::Rails::Engine, at: '/graphiql', graphql_path: '/graphql' diff --git a/spec/lib/acts_as_taggable_on_spec.rb b/spec/lib/acts_as_taggable_on_spec.rb index 761e90553..de53b35e7 100644 --- a/spec/lib/acts_as_taggable_on_spec.rb +++ b/spec/lib/acts_as_taggable_on_spec.rb @@ -133,6 +133,21 @@ describe 'ActsAsTaggableOn' do expect(ActsAsTaggableOn::Tag.public_for_api).to be_empty end end + + describe "search" do + it "containing the word in the name" do + create(:tag, name: 'Familia') + create(:tag, name: 'Cultura') + create(:tag, name: 'Salud') + create(:tag, name: 'Famosos') + + expect(ActsAsTaggableOn::Tag.pg_search('f').length).to eq(2) + expect(ActsAsTaggableOn::Tag.search('cultura').first.name).to eq('Cultura') + expect(ActsAsTaggableOn::Tag.search('sal').first.name).to eq('Salud') + expect(ActsAsTaggableOn::Tag.search('fami').first.name).to eq('Familia') + end + end + end end From c01208b203a319feac420fc0a78ee26239ffab2d Mon Sep 17 00:00:00 2001 From: iagirre Date: Thu, 21 Sep 2017 18:27:52 +0200 Subject: [PATCH 075/765] Autocomplete tags for investments projects --- app/views/budgets/investments/_form.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/budgets/investments/_form.html.erb b/app/views/budgets/investments/_form.html.erb index 7cf2bb1e2..8f98b9d5c 100644 --- a/app/views/budgets/investments/_form.html.erb +++ b/app/views/budgets/investments/_form.html.erb @@ -49,7 +49,8 @@ label: false, placeholder: t("budgets.investments.form.tags_placeholder"), aria: {describedby: "tags-list-help-text"}, - class: 'js-tag-list' %> + class: 'js-tag-list tag-autocomplete', + data: {js_url: suggest_tags_path} %>
    From f3229007e8ba0c0853ea4b03b2bc8df22fe301e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 21 Sep 2017 21:28:54 +0200 Subject: [PATCH 076/765] Run pending migrations --- db/schema.rb | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 41952607e..acacbf347 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: 20170915101519) do +ActiveRecord::Schema.define(version: 20170918231410) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -620,20 +620,6 @@ ActiveRecord::Schema.define(version: 20170915101519) do t.string "location" end - create_table "poll_final_recounts", force: :cascade do |t| - t.integer "booth_assignment_id" - t.integer "officer_assignment_id" - t.integer "count" - t.text "count_log", default: "" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.text "officer_assignment_id_log", default: "" - t.date "date", null: false - end - - add_index "poll_final_recounts", ["booth_assignment_id"], name: "index_poll_final_recounts_on_booth_assignment_id", using: :btree - add_index "poll_final_recounts", ["officer_assignment_id"], name: "index_poll_final_recounts_on_officer_assignment_id", using: :btree - create_table "poll_null_results", force: :cascade do |t| t.integer "author_id" t.integer "amount" @@ -725,6 +711,21 @@ ActiveRecord::Schema.define(version: 20170915101519) do add_index "poll_shifts", ["booth_id"], name: "index_poll_shifts_on_booth_id", using: :btree add_index "poll_shifts", ["officer_id"], name: "index_poll_shifts_on_officer_id", using: :btree + create_table "poll_total_results", force: :cascade do |t| + t.integer "author_id" + t.integer "amount" + t.string "origin" + t.date "date" + t.integer "booth_assignment_id" + t.integer "officer_assignment_id" + t.text "amount_log", default: "" + t.text "officer_assignment_id_log", default: "" + t.text "author_id_log", default: "" + end + + add_index "poll_total_results", ["booth_assignment_id"], name: "index_poll_total_results_on_booth_assignment_id", using: :btree + add_index "poll_total_results", ["officer_assignment_id"], name: "index_poll_total_results_on_officer_assignment_id", using: :btree + create_table "poll_voters", force: :cascade do |t| t.string "document_number" t.string "document_type" @@ -1010,7 +1011,7 @@ ActiveRecord::Schema.define(version: 20170915101519) do t.boolean "email_digest", default: true t.boolean "email_on_direct_message", default: true t.boolean "official_position_badge", default: false - t.datetime "password_changed_at", default: '2017-09-06 18:19:39', null: false + t.datetime "password_changed_at", default: '2015-01-01 00:01:01', null: false t.boolean "created_from_signature", default: false t.integer "failed_email_digests_count", default: 0 t.text "former_users_data_log", default: "" @@ -1123,8 +1124,6 @@ ActiveRecord::Schema.define(version: 20170915101519) do add_foreign_key "organizations", "users" add_foreign_key "poll_answers", "poll_questions", column: "question_id" add_foreign_key "poll_booth_assignments", "polls" - add_foreign_key "poll_final_recounts", "poll_booth_assignments", column: "booth_assignment_id" - add_foreign_key "poll_final_recounts", "poll_officer_assignments", column: "officer_assignment_id" add_foreign_key "poll_null_results", "poll_booth_assignments", column: "booth_assignment_id" add_foreign_key "poll_null_results", "poll_officer_assignments", column: "officer_assignment_id" add_foreign_key "poll_officer_assignments", "poll_booth_assignments", column: "booth_assignment_id" From 0948959a65318284014ad5cff4723285d04e01b1 Mon Sep 17 00:00:00 2001 From: iagirre Date: Fri, 22 Sep 2017 08:09:03 +0200 Subject: [PATCH 077/765] Run scss-lint to fix some errors in autocomplete_overrides.scss --- .../stylesheets/autocomplete_overrides.scss | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/autocomplete_overrides.scss b/app/assets/stylesheets/autocomplete_overrides.scss index 9eac7162b..dd2b939ad 100644 --- a/app/assets/stylesheets/autocomplete_overrides.scss +++ b/app/assets/stylesheets/autocomplete_overrides.scss @@ -3,18 +3,23 @@ /* Autocomplete ----------------------------------*/ -.ui-autocomplete { position: absolute; cursor: default; } +.ui-autocomplete { + position: absolute; + cursor: default; +} /* workarounds */ -* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ +* html .ui-autocomplete { + width: 1px; +} /* without this, the menu expands to 100% in IE6 */ /* Menu ----------------------------------*/ .ui-menu { - list-style:none; + list-style: none; padding: $line-height / 4 $line-height / 3; - display:block; - background: white; + display: block; + background: #fff; border: 1px solid $border; font-size: $small-font-size; @@ -25,10 +30,11 @@ position: relative; } - .ui-state-hover, .ui-state-active { + .ui-state-hover, + .ui-state-active { background: #ececec; border-radius: rem-calc(6); } } -} \ No newline at end of file +} From ebfa3fb011b200b89a902160f70bbfbc8c4e7a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 22 Sep 2017 11:39:17 +0200 Subject: [PATCH 078/765] Disallow users to edit their legislation proposals --- app/models/abilities/common.rb | 2 +- app/models/abilities/everyone.rb | 2 +- app/views/legislation/proposals/show.html.erb | 12 ------------ 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/app/models/abilities/common.rb b/app/models/abilities/common.rb index 459b779c7..2de8e4c79 100644 --- a/app/models/abilities/common.rb +++ b/app/models/abilities/common.rb @@ -19,7 +19,7 @@ module Abilities can [:retire_form, :retire], Proposal, author_id: user.id can :read, Legislation::Proposal - can :update, Legislation::Proposal do |proposal| + cannot [:edit, :update], Legislation::Proposal do |proposal| proposal.editable_by?(user) end can [:retire_form, :retire], Legislation::Proposal, author_id: user.id diff --git a/app/models/abilities/everyone.rb b/app/models/abilities/everyone.rb index e16a53cec..c97bf0d94 100644 --- a/app/models/abilities/everyone.rb +++ b/app/models/abilities/everyone.rb @@ -18,7 +18,7 @@ module Abilities can [:read, :print], Budget::Investment can :read_results, Budget, phase: "finished" can :new, DirectMessage - can [:read, :debate, :draft_publication, :allegations, :result_publication], Legislation::Process, published: true + can [:read, :debate, :draft_publication, :allegations, :result_publication, :proposals], Legislation::Process, published: true can [:read, :changes, :go_to_version], Legislation::DraftVersion can [:read], Legislation::Question can [:create], Legislation::Answer diff --git a/app/views/legislation/proposals/show.html.erb b/app/views/legislation/proposals/show.html.erb index f3692e3c7..48dae91b6 100644 --- a/app/views/legislation/proposals/show.html.erb +++ b/app/views/legislation/proposals/show.html.erb @@ -16,18 +16,6 @@
    <%= back_link_to %> - <% if can?(:create, @document) && @proposal.documents.size < Proposal.max_documents_allowed %> - <%= link_to t("documents.upload_document"), - new_document_path(documentable_id: @proposal, documentable_type: @proposal.class.name, from: request.url), - class: 'button hollow float-right' %> - <% end %> - - <% if current_user && @proposal.editable_by?(current_user) %> - <%= link_to edit_legislation_process_proposal_path(@proposal.legislation_process_id, @proposal), class: 'edit-proposal button hollow float-right' do %> - <%= t("proposals.show.edit_proposal_link") %> - <% end %> - <% end %> -

    <%= @proposal.title %>

    <% if @proposal.conflictive? %>
    From 3c4f2426db7d11d5f4cb0c72b9459dcf1f93ce6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 22 Sep 2017 11:39:30 +0200 Subject: [PATCH 079/765] Removed unnecessary content --- app/controllers/legislation/proposals_controller.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/controllers/legislation/proposals_controller.rb b/app/controllers/legislation/proposals_controller.rb index f924cb25f..85072a419 100644 --- a/app/controllers/legislation/proposals_controller.rb +++ b/app/controllers/legislation/proposals_controller.rb @@ -53,11 +53,6 @@ class Legislation::ProposalsController < Legislation::BaseController end end - def summary - @proposals = Legislation::Proposal.for_summary - @tag_cloud = tag_cloud - end - private def proposal_params From 02fa3a83b5329a9aa82d4571b1016b38c51f95e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 22 Sep 2017 17:16:04 +0200 Subject: [PATCH 080/765] Custom tags for Legislation Process available Custom tags for Legislation Processes, editable in the admin section. --- .../admin/legislation/processes_controller.rb | 10 +++++++++- app/helpers/tags_helper.rb | 2 ++ app/models/legislation/process.rb | 5 ++++- .../admin/legislation/proposals/_form.html.erb | 14 ++++++++++++++ app/views/legislation/proposals/_form.html.erb | 4 ++-- ...1247_add_legislation_processes_count_to_tags.rb | 6 ++++++ db/schema.rb | 4 +++- 7 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20170922101247_add_legislation_processes_count_to_tags.rb diff --git a/app/controllers/admin/legislation/processes_controller.rb b/app/controllers/admin/legislation/processes_controller.rb index f316d9b65..0e7555211 100644 --- a/app/controllers/admin/legislation/processes_controller.rb +++ b/app/controllers/admin/legislation/processes_controller.rb @@ -19,6 +19,8 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll def update if @process.update(process_params) + set_tag_list + link = legislation_process_path(@process).html_safe redirect_to :back, notice: t('admin.legislation.processes.update.notice', link: link) else @@ -56,7 +58,13 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll :draft_publication_enabled, :result_publication_enabled, :published, - :proposals_description + :proposals_description, + :custom_list ) end + + def set_tag_list + @process.set_tag_list_on(:customs, process_params[:custom_list]) + @process.save + end end diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb index eb34a64f2..b31f3167f 100644 --- a/app/helpers/tags_helper.rb +++ b/app/helpers/tags_helper.rb @@ -24,6 +24,8 @@ module TagsHelper proposal_path(taggable) when 'budget/investment' budget_investment_path(taggable.budget_id, taggable) + when 'legislation/proposal' + legislation_process_proposal_path(@process, taggable) else '#' end diff --git a/app/models/legislation/process.rb b/app/models/legislation/process.rb index 7e1e884cb..d6eed62db 100644 --- a/app/models/legislation/process.rb +++ b/app/models/legislation/process.rb @@ -1,6 +1,9 @@ class Legislation::Process < ActiveRecord::Base - acts_as_paranoid column: :hidden_at include ActsAsParanoidAliases + include Taggable + + acts_as_paranoid column: :hidden_at + acts_as_taggable_on :customs PHASES_AND_PUBLICATIONS = %i(debate_phase allegations_phase proposals_phase draft_publication result_publication).freeze diff --git a/app/views/admin/legislation/proposals/_form.html.erb b/app/views/admin/legislation/proposals/_form.html.erb index 30f7f4950..343164587 100644 --- a/app/views/admin/legislation/proposals/_form.html.erb +++ b/app/views/admin/legislation/proposals/_form.html.erb @@ -28,6 +28,20 @@
    +
    +
    + <%= label_tag t('admin.legislation.proposals.form.header_information') %> + <%= t('admin.legislation.proposals.form.header_information_description') %> +
    +
    + <%= f.text_field :custom_list, value: @process.tag_list_on(:customs).to_s, + label: false, + placeholder: t("proposals.form.tags_placeholder"), + class: 'js-tag-list', + aria: {describedby: "tag-list-help-text"} %> +
    +
    +
    <%= f.submit(class: "button expanded", value: t("admin.legislation.processes.#{admin_submit_action(@process)}.submit_button")) %> diff --git a/app/views/legislation/proposals/_form.html.erb b/app/views/legislation/proposals/_form.html.erb index dec8e56d2..798266ba1 100644 --- a/app/views/legislation/proposals/_form.html.erb +++ b/app/views/legislation/proposals/_form.html.erb @@ -63,8 +63,8 @@
    <%= f.label :category_tag_list, t("proposals.form.tag_category_label") %> - <% @categories.each do |tag| %> - <%= tag.name %> + <% @process.tag_list_on(:customs).each do |tag| %> + <%= tag %> <% end %>
    diff --git a/db/migrate/20170922101247_add_legislation_processes_count_to_tags.rb b/db/migrate/20170922101247_add_legislation_processes_count_to_tags.rb new file mode 100644 index 000000000..698a66af6 --- /dev/null +++ b/db/migrate/20170922101247_add_legislation_processes_count_to_tags.rb @@ -0,0 +1,6 @@ +class AddLegislationProcessesCountToTags < ActiveRecord::Migration + def change + add_column :tags, "legislation/processes_count", :integer, default: 0 + add_index :tags, "legislation/processes_count" + end +end diff --git a/db/schema.rb b/db/schema.rb index acacbf347..df544e28a 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: 20170918231410) do +ActiveRecord::Schema.define(version: 20170922101247) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -936,9 +936,11 @@ ActiveRecord::Schema.define(version: 20170918231410) do t.string "kind" t.integer "budget/investments_count", default: 0 t.integer "legislation/proposals_count", default: 0 + t.integer "legislation/processes_count", default: 0 end add_index "tags", ["debates_count"], name: "index_tags_on_debates_count", using: :btree + add_index "tags", ["legislation/processes_count"], name: "index_tags_on_legislation/processes_count", using: :btree add_index "tags", ["legislation/proposals_count"], name: "index_tags_on_legislation/proposals_count", using: :btree add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree add_index "tags", ["proposals_count"], name: "index_tags_on_proposals_count", using: :btree From a870f35de8d9f2c98e55e2599896639c9bd35a2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 22 Sep 2017 17:21:55 +0200 Subject: [PATCH 081/765] Added translations --- app/views/admin/legislation/proposals/_form.html.erb | 4 ++-- config/locales/en/admin.yml | 2 ++ config/locales/es/admin.yml | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/views/admin/legislation/proposals/_form.html.erb b/app/views/admin/legislation/proposals/_form.html.erb index 343164587..dd12f9492 100644 --- a/app/views/admin/legislation/proposals/_form.html.erb +++ b/app/views/admin/legislation/proposals/_form.html.erb @@ -30,8 +30,8 @@
    - <%= label_tag t('admin.legislation.proposals.form.header_information') %> - <%= t('admin.legislation.proposals.form.header_information_description') %> + <%= label_tag t('admin.legislation.proposals.form.custom_categories') %> + <%= t('admin.legislation.proposals.form.custom_categories_description') %>
    <%= f.text_field :custom_list, value: @process.tag_list_on(:customs).to_s, diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 0953be816..42d18219d 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -300,6 +300,8 @@ en: header_information: Information header header_information_description: Provide information about the proposals. This text will be displayed as an alert in the Proposals section inside this Process. Use Markdown to format the text. header_information_placeholder: Add information for the proposals' header + custom_categories: Categories + custom_categories_description: Categories that users can select creating the proposal. draft_versions: create: notice: 'Draft created successfully. Click to visit' diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 679e41b6c..548cbc98b 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -300,6 +300,8 @@ es: header_information: Encabezado de información header_information_description: Proporciona información sobre el recorrido de las propuestas. Este texto se mostrará como una alerta en el encabezado de la sección de Propuestas dentro de este proceso. Usa Markdown para formatear el texto. header_information_placeholder: Añade información para el encabezado de las las propuestas + custom_categories: Categorías + custom_categories_description: Categorías que el usuario puede seleccionar al crear la propuesta. draft_versions: create: notice: 'Borrador creado correctamente. Haz click para verlo' From 2629837306fdfb97a6244e55a5cdad373fe8ff62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 22 Sep 2017 17:25:33 +0200 Subject: [PATCH 082/765] Fixed admin menu active states --- app/helpers/admin_helper.rb | 4 ++-- app/views/admin/_menu.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index f9c2e8c69..06fb158a4 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -17,7 +17,7 @@ module AdminHelper end def menu_moderated_content? - ["proposals", "debates", "comments", "hidden_users"].include? controller_name + ["proposals", "debates", "comments", "hidden_users"].include? controller_name && controller.class.parent != Admin::Legislation end def menu_budget? @@ -39,7 +39,7 @@ module AdminHelper def menu_customization? ["pages", "images", "content_blocks"].include? controller_name end - + def official_level_options options = [["", 0]] (1..5).each do |i| diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index 11d58adc8..168f8c31b 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -19,7 +19,7 @@ <%= t("admin.menu.title_moderated_content") %>
      > -
    • > +
    • > <%= link_to t("admin.menu.hidden_proposals"), admin_proposals_path %>
      • From 3c2b5281e8d2a4bd159bb2e30ad190ea5ea18cd4 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Fri, 22 Sep 2017 18:05:53 +0200 Subject: [PATCH 083/765] Fix Admin Polls menu active flags --- app/views/admin/_menu.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index 11d58adc8..a2173edf6 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -60,12 +60,12 @@ <%= t("admin.menu.title_polls") %> -
        > +
          >
        • > <%= link_to t('admin.menu.polls'), admin_polls_path %>
          • -
        • > +
        • > <%= link_to t("admin.menu.poll_questions"), admin_questions_path %>
          • From ad63b0a7d7ff673a3ffcca9bedf393ff7927723a Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 22 Sep 2017 18:20:21 +0200 Subject: [PATCH 084/765] makes filter subnav same style than order links --- app/assets/stylesheets/layout.scss | 27 +++++++++++++++++++++--- app/views/shared/_filter_subnav.html.erb | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 9ecf74442..5c7854758 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -205,19 +205,40 @@ a { .menu.simple { border-bottom: 1px solid $border; - margin-bottom: $line-height; + clear: both; + margin-bottom: $line-height / 2; li { - padding-bottom: rem-calc(7); + margin-right: $line-height / 2; + + @include breakpoint(medium) { + margin-right: $line-height * 1.5; + } a { - color: $text-medium; + color: $text; + display: inline-block; + font-weight: bold; + position: relative; + text-align: left; + + &:hover { + color: $link; + } } &.active { border-bottom: 2px solid $brand; color: $brand; } + + &:not(.active) { + margin-bottom: $line-height / 3; + } + } + + h2 { + font-size: $base-font-size; } } diff --git a/app/views/shared/_filter_subnav.html.erb b/app/views/shared/_filter_subnav.html.erb index 7364015e2..5a7e4d9d5 100644 --- a/app/views/shared/_filter_subnav.html.erb +++ b/app/views/shared/_filter_subnav.html.erb @@ -3,7 +3,7 @@ <% @valid_filters.each do |filter| %> <% if @current_filter == filter %> -
        • <%= t("#{i18n_namespace}.filters.#{filter}") %>
          • +

        • <%= t("#{i18n_namespace}.filters.#{filter}") %>

          • <% else %>
        • <%= link_to t("#{i18n_namespace}.filters.#{filter}"), current_path_with_query_params(filter: filter, page: 1) %>
          • From e404d149ce0ce0fd7f66bb9625f16b9ce8d3f32d Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 22 Sep 2017 19:10:39 +0200 Subject: [PATCH 085/765] fixes some lint errors on legislation_process.scss --- .../stylesheets/legislation_process.scss | 70 +++++++++---------- .../legislation/draft_versions/show.html.erb | 2 +- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/app/assets/stylesheets/legislation_process.scss b/app/assets/stylesheets/legislation_process.scss index 2ec9f8ee9..0e73321d3 100644 --- a/app/assets/stylesheets/legislation_process.scss +++ b/app/assets/stylesheets/legislation_process.scss @@ -459,11 +459,11 @@ $border-dark: darken($border, 10%); span { vertical-align: inherit; font-style: normal; + } - a { - text-decoration: underline; - color: $text-medium; - } + .see-changes { + color: $text-medium; + text-decoration: underline; } } @@ -477,6 +477,7 @@ $border-dark: darken($border, 10%); } .draft-allegation { + @include breakpoint(medium) { display: flex; padding-left: 0.9375rem; @@ -493,7 +494,6 @@ $border-dark: darken($border, 10%); } } - // Panel calcs for desktop @media screen and (min-width: 40em) { .calc-index { width: calc(35% - 25px); @@ -509,6 +509,7 @@ $border-dark: darken($border, 10%); width: rem-calc(50); .draft-panel { + .panel-title { display: none; } @@ -912,19 +913,15 @@ $border-dark: darken($border, 10%); display: inline-block; } } - - .show-for-medium { - .panel-title { - display: none; - } - } } } } // 08. Legislation changes // ----------------- + .legislation-changes { + ul { list-style: none; margin-left: 0; @@ -936,35 +933,36 @@ $border-dark: darken($border, 10%); margin-right: 0.25rem; content: '—'; } + } + } - .changes-link { - display: block; - margin-left: 1rem; - font-size: $small-font-size; + .changes-link { + display: block; + margin-left: 1rem; + font-size: $small-font-size; - @include breakpoint(medium) { - display: inline-block; - } + @include breakpoint(medium) { + display: inline-block; + } - a { - span { - text-decoration: underline; - } + a { - .icon-external { - text-decoration: none; - color: #999; - line-height: 0; - vertical-align: sub; - margin-left: 0.5rem; - } + span { + text-decoration: underline; + } - &:active, - &:focus, - &:hover { - text-decoration: none; - } - } + .icon-external { + text-decoration: none; + color: #999; + line-height: 0; + vertical-align: sub; + margin-left: 0.5rem; + } + + &:active, + &:focus, + &:hover { + text-decoration: none; } } } @@ -972,6 +970,7 @@ $border-dark: darken($border, 10%); // 09. Legislation comments // ----------------- + .legislation-comments { .pull-right { @@ -1020,6 +1019,7 @@ $border-dark: darken($border, 10%); // 10. Legislation draft comment // ----------------- + .legislation-comment { .annotation-share-comment { diff --git a/app/views/legislation/draft_versions/show.html.erb b/app/views/legislation/draft_versions/show.html.erb index b3067049b..d380e5cc3 100644 --- a/app/views/legislation/draft_versions/show.html.erb +++ b/app/views/legislation/draft_versions/show.html.erb @@ -15,7 +15,7 @@ <%= submit_tag t('.select_version_submit'), class: "button" %> <% end %> <% if @draft_version.changelog.present? %> - <%= link_to t('.see_changes'), legislation_process_draft_version_changes_path(@process, @draft_version) %> + <%= link_to t('.see_changes'), legislation_process_draft_version_changes_path(@process, @draft_version), class: "see-changes" %> <% end %>
    <%= t('.updated_at', date: format_date(@draft_version.updated_at)) %> From bf981ca828ad40dc4df0fa1faf7d23b596a968bd Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 25 Sep 2017 17:33:17 +0200 Subject: [PATCH 086/765] Remove Booth Assignment officer totals and add final&system counts --- .../poll/booth_assignments/show.html.erb | 23 +++++++++++++------ config/locales/en/admin.yml | 3 ++- config/locales/es/admin.yml | 3 ++- .../admin/poll/booth_assigments_spec.rb | 22 ++++++++++++------ 4 files changed, 35 insertions(+), 16 deletions(-) diff --git a/app/views/admin/poll/booth_assignments/show.html.erb b/app/views/admin/poll/booth_assignments/show.html.erb index b6917bca6..f01270bd4 100644 --- a/app/views/admin/poll/booth_assignments/show.html.erb +++ b/app/views/admin/poll/booth_assignments/show.html.erb @@ -45,25 +45,34 @@

    <%= t("admin.poll_booth_assignments.show.recounts_list") %>

    + + + + + + + + + + + + + + +
    <%= t("admin.poll_booth_assignments.show.count_final") %><%= t("admin.poll_booth_assignments.show.total_system") %>
    <%= total_recounts_by_booth(@booth_assignment) || '-' %><%= @booth_assignment.voters.count %>
    + - <% (@poll.starts_at.to_date..@poll.ends_at.to_date).each do |voting_date| %> - <% total_recount = @booth_assignment.total_results.where(date: voting_date).first %> <% system_count = @voters_by_date[voting_date].present? ? @voters_by_date[voting_date].size : 0 %> - <% if total_recount.present? %> - - <% else %> - - <% end %> <% end %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 8bbe1a5c8..f233579c9 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -532,8 +532,9 @@ en: recounts: "Recounts" recounts_list: "Recount list for this booth" date: "Date" - total_recount: "Total recount (by officer)" + count_final: "Final recount (by officer)" count_by_system: "Votes (automatic)" + total_system: Total votes (automatic) index: booths_title: "List of booths" no_booths: "There are no booths assigned to this poll." diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 93d2d6532..ec804132d 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -532,8 +532,9 @@ es: recounts: "Recuentos" recounts_list: "Lista de recuentos de esta urna" date: "Fecha" - total_recount: "Recuento total (presidente de mesa)" + count_final: "Recuento final (presidente de mesa)" count_by_system: "Votos (automático)" + total_system: "Votos totales acumulados(automático)" index: booths_title: "Listado de urnas asignadas" no_booths: "No hay urnas asignadas a esta votación." diff --git a/spec/features/admin/poll/booth_assigments_spec.rb b/spec/features/admin/poll/booth_assigments_spec.rb index 09a21dd72..77881efaa 100644 --- a/spec/features/admin/poll/booth_assigments_spec.rb +++ b/spec/features/admin/poll/booth_assigments_spec.rb @@ -97,11 +97,8 @@ feature 'Admin booths assignments' do officer_assignment_2 = create(:poll_officer_assignment, booth_assignment: booth_assignment, date: poll.ends_at) final_officer_assignment = create(:poll_officer_assignment, :final, booth_assignment: booth_assignment, date: poll.ends_at) - total_recount = create(:poll_total_result, - booth_assignment: booth_assignment, - officer_assignment: final_officer_assignment, - date: final_officer_assignment.date, - amount: 5678) + create(:poll_voter, poll: poll, booth_assignment: booth_assignment, created_at: poll.starts_at.to_date) + create(:poll_voter, poll: poll, booth_assignment: booth_assignment, created_at: poll.ends_at.to_date) booth_assignment_2 = create(:poll_booth_assignment, poll: poll) @@ -111,9 +108,20 @@ feature 'Admin booths assignments' do within('#assigned_booths_list') { click_link booth.name } click_link 'Recounts' + + within('#totals') do + within("#total_system") { expect(page).to have_content "2" } + end + within('#recounts_list') do - within("#recounting_#{total_recount.date.strftime('%Y%m%d')}") do - expect(page).to have_content total_recount.amount + within("#recounting_#{poll.starts_at.to_date.strftime('%Y%m%d')}") do + expect(page).to have_content 1 + end + within("#recounting_#{(poll.ends_at.to_date - 5.days).strftime('%Y%m%d')}") do + expect(page).to have_content '-' + end + within("#recounting_#{poll.ends_at.to_date.strftime('%Y%m%d')}") do + expect(page).to have_content 1 end end end From 7827f6edd1df7dff693522fa8e8723a3c99e31e1 Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 25 Sep 2017 19:17:48 +0200 Subject: [PATCH 087/765] fixes icon notifications on admin header --- app/assets/stylesheets/admin.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 964e1348e..3dcf4a474 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -48,11 +48,7 @@ $sidebar-active: #f4fcd0; color: #000; height: auto; - span { - padding-top: $line-height / 2; - } - - [class^="icon-"] { + [class^="icon-"]:not(.icon-circle) { font-size: $base-font-size; } } @@ -104,6 +100,10 @@ $sidebar-active: #f4fcd0; } } + .notifications .icon-circle { + color: $admin-color; + } + .dropdown.menu > .is-dropdown-submenu-parent > a::after { border-color: #000 transparent transparent; } From 9de8ef2e141389c2b6a6970395b6e93ecfd3f977 Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 25 Sep 2017 19:40:24 +0200 Subject: [PATCH 088/765] sets data-multi-open to false on admin menu --- app/views/admin/_menu.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index a2173edf6..bb246cb6c 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -1,5 +1,5 @@
    -
    +
    + <%= render 'images/nested_images', imageable: @proposal %> +
    +
    <%= render 'documents/nested_documents', documentable: @proposal %>
    diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 4b0cfe6f7..e0143fd08 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -48,6 +48,8 @@ + <%= render_image(@proposal.image, :large, true) if @proposal.image.present? %> +

    <%= t("proposals.show.code") %> @@ -106,7 +108,8 @@

    + @@ -12,6 +13,7 @@ +
    <%= t("admin.poll_booth_assignments.show.date") %><%= t("admin.poll_booth_assignments.show.total_recount") %> <%= t("admin.poll_booth_assignments.show.count_by_system") %>
    <%= l voting_date %><%= total_recount.amount %> - <%= system_count %>
    <%= t("admin.poll_shifts.new.date") %> <%= t("admin.poll_shifts.new.officer") %><%= t("admin.poll_shifts.new.task") %> <%= t("admin.poll_shifts.new.shift") %>
    <%= l(shift.date.to_date, format: :long) %> <%= shift.officer_name %><%= t("admin.poll_shifts.#{shift.task}") %> <%= link_to t("admin.poll_shifts.new.remove_shift"), admin_booth_shift_path(@booth, shift), diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 236ffd51e..0b578feb0 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -503,6 +503,7 @@ en: shift: "Assignment" shifts: "Shifts in this booth" date: "Date" + task: "Task" edit_shifts: Edit shifts new_shift: "New shift" no_shifts: "This booth has no shifts" @@ -512,12 +513,15 @@ en: search_officer_placeholder: Search officer search_officer_text: Search for an officer to assign a new shift select_date: "Select day" + select_task: "Select task" table_shift: "Shift" table_email: "Email" table_name: "Name" flash: create: "Shift added" destroy: "Shift removed" + vote_collection: Collect Votes + recount_scrutiny: Recount & Scrutiny poll_booth_assignments: flash: destroy: "Booth not assigned anymore" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 91af8db6c..b2d0e658c 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -503,6 +503,7 @@ es: shift: "Asignación" shifts: "Turnos en esta urna" date: "Fecha" + task: "Tarea" edit_shifts: Asignar turno new_shift: "Nuevo turno" no_shifts: "Esta urna no tiene turnos asignados" @@ -512,12 +513,15 @@ es: search_officer_placeholder: Buscar presidentes de mesa search_officer_text: Busca al presidente de mesa para asignar un turno select_date: "Seleccionar día" + select_task: "Seleccionar tarea" table_shift: "Turno" table_email: "Email" table_name: "Nombre" flash: create: "Añadido turno de presidente de mesa" destroy: "Eliminado turno de presidente de mesa" + vote_collection: Recoger Votos + recount_scrutiny: Recuento & Escrutinio poll_booth_assignments: flash: destroy: "Urna desasignada" From 6c1d1c2cdea001c59d8ff39833f3f28693ab1c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Thu, 3 Aug 2017 19:46:23 +0200 Subject: [PATCH 191/765] Add map settings to backend. Install leaflet assets to render maps. --- Gemfile | 3 ++ Gemfile.lock | 2 + app/assets/javascripts/application.js | 3 ++ app/assets/javascripts/map.js.coffee | 44 ++++++++++++++++++++ app/assets/stylesheets/admin.scss | 36 ++++++++++++++++ app/assets/stylesheets/application.scss | 1 + app/controllers/admin/settings_controller.rb | 7 ++++ app/views/admin/settings/_map_form.html.erb | 31 ++++++++++++++ app/views/admin/settings/index.html.erb | 8 ++++ config/locales/en/admin.yml | 15 +++++-- config/locales/en/settings.yml | 1 + config/locales/es/admin.yml | 7 ++++ config/locales/es/settings.yml | 1 + config/routes.rb | 2 + db/dev_seeds.rb | 4 ++ db/seeds.rb | 6 +++ spec/features/admin/settings_spec.rb | 35 ++++++++++++++++ 17 files changed, 202 insertions(+), 4 deletions(-) create mode 100644 app/assets/javascripts/map.js.coffee create mode 100644 app/views/admin/settings/_map_form.html.erb diff --git a/Gemfile b/Gemfile index a6c1dc71e..d4a2777a9 100644 --- a/Gemfile +++ b/Gemfile @@ -53,6 +53,9 @@ gem 'turnout', '~> 2.4.0' gem 'uglifier', '~> 3.2.0' gem 'unicorn', '~> 5.3.0' gem 'whenever', '~> 0.9.7', require: false +source 'https://rails-assets.org' do + gem 'rails-assets-leaflet' +end group :development, :test do gem "bullet", '~> 5.5.1' diff --git a/Gemfile.lock b/Gemfile.lock index f15f0c6e9..6435af58e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -334,6 +334,7 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.9) sprockets-rails + rails-assets-leaflet (1.1.0) rails-assets-markdown-it (8.2.2) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -542,6 +543,7 @@ DEPENDENCIES poltergeist (~> 1.15.0) quiet_assets (~> 1.1.0) rails (= 4.2.9) + rails-assets-leaflet! rails-assets-markdown-it (~> 8.2.1)! redcarpet (~> 3.4.0) responders (~> 2.4.0) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 0b3ee0201..d7c36e944 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -67,6 +67,8 @@ //= require tree_navigator //= require custom //= require tag_autocomplete +//= require leaflet +//= require map var initialize_modules = function() { App.Comments.initialize(); @@ -103,6 +105,7 @@ var initialize_modules = function() { App.Documentable.initialize(); App.Imageable.initialize(); App.TagAutocomplete.initialize(); + App.Map.initialize(); }; $(function(){ diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee new file mode 100644 index 000000000..c3821e338 --- /dev/null +++ b/app/assets/javascripts/map.js.coffee @@ -0,0 +1,44 @@ +App.Map = + + initialize: -> + maps = $('*[data-map]') + + if maps.length > 0 + $.each maps, (index, map) -> + App.Map.initializeMap map + + initializeMap: (element) -> + latitude = $(element).data('latitude') + longitude = $(element).data('longitude') + zoom = $(element).data('zoom') + mapTilesProvider = $(element).data('tiles-provider') + mapAttributionSelector = $(element).data('tiles-attribution-selector') + latitudeInputSelector = $(element).data('latitude-input-selector') + longitudeInputSelector = $(element).data('longitude-input-selector') + zoomInputSelector = $(element).data('zoom-input-selector') + + latLng = new (L.LatLng)(latitude, longitude) + map = L.map(element.id).setView(latLng, zoom) + attribution = $(mapAttributionSelector) + L.tileLayer(mapTilesProvider, attribution: attribution.html()).addTo map + + marker_icon = L.divIcon( + iconSize: null + html: '
    ') + marker = L.marker(latLng, { icon: marker_icon, draggable: 'true' }) + marker.addTo(map) + + onMapClick = (e) -> + marker.setLatLng(e.latlng) + updateFormfields() + return + + updateFormfields = -> + $(latitudeInputSelector).val marker.getLatLng().lat + $(longitudeInputSelector).val marker.getLatLng().lng + $(zoomInputSelector).val map.getZoom() + return + + marker.on 'dragend', updateFormfields + map.on 'zoomend', updateFormfields + map.on 'click', onMapClick \ No newline at end of file diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 3dcf4a474..2ef6fea23 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -8,6 +8,7 @@ // 06. Polls // 07. Legislation // 08. CMS +// 09. Map // // 01. Global styles @@ -967,3 +968,38 @@ table { border: 0; } } + +// 09. Map +// -------------- + +.map{ + width: 100%; + height: 350px; + .map-marker { + visibility: visible; + width: 30px; + height: 30px; + border-radius: 50% 50% 50% 0; + background: #00cae9; + position: absolute; + transform: rotate(-45deg); + left: 50%; + top: 50%; + margin: -45px 0 0 -15px; + } + .map-marker:after { + content: ""; + width: 14px; + height: 14px; + margin: 8px 0 0 8px; + background: white; + position: absolute; + border-radius: 50%; + } +} +.map-marker{ + visibility: hidden; +} +.map-attributtion{ + visibility: hidden; +} \ No newline at end of file diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 361dcfde3..aff55c88c 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -18,3 +18,4 @@ @import 'datepicker_overrides'; @import 'jquery-ui/autocomplete'; @import 'autocomplete_overrides'; +@import 'leaflet'; diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index 70541a3a0..2d69ff19a 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -14,6 +14,13 @@ class Admin::SettingsController < Admin::BaseController redirect_to admin_settings_path, notice: t("admin.settings.flash.updated") end + def update_map + Setting["map.latitude"] = params[:latitude].to_f + Setting["map.longitude"] = params[:longitude].to_f + Setting["map.zoom"] = params[:zoom].to_i + redirect_to admin_settings_path, notice: t("admin.settings.index.map.flash.update") + end + private def settings_params diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb new file mode 100644 index 000000000..1187cfa96 --- /dev/null +++ b/app/views/admin/settings/_map_form.html.erb @@ -0,0 +1,31 @@ +
    +
    +
    " + data-longitude="<%= Setting["map.longitude"] %>" + data-zoom="<%= Setting["map.zoom"] %>" + data-tiles-attribution-selector="#admin-map-attribution" + data-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" + data-latitude-input-selector="#latitude" + data-longitude-input-selector="#longitude" + data-zoom-input-selector="#zoom" + data-marker-selector="#admin-map-marker"> +
    +
    + © OpenStreetMap contributors +
    + + <%= form_tag admin_update_map_path, method: :put, id: 'map-form' do |f| %> + + <%= hidden_field_tag :latitude, Setting["map.latitude"] %> + <%= hidden_field_tag :longitude, Setting["map.longitude"] %> + <%= hidden_field_tag :zoom, Setting["map.zoom"] %> + +
    + <%= submit_tag t("admin.settings.index.map.form.submit"), + class: "button hollow expanded" %> +
    + + <% end %> +
    +
    \ No newline at end of file diff --git a/app/views/admin/settings/index.html.erb b/app/views/admin/settings/index.html.erb index 14c89b776..e49174fca 100644 --- a/app/views/admin/settings/index.html.erb +++ b/app/views/admin/settings/index.html.erb @@ -95,3 +95,11 @@
    <% end %> + +<% if feature?(:map) %> +

    <%= t("admin.settings.index.map.title") %>

    +

    <%= t("admin.settings.index.map.help") %>

    + + <%= render "map_form" %> + +<% end %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 236ffd51e..be20333d8 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -40,8 +40,8 @@ en: errors: form: error: - one: "prevented this banner from being saved" - other: 'prevented this banner from being saved' + one: "error prevented this banner from being saved" + other: 'errors prevented this banner from being saved' new: creating: Create banner activity: @@ -697,6 +697,13 @@ en: disabled: "Feature disabled" enable: "Enable" disable: "Disable" + map: + title: Map configuration + help: Here you can customize the way the map is displayed to users. Drag map marker or click anywhere over the map, set desired zoom and click button "Update". + flash: + update: Map configuration updated succesfully. + form: + submit: Update shared: booths_search: button: Search @@ -788,8 +795,8 @@ en: errors: form: error: - one: "prevented this geozone from being saved" - other: 'prevented this geozone from being saved' + one: "error prevented this geozone from being saved" + other: 'errors prevented this geozone from being saved' edit: form: submit_button: Save changes diff --git a/config/locales/en/settings.yml b/config/locales/en/settings.yml index e1d84393f..81ddd57d9 100644 --- a/config/locales/en/settings.yml +++ b/config/locales/en/settings.yml @@ -40,6 +40,7 @@ en: voting_allowed: Voting on investment projects legislation: Legislation community: Community on proposals and investments + map: Proposals and budget investments geolocation mailer_from_name: Origin email name mailer_from_address: Origin email address meta_description: "Site description (SEO)" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 91af8db6c..f2e38be7f 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -697,6 +697,13 @@ es: disabled: "Funcionalidad desactivada" enable: "Activar" disable: "Desactivar" + map: + title: Configuración del mapa + help: Aquí puedes personalizar la manera en la que se muestra el mapa a los usuarios. Arrastra el marcador o pulsa sobre cualquier parte del mapa, ajusta el zoom y pulsa el botón 'Actualizar'. + flash: + update: La configuración del mapa se ha guardado correctamente. + form: + submit: Actualizar shared: booths_search: button: Buscar diff --git a/config/locales/es/settings.yml b/config/locales/es/settings.yml index f0a7b53a2..e6cfde3b1 100644 --- a/config/locales/es/settings.yml +++ b/config/locales/es/settings.yml @@ -40,6 +40,7 @@ es: voting_allowed: Votaciones sobre propuestas de inversión legislation: Legislación community: Comunidad en propuestas y proyectos de inversión + map: Geolocalización de propuestas y proyectos de inversión mailer_from_name: Nombre email remitente mailer_from_address: Dirección email remitente meta_description: "Descripción del sitio (SEO)" diff --git a/config/routes.rb b/config/routes.rb index 1cb2d45b9..410f2dced 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -250,6 +250,8 @@ Rails.application.routes.draw do end resources :settings, only: [:index, :update] + put :update_map, to: "settings#update_map" + resources :moderators, only: [:index, :create, :destroy] do get :search, on: :collection end diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 1223d94a4..45b0ed27b 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -37,6 +37,7 @@ Setting.create(key: 'feature.google_login', value: "true") Setting.create(key: 'feature.signature_sheets', value: "true") Setting.create(key: 'feature.legislation', value: "true") Setting.create(key: 'feature.community', value: "true") +Setting.create(key: 'feature.map', value: "true") Setting.create(key: 'per_page_code_head', value: "") Setting.create(key: 'per_page_code_body', value: "") Setting.create(key: 'comments_body_max_length', value: '1000') @@ -47,6 +48,9 @@ Setting.create(key: 'meta_keywords', value: 'citizen participation, open governm Setting.create(key: 'verification_offices_url', value: 'http://oficinas-atencion-ciudadano.url/') Setting.create(key: 'min_age_to_participate', value: '16') Setting.create(key: 'proposal_improvement_path', value: nil) +Setting.create(key: 'map.latitude', value: 51.48) +Setting.create(key: 'map.longitude', value: 0) +Setting.create(key: 'map.zoom', value: 10) puts " ✅" print "Creating Geozones" diff --git a/db/seeds.rb b/db/seeds.rb index 96916f29a..13a532a92 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -80,6 +80,7 @@ Setting['feature.budgets'] = true Setting['feature.signature_sheets'] = true Setting['feature.legislation'] = true Setting['feature.community'] = true +Setting['feature.map'] = true # Spending proposals feature flags Setting['feature.spending_proposal_features.voting_allowed'] = nil @@ -108,3 +109,8 @@ Setting['min_age_to_participate'] = 16 # Proposal improvement url path ('/more-information/proposal-improvement') Setting['proposal_improvement_path'] = nil + +# City map feature default configuration (Greenwich) +Setting['map.latitude'] = 51.48 +Setting['map.longitude'] = 0 +Setting['map.zoom'] = 10 diff --git a/spec/features/admin/settings_spec.rb b/spec/features/admin/settings_spec.rb index c92b4b525..0a220d05b 100644 --- a/spec/features/admin/settings_spec.rb +++ b/spec/features/admin/settings_spec.rb @@ -28,4 +28,39 @@ feature 'Admin settings' do expect(page).to have_content 'Value updated' end + describe "Update map" do + + scenario "Should not be able when map feature deactivated" do + Setting['feature.map'] = false + admin = create(:administrator).user + login_as(admin) + visit admin_settings_path + + expect(page).not_to have_content "Map configuration" + end + + scenario "Should be able when map feature deactivated" do + Setting['feature.map'] = true + admin = create(:administrator).user + login_as(admin) + visit admin_settings_path + + expect(page).to have_content "Map configuration" + end + + scenario "Should show successful notice" do + Setting['feature.map'] = true + admin = create(:administrator).user + login_as(admin) + visit admin_settings_path + + within "#map-form" do + click_on "Update" + end + + expect(page).to have_content "Map configuration updated succesfully" + end + + end + end \ No newline at end of file From 5956207a0070090ac3228a1e082cafb56d413af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Mon, 7 Aug 2017 11:10:38 +0200 Subject: [PATCH 192/765] Add map locations. Each map location can belongs to proposal or budget investment. --- app/assets/javascripts/map.js.coffee | 40 +++++++++++++------ .../budgets/investments_controller.rb | 3 +- app/controllers/proposals_controller.rb | 3 +- app/models/budget/investment.rb | 2 + app/models/map_location.rb | 6 +++ app/models/proposal.rb | 2 + app/views/admin/settings/_map_form.html.erb | 3 +- app/views/budgets/investments/_form.html.erb | 13 ++++++ app/views/map_locations/_form_fields.html.erb | 25 ++++++++++++ app/views/proposals/_form.html.erb | 13 ++++++ config/locales/en/general.yml | 2 + config/locales/es/general.yml | 2 + .../20170805132736_create_map_locations.rb | 11 +++++ db/schema.rb | 11 +++++ 14 files changed, 119 insertions(+), 17 deletions(-) create mode 100644 app/models/map_location.rb create mode 100644 app/views/map_locations/_form_fields.html.erb create mode 100644 db/migrate/20170805132736_create_map_locations.rb diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee index c3821e338..8aca94bc7 100644 --- a/app/assets/javascripts/map.js.coffee +++ b/app/assets/javascripts/map.js.coffee @@ -16,20 +16,15 @@ App.Map = latitudeInputSelector = $(element).data('latitude-input-selector') longitudeInputSelector = $(element).data('longitude-input-selector') zoomInputSelector = $(element).data('zoom-input-selector') + removeMarkerSelector = $(element).data('remove-marker-selector') + attribution = $(mapAttributionSelector) + marker_icon = L.divIcon( + iconSize: null + html: '
    ') - latLng = new (L.LatLng)(latitude, longitude) - map = L.map(element.id).setView(latLng, zoom) - attribution = $(mapAttributionSelector) - L.tileLayer(mapTilesProvider, attribution: attribution.html()).addTo map - - marker_icon = L.divIcon( - iconSize: null - html: '
    ') - marker = L.marker(latLng, { icon: marker_icon, draggable: 'true' }) - marker.addTo(map) - - onMapClick = (e) -> + placeMarker = (e) -> marker.setLatLng(e.latlng) + marker.addTo(map) updateFormfields() return @@ -39,6 +34,25 @@ App.Map = $(zoomInputSelector).val map.getZoom() return + clearFormfields = -> + $(latitudeInputSelector).val '' + $(longitudeInputSelector).val '' + $(zoomInputSelector).val '' + return + + removeMarker = (e) -> + e.preventDefault() + map.removeLayer(marker) + clearFormfields() + return + + latLng = new (L.LatLng)(latitude, longitude) + map = L.map(element.id).setView(latLng, zoom) + marker = L.marker(latLng, { icon: marker_icon, draggable: 'true' }) + L.tileLayer(mapTilesProvider, attribution: attribution.html()).addTo map + marker.addTo(map) + + $(removeMarkerSelector).on 'click', removeMarker marker.on 'dragend', updateFormfields map.on 'zoomend', updateFormfields - map.on 'click', onMapClick \ No newline at end of file + map.on 'click', placeMarker \ No newline at end of file diff --git a/app/controllers/budgets/investments_controller.rb b/app/controllers/budgets/investments_controller.rb index fb82c51db..bb00f24af 100644 --- a/app/controllers/budgets/investments_controller.rb +++ b/app/controllers/budgets/investments_controller.rb @@ -107,7 +107,8 @@ module Budgets .permit(:title, :description, :external_url, :heading_id, :tag_list, :organization_name, :location, :terms_of_service, image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], - documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]) + documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], + map_location_attributes: [:latitude, :longitude, :zoom]) end def load_ballot diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index 9e6fc521d..d1db0e4a2 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -77,7 +77,8 @@ class ProposalsController < ApplicationController params.require(:proposal).permit(:title, :question, :summary, :description, :external_url, :video_url, :responsible_name, :tag_list, :terms_of_service, :geozone_id, image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], - documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy] ) + documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], + map_location_attributes: [:latitude, :longitude, :zoom]) end def retired_params diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index 857025375..af8feac1d 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -27,6 +27,8 @@ class Budget has_many :valuators, through: :valuator_assignments has_many :comments, as: :commentable has_many :milestones + has_one :map_location + accepts_nested_attributes_for :map_location validates :title, presence: true validates :author, presence: true diff --git a/app/models/map_location.rb b/app/models/map_location.rb new file mode 100644 index 000000000..61cb10893 --- /dev/null +++ b/app/models/map_location.rb @@ -0,0 +1,6 @@ +class MapLocation < ActiveRecord::Base + + belongs_to :proposal + belongs_to :investment + +end diff --git a/app/models/proposal.rb b/app/models/proposal.rb index 7a0abcb6e..7ad7a863b 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -25,6 +25,8 @@ class Proposal < ActiveRecord::Base belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' belongs_to :geozone + has_one :map_location + accepts_nested_attributes_for :map_location has_many :comments, as: :commentable has_many :proposal_notifications diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb index 1187cfa96..53eb3d882 100644 --- a/app/views/admin/settings/_map_form.html.erb +++ b/app/views/admin/settings/_map_form.html.erb @@ -8,8 +8,7 @@ data-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" data-latitude-input-selector="#latitude" data-longitude-input-selector="#longitude" - data-zoom-input-selector="#zoom" - data-marker-selector="#admin-map-marker"> + data-zoom-input-selector="#zoom">
    © OpenStreetMap contributors diff --git a/app/views/budgets/investments/_form.html.erb b/app/views/budgets/investments/_form.html.erb index 0d0bdd7f1..789d0f8a9 100644 --- a/app/views/budgets/investments/_form.html.erb +++ b/app/views/budgets/investments/_form.html.erb @@ -29,6 +29,19 @@ <%= render 'documents/nested_documents', documentable: @investment, f: f %>
    + <% if feature?(:map) %> +
    + + <%= render 'map_locations/form_fields', + form: f, + map_location: @investment.map_location || MapLocation.new, + label: t("proposals.form.map_location"), + help: t("proposals.form.map_location_instructions"), + parent_class: "budget_investment" %> + +
    + <% end %> +
    <%= f.text_field :location %>
    diff --git a/app/views/map_locations/_form_fields.html.erb b/app/views/map_locations/_form_fields.html.erb new file mode 100644 index 000000000..7c4a1785e --- /dev/null +++ b/app/views/map_locations/_form_fields.html.erb @@ -0,0 +1,25 @@ +<%= form.label :map_location, label %> +

    <%= help %>

    +
    " + data-longitude="<%= map_location.present? && map_location.longitude.present? ? map_location.longitude : Setting["map.longitude"] %>" + data-zoom="<%= map_location.present? && map_location.zoom.present? ? map_location.zoom : Setting["map.zoom"] %>" + data-tiles-attribution-selector="#map-location-attribution" + data-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" + data-latitude-input-selector="#<%= parent_class %>_map_location_attributes_latitude" + data-longitude-input-selector="#<%= parent_class %>_map_location_attributes_longitude" + data-zoom-input-selector="#<%= parent_class %>_map_location_attributes_zoom" + data-remove-marker-selector=".location-map-remove-marker-button"> +
    + +
    + © OpenStreetMap contributors +
    + +Remove marker + +<%= form.fields_for :map_location, map_location do |map_location_fields| %> + <%= map_location_fields.hidden_field :latitude, value: map_location.latitude, id: "#{parent_class}_map_location_attributes_latitude" %> + <%= map_location_fields.hidden_field :longitude, value: map_location.longitude, id: "#{parent_class}_map_location_attributes_longitude" %> + <%= map_location_fields.hidden_field :zoom, value: map_location.zoom, id: "#{parent_class}_map_location_attributes_zoom" %> +<% end %> \ No newline at end of file diff --git a/app/views/proposals/_form.html.erb b/app/views/proposals/_form.html.erb index df1e096e9..72feba9c3 100644 --- a/app/views/proposals/_form.html.erb +++ b/app/views/proposals/_form.html.erb @@ -59,6 +59,19 @@ <%= f.select :geozone_id, geozone_select_options, {include_blank: t("geozones.none"), label: false} %>
    + <% if feature?(:map) %> +
    + + <%= render 'map_locations/form_fields', + form: f, + map_location: @proposal.map_location || MapLocation.new, + label: t("proposals.form.map_location"), + help: t("proposals.form.map_location_instructions"), + parent_class: "proposal" %> + +
    + <% end %> +
    <%= f.label :tag_list, t("proposals.form.tags_label") %>

    <%= t("proposals.form.tags_instructions") %>

    diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 6312a9a5c..c118db367 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -333,6 +333,8 @@ en: tags_instructions: "Tag this proposal. You can choose from proposed categories or add your own" tags_label: Tags tags_placeholder: "Enter the tags you would like to use, separated by commas (',')" + map_location: "Map location" + map_location_instructions: "Navigate the map to the location and place the marker." index: featured_proposals: Featured filter_topic: diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 4b1ebe2ba..46664e2ae 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -333,6 +333,8 @@ es: tags_label: Temas tag_category_label: "Categorías" tags_placeholder: "Escribe las etiquetas que desees separadas por una coma (',')" + map_location: "Ubicación en el mapa" + map_location_instructions: "Navega por el mapa hasta la ubicación y coloca el marcador." index: featured_proposals: Destacadas filter_topic: diff --git a/db/migrate/20170805132736_create_map_locations.rb b/db/migrate/20170805132736_create_map_locations.rb new file mode 100644 index 000000000..a75820d54 --- /dev/null +++ b/db/migrate/20170805132736_create_map_locations.rb @@ -0,0 +1,11 @@ +class CreateMapLocations < ActiveRecord::Migration + def change + create_table :map_locations do |t| + t.float :latitude + t.float :longitude + t.integer :zoom + t.integer :proposal_id, index: true + t.integer :investment_id, index: true + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 41063df03..86d22f3b2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -549,6 +549,17 @@ ActiveRecord::Schema.define(version: 20170918231410) do add_index "managers", ["user_id"], name: "index_managers_on_user_id", using: :btree + create_table "map_locations", force: :cascade do |t| + t.float "latitude" + t.float "longitude" + t.integer "zoom" + t.integer "proposal_id" + t.integer "investment_id" + end + + add_index "map_locations", ["investment_id"], name: "index_map_locations_on_investment_id", using: :btree + add_index "map_locations", ["proposal_id"], name: "index_map_locations_on_proposal_id", using: :btree + create_table "moderators", force: :cascade do |t| t.integer "user_id" end From 874a951dd27f5cc9060c1a3df9b6929918b9e994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Mon, 7 Aug 2017 11:59:25 +0200 Subject: [PATCH 193/765] Add map locations helper. Allow to configure map marker edition on map instantiation at views. --- app/assets/javascripts/map.js.coffee | 24 ++++++------ app/helpers/map_locations_helper.rb | 19 +++++++++ app/views/budgets/investments/_form.html.erb | 5 ++- app/views/map_locations/_form_fields.html.erb | 39 ++++++++++++------- app/views/proposals/_form.html.erb | 1 + config/locales/en/budgets.yml | 3 ++ config/locales/en/general.yml | 1 + config/locales/es/budgets.yml | 3 ++ config/locales/es/general.yml | 1 + 9 files changed, 68 insertions(+), 28 deletions(-) create mode 100644 app/helpers/map_locations_helper.rb diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee index 8aca94bc7..fb82d0800 100644 --- a/app/assets/javascripts/map.js.coffee +++ b/app/assets/javascripts/map.js.coffee @@ -8,16 +8,17 @@ App.Map = App.Map.initializeMap map initializeMap: (element) -> - latitude = $(element).data('latitude') - longitude = $(element).data('longitude') - zoom = $(element).data('zoom') - mapTilesProvider = $(element).data('tiles-provider') - mapAttributionSelector = $(element).data('tiles-attribution-selector') + latitude = $(element).data('marker-latitude') + longitude = $(element).data('marker-longitude') + zoom = $(element).data('map-zoom') + mapTilesProvider = $(element).data('map-tiles-provider') + mapAttributionSelector = $(element).data('map-tiles-attribution-selector') latitudeInputSelector = $(element).data('latitude-input-selector') longitudeInputSelector = $(element).data('longitude-input-selector') zoomInputSelector = $(element).data('zoom-input-selector') - removeMarkerSelector = $(element).data('remove-marker-selector') + removeMarkerSelector = $(element).data('marker-remove-selector') attribution = $(mapAttributionSelector) + editable = $(element).data('marker-editable') marker_icon = L.divIcon( iconSize: null html: '
    ') @@ -48,11 +49,12 @@ App.Map = latLng = new (L.LatLng)(latitude, longitude) map = L.map(element.id).setView(latLng, zoom) - marker = L.marker(latLng, { icon: marker_icon, draggable: 'true' }) + marker = L.marker(latLng, { icon: marker_icon, draggable: editable }) L.tileLayer(mapTilesProvider, attribution: attribution.html()).addTo map marker.addTo(map) - $(removeMarkerSelector).on 'click', removeMarker - marker.on 'dragend', updateFormfields - map.on 'zoomend', updateFormfields - map.on 'click', placeMarker \ No newline at end of file + if editable + $(removeMarkerSelector).on 'click', removeMarker + marker.on 'dragend', updateFormfields + map.on 'zoomend', updateFormfields + map.on 'click', placeMarker \ No newline at end of file diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb new file mode 100644 index 000000000..08d16391f --- /dev/null +++ b/app/helpers/map_locations_helper.rb @@ -0,0 +1,19 @@ +module MapLocationsHelper + + def map_location_latitude(map_location) + map_location.present? && map_location.latitude.present? ? map_location.latitude : Setting["map.latitude"] + end + + def map_location_longitude(map_location) + map_location.present? && map_location.longitude.present? ? map_location.longitude : Setting["map.longitude"] + end + + def map_location_zoom(map_location) + map_location.present? && map_location.zoom.present? ? map_location.zoom : Setting["map.zoom"] + end + + def map_location_input_id(prefix, attribute) + "#{prefix}_map_location_attributes_#{attribute}" + end + +end \ No newline at end of file diff --git a/app/views/budgets/investments/_form.html.erb b/app/views/budgets/investments/_form.html.erb index 789d0f8a9..8a19c188a 100644 --- a/app/views/budgets/investments/_form.html.erb +++ b/app/views/budgets/investments/_form.html.erb @@ -35,8 +35,9 @@ <%= render 'map_locations/form_fields', form: f, map_location: @investment.map_location || MapLocation.new, - label: t("proposals.form.map_location"), - help: t("proposals.form.map_location_instructions"), + label: t("budgets.investments.form.map_location"), + help: t("budgets.investments.form.map_location_instructions"), + remove_marker_label: t("budgets.investments.form.map_remove_marker"), parent_class: "budget_investment" %>
    diff --git a/app/views/map_locations/_form_fields.html.erb b/app/views/map_locations/_form_fields.html.erb index 7c4a1785e..4fcefa2fa 100644 --- a/app/views/map_locations/_form_fields.html.erb +++ b/app/views/map_locations/_form_fields.html.erb @@ -1,25 +1,34 @@ <%= form.label :map_location, label %>

    <%= help %>

    -
    " - data-longitude="<%= map_location.present? && map_location.longitude.present? ? map_location.longitude : Setting["map.longitude"] %>" - data-zoom="<%= map_location.present? && map_location.zoom.present? ? map_location.zoom : Setting["map.zoom"] %>" - data-tiles-attribution-selector="#map-location-attribution" - data-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" - data-latitude-input-selector="#<%= parent_class %>_map_location_attributes_latitude" - data-longitude-input-selector="#<%= parent_class %>_map_location_attributes_longitude" - data-zoom-input-selector="#<%= parent_class %>_map_location_attributes_zoom" - data-remove-marker-selector=".location-map-remove-marker-button"> + +
    © OpenStreetMap contributors
    -Remove marker +<%= remove_marker_label %> -<%= form.fields_for :map_location, map_location do |map_location_fields| %> - <%= map_location_fields.hidden_field :latitude, value: map_location.latitude, id: "#{parent_class}_map_location_attributes_latitude" %> - <%= map_location_fields.hidden_field :longitude, value: map_location.longitude, id: "#{parent_class}_map_location_attributes_longitude" %> - <%= map_location_fields.hidden_field :zoom, value: map_location.zoom, id: "#{parent_class}_map_location_attributes_zoom" %> +<%= form.fields_for :map_location, map_location do |m_l_fields| %> + <%= m_l_fields.hidden_field :latitude, + value: map_location.latitude, + id: map_location_input_id(parent_class, 'latitude') %> + <%= m_l_fields.hidden_field :longitude, + value: map_location.longitude, + id: map_location_input_id(parent_class, 'latitude') %> + <%= m_l_fields.hidden_field :zoom, + value: map_location.zoom, + id: map_location_input_id(parent_class, 'latitude') %> <% end %> \ No newline at end of file diff --git a/app/views/proposals/_form.html.erb b/app/views/proposals/_form.html.erb index 72feba9c3..2390b62f6 100644 --- a/app/views/proposals/_form.html.erb +++ b/app/views/proposals/_form.html.erb @@ -67,6 +67,7 @@ map_location: @proposal.map_location || MapLocation.new, label: t("proposals.form.map_location"), help: t("proposals.form.map_location_instructions"), + remove_marker_label: t("proposals.form.map_remove_marker"), parent_class: "proposal" %>
    diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index c1879df16..1f29370bb 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -55,6 +55,9 @@ en: tags_instructions: "Tag this proposal. You can choose from proposed categories or add your own" tags_label: Tags tags_placeholder: "Enter the tags you would like to use, separated by commas (',')" + map_location: "Map location" + map_location_instructions: "Navigate the map to the location and place the marker." + map_remove_marker: "Remove map marker" index: title: Participatory budgeting unfeasible: Unfeasible investment projects diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index c118db367..290e1a278 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -335,6 +335,7 @@ en: tags_placeholder: "Enter the tags you would like to use, separated by commas (',')" map_location: "Map location" map_location_instructions: "Navigate the map to the location and place the marker." + map_remove_marker: "Remove map marker" index: featured_proposals: Featured filter_topic: diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index 78b81fbd3..5c76c8abe 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -55,6 +55,9 @@ es: tags_label: Temas tag_category_label: "Categorías" tags_placeholder: "Escribe las etiquetas que desees separadas por una coma (',')" + map_location: "Ubicación en el mapa" + map_location_instructions: "Navega por el mapa hasta la ubicación y coloca el marcador." + map_remove_marker: "Eliminar el marcador" index: title: Presupuestos participativos unfeasible: Propuestas de inversión no viables diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 46664e2ae..722c0dabb 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -335,6 +335,7 @@ es: tags_placeholder: "Escribe las etiquetas que desees separadas por una coma (',')" map_location: "Ubicación en el mapa" map_location_instructions: "Navega por el mapa hasta la ubicación y coloca el marcador." + map_remove_marker: "Eliminar el marcador" index: featured_proposals: Destacadas filter_topic: From a14bb77f49c8c805fe07c4cfaf11c304fe093395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Mon, 7 Aug 2017 13:22:37 +0200 Subject: [PATCH 194/765] Fix map location form fields ids definition. --- app/views/map_locations/_form_fields.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/map_locations/_form_fields.html.erb b/app/views/map_locations/_form_fields.html.erb index 4fcefa2fa..2b1b3738c 100644 --- a/app/views/map_locations/_form_fields.html.erb +++ b/app/views/map_locations/_form_fields.html.erb @@ -1,7 +1,7 @@ <%= form.label :map_location, label %>

    <%= help %>

    -
    <%= m_l_fields.hidden_field :longitude, value: map_location.longitude, - id: map_location_input_id(parent_class, 'latitude') %> + id: map_location_input_id(parent_class, 'longitude') %> <%= m_l_fields.hidden_field :zoom, value: map_location.zoom, - id: map_location_input_id(parent_class, 'latitude') %> + id: map_location_input_id(parent_class, 'zoom') %> <% end %> \ No newline at end of file From dd7afd3593a2fbb33855cc5412b3c71a63a9d41c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Mon, 7 Aug 2017 18:08:20 +0200 Subject: [PATCH 195/765] Add methods to map locations helper. --- app/assets/stylesheets/admin.scss | 5 ++ app/helpers/map_locations_helper.rb | 46 +++++++++++++++++++ app/views/admin/settings/_map_form.html.erb | 14 +++--- app/views/map_locations/_form_fields.html.erb | 22 +-------- 4 files changed, 61 insertions(+), 26 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 2ef6fea23..aec72b35b 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -996,10 +996,15 @@ table { position: absolute; border-radius: 50%; } + .map-attributtion{ + visibility: visible; + height: auto; + } } .map-marker{ visibility: hidden; } .map-attributtion{ visibility: hidden; + height: 0; } \ No newline at end of file diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 08d16391f..805d5504c 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -16,4 +16,50 @@ module MapLocationsHelper "#{prefix}_map_location_attributes_#{attribute}" end + def map_location_attribution_id(map_location) + "attribution-#{dom_id(map_location)}" + end + + def map_location_remove_marker_link_id(map_location) + "remove-marker-link-#{dom_id(map_location)}" + end + + def render_map(map_location, parent_class, editable, remove_marker_label) + map = content_tag_for :div, + map_location, + class: "map", + data:{ + map: "", + map_zoom: map_location_zoom(map_location), + map_tiles_attribution_selector: map_location_attribution_id(map_location), + map_tiles_provider: "//{s}.tile.osm.org/{z}/{x}/{y}.png", + marker_editable: editable, + marker_latitude: map_location_latitude(map_location), + marker_longitude: map_location_longitude(map_location), + marker_remove_selector: "##{map_location_remove_marker_link_id(map_location)}", + latitude_input_selector: "##{map_location_input_id(parent_class, 'latitude')}", + longitude_input_selector: "##{map_location_input_id(parent_class, 'longitude')}", + zoom_input_selector: "##{map_location_input_id(parent_class, 'zoom')}" + } + map += map_attributtion(map_location) + map += map_location_remove_marker(map_location, remove_marker_label) if editable + end + + def map_attributtion(map_location, klass = nil) + content = "©#{link_to("OpenStreetMap", "http://osm.org/copyright")} contributors".html_safe + content_tag :div, id: map_location_attribution_id(map_location), class: "map-attributtion #{klass}" do + content + end + end + + def map_location_remove_marker(map_location, text) + content_tag :div, class: "small-12 column text-right" do + content_tag :a, + id: map_location_remove_marker_link_id(map_location), + class: "location-map-remove-marker-button delete" do + text + end + end + end + end \ No newline at end of file diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb index 53eb3d882..256bcd478 100644 --- a/app/views/admin/settings/_map_form.html.erb +++ b/app/views/admin/settings/_map_form.html.erb @@ -1,11 +1,13 @@
    -
    " - data-longitude="<%= Setting["map.longitude"] %>" - data-zoom="<%= Setting["map.zoom"] %>" - data-tiles-attribution-selector="#admin-map-attribution" - data-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" +
    " + data-map-tiles-attribution-selector="#admin-map-attribution" + data-map-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" + data-marker-editable="true" + data-marker-latitude="<%= Setting["map.latitude"] %>" + data-marker-longitude="<%= Setting["map.longitude"] %>" data-latitude-input-selector="#latitude" data-longitude-input-selector="#longitude" data-zoom-input-selector="#zoom"> diff --git a/app/views/map_locations/_form_fields.html.erb b/app/views/map_locations/_form_fields.html.erb index 2b1b3738c..f838d1f98 100644 --- a/app/views/map_locations/_form_fields.html.erb +++ b/app/views/map_locations/_form_fields.html.erb @@ -1,25 +1,7 @@ <%= form.label :map_location, label %>

    <%= help %>

    -
    -
    - -
    - © OpenStreetMap contributors -
    - -<%= remove_marker_label %> +<%= render_map(map_location, parent_class, true, remove_marker_label) %> <%= form.fields_for :map_location, map_location do |m_l_fields| %> <%= m_l_fields.hidden_field :latitude, @@ -27,7 +9,7 @@ id: map_location_input_id(parent_class, 'latitude') %> <%= m_l_fields.hidden_field :longitude, value: map_location.longitude, - id: map_location_input_id(parent_class, 'longitude') %> + id: map_location_input_id(parent_class, 'longitude') %> <%= m_l_fields.hidden_field :zoom, value: map_location.zoom, id: map_location_input_id(parent_class, 'zoom') %> From 130e4533ac7b241f7d65ee60b9612844bb80725b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 10:47:35 +0200 Subject: [PATCH 196/765] Allow to render map without marker on new forms. --- app/assets/javascripts/map.js.coffee | 69 ++++++++++++------- app/helpers/map_locations_helper.rb | 11 ++- app/models/budget/investment.rb | 4 +- app/models/map_location.rb | 4 ++ app/models/proposal.rb | 4 +- app/views/admin/settings/_map_form.html.erb | 2 + .../investments/_investment_show.html.erb | 4 ++ app/views/proposals/show.html.erb | 4 ++ spec/models/map_location_spec.rb | 9 +++ 9 files changed, 79 insertions(+), 32 deletions(-) create mode 100644 spec/models/map_location_spec.rb diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee index fb82d0800..33f13d25c 100644 --- a/app/assets/javascripts/map.js.coffee +++ b/app/assets/javascripts/map.js.coffee @@ -8,24 +8,47 @@ App.Map = App.Map.initializeMap map initializeMap: (element) -> - latitude = $(element).data('marker-latitude') - longitude = $(element).data('marker-longitude') - zoom = $(element).data('map-zoom') - mapTilesProvider = $(element).data('map-tiles-provider') - mapAttributionSelector = $(element).data('map-tiles-attribution-selector') - latitudeInputSelector = $(element).data('latitude-input-selector') - longitudeInputSelector = $(element).data('longitude-input-selector') - zoomInputSelector = $(element).data('zoom-input-selector') - removeMarkerSelector = $(element).data('marker-remove-selector') - attribution = $(mapAttributionSelector) - editable = $(element).data('marker-editable') - marker_icon = L.divIcon( + + mapCenterLatitude = $(element).data('map-center-latitude') + mapCenterLongitude = $(element).data('map-center-longitude') + markerLatitude = $(element).data('marker-latitude') + markerLongitude = $(element).data('marker-longitude') + zoom = $(element).data('map-zoom') + mapTilesProvider = $(element).data('map-tiles-provider') + mapAttributionSelector = $(element).data('map-tiles-attribution-selector') + latitudeInputSelector = $(element).data('latitude-input-selector') + longitudeInputSelector = $(element).data('longitude-input-selector') + zoomInputSelector = $(element).data('zoom-input-selector') + removeMarkerSelector = $(element).data('marker-remove-selector') + attribution = $(mapAttributionSelector) + editable = $(element).data('marker-editable') + marker = null; + markerIcon = L.divIcon( iconSize: null html: '
    ') - placeMarker = (e) -> - marker.setLatLng(e.latlng) + createMarker = (latitude, longitude) -> + markerLatLng = new (L.LatLng)(latitude, longitude) + marker = L.marker(markerLatLng, { icon: markerIcon, draggable: editable }) + if editable + marker.on 'dragend', updateFormfields marker.addTo(map) + return marker + + removeMarker = (e) -> + e.preventDefault() + if marker + map.removeLayer(marker) + marker = null; + clearFormfields() + return + + moveOrPlaceMarker = (e) -> + if marker + marker.setLatLng(e.latlng) + else + marker = createMarker(e.latlng.lat, e.latlng.lng) + updateFormfields() return @@ -41,20 +64,14 @@ App.Map = $(zoomInputSelector).val '' return - removeMarker = (e) -> - e.preventDefault() - map.removeLayer(marker) - clearFormfields() - return - - latLng = new (L.LatLng)(latitude, longitude) - map = L.map(element.id).setView(latLng, zoom) - marker = L.marker(latLng, { icon: marker_icon, draggable: editable }) + mapCenterLatLng = new (L.LatLng)(mapCenterLatitude, mapCenterLongitude) + map = L.map(element.id).setView(mapCenterLatLng, zoom) L.tileLayer(mapTilesProvider, attribution: attribution.html()).addTo map - marker.addTo(map) + + if markerLatitude && markerLongitude + marker = createMarker(markerLatitude, markerLongitude) if editable $(removeMarkerSelector).on 'click', removeMarker - marker.on 'dragend', updateFormfields map.on 'zoomend', updateFormfields - map.on 'click', placeMarker \ No newline at end of file + map.on 'click', moveOrPlaceMarker \ No newline at end of file diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 805d5504c..1df7a861c 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -1,5 +1,9 @@ module MapLocationsHelper + def map_location_available?(map_location) + map_location.present? && map_location.filled? + end + def map_location_latitude(map_location) map_location.present? && map_location.latitude.present? ? map_location.latitude : Setting["map.latitude"] end @@ -30,12 +34,14 @@ module MapLocationsHelper class: "map", data:{ map: "", + map_center_latitude: map_location_latitude(map_location), + map_center_longitude: map_location_longitude(map_location), map_zoom: map_location_zoom(map_location), map_tiles_attribution_selector: map_location_attribution_id(map_location), map_tiles_provider: "//{s}.tile.osm.org/{z}/{x}/{y}.png", marker_editable: editable, - marker_latitude: map_location_latitude(map_location), - marker_longitude: map_location_longitude(map_location), + marker_latitude: map_location.latitude, + marker_longitude: map_location.longitude, marker_remove_selector: "##{map_location_remove_marker_link_id(map_location)}", latitude_input_selector: "##{map_location_input_id(parent_class, 'latitude')}", longitude_input_selector: "##{map_location_input_id(parent_class, 'longitude')}", @@ -43,6 +49,7 @@ module MapLocationsHelper } map += map_attributtion(map_location) map += map_location_remove_marker(map_location, remove_marker_label) if editable + map end def map_attributtion(map_location, klass = nil) diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index af8feac1d..e48bc2c57 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -27,8 +27,8 @@ class Budget has_many :valuators, through: :valuator_assignments has_many :comments, as: :commentable has_many :milestones - has_one :map_location - accepts_nested_attributes_for :map_location + has_one :map_location, dependent: :destroy + accepts_nested_attributes_for :map_location, allow_destroy: true validates :title, presence: true validates :author, presence: true diff --git a/app/models/map_location.rb b/app/models/map_location.rb index 61cb10893..8db4cda9c 100644 --- a/app/models/map_location.rb +++ b/app/models/map_location.rb @@ -3,4 +3,8 @@ class MapLocation < ActiveRecord::Base belongs_to :proposal belongs_to :investment + def filled? + latitude.present? && longitude.present? && zoom.present? + end + end diff --git a/app/models/proposal.rb b/app/models/proposal.rb index 7ad7a863b..b8d919e97 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -25,8 +25,8 @@ class Proposal < ActiveRecord::Base belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' belongs_to :geozone - has_one :map_location - accepts_nested_attributes_for :map_location + has_one :map_location, dependent: :destroy + accepts_nested_attributes_for :map_location, allow_destroy: true has_many :comments, as: :commentable has_many :proposal_notifications diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb index 256bcd478..beac8e87b 100644 --- a/app/views/admin/settings/_map_form.html.erb +++ b/app/views/admin/settings/_map_form.html.erb @@ -2,6 +2,8 @@
    " + data-map-center-longitude="<%= Setting["map.longitude"] %>" data-map-zoom="<%= Setting["map.zoom"] %>" data-map-tiles-attribution-selector="#admin-map-attribution" data-map-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb index e257de0bb..eab4de525 100644 --- a/app/views/budgets/investments/_investment_show.html.erb +++ b/app/views/budgets/investments/_investment_show.html.erb @@ -45,6 +45,10 @@ <%= safe_html_with_links investment.description.html_safe %> + <% if feature?(:map) && map_location_available?(@investment.map_location) %> + <%= render_map(@investment.map_location, "budget_investment", false, nil) %> + <% end %> + <% if investment.external_url.present? %>
    <%= text_with_links investment.external_url %> diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 96999ca7d..e25bdf9f7 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -68,6 +68,10 @@ <%= safe_html_with_links @proposal.description %> + <% if feature?(:map) && map_location_available?(@proposal.map_location) %> + <%= render_map(@proposal.map_location, "proposal", false, nil) %> + <% end %> + <% if @proposal.external_url.present? %>

    diff --git a/spec/models/map_location_spec.rb b/spec/models/map_location_spec.rb new file mode 100644 index 000000000..e0b61f53a --- /dev/null +++ b/spec/models/map_location_spec.rb @@ -0,0 +1,9 @@ +require 'rails_helper' + +describe MapLocation do + + context "#filled?" do + + end + +end From 3b04f881e765e57c9e956c896dcd755afac00542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 11:37:00 +0200 Subject: [PATCH 197/765] Fix map marker positioning. --- app/assets/javascripts/map.js.coffee | 6 +++-- app/assets/stylesheets/admin.scss | 33 +++++++++++++++------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee index 33f13d25c..493de07cc 100644 --- a/app/assets/javascripts/map.js.coffee +++ b/app/assets/javascripts/map.js.coffee @@ -24,8 +24,10 @@ App.Map = editable = $(element).data('marker-editable') marker = null; markerIcon = L.divIcon( - iconSize: null - html: '

    ') + className: 'map-marker' + iconSize: [30, 30] + iconAnchor: [15, 40] + html: '
    ') createMarker = (latitude, longitude) -> markerLatLng = new (L.LatLng)(latitude, longitude) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index aec72b35b..c025944f6 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -977,24 +977,27 @@ table { height: 350px; .map-marker { visibility: visible; - width: 30px; - height: 30px; - border-radius: 50% 50% 50% 0; - background: #00cae9; position: absolute; - transform: rotate(-45deg); left: 50%; top: 50%; - margin: -45px 0 0 -15px; - } - .map-marker:after { - content: ""; - width: 14px; - height: 14px; - margin: 8px 0 0 8px; - background: white; - position: absolute; - border-radius: 50%; + margin-top: -5px; + .map-icon{ + transform: rotate(-45deg); + width: 30px; + height: 30px; + border-radius: 50% 50% 50% 0; + background: #00cae9; + transform: rotate(-45deg); + } + .map-icon:after { + content: ""; + width: 14px; + height: 14px; + margin: 8px 0 0 8px; + background: white; + position: absolute; + border-radius: 50%; + } } .map-attributtion{ visibility: visible; From 5815389cb8c3b356281095b5863a4d0e5607ef7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 11:56:46 +0200 Subject: [PATCH 198/765] Rename map settings keys --- app/controllers/admin/settings_controller.rb | 6 +++--- app/helpers/map_locations_helper.rb | 6 +++--- app/views/admin/settings/_map_form.html.erb | 16 ++++++++-------- config/locales/en/settings.yml | 3 +++ config/locales/es/settings.yml | 3 +++ db/dev_seeds.rb | 6 +++--- db/seeds.rb | 6 +++--- 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index 2d69ff19a..14dfc6658 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -15,9 +15,9 @@ class Admin::SettingsController < Admin::BaseController end def update_map - Setting["map.latitude"] = params[:latitude].to_f - Setting["map.longitude"] = params[:longitude].to_f - Setting["map.zoom"] = params[:zoom].to_i + Setting["map_latitude"] = params[:latitude].to_f + Setting["map_longitude"] = params[:longitude].to_f + Setting["map_zoom"] = params[:zoom].to_i redirect_to admin_settings_path, notice: t("admin.settings.index.map.flash.update") end diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 1df7a861c..e0350773c 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -5,15 +5,15 @@ module MapLocationsHelper end def map_location_latitude(map_location) - map_location.present? && map_location.latitude.present? ? map_location.latitude : Setting["map.latitude"] + map_location.present? && map_location.latitude.present? ? map_location.latitude : Setting["map_latitude"] end def map_location_longitude(map_location) - map_location.present? && map_location.longitude.present? ? map_location.longitude : Setting["map.longitude"] + map_location.present? && map_location.longitude.present? ? map_location.longitude : Setting["map_longitude"] end def map_location_zoom(map_location) - map_location.present? && map_location.zoom.present? ? map_location.zoom : Setting["map.zoom"] + map_location.present? && map_location.zoom.present? ? map_location.zoom : Setting["map_zoom"] end def map_location_input_id(prefix, attribute) diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb index beac8e87b..1f74698f1 100644 --- a/app/views/admin/settings/_map_form.html.erb +++ b/app/views/admin/settings/_map_form.html.erb @@ -2,14 +2,14 @@
    " - data-map-center-longitude="<%= Setting["map.longitude"] %>" - data-map-zoom="<%= Setting["map.zoom"] %>" + data-map-center-latitude="<%= Setting["map_latitude"] %>" + data-map-center-longitude="<%= Setting["map_longitude"] %>" + data-map-zoom="<%= Setting["map_zoom"] %>" data-map-tiles-attribution-selector="#admin-map-attribution" data-map-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" data-marker-editable="true" - data-marker-latitude="<%= Setting["map.latitude"] %>" - data-marker-longitude="<%= Setting["map.longitude"] %>" + data-marker-latitude="<%= Setting["map_latitude"] %>" + data-marker-longitude="<%= Setting["map_longitude"] %>" data-latitude-input-selector="#latitude" data-longitude-input-selector="#longitude" data-zoom-input-selector="#zoom"> @@ -20,9 +20,9 @@ <%= form_tag admin_update_map_path, method: :put, id: 'map-form' do |f| %> - <%= hidden_field_tag :latitude, Setting["map.latitude"] %> - <%= hidden_field_tag :longitude, Setting["map.longitude"] %> - <%= hidden_field_tag :zoom, Setting["map.zoom"] %> + <%= hidden_field_tag :latitude, Setting["map_latitude"] %> + <%= hidden_field_tag :longitude, Setting["map_longitude"] %> + <%= hidden_field_tag :zoom, Setting["map_zoom"] %>
    <%= submit_tag t("admin.settings.index.map.form.submit"), diff --git a/config/locales/en/settings.yml b/config/locales/en/settings.yml index 81ddd57d9..eaf610f4d 100644 --- a/config/locales/en/settings.yml +++ b/config/locales/en/settings.yml @@ -41,6 +41,9 @@ en: legislation: Legislation community: Community on proposals and investments map: Proposals and budget investments geolocation + map_latitude: Latitude + map_longitude: Longitude + map_zoom: Zoom mailer_from_name: Origin email name mailer_from_address: Origin email address meta_description: "Site description (SEO)" diff --git a/config/locales/es/settings.yml b/config/locales/es/settings.yml index e6cfde3b1..b23c6e688 100644 --- a/config/locales/es/settings.yml +++ b/config/locales/es/settings.yml @@ -41,6 +41,9 @@ es: legislation: Legislación community: Comunidad en propuestas y proyectos de inversión map: Geolocalización de propuestas y proyectos de inversión + map_latitude: Latitud + map_longitude: Longitud + map_zoom: Zoom mailer_from_name: Nombre email remitente mailer_from_address: Dirección email remitente meta_description: "Descripción del sitio (SEO)" diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 45b0ed27b..fcd86c44a 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -48,9 +48,9 @@ Setting.create(key: 'meta_keywords', value: 'citizen participation, open governm Setting.create(key: 'verification_offices_url', value: 'http://oficinas-atencion-ciudadano.url/') Setting.create(key: 'min_age_to_participate', value: '16') Setting.create(key: 'proposal_improvement_path', value: nil) -Setting.create(key: 'map.latitude', value: 51.48) -Setting.create(key: 'map.longitude', value: 0) -Setting.create(key: 'map.zoom', value: 10) +Setting.create(key: 'map_latitude', value: 51.48) +Setting.create(key: 'map_longitude', value: 0.0) +Setting.create(key: 'map_zoom', value: 10) puts " ✅" print "Creating Geozones" diff --git a/db/seeds.rb b/db/seeds.rb index 13a532a92..a2f25e340 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -111,6 +111,6 @@ Setting['min_age_to_participate'] = 16 Setting['proposal_improvement_path'] = nil # City map feature default configuration (Greenwich) -Setting['map.latitude'] = 51.48 -Setting['map.longitude'] = 0 -Setting['map.zoom'] = 10 +Setting['map_latitude'] = 51.48 +Setting['map_longitude'] = 0.0 +Setting['map_zoom'] = 10 From 053a87eb2cc8a56e1a8e7e2066e2c15ae87a5323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 12:14:06 +0200 Subject: [PATCH 199/765] Refactor map locations helper --- app/helpers/map_locations_helper.rb | 36 +++++++++++-------- app/views/map_locations/_form_fields.html.erb | 2 +- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index e0350773c..8d295b1b6 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -32,21 +32,7 @@ module MapLocationsHelper map = content_tag_for :div, map_location, class: "map", - data:{ - map: "", - map_center_latitude: map_location_latitude(map_location), - map_center_longitude: map_location_longitude(map_location), - map_zoom: map_location_zoom(map_location), - map_tiles_attribution_selector: map_location_attribution_id(map_location), - map_tiles_provider: "//{s}.tile.osm.org/{z}/{x}/{y}.png", - marker_editable: editable, - marker_latitude: map_location.latitude, - marker_longitude: map_location.longitude, - marker_remove_selector: "##{map_location_remove_marker_link_id(map_location)}", - latitude_input_selector: "##{map_location_input_id(parent_class, 'latitude')}", - longitude_input_selector: "##{map_location_input_id(parent_class, 'longitude')}", - zoom_input_selector: "##{map_location_input_id(parent_class, 'zoom')}" - } + data: prepare_map_settings(map_location, editable, parent_class) map += map_attributtion(map_location) map += map_location_remove_marker(map_location, remove_marker_label) if editable map @@ -69,4 +55,24 @@ module MapLocationsHelper end end + private + + def prepare_map_settings(map_location, editable, parent_class) + options = { + map: "", + map_center_latitude: map_location_latitude(map_location), + map_center_longitude: map_location_longitude(map_location), + map_zoom: map_location_zoom(map_location), + map_tiles_attribution_selector: map_location_attribution_id(map_location), + map_tiles_provider: "//{s}.tile.osm.org/{z}/{x}/{y}.png", + marker_editable: editable, + marker_latitude: map_location.latitude, + marker_longitude: map_location.longitude, + marker_remove_selector: "##{map_location_remove_marker_link_id(map_location)}", + latitude_input_selector: "##{map_location_input_id(parent_class, 'latitude')}", + longitude_input_selector: "##{map_location_input_id(parent_class, 'longitude')}", + zoom_input_selector: "##{map_location_input_id(parent_class, 'zoom')}" + } + end + end \ No newline at end of file diff --git a/app/views/map_locations/_form_fields.html.erb b/app/views/map_locations/_form_fields.html.erb index f838d1f98..95e0331ae 100644 --- a/app/views/map_locations/_form_fields.html.erb +++ b/app/views/map_locations/_form_fields.html.erb @@ -1,7 +1,7 @@ <%= form.label :map_location, label %>

    <%= help %>

    -<%= render_map(map_location, parent_class, true, remove_marker_label) %> +<%= render_map(map_location, parent_class, editable = true, remove_marker_label) %> <%= form.fields_for :map_location, map_location do |m_l_fields| %> <%= m_l_fields.hidden_field :latitude, From 011ef41ae18ea42dc8d5a2ba384499a05e6fe754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 12:33:52 +0200 Subject: [PATCH 200/765] Add map location missing specs --- app/assets/stylesheets/admin.scss | 1 - app/helpers/map_locations_helper.rb | 2 +- app/models/map_location.rb | 2 +- spec/factories.rb | 16 ++++++++++++++- spec/models/map_location_spec.rb | 31 +++++++++++++++++++++++++++-- 5 files changed, 46 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index c025944f6..b6f237c15 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -982,7 +982,6 @@ table { top: 50%; margin-top: -5px; .map-icon{ - transform: rotate(-45deg); width: 30px; height: 30px; border-radius: 50% 50% 50% 0; diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 8d295b1b6..03823e25c 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -1,7 +1,7 @@ module MapLocationsHelper def map_location_available?(map_location) - map_location.present? && map_location.filled? + map_location.present? && map_location.available? end def map_location_latitude(map_location) diff --git a/app/models/map_location.rb b/app/models/map_location.rb index 8db4cda9c..6635bf995 100644 --- a/app/models/map_location.rb +++ b/app/models/map_location.rb @@ -3,7 +3,7 @@ class MapLocation < ActiveRecord::Base belongs_to :proposal belongs_to :investment - def filled? + def available? latitude.present? && longitude.present? && zoom.present? end diff --git a/spec/factories.rb b/spec/factories.rb index 160b81664..3fc3d7c36 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -821,7 +821,7 @@ LOREM_IPSUM factory :direct_upload do user - + trait :proposal do resource_type "Proposal" end @@ -840,4 +840,18 @@ LOREM_IPSUM initialize_with { new(attributes) } end + factory :map_location do + latitude 51.48 + longitude 0.0 + zoom 10 + + trait :proposal_map_location do + proposal + end + + trait :investment_map_location do + investment + end + end + end diff --git a/spec/models/map_location_spec.rb b/spec/models/map_location_spec.rb index e0b61f53a..bd093a71e 100644 --- a/spec/models/map_location_spec.rb +++ b/spec/models/map_location_spec.rb @@ -2,8 +2,35 @@ require 'rails_helper' describe MapLocation do - context "#filled?" do - + let(:map_location) { build(:map_location, :proposal_map_location ) } + + it "should be valid" do + expect(map_location).to be_valid + end + + context "#available?" do + + it "should return true when latitude, longitude and zoom defined" do + expect(map_location.available?).to be(true) + end + + it "should return false when longitude is nil" do + map_location.longitude = nil + + expect(map_location.available?).to be(false) + end + + it "should return false when latitude is nil" do + map_location.latitude = nil + + expect(map_location.available?).to be(false) + end + + it "should return false when zoom is nil" do + map_location.zoom = nil + + expect(map_location.available?).to be(false) + end end end From 5113fefef64736590ac492e38ed42f5bd7118577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 15:08:16 +0200 Subject: [PATCH 201/765] Change open street maps tile server url. --- app/helpers/map_locations_helper.rb | 2 +- app/views/admin/settings/_map_form.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 03823e25c..59711fce4 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -64,7 +64,7 @@ module MapLocationsHelper map_center_longitude: map_location_longitude(map_location), map_zoom: map_location_zoom(map_location), map_tiles_attribution_selector: map_location_attribution_id(map_location), - map_tiles_provider: "//{s}.tile.osm.org/{z}/{x}/{y}.png", + map_tiles_provider: "//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", marker_editable: editable, marker_latitude: map_location.latitude, marker_longitude: map_location.longitude, diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb index 1f74698f1..56ca958a9 100644 --- a/app/views/admin/settings/_map_form.html.erb +++ b/app/views/admin/settings/_map_form.html.erb @@ -6,7 +6,7 @@ data-map-center-longitude="<%= Setting["map_longitude"] %>" data-map-zoom="<%= Setting["map_zoom"] %>" data-map-tiles-attribution-selector="#admin-map-attribution" - data-map-tiles-provider="//{s}.tile.osm.org/{z}/{x}/{y}.png" + data-map-tiles-provider="//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" data-marker-editable="true" data-marker-latitude="<%= Setting["map_latitude"] %>" data-marker-longitude="<%= Setting["map_longitude"] %>" From 5a09b79da4c52d1d9e0ed311cc5389173e2f6314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 16:07:33 +0200 Subject: [PATCH 202/765] Move map tiles provider server and map tiles attribution to secrets. --- app/assets/javascripts/map.js.coffee | 5 ++--- app/helpers/map_locations_helper.rb | 16 ++-------------- app/views/admin/settings/_map_form.html.erb | 7 ++----- config/secrets.yml.example | 5 +++++ 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee index 493de07cc..53c346c9e 100644 --- a/app/assets/javascripts/map.js.coffee +++ b/app/assets/javascripts/map.js.coffee @@ -15,12 +15,11 @@ App.Map = markerLongitude = $(element).data('marker-longitude') zoom = $(element).data('map-zoom') mapTilesProvider = $(element).data('map-tiles-provider') - mapAttributionSelector = $(element).data('map-tiles-attribution-selector') + mapAttribution = $(element).data('map-tiles-provider-attribution') latitudeInputSelector = $(element).data('latitude-input-selector') longitudeInputSelector = $(element).data('longitude-input-selector') zoomInputSelector = $(element).data('zoom-input-selector') removeMarkerSelector = $(element).data('marker-remove-selector') - attribution = $(mapAttributionSelector) editable = $(element).data('marker-editable') marker = null; markerIcon = L.divIcon( @@ -68,7 +67,7 @@ App.Map = mapCenterLatLng = new (L.LatLng)(mapCenterLatitude, mapCenterLongitude) map = L.map(element.id).setView(mapCenterLatLng, zoom) - L.tileLayer(mapTilesProvider, attribution: attribution.html()).addTo map + L.tileLayer(mapTilesProvider, attribution: mapAttribution).addTo map if markerLatitude && markerLongitude marker = createMarker(markerLatitude, markerLongitude) diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 59711fce4..42159385a 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -20,10 +20,6 @@ module MapLocationsHelper "#{prefix}_map_location_attributes_#{attribute}" end - def map_location_attribution_id(map_location) - "attribution-#{dom_id(map_location)}" - end - def map_location_remove_marker_link_id(map_location) "remove-marker-link-#{dom_id(map_location)}" end @@ -33,18 +29,10 @@ module MapLocationsHelper map_location, class: "map", data: prepare_map_settings(map_location, editable, parent_class) - map += map_attributtion(map_location) map += map_location_remove_marker(map_location, remove_marker_label) if editable map end - def map_attributtion(map_location, klass = nil) - content = "©#{link_to("OpenStreetMap", "http://osm.org/copyright")} contributors".html_safe - content_tag :div, id: map_location_attribution_id(map_location), class: "map-attributtion #{klass}" do - content - end - end - def map_location_remove_marker(map_location, text) content_tag :div, class: "small-12 column text-right" do content_tag :a, @@ -63,8 +51,8 @@ module MapLocationsHelper map_center_latitude: map_location_latitude(map_location), map_center_longitude: map_location_longitude(map_location), map_zoom: map_location_zoom(map_location), - map_tiles_attribution_selector: map_location_attribution_id(map_location), - map_tiles_provider: "//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", + map_tiles_provider: Rails.application.secrets.map_tiles_provider, + map_tiles_provider_attribution: Rails.application.secrets.map_tiles_provider_attribution, marker_editable: editable, marker_latitude: map_location.latitude, marker_longitude: map_location.longitude, diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb index 56ca958a9..074d92bd4 100644 --- a/app/views/admin/settings/_map_form.html.erb +++ b/app/views/admin/settings/_map_form.html.erb @@ -5,8 +5,8 @@ data-map-center-latitude="<%= Setting["map_latitude"] %>" data-map-center-longitude="<%= Setting["map_longitude"] %>" data-map-zoom="<%= Setting["map_zoom"] %>" - data-map-tiles-attribution-selector="#admin-map-attribution" - data-map-tiles-provider="//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" + data-map-tiles-provider="<%= Rails.application.secrets.map_tiles_provider %>" + data-map-tiles-provider-attribution="<%= Rails.application.secrets.map_tiles_provider_attribution %>" data-marker-editable="true" data-marker-latitude="<%= Setting["map_latitude"] %>" data-marker-longitude="<%= Setting["map_longitude"] %>" @@ -14,9 +14,6 @@ data-longitude-input-selector="#longitude" data-zoom-input-selector="#zoom">
    -
    - © OpenStreetMap contributors -
    <%= form_tag admin_update_map_path, method: :put, id: 'map-form' do |f| %> diff --git a/config/secrets.yml.example b/config/secrets.yml.example index f67ea65c0..6f01d715c 100644 --- a/config/secrets.yml.example +++ b/config/secrets.yml.example @@ -1,5 +1,7 @@ default: &default secret_key_base: "56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4" + map_tiles_provider: "//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" + map_tiles_provider_attribution: "© OpenStreetMap contributors" development: <<: *default @@ -36,6 +38,9 @@ production: &production rollbar_server_token: "" server_name: "" + map_tiles_provider: "//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" + map_tiles_provider_attribution: "© OpenStreetMap contributors" + preproduction: server_name: "" <<: *production From 05350b0f40679aaef4659c3c876d65046e9bfd2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 18:03:44 +0200 Subject: [PATCH 203/765] Fix scss lint warnings --- app/assets/stylesheets/admin.scss | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index b6f237c15..ece444c76 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -972,41 +972,47 @@ table { // 09. Map // -------------- -.map{ +.map { width: 100%; height: 350px; + .map-marker { visibility: visible; position: absolute; left: 50%; top: 50%; margin-top: -5px; - .map-icon{ + + .map-icon { width: 30px; height: 30px; border-radius: 50% 50% 50% 0; background: #00cae9; transform: rotate(-45deg); } - .map-icon:after { - content: ""; + + .map-icon::after { + content: ''; width: 14px; height: 14px; margin: 8px 0 0 8px; - background: white; + background: #fff; position: absolute; border-radius: 50%; } } - .map-attributtion{ + + .map-attributtion { visibility: visible; height: auto; } } -.map-marker{ + +.map-marker { visibility: hidden; } -.map-attributtion{ + +.map-attributtion { visibility: hidden; height: 0; -} \ No newline at end of file +} From c9963b1c4f75bcf6f7ffa0cdf7e99f5c0440ef72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 8 Aug 2017 18:07:08 +0200 Subject: [PATCH 204/765] Some alignment fixes --- app/helpers/map_locations_helper.rb | 2 +- app/views/admin/settings/_map_form.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 42159385a..26766e96d 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -34,7 +34,7 @@ module MapLocationsHelper end def map_location_remove_marker(map_location, text) - content_tag :div, class: "small-12 column text-right" do + content_tag :div, class: "text-right" do content_tag :a, id: map_location_remove_marker_link_id(map_location), class: "location-map-remove-marker-button delete" do diff --git a/app/views/admin/settings/_map_form.html.erb b/app/views/admin/settings/_map_form.html.erb index 074d92bd4..9c411bb12 100644 --- a/app/views/admin/settings/_map_form.html.erb +++ b/app/views/admin/settings/_map_form.html.erb @@ -21,7 +21,7 @@ <%= hidden_field_tag :longitude, Setting["map_longitude"] %> <%= hidden_field_tag :zoom, Setting["map_zoom"] %> -
    +
    <%= submit_tag t("admin.settings.index.map.form.submit"), class: "button hollow expanded" %>
    From 7b54451491e3a10540e2b741011487fe2568778d Mon Sep 17 00:00:00 2001 From: taitus Date: Mon, 11 Sep 2017 19:29:29 +0200 Subject: [PATCH 205/765] Add missing specs on admin --- spec/features/admin/settings_spec.rb | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/spec/features/admin/settings_spec.rb b/spec/features/admin/settings_spec.rb index 0a220d05b..e3c968eca 100644 --- a/spec/features/admin/settings_spec.rb +++ b/spec/features/admin/settings_spec.rb @@ -39,7 +39,7 @@ feature 'Admin settings' do expect(page).not_to have_content "Map configuration" end - scenario "Should be able when map feature deactivated" do + scenario "Should be able when map feature activated" do Setting['feature.map'] = true admin = create(:administrator).user login_as(admin) @@ -61,6 +61,26 @@ feature 'Admin settings' do expect(page).to have_content "Map configuration updated succesfully" end + scenario "Should update marker", :js do + Setting['feature.map'] = true + admin = create(:administrator).user + login_as(admin) + visit admin_settings_path + + expect(find("#latitude", visible: false).value).to eq "51.48" + expect(find("#longitude", visible: false).value).to eq "0.0" + + find("#admin-map").click + + within "#map-form" do + click_on "Update" + end + + expect(find("#latitude", visible: false).value).not_to eq "51.48" + expect(page).to have_content "Map configuration updated succesfully" + end + + end -end \ No newline at end of file +end From 51c53b6f31d891eaab554251bd9bc1db1aa7bb5f Mon Sep 17 00:00:00 2001 From: taitus Date: Wed, 13 Sep 2017 16:19:40 +0200 Subject: [PATCH 206/765] Add missing specs from Maps on New, Edit and Show. --- app/assets/javascripts/map.js.coffee | 2 +- app/helpers/map_locations_helper.rb | 3 +- app/models/map_location.rb | 2 +- app/views/map_locations/_form_fields.html.erb | 5 +- db/seeds.rb | 2 +- spec/factories.rb | 4 +- spec/features/budgets/investments_spec.rb | 8 + spec/features/proposals_spec.rb | 39 ++++ spec/shared/features/documentable.rb | 1 - spec/shared/features/mapeable.rb | 220 ++++++++++++++++++ 10 files changed, 278 insertions(+), 8 deletions(-) create mode 100644 spec/shared/features/mapeable.rb diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee index 53c346c9e..3f28024a7 100644 --- a/app/assets/javascripts/map.js.coffee +++ b/app/assets/javascripts/map.js.coffee @@ -75,4 +75,4 @@ App.Map = if editable $(removeMarkerSelector).on 'click', removeMarker map.on 'zoomend', updateFormfields - map.on 'click', moveOrPlaceMarker \ No newline at end of file + map.on 'click', moveOrPlaceMarker diff --git a/app/helpers/map_locations_helper.rb b/app/helpers/map_locations_helper.rb index 26766e96d..ae45e7c1d 100644 --- a/app/helpers/map_locations_helper.rb +++ b/app/helpers/map_locations_helper.rb @@ -37,6 +37,7 @@ module MapLocationsHelper content_tag :div, class: "text-right" do content_tag :a, id: map_location_remove_marker_link_id(map_location), + href: "#", class: "location-map-remove-marker-button delete" do text end @@ -63,4 +64,4 @@ module MapLocationsHelper } end -end \ No newline at end of file +end diff --git a/app/models/map_location.rb b/app/models/map_location.rb index 6635bf995..14e91d92c 100644 --- a/app/models/map_location.rb +++ b/app/models/map_location.rb @@ -1,7 +1,7 @@ class MapLocation < ActiveRecord::Base belongs_to :proposal - belongs_to :investment + belongs_to :investment, class_name: Budget::Investment def available? latitude.present? && longitude.present? && zoom.present? diff --git a/app/views/map_locations/_form_fields.html.erb b/app/views/map_locations/_form_fields.html.erb index 95e0331ae..39c87c7e4 100644 --- a/app/views/map_locations/_form_fields.html.erb +++ b/app/views/map_locations/_form_fields.html.erb @@ -4,6 +4,9 @@ <%= render_map(map_location, parent_class, editable = true, remove_marker_label) %> <%= form.fields_for :map_location, map_location do |m_l_fields| %> + <%= m_l_fields.hidden_field :id, + value: map_location.id, + id: map_location_input_id(parent_class, 'id') %> <%= m_l_fields.hidden_field :latitude, value: map_location.latitude, id: map_location_input_id(parent_class, 'latitude') %> @@ -13,4 +16,4 @@ <%= m_l_fields.hidden_field :zoom, value: map_location.zoom, id: map_location_input_id(parent_class, 'zoom') %> -<% end %> \ No newline at end of file +<% end %> diff --git a/db/seeds.rb b/db/seeds.rb index a2f25e340..ee444bd91 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -80,7 +80,7 @@ Setting['feature.budgets'] = true Setting['feature.signature_sheets'] = true Setting['feature.legislation'] = true Setting['feature.community'] = true -Setting['feature.map'] = true +Setting['feature.map'] = nil # Spending proposals feature flags Setting['feature.spending_proposal_features.voting_allowed'] = nil diff --git a/spec/factories.rb b/spec/factories.rb index 3fc3d7c36..b0a287aea 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -849,8 +849,8 @@ LOREM_IPSUM proposal end - trait :investment_map_location do - investment + trait :budget_investment_map_location do + association :investment, factory: :budget_investment end end diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index f54b2e3c4..6d487772e 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -485,6 +485,14 @@ feature 'Budget Investments' do "Create Investment", "Budget Investment created successfully." + it_behaves_like "mapeable", + "budget_investment", + "investment", + "new_budget_investment_path", + "", + "budget_investment_path", + { "budget_id": "budget_id" } + context "Destroy" do scenario "Admin cannot destroy budget investments" do diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 0c3481fa1..53af5d6ac 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -1328,6 +1328,14 @@ feature 'Proposals' do "Save changes", "Proposal updated successfully" + it_behaves_like "mapeable", + "proposal", + "proposal", + "new_proposal_path", + "edit_proposal_path", + "proposal_path", + { } + scenario 'Erased author' do user = create(:user) proposal = create(:proposal, author: user) @@ -1533,6 +1541,37 @@ feature 'Proposals' do end + scenario 'Add Map on proposal' do + author = create(:user) + login_as(author) + + visit new_proposal_path + fill_in 'proposal_title', with: 'Help refugees' + fill_in 'proposal_question', with: '¿Would you like to give assistance to war refugees?' + fill_in 'proposal_summary', with: 'In summary, what we want is...' + check 'proposal_terms_of_service' + + click_button 'Create proposal' + + expect(page).to have_content 'Proposal created successfully.' + expect(page).to have_content 'Help refugees' + expect(page).not_to have_content 'You can also see more information about improving your campaign' + + click_link 'Not now, go to my proposal' + + expect(page).to have_content 'Help refugees' + expect(page).to have_content '¿Would you like to give assistance to war refugees?' + expect(page).to have_content 'In summary, what we want is...' + expect(page).to have_content 'This is very important because...' + expect(page).to have_content 'http://rescue.org/refugees' + expect(page).to have_content 'http://youtube.com' + expect(page).to have_content author.name + expect(page).to have_content 'Refugees' + expect(page).to have_content 'Solidarity' + expect(page).to have_content I18n.l(Proposal.last.created_at.to_date) + end + + end feature 'Successful proposals' do diff --git a/spec/shared/features/documentable.rb b/spec/shared/features/documentable.rb index 126573348..2bd9d8f86 100644 --- a/spec/shared/features/documentable.rb +++ b/spec/shared/features/documentable.rb @@ -5,7 +5,6 @@ shared_examples "documentable" do |documentable_factory_name, documentable_path, let!(:user) { create(:user) } let!(:arguments) { {} } let!(:documentable) { create(documentable_factory_name, author: user) } - let!(:documentable_dom_name) { documentable_factory_name.parameterize } before do create(:administrator, user: administrator) diff --git a/spec/shared/features/mapeable.rb b/spec/shared/features/mapeable.rb new file mode 100644 index 000000000..1ed69d049 --- /dev/null +++ b/spec/shared/features/mapeable.rb @@ -0,0 +1,220 @@ +shared_examples "mapeable" do |mapeable_factory_name, mapeable_association_name, mapeable_new_path, mapeable_edit_path, mapeable_show_path, mapeable_path_arguments| + + include ActionView::Helpers + + let!(:user) { create(:user, :level_two) } + + before do + Setting['feature.map'] = true + end + + describe "At #{mapeable_new_path}" do + + let!(:arguments) { {} } + let!(:mapeable) { create("#{mapeable_factory_name}".to_sym) } + let!(:map_location) { create(:map_location, "#{mapeable_factory_name}_map_location".to_sym, "#{mapeable_association_name}": mapeable) } + + before { set_arguments(arguments, mapeable, mapeable_path_arguments) } + + scenario "Should not show marker by default on create #{mapeable_factory_name}", :js do + login_as user + visit send(mapeable_new_path, arguments) + + send("fill_in_#{mapeable_factory_name}_form") + + within ".map_location" do + expect(page).not_to have_css(".map-icon") + end + end + + scenario "Should show marker on create #{mapeable_factory_name} when click on map", :js do + login_as user + visit send(mapeable_new_path, arguments) + + send("fill_in_#{mapeable_factory_name}_form") + find("#new_map_location").click + + within ".map_location" do + expect(page).to have_css(".map-icon") + end + end + + scenario "Should create #{mapeable_factory_name} with map", :js do + login_as user + visit send(mapeable_new_path, arguments) + + send("fill_in_#{mapeable_factory_name}_form") + find("#new_map_location").click + send("submit_#{mapeable_factory_name}_form") + + expect(page).to have_css(".map_location") + end + + scenario "Can not display map on #{mapeable_factory_name} when not fill marker on map", :js do + login_as user + visit send(mapeable_new_path, arguments) + + send("fill_in_#{mapeable_factory_name}_form") + expect(page).to have_css ".map_location" + send("submit_#{mapeable_factory_name}_form") + + expect(page).not_to have_css(".map_location") + end + + scenario "Can not display map on #{mapeable_factory_name} when feature.map is disabled", :js do + Setting['feature.map'] = false + login_as user + visit send(mapeable_new_path, arguments) + + send("fill_in_#{mapeable_factory_name}_form") + expect(page).not_to have_css ".map_location" + send("submit_#{mapeable_factory_name}_form") + + expect(page).not_to have_css(".map_location") + end + + end + + describe "At #{mapeable_edit_path}" do + + let!(:mapeable) { create("#{mapeable_factory_name}".to_sym) } + let!(:map_location) { create(:map_location, "#{mapeable_factory_name}_map_location".to_sym, "#{mapeable_association_name}": mapeable) } + + before { skip } unless mapeable_edit_path.present? + + scenario "Should edit map on #{mapeable_factory_name} and contain default values", :js do + login_as mapeable.author + + visit send(mapeable_edit_path, id: mapeable.id) + + expect(page).to have_content "Navigate the map to the location and place the marker." + validate_latitude_longitude(mapeable_factory_name) + end + + scenario "Should edit default values from map on #{mapeable_factory_name} edit page", :js do + login_as mapeable.author + + visit send(mapeable_edit_path, id: mapeable.id) + find(".map_location").click + click_on("Save changes") + mapeable.reload + + expect(page).to have_css(".map_location") + expect(page).not_to have_selector(".map_location[data-marker-latitude='#{map_location.latitude}']") + expect(page).to have_selector(".map_location[data-marker-latitude='#{mapeable.map_location.latitude}']") + end + + scenario "Should edit mapeable on #{mapeable_factory_name} without change map", :js do + login_as mapeable.author + + visit send(mapeable_edit_path, id: mapeable.id) + fill_in "#{mapeable_factory_name}_title", with: "New title" + click_on("Save changes") + mapeable.reload + + expect(page).to have_css(".map_location") + expect(page).to have_selector(".map_location[data-marker-latitude='#{map_location.latitude}']") + expect(page).to have_selector(".map_location[data-marker-latitude='#{mapeable.map_location.latitude}']") + end + + scenario "Can not display map on #{mapeable_factory_name} edit when remove map marker", :js do + login_as mapeable.author + + visit send(mapeable_edit_path, id: mapeable.id) + click_link "Remove map marker" + click_on "Save changes" + + expect(page).not_to have_css(".map_location") + end + + scenario "Can not display map on #{mapeable_factory_name} edit when feature.map is disabled", :js do + Setting['feature.map'] = false + login_as mapeable.author + + visit send(mapeable_edit_path, id: mapeable.id) + fill_in "#{mapeable_factory_name}_title", with: "New title" + click_on("Save changes") + + expect(page).not_to have_css(".map_location") + end + + end + + describe "At #{mapeable_show_path}" do + + let!(:arguments) { {} } + let!(:mapeable) { create("#{mapeable_factory_name}".to_sym) } + let!(:map_location) { create(:map_location, "#{mapeable_factory_name}_map_location".to_sym, "#{mapeable_association_name}": mapeable) } + + before { set_arguments(arguments, mapeable, mapeable_path_arguments) } + + scenario "Should display map on #{mapeable_factory_name} show page", :js do + arguments.merge!("id": mapeable.id) + + visit send(mapeable_show_path, arguments) + + expect(page).to have_css(".map_location") + end + + scenario "Should not display map on #{mapeable_factory_name} show when marker is not defined", :js do + mapeable_without_map = create("#{mapeable_factory_name}".to_sym) + set_arguments(arguments, mapeable_without_map, mapeable_path_arguments) + arguments.merge!("id": mapeable_without_map.id) + + visit send(mapeable_show_path, arguments) + + expect(page).not_to have_css(".map_location") + end + + scenario "Should not display map on #{mapeable_factory_name} show page when feature.map is disable", :js do + Setting['feature.map'] = false + arguments.merge!("id": mapeable.id) + + visit send(mapeable_show_path, arguments) + + expect(page).not_to have_css(".map_location") + end + + end + +end + +def fill_in_proposal_form + fill_in 'proposal_title', with: 'Help refugees' + fill_in 'proposal_question', with: '¿Would you like to give assistance to war refugees?' + fill_in 'proposal_summary', with: 'In summary, what we want is...' +end + +def submit_proposal_form + check :proposal_terms_of_service + click_button 'Create proposal' + + click_link 'Not now, go to my proposal' +end + +def validate_latitude_longitude(mapeable_factory_name) + expect(find("##{mapeable_factory_name}_map_location_attributes_latitude", visible: false).value).to eq "51.48" + expect(find("##{mapeable_factory_name}_map_location_attributes_longitude", visible: false).value).to eq "0.0" + expect(mapeable.map_location.latitude).to eq 51.48 + expect(mapeable.map_location.longitude).to eq 0.0 +end + +def fill_in_budget_investment_form + page.select mapeable.heading.name_scoped_by_group, from: :budget_investment_heading_id + fill_in :budget_investment_title, with: "Budget investment title" + fill_in_ckeditor "budget_investment_description", with: "Budget investment description" + check :budget_investment_terms_of_service +end + +def submit_budget_investment_form + check :budget_investment_terms_of_service + click_button 'Create Investment' +end + +def set_arguments(arguments, mapeable, mapeable_path_arguments) + if mapeable_path_arguments + mapeable_path_arguments.each do |argument_name, path_to_value| + arguments.merge!("#{argument_name}": mapeable.send(path_to_value)) + end + end +end From a0603985ef438fbd1041333bf0c78b07aa9d58f0 Mon Sep 17 00:00:00 2001 From: taitus Date: Wed, 13 Sep 2017 18:07:18 +0200 Subject: [PATCH 207/765] Refactor. --- app/models/budget/investment.rb | 3 +- app/models/concerns/mappable.rb | 9 + app/models/proposal.rb | 5 +- spec/features/admin/settings_spec.rb | 11 +- spec/features/budgets/investments_spec.rb | 2 +- spec/features/proposals_spec.rb | 33 +--- spec/shared/features/mapeable.rb | 220 ---------------------- spec/shared/features/mappable.rb | 220 ++++++++++++++++++++++ 8 files changed, 243 insertions(+), 260 deletions(-) create mode 100644 app/models/concerns/mappable.rb delete mode 100644 spec/shared/features/mapeable.rb create mode 100644 spec/shared/features/mappable.rb diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index e48bc2c57..ddf6e819c 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -8,6 +8,7 @@ class Budget include Followable include Communitable include Imageable + include Mappable include Documentable documentable max_documents_allowed: 3, max_file_size: 3.megabytes, @@ -27,8 +28,6 @@ class Budget has_many :valuators, through: :valuator_assignments has_many :comments, as: :commentable has_many :milestones - has_one :map_location, dependent: :destroy - accepts_nested_attributes_for :map_location, allow_destroy: true validates :title, presence: true validates :author, presence: true diff --git a/app/models/concerns/mappable.rb b/app/models/concerns/mappable.rb new file mode 100644 index 000000000..c108bdca7 --- /dev/null +++ b/app/models/concerns/mappable.rb @@ -0,0 +1,9 @@ +module Mappable + extend ActiveSupport::Concern + + included do + has_one :map_location, dependent: :destroy + accepts_nested_attributes_for :map_location, allow_destroy: true + end + +end diff --git a/app/models/proposal.rb b/app/models/proposal.rb index b8d919e97..da0fc109f 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -11,10 +11,11 @@ class Proposal < ActiveRecord::Base include Followable include Communitable include Imageable + include Mappable include Documentable documentable max_documents_allowed: 3, max_file_size: 3.megabytes, - accepted_content_types: [ "application/pdf" ] + accepted_content_types: [ "application/pdf" ] include EmbedVideosHelper acts_as_votable @@ -25,8 +26,6 @@ class Proposal < ActiveRecord::Base belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' belongs_to :geozone - has_one :map_location, dependent: :destroy - accepts_nested_attributes_for :map_location, allow_destroy: true has_many :comments, as: :commentable has_many :proposal_notifications diff --git a/spec/features/admin/settings_spec.rb b/spec/features/admin/settings_spec.rb index e3c968eca..73d190cb9 100644 --- a/spec/features/admin/settings_spec.rb +++ b/spec/features/admin/settings_spec.rb @@ -61,17 +61,24 @@ feature 'Admin settings' do expect(page).to have_content "Map configuration updated succesfully" end - scenario "Should update marker", :js do + scenario "Should display marker by default", :js do Setting['feature.map'] = true admin = create(:administrator).user login_as(admin) + visit admin_settings_path expect(find("#latitude", visible: false).value).to eq "51.48" expect(find("#longitude", visible: false).value).to eq "0.0" + end + scenario "Should update marker", :js do + Setting['feature.map'] = true + admin = create(:administrator).user + login_as(admin) + + visit admin_settings_path find("#admin-map").click - within "#map-form" do click_on "Update" end diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index 6d487772e..d17bd9c91 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -485,7 +485,7 @@ feature 'Budget Investments' do "Create Investment", "Budget Investment created successfully." - it_behaves_like "mapeable", + it_behaves_like "mappable", "budget_investment", "investment", "new_budget_investment_path", diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 53af5d6ac..f0e50c7eb 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -1328,7 +1328,7 @@ feature 'Proposals' do "Save changes", "Proposal updated successfully" - it_behaves_like "mapeable", + it_behaves_like "mappable", "proposal", "proposal", "new_proposal_path", @@ -1541,37 +1541,6 @@ feature 'Proposals' do end - scenario 'Add Map on proposal' do - author = create(:user) - login_as(author) - - visit new_proposal_path - fill_in 'proposal_title', with: 'Help refugees' - fill_in 'proposal_question', with: '¿Would you like to give assistance to war refugees?' - fill_in 'proposal_summary', with: 'In summary, what we want is...' - check 'proposal_terms_of_service' - - click_button 'Create proposal' - - expect(page).to have_content 'Proposal created successfully.' - expect(page).to have_content 'Help refugees' - expect(page).not_to have_content 'You can also see more information about improving your campaign' - - click_link 'Not now, go to my proposal' - - expect(page).to have_content 'Help refugees' - expect(page).to have_content '¿Would you like to give assistance to war refugees?' - expect(page).to have_content 'In summary, what we want is...' - expect(page).to have_content 'This is very important because...' - expect(page).to have_content 'http://rescue.org/refugees' - expect(page).to have_content 'http://youtube.com' - expect(page).to have_content author.name - expect(page).to have_content 'Refugees' - expect(page).to have_content 'Solidarity' - expect(page).to have_content I18n.l(Proposal.last.created_at.to_date) - end - - end feature 'Successful proposals' do diff --git a/spec/shared/features/mapeable.rb b/spec/shared/features/mapeable.rb deleted file mode 100644 index 1ed69d049..000000000 --- a/spec/shared/features/mapeable.rb +++ /dev/null @@ -1,220 +0,0 @@ -shared_examples "mapeable" do |mapeable_factory_name, mapeable_association_name, mapeable_new_path, mapeable_edit_path, mapeable_show_path, mapeable_path_arguments| - - include ActionView::Helpers - - let!(:user) { create(:user, :level_two) } - - before do - Setting['feature.map'] = true - end - - describe "At #{mapeable_new_path}" do - - let!(:arguments) { {} } - let!(:mapeable) { create("#{mapeable_factory_name}".to_sym) } - let!(:map_location) { create(:map_location, "#{mapeable_factory_name}_map_location".to_sym, "#{mapeable_association_name}": mapeable) } - - before { set_arguments(arguments, mapeable, mapeable_path_arguments) } - - scenario "Should not show marker by default on create #{mapeable_factory_name}", :js do - login_as user - visit send(mapeable_new_path, arguments) - - send("fill_in_#{mapeable_factory_name}_form") - - within ".map_location" do - expect(page).not_to have_css(".map-icon") - end - end - - scenario "Should show marker on create #{mapeable_factory_name} when click on map", :js do - login_as user - visit send(mapeable_new_path, arguments) - - send("fill_in_#{mapeable_factory_name}_form") - find("#new_map_location").click - - within ".map_location" do - expect(page).to have_css(".map-icon") - end - end - - scenario "Should create #{mapeable_factory_name} with map", :js do - login_as user - visit send(mapeable_new_path, arguments) - - send("fill_in_#{mapeable_factory_name}_form") - find("#new_map_location").click - send("submit_#{mapeable_factory_name}_form") - - expect(page).to have_css(".map_location") - end - - scenario "Can not display map on #{mapeable_factory_name} when not fill marker on map", :js do - login_as user - visit send(mapeable_new_path, arguments) - - send("fill_in_#{mapeable_factory_name}_form") - expect(page).to have_css ".map_location" - send("submit_#{mapeable_factory_name}_form") - - expect(page).not_to have_css(".map_location") - end - - scenario "Can not display map on #{mapeable_factory_name} when feature.map is disabled", :js do - Setting['feature.map'] = false - login_as user - visit send(mapeable_new_path, arguments) - - send("fill_in_#{mapeable_factory_name}_form") - expect(page).not_to have_css ".map_location" - send("submit_#{mapeable_factory_name}_form") - - expect(page).not_to have_css(".map_location") - end - - end - - describe "At #{mapeable_edit_path}" do - - let!(:mapeable) { create("#{mapeable_factory_name}".to_sym) } - let!(:map_location) { create(:map_location, "#{mapeable_factory_name}_map_location".to_sym, "#{mapeable_association_name}": mapeable) } - - before { skip } unless mapeable_edit_path.present? - - scenario "Should edit map on #{mapeable_factory_name} and contain default values", :js do - login_as mapeable.author - - visit send(mapeable_edit_path, id: mapeable.id) - - expect(page).to have_content "Navigate the map to the location and place the marker." - validate_latitude_longitude(mapeable_factory_name) - end - - scenario "Should edit default values from map on #{mapeable_factory_name} edit page", :js do - login_as mapeable.author - - visit send(mapeable_edit_path, id: mapeable.id) - find(".map_location").click - click_on("Save changes") - mapeable.reload - - expect(page).to have_css(".map_location") - expect(page).not_to have_selector(".map_location[data-marker-latitude='#{map_location.latitude}']") - expect(page).to have_selector(".map_location[data-marker-latitude='#{mapeable.map_location.latitude}']") - end - - scenario "Should edit mapeable on #{mapeable_factory_name} without change map", :js do - login_as mapeable.author - - visit send(mapeable_edit_path, id: mapeable.id) - fill_in "#{mapeable_factory_name}_title", with: "New title" - click_on("Save changes") - mapeable.reload - - expect(page).to have_css(".map_location") - expect(page).to have_selector(".map_location[data-marker-latitude='#{map_location.latitude}']") - expect(page).to have_selector(".map_location[data-marker-latitude='#{mapeable.map_location.latitude}']") - end - - scenario "Can not display map on #{mapeable_factory_name} edit when remove map marker", :js do - login_as mapeable.author - - visit send(mapeable_edit_path, id: mapeable.id) - click_link "Remove map marker" - click_on "Save changes" - - expect(page).not_to have_css(".map_location") - end - - scenario "Can not display map on #{mapeable_factory_name} edit when feature.map is disabled", :js do - Setting['feature.map'] = false - login_as mapeable.author - - visit send(mapeable_edit_path, id: mapeable.id) - fill_in "#{mapeable_factory_name}_title", with: "New title" - click_on("Save changes") - - expect(page).not_to have_css(".map_location") - end - - end - - describe "At #{mapeable_show_path}" do - - let!(:arguments) { {} } - let!(:mapeable) { create("#{mapeable_factory_name}".to_sym) } - let!(:map_location) { create(:map_location, "#{mapeable_factory_name}_map_location".to_sym, "#{mapeable_association_name}": mapeable) } - - before { set_arguments(arguments, mapeable, mapeable_path_arguments) } - - scenario "Should display map on #{mapeable_factory_name} show page", :js do - arguments.merge!("id": mapeable.id) - - visit send(mapeable_show_path, arguments) - - expect(page).to have_css(".map_location") - end - - scenario "Should not display map on #{mapeable_factory_name} show when marker is not defined", :js do - mapeable_without_map = create("#{mapeable_factory_name}".to_sym) - set_arguments(arguments, mapeable_without_map, mapeable_path_arguments) - arguments.merge!("id": mapeable_without_map.id) - - visit send(mapeable_show_path, arguments) - - expect(page).not_to have_css(".map_location") - end - - scenario "Should not display map on #{mapeable_factory_name} show page when feature.map is disable", :js do - Setting['feature.map'] = false - arguments.merge!("id": mapeable.id) - - visit send(mapeable_show_path, arguments) - - expect(page).not_to have_css(".map_location") - end - - end - -end - -def fill_in_proposal_form - fill_in 'proposal_title', with: 'Help refugees' - fill_in 'proposal_question', with: '¿Would you like to give assistance to war refugees?' - fill_in 'proposal_summary', with: 'In summary, what we want is...' -end - -def submit_proposal_form - check :proposal_terms_of_service - click_button 'Create proposal' - - click_link 'Not now, go to my proposal' -end - -def validate_latitude_longitude(mapeable_factory_name) - expect(find("##{mapeable_factory_name}_map_location_attributes_latitude", visible: false).value).to eq "51.48" - expect(find("##{mapeable_factory_name}_map_location_attributes_longitude", visible: false).value).to eq "0.0" - expect(mapeable.map_location.latitude).to eq 51.48 - expect(mapeable.map_location.longitude).to eq 0.0 -end - -def fill_in_budget_investment_form - page.select mapeable.heading.name_scoped_by_group, from: :budget_investment_heading_id - fill_in :budget_investment_title, with: "Budget investment title" - fill_in_ckeditor "budget_investment_description", with: "Budget investment description" - check :budget_investment_terms_of_service -end - -def submit_budget_investment_form - check :budget_investment_terms_of_service - click_button 'Create Investment' -end - -def set_arguments(arguments, mapeable, mapeable_path_arguments) - if mapeable_path_arguments - mapeable_path_arguments.each do |argument_name, path_to_value| - arguments.merge!("#{argument_name}": mapeable.send(path_to_value)) - end - end -end diff --git a/spec/shared/features/mappable.rb b/spec/shared/features/mappable.rb new file mode 100644 index 000000000..ccbcd5625 --- /dev/null +++ b/spec/shared/features/mappable.rb @@ -0,0 +1,220 @@ +shared_examples "mappable" do |mappable_factory_name, mappable_association_name, mappable_new_path, mappable_edit_path, mappable_show_path, mappable_path_arguments| + + include ActionView::Helpers + + let!(:user) { create(:user, :level_two) } + + before do + Setting['feature.map'] = true + end + + describe "At #{mappable_new_path}" do + + let!(:arguments) { {} } + let!(:mappable) { create("#{mappable_factory_name}".to_sym) } + let!(:map_location) { create(:map_location, "#{mappable_factory_name}_map_location".to_sym, "#{mappable_association_name}": mappable) } + + before { set_arguments(arguments, mappable, mappable_path_arguments) } + + scenario "Should not show marker by default on create #{mappable_factory_name}", :js do + login_as user + visit send(mappable_new_path, arguments) + + send("fill_in_#{mappable_factory_name}_form") + + within ".map_location" do + expect(page).not_to have_css(".map-icon") + end + end + + scenario "Should show marker on create #{mappable_factory_name} when click on map", :js do + login_as user + visit send(mappable_new_path, arguments) + + send("fill_in_#{mappable_factory_name}_form") + find("#new_map_location").click + + within ".map_location" do + expect(page).to have_css(".map-icon") + end + end + + scenario "Should create #{mappable_factory_name} with map", :js do + login_as user + visit send(mappable_new_path, arguments) + + send("fill_in_#{mappable_factory_name}_form") + find("#new_map_location").click + send("submit_#{mappable_factory_name}_form") + + expect(page).to have_css(".map_location") + end + + scenario "Can not display map on #{mappable_factory_name} when not fill marker on map", :js do + login_as user + visit send(mappable_new_path, arguments) + + send("fill_in_#{mappable_factory_name}_form") + expect(page).to have_css ".map_location" + send("submit_#{mappable_factory_name}_form") + + expect(page).not_to have_css(".map_location") + end + + scenario "Can not display map on #{mappable_factory_name} when feature.map is disabled", :js do + Setting['feature.map'] = false + login_as user + visit send(mappable_new_path, arguments) + + send("fill_in_#{mappable_factory_name}_form") + expect(page).not_to have_css ".map_location" + send("submit_#{mappable_factory_name}_form") + + expect(page).not_to have_css(".map_location") + end + + end + + describe "At #{mappable_edit_path}" do + + let!(:mappable) { create("#{mappable_factory_name}".to_sym) } + let!(:map_location) { create(:map_location, "#{mappable_factory_name}_map_location".to_sym, "#{mappable_association_name}": mappable) } + + before { skip } unless mappable_edit_path.present? + + scenario "Should edit map on #{mappable_factory_name} and contain default values", :js do + login_as mappable.author + + visit send(mappable_edit_path, id: mappable.id) + + expect(page).to have_content "Navigate the map to the location and place the marker." + validate_latitude_longitude(mappable_factory_name) + end + + scenario "Should edit default values from map on #{mappable_factory_name} edit page", :js do + login_as mappable.author + + visit send(mappable_edit_path, id: mappable.id) + find(".map_location").click + click_on("Save changes") + mappable.reload + + expect(page).to have_css(".map_location") + expect(page).not_to have_selector(".map_location[data-marker-latitude='#{map_location.latitude}']") + expect(page).to have_selector(".map_location[data-marker-latitude='#{mappable.map_location.latitude}']") + end + + scenario "Should edit mappable on #{mappable_factory_name} without change map", :js do + login_as mappable.author + + visit send(mappable_edit_path, id: mappable.id) + fill_in "#{mappable_factory_name}_title", with: "New title" + click_on("Save changes") + mappable.reload + + expect(page).to have_css(".map_location") + expect(page).to have_selector(".map_location[data-marker-latitude='#{map_location.latitude}']") + expect(page).to have_selector(".map_location[data-marker-latitude='#{mappable.map_location.latitude}']") + end + + scenario "Can not display map on #{mappable_factory_name} edit when remove map marker", :js do + login_as mappable.author + + visit send(mappable_edit_path, id: mappable.id) + click_link "Remove map marker" + click_on "Save changes" + + expect(page).not_to have_css(".map_location") + end + + scenario "Can not display map on #{mappable_factory_name} edit when feature.map is disabled", :js do + Setting['feature.map'] = false + login_as mappable.author + + visit send(mappable_edit_path, id: mappable.id) + fill_in "#{mappable_factory_name}_title", with: "New title" + click_on("Save changes") + + expect(page).not_to have_css(".map_location") + end + + end + + describe "At #{mappable_show_path}" do + + let!(:arguments) { {} } + let!(:mappable) { create("#{mappable_factory_name}".to_sym) } + let!(:map_location) { create(:map_location, "#{mappable_factory_name}_map_location".to_sym, "#{mappable_association_name}": mappable) } + + before { set_arguments(arguments, mappable, mappable_path_arguments) } + + scenario "Should display map on #{mappable_factory_name} show page", :js do + arguments.merge!("id": mappable.id) + + visit send(mappable_show_path, arguments) + + expect(page).to have_css(".map_location") + end + + scenario "Should not display map on #{mappable_factory_name} show when marker is not defined", :js do + mappable_without_map = create("#{mappable_factory_name}".to_sym) + set_arguments(arguments, mappable_without_map, mappable_path_arguments) + arguments.merge!("id": mappable_without_map.id) + + visit send(mappable_show_path, arguments) + + expect(page).not_to have_css(".map_location") + end + + scenario "Should not display map on #{mappable_factory_name} show page when feature.map is disable", :js do + Setting['feature.map'] = false + arguments.merge!("id": mappable.id) + + visit send(mappable_show_path, arguments) + + expect(page).not_to have_css(".map_location") + end + + end + +end + +def fill_in_proposal_form + fill_in 'proposal_title', with: 'Help refugees' + fill_in 'proposal_question', with: '¿Would you like to give assistance to war refugees?' + fill_in 'proposal_summary', with: 'In summary, what we want is...' +end + +def submit_proposal_form + check :proposal_terms_of_service + click_button 'Create proposal' + + click_link 'Not now, go to my proposal' +end + +def validate_latitude_longitude(mappable_factory_name) + expect(find("##{mappable_factory_name}_map_location_attributes_latitude", visible: false).value).to eq "51.48" + expect(find("##{mappable_factory_name}_map_location_attributes_longitude", visible: false).value).to eq "0.0" + expect(mappable.map_location.latitude).to eq 51.48 + expect(mappable.map_location.longitude).to eq 0.0 +end + +def fill_in_budget_investment_form + page.select mappable.heading.name_scoped_by_group, from: :budget_investment_heading_id + fill_in :budget_investment_title, with: "Budget investment title" + fill_in_ckeditor "budget_investment_description", with: "Budget investment description" + check :budget_investment_terms_of_service +end + +def submit_budget_investment_form + check :budget_investment_terms_of_service + click_button 'Create Investment' +end + +def set_arguments(arguments, mappable, mappable_path_arguments) + if mappable_path_arguments + mappable_path_arguments.each do |argument_name, path_to_value| + arguments.merge!("#{argument_name}": mappable.send(path_to_value)) + end + end +end From 407c0fc7023f6afaeb0d2e8875b2bdf8a4448774 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 27 Sep 2017 17:57:54 +0200 Subject: [PATCH 208/765] fixes styles for filters, orders and subnavs on admin --- app/assets/stylesheets/admin.scss | 17 ++++++++++++---- app/views/admin/poll/polls/_subnav.html.erb | 22 +++++++++++++++------ 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 3dcf4a474..fab661e8d 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -174,10 +174,19 @@ $sidebar-active: #f4fcd0; max-width: none; } - .menu.simple .active { - border-bottom: 2px solid $admin-color; - color: $admin-color; - font-weight: bold; + .menu.simple { + margin-bottom: $line-height / 2; + + h2 { + font-weight: bold; + margin-bottom: $line-height / 3; + } + + .active { + border-bottom: 2px solid $admin-color; + color: $admin-color; + font-weight: bold; + } } .tabs-panel { diff --git a/app/views/admin/poll/polls/_subnav.html.erb b/app/views/admin/poll/polls/_subnav.html.erb index 249ff407c..24d7a5b1f 100644 --- a/app/views/admin/poll/polls/_subnav.html.erb +++ b/app/views/admin/poll/polls/_subnav.html.erb @@ -1,8 +1,10 @@
    <%= select 'shift[date]', 'vote_collection_date', - options_for_select(shift_vote_collection_dates(@polls)), - prompt: t("admin.poll_shifts.new.select_date"), - label: false %> + options_for_select(shift_vote_collection_dates(@polls)), + { prompt: t("admin.poll_shifts.new.select_date"), + label: false }, + class: 'js-shift-vote-collection-dates' %> <%= select 'shift[date]', 'recount_scrutiny_date', - options_for_select(shift_recount_scrutiny_dates(@polls)), - prompt: t("admin.poll_shifts.new.select_date"), - label: false %> + options_for_select(shift_recount_scrutiny_dates(@polls)), + { prompt: t("admin.poll_shifts.new.select_date"), + label: false }, + class: 'js-shift-recount-scrutiny-dates', + hidden: 'hidden' %>
    <%= f.hidden_field :booth_id, value: @booth.id %> From 49b4af5e0434d3056b2fca02763b51926f8635e2 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 28 Sep 2017 10:53:15 +0200 Subject: [PATCH 215/765] Add flash error for shift creation without date, increase spec --- app/controllers/admin/poll/shifts_controller.rb | 4 ++-- config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 1 + spec/features/admin/poll/shifts_spec.rb | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/poll/shifts_controller.rb b/app/controllers/admin/poll/shifts_controller.rb index 42093439d..577e8afad 100644 --- a/app/controllers/admin/poll/shifts_controller.rb +++ b/app/controllers/admin/poll/shifts_controller.rb @@ -14,10 +14,10 @@ class Admin::Poll::ShiftsController < Admin::Poll::BaseController @officer = @shift.officer if @shift.save - notice = t("admin.poll_shifts.flash.create") - redirect_to new_admin_booth_shift_path(@shift.booth), notice: notice + redirect_to new_admin_booth_shift_path(@shift.booth), notice: t("admin.poll_shifts.flash.create") else load_shifts + flash[:error] = t("admin.poll_shifts.flash.date_missing") render :new end end diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 0b578feb0..14965431a 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -520,6 +520,7 @@ en: flash: create: "Shift added" destroy: "Shift removed" + date_missing: "A date must be selected" vote_collection: Collect Votes recount_scrutiny: Recount & Scrutiny poll_booth_assignments: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index b2d0e658c..329c9ce69 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -520,6 +520,7 @@ es: flash: create: "Añadido turno de presidente de mesa" destroy: "Eliminado turno de presidente de mesa" + date_missing: "Debe seleccionarse una fecha" vote_collection: Recoger Votos recount_scrutiny: Recuento & Escrutinio poll_booth_assignments: diff --git a/spec/features/admin/poll/shifts_spec.rb b/spec/features/admin/poll/shifts_spec.rb index 15fc552fa..bf6240577 100644 --- a/spec/features/admin/poll/shifts_spec.rb +++ b/spec/features/admin/poll/shifts_spec.rb @@ -88,7 +88,7 @@ feature 'Admin shifts' do end end - scenario "Erros on create", :js do + scenario "Error on create", :js do poll = create(:poll) booth = create(:poll_booth) officer = create(:poll_officer) @@ -104,7 +104,7 @@ feature 'Admin shifts' do click_link "Edit shifts" click_button "Add shift" - expect(page).to have_content "can't be blank" + expect(page).to have_content "A date must be selected" end scenario "Destroy" do From 3da4ee4ee3dcea76d2d9f8816623bb6baad9b25c Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 28 Sep 2017 12:18:47 +0200 Subject: [PATCH 216/765] Check Poll Shift creation date ranges are correct --- spec/features/admin/poll/shifts_spec.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spec/features/admin/poll/shifts_spec.rb b/spec/features/admin/poll/shifts_spec.rb index bf6240577..46c737c64 100644 --- a/spec/features/admin/poll/shifts_spec.rb +++ b/spec/features/admin/poll/shifts_spec.rb @@ -32,6 +32,8 @@ feature 'Admin shifts' do scenario "Create Vote Collection Shift", :js do poll = create(:poll) + vote_collection_dates = (poll.starts_at.to_date..poll.ends_at.to_date).to_a.map { |date| I18n.l(date, format: :long) } + booth = create(:poll_booth) officer = create(:poll_officer) @@ -45,6 +47,8 @@ feature 'Admin shifts' do click_button "Search" click_link "Edit shifts" + expect(page).to have_select('shift_date_vote_collection_date', options: ["Select day", *vote_collection_dates]) + expect(page).not_to have_select('shift_date_recount_scrutiny_date') select I18n.l(poll.starts_at.to_date, format: :long), from: 'shift_date_vote_collection_date' click_button "Add shift" @@ -60,6 +64,8 @@ feature 'Admin shifts' do scenario "Create Recount & Scrutiny Shift", :js do poll = create(:poll) + recount_scrutiny_dates = (poll.ends_at.to_date..poll.ends_at.to_date + 1.week).to_a.map { |date| I18n.l(date, format: :long) } + booth = create(:poll_booth) officer = create(:poll_officer) @@ -75,6 +81,8 @@ feature 'Admin shifts' do select "Recount & Scrutiny", from: 'shift_task' + expect(page).to have_select('shift_date_recount_scrutiny_date', options: ["Select day", *recount_scrutiny_dates]) + expect(page).not_to have_select('shift_date_vote_collection_date') select I18n.l(poll.ends_at.to_date + 4.days, format: :long), from: 'shift_date_recount_scrutiny_date' click_button "Add shift" From 8aaa0cb718583c7efd0f5fc109e1500e53e8b602 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 28 Sep 2017 15:20:00 +0200 Subject: [PATCH 217/765] adds data equalizer to fix height on items with images --- app/assets/stylesheets/participation.scss | 31 ++++++++----------- .../budgets/investments/_investment.html.erb | 22 +++++++------ app/views/proposals/_proposal.html.erb | 16 +++++----- 3 files changed, 34 insertions(+), 35 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 6a915ca54..62bf65d91 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -658,20 +658,17 @@ .proposals-list .proposal { @include breakpoint(small) { + .no-image { width: 100%; - max-width: 300px; + max-width: rem-calc(300); margin: 0 auto; - } - .no-image::before { - content: ''; - display: block; - padding-top: 100%; - } - - h3 { - font-size: 1.3rem; + &::before { + content: ''; + display: block; + padding-top: 100%; + } } .column:first-child { @@ -680,19 +677,17 @@ } @include breakpoint(medium) { + .panel { - padding: 0 0.75rem 0 0; + padding: 0 $line-height / 2 0 0; .no-image { - height: 245px; - width: 140px; + height: 100%; + min-height: rem-calc(245); + width: rem-calc(140); } } - h3 { - font-size: 1.4rem; - } - .column:first-child { overflow: hidden; } @@ -702,7 +697,7 @@ } .column:last-child:not(:first-child) { - padding-top: 0.75rem; + padding-top: $line-height / 2; } img { diff --git a/app/views/budgets/investments/_investment.html.erb b/app/views/budgets/investments/_investment.html.erb index e663229ad..b42f8be31 100644 --- a/app/views/budgets/investments/_investment.html.erb +++ b/app/views/budgets/investments/_investment.html.erb @@ -1,13 +1,15 @@
    -
    +
    - <% if investment.image.present? %> - <%= image_tag investment.image_url(:thumb), alt: investment.image.title %> - <% else %> -
    - <% end %> +
    + <% if investment.image.present? %> + <%= image_tag investment.image_url(:thumb), alt: investment.image.title %> + <% else %> +
    + <% end %> +
    @@ -53,7 +55,7 @@ <% if investment.should_show_votes? %>
    + class="small-12 medium-3 column text-center" data-equalizer-watch> <%= render partial: '/budgets/investments/votes', locals: { investment: investment, investment_votes: investment_votes, @@ -62,7 +64,7 @@
    <% elsif investment.should_show_vote_count? %>
    + class="small-12 medium-3 column text-center" data-equalizer-watch>
    <%= t("budgets.investments.investment.supports", @@ -72,7 +74,7 @@
    <% elsif investment.should_show_ballots? %>
    + class="small-12 medium-3 column text-center" data-equalizer-watch> <%= render partial: '/budgets/investments/ballot', locals: { investment: investment, investment_ids: investment_ids, @@ -81,7 +83,7 @@
    <% elsif investment.should_show_price? %>
    + class="supports small-12 medium-3 column text-center" data-equalizer-watch>

    <%= investment.formatted_price %>

    diff --git a/app/views/proposals/_proposal.html.erb b/app/views/proposals/_proposal.html.erb index eb02ea316..be5ac8e17 100644 --- a/app/views/proposals/_proposal.html.erb +++ b/app/views/proposals/_proposal.html.erb @@ -3,14 +3,16 @@ data-type="proposal">
    -
    +
    - <% if proposal.image.present? %> - <%= image_tag proposal.image_url(:thumb), alt: proposal.image.title %> - <% else %> -
    - <% end %> +
    + <% if proposal.image.present? %> + <%= image_tag proposal.image_url(:thumb), alt: proposal.image.title %> + <% else %> +
    + <% end %> +
    @@ -58,7 +60,7 @@
    -
    +
    <% if proposal.successful? %>
    From fd78eb30cce8158aed39890242be4d3d982dc418 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 28 Sep 2017 15:20:47 +0200 Subject: [PATCH 218/765] shows hr tag on forms only when expanded --- app/views/documents/_nested_documents.html.erb | 5 +---- app/views/images/_image_fields.html.erb | 1 + app/views/images/_nested_image.html.erb | 16 ++++++---------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/app/views/documents/_nested_documents.html.erb b/app/views/documents/_nested_documents.html.erb index ecbe46ce7..04fd4e8a2 100644 --- a/app/views/documents/_nested_documents.html.erb +++ b/app/views/documents/_nested_documents.html.erb @@ -20,7 +20,4 @@
    "> <%= t "documents.max_documents_allowed_reached_html" %>
    - -
    - -
    \ No newline at end of file +
    diff --git a/app/views/images/_image_fields.html.erb b/app/views/images/_image_fields.html.erb index 10a4cf898..092402706 100644 --- a/app/views/images/_image_fields.html.erb +++ b/app/views/images/_image_fields.html.erb @@ -28,4 +28,5 @@
    +
    diff --git a/app/views/images/_nested_image.html.erb b/app/views/images/_nested_image.html.erb index a981dd190..2f65b8760 100644 --- a/app/views/images/_nested_image.html.erb +++ b/app/views/images/_nested_image.html.erb @@ -1,12 +1,10 @@ -
    - <%= f.label :image, t("images.form.title") %> -

    <%= imageables_note(imageable) %>

    +<%= f.label :image, t("images.form.title") %> +

    <%= imageables_note(imageable) %>

    -
    - <%= f.fields_for :image do |image_builder| %> - <%= render 'images/image_fields', f: image_builder, imageable: imageable %> - <% end %> -
    +
    + <%= f.fields_for :image do |image_builder| %> + <%= render 'images/image_fields', f: image_builder, imageable: imageable %> + <% end %>
    <%= link_to_add_association t('images.form.add_new_image'), f, :image, @@ -21,5 +19,3 @@ association_insertion_node: "#nested-image", association_insertion_method: "append" } %> - -
    From 876a2b530b9e63bb8c5a510c1b583d3faa4c923d Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 28 Sep 2017 16:03:08 +0200 Subject: [PATCH 219/765] fixes lint warnings --- app/assets/stylesheets/mixins.scss | 13 +++++++------ app/assets/stylesheets/participation.scss | 4 +--- app/views/admin/poll/questions/edit.html.erb | 4 +++- app/views/admin/poll/questions/new.html.erb | 4 +++- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index cc8fe9360..a0afec83b 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -35,8 +35,8 @@ @mixin direct-uploads { .cached-image { - max-width: 150px; - max-height: 150px; + max-width: rem-calc(150); + max-height: rem-calc(150); } .progress-bar-placeholder { @@ -49,14 +49,15 @@ .document-attachment, .image-attachment { - padding-left:0; + padding-left: 0; - p{ + p { margin-bottom: 0; } } - input.js-document-attachment, - input.js-image-attachment{ + + .js-document-attachment, + .js-image-attachment { display: none; } } diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 62bf65d91..87f9838aa 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -310,12 +310,10 @@ .budget-investment-new, .proposal-form, .proposal-edit, -.new_poll_question, -.edit_poll_question { +.poll-question-form { @include direct-uploads; } - // 03. Show participation // ---------------------- diff --git a/app/views/admin/poll/questions/edit.html.erb b/app/views/admin/poll/questions/edit.html.erb index 48998081a..fffc4a399 100644 --- a/app/views/admin/poll/questions/edit.html.erb +++ b/app/views/admin/poll/questions/edit.html.erb @@ -2,4 +2,6 @@

    <%= t("admin.questions.edit.title") %>

    -<%= render "form", form_url: admin_question_path(@question) %> \ No newline at end of file +
    + <%= render "form", form_url: admin_question_path(@question) %> +
    diff --git a/app/views/admin/poll/questions/new.html.erb b/app/views/admin/poll/questions/new.html.erb index 844195920..c91b78016 100644 --- a/app/views/admin/poll/questions/new.html.erb +++ b/app/views/admin/poll/questions/new.html.erb @@ -2,4 +2,6 @@

    <%= t("admin.questions.new.title") %>

    -<%= render "form", form_url: admin_questions_path %> \ No newline at end of file +
    + <%= render "form", form_url: admin_questions_path %> +
    From 9a6e3219c904cd04c1bb27807af8ea5a2b9e08c6 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" Date: Thu, 28 Sep 2017 14:14:06 +0000 Subject: [PATCH 220/765] Update nokogiri to version 1.8.1 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6435af58e..72b60628e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -251,7 +251,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.2) - mini_portile2 (2.2.0) + mini_portile2 (2.3.0) minitest (5.10.3) mixlib-cli (1.7.0) mixlib-config (2.2.4) @@ -262,8 +262,8 @@ GEM net-ssh (>= 2.6.5) net-ssh (4.1.0) newrelic_rpm (4.1.0.333) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) nori (2.6.0) oauth (0.5.3) oauth2 (1.4.0) From 4eee5f6ebaba56db30460ea9b4cdaaa2bcf30b31 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Thu, 28 Sep 2017 17:03:50 +0200 Subject: [PATCH 221/765] Fixed orbit-bullets. Decreased margin-top to button.hollow.expanded. --- app/assets/stylesheets/layout.scss | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index d05dbd54b..8d2d155e3 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -2198,15 +2198,17 @@ table { margin-bottom: $line-height; } - .button.hollow{ - margin-top: $line-height; + .button.hollow { + margin-top: rem-calc(10); } } .card { .card-section { - padding:$line-height 0; + padding: $line-height 0; + max-width: 300px; + margin: 0 auto; p { font-size: rem-calc(15); @@ -2280,8 +2282,7 @@ table { height: 480px; .orbit-wrapper { - min-height: 450px; - max-height: 460px; + max-height: 450px; } } @@ -2362,6 +2363,5 @@ table { } } - } -} \ No newline at end of file +} From 20fd176b6af9ff69609c57c7508a58218efa8ba1 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Thu, 28 Sep 2017 17:13:45 +0200 Subject: [PATCH 222/765] Change again margin-top to button.hollow --- app/assets/stylesheets/layout.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 8d2d155e3..67abd0f1f 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -2199,7 +2199,7 @@ table { } .button.hollow { - margin-top: rem-calc(10); + margin-top: rem-calc(15); } } From 1e0aec37abbeafdb074290dbc93f31aab4c16df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 28 Sep 2017 17:37:31 +0200 Subject: [PATCH 223/765] Removed link to poll question in the web in admin section --- app/views/admin/poll/questions/show.html.erb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/admin/poll/questions/show.html.erb b/app/views/admin/poll/questions/show.html.erb index 3f776c5c0..360886b89 100644 --- a/app/views/admin/poll/questions/show.html.erb +++ b/app/views/admin/poll/questions/show.html.erb @@ -55,7 +55,5 @@ <%= @question.documents.first.title %>

    <% end %> - - <%= link_to t("admin.questions.show.preview"), question_path(@question) %>
    From 77d0a551cff440cfc4339a2b02571b9ce8d5d105 Mon Sep 17 00:00:00 2001 From: iagirre Date: Thu, 28 Sep 2017 17:46:30 +0200 Subject: [PATCH 224/765] Migration for adding summary and description to polls created. Both text_areas were added to polls form. Imageable class included in polls model and the first aproach for adding images added to form. --- .../admin/poll/polls_controller.rb | 4 +- app/models/poll.rb | 2 + app/views/admin/poll/polls/_form.html.erb | 37 +++++++++++++++++++ config/locales/en/images.yml | 2 + config/locales/es/images.yml | 1 + ...02_add_summary_and_description_to_polls.rb | 6 +++ 6 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20170928132402_add_summary_and_description_to_polls.rb diff --git a/app/controllers/admin/poll/polls_controller.rb b/app/controllers/admin/poll/polls_controller.rb index c95c8ed1f..db4fb567c 100644 --- a/app/controllers/admin/poll/polls_controller.rb +++ b/app/controllers/admin/poll/polls_controller.rb @@ -73,7 +73,9 @@ class Admin::Poll::PollsController < Admin::Poll::BaseController end def poll_params - params.require(:poll).permit(:name, :starts_at, :ends_at, :geozone_restricted, geozone_ids: []) + params.require(:poll).permit(:name, :starts_at, :ends_at, :geozone_restricted, :summary, :description, + geozone_ids: [], + image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]) end def search_params diff --git a/app/models/poll.rb b/app/models/poll.rb index 3873ac5e0..e852e912a 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -1,4 +1,6 @@ class Poll < ActiveRecord::Base + include Imageable + has_many :booth_assignments, class_name: "Poll::BoothAssignment" has_many :booths, through: :booth_assignments has_many :partial_results, through: :booth_assignments diff --git a/app/views/admin/poll/polls/_form.html.erb b/app/views/admin/poll/polls/_form.html.erb index 0b99ea9f5..3fa7daa4f 100644 --- a/app/views/admin/poll/polls/_form.html.erb +++ b/app/views/admin/poll/polls/_form.html.erb @@ -19,6 +19,43 @@
    +
    +
    + <%=f.text_area :summary, rows: 4%> +
    +
    + +
    +
    + <%=f.text_area :description, rows: 8%> +
    +
    + +
    +
    + <%= f.label :image, t("images.form.admin_title") %> + +
    + <%= f.fields_for :image do |image_builder| %> + <%= render 'images/image_fields', f: image_builder, imageable: @poll %> + <% end %> +
    +
    + + <%= link_to_add_association t('images.form.add_new_image'), f, :image, + force_non_association_create: true, + partial: "images/image_fields", + id: "new_image_link", + class: "button hollow #{"hide" if @poll.image.present?}", + render_options: { + locals: { imageable: @poll } + }, + data: { + association_insertion_node: "#nested-image", + association_insertion_method: "append" + } %> +
    +
    <%= f.check_box :geozone_restricted, data: { checkbox_toggle: "#geozones" } %> diff --git a/config/locales/en/images.yml b/config/locales/en/images.yml index 6f16061fa..087c85021 100644 --- a/config/locales/en/images.yml +++ b/config/locales/en/images.yml @@ -9,6 +9,8 @@ en: delete_button: Remove image note: "You can upload one image of following content types: %{accepted_content_types}, up to %{max_file_size} MB." add_new_image: Add image + title_placeholder: Add a descriptive title for the image + admin_title: "Main image of the poll" actions: destroy: diff --git a/config/locales/es/images.yml b/config/locales/es/images.yml index 869a0824e..0207bceed 100644 --- a/config/locales/es/images.yml +++ b/config/locales/es/images.yml @@ -9,6 +9,7 @@ es: note: "Puedes subir una imagen en los formatos: %{accepted_content_types}, y de hasta %{max_file_size} MB por archivo." add_new_image: Añadir imagen title_placeholder: Añade un título descriptivo para la imagen + admin_title: "Imagen principal de la votación" actions: destroy: diff --git a/db/migrate/20170928132402_add_summary_and_description_to_polls.rb b/db/migrate/20170928132402_add_summary_and_description_to_polls.rb new file mode 100644 index 000000000..6fb965346 --- /dev/null +++ b/db/migrate/20170928132402_add_summary_and_description_to_polls.rb @@ -0,0 +1,6 @@ +class AddSummaryAndDescriptionToPolls < ActiveRecord::Migration + def change + add_column :polls, :summary, :text + add_column :polls, :description, :text + end +end From 14fe771fa55296f57e765653d28a358cafb781a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 28 Sep 2017 17:47:50 +0200 Subject: [PATCH 225/765] Fixed wrong officer action path Before this change, when a user searched for an officer already assigned the ui was blocked because that path wasn't correct. --- app/views/admin/poll/officers/_officer.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/poll/officers/_officer.html.erb b/app/views/admin/poll/officers/_officer.html.erb index 80434f385..3562b4a90 100644 --- a/app/views/admin/poll/officers/_officer.html.erb +++ b/app/views/admin/poll/officers/_officer.html.erb @@ -16,7 +16,7 @@ <% if officer.persisted? %> <%= link_to t('admin.poll_officers.officer.delete'), - admin_poll_officer_path(officer), + admin_officer_path(officer), method: :delete, class: "button hollow alert" %> <% else %> From f44f3f5bc1e64689d1c97e60d0376f7792270a65 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 28 Sep 2017 17:52:28 +0200 Subject: [PATCH 226/765] fixes css to shows error messages correctly --- app/assets/stylesheets/mixins.scss | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index a0afec83b..52c07f4f5 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -56,9 +56,16 @@ } } - .js-document-attachment, - .js-image-attachment { - display: none; + .attachment-errors { + + > .js-image-attachment, + > .js-document-attachment { + display: none; + + ~ .error { + display: inline-block; + } + } } } From 1a0467d2c68d1182efc3d141fc7ad8ac8dddae6b Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 29 Sep 2017 09:23:05 +0200 Subject: [PATCH 227/765] adds data equalizer watch to prevent js errors --- app/views/budgets/investments/_investment.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/budgets/investments/_investment.html.erb b/app/views/budgets/investments/_investment.html.erb index b42f8be31..2c6269a3f 100644 --- a/app/views/budgets/investments/_investment.html.erb +++ b/app/views/budgets/investments/_investment.html.erb @@ -88,6 +88,8 @@ <%= investment.formatted_price %>

    + <% else %> +
    <% end %> <% end %> From 07592f6b0d8112dbf7ae3cb58919d0d32813a065 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Fri, 29 Sep 2017 11:50:19 +0200 Subject: [PATCH 228/765] Correct Poll current/expired/incoming scopes and helper functions --- app/models/poll.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/poll.rb b/app/models/poll.rb index 3873ac5e0..24ffa3a06 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -16,23 +16,23 @@ class Poll < ActiveRecord::Base validate :date_range - scope :current, -> { where('starts_at <= ? and ? <= ends_at', Time.current, Time.current) } - scope :incoming, -> { where('? < starts_at', Time.current) } - scope :expired, -> { where('ends_at < ?', Time.current) } + scope :current, -> { where('starts_at <= ? and ? <= ends_at', Date.current.beginning_of_day, Date.current.beginning_of_day) } + scope :incoming, -> { where('? < starts_at', Date.current.beginning_of_day) } + scope :expired, -> { where('ends_at < ?', Date.current.beginning_of_day) } scope :published, -> { where('published = ?', true) } scope :by_geozone_id, ->(geozone_id) { where(geozones: {id: geozone_id}.joins(:geozones)) } scope :sort_for_list, -> { order(:geozone_restricted, :starts_at, :name) } - def current?(timestamp = DateTime.current) + def current?(timestamp = Date.current.beginning_of_day) starts_at <= timestamp && timestamp <= ends_at end - def incoming?(timestamp = DateTime.current) + def incoming?(timestamp = Date.current.beginning_of_day) timestamp < starts_at end - def expired?(timestamp = DateTime.current) + def expired?(timestamp = Date.current.beginning_of_day) ends_at < timestamp end From 2fde9ec1b81dd0db49588a43a398c4c7672bff00 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" Date: Fri, 29 Sep 2017 12:00:16 +0000 Subject: [PATCH 229/765] Upgrade byebug to version 9.1.0 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d4a2777a9..7f9579b73 100644 --- a/Gemfile +++ b/Gemfile @@ -59,7 +59,7 @@ end group :development, :test do gem "bullet", '~> 5.5.1' - gem 'byebug', '~> 9.0.6' + gem 'byebug', '~> 9.1.0' gem 'factory_girl_rails', '~> 4.8.0' gem "faker", '~> 1.7.3' gem 'i18n-tasks', '~> 0.9.15' diff --git a/Gemfile.lock b/Gemfile.lock index 72b60628e..b3bdaed90 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,7 +71,7 @@ GEM bullet (5.5.1) activesupport (>= 3.0.0) uniform_notifier (~> 1.10.0) - byebug (9.0.6) + byebug (9.1.0) cancancan (1.16.0) capistrano (3.8.2) airbrussh (>= 1.0.0) @@ -494,7 +494,7 @@ DEPENDENCIES ancestry (~> 2.2.2) browser (~> 2.3.0) bullet (~> 5.5.1) - byebug (~> 9.0.6) + byebug (~> 9.1.0) cancancan (~> 1.16.0) capistrano (~> 3.8.1) capistrano-bundler (~> 1.2) From c67620fdef6919e1dbb1c33df490d28cdec6f50e Mon Sep 17 00:00:00 2001 From: iagirre Date: Fri, 29 Sep 2017 14:51:49 +0200 Subject: [PATCH 230/765] Table for links added (links to add images/documents). Custom partial for admins upload image created, so that it can be reused in upload images and documents. --- app/assets/stylesheets/participation.scss | 3 +- app/models/concerns/imageable.rb | 1 + app/models/poll.rb | 3 +- app/views/admin/poll/polls/_form.html.erb | 43 ++++++++-------- app/views/images/_admin_image.html.erb | 60 +++++++++++++++++++++++ config/locales/en/activerecord.yml | 2 + config/locales/es/activerecord.yml | 2 + config/locales/es/admin.yml | 6 +++ 8 files changed, 96 insertions(+), 24 deletions(-) create mode 100644 app/views/images/_admin_image.html.erb diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index fbcda0ebb..ab3369387 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -313,7 +313,8 @@ .proposal-form, .proposal-edit, .new_poll_question, -.edit_poll_question { +.edit_poll_question, +.edit_poll { @include direct-uploads; } diff --git a/app/models/concerns/imageable.rb b/app/models/concerns/imageable.rb index a2a2f537d..fea94d102 100644 --- a/app/models/concerns/imageable.rb +++ b/app/models/concerns/imageable.rb @@ -5,6 +5,7 @@ module Imageable included do has_one :image, as: :imageable, dependent: :destroy + has_many :images, as: :imageable, dependent: :destroy accepts_nested_attributes_for :image, allow_destroy: true, update_only: true def image_url(style) diff --git a/app/models/poll.rb b/app/models/poll.rb index e852e912a..9aa41cd16 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -1,5 +1,6 @@ class Poll < ActiveRecord::Base - include Imageable + include Imageable + include Documentable has_many :booth_assignments, class_name: "Poll::BoothAssignment" has_many :booths, through: :booth_assignments diff --git a/app/views/admin/poll/polls/_form.html.erb b/app/views/admin/poll/polls/_form.html.erb index 3fa7daa4f..235522c65 100644 --- a/app/views/admin/poll/polls/_form.html.erb +++ b/app/views/admin/poll/polls/_form.html.erb @@ -31,29 +31,28 @@
    -
    -
    - <%= f.label :image, t("images.form.admin_title") %> +
    + <%= render 'images/admin_image', imageable: @poll, f: f %> +
    -
    - <%= f.fields_for :image do |image_builder| %> - <%= render 'images/image_fields', f: image_builder, imageable: @poll %> - <% end %> -
    -
    - - <%= link_to_add_association t('images.form.add_new_image'), f, :image, - force_non_association_create: true, - partial: "images/image_fields", - id: "new_image_link", - class: "button hollow #{"hide" if @poll.image.present?}", - render_options: { - locals: { imageable: @poll } - }, - data: { - association_insertion_node: "#nested-image", - association_insertion_method: "append" - } %> +
    + + + + + + + + + + + + + + + + +
    <%= t("admin.polls.attachments.title") %>
    <%= t("admin.polls.attachments.images_title") %><%= t("admin.polls.attachments.documents_title") %>
    <%= link_to "#{t("admin.polls.attachments.images_link")} (#{@poll.images.count})", root_path %><%= link_to "#{t("admin.polls.attachments.documents_link")} (#{@poll.documents.count})", root_path %>
    diff --git a/app/views/images/_admin_image.html.erb b/app/views/images/_admin_image.html.erb new file mode 100644 index 000000000..7c5157216 --- /dev/null +++ b/app/views/images/_admin_image.html.erb @@ -0,0 +1,60 @@ +
    +
    + <%= f.label :image, t("images.form.admin_title") %> + +
    + <%= f.fields_for :image do |image_builder| %> + <%#= render 'images/image_fields', f: image_builder, imageable: imageable %> + + + +
    + <%= image_builder.hidden_field :id %> + <%= image_builder.hidden_field :user_id, value: current_user.id %> + <%= image_builder.hidden_field :cached_attachment %> + + <%= image_builder.text_field :title, placeholder: t("images.form.title_placeholder") %> + + + <%= render_image(image_builder.object, :thumb, false) if image_builder.object.attachment.exists? %> + +
    +
    + <%= render_image_attachment(image_builder, imageable, image_builder.object) %> +
    +
    + <%= render_destroy_image_link(image_builder, image_builder.object) %> +
    +
    + +
    +

    + <%= image_attachment_file_name(image_builder.object) %> +

    +
    + +
    +
    +
    + +
    + + + + <% end %> +
    +
    + + <%= link_to_add_association t('images.form.add_new_image'), f, :image, + force_non_association_create: true, + partial: "images/image_fields", + id: "new_image_link", + class: "button hollow #{"hide" if imageable.image.present?}", + render_options: { + locals: { imageable: imageable } + }, + data: { + association_insertion_node: "#nested-image", + association_insertion_method: "append" + } %> +
    diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 1e3f62b1a..8bb2c3286 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -152,6 +152,8 @@ en: starts_at: "Start Date" ends_at: "Closing Date" geozone_restricted: "Restricted by geozone" + summary: "Summary" + description: "Description" poll/question: title: "Question" valid_answers: "Posibles answers" diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index 108f19fcf..415e81bed 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -146,6 +146,8 @@ es: starts_at: "Fecha de apertura" ends_at: "Fecha de cierre" geozone_restricted: "Restringida por zonas" + summary: "Resumen" + description: "Descripción" poll/question: title: "Pregunta" valid_answers: "Posibles respuestas" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 816cadd57..afa963c20 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -580,6 +580,12 @@ es: error_on_question_added: "No se pudo asignar la pregunta" question_removed: "Pregunta eliminada de esta votación" error_on_question_removed: "No se pudo quitar la pregunta" + attachments: + title: "Imágenes y documentos de la votación" + images_title: "Imágenes" + documents_title: "Documents" + images_link: "Lista de imágenes" + documents_link: "Lista de documentos" questions: index: title: "Preguntas ciudadanas" From fd1d09c8c23efda9082057d02a5a10c41b85ad06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 2 Oct 2017 10:25:11 +0200 Subject: [PATCH 231/765] Booths and shifts index pages minor fixes Showing only actions to assign and edit shifits in shifts index, and option to create a new booth in booths index. --- app/views/admin/poll/booths/_booth.html.erb | 16 +++++++++------- app/views/admin/poll/booths/index.html.erb | 5 +++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/views/admin/poll/booths/_booth.html.erb b/app/views/admin/poll/booths/_booth.html.erb index 80b1ef38f..921361c4a 100644 --- a/app/views/admin/poll/booths/_booth.html.erb +++ b/app/views/admin/poll/booths/_booth.html.erb @@ -6,11 +6,13 @@ <%= booth.location %> - <%= link_to t("admin.booths.booth.shifts"), - new_admin_booth_shift_path(booth), - class: "button hollow" %> - <%= link_to t("admin.actions.edit"), - edit_admin_booth_path(booth), - class: "button hollow" %> + <% if controller_name == "shifts" || controller_name == "booths" && action_name == "available" %> + <%= link_to t("admin.booths.booth.shifts"), + new_admin_booth_shift_path(booth), + class: "button hollow" %> + <%= link_to t("admin.actions.edit"), + edit_admin_booth_path(booth), + class: "button hollow" %> + <% end %> - \ No newline at end of file + diff --git a/app/views/admin/poll/booths/index.html.erb b/app/views/admin/poll/booths/index.html.erb index 05044dd0e..95b248b3f 100644 --- a/app/views/admin/poll/booths/index.html.erb +++ b/app/views/admin/poll/booths/index.html.erb @@ -1,7 +1,8 @@

    <%= t("admin.booths.index.title") %>

    -<%= link_to t("admin.booths.index.add_booth"), new_admin_booth_path, - class: "button success float-right" %> +<% if controller_name == "booths" && action_name != "available" %> + <%= link_to t("admin.booths.index.add_booth"), new_admin_booth_path, class: "button success float-right" %> +<% end %> <% if @booths.empty? %>
    From adf18ee75635928fce0b8f029b024aa9b160829f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 2 Oct 2017 10:37:10 +0200 Subject: [PATCH 232/765] Polls admin fixes Removed search from questions tab and unassign button. --- app/controllers/admin/poll/polls_controller.rb | 12 ------------ app/views/admin/poll/polls/_questions.html.erb | 4 ---- app/views/admin/poll/polls/show.html.erb | 1 - config/routes.rb | 1 - 4 files changed, 18 deletions(-) diff --git a/app/controllers/admin/poll/polls_controller.rb b/app/controllers/admin/poll/polls_controller.rb index c95c8ed1f..3b3c4f7bd 100644 --- a/app/controllers/admin/poll/polls_controller.rb +++ b/app/controllers/admin/poll/polls_controller.rb @@ -47,18 +47,6 @@ class Admin::Poll::PollsController < Admin::Poll::BaseController redirect_to admin_poll_path(@poll), notice: notice end - def remove_question - question = ::Poll::Question.find(params[:question_id]) - - if @poll.questions.include? question - @poll.questions.delete(question) - notice = t("admin.polls.flash.question_removed") - else - notice = t("admin.polls.flash.error_on_question_removed") - end - redirect_to admin_poll_path(@poll), notice: notice - end - def search_questions @questions = ::Poll::Question.where("poll_id IS ? OR poll_id != ?", nil, @poll.id).search(search: @search).order(title: :asc) respond_to do |format| diff --git a/app/views/admin/poll/polls/_questions.html.erb b/app/views/admin/poll/polls/_questions.html.erb index e41d2017e..5088572e1 100644 --- a/app/views/admin/poll/polls/_questions.html.erb +++ b/app/views/admin/poll/polls/_questions.html.erb @@ -20,10 +20,6 @@ - <%= link_to t('admin.polls.show.remove_question'), - remove_question_admin_poll_path(poll_id: @poll.id, question_id: question.id), - class: "button hollow alert", - method: :patch %> <% end %> diff --git a/app/views/admin/poll/polls/show.html.erb b/app/views/admin/poll/polls/show.html.erb index 93ce52e47..be45eeb31 100644 --- a/app/views/admin/poll/polls/show.html.erb +++ b/app/views/admin/poll/polls/show.html.erb @@ -3,6 +3,5 @@
    <%= render "subnav" %> - <%= render "search_questions" %> <%= render "questions" %>
    diff --git a/config/routes.rb b/config/routes.rb index 410f2dced..d085acd2a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -275,7 +275,6 @@ Rails.application.routes.draw do resources :polls do get :search_questions, on: :member patch :add_question, on: :member - patch :remove_question, on: :member resources :booth_assignments, only: [:index, :show, :create, :destroy] do get :search_booths, on: :collection From 2365ec96fa4c74e7a1dfeec9cf729f522b203f95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 2 Oct 2017 10:41:48 +0200 Subject: [PATCH 233/765] Polls admin officers tab fixes Removed actions offered in search results. --- .../_search_officers_results.html.erb | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/app/views/admin/poll/officer_assignments/_search_officers_results.html.erb b/app/views/admin/poll/officer_assignments/_search_officers_results.html.erb index f665c6c0b..ee009f1fa 100644 --- a/app/views/admin/poll/officer_assignments/_search_officers_results.html.erb +++ b/app/views/admin/poll/officer_assignments/_search_officers_results.html.erb @@ -12,29 +12,19 @@ <%= t("admin.poll_officer_assignments.index.table_name") %> <%= t("admin.poll_officer_assignments.index.table_email") %> - <%= t("admin.polls.show.table_assignment") %> <% @officers.each do |user| %> - <%= user.name %> + + <%= link_to user.name, by_officer_admin_poll_officer_assignments_path(@poll, officer_id: user.id) %> + <%= user.email %> - - <% if @poll.officer_ids.include?(user.poll_officer.id) %> - <%= link_to t("admin.poll_officer_assignments.index.edit_officer_assignments"), - by_officer_admin_poll_officer_assignments_path(@poll, officer_id: user.poll_officer.id), - class: "button hollow alert" %> - <% else %> - <%= link_to t("admin.poll_officer_assignments.index.add_officer_assignments"), - by_officer_admin_poll_officer_assignments_path(@poll, officer_id: user.poll_officer.id), - class: "button hollow" %> - <% end %> - <% end %> From 2c72a054acc2e9f27994b1ecc181c75b22298f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 2 Oct 2017 11:04:37 +0200 Subject: [PATCH 234/765] Polls admin officer assignments fixes Removed total results table from officer assignment as now there are only final results. --- .../officer_assignments/by_officer.html.erb | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/app/views/admin/poll/officer_assignments/by_officer.html.erb b/app/views/admin/poll/officer_assignments/by_officer.html.erb index 6ea421e2d..c9873db96 100644 --- a/app/views/admin/poll/officer_assignments/by_officer.html.erb +++ b/app/views/admin/poll/officer_assignments/by_officer.html.erb @@ -27,30 +27,4 @@ <% end %> - -

    <%= t("admin.poll_officer_assignments.by_officer.total_recounts") %>

    - - - - - - - - - - <% @officer_assignments.each do |officer_assignment| %> - - - - - - <% end %> - -
    <%= t("admin.poll_officer_assignments.by_officer.date") %><%= t("admin.poll_officer_assignments.by_officer.booth") %><%= t("admin.poll_officer_assignments.by_officer.total_recount") %>
    <%= l(officer_assignment.date.to_date) %><%= booth_name_with_location(officer_assignment.booth_assignment.booth) %> - <% if officer_assignment.total_results.any? %> - <%= officer_assignment.total_results.to_a.sum(&:amount) %> - <% else %> - - - <% end %> -
    <% end %> From 799e2475da66dfe90d93b2528572d01c1480e512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 2 Oct 2017 11:08:18 +0200 Subject: [PATCH 235/765] Polls booth assignments fixes Poll booth preview now renders recounts tab by default instead of the officers one. --- app/views/admin/poll/booth_assignments/show.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/admin/poll/booth_assignments/show.html.erb b/app/views/admin/poll/booth_assignments/show.html.erb index f01270bd4..fd303d099 100644 --- a/app/views/admin/poll/booth_assignments/show.html.erb +++ b/app/views/admin/poll/booth_assignments/show.html.erb @@ -14,15 +14,15 @@
      -
    • +
    • <%= link_to t("admin.poll_booth_assignments.show.officers"), "#tab-officers" %>
      • -
    • +
    • <%= link_to t("admin.poll_booth_assignments.show.recounts"), "#tab-recounts" %>
    -
    +
    <% if @booth_assignment.officers.empty? %>
    <%= t("admin.poll_booth_assignments.show.no_officers") %> @@ -43,7 +43,7 @@ <% end %>
    -
    +

    <%= t("admin.poll_booth_assignments.show.recounts_list") %>

    From f497227e3f5f85c026c4d5a56117240f415ec45e Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 2 Oct 2017 12:24:31 +0200 Subject: [PATCH 236/765] improves layout for polls index view --- app/assets/stylesheets/layout.scss | 12 +++++++ app/assets/stylesheets/participation.scss | 10 ++++-- app/views/polls/_poll_group.html.erb | 41 ++++++++++++++--------- app/views/polls/index.html.erb | 10 ++++-- 4 files changed, 51 insertions(+), 22 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 67abd0f1f..44b450779 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -354,6 +354,18 @@ a { vertical-align: top; } +.aling-middle { + vertical-align: middle; +} + +.table { + display: table; +} + +.table-cell { + display: table-cell; +} + // 02. Header // ---------- diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index fbcda0ebb..719a8b229 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1701,9 +1701,13 @@ } .section-title-divider { - border-bottom: 2px solid $brand; - color: $brand; - margin-bottom: $line-height; + border-bottom: 1px solid #eee; + color: #000; + margin: $line-height 0; + + span { + border-bottom: 1px solid #000; + } } .poll-question { diff --git a/app/views/polls/_poll_group.html.erb b/app/views/polls/_poll_group.html.erb index e3e5c5976..9372aee17 100644 --- a/app/views/polls/_poll_group.html.erb +++ b/app/views/polls/_poll_group.html.erb @@ -33,23 +33,30 @@ <%= t("polls.index.cant_answer") %> <% end %> -
    -
    -
    <%= poll_dates(poll) %>
    +
    +
    + +
     
    + +
    +
    +
    <% if poll.questions.count == 1 %> <% poll.questions.each do |question| %> -

    <%= link_to question.title, poll %>

    +

    <%= link_to question.title, poll %>

    + <%= poll_dates(poll) %> <% end %> <% else %> -

    <%= link_to poll.name, poll %>

    -
      +

      <%= link_to poll.name, poll %>

      + <%= poll_dates(poll) %> +
        <% poll.questions.each do |question| %>
      • <%= link_to question.title, question_path(question) %>
        • <% end %>
      <% end %> <% if poll.geozones.any? %> -

      +

      <%= t("polls.index.geozone_info") %>

      <% end %> @@ -59,16 +66,18 @@ <% end %>
    -
    - <%= link_to poll, class: "button expanded" do %> - <% if poll.expired? %> - <%= t("polls.index.participate_button_expired") %> - <% elsif poll.incoming? %> - <%= t("polls.index.participate_button_incoming") %> - <% else %> - <%= t("polls.index.participate_button") %> +
    +
    + <%= link_to poll, class: "button hollow expanded" do %> + <% if poll.expired? %> + <%= t("polls.index.participate_button_expired") %> + <% elsif poll.incoming? %> + <%= t("polls.index.participate_button_incoming") %> + <% else %> + <%= t("polls.index.participate_button") %> + <% end %> <% end %> - <% end %> +
    diff --git a/app/views/polls/index.html.erb b/app/views/polls/index.html.erb index 871b04953..6877cd31d 100644 --- a/app/views/polls/index.html.erb +++ b/app/views/polls/index.html.erb @@ -6,18 +6,22 @@ <%= render "shared/section_header", i18n_namespace: "polls.index.section_header", image: "polls" %>
    -
    +
    <%= render 'shared/filter_subnav', i18n_namespace: "polls.index" %> <% polls_by_geozone_restriction = @polls.group_by(&:geozone_restricted) %> <% if polls_by_geozone_restriction[false].present? %> -

    <%= t("polls.index.no_geozone_restricted") %>

    +

    + <%= t("polls.index.no_geozone_restricted") %> +

    <%= render partial: 'poll_group', locals: {poll_group: polls_by_geozone_restriction[false]} %> <% end %> <% if polls_by_geozone_restriction[true].present? %> -

    <%= t("polls.index.geozone_restricted") %>

    +

    + <%= t("polls.index.geozone_restricted") %> +

    <%= render partial: 'poll_group', locals: {poll_group: polls_by_geozone_restriction[true]} %> <% end %> From 5c513d8051041b67e41f2ee9fbefe97d35187d3e Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 2 Oct 2017 12:30:31 +0200 Subject: [PATCH 237/765] Fix typo on general proposal share text --- config/locales/es/general.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index c5322c84c..1b1ceca21 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -402,7 +402,7 @@ es: proposal: created: "¡Has creado una propuesta!" share: - guide: "Compártela para que la gente empieze a apoyarla." + guide: "Compártela para que la gente empiece a apoyarla." edit: "Antes de que se publique podrás modificar el texto a tu gusto." view_proposal: "Ahora no, ir a mi propuesta" improve_info: "Mejora tu campaña y consigue más apoyos" From 166caa3b4c01ca65857ec408024bbd8a1ba69337 Mon Sep 17 00:00:00 2001 From: iagirre Date: Mon, 2 Oct 2017 12:59:26 +0200 Subject: [PATCH 238/765] Deleted code in views and concerns that lets polls have more images and documentes attached, like it was at first. Added missing text for english and new texts in english and spanish. Cambios para hacer commit: modificado: app/assets/stylesheets/participation.scss modificado: app/models/concerns/imageable.rb modificado: app/models/poll.rb modificado: app/views/admin/poll/polls/_form.html.erb modificado: app/views/images/_admin_image.html.erb modificado: config/locales/en/images.yml modificado: config/locales/es/admin.yml modificado: config/locales/es/images.yml modificado: spec/features/admin/poll/polls_spec.rb --- app/assets/stylesheets/participation.scss | 1 + app/models/concerns/imageable.rb | 1 - app/models/poll.rb | 3 +- app/views/admin/poll/polls/_form.html.erb | 20 ------ app/views/images/_admin_image.html.erb | 75 +++++++++-------------- config/locales/en/images.yml | 1 + config/locales/es/admin.yml | 6 -- config/locales/es/images.yml | 1 + spec/features/admin/poll/polls_spec.rb | 2 + 9 files changed, 36 insertions(+), 74 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index ab3369387..5b0bcaea7 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -314,6 +314,7 @@ .proposal-edit, .new_poll_question, .edit_poll_question, +.new_poll, .edit_poll { @include direct-uploads; } diff --git a/app/models/concerns/imageable.rb b/app/models/concerns/imageable.rb index fea94d102..a2a2f537d 100644 --- a/app/models/concerns/imageable.rb +++ b/app/models/concerns/imageable.rb @@ -5,7 +5,6 @@ module Imageable included do has_one :image, as: :imageable, dependent: :destroy - has_many :images, as: :imageable, dependent: :destroy accepts_nested_attributes_for :image, allow_destroy: true, update_only: true def image_url(style) diff --git a/app/models/poll.rb b/app/models/poll.rb index 9aa41cd16..9706edd6e 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -1,7 +1,6 @@ class Poll < ActiveRecord::Base include Imageable - include Documentable - + has_many :booth_assignments, class_name: "Poll::BoothAssignment" has_many :booths, through: :booth_assignments has_many :partial_results, through: :booth_assignments diff --git a/app/views/admin/poll/polls/_form.html.erb b/app/views/admin/poll/polls/_form.html.erb index 235522c65..aff19d9d7 100644 --- a/app/views/admin/poll/polls/_form.html.erb +++ b/app/views/admin/poll/polls/_form.html.erb @@ -35,26 +35,6 @@ <%= render 'images/admin_image', imageable: @poll, f: f %>
    -
    -
    - - - - - - - - - - - - - - - -
    <%= t("admin.polls.attachments.title") %>
    <%= t("admin.polls.attachments.images_title") %><%= t("admin.polls.attachments.documents_title") %>
    <%= link_to "#{t("admin.polls.attachments.images_link")} (#{@poll.images.count})", root_path %><%= link_to "#{t("admin.polls.attachments.documents_link")} (#{@poll.documents.count})", root_path %>
    -
    -
    <%= f.check_box :geozone_restricted, data: { checkbox_toggle: "#geozones" } %> diff --git a/app/views/images/_admin_image.html.erb b/app/views/images/_admin_image.html.erb index 7c5157216..a782b743b 100644 --- a/app/views/images/_admin_image.html.erb +++ b/app/views/images/_admin_image.html.erb @@ -1,55 +1,13 @@
    <%= f.label :image, t("images.form.admin_title") %> + -
    - <%= f.fields_for :image do |image_builder| %> - <%#= render 'images/image_fields', f: image_builder, imageable: imageable %> - - - -
    - <%= image_builder.hidden_field :id %> - <%= image_builder.hidden_field :user_id, value: current_user.id %> - <%= image_builder.hidden_field :cached_attachment %> - - <%= image_builder.text_field :title, placeholder: t("images.form.title_placeholder") %> - - - <%= render_image(image_builder.object, :thumb, false) if image_builder.object.attachment.exists? %> - -
    -
    - <%= render_image_attachment(image_builder, imageable, image_builder.object) %> -
    -
    - <%= render_destroy_image_link(image_builder, image_builder.object) %> -
    -
    - -
    -

    - <%= image_attachment_file_name(image_builder.object) %> -

    -
    - -
    -
    -
    - -
    - - - - <% end %> -
    -
    - - <%= link_to_add_association t('images.form.add_new_image'), f, :image, + <%= link_to_add_association t('images.form.add_new_image'), f, :image, force_non_association_create: true, partial: "images/image_fields", id: "new_image_link", - class: "button hollow #{"hide" if imageable.image.present?}", + class: "button hollow", render_options: { locals: { imageable: imageable } }, @@ -57,4 +15,31 @@ association_insertion_node: "#nested-image", association_insertion_method: "append" } %> + +
    + <%= f.fields_for :image do |image_builder| %> + +
    + <%= image_builder.hidden_field :id %> + <%= image_builder.hidden_field :user_id, value: current_user.id %> + <%= image_builder.hidden_field :cached_attachment %> + + <%= image_builder.text_field :title, placeholder: t("images.form.title_placeholder"), label: "#{t("images.form.admin_alt_text")}" %> + + +
    +
    + <%= render_image_attachment(image_builder, imageable, image_builder.object) %> +
    +
    + +
    +
    +
    + +
    + + <% end %> +
    +
    diff --git a/config/locales/en/images.yml b/config/locales/en/images.yml index 087c85021..afd8b2308 100644 --- a/config/locales/en/images.yml +++ b/config/locales/en/images.yml @@ -11,6 +11,7 @@ en: add_new_image: Add image title_placeholder: Add a descriptive title for the image admin_title: "Main image of the poll" + admin_alt_text: "Alternative text for the image" actions: destroy: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index afa963c20..816cadd57 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -580,12 +580,6 @@ es: error_on_question_added: "No se pudo asignar la pregunta" question_removed: "Pregunta eliminada de esta votación" error_on_question_removed: "No se pudo quitar la pregunta" - attachments: - title: "Imágenes y documentos de la votación" - images_title: "Imágenes" - documents_title: "Documents" - images_link: "Lista de imágenes" - documents_link: "Lista de documentos" questions: index: title: "Preguntas ciudadanas" diff --git a/config/locales/es/images.yml b/config/locales/es/images.yml index 0207bceed..e842f3f5c 100644 --- a/config/locales/es/images.yml +++ b/config/locales/es/images.yml @@ -10,6 +10,7 @@ es: add_new_image: Añadir imagen title_placeholder: Añade un título descriptivo para la imagen admin_title: "Imagen principal de la votación" + admin_alt_text: "Texto alternativo para la imagen" actions: destroy: diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb index 6eb64f6e1..c282bee5d 100644 --- a/spec/features/admin/poll/polls_spec.rb +++ b/spec/features/admin/poll/polls_spec.rb @@ -58,6 +58,8 @@ feature 'Admin polls' do fill_in "poll_name", with: "Upcoming poll" fill_in 'poll_starts_at', with: start_date.strftime("%d/%m/%Y") fill_in 'poll_ends_at', with: end_date.strftime("%d/%m/%Y") + fill_in 'poll_summary', with: "Upcoming poll's summary. This poll..." + fill_in 'poll_description', with: "Upcomming poll's description. This poll..." click_button "Create poll" expect(page).to have_content "Poll created successfully" From 1c85c8af7950775bcb757848fa2f797906ff6a77 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 2 Oct 2017 13:08:55 +0200 Subject: [PATCH 239/765] Sort Shift recount and scrutiny dates --- app/helpers/shifts_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/shifts_helper.rb b/app/helpers/shifts_helper.rb index af291779a..dc9f97a91 100644 --- a/app/helpers/shifts_helper.rb +++ b/app/helpers/shifts_helper.rb @@ -5,7 +5,7 @@ module ShiftsHelper end def shift_recount_scrutiny_dates(polls) - date_options(polls.map(&:ends_at).map(&:to_date).inject([]) { |total, date| total << (date..date + 1.week).to_a }.flatten.uniq) + date_options(polls.map(&:ends_at).map(&:to_date).sort.inject([]) { |total, date| total << (date..date + 1.week).to_a }.flatten.uniq) end def date_options(dates) From b62342280557f7509b4eb3bf933d137b31606eca Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 2 Oct 2017 13:14:58 +0200 Subject: [PATCH 240/765] allows users to change their vote without refreshing the page --- app/models/poll/answer.rb | 2 +- spec/features/polls/polls_spec.rb | 21 +++++++++++++++++++++ spec/models/poll/answer_spec.rb | 27 ++++++++++++++++++++++++--- 3 files changed, 46 insertions(+), 4 deletions(-) diff --git a/app/models/poll/answer.rb b/app/models/poll/answer.rb index a1ff30f0a..cf59cd305 100644 --- a/app/models/poll/answer.rb +++ b/app/models/poll/answer.rb @@ -14,6 +14,6 @@ class Poll::Answer < ActiveRecord::Base scope :by_question, ->(question_id) { where(question_id: question_id) } def record_voter_participation - Poll::Voter.create!(user: author, poll: poll) + Poll::Voter.find_or_create_by!(user: author, poll: poll) end end \ No newline at end of file diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb index 047c71146..8a90fb4a8 100644 --- a/spec/features/polls/polls_spec.rb +++ b/spec/features/polls/polls_spec.rb @@ -184,6 +184,7 @@ feature 'Polls' do poll.geozones << geozone create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca') user = create(:user, :level_two, geozone: geozone) + login_as user visit poll_path(poll) @@ -193,5 +194,25 @@ feature 'Polls' do expect(page).to have_link('Chewbacca') end + scenario 'Level 2 users changing answer', :js do + poll.update(geozone_restricted: true) + poll.geozones << geozone + create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca') + user = create(:user, :level_two, geozone: geozone) + + login_as user + visit poll_path(poll) + + click_link 'Han Solo' + + expect(page).to_not have_link('Han Solo') + expect(page).to have_link('Chewbacca') + + click_link 'Chewbacca' + + expect(page).to_not have_link('Chewbacca') + expect(page).to have_link('Han Solo') + end + end end diff --git a/spec/models/poll/answer_spec.rb b/spec/models/poll/answer_spec.rb index 10ccafbb6..157204364 100644 --- a/spec/models/poll/answer_spec.rb +++ b/spec/models/poll/answer_spec.rb @@ -14,17 +14,38 @@ describe Poll::Answer do end describe "#record_voter_participation" do + + let(:author) { create(:user, :level_two) } + let(:poll) { create(:poll) } + let(:question) { create(:poll_question, poll: poll, valid_answers: "Yes, No") } + it "creates a poll_voter with user and poll data" do - answer = create(:poll_answer) + answer = create(:poll_answer, question: question, author: author, answer: "Yes") expect(answer.poll.voters).to be_blank answer.record_voter_participation - expect(answer.poll.reload.voters.size).to eq(1) - voter = answer.poll.voters.first + expect(poll.reload.voters.size).to eq(1) + voter = poll.voters.first expect(voter.document_number).to eq(answer.author.document_number) expect(voter.poll_id).to eq(answer.poll.id) end + + it "updates a poll_voter with user and poll data" do + answer = create(:poll_answer, question: question, author: author, answer: "Yes") + answer.record_voter_participation + + expect(poll.reload.voters.size).to eq(1) + + answer = create(:poll_answer, question: question, author: author, answer: "No") + answer.record_voter_participation + + expect(poll.reload.voters.size).to eq(1) + + voter = poll.voters.first + expect(voter.document_number).to eq(answer.author.document_number) + expect(voter.poll_id).to eq(answer.poll.id) + end end end From ca42bc984534378b1616eb3015a3eaa2f7d0e616 Mon Sep 17 00:00:00 2001 From: iagirre Date: Mon, 2 Oct 2017 13:28:44 +0200 Subject: [PATCH 241/765] Added schema.rb with new columns for polls summary and description --- db/schema.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 500f03540..a3bc6065c 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: 20170927110953) do +ActiveRecord::Schema.define(version: 20170928132402) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -763,6 +763,8 @@ ActiveRecord::Schema.define(version: 20170927110953) do t.datetime "ends_at" t.boolean "published", default: false t.boolean "geozone_restricted", default: false + t.text "summary" + t.text "description" end add_index "polls", ["starts_at", "ends_at"], name: "index_polls_on_starts_at_and_ends_at", using: :btree From 60fb142fff2f6441eda174ae0365e56a9cceb316 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 2 Oct 2017 13:39:55 +0200 Subject: [PATCH 242/765] adds comprehensive validation specs --- app/models/poll/answer.rb | 3 ++- spec/models/poll/answer_spec.rb | 34 +++++++++++++++++++++++++++------ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/app/models/poll/answer.rb b/app/models/poll/answer.rb index cf59cd305..c2ea5724b 100644 --- a/app/models/poll/answer.rb +++ b/app/models/poll/answer.rb @@ -8,7 +8,8 @@ class Poll::Answer < ActiveRecord::Base validates :question, presence: true validates :author, presence: true validates :answer, presence: true - validates :answer, inclusion: {in: ->(a) { a.question.valid_answers }} + validates :answer, inclusion: { in: ->(a) { a.question.valid_answers }}, + unless: ->(a) { a.question.blank? } scope :by_author, ->(author_id) { where(author_id: author_id) } scope :by_question, ->(question_id) { where(question_id: question_id) } diff --git a/spec/models/poll/answer_spec.rb b/spec/models/poll/answer_spec.rb index 157204364..d66cdc18c 100644 --- a/spec/models/poll/answer_spec.rb +++ b/spec/models/poll/answer_spec.rb @@ -3,13 +3,35 @@ require 'rails_helper' describe Poll::Answer do describe "validations" do - it "validates that the answers are included in the Poll::Question's list" do - q = create(:poll_question, valid_answers: 'One, Two, Three') - expect(build(:poll_answer, question: q, answer: 'One')).to be_valid - expect(build(:poll_answer, question: q, answer: 'Two')).to be_valid - expect(build(:poll_answer, question: q, answer: 'Three')).to be_valid - expect(build(:poll_answer, question: q, answer: 'Four')).to_not be_valid + let(:answer) { build(:poll_answer) } + + it "should be valid" do + expect(answer).to be_valid + end + + it "should not be valid wihout a question" do + answer.question = nil + expect(answer).to_not be_valid + end + + it "should not be valid without an author" do + answer.author = nil + expect(answer).to_not be_valid + end + + it "should not be valid without an answer" do + answer.answer = nil + expect(answer).to_not be_valid + end + + it "should be valid for answers included in the Poll::Question's list" do + question = create(:poll_question, valid_answers: 'One, Two, Three') + expect(build(:poll_answer, question: question, answer: 'One')).to be_valid + expect(build(:poll_answer, question: question, answer: 'Two')).to be_valid + expect(build(:poll_answer, question: question, answer: 'Three')).to be_valid + + expect(build(:poll_answer, question: question, answer: 'Four')).to_not be_valid end end From 35f6a5bb65817d1d99d14ee7d66dd8a2a0817766 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 2 Oct 2017 13:45:19 +0200 Subject: [PATCH 243/765] Add task to unique triple index on Shift for booth, officer and task --- app/models/poll/shift.rb | 2 +- db/migrate/20171002103314_add_poll_shift_task_index.rb | 7 +++++++ db/schema.rb | 5 +++-- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20171002103314_add_poll_shift_task_index.rb diff --git a/app/models/poll/shift.rb b/app/models/poll/shift.rb index d64bce9ac..cc5f7045e 100644 --- a/app/models/poll/shift.rb +++ b/app/models/poll/shift.rb @@ -6,8 +6,8 @@ class Poll validates :booth_id, presence: true validates :officer_id, presence: true validates :date, presence: true - validates :date, uniqueness: { scope: [:officer_id, :booth_id] } validates :task, presence: true + validates :date, uniqueness: { scope: [:officer_id, :booth_id, :task] } enum task: { vote_collection: 0, recount_scrutiny: 1 } diff --git a/db/migrate/20171002103314_add_poll_shift_task_index.rb b/db/migrate/20171002103314_add_poll_shift_task_index.rb new file mode 100644 index 000000000..d15275556 --- /dev/null +++ b/db/migrate/20171002103314_add_poll_shift_task_index.rb @@ -0,0 +1,7 @@ +class AddPollShiftTaskIndex < ActiveRecord::Migration + def change + remove_index "poll_shifts", name: "index_poll_shifts_on_booth_id_and_officer_id" + add_index :poll_shifts, :task + add_index :poll_shifts, [:booth_id, :officer_id, :task], unique: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 500f03540..f6ff7447d 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: 20170927110953) do +ActiveRecord::Schema.define(version: 20171002103314) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -701,9 +701,10 @@ ActiveRecord::Schema.define(version: 20170927110953) do t.integer "task", default: 0, null: false end - add_index "poll_shifts", ["booth_id", "officer_id"], name: "index_poll_shifts_on_booth_id_and_officer_id", using: :btree + add_index "poll_shifts", ["booth_id", "officer_id", "task"], name: "index_poll_shifts_on_booth_id_and_officer_id_and_task", unique: true, using: :btree add_index "poll_shifts", ["booth_id"], name: "index_poll_shifts_on_booth_id", using: :btree add_index "poll_shifts", ["officer_id"], name: "index_poll_shifts_on_officer_id", using: :btree + add_index "poll_shifts", ["task"], name: "index_poll_shifts_on_task", using: :btree create_table "poll_total_results", force: :cascade do |t| t.integer "author_id" From 9d7be9b57c5d75f94240f79bbd639d3bc28d0458 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 2 Oct 2017 13:08:55 +0200 Subject: [PATCH 244/765] Sort Shift recount and scrutiny dates --- app/helpers/shifts_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/shifts_helper.rb b/app/helpers/shifts_helper.rb index af291779a..dc9f97a91 100644 --- a/app/helpers/shifts_helper.rb +++ b/app/helpers/shifts_helper.rb @@ -5,7 +5,7 @@ module ShiftsHelper end def shift_recount_scrutiny_dates(polls) - date_options(polls.map(&:ends_at).map(&:to_date).inject([]) { |total, date| total << (date..date + 1.week).to_a }.flatten.uniq) + date_options(polls.map(&:ends_at).map(&:to_date).sort.inject([]) { |total, date| total << (date..date + 1.week).to_a }.flatten.uniq) end def date_options(dates) From 6c297ae789909fe19fbbc9ddb154aa28b54665c3 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 2 Oct 2017 14:57:40 +0200 Subject: [PATCH 245/765] Add Poll Recount model, factory and spec --- app/models/poll/recount.rb | 36 +++++++ .../20171002122312_create_poll_recount.rb | 24 +++++ db/schema.rb | 23 +++- spec/factories.rb | 5 + spec/models/poll/recount_spec.rb | 102 ++++++++++++++++++ 5 files changed, 189 insertions(+), 1 deletion(-) create mode 100644 app/models/poll/recount.rb create mode 100644 db/migrate/20171002122312_create_poll_recount.rb create mode 100644 spec/models/poll/recount_spec.rb diff --git a/app/models/poll/recount.rb b/app/models/poll/recount.rb new file mode 100644 index 000000000..97a909d1f --- /dev/null +++ b/app/models/poll/recount.rb @@ -0,0 +1,36 @@ +class Poll::Recount < ActiveRecord::Base + + VALID_ORIGINS = %w{ web booth letter } + + belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' + belongs_to :booth_assignment + belongs_to :officer_assignment + + validates :author, presence: true + validates :origin, inclusion: {in: VALID_ORIGINS} + + scope :web, -> { where(origin: 'web') } + scope :booth, -> { where(origin: 'booth') } + scope :letter, -> { where(origin: 'letter') } + + scope :by_author, ->(author_id) { where(author_id: author_id) } + + before_save :update_logs + + def update_logs + amounts_changed = false + + [:white, :null, :total].each do |amount| + next unless send("#{amount}_amount_changed?") && send("#{amount}_amount_was").present? + self["#{amount}_amount_log"] += ":#{send("#{amount}_amount_was").to_s}" + amounts_changed = true + end + + update_officer_author if amounts_changed + end + + def update_officer_author + self.officer_assignment_id_log += ":#{officer_assignment_id_was.to_s}" + self.author_id_log += ":#{author_id_was.to_s}" + end +end diff --git a/db/migrate/20171002122312_create_poll_recount.rb b/db/migrate/20171002122312_create_poll_recount.rb new file mode 100644 index 000000000..807f1c84e --- /dev/null +++ b/db/migrate/20171002122312_create_poll_recount.rb @@ -0,0 +1,24 @@ +class CreatePollRecount < ActiveRecord::Migration + def change + create_table :poll_recounts do |t| + t.integer :author_id + t.string :origin + t.date :date + t.integer :booth_assignment_id + t.integer :officer_assignment_id + t.text :officer_assignment_id_log, default: "" + t.text :author_id_log, default: "" + t.integer :white_amount + t.text :white_amount_log, default: "" + t.integer :null_amount + t.text :null_amount_log, default: "" + t.integer :total_amount + t.text :total_amount_log, default: "" + end + + add_index :poll_recounts, :booth_assignment_id + add_index :poll_recounts, :officer_assignment_id + add_foreign_key :poll_recounts, :poll_booth_assignments, column: :booth_assignment_id + add_foreign_key :poll_recounts, :poll_officer_assignments, column: :officer_assignment_id + end +end diff --git a/db/schema.rb b/db/schema.rb index 500f03540..e859a487f 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: 20170927110953) do +ActiveRecord::Schema.define(version: 20171002122312) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -690,6 +690,25 @@ ActiveRecord::Schema.define(version: 20170927110953) do add_index "poll_questions", ["proposal_id"], name: "index_poll_questions_on_proposal_id", using: :btree add_index "poll_questions", ["tsv"], name: "index_poll_questions_on_tsv", using: :gin + create_table "poll_recounts", force: :cascade do |t| + t.integer "author_id" + t.string "origin" + t.date "date" + t.integer "booth_assignment_id" + t.integer "officer_assignment_id" + t.text "officer_assignment_id_log", default: "" + t.text "author_id_log", default: "" + t.integer "white_amount" + t.text "white_amount_log", default: "" + t.integer "null_amount" + t.text "null_amount_log", default: "" + t.integer "total_amount" + t.text "total_amount_log", default: "" + end + + add_index "poll_recounts", ["booth_assignment_id"], name: "index_poll_recounts_on_booth_assignment_id", using: :btree + add_index "poll_recounts", ["officer_assignment_id"], name: "index_poll_recounts_on_officer_assignment_id", using: :btree + create_table "poll_shifts", force: :cascade do |t| t.integer "booth_id" t.integer "officer_id" @@ -1126,6 +1145,8 @@ ActiveRecord::Schema.define(version: 20170927110953) do add_foreign_key "poll_questions", "polls" add_foreign_key "poll_questions", "proposals" add_foreign_key "poll_questions", "users", column: "author_id" + add_foreign_key "poll_recounts", "poll_booth_assignments", column: "booth_assignment_id" + add_foreign_key "poll_recounts", "poll_officer_assignments", column: "officer_assignment_id" add_foreign_key "poll_voters", "polls" add_foreign_key "poll_white_results", "poll_booth_assignments", column: "booth_assignment_id" add_foreign_key "poll_white_results", "poll_officer_assignments", column: "officer_assignment_id" diff --git a/spec/factories.rb b/spec/factories.rb index b0a287aea..30159f85a 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -569,6 +569,11 @@ FactoryGirl.define do origin { 'web' } end + factory :poll_recount, class: 'Poll::Recount' do + association :author, factory: :user + origin { 'web' } + end + factory :officing_residence, class: 'Officing::Residence' do user association :officer, factory: :poll_officer diff --git a/spec/models/poll/recount_spec.rb b/spec/models/poll/recount_spec.rb new file mode 100644 index 000000000..1ca0b41eb --- /dev/null +++ b/spec/models/poll/recount_spec.rb @@ -0,0 +1,102 @@ +require 'rails_helper' + +describe Poll::Recount do + + describe "logging changes" do + let(:poll_recount) { create(:poll_recount) } + + it "should update white_amount_log if white_amount changes" do + poll_recount.white_amount = 33 + + expect(poll_recount.white_amount_log).to eq("") + + poll_recount.white_amount = 33 + poll_recount.save + poll_recount.white_amount = 32 + poll_recount.save + poll_recount.white_amount = 34 + poll_recount.save + + expect(poll_recount.white_amount_log).to eq(":33:32") + end + + it "should update null_amount_log if null_amount changes" do + poll_recount.null_amount = 33 + + expect(poll_recount.null_amount_log).to eq("") + + poll_recount.null_amount = 33 + poll_recount.save + poll_recount.null_amount = 32 + poll_recount.save + poll_recount.null_amount = 34 + poll_recount.save + + expect(poll_recount.null_amount_log).to eq(":33:32") + end + + it "should update total_amount_log if total_amount changes" do + poll_recount.total_amount = 33 + + expect(poll_recount.total_amount_log).to eq("") + + poll_recount.total_amount = 33 + poll_recount.save + poll_recount.total_amount = 32 + poll_recount.save + poll_recount.total_amount = 34 + poll_recount.save + + expect(poll_recount.total_amount_log).to eq(":33:32") + end + + it "should update officer_assignment_id_log if amount changes" do + poll_recount.white_amount = 33 + + expect(poll_recount.white_amount_log).to eq("") + expect(poll_recount.officer_assignment_id_log).to eq("") + + poll_recount.white_amount = 33 + poll_recount.officer_assignment = create(:poll_officer_assignment, id: 101) + poll_recount.save + + poll_recount.white_amount = 32 + poll_recount.officer_assignment = create(:poll_officer_assignment, id: 102) + poll_recount.save + + poll_recount.white_amount = 34 + poll_recount.officer_assignment = create(:poll_officer_assignment, id: 103) + poll_recount.save + + expect(poll_recount.white_amount_log).to eq(":33:32") + expect(poll_recount.officer_assignment_id_log).to eq(":101:102") + end + + it "should update author_id if amount changes" do + poll_recount.white_amount = 33 + + expect(poll_recount.white_amount_log).to eq("") + expect(poll_recount.author_id_log).to eq("") + + author_A = create(:poll_officer).user + author_B = create(:poll_officer).user + author_C = create(:poll_officer).user + + poll_recount.white_amount = 33 + poll_recount.author_id = author_A.id + poll_recount.save! + + poll_recount.white_amount = 32 + poll_recount.author_id = author_B.id + poll_recount.save! + + poll_recount.white_amount = 34 + poll_recount.author_id = author_C.id + poll_recount.save! + + expect(poll_recount.white_amount_log).to eq(":33:32") + expect(poll_recount.author_id_log).to eq(":#{author_A.id}:#{author_B.id}") + end + end + +end From b5cf28cb35b776e0f56c7ff5cc00da35f742e32e Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 2 Oct 2017 15:21:50 +0200 Subject: [PATCH 246/765] Swap Poll White/Null/Total usage for Poll Recount --- .../poll/booth_assignments_controller.rb | 2 +- .../poll/officer_assignments_controller.rb | 2 +- .../admin/poll/recounts_controller.rb | 2 +- .../officing/results_controller.rb | 60 ++++++------------- app/helpers/poll_recounts_helper.rb | 2 +- app/models/poll.rb | 4 +- app/models/poll/booth_assignment.rb | 4 +- app/models/poll/officer_assignment.rb | 4 +- .../officer_assignments/by_officer.html.erb | 4 +- app/views/admin/poll/results/index.html.erb | 6 +- app/views/officing/results/index.html.erb | 6 +- spec/features/admin/poll/polls_spec.rb | 16 +++-- spec/features/officing/results_spec.rb | 16 ++--- 13 files changed, 43 insertions(+), 85 deletions(-) diff --git a/app/controllers/admin/poll/booth_assignments_controller.rb b/app/controllers/admin/poll/booth_assignments_controller.rb index 06eb233bd..8ffa455c8 100644 --- a/app/controllers/admin/poll/booth_assignments_controller.rb +++ b/app/controllers/admin/poll/booth_assignments_controller.rb @@ -15,7 +15,7 @@ class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController end def show - @booth_assignment = @poll.booth_assignments.includes(:total_results, :voters, + @booth_assignment = @poll.booth_assignments.includes(:recounts, :voters, officer_assignments: [officer: [:user]]).find(params[:id]) @voters_by_date = @booth_assignment.voters.group_by {|v| v.created_at.to_date} end diff --git a/app/controllers/admin/poll/officer_assignments_controller.rb b/app/controllers/admin/poll/officer_assignments_controller.rb index 7fa120aa6..fd62df8b3 100644 --- a/app/controllers/admin/poll/officer_assignments_controller.rb +++ b/app/controllers/admin/poll/officer_assignments_controller.rb @@ -18,7 +18,7 @@ class Admin::Poll::OfficerAssignmentsController < Admin::Poll::BaseController @officer = ::Poll::Officer.includes(:user).find(officer_assignment_params[:officer_id]) @officer_assignments = ::Poll::OfficerAssignment. joins(:booth_assignment). - includes(:total_results, booth_assignment: :booth). + includes(:recounts, booth_assignment: :booth). where("officer_id = ? AND poll_booth_assignments.poll_id = ?", @officer.id, @poll.id). order(:date) end diff --git a/app/controllers/admin/poll/recounts_controller.rb b/app/controllers/admin/poll/recounts_controller.rb index 6d4a9a442..32c533eec 100644 --- a/app/controllers/admin/poll/recounts_controller.rb +++ b/app/controllers/admin/poll/recounts_controller.rb @@ -3,7 +3,7 @@ class Admin::Poll::RecountsController < Admin::Poll::BaseController def index @booth_assignments = @poll.booth_assignments. - includes(:booth, :total_results, :voters). + includes(:booth, :recounts, :voters). order("poll_booths.name"). page(params[:page]).per(50) end diff --git a/app/controllers/officing/results_controller.rb b/app/controllers/officing/results_controller.rb index 3ad7a91ea..f517f081a 100644 --- a/app/controllers/officing/results_controller.rb +++ b/app/controllers/officing/results_controller.rb @@ -26,9 +26,7 @@ class Officing::ResultsController < Officing::BaseController @partial_results = ::Poll::PartialResult.includes(:question). where(booth_assignment_id: index_params[:booth_assignment_id]). where(date: index_params[:date]) - @whites = ::Poll::WhiteResult.where(booth_assignment_id: @booth_assignment.id, date: index_params[:date]).sum(:amount) - @nulls = ::Poll::NullResult.where(booth_assignment_id: @booth_assignment.id, date: index_params[:date]).sum(:amount) - @total = ::Poll::TotalResult.where(booth_assignment_id: @booth_assignment.id, date: index_params[:date]).sum(:amount) + @recounts = ::Poll::Recount.where(booth_assignment_id: @booth_assignment.id, date: index_params[:date]) end end @@ -52,14 +50,14 @@ class Officing::ResultsController < Officing::BaseController go_back_to_new if question.blank? results.each_pair do |answer_index, count| - next unless count.present? + next if count.blank? answer = question.valid_answers[answer_index.to_i] go_back_to_new if question.blank? partial_result = ::Poll::PartialResult.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id, - date: results_params[:date], - question_id: question_id, - answer: answer) + date: results_params[:date], + question_id: question_id, + answer: answer) partial_result.officer_assignment_id = @officer_assignment.id partial_result.amount = count.to_i partial_result.author = current_user @@ -68,45 +66,21 @@ class Officing::ResultsController < Officing::BaseController end end - build_white_results - build_null_results - build_total_results + build_recounts end - def build_white_results - if results_params[:whites].present? - white_result = ::Poll::WhiteResult.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id, - date: results_params[:date]) - white_result.officer_assignment_id = @officer_assignment.id - white_result.amount = results_params[:whites].to_i - white_result.author = current_user - white_result.origin = 'booth' - @results << white_result - end - end - - def build_null_results - if results_params[:nulls].present? - null_result = ::Poll::NullResult.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id, - date: results_params[:date]) - null_result.officer_assignment_id = @officer_assignment.id - null_result.amount = results_params[:nulls].to_i - null_result.author = current_user - null_result.origin = 'booth' - @results << null_result - end - end - - def build_total_results - if results_params[:total].present? - total_result = ::Poll::TotalResult.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id, - date: results_params[:date]) - total_result.officer_assignment_id = @officer_assignment.id - total_result.amount = results_params[:total].to_i - total_result.author = current_user - total_result.origin = 'booth' - @results << total_result + def build_recounts + recount = ::Poll::Recount.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id, + date: results_params[:date]) + recount.officer_assignment_id = @officer_assignment.id + recount.author = current_user + recount.origin = 'booth' + [:whites, :nulls, :total].each do |recount_type| + if results_params[recount_type].present? + recount["#{recount_type.to_s.singularize}_amount"] = results_params[recount_type].to_i + end end + @results << recount end def go_back_to_new(alert = nil) diff --git a/app/helpers/poll_recounts_helper.rb b/app/helpers/poll_recounts_helper.rb index 716b71d85..45eefd696 100644 --- a/app/helpers/poll_recounts_helper.rb +++ b/app/helpers/poll_recounts_helper.rb @@ -1,7 +1,7 @@ module PollRecountsHelper def total_recounts_by_booth(booth_assignment) - booth_assignment.total_results.any? ? booth_assignment.total_results.to_a.sum(&:amount) : nil + booth_assignment.recounts.any? ? booth_assignment.recounts.to_a.sum(&:total_amount) : nil end end diff --git a/app/models/poll.rb b/app/models/poll.rb index 24ffa3a06..091c7fbb4 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -2,9 +2,7 @@ class Poll < ActiveRecord::Base has_many :booth_assignments, class_name: "Poll::BoothAssignment" has_many :booths, through: :booth_assignments has_many :partial_results, through: :booth_assignments - has_many :white_results, through: :booth_assignments - has_many :null_results, through: :booth_assignments - has_many :total_results, through: :booth_assignments + has_many :recounts, through: :booth_assignments has_many :voters has_many :officer_assignments, through: :booth_assignments has_many :officers, through: :officer_assignments diff --git a/app/models/poll/booth_assignment.rb b/app/models/poll/booth_assignment.rb index 8b4b655ef..8489c3cf0 100644 --- a/app/models/poll/booth_assignment.rb +++ b/app/models/poll/booth_assignment.rb @@ -7,8 +7,6 @@ class Poll has_many :officers, through: :officer_assignments has_many :voters has_many :partial_results - has_many :white_results - has_many :null_results - has_many :total_results + has_many :recounts end end diff --git a/app/models/poll/officer_assignment.rb b/app/models/poll/officer_assignment.rb index 8e86d309c..9fcf02890 100644 --- a/app/models/poll/officer_assignment.rb +++ b/app/models/poll/officer_assignment.rb @@ -3,9 +3,7 @@ class Poll belongs_to :officer belongs_to :booth_assignment has_many :partial_results - has_many :white_results - has_many :null_results - has_many :total_results + has_many :recounts has_many :voters validates :officer_id, presence: true diff --git a/app/views/admin/poll/officer_assignments/by_officer.html.erb b/app/views/admin/poll/officer_assignments/by_officer.html.erb index 6ea421e2d..cefe161d9 100644 --- a/app/views/admin/poll/officer_assignments/by_officer.html.erb +++ b/app/views/admin/poll/officer_assignments/by_officer.html.erb @@ -43,8 +43,8 @@ <%= l(officer_assignment.date.to_date) %> <%= booth_name_with_location(officer_assignment.booth_assignment.booth) %> - <% if officer_assignment.total_results.any? %> - <%= officer_assignment.total_results.to_a.sum(&:amount) %> + <% if officer_assignment.recounts.any? %> + <%= officer_assignment.recounts.to_a.sum(&:total_amount) %> <% else %> - <% end %> diff --git a/app/views/admin/poll/results/index.html.erb b/app/views/admin/poll/results/index.html.erb index 64a93aa10..c65b3ead7 100644 --- a/app/views/admin/poll/results/index.html.erb +++ b/app/views/admin/poll/results/index.html.erb @@ -18,9 +18,9 @@ - <%= @poll.white_results.sum(:amount) %> - <%= @poll.null_results.sum(:amount) %> - <%= @poll.total_results.sum(:amount) %> + <%= @poll.recounts.sum(:white_amount) %> + <%= @poll.recounts.sum(:null_amount) %> + <%= @poll.recounts.sum(:total_amount) %> diff --git a/app/views/officing/results/index.html.erb b/app/views/officing/results/index.html.erb index 3b14e3c97..924d7fc13 100644 --- a/app/views/officing/results/index.html.erb +++ b/app/views/officing/results/index.html.erb @@ -21,9 +21,9 @@ - <%= @whites %> - <%= @nulls %> - <%= @total %> + <%= @recounts.sum(:white_amount) %> + <%= @recounts.sum(:null_amount) %> + <%= @recounts.sum(:total_amount) %> diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb index 6eb64f6e1..8d30dc5eb 100644 --- a/spec/features/admin/poll/polls_spec.rb +++ b/spec/features/admin/poll/polls_spec.rb @@ -249,18 +249,18 @@ feature 'Admin polls' do booth_assignment_final_recounted = create(:poll_booth_assignment, poll: poll) 3.times do |i| - create(:poll_total_result, + create(:poll_recount, booth_assignment: booth_assignment, date: poll.starts_at + i.days, - amount: 21) + total_amount: 21) end 2.times { create(:poll_voter, booth_assignment: booth_assignment_final_recounted) } - create(:poll_total_result, + create(:poll_recount, booth_assignment: booth_assignment_final_recounted, date: poll.ends_at, - amount: 55555) + total_amount: 55555) visit admin_poll_path(poll) @@ -318,12 +318,10 @@ feature 'Admin polls' do answer: 'Tomorrow', amount: 5) end - create(:poll_white_result, + create(:poll_recount, booth_assignment: booth_assignment_1, - amount: 21) - create(:poll_null_result, - booth_assignment: booth_assignment_3, - amount: 44) + white_amount: 21, + null_amount: 44) visit admin_poll_path(poll) diff --git a/spec/features/officing/results_spec.rb b/spec/features/officing/results_spec.rb index 835903ab9..f7e1ad8ef 100644 --- a/spec/features/officing/results_spec.rb +++ b/spec/features/officing/results_spec.rb @@ -127,21 +127,13 @@ feature 'Officing Results' do date: @poll.ends_at, question: @question_1, amount: 33) - white_result = create(:poll_white_result, + poll_recount = create(:poll_recount, officer_assignment: @officer_assignment, booth_assignment: @officer_assignment.booth_assignment, date: @poll.ends_at, - amount: 21) - null_result = create(:poll_null_result, - officer_assignment: @officer_assignment, - booth_assignment: @officer_assignment.booth_assignment, - date: @poll.ends_at, - amount: 44) - total_result = create(:poll_total_result, - officer_assignment: @officer_assignment, - booth_assignment: @officer_assignment.booth_assignment, - date: @poll.ends_at, - amount: 66) + white_amount: 21, + null_amount: 44, + total_amount: 66) visit officing_poll_results_path(@poll, date: I18n.l(@poll.ends_at.to_date), From afbdd4889101595d14fa866e23fd5176363495e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 2 Oct 2017 16:11:17 +0200 Subject: [PATCH 247/765] Fixed tests --- config/locales/en/admin.yml | 8 ----- config/locales/es/admin.yml | 8 ----- spec/features/admin/poll/polls_spec.rb | 48 ------------------------- spec/features/admin/poll/shifts_spec.rb | 15 ++++---- 4 files changed, 9 insertions(+), 70 deletions(-) diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 0545e6af5..008f36f3e 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -489,15 +489,11 @@ en: no_officers: "There are no officers assigned to this poll." table_name: "Name" table_email: "Email" - add_officer_assignments: "Add shifts as officer" - edit_officer_assignments: "Edit officing shifts" by_officer: date: "Date" booth: "Booth" assignments: "Officing shifts in this poll" no_assignments: "This user has no officing shifts in this poll." - total_recounts: "Total recounts" - total_recount: "Total recount (by officer)" poll_shifts: new: add_shift: "Add shift" @@ -570,7 +566,6 @@ en: results_tab: Results no_questions: "There are no questions assigned to this poll." questions_title: "List of questions" - remove_question: "Remove question from poll" add_question: "Include question" table_title: "Title" table_assignment: "Assignment" @@ -578,8 +573,6 @@ en: flash: question_added: "Question added to this poll" error_on_question_added: "Question could not be assigned to this poll" - question_removed: "Question removed from this poll" - error_on_question_removed: "Question could not be removed from this poll" questions: index: title: "Questions" @@ -606,7 +599,6 @@ en: description: Description video_url: External video documents: Documents (1) - preview: View on website recounts: index: title: "Recounts" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 816cadd57..4a4616338 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -489,15 +489,11 @@ es: no_officers: "No hay presidentes de mesa asignados a esta votación." table_name: "Nombre" table_email: "Email" - add_officer_assignments: "Añadir turnos como presidente de mesa" - edit_officer_assignments: "Editar turnos" by_officer: date: "Fecha" booth: "Urna" assignments: "Turnos como presidente de mesa en esta votación" no_assignments: "No tiene turnos como presidente de mesa en esta votación." - total_recounts: "Recuentos totales" - total_recount: "Recuento total (presidente de mesa)" poll_shifts: new: add_shift: "Añadir turno" @@ -570,7 +566,6 @@ es: results_tab: Resultados no_questions: "No hay preguntas asignadas a esta votación." questions_title: "Listado de preguntas asignadas" - remove_question: "Desasignar pregunta" add_question: "Incluir pregunta" table_title: "Título" table_assignment: "Asignación" @@ -578,8 +573,6 @@ es: flash: question_added: "Pregunta añadida a esta votación" error_on_question_added: "No se pudo asignar la pregunta" - question_removed: "Pregunta eliminada de esta votación" - error_on_question_removed: "No se pudo quitar la pregunta" questions: index: title: "Preguntas ciudadanas" @@ -606,7 +599,6 @@ es: description: Descripción video_url: Video externo documents: Documentos (1) - preview: Ver en la web recounts: index: title: "Recuentos" diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb index 6eb64f6e1..153f0885a 100644 --- a/spec/features/admin/poll/polls_spec.rb +++ b/spec/features/admin/poll/polls_spec.rb @@ -181,54 +181,6 @@ feature 'Admin polls' do expect(page).to_not have_content "There are no questions assigned to this poll" end - scenario 'Add question to poll', :js do - poll = create(:poll) - question = create(:poll_question, title: 'Should we rebuild the city?') - - visit admin_poll_path(poll) - - expect(page).to have_content 'Questions (0)' - expect(page).to have_content 'There are no questions assigned to this poll' - - fill_in 'search-questions', with: 'rebuild' - click_button 'Search' - - within('#search-questions-results') do - click_link 'Include question' - end - - expect(page).to have_content 'Question added to this poll' - - visit admin_poll_path(poll) - - expect(page).to have_content 'Questions (1)' - expect(page).to_not have_content 'There are no questions assigned to this poll' - expect(page).to have_content question.title - end - - scenario 'Remove question from poll', :js do - poll = create(:poll) - question = create(:poll_question, poll: poll) - - visit admin_poll_path(poll) - - expect(page).to have_content 'Questions (1)' - expect(page).to_not have_content 'There are no questions assigned to this poll' - expect(page).to have_content question.title - - within("#poll_question_#{question.id}") do - click_link 'Remove question from poll' - end - - expect(page).to have_content 'Question removed from this poll' - - visit admin_poll_path(poll) - - expect(page).to have_content 'Questions (0)' - expect(page).to have_content 'There are no questions assigned to this poll' - expect(page).to_not have_content question.title - end - end end diff --git a/spec/features/admin/poll/shifts_spec.rb b/spec/features/admin/poll/shifts_spec.rb index 46c737c64..9dea5f8d1 100644 --- a/spec/features/admin/poll/shifts_spec.rb +++ b/spec/features/admin/poll/shifts_spec.rb @@ -31,13 +31,14 @@ feature 'Admin shifts' do end scenario "Create Vote Collection Shift", :js do - poll = create(:poll) + poll = create(:poll, :current) vote_collection_dates = (poll.starts_at.to_date..poll.ends_at.to_date).to_a.map { |date| I18n.l(date, format: :long) } booth = create(:poll_booth) + assignment = create(:poll_booth_assignment, poll: poll, booth: booth) officer = create(:poll_officer) - visit admin_booths_path + visit available_admin_booths_path within("#booth_#{booth.id}") do click_link "Manage shifts" @@ -63,13 +64,14 @@ feature 'Admin shifts' do end scenario "Create Recount & Scrutiny Shift", :js do - poll = create(:poll) + poll = create(:poll, :current) recount_scrutiny_dates = (poll.ends_at.to_date..poll.ends_at.to_date + 1.week).to_a.map { |date| I18n.l(date, format: :long) } booth = create(:poll_booth) + assignment = create(:poll_booth_assignment, poll: poll, booth: booth) officer = create(:poll_officer) - visit admin_booths_path + visit available_admin_booths_path within("#booth_#{booth.id}") do click_link "Manage shifts" @@ -97,11 +99,12 @@ feature 'Admin shifts' do end scenario "Error on create", :js do - poll = create(:poll) + poll = create(:poll, :current) booth = create(:poll_booth) + assignment = create(:poll_booth_assignment, poll: poll, booth: booth) officer = create(:poll_officer) - visit admin_booths_path + visit available_admin_booths_path within("#booth_#{booth.id}") do click_link "Manage shifts" From 0147401fbecf797ee1762907f36d6b10666a9371 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 2 Oct 2017 16:18:08 +0200 Subject: [PATCH 248/765] adds origin to poll voters --- app/models/poll/voter.rb | 7 +++ ...0171002121658_add_origin_to_poll_voters.rb | 5 ++ db/schema.rb | 3 +- spec/factories.rb | 1 + spec/models/poll/voter_spec.rb | 58 +++++++++++++++++++ 5 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20171002121658_add_origin_to_poll_voters.rb diff --git a/app/models/poll/voter.rb b/app/models/poll/voter.rb index 760096206..abcae7d25 100644 --- a/app/models/poll/voter.rb +++ b/app/models/poll/voter.rb @@ -1,5 +1,8 @@ class Poll class Voter < ActiveRecord::Base + + VALID_ORIGINS = %w{ web booth } + belongs_to :poll belongs_to :user belongs_to :geozone @@ -10,9 +13,13 @@ class Poll validates :user_id, presence: true validates :document_number, presence: true, uniqueness: { scope: [:poll_id, :document_type], message: :has_voted } + validates :origin, inclusion: { in: VALID_ORIGINS } before_validation :set_demographic_info, :set_document_info + scope :web, -> { where(origin: 'web') } + scope :booth, -> { where(origin: 'booth') } + def set_demographic_info return if user.blank? diff --git a/db/migrate/20171002121658_add_origin_to_poll_voters.rb b/db/migrate/20171002121658_add_origin_to_poll_voters.rb new file mode 100644 index 000000000..845c1b774 --- /dev/null +++ b/db/migrate/20171002121658_add_origin_to_poll_voters.rb @@ -0,0 +1,5 @@ +class AddOriginToPollVoters < ActiveRecord::Migration + def change + add_column :poll_voters, :origin, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 500f03540..e862af922 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: 20170927110953) do +ActiveRecord::Schema.define(version: 20171002121658) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -733,6 +733,7 @@ ActiveRecord::Schema.define(version: 20170927110953) do t.integer "answer_id" t.integer "officer_assignment_id" t.integer "user_id" + t.string "origin" end add_index "poll_voters", ["booth_assignment_id"], name: "index_poll_voters_on_booth_assignment_id", using: :btree diff --git a/spec/factories.rb b/spec/factories.rb index b0a287aea..f3d70a529 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -525,6 +525,7 @@ FactoryGirl.define do factory :poll_voter, class: 'Poll::Voter' do poll association :user, :level_two + origin "web" trait :from_booth do association :booth_assignment, factory: :poll_booth_assignment diff --git a/spec/models/poll/voter_spec.rb b/spec/models/poll/voter_spec.rb index c1c248550..f306248dc 100644 --- a/spec/models/poll/voter_spec.rb +++ b/spec/models/poll/voter_spec.rb @@ -83,6 +83,64 @@ describe :voter do expect(voter.errors.messages[:document_number]).to eq(["User has already voted"]) end + context "origin" do + + it "should not be valid without an origin" do + voter.origin = nil + expect(voter).to_not be_valid + end + + it "should not be valid without a valid origin" do + voter.origin = "invalid_origin" + expect(voter).to_not be_valid + end + + it "should be valid with a booth origin" do + voter.origin = "booth" + expect(voter).to be_valid + end + + it "should be valid with a web origin" do + voter.origin = "web" + expect(voter).to be_valid + end + + end + + end + + describe "scopes" do + + describe "#web" do + it "returns voters with a web origin" do + voter1 = create(:poll_voter, origin: "web") + voter2 = create(:poll_voter, origin: "web") + voter3 = create(:poll_voter, origin: "booth") + + web_voters = Poll::Voter.web + + expect(web_voters.count).to eq(2) + expect(web_voters).to include(voter1) + expect(web_voters).to include(voter2) + expect(web_voters).to_not include(voter3) + end + end + + describe "#booth" do + it "returns voters with a booth origin" do + voter1 = create(:poll_voter, origin: "booth") + voter2 = create(:poll_voter, origin: "booth") + voter3 = create(:poll_voter, origin: "web") + + booth_voters = Poll::Voter.booth + + expect(booth_voters.count).to eq(2) + expect(booth_voters).to include(voter1) + expect(booth_voters).to include(voter2) + expect(booth_voters).to_not include(voter3) + end + end + end describe "save" do From 085991c624e9ceb5ce15f9606230b0a88ac0c6f3 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 2 Oct 2017 16:22:31 +0200 Subject: [PATCH 249/765] allows voting only in one origin: booth or web --- app/controllers/officing/voters_controller.rb | 3 +- app/models/poll.rb | 4 + app/models/poll/answer.rb | 2 +- app/views/polls/show.html.erb | 10 +- config/locales/en/general.yml | 1 + config/locales/es/general.yml | 1 + spec/factories.rb | 6 ++ spec/features/polls/voter_spec.rb | 94 +++++++++++++++++++ spec/models/poll/poll_spec.rb | 29 ++++++ spec/support/common_actions.rb | 33 +++++++ 10 files changed, 179 insertions(+), 4 deletions(-) create mode 100644 spec/features/polls/voter_spec.rb diff --git a/app/controllers/officing/voters_controller.rb b/app/controllers/officing/voters_controller.rb index dee1e00bd..a5343f83d 100644 --- a/app/controllers/officing/voters_controller.rb +++ b/app/controllers/officing/voters_controller.rb @@ -12,7 +12,8 @@ class Officing::VotersController < Officing::BaseController @voter = Poll::Voter.new(document_type: @user.document_type, document_number: @user.document_number, user: @user, - poll: @poll) + poll: @poll, + origin: "booth") @voter.save! end diff --git a/app/models/poll.rb b/app/models/poll.rb index 24ffa3a06..78ef2bc90 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -61,6 +61,10 @@ class Poll < ActiveRecord::Base voters.where(document_number: document_number, document_type: document_type).exists? end + def voted_in_booth?(user) + Poll::Voter.where(poll: self, user: user, origin: "booth").exists? + end + def date_range unless starts_at.present? && ends_at.present? && starts_at <= ends_at errors.add(:starts_at, I18n.t('errors.messages.invalid_date_range')) diff --git a/app/models/poll/answer.rb b/app/models/poll/answer.rb index c2ea5724b..01eebd553 100644 --- a/app/models/poll/answer.rb +++ b/app/models/poll/answer.rb @@ -15,6 +15,6 @@ class Poll::Answer < ActiveRecord::Base scope :by_question, ->(question_id) { where(question_id: question_id) } def record_voter_participation - Poll::Voter.find_or_create_by!(user: author, poll: poll) + Poll::Voter.find_or_create_by!(user: author, poll: poll, origin: "web") end end \ No newline at end of file diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 02ab70525..6895397de 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -31,8 +31,14 @@
    - <% @questions.each do |question| %> - <%= render 'polls/questions/question', question: question %> + <% if @poll.voted_in_booth?(current_user) %> +
    + <%= t("polls.show.already_voted_in_booth") %> +
    + <% else %> + <% @questions.each do |question| %> + <%= render 'polls/questions/question', question: question %> + <% end %> <% end %>
    diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 29c81c074..67d8eef2c 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -481,6 +481,7 @@ en: help_text_1: "Voting takes place when a citizen proposal supports reaches 1% of the census with voting rights. Voting can also include questions that the City Council ask to the citizens decision." help_text_2: "To participate in the next vote you have to sign up on %{org} and verify your account. All registered voters in the city over 16 years old can vote. The results of all votes are binding on the government." show: + already_voted_in_booth: "You have already participated in a booth for this poll." dates_title: "Participation dates" cant_answer_not_logged_in: "You must %{signin} or %{signup} to participate." signin: Sign in diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index c5322c84c..cace38212 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -481,6 +481,7 @@ es: help_text_1: "Las votaciones se convocan cuando una propuesta ciudadana alcanza el 1% de apoyos del censo con derecho a voto. En las votaciones también se pueden incluir cuestiones que el Ayuntamiento somete a decisión directa de la ciudadanía." help_text_2: "Para participar en la próxima votación tienes que registrarte en %{org} y verificar tu cuenta. Pueden votar todas las personas empadronadas en la ciudad mayores de 16 años. Los resultados de todas las votaciones serán vinculantes para el gobierno." show: + already_voted_in_booth: "Ya has participado en esta votación en una urna." dates_title: "Fechas de participación" cant_answer_not_logged_in: "Necesitas %{signin} o %{signup} para participar." signin: iniciar sesión diff --git a/spec/factories.rb b/spec/factories.rb index f3d70a529..a67cd2e8e 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -52,6 +52,12 @@ FactoryGirl.define do trait :verified do verified_at Time.current end + + trait :in_census do + document_number "12345678Z" + document_type "1" + verified_at Time.current + end end factory :identity do diff --git a/spec/features/polls/voter_spec.rb b/spec/features/polls/voter_spec.rb new file mode 100644 index 000000000..08bc6f963 --- /dev/null +++ b/spec/features/polls/voter_spec.rb @@ -0,0 +1,94 @@ +require 'rails_helper' + +feature "Voter" do + + context "Origin" do + + scenario "Voting via web", :js do + poll = create(:poll) + question = create(:poll_question, poll: poll, valid_answers: 'Yes, No') + user = create(:user, :level_two) + + login_as user + visit question_path(question) + + click_link 'Answer this question' + click_link 'Yes' + + expect(page).to_not have_link('Yes') + expect(Poll::Voter.count).to eq(1) + expect(Poll::Voter.first.origin).to eq("web") + end + + scenario "Voting in booth", :js do + user = create(:user, :in_census) + create(:geozone, :in_census) + + poll = create(:poll) + officer = create(:poll_officer) + + ba = create(:poll_booth_assignment, poll: poll) + create(:poll_officer_assignment, officer: officer, booth_assignment: ba) + + login_through_form_as_officer(officer.user) + + visit new_officing_residence_path + officing_verify_residence + + expect(page).to have_content poll.name + + first(:button, "Confirm vote").click + expect(page).to have_content "Vote introduced!" + + expect(Poll::Voter.count).to eq(1) + expect(Poll::Voter.first.origin).to eq("booth") + end + + context "Trying to vote the same poll in booth and web" do + + let(:poll) { create(:poll) } + let(:question) { create(:poll_question, poll: poll, valid_answers: 'Yes, No') } + let!(:user) { create(:user, :in_census) } + + let(:officer) { create(:poll_officer) } + let(:ba) { create(:poll_booth_assignment, poll: poll) } + let!(:oa) { create(:poll_officer_assignment, officer: officer, booth_assignment: ba) } + + scenario "Trying to vote in web and then in booth", :js do + login_as user + vote_for_poll_via_web + + click_link "Sign out" + + login_through_form_as_officer(officer.user) + + visit new_officing_residence_path + officing_verify_residence + + expect(page).to have_content poll.name + expect(page).to_not have_button "Confirm vote" + expect(page).to have_content "Has already participated in this poll" + end + + scenario "Trying to vote in booth and then in web", :js do + login_through_form_as_officer(officer.user) + + vote_for_poll_via_booth + + visit root_path + click_link "Sign out" + + login_as user + visit question_path(question) + + click_link 'Answer this question' + + expect(page).to_not have_link('Yes') + expect(page).to have_content "You have already participated in a booth for this poll." + expect(Poll::Voter.count).to eq(1) + end + end + + end + +end \ No newline at end of file diff --git a/spec/models/poll/poll_spec.rb b/spec/models/poll/poll_spec.rb index ac0cc44ea..5083d7439 100644 --- a/spec/models/poll/poll_spec.rb +++ b/spec/models/poll/poll_spec.rb @@ -138,4 +138,33 @@ describe :poll do end end end + + describe "#voted_in_booth?" do + + it "returns true if the user has already voted in booth" do + user = create(:user, :level_two) + poll = create(:poll) + + create(:poll_voter, poll: poll, user: user, origin: "booth") + + expect(poll.voted_in_booth?(user)).to be + end + + it "returns false if the user has not already voted in a booth" do + user = create(:user, :level_two) + poll = create(:poll) + + expect(poll.voted_in_booth?(user)).to_not be + end + + it "returns false if the user has voted in web" do + user = create(:user, :level_two) + poll = create(:poll) + + create(:poll_voter, poll: poll, user: user, origin: "web") + + expect(poll.voted_in_booth?(user)).to_not be + end + + end end diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index 8b8470293..97f05294c 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -24,6 +24,17 @@ module CommonActions click_button 'Enter' end + def login_through_form_as_officer(user) + visit root_path + click_link 'Sign in' + + fill_in 'user_login', with: user.email + fill_in 'user_password', with: user.password + + click_button 'Enter' + visit new_officing_residence_path + end + def login_as_authenticated_manager expected_response = {login: login, user_key: user_key, date: date}.with_indifferent_access login, user_key, date = "JJB042", "31415926", Time.current.strftime("%Y%m%d%H%M%S") @@ -287,4 +298,26 @@ module CommonActions end end + def vote_for_poll_via_web + visit question_path(question) + + click_link 'Answer this question' + click_link 'Yes' + + expect(page).to_not have_link('Yes') + expect(Poll::Voter.count).to eq(1) + end + + def vote_for_poll_via_booth + visit new_officing_residence_path + officing_verify_residence + + expect(page).to have_content poll.name + + first(:button, "Confirm vote").click + expect(page).to have_content "Vote introduced!" + + expect(Poll::Voter.count).to eq(1) + end + end From 58069b35a3642ca98990fa617363f6f04362cd70 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 2 Oct 2017 16:24:53 +0200 Subject: [PATCH 250/765] Remove Poll White/Null/Total Results models, tables, specs and references --- .rubocop_todo.yml | 6 - app/models/poll/null_result.rb | 23 - app/models/poll/total_result.rb | 23 - app/models/poll/white_result.rb | 23 - ...47_remove_poll_white_null_total_results.rb | 16 + db/schema.rb | 51 +- knapsack_rspec_report.json | 449 +++++++++--------- spec/factories.rb | 15 - spec/models/poll/null_result_spec.rb | 70 --- spec/models/poll/total_result_spec.rb | 70 --- spec/models/poll/white_result_spec.rb | 70 --- 11 files changed, 242 insertions(+), 574 deletions(-) delete mode 100644 app/models/poll/null_result.rb delete mode 100644 app/models/poll/total_result.rb delete mode 100644 app/models/poll/white_result.rb create mode 100644 db/migrate/20171002133547_remove_poll_white_null_total_results.rb delete mode 100644 spec/models/poll/null_result_spec.rb delete mode 100644 spec/models/poll/total_result_spec.rb delete mode 100644 spec/models/poll/white_result_spec.rb diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index f8d4bb811..072caad09 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -283,10 +283,7 @@ Lint/ParenthesesAsGroupedExpression: # Cop supports --auto-correct. Lint/StringConversionInInterpolation: Exclude: - - 'app/models/poll/null_result.rb' - 'app/models/poll/partial_result.rb' - - 'app/models/poll/white_result.rb' - - 'app/models/poll/total_result.rb' # Offense count: 15 # Cop supports --auto-correct. @@ -533,10 +530,7 @@ Style/MutableConstant: - 'app/models/activity.rb' - 'app/models/budget/reclassified_vote.rb' - 'app/models/legislation/draft_version.rb' - - 'app/models/poll/null_result.rb' - 'app/models/poll/partial_result.rb' - - 'app/models/poll/white_result.rb' - - 'app/models/poll/total_result.rb' - 'app/models/proposal.rb' - 'app/models/signature_sheet.rb' - 'app/models/site_customization/content_block.rb' diff --git a/app/models/poll/null_result.rb b/app/models/poll/null_result.rb deleted file mode 100644 index d10fe3cb0..000000000 --- a/app/models/poll/null_result.rb +++ /dev/null @@ -1,23 +0,0 @@ -class Poll::NullResult < ActiveRecord::Base - - VALID_ORIGINS = %w{web booth} - - belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' - belongs_to :booth_assignment - belongs_to :officer_assignment - - validates :author, presence: true - validates :origin, inclusion: {in: VALID_ORIGINS} - - scope :by_author, ->(author_id) { where(author_id: author_id) } - - before_save :update_logs - - def update_logs - if amount_changed? && amount_was.present? - self.amount_log += ":#{amount_was.to_s}" - self.officer_assignment_id_log += ":#{officer_assignment_id_was.to_s}" - self.author_id_log += ":#{author_id_was.to_s}" - end - end -end diff --git a/app/models/poll/total_result.rb b/app/models/poll/total_result.rb deleted file mode 100644 index 2df01929e..000000000 --- a/app/models/poll/total_result.rb +++ /dev/null @@ -1,23 +0,0 @@ -class Poll::TotalResult < ActiveRecord::Base - - VALID_ORIGINS = %w{web booth} - - belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' - belongs_to :booth_assignment - belongs_to :officer_assignment - - validates :author, presence: true - validates :origin, inclusion: {in: VALID_ORIGINS} - - scope :by_author, ->(author_id) { where(author_id: author_id) } - - before_save :update_logs - - def update_logs - if amount_changed? && amount_was.present? - self.amount_log += ":#{amount_was.to_s}" - self.officer_assignment_id_log += ":#{officer_assignment_id_was.to_s}" - self.author_id_log += ":#{author_id_was.to_s}" - end - end -end diff --git a/app/models/poll/white_result.rb b/app/models/poll/white_result.rb deleted file mode 100644 index a4a4e5a4d..000000000 --- a/app/models/poll/white_result.rb +++ /dev/null @@ -1,23 +0,0 @@ -class Poll::WhiteResult < ActiveRecord::Base - - VALID_ORIGINS = %w{web booth} - - belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' - belongs_to :booth_assignment - belongs_to :officer_assignment - - validates :author, presence: true - validates :origin, inclusion: {in: VALID_ORIGINS} - - scope :by_author, ->(author_id) { where(author_id: author_id) } - - before_save :update_logs - - def update_logs - if amount_changed? && amount_was.present? - self.amount_log += ":#{amount_was.to_s}" - self.officer_assignment_id_log += ":#{officer_assignment_id_was.to_s}" - self.author_id_log += ":#{author_id_was.to_s}" - end - end -end diff --git a/db/migrate/20171002133547_remove_poll_white_null_total_results.rb b/db/migrate/20171002133547_remove_poll_white_null_total_results.rb new file mode 100644 index 000000000..5fff82ef3 --- /dev/null +++ b/db/migrate/20171002133547_remove_poll_white_null_total_results.rb @@ -0,0 +1,16 @@ +class RemovePollWhiteNullTotalResults < ActiveRecord::Migration + def change + remove_index :poll_null_results, column: [:booth_assignment_id] + remove_index :poll_null_results, column: [:officer_assignment_id] + + remove_index :poll_white_results, column: [:booth_assignment_id] + remove_index :poll_white_results, column: [:officer_assignment_id] + + remove_index :poll_total_results, column: [:booth_assignment_id] + remove_index :poll_total_results, column: [:officer_assignment_id] + + drop_table :poll_null_results + drop_table :poll_total_results + drop_table :poll_white_results + end +end diff --git a/db/schema.rb b/db/schema.rb index e859a487f..b852190f0 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: 20171002122312) do +ActiveRecord::Schema.define(version: 20171002133547) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -613,21 +613,6 @@ ActiveRecord::Schema.define(version: 20171002122312) do t.string "location" end - create_table "poll_null_results", force: :cascade do |t| - t.integer "author_id" - t.integer "amount" - t.string "origin" - t.date "date" - t.integer "booth_assignment_id" - t.integer "officer_assignment_id" - t.text "amount_log", default: "" - t.text "officer_assignment_id_log", default: "" - t.text "author_id_log", default: "" - end - - add_index "poll_null_results", ["booth_assignment_id"], name: "index_poll_null_results_on_booth_assignment_id", using: :btree - add_index "poll_null_results", ["officer_assignment_id"], name: "index_poll_null_results_on_officer_assignment_id", using: :btree - create_table "poll_officer_assignments", force: :cascade do |t| t.integer "booth_assignment_id" t.integer "officer_id" @@ -724,21 +709,6 @@ ActiveRecord::Schema.define(version: 20171002122312) do add_index "poll_shifts", ["booth_id"], name: "index_poll_shifts_on_booth_id", using: :btree add_index "poll_shifts", ["officer_id"], name: "index_poll_shifts_on_officer_id", using: :btree - create_table "poll_total_results", force: :cascade do |t| - t.integer "author_id" - t.integer "amount" - t.string "origin" - t.date "date" - t.integer "booth_assignment_id" - t.integer "officer_assignment_id" - t.text "amount_log", default: "" - t.text "officer_assignment_id_log", default: "" - t.text "author_id_log", default: "" - end - - add_index "poll_total_results", ["booth_assignment_id"], name: "index_poll_total_results_on_booth_assignment_id", using: :btree - add_index "poll_total_results", ["officer_assignment_id"], name: "index_poll_total_results_on_officer_assignment_id", using: :btree - create_table "poll_voters", force: :cascade do |t| t.string "document_number" t.string "document_type" @@ -761,21 +731,6 @@ ActiveRecord::Schema.define(version: 20171002122312) do add_index "poll_voters", ["poll_id"], name: "index_poll_voters_on_poll_id", using: :btree add_index "poll_voters", ["user_id"], name: "index_poll_voters_on_user_id", using: :btree - create_table "poll_white_results", force: :cascade do |t| - t.integer "author_id" - t.integer "amount" - t.string "origin" - t.date "date" - t.integer "booth_assignment_id" - t.integer "officer_assignment_id" - t.text "amount_log", default: "" - t.text "officer_assignment_id_log", default: "" - t.text "author_id_log", default: "" - end - - add_index "poll_white_results", ["booth_assignment_id"], name: "index_poll_white_results_on_booth_assignment_id", using: :btree - add_index "poll_white_results", ["officer_assignment_id"], name: "index_poll_white_results_on_officer_assignment_id", using: :btree - create_table "polls", force: :cascade do |t| t.string "name" t.datetime "starts_at" @@ -1135,8 +1090,6 @@ ActiveRecord::Schema.define(version: 20171002122312) do add_foreign_key "organizations", "users" add_foreign_key "poll_answers", "poll_questions", column: "question_id" add_foreign_key "poll_booth_assignments", "polls" - add_foreign_key "poll_null_results", "poll_booth_assignments", column: "booth_assignment_id" - add_foreign_key "poll_null_results", "poll_officer_assignments", column: "officer_assignment_id" add_foreign_key "poll_officer_assignments", "poll_booth_assignments", column: "booth_assignment_id" add_foreign_key "poll_partial_results", "poll_booth_assignments", column: "booth_assignment_id" add_foreign_key "poll_partial_results", "poll_officer_assignments", column: "officer_assignment_id" @@ -1148,8 +1101,6 @@ ActiveRecord::Schema.define(version: 20171002122312) do add_foreign_key "poll_recounts", "poll_booth_assignments", column: "booth_assignment_id" add_foreign_key "poll_recounts", "poll_officer_assignments", column: "officer_assignment_id" add_foreign_key "poll_voters", "polls" - add_foreign_key "poll_white_results", "poll_booth_assignments", column: "booth_assignment_id" - add_foreign_key "poll_white_results", "poll_officer_assignments", column: "officer_assignment_id" add_foreign_key "proposals", "communities" add_foreign_key "users", "geozones" add_foreign_key "valuators", "users" diff --git a/knapsack_rspec_report.json b/knapsack_rspec_report.json index 595276b2b..5f1fc06b5 100644 --- a/knapsack_rspec_report.json +++ b/knapsack_rspec_report.json @@ -1,226 +1,227 @@ { - "spec/helpers/comments_helper_spec.rb": 0.010898828506469727, - "spec/controllers/graphql_controller_spec.rb": 0.7817962169647217, - "spec/controllers/concerns/has_orders_spec.rb": 0.09597063064575195, - "spec/features/officing/results_spec.rb": 2.6492855548858643, - "spec/models/poll/question_spec.rb": 0.09519433975219727, - "spec/features/organizations_spec.rb": 1.9025108814239502, - "spec/models/legislation/process_spec.rb": 0.09253501892089844, - "spec/lib/acts_as_paranoid_aliases_spec.rb": 0.2438969612121582, - "spec/features/officing_spec.rb": 1.4767742156982422, - "spec/lib/age_spec.rb": 0.0006227493286132812, - "spec/models/proposal_spec.rb": 5.535696983337402, - "spec/models/abilities/administrator_spec.rb": 2.2431821823120117, - "spec/models/poll/final_recount_spec.rb": 0.1787703037261963, - "spec/lib/graph_ql/query_type_creator_spec.rb": 0.012041091918945312, - "spec/models/verification/management/email_spec.rb": 0.06403493881225586, - "spec/models/flag_spec.rb": 0.46442556381225586, - "spec/features/tags/budget_investments_spec.rb": 23.748523235321045, - "spec/features/campaigns_spec.rb": 1.3289697170257568, - "spec/features/admin/activity_spec.rb": 7.763890743255615, - "spec/features/polls/questions_spec.rb": 2.61055326461792, - "spec/features/polls/polls_spec.rb": 2.313369035720825, - "spec/features/home_spec.rb": 0.9780440330505371, - "spec/models/poll/partial_result_spec.rb": 0.3302469253540039, - "spec/models/lock_spec.rb": 0.09437012672424316, - "spec/lib/graph_ql/api_types_creator_spec.rb": 0.0069005489349365234, - "spec/helpers/users_helper_spec.rb": 0.3229796886444092, - "spec/lib/local_census_spec.rb": 0.011091947555541992, - "spec/helpers/text_helper_spec.rb": 0.0005347728729248047, - "spec/customization_engine_spec.rb": 1.3630127906799316, - "spec/models/legislation/answer_spec.rb": 0.6906075477600098, - "spec/models/budget/ballot/line_spec.rb": 0.5054352283477783, - "spec/features/admin/proposals_spec.rb": 1.6710176467895508, - "spec/features/proposal_ballots_spec.rb": 0.3399386405944824, - "spec/models/site_customization/content_block_spec.rb": 0.014521121978759766, - "spec/features/admin/site_customization/content_blocks_spec.rb": 1.2890841960906982, - "spec/models/site_customization/page_spec.rb": 0.011090993881225586, - "spec/features/verification/email_spec.rb": 1.0991628170013428, - "spec/models/proposal_notification_spec.rb": 0.2569601535797119, - "spec/features/registration_form_spec.rb": 0.7285032272338867, - "spec/features/communities_spec.rb": 1.7133822441101074, - "spec/features/admin/moderators_spec.rb": 1.2922589778900146, - "spec/helpers/geozones_helper_spec.rb": 0.09812736511230469, - "spec/features/welcome_spec.rb": 1.5019774436950684, - "spec/controllers/comments_controller_spec.rb": 0.36508607864379883, - "spec/features/admin/legislation/questions_spec.rb": 3.81538724899292, - "spec/controllers/users/registrations_controller_spec.rb": 0.018311023712158203, - "spec/features/comments/debates_spec.rb": 12.265411615371704, - "spec/features/users_spec.rb": 11.05901050567627, - "spec/models/budget/group_spec.rb": 0.04957008361816406, - "spec/features/admin/poll/questions_spec.rb": 1.9041199684143066, - "spec/helpers/admin_helper_spec.rb": 0.00651097297668457, - "spec/models/abilities/organization_spec.rb": 0.24821996688842773, - "spec/features/moderation/comments_spec.rb": 6.318082332611084, - "spec/features/admin/poll/polls_spec.rb": 8.88325023651123, - "spec/models/activity_spec.rb": 0.9704892635345459, - "spec/features/verification/level_two_verification_spec.rb": 0.421832799911499, - "spec/models/poll/officer_assignment_spec.rb": 0.029267072677612305, - "spec/features/admin/verifications_spec.rb": 0.507885217666626, - "spec/mailers/mailer_spec.rb": 0.07406282424926758, - "spec/models/legislation/draft_version_spec.rb": 0.025011777877807617, - "spec/models/budget/investment_spec.rb": 9.084597826004028, - "spec/features/proposals_spec.rb": 183.71455550193787, - "spec/features/tags_spec.rb": 2.949070453643799, - "spec/features/tags/debates_spec.rb": 4.345250368118286, - "spec/features/admin/geozones_spec.rb": 1.935765027999878, - "spec/features/admin/feature_flags_spec.rb": 0.8357558250427246, - "spec/models/user_spec.rb": 2.436626434326172, - "spec/features/moderation/debates_spec.rb": 6.05112886428833, - "spec/models/legislation/annotation_spec.rb": 0.21427702903747559, - "spec/features/comments/proposals_spec.rb": 32.52879500389099, - "spec/controllers/legislation/answers_controller_spec.rb": 0.3481717109680176, - "spec/features/verification/sms_spec.rb": 1.2817349433898926, - "spec/features/admin/budget_investments_spec.rb": 16.1332266330719, - "spec/features/notifications_spec.rb": 14.857182264328003, - "spec/lib/tag_sanitizer_spec.rb": 0.0005936622619628906, - "spec/controllers/admin/api/stats_controller_spec.rb": 0.3948392868041992, - "spec/features/comments/topics_spec.rb": 29.646622896194458, - "spec/models/debate_spec.rb": 5.2278876304626465, - "spec/lib/email_digests_spec.rb": 0.6660604476928711, - "spec/models/abilities/everyone_spec.rb": 0.06328749656677246, - "spec/features/direct_messages_spec.rb": 1.3006987571716309, - "spec/features/debates_spec.rb": 28.736626386642456, - "spec/models/setting_spec.rb": 0.07938265800476074, - "spec/models/legislation/question_option_spec.rb": 0.058206796646118164, - "spec/models/verification/management/document_spec.rb": 0.013574600219726562, - "spec/models/poll/booth_spec.rb": 0.07824325561523438, - "spec/features/admin/legislation/draft_versions_spec.rb": 3.750009059906006, - "spec/features/admin/poll/officers_spec.rb": 1.4151291847229004, - "spec/features/moderation_spec.rb": 1.9578778743743896, - "spec/features/legislation/questions_spec.rb": 1.7689197063446045, - "spec/features/officing/residence_spec.rb": 0.971078634262085, - "spec/models/follow_spec.rb": 0.12199592590332031, - "spec/lib/census_api_spec.rb": 0.0019702911376953125, - "spec/models/tag_cloud_spec.rb": 1.5725350379943848, - "spec/models/budget_spec.rb": 0.2335052490234375, - "spec/features/management/localization_spec.rb": 1.1911811828613281, - "spec/features/legislation/draft_versions_spec.rb": 8.151643514633179, - "spec/models/budget/heading_spec.rb": 0.09901237487792969, - "spec/models/poll/poll_spec.rb": 0.46999382972717285, - "spec/models/custom/residence_spec.rb": 0.050164222717285156, - "spec/models/notification_spec.rb": 0.39408183097839355, - "spec/features/budgets/ballots_spec.rb": 27.406018257141113, - "spec/mailers/devise_mailer_spec.rb": 0.16486406326293945, - "spec/features/admin/debates_spec.rb": 1.546919345855713, - "spec/features/valuation/budgets_spec.rb": 0.2552778720855713, - "spec/models/abilities/common_spec.rb": 6.724466562271118, - "spec/models/residence_spec.rb": 0.24986696243286133, - "spec/features/officing/voters_spec.rb": 2.954087257385254, - "spec/models/vote_spec.rb": 1.3241477012634277, - "spec/lib/migrate_spending_proposals_to_investments_spec.rb": 1.1774518489837646, - "spec/controllers/management/users_controller_spec.rb": 0.007733821868896484, - "spec/helpers/proposals_helper_spec.rb": 0.21885180473327637, - "spec/features/ckeditor_spec.rb": 0.7726309299468994, - "spec/lib/census_caller_spec.rb": 0.009332895278930664, - "spec/features/tracks_spec.rb": 2.7082908153533936, - "spec/features/admin/budgets_spec.rb": 4.468225002288818, - "spec/features/admin/valuators_spec.rb": 1.3326430320739746, - "spec/features/admin/banners_spec.rb": 3.302579164505005, - "spec/features/account_spec.rb": 2.30243182182312, - "spec/features/budgets/budgets_spec.rb": 1.0318260192871094, - "spec/models/poll/answer_spec.rb": 0.11362218856811523, - "spec/features/comments/budget_investments_spec.rb": 16.92409658432007, - "spec/features/budgets/results_spec.rb": 2.589841365814209, - "spec/features/valuation_spec.rb": 2.126727819442749, - "spec/features/stats_spec.rb": 0.8516559600830078, - "spec/features/admin/poll/booths_spec.rb": 1.766916275024414, - "spec/models/legislation/process/phase_spec.rb": 0.0886683464050293, - "spec/models/budget/investment/milestone_spec.rb": 0.1419520378112793, - "spec/models/letter_spec.rb": 0.08197903633117676, - "spec/features/admin/stats_spec.rb": 3.6946730613708496, - "spec/models/identity_spec.rb": 0.004762887954711914, - "spec/features/verification/letter_spec.rb": 1.7480952739715576, - "spec/models/topic_spec.rb": 0.30414509773254395, - "spec/features/users_auth_spec.rb": 7.242254257202148, - "spec/lib/acts_as_taggable_on_spec.rb": 0.7477433681488037, - "spec/features/official_positions_spec.rb": 1.9427640438079834, - "spec/features/admin/newsletters_spec.rb": 0.22768402099609375, - "spec/features/admin/hidden_users_spec.rb": 1.4156956672668457, - "spec/features/comments/legislation_annotations_spec.rb": 18.616747856140137, - "spec/features/admin/site_customization/pages_spec.rb": 1.0219447612762451, - "spec/models/poll/shift_spec.rb": 0.2051677703857422, - "spec/models/geozone_spec.rb": 0.12972474098205566, - "spec/helpers/verification_helper_spec.rb": 0.0009250640869140625, - "spec/lib/cache_spec.rb": 0.06447911262512207, - "spec/features/verification/verification_path_spec.rb": 1.2300751209259033, - "spec/features/sessions_spec.rb": 0.3665180206298828, - "spec/controllers/management/base_controller_spec.rb": 0.019928932189941406, - "spec/features/verification/verified_user_spec.rb": 0.787623405456543, - "spec/models/direct_message_spec.rb": 0.49156641960144043, - "spec/features/admin/tags_spec.rb": 1.045637845993042, - "spec/features/admin/comments_spec.rb": 3.4312756061553955, - "spec/features/moderation/users_spec.rb": 1.1841027736663818, - "spec/models/budget/reclassified_vote_spec.rb": 0.22663235664367676, - "spec/features/admin/organizations_spec.rb": 3.4465878009796143, - "spec/features/proposal_notifications_spec.rb": 4.40612268447876, - "spec/features/emails_spec.rb": 13.047018051147461, - "spec/controllers/debates_controller_spec.rb": 0.3078582286834717, - "spec/features/budgets/investments_spec.rb": 126.55784440040588, - "spec/features/verification/residence_spec.rb": 1.8894774913787842, - "spec/models/abilities/moderator_spec.rb": 2.7029502391815186, - "spec/helpers/votes_helper_spec.rb": 0.363523006439209, - "spec/features/tags/proposals_spec.rb": 8.272820949554443, - "spec/models/signature_spec.rb": 1.6858570575714111, - "spec/models/legislation/process/publication_spec.rb": 0.0707387924194336, - "spec/models/community_spec.rb": 0.13965797424316406, - "spec/models/sms_spec.rb": 0.024147987365722656, - "spec/lib/graphql_spec.rb": 3.7293970584869385, - "spec/lib/tasks/communities_spec.rb": 0.17484474182128906, - "spec/features/management/proposals_spec.rb": 4.549585580825806, - "spec/models/document_spec.rb": 1.2667145729064941, - "spec/features/site_customization/content_blocks_spec.rb": 0.3020951747894287, - "spec/features/localization_spec.rb": 0.5679850578308105, - "spec/models/signature_sheet_spec.rb": 0.7970001697540283, - "spec/features/budgets/votes_spec.rb": 4.38911509513855, - "spec/features/verification/level_three_verification_spec.rb": 1.2754230499267578, - "spec/features/admin/users_spec.rb": 0.3584918975830078, - "spec/models/abilities/valuator_spec.rb": 1.1300320625305176, - "spec/models/officing/residence_spec.rb": 0.3599817752838135, - "spec/features/admin/officials_spec.rb": 0.940401554107666, - "spec/features/admin/settings_spec.rb": 0.37268495559692383, - "spec/models/ahoy/data_source_spec.rb": 0.04887723922729492, - "spec/helpers/settings_helper_spec.rb": 0.020088911056518555, - "spec/models/budget/result_spec.rb": 0.7962813377380371, - "spec/models/poll/null_result_spec.rb": 0.17995309829711914, - "spec/models/valuator_spec.rb": 0.02411341667175293, - "spec/lib/manager_authenticator_spec.rb": 0.0031435489654541016, - "spec/lib/tasks/settings_spec.rb": 0.07562613487243652, - "spec/controllers/legislation/annotations_controller_spec.rb": 0.712010383605957, - "spec/models/comment_spec.rb": 1.7274408340454102, - "spec/features/comments/legislation_questions_spec.rb": 15.219935894012451, - "spec/features/admin_spec.rb": 1.1390578746795654, - "spec/features/admin/poll/booth_assigments_spec.rb": 3.737426280975342, - "spec/controllers/pages_controller_spec.rb": 0.3043200969696045, - "spec/features/admin/administrators_spec.rb": 2.7916433811187744, - "spec/models/poll/total_result_spec.rb": 0.549537181854248, - "spec/features/management/managed_users_spec.rb": 4.38576078414917, - "spec/models/poll/officer_spec.rb": 0.49225711822509766, - "spec/features/user_invites_spec.rb": 0.21891093254089355, - "spec/helpers/application_helper_spec.rb": 0.13661718368530273, - "spec/features/management/account_spec.rb": 0.9717822074890137, - "spec/features/management/document_verifications_spec.rb": 1.0395607948303223, - "spec/features/admin/site_customization/images_spec.rb": 1.2623581886291504, - "spec/models/organization_spec.rb": 0.16587495803833008, - "spec/features/management/email_verifications_spec.rb": 0.46370506286621094, - "spec/features/legislation/processes_spec.rb": 3.2473270893096924, - "spec/features/admin/managers_spec.rb": 1.1836414337158203, - "spec/models/legislation/question_spec.rb": 0.4404168128967285, - "spec/features/management/budget_investments_spec.rb": 7.179029703140259, - "spec/features/admin/signature_sheets_spec.rb": 1.4004056453704834, - "spec/features/admin/poll/shifts_spec.rb": 2.6800806522369385, - "spec/i18n_spec.rb": 58.107173204422, - "spec/features/site_customization/custom_pages_spec.rb": 0.454498291015625, - "spec/features/admin/legislation/processes_spec.rb": 3.3492519855499268, - "spec/features/votes_spec.rb": 16.538654088974, - "spec/features/admin/budget_investment_milestones_spec.rb": 1.3747622966766357, - "spec/models/poll/white_result_spec.rb": 0.23045921325683594, - "spec/controllers/management/sessions_controller_spec.rb": 0.06758952140808105, - "spec/features/management/users_spec.rb": 2.044326066970825, - "spec/controllers/concerns/has_filters_spec.rb": 0.275907039642334, - "spec/features/moderation/proposals_spec.rb": 5.00596022605896, - "spec/lib/wysiwyg_sanitizer_spec.rb": 0.0016448497772216797, - "spec/models/budget/ballot_spec.rb": 0.6595156192779541, - "spec/models/poll/voter_spec.rb": 0.2982313632965088, - "spec/features/valuation/budget_investments_spec.rb": 6.490516185760498 + "spec/models/setting_spec.rb": 0.07869887351989746, + "spec/features/admin/managers_spec.rb": 5.029380798339844, + "spec/features/management/managed_users_spec.rb": 3.1642160415649414, + "spec/features/admin/poll/booths_spec.rb": 1.4152588844299316, + "spec/features/admin/comments_spec.rb": 3.889301061630249, + "spec/helpers/admin_helper_spec.rb": 0.005057334899902344, + "spec/models/abilities/moderator_spec.rb": 2.3274271488189697, + "spec/controllers/admin/api/stats_controller_spec.rb": 0.4249396324157715, + "spec/features/admin/organizations_spec.rb": 3.339292049407959, + "spec/features/admin/newsletters_spec.rb": 0.2460641860961914, + "spec/helpers/geozones_helper_spec.rb": 0.08249163627624512, + "spec/lib/graph_ql/api_types_creator_spec.rb": 0.006573915481567383, + "spec/features/emails_spec.rb": 18.91256046295166, + "spec/features/admin/hidden_users_spec.rb": 1.3854436874389648, + "spec/features/welcome_spec.rb": 1.1956276893615723, + "spec/features/sessions_spec.rb": 0.3943772315979004, + "spec/models/custom/residence_spec.rb": 0.07002687454223633, + "spec/models/poll/booth_spec.rb": 0.05489993095397949, + "spec/models/direct_message_spec.rb": 0.3973381519317627, + "spec/features/valuation/budget_investments_spec.rb": 7.6013023853302, + "spec/models/map_location_spec.rb": 0.12476563453674316, + "spec/models/budget/heading_spec.rb": 0.09248590469360352, + "spec/models/user_spec.rb": 2.9006423950195312, + "spec/features/admin/site_customization/content_blocks_spec.rb": 1.6733989715576172, + "spec/mailers/mailer_spec.rb": 0.08513784408569336, + "spec/models/site_customization/page_spec.rb": 0.015056133270263672, + "spec/features/management/budget_investments_spec.rb": 8.112786293029785, + "spec/features/admin/activity_spec.rb": 12.442089080810547, + "spec/features/registration_form_spec.rb": 1.0509357452392578, + "spec/controllers/legislation/annotations_controller_spec.rb": 0.8151364326477051, + "spec/lib/census_caller_spec.rb": 0.018165111541748047, + "spec/features/users_auth_spec.rb": 6.5102221965789795, + "spec/features/tags/proposals_spec.rb": 10.001718521118164, + "spec/features/account_spec.rb": 2.2510504722595215, + "spec/features/admin/users_spec.rb": 0.4342050552368164, + "spec/lib/cache_spec.rb": 0.057682037353515625, + "spec/features/valuation_spec.rb": 1.3436784744262695, + "spec/models/budget/investment_spec.rb": 12.89230751991272, + "spec/lib/migrate_spending_proposals_to_investments_spec.rb": 0.904367208480835, + "spec/helpers/settings_helper_spec.rb": 0.02300858497619629, + "spec/helpers/application_helper_spec.rb": 0.09152626991271973, + "spec/models/legislation/draft_version_spec.rb": 0.020322084426879883, + "spec/models/legislation/question_spec.rb": 0.3402721881866455, + "spec/models/document_spec.rb": 1.3238348960876465, + "spec/models/poll/question_spec.rb": 0.12588191032409668, + "spec/features/admin/poll/polls_spec.rb": 11.77881646156311, + "spec/lib/manager_authenticator_spec.rb": 0.006296873092651367, + "spec/features/admin/debates_spec.rb": 1.688420295715332, + "spec/features/moderation/debates_spec.rb": 5.343512773513794, + "spec/controllers/debates_controller_spec.rb": 0.40573883056640625, + "spec/models/tag_cloud_spec.rb": 1.6984672546386719, + "spec/models/budget/investment/milestone_spec.rb": 0.15051603317260742, + "spec/models/proposal_notification_spec.rb": 0.2914905548095703, + "spec/features/budgets/investments_spec.rb": 93.5263159275055, + "spec/i18n_spec.rb": 96.26275777816772, + "spec/models/community_spec.rb": 0.16270899772644043, + "spec/controllers/graphql_controller_spec.rb": 0.5831413269042969, + "spec/models/legislation/annotation_spec.rb": 0.16232728958129883, + "spec/lib/acts_as_taggable_on_spec.rb": 0.5747356414794922, + "spec/lib/census_api_spec.rb": 0.0021581649780273438, + "spec/features/moderation/comments_spec.rb": 6.70704984664917, + "spec/models/poll/voter_spec.rb": 0.32018303871154785, + "spec/features/proposal_notifications_spec.rb": 3.906450033187866, + "spec/models/budget/result_spec.rb": 0.8468267917633057, + "spec/helpers/users_helper_spec.rb": 0.25751638412475586, + "spec/features/valuation/budgets_spec.rb": 0.2564871311187744, + "spec/controllers/users/registrations_controller_spec.rb": 0.022383689880371094, + "spec/controllers/management/base_controller_spec.rb": 0.06711888313293457, + "spec/features/admin/officials_spec.rb": 0.893528938293457, + "spec/features/comments/topics_spec.rb": 29.998314142227173, + "spec/features/users_spec.rb": 11.885858297348022, + "spec/models/topic_spec.rb": 0.27634167671203613, + "spec/models/follow_spec.rb": 0.1256728172302246, + "spec/lib/local_census_spec.rb": 0.005529880523681641, + "spec/features/verification/sms_spec.rb": 1.5214743614196777, + "spec/helpers/comments_helper_spec.rb": 0.010879278182983398, + "spec/models/valuator_spec.rb": 0.02650904655456543, + "spec/features/proposal_ballots_spec.rb": 0.3937220573425293, + "spec/features/proposals_spec.rb": 142.48229122161865, + "spec/features/legislation/processes_spec.rb": 2.863476514816284, + "spec/features/ckeditor_spec.rb": 0.8433480262756348, + "spec/models/letter_spec.rb": 0.0695810317993164, + "spec/features/admin/budget_investments_spec.rb": 18.484699964523315, + "spec/models/officing/residence_spec.rb": 0.3402073383331299, + "spec/controllers/concerns/has_orders_spec.rb": 0.1844041347503662, + "spec/features/admin/legislation/processes_spec.rb": 4.020649433135986, + "spec/features/management/users_spec.rb": 2.288966178894043, + "spec/lib/tasks/communities_spec.rb": 0.15353775024414062, + "spec/models/abilities/organization_spec.rb": 0.24793481826782227, + "spec/features/polls/polls_spec.rb": 2.591568946838379, + "spec/features/communities_spec.rb": 1.6137127876281738, + "spec/models/legislation/process/phase_spec.rb": 0.07121586799621582, + "spec/features/officing_spec.rb": 0.979363203048706, + "spec/features/site_customization/custom_pages_spec.rb": 0.5588700771331787, + "spec/features/comments/legislation_questions_spec.rb": 14.133169889450073, + "spec/features/organizations_spec.rb": 0.46280837059020996, + "spec/controllers/legislation/answers_controller_spec.rb": 0.39082813262939453, + "spec/models/image_spec.rb": 7.636544466018677, + "spec/features/management/account_spec.rb": 1.150636911392212, + "spec/models/abilities/common_spec.rb": 5.959435701370239, + "spec/features/comments/debates_spec.rb": 13.69457721710205, + "spec/models/poll/shift_spec.rb": 0.19109749794006348, + "spec/features/site_customization/content_blocks_spec.rb": 0.3058288097381592, + "spec/models/poll/recount_spec.rb": 0.1983809471130371, + "spec/features/verification/level_two_verification_spec.rb": 0.4596068859100342, + "spec/features/verification/level_three_verification_spec.rb": 1.456559658050537, + "spec/lib/tasks/settings_spec.rb": 0.04654407501220703, + "spec/features/admin/budget_investment_milestones_spec.rb": 1.3974273204803467, + "spec/features/management/localization_spec.rb": 1.1653187274932861, + "spec/features/admin/tags_spec.rb": 1.0751111507415771, + "spec/features/officing/results_spec.rb": 1.2672057151794434, + "spec/features/admin/poll/booth_assigments_spec.rb": 4.1742753982543945, + "spec/models/poll/officer_assignment_spec.rb": 0.024514198303222656, + "spec/controllers/management/sessions_controller_spec.rb": 0.07244610786437988, + "spec/features/admin/signature_sheets_spec.rb": 1.4268932342529297, + "spec/models/debate_spec.rb": 4.550540924072266, + "spec/features/comments/proposals_spec.rb": 25.726442337036133, + "spec/models/poll/partial_result_spec.rb": 0.32181620597839355, + "spec/features/admin/legislation/draft_versions_spec.rb": 3.4613990783691406, + "spec/models/budget_spec.rb": 0.14807415008544922, + "spec/models/sms_spec.rb": 0.018825769424438477, + "spec/features/admin/proposals_spec.rb": 1.837270975112915, + "spec/models/geozone_spec.rb": 0.11852264404296875, + "spec/features/admin/banners_spec.rb": 3.0584604740142822, + "spec/models/legislation/process/publication_spec.rb": 0.06270265579223633, + "spec/lib/graph_ql/query_type_creator_spec.rb": 0.009456157684326172, + "spec/features/moderation_spec.rb": 1.001516342163086, + "spec/features/campaigns_spec.rb": 0.8359789848327637, + "spec/features/admin/verifications_spec.rb": 0.6421175003051758, + "spec/features/localization_spec.rb": 0.756089448928833, + "spec/features/admin/poll/questions_spec.rb": 41.59848093986511, + "spec/features/tags/debates_spec.rb": 3.4022486209869385, + "spec/helpers/text_helper_spec.rb": 0.0006229877471923828, + "spec/features/admin/moderators_spec.rb": 1.3467354774475098, + "spec/models/flag_spec.rb": 0.5202171802520752, + "spec/mailers/devise_mailer_spec.rb": 0.2588930130004883, + "spec/features/user_invites_spec.rb": 0.18819189071655273, + "spec/features/legislation/draft_versions_spec.rb": 9.352471828460693, + "spec/features/home_spec.rb": 3.0868682861328125, + "spec/features/budgets/results_spec.rb": 2.4918482303619385, + "spec/features/budgets/votes_spec.rb": 4.285862922668457, + "spec/features/comments/budget_investments_spec.rb": 16.1397545337677, + "spec/features/admin/stats_spec.rb": 2.678718090057373, + "spec/features/polls/questions_spec.rb": 2.594414472579956, + "spec/features/admin/poll/shifts_spec.rb": 4.629284143447876, + "spec/helpers/votes_helper_spec.rb": 0.31733107566833496, + "spec/models/ahoy/data_source_spec.rb": 0.04695439338684082, + "spec/models/residence_spec.rb": 0.20260858535766602, + "spec/features/admin_spec.rb": 0.6963987350463867, + "spec/controllers/comments_controller_spec.rb": 0.2683417797088623, + "spec/lib/age_spec.rb": 0.0007379055023193359, + "spec/models/legislation/answer_spec.rb": 0.14532899856567383, + "spec/features/tags_spec.rb": 3.0131027698516846, + "spec/features/admin/valuators_spec.rb": 1.0099408626556396, + "spec/models/notification_spec.rb": 0.37938618659973145, + "spec/views/welcome/index.html.erb_spec.rb": 0.1471250057220459, + "spec/customization_engine_spec.rb": 1.5587348937988281, + "spec/models/poll/officer_spec.rb": 0.2980079650878906, + "spec/features/budgets/ballots_spec.rb": 25.24861741065979, + "spec/controllers/concerns/has_filters_spec.rb": 0.1412961483001709, + "spec/features/moderation/proposals_spec.rb": 5.947849273681641, + "spec/features/management/document_verifications_spec.rb": 0.9574480056762695, + "spec/features/legislation/questions_spec.rb": 1.605849027633667, + "spec/models/proposal_spec.rb": 5.872406482696533, + "spec/models/legislation/question_option_spec.rb": 0.0395960807800293, + "spec/features/budgets/budgets_spec.rb": 0.8722023963928223, + "spec/lib/email_digests_spec.rb": 0.440814733505249, + "spec/features/official_positions_spec.rb": 1.5717194080352783, + "spec/features/officing/residence_spec.rb": 0.9819045066833496, + "spec/features/officing/voters_spec.rb": 2.078903913497925, + "spec/features/direct_messages_spec.rb": 1.6070659160614014, + "spec/models/abilities/everyone_spec.rb": 0.059804677963256836, + "spec/lib/acts_as_paranoid_aliases_spec.rb": 0.33096909523010254, + "spec/features/debates_spec.rb": 32.84718298912048, + "spec/features/votes_spec.rb": 18.217467069625854, + "spec/models/activity_spec.rb": 1.0154414176940918, + "spec/controllers/pages_controller_spec.rb": 0.19468045234680176, + "spec/features/admin/feature_flags_spec.rb": 0.726452112197876, + "spec/models/signature_sheet_spec.rb": 0.6403882503509521, + "spec/features/admin/poll/officers_spec.rb": 1.2912020683288574, + "spec/models/lock_spec.rb": 0.08562397956848145, + "spec/helpers/proposals_helper_spec.rb": 0.17275524139404297, + "spec/features/tags/budget_investments_spec.rb": 14.154245615005493, + "spec/models/vote_spec.rb": 0.9258472919464111, + "spec/features/admin/site_customization/pages_spec.rb": 1.0365827083587646, + "spec/features/moderation/users_spec.rb": 1.3000907897949219, + "spec/features/comments/legislation_annotations_spec.rb": 19.67066717147827, + "spec/features/admin/legislation/questions_spec.rb": 4.043334007263184, + "spec/models/comment_spec.rb": 1.6633994579315186, + "spec/features/admin/site_customization/images_spec.rb": 1.2299704551696777, + "spec/models/abilities/valuator_spec.rb": 1.1985805034637451, + "spec/models/organization_spec.rb": 0.12121891975402832, + "spec/models/budget/ballot_spec.rb": 0.6403298377990723, + "spec/lib/wysiwyg_sanitizer_spec.rb": 0.0018651485443115234, + "spec/features/stats_spec.rb": 0.8169982433319092, + "spec/models/poll/answer_spec.rb": 0.13266730308532715, + "spec/features/admin/settings_spec.rb": 3.1228368282318115, + "spec/features/verification/verification_path_spec.rb": 1.1146795749664307, + "spec/controllers/management/users_controller_spec.rb": 0.004178762435913086, + "spec/models/direct_upload_spec.rb": 1.1311051845550537, + "spec/features/management/email_verifications_spec.rb": 0.3727388381958008, + "spec/models/abilities/administrator_spec.rb": 2.355985164642334, + "spec/models/budget/ballot/line_spec.rb": 0.49976515769958496, + "spec/features/verification/letter_spec.rb": 1.5464122295379639, + "spec/features/notifications_spec.rb": 19.54401397705078, + "spec/features/admin/administrators_spec.rb": 1.7901337146759033, + "spec/models/signature_spec.rb": 1.5397937297821045, + "spec/models/identity_spec.rb": 0.0023458003997802734, + "spec/models/verification/management/document_spec.rb": 0.017922163009643555, + "spec/models/legislation/process_spec.rb": 0.09648776054382324, + "spec/models/budget/group_spec.rb": 0.049637794494628906, + "spec/models/verification/management/email_spec.rb": 0.057023048400878906, + "spec/helpers/verification_helper_spec.rb": 0.0009088516235351562, + "spec/features/verification/residence_spec.rb": 2.2246382236480713, + "spec/features/tracks_spec.rb": 2.320988178253174, + "spec/lib/tag_sanitizer_spec.rb": 0.0005729198455810547, + "spec/features/admin/budgets_spec.rb": 4.4486541748046875, + "spec/models/site_customization/content_block_spec.rb": 0.010473012924194336, + "spec/features/verification/email_spec.rb": 0.5266687870025635, + "spec/models/budget/reclassified_vote_spec.rb": 0.19786882400512695, + "spec/features/management/proposals_spec.rb": 4.107697486877441, + "spec/models/poll/poll_spec.rb": 0.38217735290527344, + "spec/features/admin/geozones_spec.rb": 1.561723232269287, + "spec/lib/graphql_spec.rb": 3.063258647918701, + "spec/features/verification/verified_user_spec.rb": 0.8179008960723877 } \ No newline at end of file diff --git a/spec/factories.rb b/spec/factories.rb index 30159f85a..93f00d27a 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -554,21 +554,6 @@ FactoryGirl.define do answer { question.valid_answers.sample } end - factory :poll_white_result, class: 'Poll::WhiteResult' do - association :author, factory: :user - origin { 'web' } - end - - factory :poll_null_result, class: 'Poll::NullResult' do - association :author, factory: :user - origin { 'web' } - end - - factory :poll_total_result, class: 'Poll::TotalResult' do - association :author, factory: :user - origin { 'web' } - end - factory :poll_recount, class: 'Poll::Recount' do association :author, factory: :user origin { 'web' } diff --git a/spec/models/poll/null_result_spec.rb b/spec/models/poll/null_result_spec.rb deleted file mode 100644 index 746b48377..000000000 --- a/spec/models/poll/null_result_spec.rb +++ /dev/null @@ -1,70 +0,0 @@ -require 'rails_helper' - -describe Poll::NullResult do - - describe "logging changes" do - it "should update amount_log if amount changes" do - null_result = create(:poll_null_result, amount: 33) - - expect(null_result.amount_log).to eq("") - - null_result.amount = 33 - null_result.save - null_result.amount = 32 - null_result.save - null_result.amount = 34 - null_result.save - - expect(null_result.amount_log).to eq(":33:32") - end - - it "should update officer_assignment_id_log if amount changes" do - null_result = create(:poll_null_result, amount: 33) - - expect(null_result.amount_log).to eq("") - expect(null_result.officer_assignment_id_log).to eq("") - - null_result.amount = 33 - null_result.officer_assignment = create(:poll_officer_assignment, id: 101) - null_result.save - - null_result.amount = 32 - null_result.officer_assignment = create(:poll_officer_assignment, id: 102) - null_result.save - - null_result.amount = 34 - null_result.officer_assignment = create(:poll_officer_assignment, id: 103) - null_result.save - - expect(null_result.amount_log).to eq(":33:32") - expect(null_result.officer_assignment_id_log).to eq(":101:102") - end - - it "should update author_id if amount changes" do - null_result = create(:poll_null_result, amount: 33) - - expect(null_result.amount_log).to eq("") - expect(null_result.author_id_log).to eq("") - - author_A = create(:poll_officer).user - author_B = create(:poll_officer).user - author_C = create(:poll_officer).user - - null_result.amount = 33 - null_result.author_id = author_A.id - null_result.save! - - null_result.amount = 32 - null_result.author_id = author_B.id - null_result.save! - - null_result.amount = 34 - null_result.author_id = author_C.id - null_result.save! - - expect(null_result.amount_log).to eq(":33:32") - expect(null_result.author_id_log).to eq(":#{author_A.id}:#{author_B.id}") - end - end - -end \ No newline at end of file diff --git a/spec/models/poll/total_result_spec.rb b/spec/models/poll/total_result_spec.rb deleted file mode 100644 index baa877227..000000000 --- a/spec/models/poll/total_result_spec.rb +++ /dev/null @@ -1,70 +0,0 @@ -require 'rails_helper' - -describe Poll::TotalResult do - - describe "logging changes" do - it "should update amount_log if amount changes" do - total_result = create(:poll_total_result, amount: 33) - - expect(total_result.amount_log).to eq("") - - total_result.amount = 33 - total_result.save - total_result.amount = 32 - total_result.save - total_result.amount = 34 - total_result.save - - expect(total_result.amount_log).to eq(":33:32") - end - - it "should update officer_assignment_id_log if amount changes" do - total_result = create(:poll_total_result, amount: 33) - - expect(total_result.amount_log).to eq("") - expect(total_result.officer_assignment_id_log).to eq("") - - total_result.amount = 33 - total_result.officer_assignment = create(:poll_officer_assignment, id: 101) - total_result.save - - total_result.amount = 32 - total_result.officer_assignment = create(:poll_officer_assignment, id: 102) - total_result.save - - total_result.amount = 34 - total_result.officer_assignment = create(:poll_officer_assignment, id: 103) - total_result.save - - expect(total_result.amount_log).to eq(":33:32") - expect(total_result.officer_assignment_id_log).to eq(":101:102") - end - - it "should update author_id if amount changes" do - total_result = create(:poll_total_result, amount: 33) - - expect(total_result.amount_log).to eq("") - expect(total_result.author_id_log).to eq("") - - author_A = create(:poll_officer).user - author_B = create(:poll_officer).user - author_C = create(:poll_officer).user - - total_result.amount = 33 - total_result.author_id = author_A.id - total_result.save! - - total_result.amount = 32 - total_result.author_id = author_B.id - total_result.save! - - total_result.amount = 34 - total_result.author_id = author_C.id - total_result.save! - - expect(total_result.amount_log).to eq(":33:32") - expect(total_result.author_id_log).to eq(":#{author_A.id}:#{author_B.id}") - end - end - -end diff --git a/spec/models/poll/white_result_spec.rb b/spec/models/poll/white_result_spec.rb deleted file mode 100644 index 687c4ebe1..000000000 --- a/spec/models/poll/white_result_spec.rb +++ /dev/null @@ -1,70 +0,0 @@ -require 'rails_helper' - -describe Poll::WhiteResult do - - describe "logging changes" do - it "should update amount_log if amount changes" do - white_result = create(:poll_white_result, amount: 33) - - expect(white_result.amount_log).to eq("") - - white_result.amount = 33 - white_result.save - white_result.amount = 32 - white_result.save - white_result.amount = 34 - white_result.save - - expect(white_result.amount_log).to eq(":33:32") - end - - it "should update officer_assignment_id_log if amount changes" do - white_result = create(:poll_white_result, amount: 33) - - expect(white_result.amount_log).to eq("") - expect(white_result.officer_assignment_id_log).to eq("") - - white_result.amount = 33 - white_result.officer_assignment = create(:poll_officer_assignment, id: 21) - white_result.save - - white_result.amount = 32 - white_result.officer_assignment = create(:poll_officer_assignment, id: 22) - white_result.save - - white_result.amount = 34 - white_result.officer_assignment = create(:poll_officer_assignment, id: 23) - white_result.save - - expect(white_result.amount_log).to eq(":33:32") - expect(white_result.officer_assignment_id_log).to eq(":21:22") - end - - it "should update author_id if amount changes" do - white_result = create(:poll_white_result, amount: 33) - - expect(white_result.amount_log).to eq("") - expect(white_result.author_id_log).to eq("") - - author_A = create(:poll_officer).user - author_B = create(:poll_officer).user - author_C = create(:poll_officer).user - - white_result.amount = 33 - white_result.author_id = author_A.id - white_result.save! - - white_result.amount = 32 - white_result.author_id = author_B.id - white_result.save! - - white_result.amount = 34 - white_result.author_id = author_C.id - white_result.save! - - expect(white_result.amount_log).to eq(":33:32") - expect(white_result.author_id_log).to eq(":#{author_A.id}:#{author_B.id}") - end - end - -end \ No newline at end of file From c0dcedcd0fcbda471ab87c36e9cf04716249ca62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 2 Oct 2017 16:39:09 +0200 Subject: [PATCH 251/765] Tests fix --- spec/features/admin/poll/shifts_spec.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spec/features/admin/poll/shifts_spec.rb b/spec/features/admin/poll/shifts_spec.rb index 9dea5f8d1..ceccc1867 100644 --- a/spec/features/admin/poll/shifts_spec.rb +++ b/spec/features/admin/poll/shifts_spec.rb @@ -119,13 +119,14 @@ feature 'Admin shifts' do end scenario "Destroy" do - poll = create(:poll) + poll = create(:poll, :current) booth = create(:poll_booth) + assignment = create(:poll_booth_assignment, poll: poll, booth: booth) officer = create(:poll_officer) shift = create(:poll_shift, officer: officer, booth: booth) - visit admin_booths_path + visit available_admin_booths_path within("#booth_#{booth.id}") do click_link "Manage shifts" From bc92b8d2cd53153994ccc1365acc342354e1810e Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 2 Oct 2017 17:52:13 +0200 Subject: [PATCH 252/765] Update secrets.yml.example file --- config/secrets.yml.example | 74 ++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 23 deletions(-) diff --git a/config/secrets.yml.example b/config/secrets.yml.example index 6f01d715c..3939d7b80 100644 --- a/config/secrets.yml.example +++ b/config/secrets.yml.example @@ -1,46 +1,74 @@ default: &default - secret_key_base: "56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4" + secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4 + +maps: &maps map_tiles_provider: "//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" map_tiles_provider_attribution: "© OpenStreetMap contributors" -development: - <<: *default - -test: - <<: *default - -staging: - server_name: "" - <<: *default - -production: &production - secret_key_base: "817232feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4" - +apis: &apis census_api_end_point: "" census_api_institution_code: "" census_api_portal_name: "" census_api_user_code: "" - sms_end_point: "" sms_username: "" sms_password: "" +http_basic_auth: &http_basic_auth + http_basic_auth: true + + +development: + http_basic_username: "dev" + http_basic_password: "pass" + <<: *default + +test: + <<: *default + <<: *maps + +staging: + secret_key_base: "" + server_name: "" + rollbar_server_token: "" http_basic_username: "" http_basic_password: "" + managers_url: "" + managers_application_key: "" + <<: *default + <<: *maps + <<: *apis +preproduction: + secret_key_base: "" + server_name: "" + rollbar_server_token: "" + http_basic_username: "" + http_basic_password: "" + managers_url: "" + managers_application_key: "" twitter_key: "" twitter_secret: "" facebook_key: "" facebook_secret: "" google_oauth2_key: "" google_oauth2_secret: "" + <<: *maps + <<: *apis +production: + secret_key_base: "" + server_name: "" rollbar_server_token: "" - server_name: "" - - map_tiles_provider: "//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" - map_tiles_provider_attribution: "©     OpenStreetMap contributors" - -preproduction: - server_name: "" - <<: *production + http_basic_username: "" + http_basic_password: "" + managers_url: "" + managers_application_key: "" + twitter_key: "" + twitter_secret: "" + facebook_key: "" + facebook_secret: "" + google_oauth2_key: "" + google_oauth2_secret: "" + <<: *maps + <<: *apis From 92605613322f043ab57f6f042d9760d1c986db9b Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 2 Oct 2017 17:55:56 +0200 Subject: [PATCH 253/765] Update deploy secrets example file --- config/deploy-secrets.yml.example | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/config/deploy-secrets.yml.example b/config/deploy-secrets.yml.example index 671263b1c..175026cb1 100644 --- a/config/deploy-secrets.yml.example +++ b/config/deploy-secrets.yml.example @@ -1,25 +1,28 @@ staging: deploy_to: "/var/www/consul" ssh_port: 21 - server: staging.consul.es - user: xxxxx - full_app_name: consul - server_name: staging.consul.es - db_server: postgre.consul.es + server: "staging.consul.es" + db_server: "postgre.consul.es" + user: "xxxxx" + server_name: "staging.consul.es" + full_app_name: "consul" preproduction: deploy_to: "/var/www/consul" ssh_port: 2222 server1: xxx.xxx.xxx.xxx server2: xxx.xxx.xxx.xxx - user: xxxxx - full_app_name: consul db_server: xxx.xxx.xxx.xxx + user: xxxxx + server_name: pre.consul.es + full_app_name: "consul" production: deploy_to: "/var/www/consul" - ssh_port: 2222 - server: xxx.xxx.xxx.xxx - user: xxxxx - full_app_name: consul - + ssh_port: 22 + server1: xxx.xxx.xxx.xxx + server2: xxx.xxx.xxx.xxx + db_server: xxx.xxx.xxx.xxx + user: "deploy" + server_name: "consul.es" + full_app_name: "consul" From 5aa063668fc6fb799cb694e6866e082b101d0123 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 2 Oct 2017 19:57:02 +0200 Subject: [PATCH 254/765] Remove no longer used befor block with comments --- spec/features/home_spec.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/spec/features/home_spec.rb b/spec/features/home_spec.rb index 8b9cf3e4e..cb5349814 100644 --- a/spec/features/home_spec.rb +++ b/spec/features/home_spec.rb @@ -22,11 +22,6 @@ feature "Home" do feature "For signed in users" do - before do - # user = create(:user) - # login_as(user) - end - feature "Recommended" do background do From e464985114c7e351ec1db79246d46c31df685f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 2 Oct 2017 20:34:38 +0200 Subject: [PATCH 255/765] Minor fix Removed unnecessary markdown --- app/views/admin/poll/polls/_questions.html.erb | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/views/admin/poll/polls/_questions.html.erb b/app/views/admin/poll/polls/_questions.html.erb index 5088572e1..fb92a4e43 100644 --- a/app/views/admin/poll/polls/_questions.html.erb +++ b/app/views/admin/poll/polls/_questions.html.erb @@ -9,7 +9,6 @@ <%= t('admin.polls.show.table_title') %> - <%= t('admin.polls.show.table_assignment') %> <% @poll.questions.each do |question| %> @@ -19,8 +18,6 @@ <%= link_to question.title, admin_question_path(question) %> - - <% end %> From d401a2cd9272c24d7a094a5f92084008423bdbdc Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 2 Oct 2017 21:16:22 +0200 Subject: [PATCH 256/765] Add default 0 value for Poll Recount amounts --- .../20171002191347_add_default_to_recount_amounts.rb | 7 +++++++ db/schema.rb | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20171002191347_add_default_to_recount_amounts.rb diff --git a/db/migrate/20171002191347_add_default_to_recount_amounts.rb b/db/migrate/20171002191347_add_default_to_recount_amounts.rb new file mode 100644 index 000000000..b90e86aae --- /dev/null +++ b/db/migrate/20171002191347_add_default_to_recount_amounts.rb @@ -0,0 +1,7 @@ +class AddDefaultToRecountAmounts < ActiveRecord::Migration + def change + change_column_default :poll_recounts, :white_amount, 0 + change_column_default :poll_recounts, :null_amount, 0 + change_column_default :poll_recounts, :total_amount, 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index e859a487f..ebcdfe5dc 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: 20171002122312) do +ActiveRecord::Schema.define(version: 20171002191347) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -698,11 +698,11 @@ ActiveRecord::Schema.define(version: 20171002122312) do t.integer "officer_assignment_id" t.text "officer_assignment_id_log", default: "" t.text "author_id_log", default: "" - t.integer "white_amount" + t.integer "white_amount", default: 0 t.text "white_amount_log", default: "" - t.integer "null_amount" + t.integer "null_amount", default: 0 t.text "null_amount_log", default: "" - t.integer "total_amount" + t.integer "total_amount", default: 0 t.text "total_amount_log", default: "" end From 9ae72387fe9feba12de561238ef4fc9fa9b79eb0 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 2 Oct 2017 23:29:57 +0200 Subject: [PATCH 257/765] Remove remove_question ability from admin on Poll --- app/models/abilities/administrator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/abilities/administrator.rb b/app/models/abilities/administrator.rb index 4278d4f8d..2d1a0ee22 100644 --- a/app/models/abilities/administrator.rb +++ b/app/models/abilities/administrator.rb @@ -56,7 +56,7 @@ module Abilities can [:index, :create, :edit, :update, :destroy], Geozone - can [:read, :create, :update, :destroy, :add_question, :remove_question, :search_booths, :search_questions, :search_officers], Poll + can [:read, :create, :update, :destroy, :add_question, :search_booths, :search_questions, :search_officers], Poll can [:read, :create, :update, :destroy, :available], Poll::Booth can [:search, :create, :index, :destroy], ::Poll::Officer can [:create, :destroy], ::Poll::BoothAssignment From 6c998768e8e4a7f8dcd853140d8ceefaca06a946 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 3 Oct 2017 00:19:12 +0200 Subject: [PATCH 258/765] Fix Poll Recount model spec after default amount value added --- app/models/poll/recount.rb | 8 ++++---- spec/models/poll/recount_spec.rb | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/models/poll/recount.rb b/app/models/poll/recount.rb index 97a909d1f..74a6fe937 100644 --- a/app/models/poll/recount.rb +++ b/app/models/poll/recount.rb @@ -1,6 +1,6 @@ class Poll::Recount < ActiveRecord::Base - VALID_ORIGINS = %w{ web booth letter } + VALID_ORIGINS = %w{web booth letter}.freeze belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' belongs_to :booth_assignment @@ -22,7 +22,7 @@ class Poll::Recount < ActiveRecord::Base [:white, :null, :total].each do |amount| next unless send("#{amount}_amount_changed?") && send("#{amount}_amount_was").present? - self["#{amount}_amount_log"] += ":#{send("#{amount}_amount_was").to_s}" + self["#{amount}_amount_log"] += ":#{send("#{amount}_amount_was")}" amounts_changed = true end @@ -30,7 +30,7 @@ class Poll::Recount < ActiveRecord::Base end def update_officer_author - self.officer_assignment_id_log += ":#{officer_assignment_id_was.to_s}" - self.author_id_log += ":#{author_id_was.to_s}" + self.officer_assignment_id_log += ":#{officer_assignment_id_was}" + self.author_id_log += ":#{author_id_was}" end end diff --git a/spec/models/poll/recount_spec.rb b/spec/models/poll/recount_spec.rb index 1ca0b41eb..bec531d96 100644 --- a/spec/models/poll/recount_spec.rb +++ b/spec/models/poll/recount_spec.rb @@ -17,7 +17,7 @@ describe Poll::Recount do poll_recount.white_amount = 34 poll_recount.save - expect(poll_recount.white_amount_log).to eq(":33:32") + expect(poll_recount.white_amount_log).to eq(":0:33:32") end it "should update null_amount_log if null_amount changes" do @@ -32,7 +32,7 @@ describe Poll::Recount do poll_recount.null_amount = 34 poll_recount.save - expect(poll_recount.null_amount_log).to eq(":33:32") + expect(poll_recount.null_amount_log).to eq(":0:33:32") end it "should update total_amount_log if total_amount changes" do @@ -47,7 +47,7 @@ describe Poll::Recount do poll_recount.total_amount = 34 poll_recount.save - expect(poll_recount.total_amount_log).to eq(":33:32") + expect(poll_recount.total_amount_log).to eq(":0:33:32") end it "should update officer_assignment_id_log if amount changes" do @@ -68,7 +68,7 @@ describe Poll::Recount do poll_recount.officer_assignment = create(:poll_officer_assignment, id: 103) poll_recount.save - expect(poll_recount.white_amount_log).to eq(":33:32") + expect(poll_recount.white_amount_log).to eq(":0:33:32") expect(poll_recount.officer_assignment_id_log).to eq(":101:102") end @@ -78,24 +78,24 @@ describe Poll::Recount do expect(poll_recount.white_amount_log).to eq("") expect(poll_recount.author_id_log).to eq("") - author_A = create(:poll_officer).user - author_B = create(:poll_officer).user - author_C = create(:poll_officer).user + first_author = create(:poll_officer).user + second_author = create(:poll_officer).user + third_author = create(:poll_officer).user poll_recount.white_amount = 33 - poll_recount.author_id = author_A.id + poll_recount.author_id = first_author.id poll_recount.save! poll_recount.white_amount = 32 - poll_recount.author_id = author_B.id + poll_recount.author_id = second_author.id poll_recount.save! poll_recount.white_amount = 34 - poll_recount.author_id = author_C.id + poll_recount.author_id = third_author.id poll_recount.save! - expect(poll_recount.white_amount_log).to eq(":33:32") - expect(poll_recount.author_id_log).to eq(":#{author_A.id}:#{author_B.id}") + expect(poll_recount.white_amount_log).to eq(":0:33:32") + expect(poll_recount.author_id_log).to eq(":#{first_author.id}:#{second_author.id}:#{third_author.id}") end end From bf61dffd4b354e3b0d8fe016265e652151e2ef8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 3 Oct 2017 10:47:48 +0200 Subject: [PATCH 259/765] Removed files that are not used --- .../admin/poll/polls_controller.rb | 9 +---- .../poll/polls/_search_questions.html.erb | 17 ---------- .../polls/_search_questions_results.html.erb | 33 ------------------- .../admin/poll/polls/search_questions.js.erb | 1 - 4 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 app/views/admin/poll/polls/_search_questions.html.erb delete mode 100644 app/views/admin/poll/polls/_search_questions_results.html.erb delete mode 100644 app/views/admin/poll/polls/search_questions.js.erb diff --git a/app/controllers/admin/poll/polls_controller.rb b/app/controllers/admin/poll/polls_controller.rb index 3b3c4f7bd..fb4b4d127 100644 --- a/app/controllers/admin/poll/polls_controller.rb +++ b/app/controllers/admin/poll/polls_controller.rb @@ -1,7 +1,7 @@ class Admin::Poll::PollsController < Admin::Poll::BaseController load_and_authorize_resource - before_action :load_search, only: [:search_booths, :search_questions, :search_officers] + before_action :load_search, only: [:search_booths, :search_officers] before_action :load_geozones, only: [:new, :create, :edit, :update] def index @@ -47,13 +47,6 @@ class Admin::Poll::PollsController < Admin::Poll::BaseController redirect_to admin_poll_path(@poll), notice: notice end - def search_questions - @questions = ::Poll::Question.where("poll_id IS ? OR poll_id != ?", nil, @poll.id).search(search: @search).order(title: :asc) - respond_to do |format| - format.js - end - end - private def load_geozones diff --git a/app/views/admin/poll/polls/_search_questions.html.erb b/app/views/admin/poll/polls/_search_questions.html.erb deleted file mode 100644 index 659cdcd37..000000000 --- a/app/views/admin/poll/polls/_search_questions.html.erb +++ /dev/null @@ -1,17 +0,0 @@ -
    -
    - <%= form_tag(search_questions_admin_poll_path(@poll), method: :get, remote: true) do |f| %> -
    - <%= text_field_tag :search, - @search, - placeholder: t("admin.shared.poll_questions_search.placeholder"), id: "search-questions" %> - -
    - <%= submit_tag t("admin.shared.poll_questions_search.button"), class: "button" %> -
    -
    - <% end %> -
    -
    - -
    diff --git a/app/views/admin/poll/polls/_search_questions_results.html.erb b/app/views/admin/poll/polls/_search_questions_results.html.erb deleted file mode 100644 index f6f11e1f1..000000000 --- a/app/views/admin/poll/polls/_search_questions_results.html.erb +++ /dev/null @@ -1,33 +0,0 @@ -<% if @questions.blank? %> -
    - <%= t('admin.shared.no_search_results') %> -
    -<% else %> -

    <%= t('admin.shared.search_results') %>

    -<% end %> - -<% if @questions.any? %> - - - - - - - - - <% @questions.each do |question| %> - - - - - <% end %> - -
    <%= t("admin.polls.show.table_name") %><%= t("admin.polls.show.table_assignment") %>
    - <%= question.title %> - - <%= link_to t("admin.polls.show.add_question"), - add_question_admin_poll_path(poll_id: @poll.id, question_id: question.id), - method: :patch, - class: "button hollow" %> -
    -<% end %> diff --git a/app/views/admin/poll/polls/search_questions.js.erb b/app/views/admin/poll/polls/search_questions.js.erb deleted file mode 100644 index 05f5c5167..000000000 --- a/app/views/admin/poll/polls/search_questions.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#search-questions-results").html("<%= j render 'search_questions_results' %>"); \ No newline at end of file From e6b5de77fe8889e9d8a9f18c6b1e55b0e4a58f95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 3 Oct 2017 10:50:18 +0200 Subject: [PATCH 260/765] Removed files that are not being used --- app/models/abilities/administrator.rb | 2 +- config/routes.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/abilities/administrator.rb b/app/models/abilities/administrator.rb index 2d1a0ee22..bfccc5d52 100644 --- a/app/models/abilities/administrator.rb +++ b/app/models/abilities/administrator.rb @@ -56,7 +56,7 @@ module Abilities can [:index, :create, :edit, :update, :destroy], Geozone - can [:read, :create, :update, :destroy, :add_question, :search_booths, :search_questions, :search_officers], Poll + can [:read, :create, :update, :destroy, :add_question, :search_booths, :search_officers], Poll can [:read, :create, :update, :destroy, :available], Poll::Booth can [:search, :create, :index, :destroy], ::Poll::Officer can [:create, :destroy], ::Poll::BoothAssignment diff --git a/config/routes.rb b/config/routes.rb index d085acd2a..51e1f351d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -273,7 +273,6 @@ Rails.application.routes.draw do scope module: :poll do resources :polls do - get :search_questions, on: :member patch :add_question, on: :member resources :booth_assignments, only: [:index, :show, :create, :destroy] do From ccb80ce96705551aec6b1707e87cc32233d8c375 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 3 Oct 2017 11:40:36 +0200 Subject: [PATCH 261/765] Fix recount spec to take into account already existing values and mandatory officer_assigment --- spec/models/poll/recount_spec.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spec/models/poll/recount_spec.rb b/spec/models/poll/recount_spec.rb index bec531d96..2a5ed16a7 100644 --- a/spec/models/poll/recount_spec.rb +++ b/spec/models/poll/recount_spec.rb @@ -3,7 +3,9 @@ require 'rails_helper' describe Poll::Recount do describe "logging changes" do - let(:poll_recount) { create(:poll_recount) } + let(:author) { create(:user) } + let(:officer_assignment) { create(:poll_officer_assignment) } + let(:poll_recount) { create(:poll_recount, author: author, officer_assignment: officer_assignment) } it "should update white_amount_log if white_amount changes" do poll_recount.white_amount = 33 @@ -69,7 +71,7 @@ describe Poll::Recount do poll_recount.save expect(poll_recount.white_amount_log).to eq(":0:33:32") - expect(poll_recount.officer_assignment_id_log).to eq(":101:102") + expect(poll_recount.officer_assignment_id_log).to eq(":#{officer_assignment.id}:101:102") end it "should update author_id if amount changes" do @@ -95,7 +97,7 @@ describe Poll::Recount do poll_recount.save! expect(poll_recount.white_amount_log).to eq(":0:33:32") - expect(poll_recount.author_id_log).to eq(":#{first_author.id}:#{second_author.id}:#{third_author.id}") + expect(poll_recount.author_id_log).to eq(":#{author.id}:#{first_author.id}:#{second_author.id}") end end From 4e85e136d1da2095646a903b8d30ea7ac8f7d9b1 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 3 Oct 2017 12:02:05 +0200 Subject: [PATCH 262/765] Remove OfficerAssignment composed index --- app/models/poll/officer_assignment.rb | 2 +- ...20171003095936_remove_officer_assigment_composed_index.rb | 5 +++++ db/schema.rb | 3 +-- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20171003095936_remove_officer_assigment_composed_index.rb diff --git a/app/models/poll/officer_assignment.rb b/app/models/poll/officer_assignment.rb index 9fcf02890..417e6a150 100644 --- a/app/models/poll/officer_assignment.rb +++ b/app/models/poll/officer_assignment.rb @@ -8,7 +8,7 @@ class Poll validates :officer_id, presence: true validates :booth_assignment_id, presence: true - validates :date, presence: true, uniqueness: { scope: [:officer_id, :booth_assignment_id] } + validates :date, presence: true delegate :poll_id, :booth_id, to: :booth_assignment diff --git a/db/migrate/20171003095936_remove_officer_assigment_composed_index.rb b/db/migrate/20171003095936_remove_officer_assigment_composed_index.rb new file mode 100644 index 000000000..874672f84 --- /dev/null +++ b/db/migrate/20171003095936_remove_officer_assigment_composed_index.rb @@ -0,0 +1,5 @@ +class RemoveOfficerAssigmentComposedIndex < ActiveRecord::Migration + def change + remove_index "poll_officer_assignments", name: "index_poll_officer_assignments_on_officer_id_and_date" + end +end diff --git a/db/schema.rb b/db/schema.rb index 5c5b99d11..e75c2aac3 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: 20171002191347) do +ActiveRecord::Schema.define(version: 20171003095936) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -639,7 +639,6 @@ ActiveRecord::Schema.define(version: 20171002191347) do end add_index "poll_officer_assignments", ["booth_assignment_id"], name: "index_poll_officer_assignments_on_booth_assignment_id", using: :btree - add_index "poll_officer_assignments", ["officer_id", "date"], name: "index_poll_officer_assignments_on_officer_id_and_date", using: :btree add_index "poll_officer_assignments", ["officer_id"], name: "index_poll_officer_assignments_on_officer_id", using: :btree create_table "poll_officers", force: :cascade do |t| From 1afd97b6875dfe16e6af4d053d4ec6f566438c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 3 Oct 2017 12:09:02 +0200 Subject: [PATCH 263/765] Removed unnused translations --- config/locales/en/admin.yml | 3 --- config/locales/es/admin.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 008f36f3e..a3751615a 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -566,10 +566,7 @@ en: results_tab: Results no_questions: "There are no questions assigned to this poll." questions_title: "List of questions" - add_question: "Include question" table_title: "Title" - table_assignment: "Assignment" - table_name: "Name" flash: question_added: "Question added to this poll" error_on_question_added: "Question could not be assigned to this poll" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 4a4616338..f95c2d39f 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -566,10 +566,7 @@ es: results_tab: Resultados no_questions: "No hay preguntas asignadas a esta votación." questions_title: "Listado de preguntas asignadas" - add_question: "Incluir pregunta" table_title: "Título" - table_assignment: "Asignación" - table_name: "Nombre" flash: question_added: "Pregunta añadida a esta votación" error_on_question_added: "No se pudo asignar la pregunta" From 34fbf1472c0d0f39d794c56e3570d158b29381ff Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 3 Oct 2017 12:26:04 +0200 Subject: [PATCH 264/765] Join in a single validation both Shift date validates statements --- app/models/poll/shift.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/poll/shift.rb b/app/models/poll/shift.rb index cc5f7045e..7fc5e09d1 100644 --- a/app/models/poll/shift.rb +++ b/app/models/poll/shift.rb @@ -5,9 +5,8 @@ class Poll validates :booth_id, presence: true validates :officer_id, presence: true - validates :date, presence: true + validates :date, presence: true, uniqueness: { scope: [:officer_id, :booth_id, :task] } validates :task, presence: true - validates :date, uniqueness: { scope: [:officer_id, :booth_id, :task] } enum task: { vote_collection: 0, recount_scrutiny: 1 } From 332b9be94a3e1562779ea0d539fa1ba401858ccd Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 3 Oct 2017 12:26:43 +0200 Subject: [PATCH 265/765] Reorder before/after create methods --- app/models/poll/shift.rb | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/models/poll/shift.rb b/app/models/poll/shift.rb index 7fc5e09d1..2870709d7 100644 --- a/app/models/poll/shift.rb +++ b/app/models/poll/shift.rb @@ -13,19 +13,21 @@ class Poll before_create :persist_data after_create :create_officer_assignments - def create_officer_assignments - booth.booth_assignments.each do |booth_assignment| - attrs = { officer_id: officer_id, - date: date, - booth_assignment_id: booth_assignment.id } - Poll::OfficerAssignment.create!(attrs) - end - end - def persist_data self.officer_name = officer.name self.officer_email = officer.email end + def create_officer_assignments + booth.booth_assignments.each do |booth_assignment| + attrs = { + officer_id: officer_id, + date: date, + booth_assignment_id: booth_assignment.id, + final: recount_scrutiny? + } + Poll::OfficerAssignment.create!(attrs) + end + end end end From fc5ff61365c0ae78d98c5e2dd6a612a1fbea032a Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 3 Oct 2017 12:30:42 +0200 Subject: [PATCH 266/765] Destroy all related OfficerAssignments when destroying a Shift --- app/models/poll/shift.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/models/poll/shift.rb b/app/models/poll/shift.rb index 2870709d7..4edeb26ef 100644 --- a/app/models/poll/shift.rb +++ b/app/models/poll/shift.rb @@ -12,6 +12,7 @@ class Poll before_create :persist_data after_create :create_officer_assignments + before_destroy :destroy_officer_assignments def persist_data self.officer_name = officer.name @@ -29,5 +30,12 @@ class Poll Poll::OfficerAssignment.create!(attrs) end end + + def destroy_officer_assignments + Poll::OfficerAssignment.where(booth_assignment: booth.booth_assignments, + officer: officer, + date: date, + final: recount_scrutiny?).destroy_all + end end end From c624129175cb8e2b9d441d568e682db76663b38e Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 3 Oct 2017 12:57:40 +0200 Subject: [PATCH 267/765] Check Shift creates final/not-final OfficerAssigments correctly --- spec/models/poll/shift_spec.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/spec/models/poll/shift_spec.rb b/spec/models/poll/shift_spec.rb index b7918b95c..86755a310 100644 --- a/spec/models/poll/shift_spec.rb +++ b/spec/models/poll/shift_spec.rb @@ -50,10 +50,32 @@ describe :shift do expect(oa1.officer).to eq(officer) expect(oa1.date).to eq(Date.current) expect(oa1.booth_assignment).to eq(booth_assignment1) + expect(oa1.final).to be_falsey expect(oa2.officer).to eq(officer) expect(oa2.date).to eq(Date.current) expect(oa2.booth_assignment).to eq(booth_assignment2) + expect(oa2.final).to be_falsey + end + + it "should create final officer_assignments" do + poll = create(:poll) + booth = create(:poll_booth) + officer = create(:poll_officer) + + booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth) + + shift = create(:poll_shift, booth: booth, officer: officer, date: Date.current, task: :recount_scrutiny) + + officer_assignments = Poll::OfficerAssignment.all + expect(officer_assignments.count).to eq(1) + + officer_assignment = officer_assignments.first + + expect(officer_assignment.officer).to eq(officer) + expect(officer_assignment.date).to eq(Date.current) + expect(officer_assignment.booth_assignment).to eq(booth_assignment) + expect(officer_assignment.final).to be_truthy end end From 690ebfba01c3e10cb45c8ec695f8392090c8f7a7 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 3 Oct 2017 13:24:07 +0200 Subject: [PATCH 268/765] Check Shift destroy also destroy only associated OfficerAssigments --- spec/models/poll/shift_spec.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/spec/models/poll/shift_spec.rb b/spec/models/poll/shift_spec.rb index 86755a310..b62f220da 100644 --- a/spec/models/poll/shift_spec.rb +++ b/spec/models/poll/shift_spec.rb @@ -28,7 +28,7 @@ describe :shift do describe "officer_assignments" do - it "should create corresponding officer_assignments" do + it "should create and destroy corresponding officer_assignments" do poll1 = create(:poll) poll2 = create(:poll) poll3 = create(:poll) @@ -39,11 +39,9 @@ describe :shift do booth_assignment1 = create(:poll_booth_assignment, poll: poll1, booth: booth) booth_assignment2 = create(:poll_booth_assignment, poll: poll2, booth: booth) - shift = create(:poll_shift, booth: booth, officer: officer, date: Date.current) + expect { create(:poll_shift, booth: booth, officer: officer, date: Date.current) }.to change {Poll::OfficerAssignment.all.count}.by(2) officer_assignments = Poll::OfficerAssignment.all - expect(officer_assignments.count).to eq(2) - oa1 = officer_assignments.first oa2 = officer_assignments.second @@ -56,6 +54,10 @@ describe :shift do expect(oa2.date).to eq(Date.current) expect(oa2.booth_assignment).to eq(booth_assignment2) expect(oa2.final).to be_falsey + + create(:poll_officer_assignment, officer: officer, booth_assignment: booth_assignment1, date: Date.tomorrow) + + expect { Poll::Shift.last.destroy }.to change {Poll::OfficerAssignment.all.count}.by(-2) end it "should create final officer_assignments" do From 0384baf26aac314fac2afa9e8aa18ef24dc1cd4a Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 3 Oct 2017 13:29:26 +0200 Subject: [PATCH 269/765] Unify both Shift task type creation on a single scenario to check double task on same day --- spec/features/admin/poll/shifts_spec.rb | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/spec/features/admin/poll/shifts_spec.rb b/spec/features/admin/poll/shifts_spec.rb index 46c737c64..2e957ef11 100644 --- a/spec/features/admin/poll/shifts_spec.rb +++ b/spec/features/admin/poll/shifts_spec.rb @@ -30,12 +30,12 @@ feature 'Admin shifts' do expect(page).to have_content officer.name end - scenario "Create Vote Collection Shift", :js do + scenario "Create Vote Collection Shift and Recount & Scrutiny Shift on same date", :js do poll = create(:poll) - vote_collection_dates = (poll.starts_at.to_date..poll.ends_at.to_date).to_a.map { |date| I18n.l(date, format: :long) } - booth = create(:poll_booth) officer = create(:poll_officer) + vote_collection_dates = (poll.starts_at.to_date..poll.ends_at.to_date).to_a.map { |date| I18n.l(date, format: :long) } + recount_scrutiny_dates = (poll.ends_at.to_date..poll.ends_at.to_date + 1.week).to_a.map { |date| I18n.l(date, format: :long) } visit admin_booths_path @@ -60,14 +60,6 @@ feature 'Admin shifts' do expect(page).to have_content("Collect Votes") expect(page).to have_content(officer.name) end - end - - scenario "Create Recount & Scrutiny Shift", :js do - poll = create(:poll) - recount_scrutiny_dates = (poll.ends_at.to_date..poll.ends_at.to_date + 1.week).to_a.map { |date| I18n.l(date, format: :long) } - - booth = create(:poll_booth) - officer = create(:poll_officer) visit admin_booths_path @@ -89,7 +81,7 @@ feature 'Admin shifts' do expect(page).to have_content "Shift added" within("#shifts") do - expect(page).to have_css(".shift", count: 1) + expect(page).to have_css(".shift", count: 2) expect(page).to have_content(I18n.l(poll.ends_at.to_date + 4.days, format: :long)) expect(page).to have_content("Recount & Scrutiny") expect(page).to have_content(officer.name) From 367b43fd31ebb8a7ca797b04a7ce1f4bd6c55228 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 3 Oct 2017 13:51:15 +0200 Subject: [PATCH 270/765] adds polls index orders on ignore i18n-tasks --- config/i18n-tasks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 156a38eff..427fec5ad 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -154,6 +154,7 @@ ignore_unused: - 'users.show.filters.*' - 'polls.index.filters.*' - 'polls.index.section_header.*' + - 'polls.index.orders.*' - 'debates.index.select_order' - 'debates.index.orders.*' - 'debates.index.section_header.*' From 894bda92ba3e2e2d84ea3748aa610ced858db08e Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 3 Oct 2017 13:53:57 +0200 Subject: [PATCH 271/765] moves custom setting to consul settings css --- app/assets/stylesheets/_consul_settings.scss | 2 ++ app/assets/stylesheets/_settings.scss | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/_consul_settings.scss b/app/assets/stylesheets/_consul_settings.scss index 0844f861f..1f03c9be7 100644 --- a/app/assets/stylesheets/_consul_settings.scss +++ b/app/assets/stylesheets/_consul_settings.scss @@ -75,3 +75,5 @@ $accordion-content-color: foreground($accordion-background, $text); $tab-item-font-size: $base-font-size; $tab-item-padding: $line-height / 2 0; $tab-content-border: $border; + +$orbit-bullet-diameter: 0.8rem; diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss index a38071a05..33800fed5 100644 --- a/app/assets/stylesheets/_settings.scss +++ b/app/assets/stylesheets/_settings.scss @@ -411,7 +411,7 @@ $maincontent-shadow: 0 0 10px rgba($black, 0.5); $orbit-bullet-background: $medium-gray; $orbit-bullet-background-active: $dark-gray; -$orbit-bullet-diameter: 0.8rem; +$orbit-bullet-diameter: 1.2rem; $orbit-bullet-margin: 0.1rem; $orbit-bullet-margin-top: 0.8rem; $orbit-bullet-margin-bottom: 0.8rem; From d39c2c6e9edb45f4510248236e5c78269928ddb6 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 3 Oct 2017 13:55:59 +0200 Subject: [PATCH 272/765] cleans css format --- app/assets/stylesheets/layout.scss | 37 ++++++++++++----------- app/assets/stylesheets/mixins.scss | 8 +++-- app/assets/stylesheets/participation.scss | 2 +- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 44b450779..b9f79430e 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -343,11 +343,9 @@ a { } .truncate-horizontal-text { - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - -o-text-overflow: ellipsis; - -ms-text-overflow: ellipsis; + white-space: nowrap; } .align-top { @@ -633,7 +631,7 @@ header { text-align: left; @include breakpoint(medium) { - margin-right: rem-calc(24); + margin-right: $line-height; } &:hover { @@ -2183,9 +2181,10 @@ table { } // 19. Recommended Section Home -// ----------- +// ---------------------------- .home-page { + .push { display: none; } @@ -2219,7 +2218,7 @@ table { .card-section { padding: $line-height 0; - max-width: 300px; + max-width: rem-calc(300); margin: 0 auto; p { @@ -2229,10 +2228,10 @@ table { } .orbit { - height: 300px; + height: rem-calc(300); .orbit-wrapper { - max-height: 250px; + max-height: rem-calc(250); overflow: hidden; position: relative; } @@ -2248,7 +2247,7 @@ table { background: image-url('truncate.png'); background-repeat: repeat-x; bottom: 0; - height: 20px; + height: rem-calc(20); position: absolute; width: 100%; } @@ -2269,21 +2268,21 @@ table { .proposals-inner, .budget-investments-inner { background: #fff; - max-height: 350px; + max-height: rem-calc(350); @include breakpoint(small) { - max-height: 400px; + max-height: rem-calc(400); } h4 { margin-top: $line-height; margin-bottom: 0; font-size: rem-calc(18); - min-height: 50px; + min-height: rem-calc(50); } h5 { - font-size: rem-calc(14); + font-size: $small-font-size; text-align: left; } } @@ -2291,20 +2290,20 @@ table { .carousel-image { .card .orbit { - height: 480px; + height: rem-calc(480); .orbit-wrapper { - max-height: 450px; + max-height: rem-calc(450); } } .debates-inner, .proposals-inner, .budget-investments-inner { - max-height: 500px; + max-height: rem-calc(500); @include breakpoint(small) { - max-height: 600px; + max-height: rem-calc(600); } } } @@ -2318,7 +2317,9 @@ table { } } -// 19. Documents +// 20. Documents +// ------------- + .documents-list { table { diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index 1aa51d1a6..ac3c0a923 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -2,7 +2,8 @@ // // 01. Logo // 02. Orbit bullets -// +// 03. Direct uploads +// ------------------ // 01. Logo // -------- @@ -34,6 +35,7 @@ // 02. Orbit bullet // ---------------- + @mixin orbit-bullets { @include disable-mouse-outline; position: relative; @@ -59,8 +61,9 @@ } } -// 02. Direct uploads +// 03. Direct uploads // ------------------ + @mixin direct-uploads { .cached-image { @@ -133,5 +136,4 @@ .loading-bar.no-transition { transition: none; } - } diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index b1edc246d..c0eb6eed7 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -825,7 +825,7 @@ background: image-url('truncate.png'); background-repeat: repeat-x; bottom: 0; - height: 24px; + height: rem-calc(24); position: absolute; width: 100%; } From 5e9a452e55e31d88e8bdeb029a4b4f536dc1626f Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 3 Oct 2017 13:56:16 +0200 Subject: [PATCH 273/765] removes unnecessary blank space --- app/views/budgets/investments/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/budgets/investments/_form.html.erb b/app/views/budgets/investments/_form.html.erb index 8a19c188a..b3bbf4e14 100644 --- a/app/views/budgets/investments/_form.html.erb +++ b/app/views/budgets/investments/_form.html.erb @@ -41,7 +41,7 @@ parent_class: "budget_investment" %>
    - <% end %> + <% end %>
    <%= f.text_field :location %> From c32a70d2a92ab8f2500bde1d26553df70169ca29 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 3 Oct 2017 13:57:01 +0200 Subject: [PATCH 274/765] improves css for items on list with images --- app/assets/stylesheets/participation.scss | 9 ++++----- app/views/budgets/investments/_investment.html.erb | 4 ++-- app/views/proposals/_proposal.html.erb | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index c0eb6eed7..565803114 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -668,16 +668,15 @@ padding-top: 100%; } } - - .column:first-child { - text-align: center; - } } @include breakpoint(medium) { .panel { - padding: 0 $line-height / 2 0 0; + + &.with-image { + padding: 0 $line-height / 2 0 0; + } .no-image { height: 100%; diff --git a/app/views/budgets/investments/_investment.html.erb b/app/views/budgets/investments/_investment.html.erb index 2c6269a3f..ecfdcb3c7 100644 --- a/app/views/budgets/investments/_investment.html.erb +++ b/app/views/budgets/investments/_investment.html.erb @@ -1,8 +1,8 @@
    -
    +
    -
    +
    <% if investment.image.present? %> <%= image_tag investment.image_url(:thumb), alt: investment.image.title %> diff --git a/app/views/proposals/_proposal.html.erb b/app/views/proposals/_proposal.html.erb index be5ac8e17..2f5c22c3c 100644 --- a/app/views/proposals/_proposal.html.erb +++ b/app/views/proposals/_proposal.html.erb @@ -1,11 +1,11 @@
    Proposal.votes_needed_for_success) %>" data-type="proposal"> -
    +
    -
    +
    <% if proposal.image.present? %> <%= image_tag proposal.image_url(:thumb), alt: proposal.image.title %> From 2cb620296bdcf241610381511c563fdf4b871396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 3 Oct 2017 15:49:03 +0200 Subject: [PATCH 275/765] Fixed test --- spec/features/admin/poll/booths_spec.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spec/features/admin/poll/booths_spec.rb b/spec/features/admin/poll/booths_spec.rb index 13f3af2ff..22b77b397 100644 --- a/spec/features/admin/poll/booths_spec.rb +++ b/spec/features/admin/poll/booths_spec.rb @@ -87,9 +87,11 @@ feature 'Admin booths' do end scenario "Edit" do + poll = create(:poll, :current) booth = create(:poll_booth) + assignment = create(:poll_booth_assignment, poll: poll, booth: booth) - visit admin_booths_path + visit available_admin_booths_path within("#booth_#{booth.id}") do click_link "Edit" @@ -109,4 +111,4 @@ feature 'Admin booths' do end end -end \ No newline at end of file +end From 080064ed46cb9c950ee68bbbd93def5cd5cc1488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 3 Oct 2017 16:48:21 +0200 Subject: [PATCH 276/765] Updated schema.rb --- db/schema.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index e859a487f..e75c2aac3 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: 20171002122312) do +ActiveRecord::Schema.define(version: 20171003095936) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -639,7 +639,6 @@ ActiveRecord::Schema.define(version: 20171002122312) do end add_index "poll_officer_assignments", ["booth_assignment_id"], name: "index_poll_officer_assignments_on_booth_assignment_id", using: :btree - add_index "poll_officer_assignments", ["officer_id", "date"], name: "index_poll_officer_assignments_on_officer_id_and_date", using: :btree add_index "poll_officer_assignments", ["officer_id"], name: "index_poll_officer_assignments_on_officer_id", using: :btree create_table "poll_officers", force: :cascade do |t| @@ -698,11 +697,11 @@ ActiveRecord::Schema.define(version: 20171002122312) do t.integer "officer_assignment_id" t.text "officer_assignment_id_log", default: "" t.text "author_id_log", default: "" - t.integer "white_amount" + t.integer "white_amount", default: 0 t.text "white_amount_log", default: "" - t.integer "null_amount" + t.integer "null_amount", default: 0 t.text "null_amount_log", default: "" - t.integer "total_amount" + t.integer "total_amount", default: 0 t.text "total_amount_log", default: "" end @@ -720,9 +719,10 @@ ActiveRecord::Schema.define(version: 20171002122312) do t.integer "task", default: 0, null: false end - add_index "poll_shifts", ["booth_id", "officer_id"], name: "index_poll_shifts_on_booth_id_and_officer_id", using: :btree + add_index "poll_shifts", ["booth_id", "officer_id", "task"], name: "index_poll_shifts_on_booth_id_and_officer_id_and_task", unique: true, using: :btree add_index "poll_shifts", ["booth_id"], name: "index_poll_shifts_on_booth_id", using: :btree add_index "poll_shifts", ["officer_id"], name: "index_poll_shifts_on_officer_id", using: :btree + add_index "poll_shifts", ["task"], name: "index_poll_shifts_on_task", using: :btree create_table "poll_total_results", force: :cascade do |t| t.integer "author_id" @@ -752,6 +752,7 @@ ActiveRecord::Schema.define(version: 20171002122312) do t.integer "answer_id" t.integer "officer_assignment_id" t.integer "user_id" + t.string "origin" end add_index "poll_voters", ["booth_assignment_id"], name: "index_poll_voters_on_booth_assignment_id", using: :btree From 825671ad9b14df9b2f5ab434b9c379c17b768051 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 3 Oct 2017 18:53:44 +0200 Subject: [PATCH 277/765] Fix polls answer this question show text --- config/locales/en/general.yml | 2 +- spec/features/polls/questions_spec.rb | 8 ++++---- spec/features/polls/voter_spec.rb | 6 +++--- spec/support/common_actions.rb | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 67d8eef2c..ff8a77014 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -494,7 +494,7 @@ en: create_question: "Create question" default_valid_answers: "Yes, No" show: - answer_this_question: "Answer this question" + answer_this_question: "Go to voting page" original_proposal: "Original proposal" author: "Created by" dates_title: "Participation dates" diff --git a/spec/features/polls/questions_spec.rb b/spec/features/polls/questions_spec.rb index 1563ca81a..06dd9df08 100644 --- a/spec/features/polls/questions_spec.rb +++ b/spec/features/polls/questions_spec.rb @@ -82,7 +82,7 @@ feature 'Poll Questions' do login_as(create(:user, :level_two, geozone: geozone)) visit question_path(question) - expect(page).to have_link('Answer this question') + expect(page).to have_link('Go to voting page') end scenario 'Level 2 users who have already answered' do @@ -94,7 +94,7 @@ feature 'Poll Questions' do login_as user visit question_path(question) - expect(page).to have_link('Answer this question') + expect(page).to have_link('Go to voting page') end scenario 'Level 2 users answering', :js do @@ -104,7 +104,7 @@ feature 'Poll Questions' do login_as user visit question_path(question) - expect(page).to have_link('Answer this question') + expect(page).to have_link('Go to voting page') end scenario 'Records participation', :js do @@ -114,7 +114,7 @@ feature 'Poll Questions' do login_as user visit question_path(question) - click_link 'Answer this question' + click_link 'Go to voting page' click_link 'Han Solo' expect(page).to_not have_link('Han Solo') diff --git a/spec/features/polls/voter_spec.rb b/spec/features/polls/voter_spec.rb index 08bc6f963..c12a9f0e4 100644 --- a/spec/features/polls/voter_spec.rb +++ b/spec/features/polls/voter_spec.rb @@ -12,7 +12,7 @@ feature "Voter" do login_as user visit question_path(question) - click_link 'Answer this question' + click_link 'Go to voting page' click_link 'Yes' expect(page).to_not have_link('Yes') @@ -81,7 +81,7 @@ feature "Voter" do login_as user visit question_path(question) - click_link 'Answer this question' + click_link 'Go to voting page' expect(page).to_not have_link('Yes') expect(page).to have_content "You have already participated in a booth for this poll." @@ -91,4 +91,4 @@ feature "Voter" do end -end \ No newline at end of file +end diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index 97f05294c..eda55986f 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -301,7 +301,7 @@ module CommonActions def vote_for_poll_via_web visit question_path(question) - click_link 'Answer this question' + click_link 'Go to voting page' click_link 'Yes' expect(page).to_not have_link('Yes') From 45831a0b68fd4b760e3c96964f4f05fb2c145236 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 3 Oct 2017 18:10:16 +0200 Subject: [PATCH 278/765] Include last day of poll in range for recount and scrutiny on officing panel --- app/controllers/officing/polls_controller.rb | 4 +++- app/controllers/officing/results_controller.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/officing/polls_controller.rb b/app/controllers/officing/polls_controller.rb index 5ba94e024..69b65ad23 100644 --- a/app/controllers/officing/polls_controller.rb +++ b/app/controllers/officing/polls_controller.rb @@ -7,7 +7,9 @@ class Officing::PollsController < Officing::BaseController def final @polls = if current_user.poll_officer? - current_user.poll_officer.final_days_assigned_polls.select {|poll| poll.ends_at > 2.weeks.ago && poll.expired?} + current_user.poll_officer.final_days_assigned_polls.select do |poll| + poll.ends_at > 2.weeks.ago && poll.expired? || poll.ends_at.today? + end else [] end diff --git a/app/controllers/officing/results_controller.rb b/app/controllers/officing/results_controller.rb index f517f081a..23ef0b038 100644 --- a/app/controllers/officing/results_controller.rb +++ b/app/controllers/officing/results_controller.rb @@ -93,7 +93,7 @@ class Officing::ResultsController < Officing::BaseController end def load_poll - @poll = ::Poll.expired.includes(:questions).find(params[:poll_id]) + @poll = ::Poll.includes(:questions).find(params[:poll_id]) end def load_officer_assignment From 5bb831e9595c6d2f7fa55c3eda0676878ccd0617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 3 Oct 2017 19:11:39 +0200 Subject: [PATCH 279/765] Removed poll question show --- app/controllers/polls/questions_controller.rb | 9 -- app/views/polls/_poll_group.html.erb | 2 +- app/views/polls/questions/_answers.html.erb | 22 ----- app/views/polls/questions/_comments.html.erb | 31 ------- .../polls/questions/_filter_subnav.html.erb | 22 ----- app/views/polls/questions/_question.html.erb | 9 -- app/views/polls/questions/answer.js.erb | 1 - app/views/polls/questions/show.html.erb | 92 ------------------- config/routes.rb | 6 +- 9 files changed, 2 insertions(+), 192 deletions(-) delete mode 100644 app/views/polls/questions/_answers.html.erb delete mode 100644 app/views/polls/questions/_comments.html.erb delete mode 100644 app/views/polls/questions/_filter_subnav.html.erb delete mode 100644 app/views/polls/questions/_question.html.erb delete mode 100644 app/views/polls/questions/answer.js.erb delete mode 100644 app/views/polls/questions/show.html.erb diff --git a/app/controllers/polls/questions_controller.rb b/app/controllers/polls/questions_controller.rb index 1849dff97..74266a6fc 100644 --- a/app/controllers/polls/questions_controller.rb +++ b/app/controllers/polls/questions_controller.rb @@ -5,15 +5,6 @@ class Polls::QuestionsController < ApplicationController has_orders %w{most_voted newest oldest}, only: :show - def show - @commentable = @question.proposal.present? ? @question.proposal : @question - @comment_tree = CommentTree.new(@commentable, params[:page], @current_order) - set_comment_flags(@comment_tree.comments) - - question_answer = @question.answers.where(author_id: current_user.try(:id)).first - @answers_by_question_id = {@question.id => question_answer.try(:answer)} - end - def answer answer = @question.answers.find_or_initialize_by(author: current_user) diff --git a/app/views/polls/_poll_group.html.erb b/app/views/polls/_poll_group.html.erb index 9372aee17..fe12c341b 100644 --- a/app/views/polls/_poll_group.html.erb +++ b/app/views/polls/_poll_group.html.erb @@ -51,7 +51,7 @@ <%= poll_dates(poll) %>
      <% poll.questions.each do |question| %> -
    • <%= link_to question.title, question_path(question) %>
      • +
    • <%= question.title %>
      • <% end %>
    <% end %> diff --git a/app/views/polls/questions/_answers.html.erb b/app/views/polls/questions/_answers.html.erb deleted file mode 100644 index c88156b68..000000000 --- a/app/views/polls/questions/_answers.html.erb +++ /dev/null @@ -1,22 +0,0 @@ -
    - <% if can? :answer, question %> - <% question.valid_answers.each do |answer| %> - <% if @answers_by_question_id[question.id] == answer %> - "> - <%= answer %> - - <% else %> - <%= link_to answer, - answer_question_path(question, answer: answer), - method: :post, - remote: true, - title: t("poll_questions.show.vote_answer", answer: answer), - class: "button secondary hollow" %> - <% end %> - <% end %> - <% else %> - <% question.valid_answers.each do |answer| %> - <%= answer %> - <% end %> - <% end %> -
    diff --git a/app/views/polls/questions/_comments.html.erb b/app/views/polls/questions/_comments.html.erb deleted file mode 100644 index a967406aa..000000000 --- a/app/views/polls/questions/_comments.html.erb +++ /dev/null @@ -1,31 +0,0 @@ -<% cache [locale_and_user_status, @current_order, commentable_cache_key(@commentable), @comment_tree.comments, @comment_tree.comment_authors, @commentable.comments_count, @comment_flags] do %> -
    -
    -
    -

    - <%= t("shared.comments.title") %> - (<%= @commentable.comments_count %>) -

    - - <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %> - - <% if user_signed_in? %> - <%= render 'comments/form', {commentable: @commentable, parent_id: nil, toggeable: false} %> - <% else %> -
    - -
    - <%= t("shared.comments.login_to_comment", - signin: link_to(t("votes.signin"), new_user_session_path), - signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %> -
    - <% end %> - - <% @comment_tree.root_comments.each do |comment| %> - <%= render 'comments/comment', comment: comment %> - <% end %> - <%= paginate @comment_tree.root_comments %> -
    -
    -
    -<% end %> \ No newline at end of file diff --git a/app/views/polls/questions/_filter_subnav.html.erb b/app/views/polls/questions/_filter_subnav.html.erb deleted file mode 100644 index 738fc3700..000000000 --- a/app/views/polls/questions/_filter_subnav.html.erb +++ /dev/null @@ -1,22 +0,0 @@ -
    -
    -
      -
    • - <%= link_to "#tab-comments" do %> -

      - <%= t("proposals.show.comments_tab") %> - (<%= @question.comments_count %>) -

      - <% end %> -
      • -
    • - <%= link_to "#tab-documents" do %> -

      - <%= t("documents.tab") %> - (<%= @question.documents.count %>) -

      - <% end %> -
      • -
    -
    -
    diff --git a/app/views/polls/questions/_question.html.erb b/app/views/polls/questions/_question.html.erb deleted file mode 100644 index f0958b6e4..000000000 --- a/app/views/polls/questions/_question.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -
    -

    - <%= link_to question.title, question_path(question) %> -

    - -
    - <%= render 'polls/questions/answers', question: question %> -
    -
    diff --git a/app/views/polls/questions/answer.js.erb b/app/views/polls/questions/answer.js.erb deleted file mode 100644 index aabbd8d89..000000000 --- a/app/views/polls/questions/answer.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#<%= dom_id(@question) %>_answers").html('<%= j render("polls/questions/answers", question: @question) %>'); diff --git a/app/views/polls/questions/show.html.erb b/app/views/polls/questions/show.html.erb deleted file mode 100644 index f67633129..000000000 --- a/app/views/polls/questions/show.html.erb +++ /dev/null @@ -1,92 +0,0 @@ -<% provide :title do %><%= @question.title %><% end %> - -
    -
    -
    - <%= back_link_to %> - -

    <%= @question.title %>

    - - <% if @question.proposal.present? %> -
    - <%= link_to t('poll_questions.show.original_proposal'), @question.proposal %> -
    - <% end %> - - <% if can? :answer, @question %> - <%= link_to t('poll_questions.show.answer_this_question'), - @question.poll, - class: 'large button' %> - <% else %> - <%= render 'polls/reasons_for_not_answering', poll: @question.poll %> - <% end %> -
    - -
    -

    - - <%= t('poll_questions.show.author') %> - -
    - <% if @question.author_visible_name.present? %> - <%= @question.author_visible_name %> - <% else %> - <%= link_to @question.author.name, @question.author %> - <% end %> - -

    - -

    - - <%= t('poll_questions.show.poll') %> - -
    - <%= link_to @question.poll.name, @question.poll %> -

    - -

    - - <%= t('poll_questions.show.dates_title') %> - -
    - <%= poll_dates(@question.poll) %> -

    -
    -
    -
    - -<% if @question.video_url.present? %> -
    -
    -
    -

    -   - <%= t('proposals.show.title_video_url') %> -

    - <%= text_with_links @question.video_url %> -
    -
    -
    - -<% end %> - -
    -
    -

    <%= t('poll_questions.show.more_info') %>

    - <%= @question.description %> -
    -
    - -
    - <%= render "polls/questions/filter_subnav" %> - -
    - <%= render "polls/questions/comments" %> -
    - -
    - <%= render 'documents/documents', - documents: @question.documents, - max_documents_allowed: Poll::Question.max_documents_allowed %> -
    -
    diff --git a/config/routes.rb b/config/routes.rb index 410f2dced..6c893c24a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -112,11 +112,7 @@ Rails.application.routes.draw do get :search, on: :collection end - resources :polls, only: [:show, :index] do - resources :questions, only: [:show], controller: 'polls/questions', shallow: true do - post :answer, on: :member - end - end + resources :polls, only: [:show, :index] namespace :legislation do resources :processes, only: [:index, :show] do From 348e4e54f324ec18f16c93e530fc2267717aa863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 3 Oct 2017 19:11:54 +0200 Subject: [PATCH 280/765] Removed question description --- app/controllers/admin/poll/questions_controller.rb | 2 +- app/models/poll/question.rb | 7 ------- app/views/admin/poll/questions/_form.html.erb | 6 ------ ...0171003170029_remove_description_from_poll_questions.rb | 5 +++++ db/schema.rb | 3 +-- 5 files changed, 7 insertions(+), 16 deletions(-) create mode 100644 db/migrate/20171003170029_remove_description_from_poll_questions.rb diff --git a/app/controllers/admin/poll/questions_controller.rb b/app/controllers/admin/poll/questions_controller.rb index 97b301d43..107c06740 100644 --- a/app/controllers/admin/poll/questions_controller.rb +++ b/app/controllers/admin/poll/questions_controller.rb @@ -56,7 +56,7 @@ class Admin::Poll::QuestionsController < Admin::Poll::BaseController private def question_params - params.require(:poll_question).permit(:poll_id, :title, :question, :description, :proposal_id, :valid_answers, :video_url, + params.require(:poll_question).permit(:poll_id, :title, :question, :proposal_id, :valid_answers, :video_url, documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]) end diff --git a/app/models/poll/question.rb b/app/models/poll/question.rb index a46f28a8c..55396fd3b 100644 --- a/app/models/poll/question.rb +++ b/app/models/poll/question.rb @@ -23,7 +23,6 @@ class Poll::Question < ActiveRecord::Base validates :poll_id, presence: true validates :title, length: { minimum: 4 } - validates :description, length: { maximum: Poll::Question.description_max_length } scope :by_poll_id, ->(poll_id) { where(poll_id: poll_id) } @@ -40,15 +39,10 @@ class Poll::Question < ActiveRecord::Base def searchable_values { title => 'A', proposal.try(:title) => 'A', - description => 'B', author.username => 'C', author_visible_name => 'C' } end - def description - super.try :html_safe - end - def valid_answers (super.try(:split, ',').compact || []).map(&:strip) end @@ -59,7 +53,6 @@ class Poll::Question < ActiveRecord::Base self.author_visible_name = proposal.author.name self.proposal_id = proposal.id self.title = proposal.title - self.description = proposal.description self.valid_answers = I18n.t('poll_questions.default_valid_answers') end end diff --git a/app/views/admin/poll/questions/_form.html.erb b/app/views/admin/poll/questions/_form.html.erb index 7881936e4..6091c024f 100644 --- a/app/views/admin/poll/questions/_form.html.erb +++ b/app/views/admin/poll/questions/_form.html.erb @@ -20,12 +20,6 @@

    <%= t("admin.questions.new.valid_answers_note") %>

    <%= f.text_field :valid_answers, label: false, aria: {describedby: "valid-answers-help-text"} %> -
    - <%= f.cktext_area :description, - maxlength: Poll::Question.description_max_length, - ckeditor: { language: I18n.locale } %> -
    -
    <%= render 'documents/nested_documents', documentable: @question, f: f %>
    diff --git a/db/migrate/20171003170029_remove_description_from_poll_questions.rb b/db/migrate/20171003170029_remove_description_from_poll_questions.rb new file mode 100644 index 000000000..31e1b9578 --- /dev/null +++ b/db/migrate/20171003170029_remove_description_from_poll_questions.rb @@ -0,0 +1,5 @@ +class RemoveDescriptionFromPollQuestions < ActiveRecord::Migration + def change + remove_column :poll_questions, :description + end +end diff --git a/db/schema.rb b/db/schema.rb index e75c2aac3..9381f8e2c 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: 20171003095936) do +ActiveRecord::Schema.define(version: 20171003170029) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -675,7 +675,6 @@ ActiveRecord::Schema.define(version: 20171003095936) do t.string "author_visible_name" t.string "title" t.string "valid_answers" - t.text "description" t.integer "comments_count" t.datetime "hidden_at" t.datetime "created_at" From d9d03079e173aa438909ac0795d21adcac05e638 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Tue, 3 Oct 2017 13:29:07 -0400 Subject: [PATCH 281/765] Adapt Poll::Question 'show' action to mockup --- app/views/admin/poll/questions/_form.html.erb | 4 ---- app/views/admin/poll/questions/show.html.erb | 22 ++++++++++++------- config/locales/en/admin.yml | 3 ++- config/locales/es/admin.yml | 3 ++- config/locales/fr/admin.yml | 3 ++- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/app/views/admin/poll/questions/_form.html.erb b/app/views/admin/poll/questions/_form.html.erb index 7881936e4..5b4de0bcb 100644 --- a/app/views/admin/poll/questions/_form.html.erb +++ b/app/views/admin/poll/questions/_form.html.erb @@ -16,10 +16,6 @@ <%= f.text_field :title, maxlength: Poll::Question.title_max_length %> - <%= f.label :valid_answers %> -

    <%= t("admin.questions.new.valid_answers_note") %>

    - <%= f.text_field :valid_answers, label: false, aria: {describedby: "valid-answers-help-text"} %> -
    <%= f.cktext_area :description, maxlength: Poll::Question.description_max_length, diff --git a/app/views/admin/poll/questions/show.html.erb b/app/views/admin/poll/questions/show.html.erb index 3f776c5c0..9d38735ca 100644 --- a/app/views/admin/poll/questions/show.html.erb +++ b/app/views/admin/poll/questions/show.html.erb @@ -24,15 +24,21 @@ <%= link_to @question.author.name, user_path(@question.author) %>

    -

    - <%= t("admin.questions.show.valid_answers") %> -

    + + + + + - <% @question.valid_answers.each do |answer| %> - - <%= answer %> - - <% end %> + + + + + + + + +
    <%= t('admin.questions.show.valid_answers') %><%= link_to t("admin.questions.show.add_answer"), "#", class: "button hollow float-right" %>
    <%= t("admin.questions.show.answer") %><%= t("admin.questions.show.description") %>

    <%= t("admin.questions.show.description") %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 0545e6af5..2b8a18ce2 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -597,12 +597,13 @@ en: new: title: "Create Question" poll_label: "Poll" - valid_answers_note: "Enter the answers separated by commas (,)" show: proposal: Original proposal author: Author title: Title valid_answers: Valid answers + add_answer: "Add answer" + answer: "Answer" description: Description video_url: External video documents: Documents (1) diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 816cadd57..333cf9cf9 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -597,12 +597,13 @@ es: new: title: "Crear pregunta ciudadana" poll_label: "Votación" - valid_answers_note: "Escribe las respuestas separadas por comas (,)" show: proposal: Propuesta ciudadana original author: Autor title: Título valid_answers: Respuestas válidas + add_answer: "Añadir respuesta" + answer: "Respuesta" description: Descripción video_url: Video externo documents: Documentos (1) diff --git a/config/locales/fr/admin.yml b/config/locales/fr/admin.yml index ae9a44277..f509b2a94 100644 --- a/config/locales/fr/admin.yml +++ b/config/locales/fr/admin.yml @@ -377,12 +377,13 @@ fr: new: title: "Créer une question" poll_label: "Vote" - valid_answers_note: "Saisir les réponses séparées par des virgules (,)" show: proposal: Proposition originale author: Auteur title: Titre valid_answers: Réponses valides + add_answer: "Ajouter une réponse" + answer: "Réponse" description: Description preview: Voir l'aperçu recounts: From 9871503c5e8a8bf33088fba5a00e1ca48958a8e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 3 Oct 2017 21:00:40 +0200 Subject: [PATCH 282/765] Restored views --- app/views/admin/poll/questions/show.html.erb | 8 ------- app/views/polls/questions/_answers.html.erb | 22 ++++++++++++++++++++ app/views/polls/questions/_question.html.erb | 9 ++++++++ app/views/polls/questions/answer.js.erb | 1 + config/routes.rb | 6 +++++- 5 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 app/views/polls/questions/_answers.html.erb create mode 100644 app/views/polls/questions/_question.html.erb create mode 100644 app/views/polls/questions/answer.js.erb diff --git a/app/views/admin/poll/questions/show.html.erb b/app/views/admin/poll/questions/show.html.erb index 3f776c5c0..438ee3a40 100644 --- a/app/views/admin/poll/questions/show.html.erb +++ b/app/views/admin/poll/questions/show.html.erb @@ -34,12 +34,6 @@ <% end %> -

    - <%= t("admin.questions.show.description") %> -
    - <%= @question.description %> -

    - <% if @question.video_url.present? %>

    <%= t("admin.questions.show.video_url") %> @@ -55,7 +49,5 @@ <%= @question.documents.first.title %>

    <% end %> - - <%= link_to t("admin.questions.show.preview"), question_path(@question) %>
    diff --git a/app/views/polls/questions/_answers.html.erb b/app/views/polls/questions/_answers.html.erb new file mode 100644 index 000000000..c88156b68 --- /dev/null +++ b/app/views/polls/questions/_answers.html.erb @@ -0,0 +1,22 @@ +
    + <% if can? :answer, question %> + <% question.valid_answers.each do |answer| %> + <% if @answers_by_question_id[question.id] == answer %> + "> + <%= answer %> + + <% else %> + <%= link_to answer, + answer_question_path(question, answer: answer), + method: :post, + remote: true, + title: t("poll_questions.show.vote_answer", answer: answer), + class: "button secondary hollow" %> + <% end %> + <% end %> + <% else %> + <% question.valid_answers.each do |answer| %> + <%= answer %> + <% end %> + <% end %> +
    diff --git a/app/views/polls/questions/_question.html.erb b/app/views/polls/questions/_question.html.erb new file mode 100644 index 000000000..982d0a070 --- /dev/null +++ b/app/views/polls/questions/_question.html.erb @@ -0,0 +1,9 @@ +
    +

    + <%= question.title %> +

    + +
    + <%= render 'polls/questions/answers', question: question %> +
    +
    diff --git a/app/views/polls/questions/answer.js.erb b/app/views/polls/questions/answer.js.erb new file mode 100644 index 000000000..aabbd8d89 --- /dev/null +++ b/app/views/polls/questions/answer.js.erb @@ -0,0 +1 @@ +$("#<%= dom_id(@question) %>_answers").html('<%= j render("polls/questions/answers", question: @question) %>'); diff --git a/config/routes.rb b/config/routes.rb index 6c893c24a..9e7c8d307 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -112,7 +112,11 @@ Rails.application.routes.draw do get :search, on: :collection end - resources :polls, only: [:show, :index] + resources :polls, only: [:show, :index] do + resources :questions, controller: 'polls/questions', shallow: true do + post :answer, on: :member + end + end namespace :legislation do resources :processes, only: [:index, :show] do From 81e9682aa3bc4142436dcc47b9a6dd447ace0c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 3 Oct 2017 22:30:15 +0200 Subject: [PATCH 283/765] Fixed tests --- spec/factories.rb | 1 - spec/features/polls/questions_spec.rb | 117 -------------------------- 2 files changed, 118 deletions(-) diff --git a/spec/factories.rb b/spec/factories.rb index c21c35b4e..f311f58d4 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -498,7 +498,6 @@ FactoryGirl.define do poll association :author, factory: :user sequence(:title) { |n| "Question title #{n}" } - sequence(:description) { |n| "Question description #{n}" } valid_answers { Faker::Lorem.words(3).join(', ') } end diff --git a/spec/features/polls/questions_spec.rb b/spec/features/polls/questions_spec.rb index 1563ca81a..9e7efeedc 100644 --- a/spec/features/polls/questions_spec.rb +++ b/spec/features/polls/questions_spec.rb @@ -11,121 +11,4 @@ feature 'Poll Questions' do expect(proposal_question.title).to appear_before(normal_question.title) end - - scenario 'shows the author visible name instead of a link to the author' do - poll = create(:poll) - question_with_author = create(:poll_question, poll: poll) - question_with_author_visible_name = create(:poll_question, poll: poll, author_visible_name: 'potato') - - visit question_path(question_with_author) - expect(page).to have_link(question_with_author.author.name) - - visit question_path(question_with_author_visible_name) - expect(page).to_not have_link(question_with_author_visible_name.author.name) - expect(page).to have_content(question_with_author_visible_name.author_visible_name) - end - - scenario '#show view has video_url present' do - poll = create(:poll) - normal_question = create(:poll_question, poll: poll, video_url: "https://puppyvideos.com") - - visit question_path(normal_question) - - expect(page).to have_link(normal_question.video_url) - end - - scenario '#show view has document present' do - poll = create(:poll) - normal_question = create(:poll_question, poll: poll) - document = create(:document, documentable: normal_question) - - visit question_path(normal_question) - - expect(page).to have_content(document.title) - end - - context 'Answering' do - let(:geozone) { create(:geozone) } - let(:poll) { create(:poll, geozone_restricted: true, geozone_ids: [geozone.id]) } - - scenario 'Non-logged in users' do - question = create(:poll_question, valid_answers: 'Han Solo, Chewbacca') - - visit question_path(question) - - expect(page).to have_content('You must Sign in or Sign up to participate') - end - - scenario 'Level 1 users' do - question = create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca') - - login_as(create(:user, geozone: geozone)) - visit question_path(question) - - expect(page).to have_content('You must verify your account in order to answer') - end - - scenario 'Level 2 users in an poll question for a geozone which is not theirs' do - - other_poll = create(:poll, geozone_restricted: true, geozone_ids: [create(:geozone).id]) - question = create(:poll_question, poll: other_poll, valid_answers: 'Vader, Palpatine') - - login_as(create(:user, :level_two, geozone: geozone)) - visit question_path(question) - - expect(page).to have_content('This question is not available on your geozone') - end - - scenario 'Level 2 users who can answer' do - question = create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca') - - login_as(create(:user, :level_two, geozone: geozone)) - visit question_path(question) - - expect(page).to have_link('Answer this question') - end - - scenario 'Level 2 users who have already answered' do - question = create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca') - - user = create(:user, :level_two, geozone: geozone) - create(:poll_answer, question: question, author: user, answer: 'Chewbacca') - - login_as user - visit question_path(question) - - expect(page).to have_link('Answer this question') - end - - scenario 'Level 2 users answering', :js do - question = create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca') - user = create(:user, :level_two, geozone: geozone) - - login_as user - visit question_path(question) - - expect(page).to have_link('Answer this question') - end - - scenario 'Records participation', :js do - question = create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca') - user = create(:user, :level_two, geozone: geozone, gender: 'female', date_of_birth: 33.years.ago) - - login_as user - visit question_path(question) - - click_link 'Answer this question' - click_link 'Han Solo' - - expect(page).to_not have_link('Han Solo') - - voter = poll.voters.first - expect(voter.document_number).to eq(user.document_number) - expect(voter.geozone_id).to eq(user.geozone_id) - expect(voter.gender).to eq(user.gender) - expect(voter.age).to eq(33) - expect(voter.poll_id).to eq(poll.id) - end - - end end From bdfe822ddf2b27631ab40df8a339c17fbdc0f9b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 3 Oct 2017 23:05:06 +0200 Subject: [PATCH 284/765] Removed unused translations --- config/locales/en/admin.yml | 1 - config/locales/en/general.yml | 9 --------- config/locales/es/admin.yml | 1 - config/locales/es/general.yml | 9 --------- 4 files changed, 20 deletions(-) diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index a3751615a..c4694b310 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -593,7 +593,6 @@ en: author: Author title: Title valid_answers: Valid answers - description: Description video_url: External video documents: Documents (1) recounts: diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index ff8a77014..fbaa3e4d0 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -494,11 +494,6 @@ en: create_question: "Create question" default_valid_answers: "Yes, No" show: - answer_this_question: "Go to voting page" - original_proposal: "Original proposal" - author: "Created by" - dates_title: "Participation dates" - more_info: "More information" not_logged_in: "You must %{signin} or %{signup} to participate." signin: Sign in signup: Sign up @@ -509,7 +504,6 @@ en: cant_answer_wrong_geozone: "This question is not available on your geozone." vote_answer: "Vote %{answer}" voted: "You have voted %{answer}" - poll: "Poll" proposal_notifications: new: title: "Send message" @@ -524,9 +518,6 @@ en: edit: 'Edit' save: 'Save' delete: 'Delete' - comments: - title: 'Comments' - login_to_comment: 'You must %{signin} or %{signup} to leave a comment.' "yes": "Yes" "no": "No" search_results: "Search results" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index f95c2d39f..c1c2cbf9d 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -593,7 +593,6 @@ es: author: Autor title: Título valid_answers: Respuestas válidas - description: Descripción video_url: Video externo documents: Documentos (1) recounts: diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index aaa59a900..898826c0e 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -494,11 +494,6 @@ es: create_question: "Crear pregunta para votación" default_valid_answers: "Sí, No" show: - answer_this_question: "Responder a esta pregunta" - original_proposal: "Propuesta original" - author: "Creado por" - dates_title: "Fechas de participación" - more_info: "Más información" not_logged_in: "Necesitas %{signin} o %{signup} para participar." signin: iniciar sesión signup: registrarte @@ -509,7 +504,6 @@ es: cant_answer_wrong_geozone: "Esta votación no está disponible en tu zona." vote_answer: "Votar %{answer}" voted: "Has votado %{answer}" - poll: "Votación" proposal_notifications: new: title: "Enviar mensaje" @@ -524,9 +518,6 @@ es: edit: 'Editar' save: 'Guardar' delete: 'Borrar' - comments: - title: 'Comentarios' - login_to_comment: 'Necesitas %{signin} o %{signup} para comentar.' "yes": "Sí" "no": "No" search_results: "Resultados de búsqueda" From 3a0e709e14a8311f528537a9fb19769ad8743373 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 3 Oct 2017 23:34:09 +0200 Subject: [PATCH 285/765] Correct composed index on poll Shift model adding date --- ...20171003212958_add_date_to_poll_shift_composed_index.rb | 7 +++++++ db/schema.rb | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20171003212958_add_date_to_poll_shift_composed_index.rb diff --git a/db/migrate/20171003212958_add_date_to_poll_shift_composed_index.rb b/db/migrate/20171003212958_add_date_to_poll_shift_composed_index.rb new file mode 100644 index 000000000..b59a859c1 --- /dev/null +++ b/db/migrate/20171003212958_add_date_to_poll_shift_composed_index.rb @@ -0,0 +1,7 @@ +class AddDateToPollShiftComposedIndex < ActiveRecord::Migration + def change + remove_index "poll_shifts", name: "index_poll_shifts_on_booth_id_and_officer_id_and_task" + remove_index "poll_shifts", name: "index_poll_shifts_on_task" + add_index :poll_shifts, [:booth_id, :officer_id, :date, :task], unique: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 8b3e89a19..9a6fe919d 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: 20171003095936) do +ActiveRecord::Schema.define(version: 20171003212958) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -719,10 +719,9 @@ ActiveRecord::Schema.define(version: 20171003095936) do t.integer "task", default: 0, null: false end - add_index "poll_shifts", ["booth_id", "officer_id", "task"], name: "index_poll_shifts_on_booth_id_and_officer_id_and_task", unique: true, using: :btree + add_index "poll_shifts", ["booth_id", "officer_id", "date", "task"], name: "index_poll_shifts_on_booth_id_and_officer_id_and_date_and_task", unique: true, using: :btree add_index "poll_shifts", ["booth_id"], name: "index_poll_shifts_on_booth_id", using: :btree add_index "poll_shifts", ["officer_id"], name: "index_poll_shifts_on_officer_id", using: :btree - add_index "poll_shifts", ["task"], name: "index_poll_shifts_on_task", using: :btree create_table "poll_total_results", force: :cascade do |t| t.integer "author_id" From b893c0bacef22fd4281089b15b3d0d810e94c508 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 3 Oct 2017 23:45:02 +0200 Subject: [PATCH 286/765] Add shift task presence validation expectation --- spec/models/poll/shift_spec.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/models/poll/shift_spec.rb b/spec/models/poll/shift_spec.rb index b62f220da..686dc41db 100644 --- a/spec/models/poll/shift_spec.rb +++ b/spec/models/poll/shift_spec.rb @@ -24,6 +24,11 @@ describe :shift do expect(shift).to_not be_valid end + it "should not be valid without a task" do + shift.task = nil + expect(shift).to_not be_valid + end + end describe "officer_assignments" do From 19750995455f6cbe9d876e6048e2b4288da0b346 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 3 Oct 2017 23:53:20 +0200 Subject: [PATCH 287/765] Refactor & cleanup let statements on Shift model spec --- spec/models/poll/shift_spec.rb | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/spec/models/poll/shift_spec.rb b/spec/models/poll/shift_spec.rb index 686dc41db..be564421c 100644 --- a/spec/models/poll/shift_spec.rb +++ b/spec/models/poll/shift_spec.rb @@ -1,9 +1,14 @@ require 'rails_helper' describe :shift do - let(:shift) { build(:poll_shift) } + let(:poll) { create(:poll) } + let(:booth) { create(:poll_booth) } + let(:user) { create(:user, username: "Ana", email: "ana@example.com") } + let(:officer) { create(:poll_officer, user: user) } + let(:recount_shift) { build(:poll_shift, booth: booth, officer: officer, date: Date.current, task: :recount_scrutiny) } describe "validations" do + let(:shift) { build(:poll_shift) } it "should be valid" do expect(shift).to be_valid @@ -34,14 +39,10 @@ describe :shift do describe "officer_assignments" do it "should create and destroy corresponding officer_assignments" do - poll1 = create(:poll) poll2 = create(:poll) poll3 = create(:poll) - booth = create(:poll_booth) - officer = create(:poll_officer) - - booth_assignment1 = create(:poll_booth_assignment, poll: poll1, booth: booth) + booth_assignment1 = create(:poll_booth_assignment, poll: poll, booth: booth) booth_assignment2 = create(:poll_booth_assignment, poll: poll2, booth: booth) expect { create(:poll_shift, booth: booth, officer: officer, date: Date.current) }.to change {Poll::OfficerAssignment.all.count}.by(2) @@ -66,13 +67,8 @@ describe :shift do end it "should create final officer_assignments" do - poll = create(:poll) - booth = create(:poll_booth) - officer = create(:poll_officer) - booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth) - - shift = create(:poll_shift, booth: booth, officer: officer, date: Date.current, task: :recount_scrutiny) + recount_shift.save officer_assignments = Poll::OfficerAssignment.all expect(officer_assignments.count).to eq(1) @@ -88,10 +84,7 @@ describe :shift do end describe "#persist_data" do - - let(:user) { create(:user, username: "Ana", email: "ana@example.com") } - let(:officer) { create(:poll_officer, user: user) } - let(:shift) { create(:poll_shift, officer: officer) } + let(:shift) { create(:poll_shift, officer: officer, booth: booth) } it "should maintain officer data after destroying associated user" do shift.officer.user.destroy From b1eb6698be18674dfb968aac923d6fff24f457df Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 4 Oct 2017 00:13:10 +0200 Subject: [PATCH 288/765] Add validation expectations for shift date/task/booth/officer combinations --- spec/models/poll/shift_spec.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/spec/models/poll/shift_spec.rb b/spec/models/poll/shift_spec.rb index be564421c..cba4285ae 100644 --- a/spec/models/poll/shift_spec.rb +++ b/spec/models/poll/shift_spec.rb @@ -34,6 +34,24 @@ describe :shift do expect(shift).to_not be_valid end + it "should not be valid with same booth, officer, date and task" do + recount_shift.save + + expect(build(:poll_shift, booth: booth, officer: officer, date: Date.current, task: :recount_scrutiny)).to_not be_valid + end + + it "should be valid with same booth, officer and date but different task" do + recount_shift.save + + expect(build(:poll_shift, booth: booth, officer: officer, date: Date.current, task: :vote_collection)).to be_valid + end + + it "should be valid with same booth, officer and task but different date" do + recount_shift.save + + expect(build(:poll_shift, booth: booth, officer: officer, date: Date.tomorrow, task: :recount_scrutiny)).to be_valid + end + end describe "officer_assignments" do From e928eb38acd093dead71fb1401a109daa37fdd0c Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 4 Oct 2017 00:39:31 +0200 Subject: [PATCH 289/765] Add Officer relationship to Poll Voter --- app/controllers/officing/voters_controller.rb | 3 ++- app/models/poll/voter.rb | 1 + db/migrate/20171003223152_add_officer_to_poll_voter.rb | 5 +++++ db/schema.rb | 3 ++- spec/factories.rb | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20171003223152_add_officer_to_poll_voter.rb diff --git a/app/controllers/officing/voters_controller.rb b/app/controllers/officing/voters_controller.rb index a5343f83d..2c3867416 100644 --- a/app/controllers/officing/voters_controller.rb +++ b/app/controllers/officing/voters_controller.rb @@ -13,7 +13,8 @@ class Officing::VotersController < Officing::BaseController document_number: @user.document_number, user: @user, poll: @poll, - origin: "booth") + origin: "booth", + officer: current_user.poll_officer) @voter.save! end diff --git a/app/models/poll/voter.rb b/app/models/poll/voter.rb index abcae7d25..bc0118a88 100644 --- a/app/models/poll/voter.rb +++ b/app/models/poll/voter.rb @@ -8,6 +8,7 @@ class Poll belongs_to :geozone belongs_to :booth_assignment belongs_to :officer_assignment + belongs_to :officer validates :poll_id, presence: true validates :user_id, presence: true diff --git a/db/migrate/20171003223152_add_officer_to_poll_voter.rb b/db/migrate/20171003223152_add_officer_to_poll_voter.rb new file mode 100644 index 000000000..99f9cd3e3 --- /dev/null +++ b/db/migrate/20171003223152_add_officer_to_poll_voter.rb @@ -0,0 +1,5 @@ +class AddOfficerToPollVoter < ActiveRecord::Migration + def change + add_column :poll_voters, :officer_id, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 9a6fe919d..a53b0c490 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: 20171003212958) do +ActiveRecord::Schema.define(version: 20171003223152) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -752,6 +752,7 @@ ActiveRecord::Schema.define(version: 20171003212958) do t.integer "officer_assignment_id" t.integer "user_id" t.string "origin" + t.integer "officer_id" end add_index "poll_voters", ["booth_assignment_id"], name: "index_poll_voters_on_booth_assignment_id", using: :btree diff --git a/spec/factories.rb b/spec/factories.rb index c21c35b4e..a127d1bc9 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -531,6 +531,7 @@ FactoryGirl.define do factory :poll_voter, class: 'Poll::Voter' do poll association :user, :level_two + association :officer, factory: :poll_officer origin "web" trait :from_booth do From 85087b0bea5b457cdbcb3a8d3ed94fa39f20f20d Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 4 Oct 2017 01:08:33 +0200 Subject: [PATCH 290/765] Check officer value for Poll Voter created from officing panel --- spec/features/officing/voters_spec.rb | 2 ++ spec/models/poll/answer_spec.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/spec/features/officing/voters_spec.rb b/spec/features/officing/voters_spec.rb index 0a23a6a27..b4127b5b8 100644 --- a/spec/features/officing/voters_spec.rb +++ b/spec/features/officing/voters_spec.rb @@ -26,6 +26,8 @@ feature 'Voters' do page.evaluate_script("window.location.reload()") expect(page).to have_content "Has already participated in this poll" expect(page).to_not have_button "Confirm vote" + + expect(Poll::Voter.last.officer_id).to eq(officer.id) end scenario "Already voted", :js do diff --git a/spec/models/poll/answer_spec.rb b/spec/models/poll/answer_spec.rb index d66cdc18c..d245af8d4 100644 --- a/spec/models/poll/answer_spec.rb +++ b/spec/models/poll/answer_spec.rb @@ -51,6 +51,7 @@ describe Poll::Answer do expect(voter.document_number).to eq(answer.author.document_number) expect(voter.poll_id).to eq(answer.poll.id) + expect(voter.officer_id).to eq(nil) end it "updates a poll_voter with user and poll data" do From 1d1b861ddf34e7caaf68077c9a6e4dc571acd3aa Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Tue, 3 Oct 2017 23:04:50 -0400 Subject: [PATCH 291/765] Create 'poll_question_answers' table --- app/models/poll/question.rb | 1 + app/models/poll/question_answer.rb | 5 +++++ .../20171004025903_create_poll_question_answers.rb | 9 +++++++++ db/schema.rb | 11 ++++++++++- 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 app/models/poll/question_answer.rb create mode 100644 db/migrate/20171004025903_create_poll_question_answers.rb diff --git a/app/models/poll/question.rb b/app/models/poll/question.rb index a46f28a8c..d576ac95a 100644 --- a/app/models/poll/question.rb +++ b/app/models/poll/question.rb @@ -15,6 +15,7 @@ class Poll::Question < ActiveRecord::Base has_many :comments, as: :commentable has_many :answers + has_many :question_answers, class_name: 'Poll::QuestionAnswer', foreign_key: 'poll_question_id' has_many :partial_results belongs_to :proposal diff --git a/app/models/poll/question_answer.rb b/app/models/poll/question_answer.rb new file mode 100644 index 000000000..508a92ee2 --- /dev/null +++ b/app/models/poll/question_answer.rb @@ -0,0 +1,5 @@ +class Poll::QuestionAnswer < ActiveRecord::Base + belongs_to :question, class_name: 'Poll::Question', foreign_key: 'poll_question_id' + + validates :title, presence: true +end diff --git a/db/migrate/20171004025903_create_poll_question_answers.rb b/db/migrate/20171004025903_create_poll_question_answers.rb new file mode 100644 index 000000000..834421f5f --- /dev/null +++ b/db/migrate/20171004025903_create_poll_question_answers.rb @@ -0,0 +1,9 @@ +class CreatePollQuestionAnswers < ActiveRecord::Migration + def change + create_table :poll_question_answers do |t| + t.string :title + t.text :description + t.references :poll_question, index: true, foreign_key: true + end + end +end diff --git a/db/schema.rb b/db/schema.rb index af121fa0e..4e62c099c 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: 20171002191347) do +ActiveRecord::Schema.define(version: 20171004025903) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -669,6 +669,14 @@ ActiveRecord::Schema.define(version: 20171002191347) do add_index "poll_partial_results", ["origin"], name: "index_poll_partial_results_on_origin", using: :btree add_index "poll_partial_results", ["question_id"], name: "index_poll_partial_results_on_question_id", using: :btree + create_table "poll_question_answers", force: :cascade do |t| + t.string "title" + t.text "description" + t.integer "poll_question_id" + end + + add_index "poll_question_answers", ["poll_question_id"], name: "index_poll_question_answers_on_poll_question_id", using: :btree + create_table "poll_questions", force: :cascade do |t| t.integer "proposal_id" t.integer "poll_id" @@ -1143,6 +1151,7 @@ ActiveRecord::Schema.define(version: 20171002191347) do add_foreign_key "poll_partial_results", "poll_officer_assignments", column: "officer_assignment_id" add_foreign_key "poll_partial_results", "poll_questions", column: "question_id" add_foreign_key "poll_partial_results", "users", column: "author_id" + add_foreign_key "poll_question_answers", "poll_questions" add_foreign_key "poll_questions", "polls" add_foreign_key "poll_questions", "proposals" add_foreign_key "poll_questions", "users", column: "author_id" From 1cc0816dcdd47409a897dafc83bde14ac4d2830f Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Tue, 3 Oct 2017 23:23:50 -0400 Subject: [PATCH 292/765] Create 'poll_question_answers' controller and views --- .../admin/poll/answers_controller.rb | 29 +++++++++++++++++++ app/models/poll/question_answer.rb | 4 +++ app/views/admin/poll/answers/_form.html.erb | 24 +++++++++++++++ app/views/admin/poll/answers/new.html.erb | 7 +++++ app/views/admin/poll/questions/show.html.erb | 7 +++-- config/locales/en/activerecord.yml | 3 ++ config/locales/en/admin.yml | 3 ++ config/locales/es/activerecord.yml | 3 ++ config/locales/es/admin.yml | 3 ++ config/locales/fr/activerecord.yml | 3 ++ config/locales/fr/admin.yml | 3 ++ config/routes.rb | 4 ++- 12 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 app/controllers/admin/poll/answers_controller.rb create mode 100644 app/views/admin/poll/answers/_form.html.erb create mode 100644 app/views/admin/poll/answers/new.html.erb diff --git a/app/controllers/admin/poll/answers_controller.rb b/app/controllers/admin/poll/answers_controller.rb new file mode 100644 index 000000000..f949ad115 --- /dev/null +++ b/app/controllers/admin/poll/answers_controller.rb @@ -0,0 +1,29 @@ +class Admin::Poll::AnswersController < Admin::Poll::BaseController + before_action :load_question + + load_and_authorize_resource :question, class: "::Poll::Question" + + def new + @answer = Poll::QuestionAnswer.new + end + + def create + @answer = Poll::QuestionAnswer.new(answer_params) + + if @answer.save + redirect_to admin_question_path(@question) + else + render :new + end + end + + private + + def answer_params + params.require(:poll_question_answer).permit(:title, :description, :poll_question_id) + end + + def load_question + @question = ::Poll::Question.find(params[:question_id]) + end +end diff --git a/app/models/poll/question_answer.rb b/app/models/poll/question_answer.rb index 508a92ee2..871336cfd 100644 --- a/app/models/poll/question_answer.rb +++ b/app/models/poll/question_answer.rb @@ -2,4 +2,8 @@ class Poll::QuestionAnswer < ActiveRecord::Base belongs_to :question, class_name: 'Poll::Question', foreign_key: 'poll_question_id' validates :title, presence: true + + def description + super.try :html_safe + end end diff --git a/app/views/admin/poll/answers/_form.html.erb b/app/views/admin/poll/answers/_form.html.erb new file mode 100644 index 000000000..7da1afd26 --- /dev/null +++ b/app/views/admin/poll/answers/_form.html.erb @@ -0,0 +1,24 @@ +<%= form_for(@answer, url: form_url) do |f| %> + + <%= render 'shared/errors', resource: @answer %> + + <%= f.hidden_field :poll_question_id, value: @question.id %> + +
    +
    + <%= f.text_field :title %> + +
    + <%= f.cktext_area :description, + maxlength: Poll::Question.description_max_length, + ckeditor: { language: I18n.locale } %> +
    + +
    +
    + <%= f.submit(class: "button expanded", value: t("shared.save")) %> +
    +
    +
    +
    +<% end %> diff --git a/app/views/admin/poll/answers/new.html.erb b/app/views/admin/poll/answers/new.html.erb new file mode 100644 index 000000000..b4d02cfeb --- /dev/null +++ b/app/views/admin/poll/answers/new.html.erb @@ -0,0 +1,7 @@ +<%= back_link_to %> + +

    <%= t('admin.answers.new.title') %>

    + +
    + <%= render "form", form_url: admin_question_answers_path %> +
    diff --git a/app/views/admin/poll/questions/show.html.erb b/app/views/admin/poll/questions/show.html.erb index 9d38735ca..6f8dfd583 100644 --- a/app/views/admin/poll/questions/show.html.erb +++ b/app/views/admin/poll/questions/show.html.erb @@ -27,7 +27,7 @@ - + @@ -36,7 +36,10 @@ - + <% @question.question_answers.each do |answer| %> + + + <% end %>
    <%= t('admin.questions.show.valid_answers') %><%= link_to t("admin.questions.show.add_answer"), "#", class: "button hollow float-right" %><%= link_to t("admin.questions.show.add_answer"), new_admin_question_answer_path(@question), class: "button hollow float-right" %>
    <%= answer.title %><%= answer.description %>
    diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 1e3f62b1a..dd279f6ae 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -211,6 +211,9 @@ en: image: title: Title attachment: Attachment + poll/question_answer: + title: "Answer" + description: "Description" errors: models: user: diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 2b8a18ce2..2c6b8bc97 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -608,6 +608,9 @@ en: video_url: External video documents: Documents (1) preview: View on website + answers: + new: + title: "New answer" recounts: index: title: "Recounts" diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index 108f19fcf..c12b8e9a9 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -205,6 +205,9 @@ es: image: title: Título attachment: Archivo adjunto + poll/question_answer: + title: "Respuesta" + description: "Descripción" errors: models: user: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 333cf9cf9..37e34fa52 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -608,6 +608,9 @@ es: video_url: Video externo documents: Documentos (1) preview: Ver en la web + answers: + new: + title: "Nueva respuesta" recounts: index: title: "Recuentos" diff --git a/config/locales/fr/activerecord.yml b/config/locales/fr/activerecord.yml index b588d37dc..d6ab5db80 100644 --- a/config/locales/fr/activerecord.yml +++ b/config/locales/fr/activerecord.yml @@ -147,6 +147,9 @@ fr: name: Nom locale: Langue body: Contenu + poll/question_answer: + title: "Réponse" + description: "Description" errors: models: user: diff --git a/config/locales/fr/admin.yml b/config/locales/fr/admin.yml index f509b2a94..e000c8a28 100644 --- a/config/locales/fr/admin.yml +++ b/config/locales/fr/admin.yml @@ -386,6 +386,9 @@ fr: answer: "Réponse" description: Description preview: Voir l'aperçu + answers: + new: + title: "Nouvelle réponse" recounts: index: title: "Dépouillements" diff --git a/config/routes.rb b/config/routes.rb index 410f2dced..d72058737 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -302,7 +302,9 @@ Rails.application.routes.draw do end end - resources :questions + resources :questions do + resources :answers, only: [:new, :create] + end end resources :verifications, controller: :verifications, only: :index do From 8dc05d399b9ba1343ef5efbe8e111cf7453866d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 4 Oct 2017 10:03:44 +0200 Subject: [PATCH 293/765] Fixed tests --- spec/features/admin/poll/questions_spec.rb | 5 ----- spec/shared/features/nested_documentable.rb | 1 - 2 files changed, 6 deletions(-) diff --git a/spec/features/admin/poll/questions_spec.rb b/spec/features/admin/poll/questions_spec.rb index ca3706a24..52e3783f0 100644 --- a/spec/features/admin/poll/questions_spec.rb +++ b/spec/features/admin/poll/questions_spec.rb @@ -24,7 +24,6 @@ feature 'Admin poll questions' do visit admin_question_path(question) expect(page).to have_content(question.title) - expect(page).to have_content(question.description) expect(page).to have_content(question.author.name) expect(page).to have_content(question.valid_answers.join(" ")) end @@ -45,13 +44,11 @@ feature 'Admin poll questions' do select 'Movies', from: 'poll_question_poll_id' fill_in 'poll_question_title', with: title - fill_in 'poll_question_description', with: description fill_in 'poll_question_video_url', with: video_url click_button 'Save' expect(page).to have_content(title) - expect(page).to have_content(description) expect(page).to have_content(video_url) end @@ -64,7 +61,6 @@ feature 'Admin poll questions' do expect(current_path).to eq(new_admin_question_path) expect(page).to have_field('poll_question_title', with: proposal.title) - expect(page).to have_field('poll_question_description', with: proposal.description) expect(page).to have_field('poll_question_valid_answers', with: "Yes, No") select 'Proposals', from: 'poll_question_poll_id' @@ -72,7 +68,6 @@ feature 'Admin poll questions' do click_button 'Save' expect(page).to have_content(proposal.title) - expect(page).to have_content(proposal.description) expect(page).to have_link(proposal.title, href: proposal_path(proposal)) expect(page).to have_link(proposal.author.name, href: user_path(proposal.author)) end diff --git a/spec/shared/features/nested_documentable.rb b/spec/shared/features/nested_documentable.rb index 10a2c9fbf..8780936a7 100644 --- a/spec/shared/features/nested_documentable.rb +++ b/spec/shared/features/nested_documentable.rb @@ -322,5 +322,4 @@ end def documentable_fill_new_valid_poll_question page.select documentable.poll.name, from: 'poll_question_poll_id' fill_in 'poll_question_title', with: "Star Wars: Episode IV - A New Hope" - fill_in_ckeditor "poll_question_description", with: "Description" end From 1b3cdc181dcda64ef56964c6a2af1907fa74ba6f Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 2 Oct 2017 20:44:28 +0200 Subject: [PATCH 294/765] improves polls show layout --- app/assets/stylesheets/layout.scss | 4 +++ app/assets/stylesheets/participation.scss | 37 ++--------------------- app/views/polls/show.html.erb | 35 ++++++++------------- config/locales/en/general.yml | 3 +- config/locales/es/general.yml | 3 +- 5 files changed, 22 insertions(+), 60 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 44b450779..a0844d6b2 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -303,6 +303,10 @@ a { float: left; } +.back:not([class^="icon-"]) { + text-decoration: underline; +} + .tabs-content { border: 0; } diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 8b7390191..21160f7e9 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1549,18 +1549,8 @@ // 08. Polls // ---------------------- -.dark-heading { - background: #2d3e50; - color: #fff; - - .title { - color: #92ba48; - } - - .button { - background: #fff; - color: $brand; - } +.polls-show-header { + background: #fafafa; .callout { @@ -1576,29 +1566,6 @@ color: $color-alert; } } - - .info { - background: #314253; - padding: $line-height; - - @include breakpoint(medium) { - border-top: rem-calc(6) solid #92ba48; - } - } - - a:not(.button) { - color: #fff; - text-decoration: underline; - } - - .back, - .icon-angle-left { - color: #fff; - } - - &.polls-show-header { - min-height: $line-height * 8; - } } .poll, diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 6895397de..04dce1d40 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -1,10 +1,10 @@ <% provide :title do %><%= @poll.name %><% end %>
    -
    +
    - <%= back_link_to polls_path %> + <%= back_link_to polls_path, t("polls.show.back") %>

    <%= @poll.name %>

      @@ -12,25 +12,22 @@
    • <%= g.name %>
      • <% end %>
    +
    - <%= render "callout" %> -
    -
    -
    -

    - - <%= t("polls.show.dates_title") %> - -
    - <%= poll_dates(@poll) %> -

    -
    -
    +
    + <%= render "callout" %> + <% if @poll.voted_in_booth?(current_user) %>
    <%= t("polls.show.already_voted_in_booth") %> @@ -41,13 +38,5 @@ <% end %> <% end %>
    - -
    diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index ff8a77014..5042eedb8 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -482,7 +482,7 @@ en: help_text_2: "To participate in the next vote you have to sign up on %{org} and verify your account. All registered voters in the city over 16 years old can vote. The results of all votes are binding on the government." show: already_voted_in_booth: "You have already participated in a booth for this poll." - dates_title: "Participation dates" + back: Back to voting cant_answer_not_logged_in: "You must %{signin} or %{signup} to participate." signin: Sign in signup: Sign up @@ -607,6 +607,7 @@ en: budget: Participatory budget searcher: Searcher go_to_page: "Go to page of " + share: Share social: blog: "%{org} Blog" facebook: "%{org} Facebook" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index aaa59a900..e984f6675 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -482,7 +482,7 @@ es: help_text_2: "Para participar en la próxima votación tienes que registrarte en %{org} y verificar tu cuenta. Pueden votar todas las personas empadronadas en la ciudad mayores de 16 años. Los resultados de todas las votaciones serán vinculantes para el gobierno." show: already_voted_in_booth: "Ya has participado en esta votación en una urna." - dates_title: "Fechas de participación" + back: Volver a votaciones cant_answer_not_logged_in: "Necesitas %{signin} o %{signup} para participar." signin: iniciar sesión signup: registrarte @@ -607,6 +607,7 @@ es: budget: Presupuestos participativos searcher: Buscador go_to_page: "Ir a la página de " + share: Compartir social: blog: "Blog de %{org}" facebook: "Facebook de %{org}" From ad08303dfdf8ca445fe6117e5385769d6f44ff25 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 3 Oct 2017 20:24:10 +0200 Subject: [PATCH 295/765] removes question link on polls index --- app/views/polls/_poll_group.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/polls/_poll_group.html.erb b/app/views/polls/_poll_group.html.erb index 9372aee17..fe12c341b 100644 --- a/app/views/polls/_poll_group.html.erb +++ b/app/views/polls/_poll_group.html.erb @@ -51,7 +51,7 @@ <%= poll_dates(poll) %>
      <% poll.questions.each do |question| %> -
    • <%= link_to question.title, question_path(question) %>
      • +
    • <%= question.title %>
      • <% end %>
    <% end %> From 87676f52964ffd744ebf957ae2e7557e7f9b99bf Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 3 Oct 2017 20:45:31 +0200 Subject: [PATCH 296/765] include lorem ipsum content on polls show --- app/assets/stylesheets/participation.scss | 9 ++++++ app/views/polls/show.html.erb | 37 +++++++++++++++++++---- config/locales/en/general.yml | 2 ++ config/locales/es/general.yml | 2 ++ 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 21160f7e9..5be764745 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1568,6 +1568,15 @@ } } +.poll-more-info, +.poll-more-info-answers { + border-top: 1px solid #eee; +} + +.poll-more-info-answers { + background: #fafafa; +} + .poll, .poll-question { border: 1px solid $border; diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 04dce1d40..890e8c56f 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -7,11 +7,19 @@ <%= back_link_to polls_path, t("polls.show.back") %>

    <%= @poll.name %>

    -
      - <% @poll.geozones.each do |g| %> -
    • <%= g.name %>
      • - <% end %> -
    + + +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat.

    + + + <% if @poll.geozones.any? %> +
      + <% @poll.geozones.each do |g| %> +
    • <%= g.name %>
      • + <% end %> +
    + <% end %>
    -
    +
    <%= render "callout" %> @@ -39,4 +47,21 @@ <% end %>
    + +
    +
    +
    +

    <%= t("polls.show.more_info_title") %>

    + +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

    + +
    + +
    +
    diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 5042eedb8..0f662879d 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -490,6 +490,8 @@ en: verify_link: "verify your account" cant_answer_incoming: "This poll has not yet started." cant_answer_expired: "This poll has finished." + more_info_title: "More information" + documents: Documents poll_questions: create_question: "Create question" default_valid_answers: "Yes, No" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index e984f6675..88fef9cd4 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -490,6 +490,8 @@ es: verify_link: "verifica tu cuenta" cant_answer_incoming: "Esta votación todavía no ha comenzado." cant_answer_expired: "Esta votación ha terminado." + more_info_title: "Más información" + documents: Documentación poll_questions: create_question: "Crear pregunta para votación" default_valid_answers: "Sí, No" From 639f24e316cd1b7f9d8dcf433380d781c60db4d0 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 3 Oct 2017 22:21:02 +0200 Subject: [PATCH 297/765] adds foundation orbit components and customise them --- .../stylesheets/foundation_and_overrides.scss | 5 ++++ app/assets/stylesheets/participation.scss | 30 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/app/assets/stylesheets/foundation_and_overrides.scss b/app/assets/stylesheets/foundation_and_overrides.scss index 0bead10ae..66640f3f2 100644 --- a/app/assets/stylesheets/foundation_and_overrides.scss +++ b/app/assets/stylesheets/foundation_and_overrides.scss @@ -4,6 +4,7 @@ @import 'consul_settings'; @import 'custom_settings'; @import 'foundation'; +@import 'motion-ui/motion-ui'; @include foundation-global-styles; @include foundation-grid; @@ -37,3 +38,7 @@ @include foundation-title-bar; @include foundation-top-bar; @include foundation-menu-icon; +@include foundation-orbit; + +@include motion-ui-transitions; +@include motion-ui-animations; diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 5be764745..582e6edb4 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1575,6 +1575,36 @@ .poll-more-info-answers { background: #fafafa; + border-bottom: 1px solid #eee; + + .column:nth-child(odd) { + border-right: 1px solid #eee; + } +} + +.orbit-bullets button { + background-color: #ccc; + height: $line-height / 2; + width: $line-height / 2; + + &.is-active { + background-color: $brand; + } +} + +.orbit-container { + height: 100% !important; + max-height: none !important; +} + +.orbit-slide { + max-height: none !important; +} + +.orbit-caption { + background: #eee; + color: $text; +} } .poll, From cfbc5db9af97e845ca183d4d8b3234309d70304d Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 3 Oct 2017 22:25:50 +0200 Subject: [PATCH 298/765] adds zoom icons and texts --- app/assets/fonts/icons.eot | Bin 12060 -> 12528 bytes app/assets/fonts/icons.svg | 2 ++ app/assets/fonts/icons.ttf | Bin 11904 -> 12372 bytes app/assets/fonts/icons.woff | Bin 9236 -> 9352 bytes app/assets/stylesheets/icons.scss | 8 ++++++++ app/assets/stylesheets/participation.scss | 22 ++++++++++++++++++++++ config/locales/en/general.yml | 1 + config/locales/es/general.yml | 1 + 8 files changed, 34 insertions(+) diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index 5f29191f77be1a7f8e4634f5e26a38271acc9df7..5564a5c62a83883cf5911bcc08931452d8ca3931 100644 GIT binary patch delta 600 zcmbOe_aTw(g8>6Wh`~fQGnTd^?SCgauQpPIV``M zfq|ujfkAyiMrvXTuVC)t$pVbB^+{}sKs_6P>Y8%$lM{6`%{3Spn12BIHMxlu1q@vb zTY>T*cPQi~=B5f+_8w+n&=CQOws?MYVsOJT}IoW)=ow2WB=PhYiSP12R=6D@bZdN(%uwEKJPIOe{bd zAr_DfND=R3Z%Iuhgw6a6vJ8$en_;#=?cf30u@s~YNPtb{2AK*r4Q!6qp+a^$x zf$|nWzCvDNZmOVt=K}@?tr(zKUO|3wiB3y`Cj*1_8KB*{42(ckK-^LOdwx8>%~u9) zCZGTV!_`j#x-k0xJD^G-us8<;kea-PQJ2wr@-4=Xlg~5hF&a<)$8-WHy!iyP3*%-1 z){m-_H|l&~H)610&}Fckyh2xn#mGX}a`FY;LZB`uy|T@F^sX{8GE81&AkSzu`ILb) HH + + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index 2524576116599f0536ecdd99d106894ce5b7f0aa..6af0797fb5fe1f6a0dee2d96adbaa03fea58f23c 100644 GIT binary patch delta 587 zcmZpOy^>JRz{tSBz{}9Uz|0Wf<`&{xVQ{{Tfx*B6C@SOb;_Akb#lQySO91%_{=xc2 z{-Y}Begz}#enfMP_qb7KqVu$q=Gw%O%cf70OU92TU zXqsyNOUz9bvg|#~z@P)v&zM(`UtD6s^Asqh+X8e{ z7ua(^5B_aG(iYEe^Ob>{2`IdrNXndz*@2mvSr~{NnAw0FHXxe~$W)o!BB3QIEd=DS zFflVTu>fU+SU@r$MZA;OOK2(~Z02W>WpISq46_Yt2M^GWr66rU0&FTb$W*XtU~{x4 z$7p?IH)hafFk~>89HOnlVytUuFu6v%5EuaOw98l+Eg7vgr|4W|l;kc>O)N^z&@IR* dE#`r;b2IZwizi#@$urtaj?$Cnh6m!bU;tN3f1>~Z delta 355 zcmcbT&=6bCz{tSBz{}9Uz|0Wf<`&{xq2#Q^z@V1`6qRvzadl(JU|<9CU4VQA|6qM1 z|5Gvh85kHNfc&uJ+{A)ACpQW+FfbVa#SWz>78m^g4>XBE&ju*Zk)BhTR$cV-IRgVr z4g-Vghm6$36keu>;Xt`NKx~$gky@X~V!-$rs96LkppubWQo$X-#t-Cg0P^c{@{;CwqyJ_*_cU>(Rgwa(+Qxe z%{t63jGIeXKB`U@)%n0~#9+ao%V0T~M^}Z#$U@h0vWadXP}efuvds#5R~Z=@Ci5A{ QGg?j7Gmz$n8y=tw0BJi|NB{r; diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff index 2cf6dc4b73a9d4df579a75f015aa210bd68cd0a0..7f8f3c95e81bff9ad949c7b630da7ecfa6e4e196 100644 GIT binary patch delta 9275 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 delta 9151 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 A;Q#;t diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index 135b9fe12..96eb10a0d 100644 --- a/app/assets/stylesheets/icons.scss +++ b/app/assets/stylesheets/icons.scss @@ -260,3 +260,11 @@ .icon-image::before { content: '\33'; } + +.icon-search-plus::before { + content: '\34'; +} + +.icon-search-minus::before { + content: '\35'; +} diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 582e6edb4..38e330003 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1605,6 +1605,28 @@ background: #eee; color: $text; } + +.zoom-link { + background: #fff; + border-radius: rem-calc(48); + color: #000; + font-size: rem-calc(24); + font-weight: bold; + height: rem-calc(48); + line-height: rem-calc(48); + right: 12px; + padding-top: rem-calc(4); + position: absolute; + text-align: center; + top: 24px; + width: rem-calc(48); + z-index: 9; + + &:hover { + background: $dark; + color: #fff; + text-decoration: none; + } } .poll, diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 0f662879d..644c84562 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -492,6 +492,7 @@ en: cant_answer_expired: "This poll has finished." more_info_title: "More information" documents: Documents + zoom_plus: Expand image poll_questions: create_question: "Create question" default_valid_answers: "Yes, No" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 88fef9cd4..531be386e 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -492,6 +492,7 @@ es: cant_answer_expired: "Esta votación ha terminado." more_info_title: "Más información" documents: Documentación + zoom_plus: Ampliar imagen poll_questions: create_question: "Crear pregunta para votación" default_valid_answers: "Sí, No" From c9e8152eadef3c56eb793443056ed500fa0350b4 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 3 Oct 2017 22:26:33 +0200 Subject: [PATCH 299/765] includes lorem content and images to answers --- .../images/custom/example_horizontal.jpg | Bin 0 -> 129663 bytes app/assets/images/custom/example_vertical.jpg | Bin 0 -> 116481 bytes app/views/polls/_gallery.html.erb | 42 ++++++++++++++++++ app/views/polls/show.html.erb | 27 +++++++++++ 4 files changed, 69 insertions(+) create mode 100644 app/assets/images/custom/example_horizontal.jpg create mode 100644 app/assets/images/custom/example_vertical.jpg create mode 100644 app/views/polls/_gallery.html.erb diff --git a/app/assets/images/custom/example_horizontal.jpg b/app/assets/images/custom/example_horizontal.jpg new file mode 100644 index 0000000000000000000000000000000000000000..634e432ace6aea808d7bded07ef4e0c36593a456 GIT binary patch literal 129663 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 TfaqF=wG>n@1DYtJsSp3zz}yzF literal 0 HcmV?d00001 diff --git a/app/assets/images/custom/example_vertical.jpg b/app/assets/images/custom/example_vertical.jpg new file mode 100644 index 0000000000000000000000000000000000000000..11743cc18d870045af2ced8d6fc0c9523bd47777 GIT binary patch literal 116481 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"&xOPvR_ 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 + + + <%= t("polls.show.zoom_plus") %> + + +
      +
    • + +
      • +
    • + +
      • + +
    • + <%= link_to "/assets/example_vertical.jpg", target: "_blank" do %> + <%= image_tag "example_horizontal.jpg", class: "orbit-image" %> + <% end %> + Image title 1 +
      • + +
    • + <%= link_to "/assets/example_vertical.jpg", target: "_blank" do %> + <%= image_tag "example_vertical.jpg", class: "orbit-image" %> + <% end %> + Image title 2 +
      • +
    + + +

    diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 890e8c56f..1d4153356 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -64,4 +64,31 @@
    + +
    +
    + + +
    + + +

    Answer 1

    + + + + <%= render "gallery" %> + + + +
    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

    +
    + + +
    +
    + + +
    From 3edd59c8d61fe5a1200a9e59501e77c9f4cfda3c Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 4 Oct 2017 10:54:59 +0200 Subject: [PATCH 300/765] replaces lorem with poll summary and description --- app/views/polls/show.html.erb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 1d4153356..b3a78e402 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -8,10 +8,7 @@

    <%= @poll.name %>

    - -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo - consequat.

    - + <%= safe_html_with_links simple_format(@poll.summary) %> <% if @poll.geozones.any? %>
    - - <%= link_to "Estadísticas", custom_poll_stats_path(@poll.id) %> + +
    + <%= render "results_subnavigation" %> -
    -
    - <%= render "callout" %> - - <% if @poll.voted_in_booth?(current_user) %> -
    - <%= t("polls.show.already_voted_in_booth") %> -
    - <% else %> - - <% if current_user && !@poll.votable_by?(current_user) %> -
    - <%= t("polls.show.already_voted_in_web") %> -
    - <% end %> - <% end %> - - <% @questions.each do |question| %> - <%= render 'polls/questions/question', question: question, token: @token %> - <% end %> - - <% if poll_voter_token(@poll, current_user).empty? %> - - <% end %> - - <%= link_to t("polls.show.participate_in_other_polls"), polls_path, class: "button hollow" %> +
    + <%= render "polls/stats/show" %>
    -
    - -
    -
    -
    -

    <%= t("polls.show.more_info_title") %>

    - <%= safe_html_with_links simple_format(@poll.description) %> -
    - - <% if false %> - - <% end %> -
    -
    - -
    -
    - - <% @poll_questions_answers.each do |answer| %> -
    - - <% if answer.description.present? %> -

    <%= answer.title %>

    - <% end %> - - <% if answer.images.any? %> - <%= render "gallery", answer: answer %> - <% end %> - - <% if answer.description.present? %> -
    -
    - <%= safe_html_with_links simple_format(answer.description) %> -
    -
    - - <%= t("polls.show.read_more", answer: answer.title) %> - - - <%= t("polls.show.read_less", answer: answer.title) %> - -
    -
    - <% end %> - - <% if answer.documents.present? %> -
    -

    -   - <%= t("polls.show.documents") %> -

    - - <% answer.documents.each do |document| %> - <%= link_to document.title, - document.attachment.url, - target: "_blank", - rel: "nofollow" %>
    - <% end %> -
    - <% end %> -
    - <% end %> -
    - +
    + <%= render "show" %> +
    -
    - <%= render "filter_subnav" %> - -
    - <%= render "comments" %> -
    -
    diff --git a/app/views/polls/stats/_show.html.erb b/app/views/polls/stats/_show.html.erb new file mode 100644 index 000000000..1aeb7cf69 --- /dev/null +++ b/app/views/polls/stats/_show.html.erb @@ -0,0 +1,85 @@ +
    +
    +

    <%= t("polls.show.stats.title") %>

    + +
    +
    +

    <%= t("polls.show.stats.total_participation") %>

    + +

    + <%= t("polls.show.stats.total_votes") %>
    + <%= @stats[:total_participants] %> +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    <%= t("polls.show.stats.votes") %><%= t("polls.show.stats.web") %><%= t("polls.show.stats.booth") %><%= t("polls.show.stats.total") %>
    <%= t("polls.show.stats.valid") %><%= @stats[:total_web_valid] %> + (<%= number_to_percentage(@stats[:valid_percentage_web], + strip_insignificant_zeros: true, + precision: 2) %>)<%= @stats[:total_booth_valid] %> + (<%= number_to_percentage(@stats[:valid_percentage_booth], + strip_insignificant_zeros: true, + precision: 2) %>)<%= @stats[:total_valid_votes] %> + (<%= number_to_percentage(@stats[:total_valid_percentage], + strip_insignificant_zeros: true, + precision: 2) %>)
    <%= t("polls.show.stats.white") %><%= @stats[:total_web_white] %> + (<%= number_to_percentage(@stats[:white_percentage_web], + strip_insignificant_zeros: true, + precision: 2) %>)<%= @stats[:total_booth_white] %> + (<%= number_to_percentage(@stats[:white_percentage_booth], + strip_insignificant_zeros: true, + precision: 2) %>)<%= @stats[:total_white_votes] %> + (<%= number_to_percentage(@stats[:total_white_percentage], + strip_insignificant_zeros: true, + precision: 2) %>)
    <%= t("polls.show.stats.null_votes") %><%= @stats[:total_web_null] %> + (<%= number_to_percentage(@stats[:null_percentage_web], + strip_insignificant_zeros: true, + precision: 2) %>)<%= @stats[:total_booth_null] %> + (<%= number_to_percentage(@stats[:null_percentage_booth], + strip_insignificant_zeros: true, + precision: 2) %>)<%= @stats[:total_null_votes] %> + (<%= number_to_percentage(@stats[:total_null_percentage], + strip_insignificant_zeros: true, + precision: 2) %>)
    <%= t("polls.show.stats.total") %><%= @stats[:total_participants_web] %> + (<%= number_to_percentage(@stats[:total_participants_web_percentage], + strip_insignificant_zeros: true, + precision: 2) %>)<%= @stats[:total_participants_booth] %> + (<%= number_to_percentage(@stats[:total_participants_booth_percentage], + strip_insignificant_zeros: true, + precision: 2) %>)<%= @stats[:total_participants_web] + @stats[:total_participants_booth] %>
    +
    +
    \ No newline at end of file diff --git a/app/views/polls/stats/show.html.erb b/app/views/polls/stats/show.html.erb deleted file mode 100644 index 6018708c9..000000000 --- a/app/views/polls/stats/show.html.erb +++ /dev/null @@ -1,53 +0,0 @@ -<% cache [@stats] do %> - <% provide :title do %> - <%= t("polls.stats.page_title", poll: @poll.name) %> - <% end %> - <% provide :social_media_meta_tags do %> - <%= render "shared/social_media_meta_tags", - social_url: poll_url(@poll), - social_title: @poll.name, - social_description: @poll.description %> - <% end %> - -
    -
    -
    -
    - <%= back_link_to polls_path %> -

    <%= t("polls.stats.title") %>
    <%= @poll.name %>

    -
    -
    -
    - - -
    -
    -
    - <%= t("polls.stats.total_participants") %> -

    - <%= @stats[:total_participants] %> -

    - - - - - - - - - - - - - -
    WebBooth
    <%= @stats[:total_participants_web] %><%= @stats[:total_participants_booth] %>
    - - <%= t("polls.stats.total_votes") %> -

    - <%= @stats[:total_votes] %> -

    -
    -
    -
    -
    -<% end %> \ No newline at end of file diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 77579a7ea..e39d1aa07 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -497,6 +497,17 @@ en: read_more: "Read more about %{answer}" read_less: "Read less about %{answer}" participate_in_other_polls: Participate in other polls + stats: + title: "Participation data" + total_participation: "Total participation" + total_votes: "Total amount of given votes" + votes: "VOTES" + web: "WEB" + booth: "BOOTH" + total: "TOTAL" + valid: "Valid" + white: "White votes" + null_votes: "Invalid" poll_questions: create_question: "Create question" default_valid_answers: "Yes, No" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 11e5e252a..8ba167a05 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -497,6 +497,17 @@ es: read_more: "Leer más sobre %{answer}" read_less: "Leer menos sobre %{answer}" participate_in_other_polls: Participar en otras votaciones + stats: + title: "Datos de participación" + total_participation: "Participación total" + total_votes: "Nº total de votos emitidos" + votes: "VOTOS" + web: "WEB" + booth: "URNAS" + total: "TOTAL" + valid: "Válidos" + white: "En blanco" + null_votes: "Nulos" poll_questions: create_question: "Crear pregunta para votación" default_valid_answers: "Sí, No" From 0f73b787b2fda47f95130df2395511ade1fbaca8 Mon Sep 17 00:00:00 2001 From: iagirre Date: Tue, 17 Oct 2017 16:07:44 +0200 Subject: [PATCH 520/765] Fixed views and Poll::Stats model to pass the specs --- app/models/poll/stats.rb | 2 +- app/views/polls/_results_subnavigation.html.erb | 4 ++-- app/views/polls/show.html.erb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index 1eef537a0..1df281434 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -26,7 +26,7 @@ class Poll end def total_participants_web_percentage - total_participants_web * 100 / total_participants + (total_participants) == 0 ? 0 : total_participants_web * 100 / total_participants end def total_participants_booth diff --git a/app/views/polls/_results_subnavigation.html.erb b/app/views/polls/_results_subnavigation.html.erb index afff4de03..43aa95b40 100644 --- a/app/views/polls/_results_subnavigation.html.erb +++ b/app/views/polls/_results_subnavigation.html.erb @@ -1,14 +1,14 @@
      -
    • +
    • <%= link_to "#tab-stats" do %>

      <%= "Estadísticas" %>

      <% end %>
      • -
    • +
    • <%= link_to "#tab-information" do %>

      <%= "Información" %> diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index e7e22124e..e4e11af6f 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -32,10 +32,10 @@
      <%= render "results_subnavigation" %> -
      +
      <%= render "polls/stats/show" %>
      -
      +
      <%= render "show" %>
      From 12ac758e8ef58742408a2eb9787334e5c19e7f96 Mon Sep 17 00:00:00 2001 From: Manuel Ortega Date: Tue, 17 Oct 2017 18:11:29 +0200 Subject: [PATCH 521/765] Added investment's user generated tags to admin interface form --- .../admin/budget_investments_controller.rb | 2 +- .../admin/budget_investments/edit.html.erb | 9 ++++++- config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 1 + .../features/admin/budget_investments_spec.rb | 27 +++++++++++++++---- 5 files changed, 33 insertions(+), 7 deletions(-) diff --git a/app/controllers/admin/budget_investments_controller.rb b/app/controllers/admin/budget_investments_controller.rb index dd10930fb..4b6bd6b3a 100644 --- a/app/controllers/admin/budget_investments_controller.rb +++ b/app/controllers/admin/budget_investments_controller.rb @@ -51,7 +51,7 @@ class Admin::BudgetInvestmentsController < Admin::BaseController def budget_investment_params params.require(:budget_investment) - .permit(:title, :description, :external_url, :heading_id, :administrator_id, :valuation_tag_list, :incompatible, + .permit(:title, :description, :external_url, :heading_id, :administrator_id, :tag_list, :valuation_tag_list, :incompatible, :selected, valuator_ids: []) end diff --git a/app/views/admin/budget_investments/edit.html.erb b/app/views/admin/budget_investments/edit.html.erb index c33039021..ab843cf24 100644 --- a/app/views/admin/budget_investments/edit.html.erb +++ b/app/views/admin/budget_investments/edit.html.erb @@ -18,6 +18,13 @@ <%= f.cktext_area :description, maxlength: Budget::Investment.description_max_length, ckeditor: { language: I18n.locale } %>
      +
      + <%= f.label :tag_list, t("admin.budget_investments.edit.user_tags") %> + <%= f.text_field :tag_list, + value: @investment.tag_list.sort.join(','), + label: false %> +
      +
      <%= f.text_field :external_url %>
      @@ -39,7 +46,7 @@
      - <%= f.label :tag_list, t("admin.budget_investments.edit.tags") %> + <%= f.label :valuation_tag_list, t("admin.budget_investments.edit.tags") %>
      <% @tags.each do |tag| %> <%= tag.name %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 87bbb6685..398ce6421 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -181,6 +181,7 @@ en: assigned_valuators: Valuators select_heading: Select heading submit_button: Update + user_tags: User assigned tags tags: Tags tags_placeholder: "Write the tags you want separated by commas (,)" undefined: Undefined diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index d1a24b314..e3a52977d 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -181,6 +181,7 @@ es: assigned_valuators: Evaluadores select_heading: Seleccionar partida submit_button: Actualizar + user_tags: Etiquetas asignadas por el usuario tags: Etiquetas tags_placeholder: "Escribe las etiquetas que desees separadas por comas (,)" undefined: Sin definir diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb index 7252e2660..1ad89e6aa 100644 --- a/spec/features/admin/budget_investments_spec.rb +++ b/spec/features/admin/budget_investments_spec.rb @@ -421,20 +421,37 @@ feature 'Admin budget investments' do end end - scenario "Only displays valuation tags" do + scenario "Changes valuation and user generated tags" do budget_investment = create(:budget_investment, tag_list: 'Park') budget_investment.set_tag_list_on(:valuation, 'Education') budget_investment.save visit admin_budget_budget_investment_path(budget_investment.budget, budget_investment) - expect(page).to have_content "Education" - expect(page).to_not have_content "Park" + within("#user-tags") do + expect(page).to_not have_content "Education" + expect(page).to have_content "Park" + end click_link 'Edit classification' - expect(page).to have_content "Education" - expect(page).to_not have_content "Park" + fill_in 'budget_investment_tag_list', with: 'Park, Trees' + fill_in 'budget_investment_valuation_tag_list', with: 'Education, Environment' + click_button 'Update' + + visit admin_budget_budget_investment_path(budget_investment.budget, budget_investment) + + within("#user-tags") do + expect(page).to_not have_content "Education" + expect(page).to_not have_content "Environment" + expect(page).to have_content "Park, Trees" + end + + within("#tags") do + expect(page).to have_content "Education, Environment" + expect(page).to_not have_content "Park" + expect(page).to_not have_content "Trees" + end end scenario "Maintains user tags" do From 55c15bca86c0e7653ec0b8d151127d892d285f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 17 Oct 2017 18:29:14 +0200 Subject: [PATCH 522/765] Added poll results route --- app/controllers/polls_controller.rb | 4 ++++ config/routes.rb | 1 + 2 files changed, 5 insertions(+) diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb index 338f72cc4..834c9950d 100644 --- a/app/controllers/polls_controller.rb +++ b/app/controllers/polls_controller.rb @@ -27,4 +27,8 @@ class PollsController < ApplicationController @comment_tree = CommentTree.new(@commentable, params[:page], @current_order) end + def results + @poll = Poll.find(params[:poll_id]) + end + end diff --git a/config/routes.rb b/config/routes.rb index 1fb74aa53..3a7c1dcae 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -113,6 +113,7 @@ Rails.application.routes.draw do end resources :polls, only: [:show, :index] do + get :results resources :questions, controller: 'polls/questions', shallow: true do post :answer, on: :member end From 49118ea312c9f11306083ec58e1a6e9e8daac620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 17 Oct 2017 18:29:32 +0200 Subject: [PATCH 523/765] Gave permission to everyone to access poll results --- app/models/abilities/everyone.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/abilities/everyone.rb b/app/models/abilities/everyone.rb index 3004ca8ad..2a6eaf4aa 100644 --- a/app/models/abilities/everyone.rb +++ b/app/models/abilities/everyone.rb @@ -6,7 +6,7 @@ module Abilities can [:read, :map], Debate can [:read, :map, :summary, :share], Proposal can :read, Comment - can :read, Poll + can [:read, :results], Poll can :read, Poll::Question can [:read, :welcome], Budget can :read, SpendingProposal From bfe0addf3b767858853b3d155053f7c3451e47d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 17 Oct 2017 18:29:53 +0200 Subject: [PATCH 524/765] Added poll results view --- app/views/polls/results.html.erb | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 app/views/polls/results.html.erb diff --git a/app/views/polls/results.html.erb b/app/views/polls/results.html.erb new file mode 100644 index 000000000..353f92fa1 --- /dev/null +++ b/app/views/polls/results.html.erb @@ -0,0 +1,36 @@ +
      +
      +

      Preguntas

      +
        + <%- @poll.questions.each do |question| %> +
      • <%=link_to question.title, "##{question.title.parameterize}" %>
        • + <% end %> +
      +
      + +
      + <%- @poll.questions.each do |question| %> + +

      <%= question.title %>

      + + + <%- question.question_answers.each do |answer| %> + + <% end %> + + + + + <%- question.question_answers.each do |answer| %> + + <% end %> + + +
      ><%= answer.title %>
      > + <%= answer.total_votes %> + (<%= answer.total_votes_percentage %>%) +
      + <% end %> + +
      +
      From 610aea2c72e5238bb9f6ad8b528ebaa986e96b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 17 Oct 2017 18:30:20 +0200 Subject: [PATCH 525/765] Added new methods to Poll question and Poll answers --- app/models/poll/question.rb | 4 ++++ app/models/poll/question/answer.rb | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/app/models/poll/question.rb b/app/models/poll/question.rb index 90e528bd0..94a68b806 100644 --- a/app/models/poll/question.rb +++ b/app/models/poll/question.rb @@ -60,4 +60,8 @@ class Poll::Question < ActiveRecord::Base where(poll_id: Poll.answerable_by(user).pluck(:id)) end + def answers_total_votes + question_answers.map { |a| Poll::Answer.where(question_id: self, answer: a.title).count }.sum + end + end diff --git a/app/models/poll/question/answer.rb b/app/models/poll/question/answer.rb index ccbcf1abd..de6e35d1d 100644 --- a/app/models/poll/question/answer.rb +++ b/app/models/poll/question/answer.rb @@ -31,4 +31,18 @@ class Poll::Question::Answer < ActiveRecord::Base def self.last_position(question_id) where(question_id: question_id).maximum('given_order') || 0 end + + def total_votes + Poll::Answer.where(question_id: question, answer: title).count + end + + def is_winner? + answers = question.question_answers + .map { |a| Poll::Answer.where(question_id: a.question, answer: a.title).count } + !answers.any?{ |a| a > total_votes } + end + + def total_votes_percentage + ((total_votes*100) / question.answers_total_votes).round(2) + end end From 20fd8c05151ad42d265c230c259a39201cd30e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 17 Oct 2017 20:41:48 +0200 Subject: [PATCH 526/765] Officing tests improvements --- app/controllers/officing/voters_controller.rb | 2 ++ lib/census_api.rb | 2 +- spec/features/officing_spec.rb | 24 ++++++++++++++++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app/controllers/officing/voters_controller.rb b/app/controllers/officing/voters_controller.rb index 2b7ed329f..fdb4a128f 100644 --- a/app/controllers/officing/voters_controller.rb +++ b/app/controllers/officing/voters_controller.rb @@ -17,6 +17,8 @@ class Officing::VotersController < Officing::BaseController origin: "booth", officer: current_user.poll_officer) @voter.save! + + render 'create.js' end private diff --git a/lib/census_api.rb b/lib/census_api.rb index 931781c6d..4fdbd37cb 100644 --- a/lib/census_api.rb +++ b/lib/census_api.rb @@ -84,7 +84,7 @@ class CensusApi end def stubbed_response(document_type, document_number) - if document_number == "12345678Z" && document_type == "1" + if (document_number == "12345678Z" || document_number == "12345678Y") && document_type == "1" stubbed_valid_response else stubbed_invalid_response diff --git a/spec/features/officing_spec.rb b/spec/features/officing_spec.rb index 2a54bbff1..f7c62fbbd 100644 --- a/spec/features/officing_spec.rb +++ b/spec/features/officing_spec.rb @@ -117,6 +117,9 @@ feature 'Poll Officing' do officer1 = create(:poll_officer, user: user1) officer2 = create(:poll_officer, user: user2) + create(:poll_shift, officer: officer1, booth: booth, date: Date.current, task: :vote_collection) + create(:poll_shift, officer: officer2, booth: booth, date: Date.current, task: :vote_collection) + officer_assignment_1 = create(:poll_officer_assignment, booth_assignment: booth_assignment, officer: officer1) officer_assignment_2 = create(:poll_officer_assignment, booth_assignment: booth_assignment, officer: officer2) @@ -134,7 +137,16 @@ feature 'Poll Officing' do page.should have_content("Here you can validate user documents and store voting results") visit new_officing_residence_path - page.should have_content("Validate document") + within("#side_menu") do + click_link "Validate document" + end + select 'DNI', from: 'residence_document_type' + fill_in 'residence_document_number', with: "12345678Z" + fill_in 'residence_year_of_birth', with: '1980' + click_button 'Validate document' + expect(page).to have_content 'Document verified with Census' + click_button "Confirm vote" + expect(page).to have_content "Vote introduced!" visit final_officing_polls_path page.should have_content("Polls ready for final recounting") @@ -145,6 +157,16 @@ feature 'Poll Officing' do visit new_officing_residence_path page.should have_content("Validate document") + within("#side_menu") do + click_link "Validate document" + end + select 'DNI', from: 'residence_document_type' + fill_in 'residence_document_number', with: "12345678Y" + fill_in 'residence_year_of_birth', with: '1980' + click_button 'Validate document' + expect(page).to have_content 'Document verified with Census' + click_button "Confirm vote" + expect(page).to have_content "Vote introduced!" visit final_officing_polls_path page.should have_content("Polls ready for final recounting") From e2b06ef2597f3c360a8a5f5d2ed2ab3c7fe57710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Tue, 17 Oct 2017 20:43:42 +0200 Subject: [PATCH 527/765] Minor change --- spec/features/officing_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/features/officing_spec.rb b/spec/features/officing_spec.rb index f7c62fbbd..ae4e11858 100644 --- a/spec/features/officing_spec.rb +++ b/spec/features/officing_spec.rb @@ -156,7 +156,6 @@ feature 'Poll Officing' do page.should have_content("Here you can validate user documents and store voting results") visit new_officing_residence_path - page.should have_content("Validate document") within("#side_menu") do click_link "Validate document" end From 04910fea5b747b4ba4d54b25e07b97012deed2fb Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 17 Oct 2017 19:23:56 +0200 Subject: [PATCH 528/765] Remove officing results date picker for current date --- app/controllers/officing/results_controller.rb | 16 ++++++---------- app/views/officing/results/new.html.erb | 11 ----------- config/locales/en/officing.yml | 2 -- config/locales/es/officing.yml | 4 +--- spec/features/officing/results_spec.rb | 10 +++------- 5 files changed, 10 insertions(+), 33 deletions(-) diff --git a/app/controllers/officing/results_controller.rb b/app/controllers/officing/results_controller.rb index 23ef0b038..e1b6978f9 100644 --- a/app/controllers/officing/results_controller.rb +++ b/app/controllers/officing/results_controller.rb @@ -5,7 +5,7 @@ class Officing::ResultsController < Officing::BaseController before_action :load_partial_results, only: :new before_action :load_officer_assignment, only: :create - before_action :check_booth_and_date, only: :create + before_action :check_officer_assignment, only: :create before_action :build_results, only: :create def new @@ -32,13 +32,9 @@ class Officing::ResultsController < Officing::BaseController private - def check_booth_and_date + def check_officer_assignment if @officer_assignment.blank? go_back_to_new(t("officing.results.flash.error_wrong_booth")) - elsif results_params[:date].blank? || - Date.parse(results_params[:date]) < @poll.starts_at.to_date || - Date.parse(results_params[:date]) > @poll.ends_at.to_date - go_back_to_new(t("officing.results.flash.error_wrong_date")) end end @@ -55,7 +51,7 @@ class Officing::ResultsController < Officing::BaseController go_back_to_new if question.blank? partial_result = ::Poll::PartialResult.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id, - date: results_params[:date], + date: Date.current, question_id: question_id, answer: answer) partial_result.officer_assignment_id = @officer_assignment.id @@ -71,7 +67,7 @@ class Officing::ResultsController < Officing::BaseController def build_recounts recount = ::Poll::Recount.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id, - date: results_params[:date]) + date: Date.current) recount.officer_assignment_id = @officer_assignment.id recount.author = current_user recount.origin = 'booth' @@ -84,7 +80,7 @@ class Officing::ResultsController < Officing::BaseController end def go_back_to_new(alert = nil) - params[:d] = results_params[:date] + params[:d] = Date.current params[:oa] = results_params[:officer_assignment_id] flash.now[:alert] = (alert || t("officing.results.flash.error_create")) load_officer_assignments @@ -119,7 +115,7 @@ class Officing::ResultsController < Officing::BaseController end def results_params - params.permit(:officer_assignment_id, :date, :questions, :whites, :nulls, :total) + params.permit(:officer_assignment_id, :questions, :whites, :nulls, :total) end def index_params diff --git a/app/views/officing/results/new.html.erb b/app/views/officing/results/new.html.erb index fa5f449fb..2d023786f 100644 --- a/app/views/officing/results/new.html.erb +++ b/app/views/officing/results/new.html.erb @@ -12,16 +12,6 @@
      -
      -
      - - <%= select_tag :date, - poll_dates_select_options(@poll), - { prompt: t("officing.results.new.select_date"), - label: false } %> -
      -
      - <% @poll.questions.each do |question| %>
      @@ -101,4 +91,3 @@ <% end %> - diff --git a/config/locales/en/officing.yml b/config/locales/en/officing.yml index bb9ef6bd2..7a5668e87 100644 --- a/config/locales/en/officing.yml +++ b/config/locales/en/officing.yml @@ -21,14 +21,12 @@ en: create: "Results saved" error_create: "Results NOT saved. Error in data." error_wrong_booth: "Wrong booth. Results NOT saved." - error_wrong_date: "Wrong date. Results NOT saved." new: title: "%{poll} - Add results" not_allowed: "You are allowed to add results for this poll" booth: "Booth" date: "Date" select_booth: "Select booth" - select_date: "Select date" ballots_white: "Totally blank ballots" ballots_null: "Invalid ballots" ballots_total: "Total ballots" diff --git a/config/locales/es/officing.yml b/config/locales/es/officing.yml index 86d6982fc..5ab219fc7 100644 --- a/config/locales/es/officing.yml +++ b/config/locales/es/officing.yml @@ -21,14 +21,12 @@ es: create: "Datos guardados" error_create: "Resultados NO añadidos. Error en los datos" error_wrong_booth: "Urna incorrecta. Resultados NO guardados." - error_wrong_date: "Fecha incorrecta. Resultados NO guardados." new: title: "%{poll} - Añadir resultados" not_allowed: "No tienes permiso para introducir resultados" booth: "Urna" date: "Día" select_booth: "Elige urna" - select_date: "Elige día" ballots_white: "Papeletas totalmente en blanco" ballots_null: "Papeletas nulas" ballots_total: "Papeletas totales" @@ -67,4 +65,4 @@ es: submit: Confirmar voto success: "¡Voto introducido!" can_vote: - submit_disable_with: "Espera, confirmando voto..." \ No newline at end of file + submit_disable_with: "Espera, confirmando voto..." diff --git a/spec/features/officing/results_spec.rb b/spec/features/officing/results_spec.rb index f7e1ad8ef..288730599 100644 --- a/spec/features/officing/results_spec.rb +++ b/spec/features/officing/results_spec.rb @@ -53,9 +53,7 @@ feature 'Officing Results' do expect(page).to_not have_content('Your results') booth_name = @officer_assignment.booth_assignment.booth.name - date = I18n.l(@poll.starts_at.to_date, format: :long) select booth_name, from: 'officer_assignment_id' - select date, from: 'date' fill_in "questions[#{@question_1.id}][0]", with: '100' fill_in "questions[#{@question_1.id}][1]", with: '200' @@ -71,8 +69,8 @@ feature 'Officing Results' do expect(page).to have_content('Your results') - within("#results_#{@officer_assignment.booth_assignment_id}_#{@poll.starts_at.to_date.strftime('%Y%m%d')}") do - expect(page).to have_content(date) + within("#results_#{@officer_assignment.booth_assignment_id}_#{Date.current.strftime('%Y%m%d')}") do + expect(page).to have_content(I18n.l(Date.current, format: :long)) expect(page).to have_content(booth_name) end end @@ -81,7 +79,7 @@ feature 'Officing Results' do partial_result = create(:poll_partial_result, officer_assignment: @officer_assignment, booth_assignment: @officer_assignment.booth_assignment, - date: @poll.starts_at, + date: Date.current, question: @question_1, answer: @question_1.valid_answers[0], author: @poll_officer.user, @@ -94,9 +92,7 @@ feature 'Officing Results' do visit new_officing_poll_result_path(@poll) booth_name = partial_result.booth_assignment.booth.name - date = I18n.l(partial_result.date, format: :long) select booth_name, from: 'officer_assignment_id' - select date, from: 'date' fill_in "questions[#{@question_1.id}][0]", with: '5555' fill_in "questions[#{@question_1.id}][1]", with: '200' From ceec71e558d0fd34f1012736ab9be36e53574933 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 17 Oct 2017 21:41:52 +0200 Subject: [PATCH 529/765] Remove no actions message for citizen that already voted at officing panel --- app/views/officing/voters/_already_voted.html.erb | 3 +-- config/locales/en/officing.yml | 1 - config/locales/es/officing.yml | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/views/officing/voters/_already_voted.html.erb b/app/views/officing/voters/_already_voted.html.erb index 1af002b3f..cc144eb09 100644 --- a/app/views/officing/voters/_already_voted.html.erb +++ b/app/views/officing/voters/_already_voted.html.erb @@ -3,6 +3,5 @@ <%= t("officing.voters.show.error_already_voted") %>

      - - <%= t("officing.voters.show.no_actions") %> + diff --git a/config/locales/en/officing.yml b/config/locales/en/officing.yml index bb9ef6bd2..9837e7b86 100644 --- a/config/locales/en/officing.yml +++ b/config/locales/en/officing.yml @@ -63,7 +63,6 @@ en: show: can_vote: Can vote error_already_voted: Has already participated in this poll - no_actions: There is no available actions submit: Confirm vote success: "Vote introduced!" can_vote: diff --git a/config/locales/es/officing.yml b/config/locales/es/officing.yml index 86d6982fc..b16196382 100644 --- a/config/locales/es/officing.yml +++ b/config/locales/es/officing.yml @@ -63,8 +63,7 @@ es: show: can_vote: Puede votar error_already_voted: "Ya ha participado en esta votación" - no_actions: No hay acciones disponibles submit: Confirmar voto success: "¡Voto introducido!" can_vote: - submit_disable_with: "Espera, confirmando voto..." \ No newline at end of file + submit_disable_with: "Espera, confirmando voto..." From ce0a7f6fad4382468bdda767e37c0009d402b3db Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 17 Oct 2017 22:00:00 +0200 Subject: [PATCH 530/765] Rubocop autocorrections --- .../admin/poll/polls_controller.rb | 2 +- .../questions/answers/images_controller.rb | 2 +- .../questions/answers/videos_controller.rb | 10 ++++----- .../admin/poll/shifts_controller.rb | 2 +- app/controllers/direct_uploads_controller.rb | 5 ++--- app/helpers/documentables_helper.rb | 4 ++-- app/helpers/documents_helper.rb | 2 +- app/helpers/imageables_helper.rb | 10 ++++----- app/helpers/polls_helper.rb | 2 +- app/helpers/welcome_helper.rb | 12 +++++----- app/models/concerns/followable.rb | 2 +- app/models/debate.rb | 4 ++-- app/models/direct_upload.rb | 22 +++++++++---------- app/models/document.rb | 2 +- app/models/image.rb | 8 +++---- app/models/poll/voter.rb | 2 +- app/models/proposal.rb | 8 +++---- .../admin/poll/officer_assignments_spec.rb | 7 +++--- spec/features/admin/poll/shifts_spec.rb | 8 +++---- spec/features/admin/settings_spec.rb | 1 - spec/features/comments/polls_spec.rb | 20 ++++++++--------- spec/features/debates_spec.rb | 4 ++-- spec/features/emails_spec.rb | 1 - spec/features/home_spec.rb | 2 +- spec/models/debate_spec.rb | 12 +++++----- spec/models/direct_upload_spec.rb | 4 ++-- spec/models/map_location_spec.rb | 2 +- spec/models/proposal_spec.rb | 8 +++---- spec/shared/features/mappable.rb | 22 +++++++++---------- spec/shared/features/nested_documentable.rb | 4 ++-- spec/shared/features/nested_imageable.rb | 16 +++++--------- spec/support/common_actions.rb | 2 +- 32 files changed, 101 insertions(+), 111 deletions(-) diff --git a/app/controllers/admin/poll/polls_controller.rb b/app/controllers/admin/poll/polls_controller.rb index cce880ed4..5103275fb 100644 --- a/app/controllers/admin/poll/polls_controller.rb +++ b/app/controllers/admin/poll/polls_controller.rb @@ -54,7 +54,7 @@ class Admin::Poll::PollsController < Admin::Poll::BaseController end def poll_params - params.require(:poll).permit(:name, :starts_at, :ends_at, :geozone_restricted, :summary, :description, + params.require(:poll).permit(:name, :starts_at, :ends_at, :geozone_restricted, :summary, :description, geozone_ids: [], image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]) end diff --git a/app/controllers/admin/poll/questions/answers/images_controller.rb b/app/controllers/admin/poll/questions/answers/images_controller.rb index 1bf30907d..030e177a1 100644 --- a/app/controllers/admin/poll/questions/answers/images_controller.rb +++ b/app/controllers/admin/poll/questions/answers/images_controller.rb @@ -5,7 +5,7 @@ class Admin::Poll::Questions::Answers::ImagesController < Admin::Poll::BaseContr end def new - @answer = ::Poll::Question::Answer.find(params[:answer_id]) + @answer = ::Poll::Question::Answer.find(params[:answer_id]) end def create diff --git a/app/controllers/admin/poll/questions/answers/videos_controller.rb b/app/controllers/admin/poll/questions/answers/videos_controller.rb index a231c1a20..e9262b6dd 100644 --- a/app/controllers/admin/poll/questions/answers/videos_controller.rb +++ b/app/controllers/admin/poll/questions/answers/videos_controller.rb @@ -33,11 +33,11 @@ class Admin::Poll::Questions::Answers::VideosController < Admin::Poll::BaseContr end def destroy - if @video.destroy - notice = t("flash.actions.destroy.poll_question_answer_video") - else - notice = t("flash.actions.destroy.error") - end + notice = if @video.destroy + t("flash.actions.destroy.poll_question_answer_video") + else + t("flash.actions.destroy.error") + end redirect_to :back, notice: notice end diff --git a/app/controllers/admin/poll/shifts_controller.rb b/app/controllers/admin/poll/shifts_controller.rb index 1f60b2b4e..89bb68999 100644 --- a/app/controllers/admin/poll/shifts_controller.rb +++ b/app/controllers/admin/poll/shifts_controller.rb @@ -49,7 +49,7 @@ class Admin::Poll::ShiftsController < Admin::Poll::BaseController end def shift_params - shift_params = params.require(:shift).permit(:booth_id, :officer_id, :task, date:[:vote_collection_date, :recount_scrutiny_date]) + shift_params = params.require(:shift).permit(:booth_id, :officer_id, :task, date: [:vote_collection_date, :recount_scrutiny_date]) shift_params.merge(date: shift_params[:date]["#{shift_params[:task]}_date".to_sym]) end end diff --git a/app/controllers/direct_uploads_controller.rb b/app/controllers/direct_uploads_controller.rb index ade7d631f..a067a5d04 100644 --- a/app/controllers/direct_uploads_controller.rb +++ b/app/controllers/direct_uploads_controller.rb @@ -18,8 +18,7 @@ class DirectUploadsController < ApplicationController render json: { cached_attachment: @direct_upload.relation.cached_attachment, filename: @direct_upload.relation.attachment.original_filename, destroy_link: render_destroy_upload_link(@direct_upload).html_safe, - attachment_url: @direct_upload.relation.attachment.url - } + attachment_url: @direct_upload.relation.attachment.url} else @direct_upload.destroy_attachment render json: { errors: @direct_upload.errors[:attachment].join(", ") }, @@ -28,7 +27,7 @@ class DirectUploadsController < ApplicationController end def destroy - @direct_upload = DirectUpload.new(direct_upload_params.merge(user: current_user) ) + @direct_upload = DirectUpload.new(direct_upload_params.merge(user: current_user)) @direct_upload.relation.set_attachment_from_cached_attachment if @direct_upload.destroy_attachment diff --git a/app/helpers/documentables_helper.rb b/app/helpers/documentables_helper.rb index 8d9f85578..3fe56abd2 100644 --- a/app/helpers/documentables_helper.rb +++ b/app/helpers/documentables_helper.rb @@ -24,8 +24,8 @@ module DocumentablesHelper def documentable_humanized_accepted_content_types(documentable_class) documentable_class.accepted_content_types - .collect{ |content_type| content_type.split("/").last } - .join(", ") + .collect{ |content_type| content_type.split("/").last } + .join(", ") end def documentables_note(documentable) diff --git a/app/helpers/documents_helper.rb b/app/helpers/documents_helper.rb index d7e8d1dea..70eb6a27f 100644 --- a/app/helpers/documents_helper.rb +++ b/app/helpers/documents_helper.rb @@ -33,7 +33,7 @@ module DocumentsHelper def render_attachment(builder, document) klass = document.errors[:attachment].any? ? "error" : "" - klass = document.persisted? || document.cached_attachment.present? ? " hide" : "" + klass = document.persisted? || document.cached_attachment.present? ? " hide" : "" html = builder.label :attachment, t("documents.form.attachment_label"), class: "button hollow #{klass}" diff --git a/app/helpers/imageables_helper.rb b/app/helpers/imageables_helper.rb index b1c8059ce..efe3c88ce 100644 --- a/app/helpers/imageables_helper.rb +++ b/app/helpers/imageables_helper.rb @@ -22,17 +22,17 @@ module ImageablesHelper def imageable_accepted_content_types_extensions Image::ACCEPTED_CONTENT_TYPE - .collect{ |content_type| ".#{content_type.split("/").last}" } - .join(",") + .collect{ |content_type| ".#{content_type.split('/').last}" } + .join(",") end def imageable_humanized_accepted_content_types Image::ACCEPTED_CONTENT_TYPE - .collect{ |content_type| content_type.split("/").last } - .join(", ") + .collect{ |content_type| content_type.split("/").last } + .join(", ") end - def imageables_note(imageable) + def imageables_note(_imageable) t "images.form.note", accepted_content_types: imageable_humanized_accepted_content_types, max_file_size: imageable_max_file_size end diff --git a/app/helpers/polls_helper.rb b/app/helpers/polls_helper.rb index dd4018be7..0d5b0a605 100644 --- a/app/helpers/polls_helper.rb +++ b/app/helpers/polls_helper.rb @@ -44,7 +44,7 @@ module PollsHelper def poll_voter_token(poll, user) Poll::Voter.where(poll: poll, user: user, origin: "web").first&.token || '' end - + def voted_before_sign_in(question) question.answers.where(author: current_user).any? { |vote| current_user.current_sign_in_at >= vote.updated_at } end diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index fe1c5f450..7b12c5d6f 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -46,12 +46,12 @@ module WelcomeHelper end def calculate_offset(debates, proposals, apply_offset) - if (debates.any? && proposals.any?) - if apply_offset - offset = "medium-offset-2 large-offset-2" - else - offset = "end" - end + if debates.any? && proposals.any? + offset = if apply_offset + "medium-offset-2 large-offset-2" + else + "end" + end end end diff --git a/app/models/concerns/followable.rb b/app/models/concerns/followable.rb index fee1ebd7f..d635cadda 100644 --- a/app/models/concerns/followable.rb +++ b/app/models/concerns/followable.rb @@ -5,7 +5,7 @@ module Followable has_many :follows, as: :followable, dependent: :destroy has_many :followers, through: :follows, source: :user - scope :followed_by_user, -> (user){ + scope :followed_by_user, ->(user){ joins(:follows).where("follows.user_id = ?", user.id) } end diff --git a/app/models/debate.rb b/app/models/debate.rb index eb424c308..65c06345d 100644 --- a/app/models/debate.rb +++ b/app/models/debate.rb @@ -48,8 +48,8 @@ class Debate < ActiveRecord::Base attr_accessor :link_required def self.recommendations(user) - tagged_with(user.interests, any: true). - where("author_id != ?", user.id) + tagged_with(user.interests, any: true) + .where("author_id != ?", user.id) end def searchable_values diff --git a/app/models/direct_upload.rb b/app/models/direct_upload.rb index e597f9f12..6681aa7be 100644 --- a/app/models/direct_upload.rb +++ b/app/models/direct_upload.rb @@ -7,7 +7,7 @@ class DirectUpload :relation, :resource_relation, :attachment, :cached_attachment, :user - validates_presence_of :attachment, :resource_type, :resource_relation, :user + validates :attachment, :resource_type, :resource_relation, :user, presence: true validate :parent_resource_attachment_validations, if: -> { attachment.present? && resource_type.present? && resource_relation.present? && user.present? } @@ -19,15 +19,15 @@ class DirectUpload if @resource_type.present? && @resource_relation.present? && (@attachment.present? || @cached_attachment.present?) @resource = @resource_type.constantize.find_or_initialize_by(id: @resource_id) - #Refactor - if @resource.respond_to?(:images) && - ((@attachment.present? && !@attachment.content_type.match(/pdf/)) || @cached_attachment.present?) - @relation = @resource.images.send("build", relation_attributtes) - elsif @resource.class.reflections[@resource_relation].macro == :has_one - @relation = @resource.send("build_#{resource_relation}", relation_attributtes) - else - @relation = @resource.send(@resource_relation).build(relation_attributtes) - end + # Refactor + @relation = if @resource.respond_to?(:images) && + ((@attachment.present? && !@attachment.content_type.match(/pdf/)) || @cached_attachment.present?) + @resource.images.send("build", relation_attributtes) + elsif @resource.class.reflections[@resource_relation].macro == :has_one + @resource.send("build_#{resource_relation}", relation_attributtes) + else + @resource.send(@resource_relation).build(relation_attributtes) + end @relation.user = user end @@ -50,7 +50,7 @@ class DirectUpload def parent_resource_attachment_validations @relation.valid? - if @relation.errors.has_key? :attachment + if @relation.errors.key? :attachment errors[:attachment] = @relation.errors[:attachment] end end diff --git a/app/models/document.rb b/app/models/document.rb index f680bc04e..8843bbed9 100644 --- a/app/models/document.rb +++ b/app/models/document.rb @@ -44,7 +44,7 @@ class Document < ActiveRecord::Base attachment.instance.prefix(attachment, style) end - def prefix(attachment, style) + def prefix(attachment, _style) if !attachment.instance.persisted? "cached_attachments/user/#{attachment.instance.user_id}" else diff --git a/app/models/image.rb b/app/models/image.rb index 84b38dd4a..99061f6f1 100644 --- a/app/models/image.rb +++ b/app/models/image.rb @@ -5,7 +5,7 @@ class Image < ActiveRecord::Base TITLE_LEGHT_RANGE = 4..80 MIN_SIZE = 475 MAX_IMAGE_SIZE = 1.megabyte - ACCEPTED_CONTENT_TYPE = %w(image/jpeg image/jpg) + ACCEPTED_CONTENT_TYPE = %w(image/jpeg image/jpg).freeze has_attached_file :attachment, styles: { large: "x#{MIN_SIZE}", medium: "300x300#", thumb: "140x245#" }, url: "/system/:class/:prefix/:style/:hash.:extension", @@ -52,7 +52,7 @@ class Image < ActiveRecord::Base attachment.instance.prefix(attachment, style) end - def prefix(attachment, style) + def prefix(attachment, _style) if !attachment.instance.persisted? "cached_attachments/user/#{attachment.instance.user_id}" else @@ -103,8 +103,8 @@ class Image < ActiveRecord::Base def remove_cached_attachment image = Image.new(imageable: imageable, - cached_attachment: cached_attachment, - user: user) + cached_attachment: cached_attachment, + user: user) image.set_attachment_from_cached_attachment image.attachment.destroy end diff --git a/app/models/poll/voter.rb b/app/models/poll/voter.rb index bc0118a88..778a5d88a 100644 --- a/app/models/poll/voter.rb +++ b/app/models/poll/voter.rb @@ -1,7 +1,7 @@ class Poll class Voter < ActiveRecord::Base - VALID_ORIGINS = %w{ web booth } + VALID_ORIGINS = %w{web booth}.freeze belongs_to :poll belongs_to :user diff --git a/app/models/proposal.rb b/app/models/proposal.rb index 1a688ab30..3b0696d26 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -69,10 +69,10 @@ class Proposal < ActiveRecord::Base scope :public_for_api, -> { all } def self.recommendations(user) - tagged_with(user.interests, any: true). - where("author_id != ?", user.id). - unsuccessful. - not_followed_by_user(user) + tagged_with(user.interests, any: true) + .where("author_id != ?", user.id) + .unsuccessful + .not_followed_by_user(user) end def self.not_followed_by_user(user) diff --git a/spec/features/admin/poll/officer_assignments_spec.rb b/spec/features/admin/poll/officer_assignments_spec.rb index 20be138b9..48d10ad39 100644 --- a/spec/features/admin/poll/officer_assignments_spec.rb +++ b/spec/features/admin/poll/officer_assignments_spec.rb @@ -30,9 +30,9 @@ feature 'Officer Assignments' do expect(page).to have_content officer2.name expect(page).to_not have_content officer3.name end - end + end - scenario "Search", :js do + scenario "Search", :js do poll = create(:poll) booth = create(:poll_booth) @@ -62,7 +62,6 @@ feature 'Officer Assignments' do expect(page).to have_content officer2.name expect(page).to_not have_content officer3.name end - end - + end end \ No newline at end of file diff --git a/spec/features/admin/poll/shifts_spec.rb b/spec/features/admin/poll/shifts_spec.rb index 35df2e20e..bddd1b6b1 100644 --- a/spec/features/admin/poll/shifts_spec.rb +++ b/spec/features/admin/poll/shifts_spec.rb @@ -102,11 +102,11 @@ feature 'Admin shifts' do shift2 = create(:poll_shift, :recount_scrutiny_task, officer: officer, booth: booth, date: Time.zone.tomorrow) vote_collection_dates = (Date.current..poll.ends_at.to_date).to_a - .reject { |date| date == Time.zone.today } - .map { |date| I18n.l(date, format: :long) } + .reject { |date| date == Time.zone.today } + .map { |date| I18n.l(date, format: :long) } recount_scrutiny_dates = (poll.ends_at.to_date..poll.ends_at.to_date + 1.week).to_a - .reject { |date| date == Time.zone.tomorrow } - .map { |date| I18n.l(date, format: :long) } + .reject { |date| date == Time.zone.tomorrow } + .map { |date| I18n.l(date, format: :long) } visit available_admin_booths_path diff --git a/spec/features/admin/settings_spec.rb b/spec/features/admin/settings_spec.rb index 73d190cb9..40baf6423 100644 --- a/spec/features/admin/settings_spec.rb +++ b/spec/features/admin/settings_spec.rb @@ -87,7 +87,6 @@ feature 'Admin settings' do expect(page).to have_content "Map configuration updated succesfully" end - end end diff --git a/spec/features/comments/polls_spec.rb b/spec/features/comments/polls_spec.rb index 8ef528cd3..0fe01cf06 100644 --- a/spec/features/comments/polls_spec.rb +++ b/spec/features/comments/polls_spec.rb @@ -21,7 +21,7 @@ feature 'Commenting polls' do end scenario 'Show' do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" parent_comment = create(:comment, commentable: poll) first_child = create(:comment, commentable: poll, parent: parent_comment) @@ -243,7 +243,7 @@ feature 'Commenting polls' do end scenario "Flagging as inappropriate", :js do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" comment = create(:comment, commentable: poll) @@ -261,7 +261,7 @@ feature 'Commenting polls' do end scenario "Undoing flagging as inappropriate", :js do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" comment = create(:comment, commentable: poll) Flag.flag(user, comment) @@ -280,7 +280,7 @@ feature 'Commenting polls' do end scenario "Flagging turbolinks sanity check", :js do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" poll = create(:poll, title: "Should we change the world?") comment = create(:comment, commentable: poll) @@ -310,7 +310,7 @@ feature 'Commenting polls' do feature "Moderators" do scenario "can create comment as a moderator", :js do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" moderator = create(:moderator) @@ -330,7 +330,7 @@ feature 'Commenting polls' do end scenario "can create reply as a moderator", :js do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" citizen = create(:user, username: "Ana") manuela = create(:user, username: "Manuela") @@ -359,7 +359,7 @@ feature 'Commenting polls' do end scenario "can not comment as an administrator" do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" moderator = create(:moderator) @@ -372,7 +372,7 @@ feature 'Commenting polls' do feature "Administrators" do scenario "can create comment as an administrator", :js do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" admin = create(:administrator) @@ -392,7 +392,7 @@ feature 'Commenting polls' do end scenario "can create reply as an administrator", :js do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" citizen = create(:user, username: "Ana") manuela = create(:user, username: "Manuela") @@ -421,7 +421,7 @@ feature 'Commenting polls' do end scenario "can not comment as a moderator" do - skip "Feature not implemented yet, review soon" + skip "Feature not implemented yet, review soon" admin = create(:administrator) diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb index 3d7c6acf8..39cd84760 100644 --- a/spec/features/debates_spec.rb +++ b/spec/features/debates_spec.rb @@ -394,7 +394,7 @@ feature 'Debates' do end scenario 'Debates are ordered by recommendations when there is a user logged', :js do - proposal = create(:proposal, tag_list: "Sport" ) + proposal = create(:proposal, tag_list: "Sport") user = create(:user) create(:follow, followable: proposal, user: user) login_as(user) @@ -830,7 +830,7 @@ feature 'Debates' do debate2 = create(:debate, title: "Show what you got", cached_votes_total: 1, tag_list: "Sport") debate3 = create(:debate, title: "Do not display with same tag", cached_votes_total: 100, tag_list: "Sport") debate4 = create(:debate, title: "Do not display", cached_votes_total: 1) - proposal1 = create(:proposal, tag_list: "Sport") + proposal1 = create(:proposal, tag_list: "Sport") create(:follow, followable: proposal1, user: user) visit debates_path diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index a26e8ce11..74b608ed6 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -408,7 +408,6 @@ feature 'Emails' do end expect(page).to have_content 'It will be done next week.' - email = open_last_email expect(email).to have_subject('Someone has responded to your comment') expect(email).to deliver_to(user1) diff --git a/spec/features/home_spec.rb b/spec/features/home_spec.rb index cb5349814..4854fff4d 100644 --- a/spec/features/home_spec.rb +++ b/spec/features/home_spec.rb @@ -27,7 +27,7 @@ feature "Home" do background do Setting['feature.user.recommendations'] = true user = create(:user) - proposal = create(:proposal, tag_list: "Sport" ) + proposal = create(:proposal, tag_list: "Sport") create(:follow, followable: proposal, user: user) login_as(user) end diff --git a/spec/models/debate_spec.rb b/spec/models/debate_spec.rb index 64dbf729f..3e1278bd7 100644 --- a/spec/models/debate_spec.rb +++ b/spec/models/debate_spec.rb @@ -725,10 +725,10 @@ describe Debate do end it "Should return debates ordered by cached_votes_total" do - debate1 = create(:debate, cached_votes_total: 1, tag_list: "Sport" ) - debate2 = create(:debate, cached_votes_total: 5, tag_list: "Sport" ) - debate3 = create(:debate, cached_votes_total: 10, tag_list: "Sport" ) - proposal = create(:proposal, tag_list: "Sport" ) + debate1 = create(:debate, cached_votes_total: 1, tag_list: "Sport") + debate2 = create(:debate, cached_votes_total: 5, tag_list: "Sport") + debate3 = create(:debate, cached_votes_total: 10, tag_list: "Sport") + proposal = create(:proposal, tag_list: "Sport") create(:follow, followable: proposal, user: user) result = Debate.recommendations(user).sort_by_recommendations @@ -741,7 +741,7 @@ describe Debate do it "Should return debates related with user interests" do debate1 = create(:debate, tag_list: "Sport") debate2 = create(:debate, tag_list: "Politics") - proposal1 = create(:proposal, tag_list: "Sport") + proposal1 = create(:proposal, tag_list: "Sport") create(:follow, followable: proposal1, user: user) result = Debate.recommendations(user) @@ -753,7 +753,7 @@ describe Debate do it "Should not return debates when user is the author" do debate1 = create(:debate, author: user, tag_list: "Sport") debate2 = create(:debate, tag_list: "Sport") - proposal = create(:proposal, tag_list: "Sport" ) + proposal = create(:proposal, tag_list: "Sport") create(:follow, followable: proposal, user: user) result = Debate.recommendations(user) diff --git a/spec/models/direct_upload_spec.rb b/spec/models/direct_upload_spec.rb index 5abe06765..8cfebf076 100644 --- a/spec/models/direct_upload_spec.rb +++ b/spec/models/direct_upload_spec.rb @@ -42,7 +42,7 @@ describe DirectUpload do proposal_document_direct_upload.save_attachment - expect(File.exists?(proposal_document_direct_upload.relation.attachment.path)).to eq(true) + expect(File.exist?(proposal_document_direct_upload.relation.attachment.path)).to eq(true) expect(proposal_document_direct_upload.relation.attachment.path).to include('cached_attachments') end @@ -57,7 +57,7 @@ describe DirectUpload do uploaded_path = proposal_document_direct_upload.relation.attachment.path proposal_document_direct_upload.destroy_attachment - expect(File.exists?(uploaded_path)).to eq(false) + expect(File.exist?(uploaded_path)).to eq(false) end end diff --git a/spec/models/map_location_spec.rb b/spec/models/map_location_spec.rb index bd093a71e..62070529e 100644 --- a/spec/models/map_location_spec.rb +++ b/spec/models/map_location_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' describe MapLocation do - let(:map_location) { build(:map_location, :proposal_map_location ) } + let(:map_location) { build(:map_location, :proposal_map_location) } it "should be valid" do expect(map_location).to be_valid diff --git a/spec/models/proposal_spec.rb b/spec/models/proposal_spec.rb index 588bd4057..29338a62f 100644 --- a/spec/models/proposal_spec.rb +++ b/spec/models/proposal_spec.rb @@ -903,10 +903,10 @@ describe Proposal do end it "Should return proposals ordered by cached_votes_up" do - proposal1 = create(:proposal, cached_votes_up: 1, tag_list: "Sport" ) - proposal2 = create(:proposal, cached_votes_up: 5, tag_list: "Sport" ) - proposal3 = create(:proposal, cached_votes_up: 10, tag_list: "Sport" ) - proposal4 = create(:proposal, tag_list: "Sport" ) + proposal1 = create(:proposal, cached_votes_up: 1, tag_list: "Sport") + proposal2 = create(:proposal, cached_votes_up: 5, tag_list: "Sport") + proposal3 = create(:proposal, cached_votes_up: 10, tag_list: "Sport") + proposal4 = create(:proposal, tag_list: "Sport") create(:follow, followable: proposal4, user: user) result = Proposal.recommendations(user).sort_by_recommendations diff --git a/spec/shared/features/mappable.rb b/spec/shared/features/mappable.rb index ccbcd5625..65ece1f25 100644 --- a/spec/shared/features/mappable.rb +++ b/spec/shared/features/mappable.rb @@ -2,7 +2,7 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name, include ActionView::Helpers - let!(:user) { create(:user, :level_two) } + let!(:user) { create(:user, :level_two) } before do Setting['feature.map'] = true @@ -11,7 +11,7 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name, describe "At #{mappable_new_path}" do let!(:arguments) { {} } - let!(:mappable) { create("#{mappable_factory_name}".to_sym) } + let!(:mappable) { create(mappable_factory_name.to_s.to_sym) } let!(:map_location) { create(:map_location, "#{mappable_factory_name}_map_location".to_sym, "#{mappable_association_name}": mappable) } before { set_arguments(arguments, mappable, mappable_path_arguments) } @@ -77,10 +77,10 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name, describe "At #{mappable_edit_path}" do - let!(:mappable) { create("#{mappable_factory_name}".to_sym) } + let!(:mappable) { create(mappable_factory_name.to_s.to_sym) } let!(:map_location) { create(:map_location, "#{mappable_factory_name}_map_location".to_sym, "#{mappable_association_name}": mappable) } - before { skip } unless mappable_edit_path.present? + before { skip } if mappable_edit_path.blank? scenario "Should edit map on #{mappable_factory_name} and contain default values", :js do login_as mappable.author @@ -143,13 +143,13 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name, describe "At #{mappable_show_path}" do let!(:arguments) { {} } - let!(:mappable) { create("#{mappable_factory_name}".to_sym) } + let!(:mappable) { create(mappable_factory_name.to_s.to_sym) } let!(:map_location) { create(:map_location, "#{mappable_factory_name}_map_location".to_sym, "#{mappable_association_name}": mappable) } before { set_arguments(arguments, mappable, mappable_path_arguments) } scenario "Should display map on #{mappable_factory_name} show page", :js do - arguments.merge!("id": mappable.id) + arguments[:id] = mappable.id visit send(mappable_show_path, arguments) @@ -157,9 +157,9 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name, end scenario "Should not display map on #{mappable_factory_name} show when marker is not defined", :js do - mappable_without_map = create("#{mappable_factory_name}".to_sym) + mappable_without_map = create(mappable_factory_name.to_s.to_sym) set_arguments(arguments, mappable_without_map, mappable_path_arguments) - arguments.merge!("id": mappable_without_map.id) + arguments[:id] = mappable_without_map.id visit send(mappable_show_path, arguments) @@ -168,7 +168,7 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name, scenario "Should not display map on #{mappable_factory_name} show page when feature.map is disable", :js do Setting['feature.map'] = false - arguments.merge!("id": mappable.id) + arguments[:id] = mappable.id visit send(mappable_show_path, arguments) @@ -212,9 +212,7 @@ def submit_budget_investment_form end def set_arguments(arguments, mappable, mappable_path_arguments) - if mappable_path_arguments - mappable_path_arguments.each do |argument_name, path_to_value| + mappable_path_arguments&.each do |argument_name, path_to_value| arguments.merge!("#{argument_name}": mappable.send(path_to_value)) - end end end diff --git a/spec/shared/features/nested_documentable.rb b/spec/shared/features/nested_documentable.rb index 24d6631a8..3661af408 100644 --- a/spec/shared/features/nested_documentable.rb +++ b/spec/shared/features/nested_documentable.rb @@ -199,8 +199,8 @@ shared_examples "nested documentable" do |login_as_name, documentable_factory_na find("#tab-documents-label").click expect(page).to have_content "empty.pdf" - #Review - #Doble check why the file is stored with a name different to empty.pdf + # Review + # Doble check why the file is stored with a name different to empty.pdf expect(page).to have_css("a[href$='.pdf']") end diff --git a/spec/shared/features/nested_imageable.rb b/spec/shared/features/nested_imageable.rb index 1eef9a269..947887afa 100644 --- a/spec/shared/features/nested_imageable.rb +++ b/spec/shared/features/nested_imageable.rb @@ -1,4 +1,4 @@ -shared_examples "nested imageable" do |imageable_factory_name, path, imageable_path_arguments, fill_resource_method_name, submit_button, imageable_success_notice, has_many_images=false| +shared_examples "nested imageable" do |imageable_factory_name, path, imageable_path_arguments, fill_resource_method_name, submit_button, imageable_success_notice, has_many_images = false| include ActionView::Helpers include ImagesHelper include ImageablesHelper @@ -9,15 +9,11 @@ shared_examples "nested imageable" do |imageable_factory_name, path, imageable_p let!(:imageable) { create(imageable_factory_name) } before do - if imageable_path_arguments - imageable_path_arguments.each do |argument_name, path_to_value| + imageable_path_arguments&.each do |argument_name, path_to_value| arguments.merge!("#{argument_name}": imageable.send(path_to_value)) - end end - if imageable.respond_to?(:author) - imageable.update(author: user) - end + imageable.update(author: user) if imageable.respond_to?(:author) end describe "at #{path}" do @@ -119,7 +115,7 @@ shared_examples "nested imageable" do |imageable_factory_name, path, imageable_p click_on submit_button if has_many_images - #Pending. Review soon and test + # Pending. Review soon and test else within "#nested-image .image" do expect(page).to have_content("can't be blank", count: 2) @@ -174,7 +170,7 @@ shared_examples "nested imageable" do |imageable_factory_name, path, imageable_p imageable_redirected_to_resource_show_or_navigate_to if has_many_images - #Pending. Review soon and test + # Pending. Review soon and test else expect(page).to have_selector "figure img" expect(page).to have_selector "figure figcaption" @@ -230,7 +226,7 @@ rescue return end -def imageable_attach_new_file(imageable_factory_name, path, success = true) +def imageable_attach_new_file(_imageable_factory_name, path, success = true) click_link "Add image" within "#nested-image" do image = find(".image") diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index a55ebd63c..b87a54d8e 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -163,7 +163,7 @@ module CommonActions expect(page).to have_content 'Document verified with Census' end - def confirm_phone(user=nil) + def confirm_phone(user = nil) user ||= User.last fill_in 'sms_phone', with: "611111111" From 7b40c8416664d3c9788a46e61353711a03a04f0c Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 17 Oct 2017 22:06:07 +0200 Subject: [PATCH 531/765] Rubocop fixes and rubocop todo update for those that can't be done right now --- .rubocop_todo.yml | 118 +++++++++++------------- app/helpers/imageables_helper.rb | 6 +- app/helpers/images_helper.rb | 2 +- app/helpers/welcome_helper.rb | 4 +- spec/models/poll/partial_result_spec.rb | 14 +-- 5 files changed, 65 insertions(+), 79 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 072caad09..373bb213c 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,12 +1,12 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2017-07-07 21:23:30 +0200 using RuboCop version 0.49.1. +# on 2017-10-17 22:05:23 +0200 using RuboCop version 0.49.1. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. -# Offense count: 45 +# Offense count: 40 # Cop supports --auto-correct. # Configuration parameters: EnforcedHashRocketStyle, SupportedHashRocketStyles, EnforcedColonStyle, SupportedColonStyles, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles. # SupportedHashRocketStyles: key, separator, table @@ -14,11 +14,10 @@ # SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit Layout/AlignHash: Exclude: - - 'app/controllers/officing/results_controller.rb' - 'spec/controllers/legislation/annotations_controller_spec.rb' - 'spec/features/admin/banners_spec.rb' -# Offense count: 50 +# Offense count: 52 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth. # SupportedStyles: with_first_parameter, with_fixed_indentation @@ -33,7 +32,7 @@ Layout/ClosingParenthesisIndentation: - 'spec/models/legislation/annotation_spec.rb' - 'spec/rails_helper.rb' -# Offense count: 51 +# Offense count: 37 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles. # SupportedStyles: leading, trailing @@ -68,11 +67,10 @@ Layout/EmptyLines: Exclude: - 'app/controllers/admin/budget_investment_milestones_controller.rb' -# Offense count: 2 +# Offense count: 1 # Cop supports --auto-correct. Layout/EmptyLinesAroundMethodBody: Exclude: - - 'app/models/abilities/administrator.rb' - 'lib/graph_ql/api_types_creator.rb' # Offense count: 2 @@ -126,13 +124,13 @@ Layout/IndentationConsistency: - 'spec/models/legislation/draft_version_spec.rb' - 'spec/models/proposal_spec.rb' -# Offense count: 23 +# Offense count: 48 # Cop supports --auto-correct. # Configuration parameters: Width, IgnoredPatterns. Layout/IndentationWidth: Enabled: false -# Offense count: 7 +# Offense count: 6 # Cop supports --auto-correct. Layout/LeadingCommentSpace: Exclude: @@ -140,7 +138,6 @@ Layout/LeadingCommentSpace: - 'app/controllers/budgets/ballot/lines_controller.rb' - 'spec/features/budgets/ballots_spec.rb' - 'spec/features/comments/poll_questions_spec.rb' - - 'spec/features/officing/voters_spec.rb' - 'spec/support/common_actions.rb' # Offense count: 3 @@ -181,7 +178,7 @@ Layout/MultilineMethodCallBraceLayout: - 'spec/models/legislation/annotation_spec.rb' - 'spec/rails_helper.rb' -# Offense count: 71 +# Offense count: 59 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth. # SupportedStyles: aligned, indented, indented_relative_to_receiver @@ -201,7 +198,7 @@ Layout/MultilineMethodCallIndentation: - 'spec/models/proposal_spec.rb' - 'spec/models/user_spec.rb' -# Offense count: 8 +# Offense count: 7 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth. # SupportedStyles: aligned, indented @@ -264,22 +261,7 @@ Lint/LiteralInCondition: Exclude: - 'app/models/budget/investment.rb' -# Offense count: 51 -Lint/ParenthesesAsGroupedExpression: - Exclude: - - 'spec/factories.rb' - - 'spec/features/admin/organizations_spec.rb' - - 'spec/features/budgets/investments_spec.rb' - - 'spec/features/campaigns_spec.rb' - - 'spec/features/debates_spec.rb' - - 'spec/features/management/managed_users_spec.rb' - - 'spec/features/management/proposals_spec.rb' - - 'spec/features/management/spending_proposals_spec.rb' - - 'spec/features/management/users_spec.rb' - - 'spec/features/proposals_spec.rb' - - 'spec/models/debate_spec.rb' - -# Offense count: 13 +# Offense count: 3 # Cop supports --auto-correct. Lint/StringConversionInInterpolation: Exclude: @@ -308,7 +290,7 @@ Lint/UnusedMethodArgument: - 'app/mailers/mailer.rb' - 'app/models/abilities/everyone.rb' -# Offense count: 278 +# Offense count: 325 Lint/UselessAssignment: Enabled: false @@ -317,35 +299,46 @@ Lint/Void: Exclude: - 'app/controllers/polls_controller.rb' -# Offense count: 74 +# Offense count: 86 Metrics/AbcSize: - Max: 54 + Max: 64 -# Offense count: 454 +# Offense count: 487 # Configuration parameters: CountComments, ExcludedMethods. Metrics/BlockLength: - Max: 1071 - -# Offense count: 8 -# Configuration parameters: CountComments. -Metrics/ClassLength: - Max: 256 + Max: 1227 # Offense count: 10 +# Configuration parameters: CountComments. +Metrics/ClassLength: + Max: 262 + +# Offense count: 13 Metrics/CyclomaticComplexity: Max: 10 -# Offense count: 53 +# Offense count: 25 +# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. +# URISchemes: http, https +Metrics/LineLength: + Max: 248 + +# Offense count: 67 # Configuration parameters: CountComments. Metrics/MethodLength: - Max: 49 + Max: 56 # Offense count: 1 # Configuration parameters: CountComments. Metrics/ModuleLength: - Max: 214 + Max: 242 -# Offense count: 7 +# Offense count: 3 +# Configuration parameters: CountKeywordArgs. +Metrics/ParameterLists: + Max: 7 + +# Offense count: 8 Metrics/PerceivedComplexity: Max: 11 @@ -399,20 +392,20 @@ Rails/HttpPositionalArguments: - 'spec/controllers/pages_controller_spec.rb' - 'spec/controllers/users/registrations_controller_spec.rb' -# Offense count: 20 +# Offense count: 18 Rails/OutputSafety: Exclude: - 'app/controllers/admin/legislation/draft_versions_controller.rb' - 'app/controllers/admin/legislation/processes_controller.rb' - 'app/controllers/admin/legislation/questions_controller.rb' - 'app/controllers/budgets/investments_controller.rb' + - 'app/controllers/direct_uploads_controller.rb' - 'app/controllers/spending_proposals_controller.rb' - 'app/helpers/application_helper.rb' - 'app/helpers/text_with_links_helper.rb' - - 'app/helpers/users_helper.rb' - 'app/helpers/valuation_helper.rb' -# Offense count: 70 +# Offense count: 71 # Configuration parameters: Blacklist. # Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters Rails/SkipsModelValidations: @@ -428,7 +421,7 @@ Style/AccessorMethodName: - 'app/controllers/proposals_controller.rb' - 'lib/merged_comment_tree.rb' -# Offense count: 1 +# Offense count: 8 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles. # SupportedStyles: braces, no_braces, context_dependent @@ -438,7 +431,7 @@ Style/BracesAroundHashParameters: - 'spec/features/budgets/investments_spec.rb' - 'spec/features/proposals_spec.rb' -# Offense count: 119 +# Offense count: 123 # Configuration parameters: EnforcedStyle, SupportedStyles. # SupportedStyles: nested, compact Style/ClassAndModuleChildren: @@ -451,14 +444,13 @@ Style/ClassVars: - 'app/models/organization.rb' - 'app/models/user.rb' -# Offense count: 12 +# Offense count: 8 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly, IncludeTernaryExpressions. # SupportedStyles: assign_to_condition, assign_inside_condition Style/ConditionalAssignment: Exclude: - 'app/controllers/admin/poll/booth_assignments_controller.rb' - - 'app/controllers/admin/poll/officer_assignments_controller.rb' - 'app/controllers/admin/poll/questions_controller.rb' - 'app/controllers/comments_controller.rb' - 'app/controllers/management/spending_proposals_controller.rb' @@ -484,7 +476,7 @@ Style/FileName: Style/GuardClause: Enabled: false -# Offense count: 12 +# Offense count: 11 # Cop supports --auto-correct. # Configuration parameters: MaxLineLength. Style/IfUnlessModifier: @@ -495,19 +487,19 @@ Style/IfUnlessModifier: - 'app/controllers/legislation/annotations_controller.rb' - 'app/controllers/valuation/budget_investments_controller.rb' - 'app/controllers/verification/letter_controller.rb' - - 'app/controllers/welcome_controller.rb' - 'app/helpers/embed_videos_helper.rb' - 'app/mailers/mailer.rb' - 'app/models/proposal.rb' - 'app/models/spending_proposal.rb' -# Offense count: 4 +# Offense count: 5 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles. # SupportedStyles: line_count_dependent, lambda, literal Style/Lambda: Exclude: - 'app/models/comment.rb' + - 'app/models/concerns/followable.rb' - 'app/models/direct_message.rb' - 'app/models/vote.rb' - 'lib/graph_ql/api_types_creator.rb' @@ -523,7 +515,7 @@ Style/MultilineIfThen: Exclude: - 'app/controllers/management/users_controller.rb' -# Offense count: 15 +# Offense count: 13 # Cop supports --auto-correct. Style/MutableConstant: Exclude: @@ -546,7 +538,7 @@ Style/MutableConstant: Style/NumericLiterals: MinDigits: 9 -# Offense count: 19 +# Offense count: 20 # Cop supports --auto-correct. # Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles. # SupportedStyles: predicate, comparison @@ -574,7 +566,7 @@ Style/ParallelAssignment: - 'lib/active_model/dates.rb' - 'spec/support/common_actions.rb' -# Offense count: 11 +# Offense count: 10 # Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist. # NamePrefix: is_, has_, have_ # NamePrefixBlacklist: is_, has_, have_ @@ -588,7 +580,6 @@ Style/PredicateName: - 'app/helpers/debates_helper.rb' - 'app/models/budget/ballot.rb' - 'app/models/user.rb' - - 'lib/census_api.rb' # Offense count: 4 # Cop supports --auto-correct. @@ -608,13 +599,14 @@ Style/RedundantBegin: - 'app/controllers/graphql_controller.rb' - 'app/models/legislation/annotation.rb' -# Offense count: 3 +# Offense count: 5 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes. # SupportedStyles: slashes, percent_r, mixed Style/RegexpLiteral: Exclude: - 'app/helpers/embed_videos_helper.rb' + - 'app/models/poll/question/answer/video.rb' - 'spec/customization_engine_spec.rb' # Offense count: 6 @@ -633,22 +625,16 @@ Style/SafeNavigation: Exclude: - 'app/models/signature.rb' -# Offense count: 9 -# Configuration parameters: SupportedStyles. -# SupportedStyles: snake_case, camelCase -Style/VariableName: - EnforcedStyle: snake_case - -# Offense count: 107 +# Offense count: 93 # Configuration parameters: EnforcedStyle, SupportedStyles. # SupportedStyles: snake_case, normalcase, non_integer Style/VariableNumber: Enabled: false -# Offense count: 31 +# Offense count: 34 # Cop supports --auto-correct. # Configuration parameters: SupportedStyles, WordRegex. # SupportedStyles: percent, brackets Style/WordArray: EnforcedStyle: percent - MinSize: 9 + MinSize: 8 diff --git a/app/helpers/imageables_helper.rb b/app/helpers/imageables_helper.rb index efe3c88ce..8cae1b989 100644 --- a/app/helpers/imageables_helper.rb +++ b/app/helpers/imageables_helper.rb @@ -9,10 +9,10 @@ module ImageablesHelper end def imageable_max_file_size - bytesToMeg(Image::MAX_IMAGE_SIZE) + bytes_to_megabytes(Image::MAX_IMAGE_SIZE) end - def bytesToMeg(bytes) + def bytes_to_megabytes(bytes) bytes / Numeric::MEGABYTE end @@ -37,4 +37,4 @@ module ImageablesHelper max_file_size: imageable_max_file_size end -end \ No newline at end of file +end diff --git a/app/helpers/images_helper.rb b/app/helpers/images_helper.rb index 4e2bdff0e..208ccf5ab 100644 --- a/app/helpers/images_helper.rb +++ b/app/helpers/images_helper.rb @@ -22,7 +22,7 @@ module ImagesHelper image.errors[:attachment].join(', ') if image.errors.key?(:attachment) end - def image_bytesToMeg(bytes) + def image_bytes_to_megabytes(bytes) bytes / Numeric::MEGABYTE end diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index 7b12c5d6f..0b483468f 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -1,11 +1,11 @@ module WelcomeHelper def active_class(index) - "is-active is-in" if index == 0 + "is-active is-in" if index.zero? end def slide_display(index) - "display: none;" if index > 0 + "display: none;" if index.positive? end def recommended_path(recommended) diff --git a/spec/models/poll/partial_result_spec.rb b/spec/models/poll/partial_result_spec.rb index dd6176a06..07e6a7355 100644 --- a/spec/models/poll/partial_result_spec.rb +++ b/spec/models/poll/partial_result_spec.rb @@ -57,24 +57,24 @@ describe Poll::PartialResult do expect(partial_result.amount_log).to eq("") expect(partial_result.author_id_log).to eq("") - author_A = create(:poll_officer).user - author_B = create(:poll_officer).user - author_C = create(:poll_officer).user + author1 = create(:poll_officer).user + author2 = create(:poll_officer).user + author3 = create(:poll_officer).user partial_result.amount = 33 - partial_result.author_id = author_A.id + partial_result.author_id = author1.id partial_result.save! partial_result.amount = 32 - partial_result.author_id = author_B.id + partial_result.author_id = author2.id partial_result.save! partial_result.amount = 34 - partial_result.author_id = author_C.id + partial_result.author_id = author3.id partial_result.save! expect(partial_result.amount_log).to eq(":33:32") - expect(partial_result.author_id_log).to eq(":#{author_A.id}:#{author_B.id}") + expect(partial_result.author_id_log).to eq(":#{author1.id}:#{author2.id}") end end From ce03251c722a878df4ea7cc349bbc22baf742830 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 17 Oct 2017 23:15:14 +0200 Subject: [PATCH 532/765] Filter officing results officer assigments to current date --- app/controllers/officing/results_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/officing/results_controller.rb b/app/controllers/officing/results_controller.rb index e1b6978f9..50d049549 100644 --- a/app/controllers/officing/results_controller.rb +++ b/app/controllers/officing/results_controller.rb @@ -104,7 +104,7 @@ class Officing::ResultsController < Officing::BaseController final. where(id: current_user.poll_officer.officer_assignment_ids). where("poll_booth_assignments.poll_id = ?", @poll.id). - order(date: :asc) + where(date: Date.current) end def load_partial_results From b5255afb2dbac6e8e62a3c60406a15961ec737dc Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 18 Oct 2017 00:17:01 +0200 Subject: [PATCH 533/765] Remove deprecated Poll::Question valid_answers attribute --- .../20171017221546_remove_poll_question_valid_answers.rb | 5 +++++ db/schema.rb | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20171017221546_remove_poll_question_valid_answers.rb diff --git a/db/migrate/20171017221546_remove_poll_question_valid_answers.rb b/db/migrate/20171017221546_remove_poll_question_valid_answers.rb new file mode 100644 index 000000000..e4c1ebb11 --- /dev/null +++ b/db/migrate/20171017221546_remove_poll_question_valid_answers.rb @@ -0,0 +1,5 @@ +class RemovePollQuestionValidAnswers < ActiveRecord::Migration + def change + remove_column :poll_questions, :valid_answers + end +end diff --git a/db/schema.rb b/db/schema.rb index 8a03412be..c3ccbeac7 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: 20171010143623) do +ActiveRecord::Schema.define(version: 20171017221546) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -676,7 +676,6 @@ ActiveRecord::Schema.define(version: 20171010143623) do t.integer "author_id" t.string "author_visible_name" t.string "title" - t.string "valid_answers" t.integer "comments_count" t.datetime "hidden_at" t.datetime "created_at" From f05e5291b2830aa43eabe6fad3493b3c98704029 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 18 Oct 2017 01:21:40 +0200 Subject: [PATCH 534/765] Replace valid_answers usage for question_answers on factories --- spec/factories.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/factories.rb b/spec/factories.rb index f7b10bba1..d2bce146f 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -576,14 +576,14 @@ FactoryGirl.define do factory :poll_answer, class: 'Poll::Answer' do association :question, factory: :poll_question association :author, factory: [:user, :level_two] - answer { question.valid_answers.sample } + answer { question.question_answers.sample.title } end factory :poll_partial_result, class: 'Poll::PartialResult' do association :question, factory: :poll_question association :author, factory: :user origin { 'web' } - answer { question.valid_answers.sample } + answer { question.question_answers.sample.title } end factory :poll_recount, class: 'Poll::Recount' do From 9e22a1812f3d9ffa8f8a44ce3ca09b0988c428c8 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 18 Oct 2017 01:22:15 +0200 Subject: [PATCH 535/765] Remove no longer needed valid_answers attribute from poll_question factory --- spec/factories.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/factories.rb b/spec/factories.rb index d2bce146f..3164599a5 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -503,7 +503,6 @@ FactoryGirl.define do poll association :author, factory: :user sequence(:title) { |n| "Question title #{n}" } - valid_answers { Faker::Lorem.words(3).join(', ') } end factory :poll_question_answer, class: 'Poll::Question::Answer' do From 60f2815010b0dd988b372534032e41ba394170b8 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 18 Oct 2017 01:27:39 +0200 Subject: [PATCH 536/765] Add missing total_results check on poll result specs --- spec/features/admin/poll/polls_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb index a9a33447f..829c28461 100644 --- a/spec/features/admin/poll/polls_spec.rb +++ b/spec/features/admin/poll/polls_spec.rb @@ -279,7 +279,8 @@ feature 'Admin polls' do create(:poll_recount, booth_assignment: booth_assignment_1, white_amount: 21, - null_amount: 44) + null_amount: 44, + total_amount: 66) visit admin_poll_path(poll) @@ -303,6 +304,7 @@ feature 'Admin polls' do within('#white_results') { expect(page).to have_content('21') } within('#null_results') { expect(page).to have_content('44') } + within('#total_results') { expect(page).to have_content('66') } end end end From 39f23d3b7bacffc8fb087c32179bbfb0dbd62c1d Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 18 Oct 2017 01:28:38 +0200 Subject: [PATCH 537/765] Switch from valid_answers to question_answers on specs --- spec/features/admin/poll/polls_spec.rb | 17 +++++++++++------ spec/features/officing/results_spec.rb | 19 ++++++++++++------- spec/models/poll/answer_spec.rb | 11 +++++++---- spec/models/poll/partial_result_spec.rb | 14 +++++++++----- 4 files changed, 39 insertions(+), 22 deletions(-) diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb index 829c28461..9c2d3fcf1 100644 --- a/spec/features/admin/poll/polls_spec.rb +++ b/spec/features/admin/poll/polls_spec.rb @@ -261,8 +261,13 @@ feature 'Admin polls' do booth_assignment_2 = create(:poll_booth_assignment, poll: poll) booth_assignment_3 = create(:poll_booth_assignment, poll: poll) - question_1 = create(:poll_question, poll: poll, valid_answers: "Yes,No") - question_2 = create(:poll_question, poll: poll, valid_answers: "Today,Tomorrow") + question_1 = create(:poll_question, poll: poll) + create(:poll_question_answer, title: 'Yes', question: question_1) + create(:poll_question_answer, title: 'No', question: question_1) + + question_2 = create(:poll_question, poll: poll) + create(:poll_question_answer, title: 'Today', question: question_2) + create(:poll_question_answer, title: 'Tomorrow', question: question_2) [booth_assignment_1, booth_assignment_2, booth_assignment_3].each do |ba| create(:poll_partial_result, @@ -287,17 +292,17 @@ feature 'Admin polls' do click_link "Results" expect(page).to have_content(question_1.title) - question_1.valid_answers.each_with_index do |answer, i| + question_1.question_answers.each_with_index do |answer, i| within("#question_#{question_1.id}_#{i}_result") do - expect(page).to have_content(answer) + expect(page).to have_content(answer.title) expect(page).to have_content([33, 0][i]) end end expect(page).to have_content(question_2.title) - question_2.valid_answers.each_with_index do |answer, i| + question_2.question_answers.each_with_index do |answer, i| within("#question_#{question_2.id}_#{i}_result") do - expect(page).to have_content(answer) + expect(page).to have_content(answer.title) expect(page).to have_content([0, 15][i]) end end diff --git a/spec/features/officing/results_spec.rb b/spec/features/officing/results_spec.rb index f7e1ad8ef..21cad8b77 100644 --- a/spec/features/officing/results_spec.rb +++ b/spec/features/officing/results_spec.rb @@ -7,8 +7,13 @@ feature 'Officing Results' do @officer_assignment = create(:poll_officer_assignment, :final, officer: @poll_officer) @poll = @officer_assignment.booth_assignment.poll @poll.update(ends_at: 1.day.ago) - @question_1 = create(:poll_question, poll: @poll, valid_answers: "Yes,No") - @question_2 = create(:poll_question, poll: @poll, valid_answers: "Today,Tomorrow") + @question_1 = create(:poll_question, poll: @poll) + create(:poll_question_answer, title: 'Yes', question: @question_1) + create(:poll_question_answer, title: 'No', question: @question_1) + @question_2 = create(:poll_question, poll: @poll) + create(:poll_question_answer, title: 'Today', question: @question_2) + create(:poll_question_answer, title: 'Tomorrow', question: @question_2) + login_as(@poll_officer.user) end @@ -83,7 +88,7 @@ feature 'Officing Results' do booth_assignment: @officer_assignment.booth_assignment, date: @poll.starts_at, question: @question_1, - answer: @question_1.valid_answers[0], + answer: @question_1.question_answers.first.title, author: @poll_officer.user, amount: 7777) @@ -143,13 +148,13 @@ feature 'Officing Results' do expect(page).to have_content(@officer_assignment.booth_assignment.booth.name) expect(page).to have_content(@question_1.title) - @question_1.valid_answers.each_with_index do |answer, i| - within("#question_#{@question_1.id}_#{i}_result") { expect(page).to have_content(answer) } + @question_1.question_answers.each_with_index do |answer, i| + within("#question_#{@question_1.id}_#{i}_result") { expect(page).to have_content(answer.title) } end expect(page).to have_content(@question_2.title) - @question_2.valid_answers.each_with_index do |answer, i| - within("#question_#{@question_2.id}_#{i}_result") { expect(page).to have_content(answer) } + @question_2.question_answers.each_with_index do |answer, i| + within("#question_#{@question_2.id}_#{i}_result") { expect(page).to have_content(answer.title) } end within('#white_results') { expect(page).to have_content('21') } diff --git a/spec/models/poll/answer_spec.rb b/spec/models/poll/answer_spec.rb index 8731445cc..fecf2f2d5 100644 --- a/spec/models/poll/answer_spec.rb +++ b/spec/models/poll/answer_spec.rb @@ -25,9 +25,12 @@ describe Poll::Answer do expect(answer).to_not be_valid end - it "should be valid for answers included in the Poll::Question's list" do - skip "review when removing valid_answers" - question = create(:poll_question, valid_answers: 'One, Two, Three') + it "should be valid for answers included in the Poll::Question's question_answers list" do + question = create(:poll_question) + create(:poll_question_answer, title: 'One', question: question) + create(:poll_question_answer, title: 'Two', question: question) + create(:poll_question_answer, title: 'Three', question: question) + expect(build(:poll_answer, question: question, answer: 'One')).to be_valid expect(build(:poll_answer, question: question, answer: 'Two')).to be_valid expect(build(:poll_answer, question: question, answer: 'Three')).to be_valid @@ -40,7 +43,7 @@ describe Poll::Answer do let(:author) { create(:user, :level_two) } let(:poll) { create(:poll) } - let(:question) { create(:poll_question, poll: poll, valid_answers: "Yes, No") } + let(:question) { create(:poll_question, poll: poll) } it "creates a poll_voter with user and poll data" do answer = create(:poll_answer, question: question, author: author, answer: "Yes") diff --git a/spec/models/poll/partial_result_spec.rb b/spec/models/poll/partial_result_spec.rb index 07e6a7355..316b17524 100644 --- a/spec/models/poll/partial_result_spec.rb +++ b/spec/models/poll/partial_result_spec.rb @@ -4,12 +4,16 @@ describe Poll::PartialResult do describe "validations" do it "validates that the answers are included in the Poll::Question's list" do - q = create(:poll_question, valid_answers: 'One, Two, Three') - expect(build(:poll_partial_result, question: q, answer: 'One')).to be_valid - expect(build(:poll_partial_result, question: q, answer: 'Two')).to be_valid - expect(build(:poll_partial_result, question: q, answer: 'Three')).to be_valid + question = create(:poll_question) + create(:poll_question_answer, title: 'One', question: question) + create(:poll_question_answer, title: 'Two', question: question) + create(:poll_question_answer, title: 'Three', question: question) - expect(build(:poll_partial_result, question: q, answer: 'Four')).to_not be_valid + expect(build(:poll_partial_result, question: question, answer: 'One')).to be_valid + expect(build(:poll_partial_result, question: question, answer: 'Two')).to be_valid + expect(build(:poll_partial_result, question: question, answer: 'Three')).to be_valid + + expect(build(:poll_partial_result, question: question, answer: 'Four')).to_not be_valid end end From fbcf8678c3c412c6d9eee22440d893142ec16b3c Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 18 Oct 2017 01:28:59 +0200 Subject: [PATCH 538/765] Remove no longer needed question model tests for valid_answers --- spec/models/poll/question_spec.rb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/spec/models/poll/question_spec.rb b/spec/models/poll/question_spec.rb index 60f9d6716..8c8a94d35 100644 --- a/spec/models/poll/question_spec.rb +++ b/spec/models/poll/question_spec.rb @@ -3,13 +3,6 @@ require 'rails_helper' RSpec.describe Poll::Question, type: :model do let(:poll_question) { build(:poll_question) } - describe "#valid_answers" do - it "gets a comma-separated string, but returns an array" do - poll_question.valid_answers = "Yes, No" - expect(poll_question.valid_answers).to eq(["Yes", "No"]) - end - end - describe "#poll_question_id" do it "should be invalid if a poll is not selected" do poll_question.poll_id = nil @@ -27,7 +20,6 @@ RSpec.describe Poll::Question, type: :model do create_list(:geozone, 3) p = create(:proposal) poll_question.copy_attributes_from_proposal(p) - expect(poll_question.valid_answers).to eq(['Yes', 'No']) expect(poll_question.author).to eq(p.author) expect(poll_question.author_visible_name).to eq(p.author.name) expect(poll_question.proposal_id).to eq(p.id) From c6d1f727af6597781842a14a9368977bbc63ca26 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 18 Oct 2017 01:29:40 +0200 Subject: [PATCH 539/765] Correct dev_seeds to correctly create Poll::Question::Answers instead of valid_answers, plus style fixes --- db/dev_seeds.rb | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 6b80a0ec5..18bfe0dcb 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -73,7 +73,7 @@ def create_user(email, username = Faker::Name.name) confirmed_at: Time.current, terms_of_service: "1", gender: ['Male', 'Female'].sample, - date_of_birth: rand((Time.current - 80.years) .. (Time.current - 16.years)), + date_of_birth: rand((Time.current - 80.years)..(Time.current - 16.years)), public_activity: (rand(1..100) > 30) ) end @@ -127,7 +127,7 @@ end user = create_user("user#{i}@consul.dev") level = [1, 2, 3].sample if level >= 2 - user.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: Faker::Number.number(10), document_type: "1", geozone: Geozone.reorder("RANDOM()").first) + user.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: Faker::Number.number(10), document_type: "1", geozone: Geozone.reorder("RANDOM()").first) end if level == 3 user.update(verified_at: Time.current, document_number: Faker::Number.number(10)) @@ -319,7 +319,7 @@ end end 100.times do - voter = not_org_users.level_two_or_three_verified.reorder("RANDOM()").first + voter = not_org_users.level_two_or_three_verified.reorder("RANDOM()").first proposal = Proposal.reorder("RANDOM()").first proposal.vote_by(voter: voter, vote: true) end @@ -504,7 +504,7 @@ Proposal.last(3).each do |proposal| "banner-img banner-img-three"].sample, target_url: Rails.application.routes.url_helpers.proposal_path(proposal), post_started_at: rand((Time.current - 1.week)..(Time.current - 1.day)), - post_ended_at: rand((Time.current - 1.day)..(Time.current + 1.week)), + post_ended_at: rand((Time.current - 1.day)..(Time.current + 1.week)), created_at: rand((Time.current - 1.week)..Time.current)) end @@ -561,13 +561,11 @@ print "Creating Poll Questions" author = User.reorder("RANDOM()").first description = "

      #{Faker::Lorem.paragraphs.join('

      ')}

      " open_at = rand(2.months.ago..2.months.from_now) - answers = Faker::Lorem.words((2..4).to_a.sample).map { |answer| answer.capitalize } question = Poll::Question.create!(author: author, title: Faker::Lorem.sentence(3).truncate(60), - valid_answers: answers.join(', '), poll: poll) - answers.each do |answer| - Poll::Question::Answer.create!(question: question, title: answer, description: Faker::ChuckNorris.fact) + Faker::Lorem.words((2..4).to_a.sample).each do |answer| + Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) end end @@ -599,7 +597,10 @@ print "Creating Poll Questions from Proposals" 3.times do proposal = Proposal.reorder("RANDOM()").first poll = Poll.current.first - question = Poll::Question.create(valid_answers: "Yes, No", poll: poll) + question = Poll::Question.create(poll: poll) + Faker::Lorem.words((2..4).to_a.sample).each do |answer| + Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) + end question.copy_attributes_from_proposal(proposal) question.save! end @@ -610,7 +611,10 @@ print "Creating Successful Proposals" 10.times do proposal = Proposal.reorder("RANDOM()").first poll = Poll.current.first - question = Poll::Question.create(valid_answers: "Yes, No", poll: poll) + question = Poll::Question.create(poll: poll) + Faker::Lorem.words((2..4).to_a.sample).each do |answer| + Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) + end question.copy_attributes_from_proposal(proposal) question.save! end @@ -656,8 +660,7 @@ print "Creating legislation processes" allegations_phase_enabled: true, draft_publication_enabled: true, result_publication_enabled: true, - published: true - ) + published: true) end ::Legislation::Process.all.each do |process| From 0a5ee3f8619da23036b81b9fd8ae6de2f31d5a79 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 18 Oct 2017 01:30:21 +0200 Subject: [PATCH 540/765] Remove valid_answers usage on Poll Question model --- app/models/poll/question.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/models/poll/question.rb b/app/models/poll/question.rb index 90e528bd0..066d223d9 100644 --- a/app/models/poll/question.rb +++ b/app/models/poll/question.rb @@ -39,17 +39,12 @@ class Poll::Question < ActiveRecord::Base author_visible_name => 'C' } end - def valid_answers - (super.try(:split, ',')&.compact || []).map(&:strip) - end - def copy_attributes_from_proposal(proposal) if proposal.present? self.author = proposal.author self.author_visible_name = proposal.author.name self.proposal_id = proposal.id self.title = proposal.title - self.valid_answers = I18n.t('poll_questions.default_valid_answers') end end From 8d2945e8a2227cc98b19f80222fd40cb40f33749 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 18 Oct 2017 01:31:34 +0200 Subject: [PATCH 541/765] Fix answer attribute validation to check question's question_answers inclusion --- app/models/poll/answer.rb | 4 +--- app/models/poll/partial_result.rb | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/models/poll/answer.rb b/app/models/poll/answer.rb index 4484060dd..ce4bc37af 100644 --- a/app/models/poll/answer.rb +++ b/app/models/poll/answer.rb @@ -9,9 +9,7 @@ class Poll::Answer < ActiveRecord::Base validates :author, presence: true validates :answer, presence: true - # temporary skipping validation, review when removing valid_answers - # validates :answer, inclusion: { in: ->(a) { a.question.valid_answers }}, - # unless: ->(a) { a.question.blank? } + validates :answer, inclusion: { in: ->(a) { a.question.question_answers.pluck(:title) }} scope :by_author, ->(author_id) { where(author_id: author_id) } scope :by_question, ->(question_id) { where(question_id: question_id) } diff --git a/app/models/poll/partial_result.rb b/app/models/poll/partial_result.rb index 12b16aa3a..a44b61cad 100644 --- a/app/models/poll/partial_result.rb +++ b/app/models/poll/partial_result.rb @@ -10,7 +10,7 @@ class Poll::PartialResult < ActiveRecord::Base validates :question, presence: true validates :author, presence: true validates :answer, presence: true - validates :answer, inclusion: {in: ->(a) { a.question.valid_answers }} + validates :answer, inclusion: {in: ->(a) { a.question.question_answers.pluck(:title) }} validates :origin, inclusion: {in: VALID_ORIGINS} scope :by_author, ->(author_id) { where(author_id: author_id) } From e9294f2a222b7de240d6804181a74e34737abbdc Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 18 Oct 2017 01:32:15 +0200 Subject: [PATCH 542/765] Switch from valid_answers to question_answers usage for Poll Questions --- app/controllers/admin/poll/questions_controller.rb | 3 +-- app/controllers/officing/results_controller.rb | 2 +- app/views/admin/poll/results/index.html.erb | 6 +++--- app/views/officing/results/index.html.erb | 6 +++--- app/views/officing/results/new.html.erb | 4 ++-- config/locales/en/activerecord.yml | 1 - config/locales/en/general.yml | 1 - config/locales/es/activerecord.yml | 1 - config/locales/es/general.yml | 1 - 9 files changed, 10 insertions(+), 15 deletions(-) diff --git a/app/controllers/admin/poll/questions_controller.rb b/app/controllers/admin/poll/questions_controller.rb index 5cf587735..64ecf4009 100644 --- a/app/controllers/admin/poll/questions_controller.rb +++ b/app/controllers/admin/poll/questions_controller.rb @@ -15,7 +15,6 @@ class Admin::Poll::QuestionsController < Admin::Poll::BaseController def new @polls = Poll.all - @question.valid_answers = I18n.t('poll_questions.default_valid_answers') proposal = Proposal.find(params[:proposal_id]) if params[:proposal_id].present? @question.copy_attributes_from_proposal(proposal) end @@ -56,7 +55,7 @@ class Admin::Poll::QuestionsController < Admin::Poll::BaseController private def question_params - params.require(:poll_question).permit(:poll_id, :title, :question, :proposal_id, :valid_answers, :video_url) + params.require(:poll_question).permit(:poll_id, :title, :question, :proposal_id, :video_url) end def search_params diff --git a/app/controllers/officing/results_controller.rb b/app/controllers/officing/results_controller.rb index 23ef0b038..e3f0bb27c 100644 --- a/app/controllers/officing/results_controller.rb +++ b/app/controllers/officing/results_controller.rb @@ -51,7 +51,7 @@ class Officing::ResultsController < Officing::BaseController results.each_pair do |answer_index, count| next if count.blank? - answer = question.valid_answers[answer_index.to_i] + answer = question.question_answers.where(given_order: answer_index.to_i + 1).first.title go_back_to_new if question.blank? partial_result = ::Poll::PartialResult.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id, diff --git a/app/views/admin/poll/results/index.html.erb b/app/views/admin/poll/results/index.html.erb index c65b3ead7..ab4e94857 100644 --- a/app/views/admin/poll/results/index.html.erb +++ b/app/views/admin/poll/results/index.html.erb @@ -37,11 +37,11 @@ - <% question.valid_answers.each_with_index do |answer, i| %> + <% question.question_answers.each_with_index do |answer, i| %> <% by_answer = by_question[question.id].present? ? by_question[question.id].group_by(&:answer) : {} %> - <%= answer %> - <%= by_answer[answer].present? ? by_answer[answer].sum(&:amount) : 0 %> + <%= answer.title %> + <%= by_answer[answer.title].present? ? by_answer[answer.title].sum(&:amount) : 0 %> <% end %> diff --git a/app/views/officing/results/index.html.erb b/app/views/officing/results/index.html.erb index 924d7fc13..67b6ece0f 100644 --- a/app/views/officing/results/index.html.erb +++ b/app/views/officing/results/index.html.erb @@ -40,11 +40,11 @@ - <% question.valid_answers.each_with_index do |answer, i| %> + <% question.question_answers.each_with_index do |answer, i| %> <% by_answer = by_question[question.id].present? ? by_question[question.id].group_by(&:answer) : {} %> - <%= answer %> - <%= by_answer[answer].present? ? by_answer[answer].first.amount : 0 %> + <%= answer.title %> + <%= by_answer[answer.title].present? ? by_answer[answer.title].first.amount : 0 %> <% end %> diff --git a/app/views/officing/results/new.html.erb b/app/views/officing/results/new.html.erb index fa5f449fb..2f05ca748 100644 --- a/app/views/officing/results/new.html.erb +++ b/app/views/officing/results/new.html.erb @@ -27,9 +27,9 @@

      <%= question.title %>

      - <% question.valid_answers.each_with_index do |answer, i| %> + <% question.question_answers.each_with_index do |answer, i| %>
      - + <%= text_field_tag "questions[#{question.id}][#{i}]", answer_result_value(question.id, i), placeholder: "0" %>
      <% end %> diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index bf2cbb712..8ef98b4d1 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -156,7 +156,6 @@ en: description: "Description" poll/question: title: "Question" - valid_answers: "Posibles answers" summary: "Summary" description: "Description" external_url: "Link to additional documentation" diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 7b3766471..ec1e1e767 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -500,7 +500,6 @@ en: videos: "External video" poll_questions: create_question: "Create question" - default_valid_answers: "Yes, No" show: vote_answer: "Vote %{answer}" voted: "You have voted %{answer}" diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index f61e3bd53..03de3965d 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -150,7 +150,6 @@ es: description: "Descripción" poll/question: title: "Pregunta" - valid_answers: "Posibles respuestas" summary: "Resumen" description: "Descripción" external_url: "Enlace a documentación adicional" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 0d2d11a52..c1e71cb33 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -500,7 +500,6 @@ es: videos: "Vídeo externo" poll_questions: create_question: "Crear pregunta para votación" - default_valid_answers: "Sí, No" show: vote_answer: "Votar %{answer}" voted: "Has votado %{answer}" From c044fb293c159d6a0f94f6ccca65e1ac448bcfe6 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 18 Oct 2017 01:59:30 +0200 Subject: [PATCH 543/765] Create poll_question trait with answers --- spec/factories.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/spec/factories.rb b/spec/factories.rb index 3164599a5..b98fc7adb 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -503,6 +503,13 @@ FactoryGirl.define do poll association :author, factory: :user sequence(:title) { |n| "Question title #{n}" } + + trait :with_answers do + after(:create) do |question, _evaluator| + create(:poll_question_answer, question: question, title: "Yes") + create(:poll_question_answer, question: question, title: "No") + end + end end factory :poll_question_answer, class: 'Poll::Question::Answer' do @@ -573,13 +580,13 @@ FactoryGirl.define do end factory :poll_answer, class: 'Poll::Answer' do - association :question, factory: :poll_question + association :question, factory: [:poll_question, :with_answers] association :author, factory: [:user, :level_two] answer { question.question_answers.sample.title } end factory :poll_partial_result, class: 'Poll::PartialResult' do - association :question, factory: :poll_question + association :question, factory: [:poll_question, :with_answers] association :author, factory: :user origin { 'web' } answer { question.question_answers.sample.title } From 08823153a9f590225142301226ec97162fb50d16 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 18 Oct 2017 02:03:58 +0200 Subject: [PATCH 544/765] Correct answer inclusion validation for no question scenario --- app/models/poll/answer.rb | 3 ++- app/models/poll/partial_result.rb | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/models/poll/answer.rb b/app/models/poll/answer.rb index ce4bc37af..78122188a 100644 --- a/app/models/poll/answer.rb +++ b/app/models/poll/answer.rb @@ -9,7 +9,8 @@ class Poll::Answer < ActiveRecord::Base validates :author, presence: true validates :answer, presence: true - validates :answer, inclusion: { in: ->(a) { a.question.question_answers.pluck(:title) }} + validates :answer, inclusion: { in: ->(a) { a.question.question_answers.pluck(:title) }}, + unless: ->(a) { a.question.blank? } scope :by_author, ->(author_id) { where(author_id: author_id) } scope :by_question, ->(question_id) { where(question_id: question_id) } diff --git a/app/models/poll/partial_result.rb b/app/models/poll/partial_result.rb index a44b61cad..0550650a5 100644 --- a/app/models/poll/partial_result.rb +++ b/app/models/poll/partial_result.rb @@ -10,8 +10,9 @@ class Poll::PartialResult < ActiveRecord::Base validates :question, presence: true validates :author, presence: true validates :answer, presence: true - validates :answer, inclusion: {in: ->(a) { a.question.question_answers.pluck(:title) }} - validates :origin, inclusion: {in: VALID_ORIGINS} + validates :answer, inclusion: { in: ->(a) { a.question.question_answers.pluck(:title) }}, + unless: ->(a) { a.question.blank? } + validates :origin, inclusion: { in: VALID_ORIGINS } scope :by_author, ->(author_id) { where(author_id: author_id) } scope :by_question, ->(question_id) { where(question_id: question_id) } From 36610f0c1a3bbe328f5e35179682291ea1513fba Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 18 Oct 2017 02:06:34 +0200 Subject: [PATCH 545/765] Use poll question trait with_answers to generate yes/no answers --- spec/models/poll/answer_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/models/poll/answer_spec.rb b/spec/models/poll/answer_spec.rb index fecf2f2d5..33cf833b6 100644 --- a/spec/models/poll/answer_spec.rb +++ b/spec/models/poll/answer_spec.rb @@ -43,7 +43,7 @@ describe Poll::Answer do let(:author) { create(:user, :level_two) } let(:poll) { create(:poll) } - let(:question) { create(:poll_question, poll: poll) } + let(:question) { create(:poll_question, :with_answers, poll: poll) } it "creates a poll_voter with user and poll data" do answer = create(:poll_answer, question: question, author: author, answer: "Yes") From 73365ad9d2fa1483244994df7ecef535b9dd9aa3 Mon Sep 17 00:00:00 2001 From: iagirre Date: Wed, 18 Oct 2017 09:34:17 +0200 Subject: [PATCH 546/765] Added spects to check de stats model and view --- .../polls/_results_subnavigation.html.erb | 4 +- config/locales/en/general.yml | 2 + config/locales/es/general.yml | 2 + spec/features/polls/polls_spec.rb | 13 ++++++ spec/models/poll/stats_spec.rb | 45 +++++++++++++++++++ 5 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 spec/models/poll/stats_spec.rb diff --git a/app/views/polls/_results_subnavigation.html.erb b/app/views/polls/_results_subnavigation.html.erb index 43aa95b40..9c2a7e8b0 100644 --- a/app/views/polls/_results_subnavigation.html.erb +++ b/app/views/polls/_results_subnavigation.html.erb @@ -4,14 +4,14 @@
    • <%= link_to "#tab-stats" do %>

      - <%= "Estadísticas" %> + <%= t("polls.show.stats_menu") %>

      <% end %>
    • <%= link_to "#tab-information" do %>

      - <%= "Información" %> + <%= t("polls.show.info_menu") %>

      <% end %>
      • diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index e39d1aa07..6867a1aa1 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -497,6 +497,8 @@ en: read_more: "Read more about %{answer}" read_less: "Read less about %{answer}" participate_in_other_polls: Participate in other polls + info_menu: "Information" + stats_menu: "Participation statistics" stats: title: "Participation data" total_participation: "Total participation" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 8ba167a05..38f4077c7 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -497,6 +497,8 @@ es: read_more: "Leer más sobre %{answer}" read_less: "Leer menos sobre %{answer}" participate_in_other_polls: Participar en otras votaciones + info_menu: "Información" + stats_menu: "Estadísticas de participación" stats: title: "Datos de participación" total_participation: "Participación total" diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb index 90deca711..223aa9e9d 100644 --- a/spec/features/polls/polls_spec.rb +++ b/spec/features/polls/polls_spec.rb @@ -357,4 +357,17 @@ feature 'Polls' do end end + + context "Results and stats" do + scenario "See polls statistics", :js do + user = create(:user) + poll = create(:poll, summary: "Summary", description: "Description") + login_as user + visit poll_path(poll) + + click_link "Participation statistics" + + expect(page).to have_content("Total participation") + end + end end diff --git a/spec/models/poll/stats_spec.rb b/spec/models/poll/stats_spec.rb new file mode 100644 index 000000000..ee431fa97 --- /dev/null +++ b/spec/models/poll/stats_spec.rb @@ -0,0 +1,45 @@ +require 'rails_helper' + +describe Poll::Stats do + + describe "Calculate stats" do + it "Generate the correct stats" do + poll = create(:poll) + booth = create(:poll_booth) + booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth) + create(:poll_voter, poll: poll, origin: 'web') + 3.times {create(:poll_voter, poll: poll, origin: 'booth')} + create(:poll_voter, poll: poll) + create(:poll_recount, origin: 'booth', white_amount: 1, null_amount: 0, total_amount: 2, booth_assignment_id: booth_assignment.id) + stats = Poll::Stats.new(poll).generate + + expect(stats[:total_participants]).to eq(5) + expect(stats[:total_participants_web]).to eq(2) + expect(stats[:total_participants_booth]).to eq(3) + expect(stats[:total_valid_votes]).to eq(4) + expect(stats[:total_white_votes]).to eq(1) + expect(stats[:total_null_votes]).to eq(0) + + expect(stats[:total_web_valid]).to eq(2) + expect(stats[:total_web_white]).to eq(0) + expect(stats[:total_web_null]).to eq(0) + + expect(stats[:total_booth_valid]).to eq(2) + expect(stats[:total_booth_white]).to eq(1) + expect(stats[:total_booth_null]).to eq(0) + + expect(stats[:total_participants_web_percentage]).to eq(40) + expect(stats[:total_participants_booth_percentage]).to eq(60) + expect(stats[:valid_percentage_web]).to eq(50) + expect(stats[:white_percentage_web]).to eq(0) + expect(stats[:null_percentage_web]).to eq(0) + expect(stats[:valid_percentage_booth]).to eq(50) + expect(stats[:white_percentage_booth]).to eq(100) + expect(stats[:null_percentage_booth]).to eq(0) + expect(stats[:total_valid_percentage]).to eq(80) + expect(stats[:total_white_percentage]).to eq(20) + expect(stats[:total_null_percentage]).to eq(0) + end + end + +end \ No newline at end of file From c896800325b5eb21ac1271e98aa41ca51b8887a1 Mon Sep 17 00:00:00 2001 From: iagirre Date: Wed, 18 Oct 2017 09:53:03 +0200 Subject: [PATCH 547/765] Removed added and unused route --- config/routes.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index e9ae237f0..ae4f7280c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -111,8 +111,6 @@ Rails.application.routes.draw do resources :annotations do get :search, on: :collection end - - get "polls/:id/stats", to: "polls/stats#show", as: 'custom_poll_stats' resources :polls, only: [:show, :index] do resources :questions, controller: 'polls/questions', shallow: true do From 81b1fb1a72b749ec16a843b963850d555922c2ce Mon Sep 17 00:00:00 2001 From: iagirre Date: Wed, 18 Oct 2017 10:27:41 +0200 Subject: [PATCH 548/765] Fixed some conflicts automatically merged that didn't realised before they were there --- app/views/polls/_show.html.erb | 21 ++++++++++++++++++--- app/views/polls/show.html.erb | 21 ++------------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/app/views/polls/_show.html.erb b/app/views/polls/_show.html.erb index 6350048ef..ee75ea5e3 100644 --- a/app/views/polls/_show.html.erb +++ b/app/views/polls/_show.html.erb @@ -8,7 +8,7 @@
      <% else %> - <% if current_user && !@poll.votable_by?(current_user) %> + <% if current_user && @poll.voted_in_web?(current_user) %>
      <%= t("polls.show.already_voted_in_web") %>
      @@ -49,8 +49,7 @@
      <% @poll_questions_answers.each do |answer| %> -
      +
      <% if answer.description.present? %>

      <%= answer.title %>

      @@ -96,6 +95,22 @@ <% end %>
      <% end %> + + <% if answer.videos.present? %> +
      +

      +   + <%= t("polls.show.videos") %> +

      + + <% answer.videos.each do |video| %> + <%= link_to video.title, + video.url, + target: "_blank", + rel: "nofollow" %>
      + <% end %> +
      + <% end %>
      <% end %>
      diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 9f3e36c75..880d0d421 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -31,28 +31,11 @@
      <%= render "results_subnavigation" %> - <% if current_user && @poll.voted_in_web?(current_user) %> -
      - <%= render "polls/stats/show" %> - target: "_blank", - rel: "nofollow" %>
      - <% end %> -
      - <% end %> - - <% if answer.videos.present? %> -
      -

      -   - <%= t("polls.show.videos") %> -

      - - <% answer.videos.each do |video| %> - <%= link_to video.title, - video.url, + <%= render "polls/stats/show" %>
      +
      <%= render "show" %>
      From 6c5ad49a3c39dc470e3a62754fe132b45a7d061a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 18 Oct 2017 11:52:42 +0200 Subject: [PATCH 549/765] Tests improvements --- spec/features/officing_spec.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/features/officing_spec.rb b/spec/features/officing_spec.rb index ae4e11858..5df4d4501 100644 --- a/spec/features/officing_spec.rb +++ b/spec/features/officing_spec.rb @@ -148,6 +148,8 @@ feature 'Poll Officing' do click_button "Confirm vote" expect(page).to have_content "Vote introduced!" + expect(Poll::Voter.where(document_number: '12345678Z').count).to be(1) + visit final_officing_polls_path page.should have_content("Polls ready for final recounting") end @@ -167,6 +169,8 @@ feature 'Poll Officing' do click_button "Confirm vote" expect(page).to have_content "Vote introduced!" + expect(Poll::Voter.where(document_number: '12345678Y').count).to be(1) + visit final_officing_polls_path page.should have_content("Polls ready for final recounting") end From fb1a0904cb770574b34fc1a01459a5d5c299ee22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 18 Oct 2017 13:17:50 +0200 Subject: [PATCH 550/765] Tests improvements --- app/controllers/officing/voters_controller.rb | 2 -- spec/features/officing_spec.rb | 8 +------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/app/controllers/officing/voters_controller.rb b/app/controllers/officing/voters_controller.rb index fdb4a128f..2b7ed329f 100644 --- a/app/controllers/officing/voters_controller.rb +++ b/app/controllers/officing/voters_controller.rb @@ -17,8 +17,6 @@ class Officing::VotersController < Officing::BaseController origin: "booth", officer: current_user.poll_officer) @voter.save! - - render 'create.js' end private diff --git a/spec/features/officing_spec.rb b/spec/features/officing_spec.rb index 5df4d4501..12d322099 100644 --- a/spec/features/officing_spec.rb +++ b/spec/features/officing_spec.rb @@ -107,7 +107,7 @@ feature 'Poll Officing' do expect(page).to_not have_css('#moderation_menu') end - scenario 'Officing dashboard available for multiple sessions' do + scenario 'Officing dashboard available for multiple sessions', :js do poll = create(:poll) booth = create(:poll_booth) booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth) @@ -137,9 +137,6 @@ feature 'Poll Officing' do page.should have_content("Here you can validate user documents and store voting results") visit new_officing_residence_path - within("#side_menu") do - click_link "Validate document" - end select 'DNI', from: 'residence_document_type' fill_in 'residence_document_number', with: "12345678Z" fill_in 'residence_year_of_birth', with: '1980' @@ -158,9 +155,6 @@ feature 'Poll Officing' do page.should have_content("Here you can validate user documents and store voting results") visit new_officing_residence_path - within("#side_menu") do - click_link "Validate document" - end select 'DNI', from: 'residence_document_type' fill_in 'residence_document_number', with: "12345678Y" fill_in 'residence_year_of_birth', with: '1980' From 5589c2d8a0f283168cd79814c005b60d3aaf5689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 18 Oct 2017 13:40:04 +0200 Subject: [PATCH 551/765] Tests improvements --- spec/features/officing_spec.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/spec/features/officing_spec.rb b/spec/features/officing_spec.rb index 12d322099..338b416ea 100644 --- a/spec/features/officing_spec.rb +++ b/spec/features/officing_spec.rb @@ -144,8 +144,7 @@ feature 'Poll Officing' do expect(page).to have_content 'Document verified with Census' click_button "Confirm vote" expect(page).to have_content "Vote introduced!" - - expect(Poll::Voter.where(document_number: '12345678Z').count).to be(1) + expect(Poll::Voter.where(document_number: '12345678Z', poll_id: poll, origin: 'booth', officer_id: officer1).count).to be(1) visit final_officing_polls_path page.should have_content("Polls ready for final recounting") @@ -162,8 +161,7 @@ feature 'Poll Officing' do expect(page).to have_content 'Document verified with Census' click_button "Confirm vote" expect(page).to have_content "Vote introduced!" - - expect(Poll::Voter.where(document_number: '12345678Y').count).to be(1) + expect(Poll::Voter.where(document_number: '12345678Y', poll_id: poll, origin: 'booth', officer_id: officer2).count).to be(1) visit final_officing_polls_path page.should have_content("Polls ready for final recounting") From 70a35fbe58221bf6bd7a04683f9a5a432b9b39dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 18 Oct 2017 18:35:53 +0200 Subject: [PATCH 552/765] Poll views improvements Reorganized poll `#show`, `#stats` and `#results` views. Gave stats section its own route. --- app/controllers/polls_controller.rb | 11 +- app/models/abilities/everyone.rb | 3 +- app/views/polls/_poll_header.html.erb | 27 ++++ app/views/polls/_poll_subnav.html.erb | 21 +++ .../polls/_results_subnavigation.html.erb | 20 --- app/views/polls/_show.html.erb | 126 --------------- app/views/polls/results.html.erb | 70 +++++---- app/views/polls/show.html.erb | 148 ++++++++++++++---- app/views/polls/stats.html.erb | 94 +++++++++++ app/views/polls/stats/_show.html.erb | 85 ---------- config/routes.rb | 3 +- 11 files changed, 313 insertions(+), 295 deletions(-) create mode 100644 app/views/polls/_poll_header.html.erb create mode 100644 app/views/polls/_poll_subnav.html.erb delete mode 100644 app/views/polls/_results_subnavigation.html.erb delete mode 100644 app/views/polls/_show.html.erb create mode 100644 app/views/polls/stats.html.erb delete mode 100644 app/views/polls/stats/_show.html.erb diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb index 4dce3bc81..aa93581cc 100644 --- a/app/controllers/polls_controller.rb +++ b/app/controllers/polls_controller.rb @@ -3,6 +3,8 @@ class PollsController < ApplicationController load_and_authorize_resource + before_filter :set_poll, only: [:stats, :results] + has_filters %w{current expired incoming} has_orders %w{most_voted newest oldest}, only: :show @@ -25,11 +27,18 @@ class PollsController < ApplicationController @commentable = @poll @comment_tree = CommentTree.new(@commentable, params[:page], @current_order) - + end + + def stats @stats = Poll::Stats.new(@poll).generate end def results + end + + private + + def set_poll @poll = Poll.find(params[:poll_id]) end diff --git a/app/models/abilities/everyone.rb b/app/models/abilities/everyone.rb index e2529f72a..4d2fe4434 100644 --- a/app/models/abilities/everyone.rb +++ b/app/models/abilities/everyone.rb @@ -6,7 +6,7 @@ module Abilities can [:read, :map], Debate can [:read, :map, :summary, :share], Proposal can :read, Comment - can [:read, :results], Poll + can [:read, :results, :stats], Poll can :read, Poll::Question can [:read, :welcome], Budget can :read, SpendingProposal @@ -23,7 +23,6 @@ module Abilities can [:read], Legislation::Question can [:create], Legislation::Answer can [:search, :comments, :read, :create, :new_comment], Legislation::Annotation - can :read_stats, Poll end end end diff --git a/app/views/polls/_poll_header.html.erb b/app/views/polls/_poll_header.html.erb new file mode 100644 index 000000000..db4918ab4 --- /dev/null +++ b/app/views/polls/_poll_header.html.erb @@ -0,0 +1,27 @@ +
      +
      +
      + <%= back_link_to polls_path, t("polls.show.back") %> + +

      <%= @poll.name %>

      + + <%= safe_html_with_links simple_format(@poll.summary) %> + + <% if @poll.geozones.any? %> +
        + <% @poll.geozones.each do |g| %> +
      • <%= g.name %>
        • + <% end %> +
      + <% end %> +
      + + +
      +
      diff --git a/app/views/polls/_poll_subnav.html.erb b/app/views/polls/_poll_subnav.html.erb new file mode 100644 index 000000000..9b37e1867 --- /dev/null +++ b/app/views/polls/_poll_subnav.html.erb @@ -0,0 +1,21 @@ +
      +
      +
        +
      • + <%= link_to t("polls.show.results_menu"), + poll_results_path(@poll), + class: (controller_name == "polls" && action_name == "results" ? "is-active" : "") %> +
        • +
      • + <%= link_to t("polls.show.stats_menu"), + poll_stats_path(@poll), + class: (controller_name == "polls" && action_name == "stats" ? "is-active" : "") %> +
        • +
      • + <%= link_to t("polls.show.info_menu"), + poll_path(@poll), + class: (controller_name == "polls" && action_name == "show" ? "is-active" : "") %> +
        • +
      +
      +
      diff --git a/app/views/polls/_results_subnavigation.html.erb b/app/views/polls/_results_subnavigation.html.erb deleted file mode 100644 index 9c2a7e8b0..000000000 --- a/app/views/polls/_results_subnavigation.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -
      -
      -
        -
      • - <%= link_to "#tab-stats" do %> -

        - <%= t("polls.show.stats_menu") %> -

        - <% end %> -
        • -
      • - <%= link_to "#tab-information" do %> -

        - <%= t("polls.show.info_menu") %> -

        - <% end %> -
        • -
      -
      -
      \ No newline at end of file diff --git a/app/views/polls/_show.html.erb b/app/views/polls/_show.html.erb deleted file mode 100644 index ee75ea5e3..000000000 --- a/app/views/polls/_show.html.erb +++ /dev/null @@ -1,126 +0,0 @@ -
      -
      - <%= render "callout" %> - - <% if @poll.voted_in_booth?(current_user) %> -
      - <%= t("polls.show.already_voted_in_booth") %> -
      - <% else %> - - <% if current_user && @poll.voted_in_web?(current_user) %> -
      - <%= t("polls.show.already_voted_in_web") %> -
      - <% end %> - <% end %> - - <% @questions.each do |question| %> - <%= render 'polls/questions/question', question: question, token: @token %> - <% end %> - - <% if poll_voter_token(@poll, current_user).empty? %> - - <% end %> - - <%= link_to t("polls.show.participate_in_other_polls"), polls_path, class: "button hollow" %> -
      -
      - -
      -
      -
      -

      <%= t("polls.show.more_info_title") %>

      - <%= safe_html_with_links simple_format(@poll.description) %> -
      - - <% if false %> - - <% end %> -
      -
      - -
      -
      - - <% @poll_questions_answers.each do |answer| %> -
      - - <% if answer.description.present? %> -

      <%= answer.title %>

      - <% end %> - - <% if answer.images.any? %> - <%= render "gallery", answer: answer %> - <% end %> - - <% if answer.description.present? %> -
      -
      - <%= safe_html_with_links simple_format(answer.description) %> -
      -
      - - <%= t("polls.show.read_more", answer: answer.title) %> - - - <%= t("polls.show.read_less", answer: answer.title) %> - -
      -
      - <% end %> - - <% if answer.documents.present? %> -
      -

      -   - <%= t("polls.show.documents") %> -

      - - <% answer.documents.each do |document| %> - <%= link_to document.title, - document.attachment.url, - target: "_blank", - rel: "nofollow" %>
      - <% end %> -
      - <% end %> - - <% if answer.videos.present? %> -
      -

      -   - <%= t("polls.show.videos") %> -

      - - <% answer.videos.each do |video| %> - <%= link_to video.title, - video.url, - target: "_blank", - rel: "nofollow" %>
      - <% end %> -
      - <% end %> -
      - <% end %> -
      - -
      - -
      - <%= render "filter_subnav" %> - -
      - <%= render "comments" %> -
      -
      \ No newline at end of file diff --git a/app/views/polls/results.html.erb b/app/views/polls/results.html.erb index 353f92fa1..f0c9e4a38 100644 --- a/app/views/polls/results.html.erb +++ b/app/views/polls/results.html.erb @@ -1,36 +1,44 @@ -
      -
      -

      Preguntas

      -
        +<% provide :title do %><%= @poll.name %><% end %> + +
        + <%= render "poll_header" %> + + <%= render "poll_subnav" %> + +
        +
        +

        Preguntas

        +
          + <%- @poll.questions.each do |question| %> +
        • <%=link_to question.title, "##{question.title.parameterize}" %>
          • + <% end %> +
        +
        + +
        <%- @poll.questions.each do |question| %> -
      • <%=link_to question.title, "##{question.title.parameterize}" %>
        • + +

        <%= question.title %>

        + + + <%- question.question_answers.each do |answer| %> + + <% end %> + + + + + <%- question.question_answers.each do |answer| %> + + <% end %> + + +
        ><%= answer.title %>
        > + <%= answer.total_votes %> + (<%= answer.total_votes_percentage %>%) +
        <% end %> -
      -
      - -
      - <%- @poll.questions.each do |question| %> - -

      <%= question.title %>

      - - - <%- question.question_answers.each do |answer| %> - - <% end %> - - - - - <%- question.question_answers.each do |answer| %> - - <% end %> - - -
      ><%= answer.title %>
      > - <%= answer.total_votes %> - (<%= answer.total_votes_percentage %>%) -
      - <% end %> +
      diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 880d0d421..4eabd240b 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -1,44 +1,134 @@ <% provide :title do %><%= @poll.name %><% end %>
      -
      -
      -
      - <%= back_link_to polls_path, t("polls.show.back") %> + <%= render "poll_header" %> -

      <%= @poll.name %>

      + <%= render "poll_subnav" %> - <%= safe_html_with_links simple_format(@poll.summary) %> +
      +
      + <%= render "callout" %> - <% if @poll.geozones.any? %> -
        - <% @poll.geozones.each do |g| %> -
      • <%= g.name %>
        • - <% end %> -
      + <% if @poll.voted_in_booth?(current_user) %> +
      + <%= t("polls.show.already_voted_in_booth") %> +
      + <% else %> + + <% if current_user && @poll.voted_in_web?(current_user) %> +
      + <%= t("polls.show.already_voted_in_web") %> +
      <% end %> + <% end %> + + <% @questions.each do |question| %> + <%= render 'polls/questions/question', question: question, token: @token %> + <% end %> + + <% if poll_voter_token(@poll, current_user).empty? %> + + <% end %> + + <%= link_to t("polls.show.participate_in_other_polls"), polls_path, class: "button hollow" %> +
      +
      + +
      +
      +
      +

      <%= t("polls.show.more_info_title") %>

      + <%= safe_html_with_links simple_format(@poll.description) %>
      - + <% if false %> + + <% end %>
      - -
      - <%= render "results_subnavigation" %> -
      - <%= render "polls/stats/show" %> +
      +
      + + <% @poll_questions_answers.each do |answer| %> +
      + + <% if answer.description.present? %> +

      <%= answer.title %>

      + <% end %> + + <% if answer.images.any? %> + <%= render "gallery", answer: answer %> + <% end %> + + <% if answer.description.present? %> +
      +
      + <%= safe_html_with_links simple_format(answer.description) %> +
      +
      + + <%= t("polls.show.read_more", answer: answer.title) %> + + + <%= t("polls.show.read_less", answer: answer.title) %> + +
      +
      + <% end %> + + <% if answer.documents.present? %> +
      +

      +   + <%= t("polls.show.documents") %> +

      + + <% answer.documents.each do |document| %> + <%= link_to document.title, + document.attachment.url, + target: "_blank", + rel: "nofollow" %>
      + <% end %> +
      + <% end %> + + <% if answer.videos.present? %> +
      +

      +   + <%= t("polls.show.videos") %> +

      + + <% answer.videos.each do |video| %> + <%= link_to video.title, + video.url, + target: "_blank", + rel: "nofollow" %>
      + <% end %> +
      + <% end %> +
      + <% end %> +
      + +
      + +
      + <%= render "filter_subnav" %> + +
      + <%= render "comments" %>
      - -
      - <%= render "show" %> -
      - diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb new file mode 100644 index 000000000..20e5411ab --- /dev/null +++ b/app/views/polls/stats.html.erb @@ -0,0 +1,94 @@ +<% provide :title do %><%= @poll.name %><% end %> + +
      + <%= render "poll_header" %> + + <%= render "poll_subnav" %> + +
      +
      +

      <%= t("polls.show.stats.title") %>

      + +
      +
      +

      <%= t("polls.show.stats.total_participation") %>

      + +

      + <%= t("polls.show.stats.total_votes") %>
      + <%= @stats[:total_participants] %> +

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      <%= t("polls.show.stats.votes") %><%= t("polls.show.stats.web") %><%= t("polls.show.stats.booth") %><%= t("polls.show.stats.total") %>
      <%= t("polls.show.stats.valid") %><%= @stats[:total_web_valid] %> + (<%= number_to_percentage(@stats[:valid_percentage_web], + strip_insignificant_zeros: true, + precision: 2) %>)<%= @stats[:total_booth_valid] %> + (<%= number_to_percentage(@stats[:valid_percentage_booth], + strip_insignificant_zeros: true, + precision: 2) %>)<%= @stats[:total_valid_votes] %> + (<%= number_to_percentage(@stats[:total_valid_percentage], + strip_insignificant_zeros: true, + precision: 2) %>)
      <%= t("polls.show.stats.white") %><%= @stats[:total_web_white] %> + (<%= number_to_percentage(@stats[:white_percentage_web], + strip_insignificant_zeros: true, + precision: 2) %>)<%= @stats[:total_booth_white] %> + (<%= number_to_percentage(@stats[:white_percentage_booth], + strip_insignificant_zeros: true, + precision: 2) %>)<%= @stats[:total_white_votes] %> + (<%= number_to_percentage(@stats[:total_white_percentage], + strip_insignificant_zeros: true, + precision: 2) %>)
      <%= t("polls.show.stats.null_votes") %><%= @stats[:total_web_null] %> + (<%= number_to_percentage(@stats[:null_percentage_web], + strip_insignificant_zeros: true, + precision: 2) %>)<%= @stats[:total_booth_null] %> + (<%= number_to_percentage(@stats[:null_percentage_booth], + strip_insignificant_zeros: true, + precision: 2) %>)<%= @stats[:total_null_votes] %> + (<%= number_to_percentage(@stats[:total_null_percentage], + strip_insignificant_zeros: true, + precision: 2) %>)
      <%= t("polls.show.stats.total") %><%= @stats[:total_participants_web] %> + (<%= number_to_percentage(@stats[:total_participants_web_percentage], + strip_insignificant_zeros: true, + precision: 2) %>)<%= @stats[:total_participants_booth] %> + (<%= number_to_percentage(@stats[:total_participants_booth_percentage], + strip_insignificant_zeros: true, + precision: 2) %>)<%= @stats[:total_participants_web] + @stats[:total_participants_booth] %>
      +
      +
      + +
      diff --git a/app/views/polls/stats/_show.html.erb b/app/views/polls/stats/_show.html.erb deleted file mode 100644 index 1aeb7cf69..000000000 --- a/app/views/polls/stats/_show.html.erb +++ /dev/null @@ -1,85 +0,0 @@ -
      -
      -

      <%= t("polls.show.stats.title") %>

      - -
      -
      -

      <%= t("polls.show.stats.total_participation") %>

      - -

      - <%= t("polls.show.stats.total_votes") %>
      - <%= @stats[:total_participants] %> -

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      <%= t("polls.show.stats.votes") %><%= t("polls.show.stats.web") %><%= t("polls.show.stats.booth") %><%= t("polls.show.stats.total") %>
      <%= t("polls.show.stats.valid") %><%= @stats[:total_web_valid] %> - (<%= number_to_percentage(@stats[:valid_percentage_web], - strip_insignificant_zeros: true, - precision: 2) %>)<%= @stats[:total_booth_valid] %> - (<%= number_to_percentage(@stats[:valid_percentage_booth], - strip_insignificant_zeros: true, - precision: 2) %>)<%= @stats[:total_valid_votes] %> - (<%= number_to_percentage(@stats[:total_valid_percentage], - strip_insignificant_zeros: true, - precision: 2) %>)
      <%= t("polls.show.stats.white") %><%= @stats[:total_web_white] %> - (<%= number_to_percentage(@stats[:white_percentage_web], - strip_insignificant_zeros: true, - precision: 2) %>)<%= @stats[:total_booth_white] %> - (<%= number_to_percentage(@stats[:white_percentage_booth], - strip_insignificant_zeros: true, - precision: 2) %>)<%= @stats[:total_white_votes] %> - (<%= number_to_percentage(@stats[:total_white_percentage], - strip_insignificant_zeros: true, - precision: 2) %>)
      <%= t("polls.show.stats.null_votes") %><%= @stats[:total_web_null] %> - (<%= number_to_percentage(@stats[:null_percentage_web], - strip_insignificant_zeros: true, - precision: 2) %>)<%= @stats[:total_booth_null] %> - (<%= number_to_percentage(@stats[:null_percentage_booth], - strip_insignificant_zeros: true, - precision: 2) %>)<%= @stats[:total_null_votes] %> - (<%= number_to_percentage(@stats[:total_null_percentage], - strip_insignificant_zeros: true, - precision: 2) %>)
      <%= t("polls.show.stats.total") %><%= @stats[:total_participants_web] %> - (<%= number_to_percentage(@stats[:total_participants_web_percentage], - strip_insignificant_zeros: true, - precision: 2) %>)<%= @stats[:total_participants_booth] %> - (<%= number_to_percentage(@stats[:total_participants_booth_percentage], - strip_insignificant_zeros: true, - precision: 2) %>)<%= @stats[:total_participants_web] + @stats[:total_participants_booth] %>
      -
      -
      \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 5ab529a87..38858b813 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -111,8 +111,9 @@ Rails.application.routes.draw do resources :annotations do get :search, on: :collection end - + resources :polls, only: [:show, :index] do + get :stats get :results resources :questions, controller: 'polls/questions', shallow: true do post :answer, on: :member From 68341e5a7682c923c69c67be9ca0e76a57e35466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 18 Oct 2017 18:36:02 +0200 Subject: [PATCH 553/765] Added translations --- config/locales/en/general.yml | 1 + config/locales/es/general.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 85bfbe699..93b2b8931 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -500,6 +500,7 @@ en: videos: "External video" info_menu: "Information" stats_menu: "Participation statistics" + results_menu: "Poll results" stats: title: "Participation data" total_participation: "Total participation" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index a15952cc9..3da5c5593 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -500,6 +500,7 @@ es: videos: "Vídeo externo" info_menu: "Información" stats_menu: "Estadísticas de participación" + results_menu: "Resultados de la votación" stats: title: "Datos de participación" total_participation: "Participación total" From 05a713790f4f0cf41c08fd3185da3f8300ee8971 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 18 Oct 2017 18:54:01 +0200 Subject: [PATCH 554/765] improves edit debate button on debate show --- app/assets/stylesheets/participation.scss | 4 ---- app/views/debates/show.html.erb | 16 +++++++++------- config/locales/en/general.yml | 1 + config/locales/es/general.yml | 1 + 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index a887d83de..55645309f 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -363,10 +363,6 @@ width: rem-calc(48); } - .edit-debate { - margin-bottom: 0; - } - .debate-info, .proposal-info, .investment-project-info, diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 44fa08a06..5f6d6b50f 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -9,13 +9,6 @@
      <%= back_link_to %> - <% if current_user && @debate.editable_by?(current_user) %> - <%= link_to edit_debate_path(@debate), class: 'edit-debate button success small float-right' do %> - - <%= t("debates.show.edit_debate_link") %> - <% end %> - <% end %> -

      <%= @debate.title %>

      <% if @debate.conflictive? %>
      @@ -47,6 +40,15 @@
      \ No newline at end of file +
      diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index e4085c8e5..4e6b6f0e5 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -43,7 +43,9 @@ <%= render "activity_page" %> <% else %> -

      <%= t('users.show.private_activity') %>

      +
      + <%= t('users.show.private_activity') %> +
      <% end %> <%= render 'interests', user: @user if valid_interests_access? %> diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index d42a24ac9..172c8e2bf 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -14,8 +14,8 @@ en: phone_number_label: Phone number public_activity_label: Keep my list of activities public public_interests_label: Keep my interests public - public_interests_my_title_list: List of interests (Tags of elements you follow) - public_interests_user_title_list: List of interests (Tags of elements this user follows) + public_interests_my_title_list: List of interests (tags of elements you follow) + public_interests_user_title_list: List of interests (tags of elements this user follows) public_interests_my_empty_list: You do not follow any elements yet. public_interests_user_empty_list: This user does not follow any elements yet. save_changes_submit: Save changes @@ -731,7 +731,7 @@ en: other: "%{count} Following" no_activity: User has no public activity no_private_messages: "This user doesn't accept private messages." - private_activity: This user decided to keep the activity list private + private_activity: This user decided to keep the activity list private. send_private_message: "Send private message" proposals: send_notification: "Send notification" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 05c810a76..e56f725c9 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -14,8 +14,8 @@ es: phone_number_label: Teléfono public_activity_label: Mostrar públicamente mi lista de actividades public_interests_label: Mostrar públicamente mis intereses - public_interests_my_title_list: Lista de intereses (Etiquetas de los elementos que sigues) - public_interests_user_title_list: Lista de intereses (Etiquetas de los elementos seguidos este usuario) + public_interests_my_title_list: Lista de intereses (etiquetas de los elementos que sigues) + public_interests_user_title_list: Lista de intereses (etiquetas de los elementos seguidos este usuario) public_interests_my_empty_list: Aún no sigues ningún elemento. public_interests_user_empty_list: Este usuario no sigue ningún elemento todavía. save_changes_submit: Guardar cambios @@ -731,7 +731,7 @@ es: other: "%{count} Siguiendo" no_activity: Usuario sin actividad pública no_private_messages: "Este usuario no acepta mensajes privados." - private_activity: Este usuario ha decidido mantener en privado su lista de actividades + private_activity: Este usuario ha decidido mantener en privado su lista de actividades. send_private_message: "Enviar un mensaje privado" proposals: send_notification: "Enviar notificación" From 2148ee7492cd6026bd723e5b2554799b2ff7d7a0 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 18 Oct 2017 19:37:20 +0200 Subject: [PATCH 558/765] updates texts on specs --- spec/features/users_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb index ae2bac6d1..5a73209df 100644 --- a/spec/features/users_spec.rb +++ b/spec/features/users_spec.rb @@ -314,7 +314,7 @@ feature 'Users' do @user.update(public_interests: true) visit user_path(@user) - expect(page).to have_content("List of interests (Tags of elements this user follows)") + expect(page).to have_content("List of interests (tags of elements this user follows)") end scenario 'Should display custom interests title when user is visiting own user page' do @@ -322,7 +322,7 @@ feature 'Users' do login_as(@user) visit user_path(@user) - expect(page).to have_content("List of interests (Tags of elements you follow)") + expect(page).to have_content("List of interests (tags of elements you follow)") end scenario 'Should display generic empty interests list message when visited user has not interests defined' do From 97fb986626341af2629270845ac3bfe47df33adc Mon Sep 17 00:00:00 2001 From: Manuel Ortega Date: Wed, 18 Oct 2017 19:50:34 +0200 Subject: [PATCH 559/765] Added documentable feature to legislation processes --- app/assets/stylesheets/layout.scss | 26 +++++++++++++++++++ app/assets/stylesheets/participation.scss | 4 ++- .../admin/legislation/processes_controller.rb | 3 ++- app/helpers/documentables_helper.rb | 7 +++++ app/models/legislation/process.rb | 4 +++ .../legislation/processes/_form.html.erb | 7 +++++ .../documents/_additional_documents.html.erb | 22 ++++++++++++++++ .../legislation/processes/debate.html.erb | 2 ++ 8 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 app/views/documents/_additional_documents.html.erb diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 06fdfd396..fc5ac0c6a 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -2395,3 +2395,29 @@ table { } } } + +.additional-document-link { + background: $highlight-soft; + border: 1px solid $highlight; + display: block; + margin: $line-height / 2 0; + padding: $line-height / 2; + position: relative; + + a { + word-wrap: break-word; + } + + .icon-document { + color: #007bb7; + display: inline-block; + font-size: rem-calc(24); + line-height: $line-height; + vertical-align: middle; + } +} + +.document-divider { + background: #fafafa; + border-bottom: 1px solid #eee; +} diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index a887d83de..456b10506 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -311,7 +311,9 @@ .proposal-form, .proposal-edit, .polls-form, -.poll-question-form { +.poll-question-form, +.legislation-process-new, +.legislation-process-edit { @include direct-uploads; } diff --git a/app/controllers/admin/legislation/processes_controller.rb b/app/controllers/admin/legislation/processes_controller.rb index 5d8d828cd..aef452322 100644 --- a/app/controllers/admin/legislation/processes_controller.rb +++ b/app/controllers/admin/legislation/processes_controller.rb @@ -52,7 +52,8 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll :allegations_phase_enabled, :draft_publication_enabled, :result_publication_enabled, - :published + :published, + documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy] ) end end diff --git a/app/helpers/documentables_helper.rb b/app/helpers/documentables_helper.rb index 3fe56abd2..8e832535f 100644 --- a/app/helpers/documentables_helper.rb +++ b/app/helpers/documentables_helper.rb @@ -38,4 +38,11 @@ module DocumentablesHelper documentable.documents.count >= documentable.class.max_documents_allowed end + def documentable_humanized_content_type(documentable_class) + documentable_class.attachment_content_type.split("/").last.upcase + end + + def documentable_humanized_file_size(documentable_class) + number_to_human_size(documentable_class.attachment_file_size) + end end diff --git a/app/models/legislation/process.rb b/app/models/legislation/process.rb index b6043df57..03c8e3095 100644 --- a/app/models/legislation/process.rb +++ b/app/models/legislation/process.rb @@ -1,6 +1,10 @@ class Legislation::Process < ActiveRecord::Base acts_as_paranoid column: :hidden_at include ActsAsParanoidAliases + include Documentable + documentable max_documents_allowed: 3, + max_file_size: 3.megabytes, + accepted_content_types: [ "application/pdf" ] PHASES_AND_PUBLICATIONS = %i(debate_phase allegations_phase draft_publication result_publication).freeze diff --git a/app/views/admin/legislation/processes/_form.html.erb b/app/views/admin/legislation/processes/_form.html.erb index 205d97361..43de37aa2 100644 --- a/app/views/admin/legislation/processes/_form.html.erb +++ b/app/views/admin/legislation/processes/_form.html.erb @@ -152,6 +152,13 @@
      +
      + <%= render 'documents/nested_documents', documentable: @process, f: f %> +
      +
      +
      +
      +
      <%= f.label :title %> diff --git a/app/views/documents/_additional_documents.html.erb b/app/views/documents/_additional_documents.html.erb new file mode 100644 index 000000000..9fb999de4 --- /dev/null +++ b/app/views/documents/_additional_documents.html.erb @@ -0,0 +1,22 @@ +<% if documents.any? %> +
      +
      +
      +
      +

      + <%= t('proposals.show.title_external_url') %> +

      + <% documents.each do |document| %> +

        + <%= link_to "#{document.title} (#{documentable_humanized_content_type(document)} | \ + #{documentable_humanized_file_size(document)})".html_safe, + document.attachment.url, + target: "_blank", + title: t("shared.target_blank_html") %> +

      + <% end %> +
      +
      +
      +
      +<% end %> diff --git a/app/views/legislation/processes/debate.html.erb b/app/views/legislation/processes/debate.html.erb index a387989a7..a6042bd84 100644 --- a/app/views/legislation/processes/debate.html.erb +++ b/app/views/legislation/processes/debate.html.erb @@ -2,6 +2,8 @@ <%= render 'legislation/processes/header', process: @process, header: :full %> +<%= render 'documents/additional_documents', documents: @process.documents %> + <%= render 'key_dates', process: @process, phase: :debate %>
      From d15f150e988af033df5c57aa3cb8b7f857faeb1e Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 18 Oct 2017 20:49:30 +0200 Subject: [PATCH 560/765] Trim officer shifts by booth as well --- app/helpers/shifts_helper.rb | 20 ++++++++++---------- app/views/admin/poll/shifts/_form.html.erb | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/helpers/shifts_helper.rb b/app/helpers/shifts_helper.rb index 3773014ac..3a55feb4f 100644 --- a/app/helpers/shifts_helper.rb +++ b/app/helpers/shifts_helper.rb @@ -1,23 +1,23 @@ module ShiftsHelper - def shift_vote_collection_dates(polls) - date_options((start_date(polls)..end_date(polls)), Poll::Shift.tasks[:vote_collection]) + def shift_vote_collection_dates(booth, polls) + date_options((start_date(polls)..end_date(polls)), Poll::Shift.tasks[:vote_collection], booth) end - def shift_recount_scrutiny_dates(polls) + def shift_recount_scrutiny_dates(booth, polls) dates = polls.map(&:ends_at).map(&:to_date).sort.inject([]) do |total, date| initial_date = date < Date.current ? Date.current : date total << (initial_date..date + Poll::RECOUNT_DURATION).to_a end - date_options(dates.flatten.uniq, Poll::Shift.tasks[:recount_scrutiny]) + date_options(dates.flatten.uniq, Poll::Shift.tasks[:recount_scrutiny], booth) end - def date_options(dates, task_id) - valid_dates(dates, task_id).map { |date| [l(date, format: :long), l(date)] } + def date_options(dates, task_id, booth) + valid_dates(dates, task_id, booth).map { |date| [l(date, format: :long), l(date)] } end - def valid_dates(dates, task_id) - dates.reject { |date| officer_shifts(task_id).include?(date) } + def valid_dates(dates, task_id, booth) + dates.reject { |date| officer_shifts(task_id, booth).include?(date) } end def start_date(polls) @@ -35,7 +35,7 @@ module ShiftsHelper private - def officer_shifts(task_id) - @officer.shifts.where(task: task_id).map(&:date) + def officer_shifts(task_id, booth) + @officer.shifts.where(task: task_id, booth: booth).map(&:date) end end diff --git a/app/views/admin/poll/shifts/_form.html.erb b/app/views/admin/poll/shifts/_form.html.erb index 4004a949b..07e07381f 100644 --- a/app/views/admin/poll/shifts/_form.html.erb +++ b/app/views/admin/poll/shifts/_form.html.erb @@ -24,12 +24,12 @@
      <%= select 'shift[date]', 'vote_collection_date', - options_for_select(shift_vote_collection_dates(@booth.polls.current_or_incoming)), + options_for_select(shift_vote_collection_dates(@booth, @booth.polls.current_or_incoming)), { prompt: t("admin.poll_shifts.new.select_date"), label: false }, class: 'js-shift-vote-collection-dates' %> <%= select 'shift[date]', 'recount_scrutiny_date', - options_for_select(shift_recount_scrutiny_dates(@booth.polls.current_or_recounting_or_incoming)), + options_for_select(shift_recount_scrutiny_dates(@booth, @booth.polls.current_or_recounting_or_incoming)), { prompt: t("admin.poll_shifts.new.select_date"), label: false }, class: 'js-shift-recount-scrutiny-dates', From 2fef9c14d0d73ebd41bd3f333364addd24f3be55 Mon Sep 17 00:00:00 2001 From: Manuel Ortega Date: Wed, 18 Oct 2017 22:21:01 +0200 Subject: [PATCH 561/765] Moving humanized_content_type from DocumentablesHelper to Document model. Removing humanized_file_size in favor of direct use of number_to_human_size form ActionViewHelper. Added additional documentens to all concerned views --- app/helpers/documentables_helper.rb | 8 -------- app/models/document.rb | 4 ++++ app/views/documents/_additional_documents.html.erb | 4 ++-- app/views/legislation/draft_versions/changes.html.erb | 2 ++ app/views/legislation/draft_versions/show.html.erb | 2 ++ app/views/legislation/processes/phase_empty.html.erb | 2 ++ app/views/legislation/processes/phase_not_open.html.erb | 2 ++ 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/helpers/documentables_helper.rb b/app/helpers/documentables_helper.rb index 8e832535f..5c3181c95 100644 --- a/app/helpers/documentables_helper.rb +++ b/app/helpers/documentables_helper.rb @@ -37,12 +37,4 @@ module DocumentablesHelper def max_documents_allowed?(documentable) documentable.documents.count >= documentable.class.max_documents_allowed end - - def documentable_humanized_content_type(documentable_class) - documentable_class.attachment_content_type.split("/").last.upcase - end - - def documentable_humanized_file_size(documentable_class) - number_to_human_size(documentable_class.attachment_file_size) - end end diff --git a/app/models/document.rb b/app/models/document.rb index 8843bbed9..3771a4e69 100644 --- a/app/models/document.rb +++ b/app/models/document.rb @@ -52,6 +52,10 @@ class Document < ActiveRecord::Base end end + def humanized_content_type + attachment_content_type.split("/").last.upcase + end + private def documentable_class diff --git a/app/views/documents/_additional_documents.html.erb b/app/views/documents/_additional_documents.html.erb index 9fb999de4..2c8791dad 100644 --- a/app/views/documents/_additional_documents.html.erb +++ b/app/views/documents/_additional_documents.html.erb @@ -8,8 +8,8 @@

      <% documents.each do |document| %>

        - <%= link_to "#{document.title} (#{documentable_humanized_content_type(document)} | \ - #{documentable_humanized_file_size(document)})".html_safe, + <%= link_to "#{document.title} (#{document.humanized_content_type} | \ + #{number_to_human_size(document.attachment_file_size)})".html_safe, document.attachment.url, target: "_blank", title: t("shared.target_blank_html") %> diff --git a/app/views/legislation/draft_versions/changes.html.erb b/app/views/legislation/draft_versions/changes.html.erb index dc6e0aa06..fb8ad43ad 100644 --- a/app/views/legislation/draft_versions/changes.html.erb +++ b/app/views/legislation/draft_versions/changes.html.erb @@ -2,6 +2,8 @@ <%= render 'legislation/processes/header', process: @process, header: :small %> +<%= render 'documents/additional_documents', documents: @process.documents %> + <%= render 'legislation/processes/key_dates', process: @process, phase: :allegations_phase %>

      diff --git a/app/views/legislation/draft_versions/show.html.erb b/app/views/legislation/draft_versions/show.html.erb index d380e5cc3..8a66d0a98 100644 --- a/app/views/legislation/draft_versions/show.html.erb +++ b/app/views/legislation/draft_versions/show.html.erb @@ -2,6 +2,8 @@ <%= render 'legislation/processes/header', process: @process, header: :small %> +<%= render 'documents/additional_documents', documents: @process.documents %> + <%= render 'legislation/processes/key_dates', process: @process, phase: :allegations_phase %>
      diff --git a/app/views/legislation/processes/phase_empty.html.erb b/app/views/legislation/processes/phase_empty.html.erb index 07ad9b942..1d7a28558 100644 --- a/app/views/legislation/processes/phase_empty.html.erb +++ b/app/views/legislation/processes/phase_empty.html.erb @@ -2,6 +2,8 @@ <%= render 'legislation/processes/header', process: @process, header: :full %> +<%= render 'documents/additional_documents', documents: @process.documents %> + <%= render 'legislation/processes/key_dates', process: @process, phase: @phase %>
      diff --git a/app/views/legislation/processes/phase_not_open.html.erb b/app/views/legislation/processes/phase_not_open.html.erb index ba78c50a8..41727e025 100644 --- a/app/views/legislation/processes/phase_not_open.html.erb +++ b/app/views/legislation/processes/phase_not_open.html.erb @@ -2,6 +2,8 @@ <%= render 'legislation/processes/header', process: @process, header: :full %> +<%= render 'documents/additional_documents', documents: @process.documents %> + <%= render 'legislation/processes/key_dates', process: @process, phase: @phase %>
      From df9fb607a7ccf2ac81fa26bbcfb17433372543f5 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 19 Oct 2017 00:49:45 +0200 Subject: [PATCH 562/765] Fix delete budget investment translation on english --- config/locales/en/general.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 172c8e2bf..9c16e40ec 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -707,7 +707,7 @@ en: deleted: Deleted deleted_debate: This debate has been deleted deleted_proposal: This proposal has been deleted - deleted_budget_investment: This investment has been deleted + deleted_budget_investment: This investment project has been deleted proposals: Proposals debates: Debates budget_investments: Budget investments From 3d43bc922b9bff2fbd061d4d25692f8905f4045f Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 19 Oct 2017 10:19:42 +0200 Subject: [PATCH 563/765] replaces citizen question to polls question i18n on admin --- config/locales/es/admin.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index d1a24b314..0aa73ffb2 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -405,7 +405,7 @@ es: admin: Menú de administración banner: Gestionar banners proposals_topics: Temas de propuestas - poll_questions: Preguntas ciudadanas + poll_questions: Preguntas de votaciones budgets: Presupuestos participativos geozones: Gestionar distritos hidden_comments: Comentarios ocultos @@ -577,12 +577,12 @@ es: error_on_question_added: "No se pudo asignar la pregunta" questions: index: - title: "Preguntas ciudadanas" + title: "Preguntas de votaciones" create: "Crear pregunta ciudadana" no_questions: "No hay ninguna pregunta ciudadana." filter_poll: "Filtrar por votación" select_poll: "Seleccionar votación" - questions_tab: "Preguntas ciudadanas" + questions_tab: "Preguntas" successful_proposals_tab: "Propuestas que han superado el umbral" create_question: "Crear pregunta para votación" table_proposal: "Propuesta" From cd148dfbf09658940394b77e4178740e5212fb90 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 18 Oct 2017 18:44:24 +0200 Subject: [PATCH 564/765] adds recounts and results to dev seeds --- db/dev_seeds.rb | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 18bfe0dcb..8c09923d8 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -640,6 +640,49 @@ print "Creating Poll Voters" Poll::Voter.create(poll: poll, user: user) end +puts " ✅" +print "Creating Poll Recounts" + +Poll.all.each do |poll| + poll.booth_assignments.each do |booth_assignment| + officer_assignment = poll.officer_assignments.first + author = Poll::Officer.first.user + + Poll::Recount.create!(officer_assignment: officer_assignment, + booth_assignment: booth_assignment, + author: author, + date: poll.ends_at, + white_amount: rand(0..10), + null_amount: rand(0..10), + total_amount: rand(100..9999), + origin: "booth") + end +end + +puts " ✅" +print "Creating Poll Results" + +Poll.all.each do |poll| + poll.booth_assignments.each do |booth_assignment| + officer_assignment = poll.officer_assignments.first + author = Poll::Officer.first.user + + poll.questions.each do |question| + question.question_answers.each do |answer| + Poll::PartialResult.create!(officer_assignment: officer_assignment, + booth_assignment: booth_assignment, + date: Date.current, + question: question, + answer: answer.title, + author: author, + amount: rand(999), + origin: "booth") + end + end + end + +end + puts " ✅" print "Creating legislation processes" From cf400f3082836c884ca79318437637e20bf4c2e0 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 18 Oct 2017 20:18:56 +0200 Subject: [PATCH 565/765] refactors poll results into partial --- app/views/admin/poll/results/_result.html.erb | 37 +++++++++++++++++ app/views/admin/poll/results/index.html.erb | 40 +------------------ 2 files changed, 38 insertions(+), 39 deletions(-) create mode 100644 app/views/admin/poll/results/_result.html.erb diff --git a/app/views/admin/poll/results/_result.html.erb b/app/views/admin/poll/results/_result.html.erb new file mode 100644 index 000000000..074c26ebf --- /dev/null +++ b/app/views/admin/poll/results/_result.html.erb @@ -0,0 +1,37 @@ + + + + + + + + + + + + + +
      <%= t("admin.results.index.table_whites") %><%= t("admin.results.index.table_nulls") %><%= t("admin.results.index.table_total") %>
      <%= @poll.recounts.sum(:white_amount) %><%= @poll.recounts.sum(:null_amount) %><%= @poll.recounts.sum(:total_amount) %>
      + + +<% by_question = @partial_results.group_by(&:question_id) %> +<% @poll.questions.each do |question| %> +

      <%= question.title %>

      + + + + + + + + + <% question.question_answers.each_with_index do |answer, i| %> + <% by_answer = by_question[question.id].present? ? by_question[question.id].group_by(&:answer) : {} %> + + + + + <% end %> + +
      <%= t("admin.results.index.table_answer") %><%= t("admin.results.index.table_votes") %>
      <%= answer.title %><%= by_answer[answer.title].present? ? by_answer[answer.title].sum(&:amount) : 0 %>
      +<% end %> \ No newline at end of file diff --git a/app/views/admin/poll/results/index.html.erb b/app/views/admin/poll/results/index.html.erb index ab4e94857..e80a20f2b 100644 --- a/app/views/admin/poll/results/index.html.erb +++ b/app/views/admin/poll/results/index.html.erb @@ -9,44 +9,6 @@ <%= t("admin.results.index.no_results") %>
      <% else %> - - - - - - - - - - - - - - -
      <%= t("admin.results.index.table_whites") %><%= t("admin.results.index.table_nulls") %><%= t("admin.results.index.table_total") %>
      <%= @poll.recounts.sum(:white_amount) %><%= @poll.recounts.sum(:null_amount) %><%= @poll.recounts.sum(:total_amount) %>
      - - - <% by_question = @partial_results.group_by(&:question_id) %> - <% @poll.questions.each do |question| %> -

      <%= question.title %>

      - - - - - - - - - <% question.question_answers.each_with_index do |answer, i| %> - <% by_answer = by_question[question.id].present? ? by_question[question.id].group_by(&:answer) : {} %> - - - - - <% end %> - -
      <%= t("admin.results.index.table_answer") %><%= t("admin.results.index.table_votes") %>
      <%= answer.title %><%= by_answer[answer.title].present? ? by_answer[answer.title].sum(&:amount) : 0 %>
      - <% end %> - + <%= render "result" %> <% end %>
      From 34ee16a1c191179c5be4847788263e5256cf989a Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 18 Oct 2017 20:25:36 +0200 Subject: [PATCH 566/765] displays results for booth --- .../admin/poll/booth_assignments_controller.rb | 1 + .../poll/booth_assignments/_results.html.erb | 11 +++++++++++ .../admin/poll/booth_assignments/show.html.erb | 18 ++++++++++++++---- 3 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 app/views/admin/poll/booth_assignments/_results.html.erb diff --git a/app/controllers/admin/poll/booth_assignments_controller.rb b/app/controllers/admin/poll/booth_assignments_controller.rb index 8ffa455c8..c9f95de30 100644 --- a/app/controllers/admin/poll/booth_assignments_controller.rb +++ b/app/controllers/admin/poll/booth_assignments_controller.rb @@ -18,6 +18,7 @@ class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController @booth_assignment = @poll.booth_assignments.includes(:recounts, :voters, officer_assignments: [officer: [:user]]).find(params[:id]) @voters_by_date = @booth_assignment.voters.group_by {|v| v.created_at.to_date} + @partial_results = @booth_assignment.partial_results end def create diff --git a/app/views/admin/poll/booth_assignments/_results.html.erb b/app/views/admin/poll/booth_assignments/_results.html.erb new file mode 100644 index 000000000..224da76ab --- /dev/null +++ b/app/views/admin/poll/booth_assignments/_results.html.erb @@ -0,0 +1,11 @@ +
      +

      <%= t("admin.results.index.title") %>

      + + <% if @partial_results.empty? %> +
      + <%= t("admin.results.index.no_results") %> +
      + <% else %> + <%= render "admin/poll/results/result" %> + <% end %> +
      \ No newline at end of file diff --git a/app/views/admin/poll/booth_assignments/show.html.erb b/app/views/admin/poll/booth_assignments/show.html.erb index fd303d099..5f80f2617 100644 --- a/app/views/admin/poll/booth_assignments/show.html.erb +++ b/app/views/admin/poll/booth_assignments/show.html.erb @@ -17,9 +17,12 @@
    • <%= link_to t("admin.poll_booth_assignments.show.officers"), "#tab-officers" %>
      • -
    • +
    • <%= link_to t("admin.poll_booth_assignments.show.recounts"), "#tab-recounts" %>
      • +
    • + <%= link_to "Results", "#tab-results" %> +

    @@ -43,7 +46,7 @@ <% end %>
    -
    +

    <%= t("admin.poll_booth_assignments.show.recounts_list") %>

    @@ -55,8 +58,12 @@ - - + +
    <%= total_recounts_by_booth(@booth_assignment) || '-' %><%= @booth_assignment.voters.count %> + <%= total_recounts_by_booth(@booth_assignment) || '-' %> + + <%= @booth_assignment.voters.count %> +
    @@ -79,4 +86,7 @@
    +
    + <%= render "results" %> +
    From 6b98bc0086991abaf63f274e8a4136381d2b0ae3 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 18 Oct 2017 20:25:54 +0200 Subject: [PATCH 567/765] displays links to results by booth --- .../poll/results/_results_by_booth.html.erb | 19 +++++++++++++++++++ app/views/admin/poll/results/index.html.erb | 1 + 2 files changed, 20 insertions(+) create mode 100644 app/views/admin/poll/results/_results_by_booth.html.erb diff --git a/app/views/admin/poll/results/_results_by_booth.html.erb b/app/views/admin/poll/results/_results_by_booth.html.erb new file mode 100644 index 000000000..3c240f8d3 --- /dev/null +++ b/app/views/admin/poll/results/_results_by_booth.html.erb @@ -0,0 +1,19 @@ + + + + + + + + + <% @poll.booth_assignments.each do |booth_assignment| %> + + + + + <% end %> + +
    UrnaResultados
    <%= booth_assignment.booth.name %> + <%= link_to "See results", + admin_poll_booth_assignment_path(@poll, booth_assignment, anchor: "tab-results") %> +
    \ No newline at end of file diff --git a/app/views/admin/poll/results/index.html.erb b/app/views/admin/poll/results/index.html.erb index e80a20f2b..f4823ccd4 100644 --- a/app/views/admin/poll/results/index.html.erb +++ b/app/views/admin/poll/results/index.html.erb @@ -10,5 +10,6 @@
    <% else %> <%= render "result" %> + <%= render "results_by_booth" %> <% end %>
    From 0e8dc55b1be09ea64e1832e0894dceb755fa1af4 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 18 Oct 2017 20:46:31 +0200 Subject: [PATCH 568/765] updates translations --- app/views/admin/poll/booth_assignments/show.html.erb | 2 +- app/views/admin/poll/results/_result.html.erb | 10 +++++----- .../admin/poll/results/_results_by_booth.html.erb | 9 +++++---- config/locales/en/admin.yml | 6 ++++++ config/locales/es/admin.yml | 6 ++++++ 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/app/views/admin/poll/booth_assignments/show.html.erb b/app/views/admin/poll/booth_assignments/show.html.erb index 5f80f2617..c69631dee 100644 --- a/app/views/admin/poll/booth_assignments/show.html.erb +++ b/app/views/admin/poll/booth_assignments/show.html.erb @@ -21,7 +21,7 @@ <%= link_to t("admin.poll_booth_assignments.show.recounts"), "#tab-recounts" %>
  • - <%= link_to "Results", "#tab-results" %> + <%= link_to t("admin.poll_booth_assignments.show.results"), "#tab-results" %>
    • diff --git a/app/views/admin/poll/results/_result.html.erb b/app/views/admin/poll/results/_result.html.erb index 074c26ebf..64da2c9b2 100644 --- a/app/views/admin/poll/results/_result.html.erb +++ b/app/views/admin/poll/results/_result.html.erb @@ -1,8 +1,8 @@ - - - + + + @@ -20,8 +20,8 @@
    <%= t("admin.results.index.table_whites") %><%= t("admin.results.index.table_nulls") %><%= t("admin.results.index.table_total") %><%= t("admin.results.result.table_whites") %><%= t("admin.results.result.table_nulls") %><%= t("admin.results.result.table_total") %>
    - - + + diff --git a/app/views/admin/poll/results/_results_by_booth.html.erb b/app/views/admin/poll/results/_results_by_booth.html.erb index 3c240f8d3..8778a7434 100644 --- a/app/views/admin/poll/results/_results_by_booth.html.erb +++ b/app/views/admin/poll/results/_results_by_booth.html.erb @@ -1,8 +1,8 @@
    <%= t("admin.results.index.table_answer") %><%= t("admin.results.index.table_votes") %><%= t("admin.results.result.table_answer") %><%= t("admin.results.result.table_votes") %>
    - - + + @@ -10,8 +10,9 @@ <% end %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 87bbb6685..2b6f2988e 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -537,6 +537,7 @@ en: no_officers: "There are no officers for this booth" recounts: "Recounts" recounts_list: "Recount list for this booth" + results: "Results" date: "Date" count_final: "Final recount (by officer)" count_by_system: "Votes (automatic)" @@ -647,11 +648,16 @@ en: index: title: "Results" no_results: "There are no results" + result: table_whites: "Totally blank ballots" table_nulls: "Invalid ballots" table_total: "Total ballots" table_answer: Answer table_votes: Votes + results_by_booth: + booth: Booth + results: Results + see_results: See results booths: index: title: "List of booths" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 0aa73ffb2..26e2d18dc 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -537,6 +537,7 @@ es: no_officers: "No hay presidentes de mesa para esta urna" recounts: "Recuentos" recounts_list: "Lista de recuentos de esta urna" + results: "Resultados" date: "Fecha" count_final: "Recuento final (presidente de mesa)" count_by_system: "Votos (automático)" @@ -649,11 +650,16 @@ es: index: title: "Resultados" no_results: "No hay resultados" + result: table_whites: Papeletas totalmente en blanco table_nulls: Papeletas nulas table_total: Papeletas totales table_answer: Respuesta table_votes: Votos + results_by_booth: + booth: Urna + results: Resultados + see_results: Ver resultados booths: index: title: "Lista de urnas" From 0499fb6fefd197b745a87d5fa371cdcd89a25187 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 18 Oct 2017 20:48:44 +0200 Subject: [PATCH 569/765] highlights result's tab --- app/views/admin/poll/booth_assignments/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/poll/booth_assignments/show.html.erb b/app/views/admin/poll/booth_assignments/show.html.erb index c69631dee..71938cce5 100644 --- a/app/views/admin/poll/booth_assignments/show.html.erb +++ b/app/views/admin/poll/booth_assignments/show.html.erb @@ -20,7 +20,7 @@
  • <%= link_to t("admin.poll_booth_assignments.show.recounts"), "#tab-recounts" %>
    • -
  • +
  • <%= link_to t("admin.poll_booth_assignments.show.results"), "#tab-results" %>
    • From 6a697bd6d0e07310d90dc3a6206cb2ae849a7acb Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 18 Oct 2017 20:50:46 +0200 Subject: [PATCH 570/765] adds specs --- .../admin/poll/booth_assigments_spec.rb | 86 +++++++++++++++++++ spec/features/admin/poll/polls_spec.rb | 37 ++++++++ 2 files changed, 123 insertions(+) diff --git a/spec/features/admin/poll/booth_assigments_spec.rb b/spec/features/admin/poll/booth_assigments_spec.rb index 77881efaa..b527170d2 100644 --- a/spec/features/admin/poll/booth_assigments_spec.rb +++ b/spec/features/admin/poll/booth_assigments_spec.rb @@ -126,5 +126,91 @@ feature 'Admin booths assignments' do end end + scenario 'Results' do + poll = create(:poll) + booth_assignment = create(:poll_booth_assignment, poll: poll) + + question_1 = create(:poll_question, poll: poll) + create(:poll_question_answer, title: 'Yes', question: question_1) + create(:poll_question_answer, title: 'No', question: question_1) + + question_2 = create(:poll_question, poll: poll) + create(:poll_question_answer, title: 'Today', question: question_2) + create(:poll_question_answer, title: 'Tomorrow', question: question_2) + + create(:poll_partial_result, + booth_assignment: booth_assignment, + question: question_1, + answer: 'Yes', + amount: 11) + + create(:poll_partial_result, + booth_assignment: booth_assignment, + question: question_1, + answer: 'No', + amount: 4) + + create(:poll_partial_result, + booth_assignment: booth_assignment, + question: question_2, + answer: 'Today', + amount: 5) + + create(:poll_partial_result, + booth_assignment: booth_assignment, + question: question_2, + answer: 'Tomorrow', + amount: 6) + + create(:poll_recount, + booth_assignment: booth_assignment, + white_amount: 21, + null_amount: 44, + total_amount: 66) + + visit admin_poll_booth_assignment_path(poll, booth_assignment) + + click_link 'Results' + + expect(page).to have_content(question_1.title) + + within("#question_#{question_1.id}_0_result") do + expect(page).to have_content("Yes") + expect(page).to have_content(11) + end + + within("#question_#{question_1.id}_1_result") do + expect(page).to have_content("No") + expect(page).to have_content(4) + end + + expect(page).to have_content(question_2.title) + + within("#question_#{question_2.id}_0_result") do + expect(page).to have_content("Today") + expect(page).to have_content(5) + end + + within("#question_#{question_2.id}_1_result") do + expect(page).to have_content("Tomorrow") + expect(page).to have_content(6) + end + + within('#white_results') { expect(page).to have_content('21') } + within('#null_results') { expect(page).to have_content('44') } + within('#total_results') { expect(page).to have_content('66') } + end + + scenario "No results" do + poll = create(:poll) + booth_assignment = create(:poll_booth_assignment, poll: poll) + + visit admin_poll_booth_assignment_path(poll, booth_assignment) + + click_link "Results" + + expect(page).to have_content "There are no results" + end + end end diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb index 9c2d3fcf1..2a2d26ea5 100644 --- a/spec/features/admin/poll/polls_spec.rb +++ b/spec/features/admin/poll/polls_spec.rb @@ -311,6 +311,43 @@ feature 'Admin polls' do within('#null_results') { expect(page).to have_content('44') } within('#total_results') { expect(page).to have_content('66') } end + + scenario "Link to results by booth" do + poll = create(:poll) + booth_assignment1 = create(:poll_booth_assignment, poll: poll) + booth_assignment2 = create(:poll_booth_assignment, poll: poll) + + question = create(:poll_question, poll: poll) + create(:poll_question_answer, title: 'Yes', question: question) + create(:poll_question_answer, title: 'No', question: question) + + create(:poll_partial_result, + booth_assignment: booth_assignment1, + question: question, + answer: 'Yes', + amount: 5) + + create(:poll_partial_result, + booth_assignment: booth_assignment2, + question: question, + answer: 'Yes', + amount: 6) + + visit admin_poll_path(poll) + + click_link "Results" + + expect(page).to have_link("See results", count: 2) + + within("#booth_assignment_#{booth_assignment1.id}_result") do + click_link "See results" + end + + expect(page).to have_content booth_assignment1.booth.name + expect(page).to have_content "Results" + expect(page).to have_content "Yes" + expect(page).to have_content "5" + end end end From fcbcca3b6002b02212861d60c210f04b00353682 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 18 Oct 2017 22:21:47 +0200 Subject: [PATCH 571/765] sorts booths by name --- app/views/admin/poll/results/_results_by_booth.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/poll/results/_results_by_booth.html.erb b/app/views/admin/poll/results/_results_by_booth.html.erb index 8778a7434..4e2a8bcae 100644 --- a/app/views/admin/poll/results/_results_by_booth.html.erb +++ b/app/views/admin/poll/results/_results_by_booth.html.erb @@ -6,7 +6,7 @@     - <% @poll.booth_assignments.each do |booth_assignment| %> + <% @poll.booth_assignments.sort_by {|ba| ba.booth.name }.each do |booth_assignment| %>
    UrnaResultados<%= t("admin.results.results_by_booth.booth") %><%= t("admin.results.results_by_booth.results") %>
    <%= booth_assignment.booth.name %> - <%= link_to "See results", - admin_poll_booth_assignment_path(@poll, booth_assignment, anchor: "tab-results") %> + <%= link_to t("admin.results.results_by_booth.see_results"), + admin_poll_booth_assignment_path(@poll, booth_assignment, + anchor: "tab-results") %>
    <%= booth_assignment.booth.name %> From 5d3654f92f9fe872e29ab017e523def0978125e0 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 18 Oct 2017 22:40:41 +0200 Subject: [PATCH 572/765] refactors recounts into partial --- app/views/admin/poll/results/_recount.html.erb | 14 ++++++++++++++ app/views/admin/poll/results/_result.html.erb | 16 ---------------- app/views/admin/poll/results/index.html.erb | 1 + 3 files changed, 15 insertions(+), 16 deletions(-) create mode 100644 app/views/admin/poll/results/_recount.html.erb diff --git a/app/views/admin/poll/results/_recount.html.erb b/app/views/admin/poll/results/_recount.html.erb new file mode 100644 index 000000000..f4ab43954 --- /dev/null +++ b/app/views/admin/poll/results/_recount.html.erb @@ -0,0 +1,14 @@ + + + + + + + + + + + + + +
    <%= t("admin.results.result.table_whites") %><%= t("admin.results.result.table_nulls") %><%= t("admin.results.result.table_total") %>
    <%= resource.recounts.sum(:white_amount) %><%= resource.recounts.sum(:null_amount) %><%= resource.recounts.sum(:total_amount) %>
    \ No newline at end of file diff --git a/app/views/admin/poll/results/_result.html.erb b/app/views/admin/poll/results/_result.html.erb index 64da2c9b2..e2fe5f037 100644 --- a/app/views/admin/poll/results/_result.html.erb +++ b/app/views/admin/poll/results/_result.html.erb @@ -1,19 +1,3 @@ - - - - - - - - - - - - - -
    <%= t("admin.results.result.table_whites") %><%= t("admin.results.result.table_nulls") %><%= t("admin.results.result.table_total") %>
    <%= @poll.recounts.sum(:white_amount) %><%= @poll.recounts.sum(:null_amount) %><%= @poll.recounts.sum(:total_amount) %>
    - - <% by_question = @partial_results.group_by(&:question_id) %> <% @poll.questions.each do |question| %>

    <%= question.title %>

    diff --git a/app/views/admin/poll/results/index.html.erb b/app/views/admin/poll/results/index.html.erb index f4823ccd4..7f21e5452 100644 --- a/app/views/admin/poll/results/index.html.erb +++ b/app/views/admin/poll/results/index.html.erb @@ -9,6 +9,7 @@ <%= t("admin.results.index.no_results") %> <% else %> + <%= render "recount", resource: @poll %> <%= render "result" %> <%= render "results_by_booth" %> <% end %> From 39ebc5173a3d34f11cc952ace04fd5fe94edcbf1 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 18 Oct 2017 22:40:53 +0200 Subject: [PATCH 573/765] displays recounts for a single booth --- app/controllers/admin/poll/booth_assignments_controller.rb | 1 + app/views/admin/poll/booth_assignments/_results.html.erb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/controllers/admin/poll/booth_assignments_controller.rb b/app/controllers/admin/poll/booth_assignments_controller.rb index c9f95de30..7998f29a2 100644 --- a/app/controllers/admin/poll/booth_assignments_controller.rb +++ b/app/controllers/admin/poll/booth_assignments_controller.rb @@ -19,6 +19,7 @@ class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController officer_assignments: [officer: [:user]]).find(params[:id]) @voters_by_date = @booth_assignment.voters.group_by {|v| v.created_at.to_date} @partial_results = @booth_assignment.partial_results + @recounts = @booth_assignment.recounts end def create diff --git a/app/views/admin/poll/booth_assignments/_results.html.erb b/app/views/admin/poll/booth_assignments/_results.html.erb index 224da76ab..1b3f1ec08 100644 --- a/app/views/admin/poll/booth_assignments/_results.html.erb +++ b/app/views/admin/poll/booth_assignments/_results.html.erb @@ -6,6 +6,7 @@ <%= t("admin.results.index.no_results") %> <% else %> + <%= render "admin/poll/results/recount", resource: @booth_assignment %> <%= render "admin/poll/results/result" %> <% end %> \ No newline at end of file From 98f5d70e6d7e84bc534044dc7e11dd96a2c7e0a2 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 18 Oct 2017 22:41:31 +0200 Subject: [PATCH 574/765] makes specs more robust --- spec/features/admin/poll/booth_assigments_spec.rb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/spec/features/admin/poll/booth_assigments_spec.rb b/spec/features/admin/poll/booth_assigments_spec.rb index b527170d2..5813e2dac 100644 --- a/spec/features/admin/poll/booth_assigments_spec.rb +++ b/spec/features/admin/poll/booth_assigments_spec.rb @@ -126,9 +126,10 @@ feature 'Admin booths assignments' do end end - scenario 'Results' do + scenario 'Results for a booth assignment' do poll = create(:poll) booth_assignment = create(:poll_booth_assignment, poll: poll) + other_booth_assignment = create(:poll_booth_assignment, poll: poll) question_1 = create(:poll_question, poll: poll) create(:poll_question_answer, title: 'Yes', question: question_1) @@ -162,12 +163,24 @@ feature 'Admin booths assignments' do answer: 'Tomorrow', amount: 6) + create(:poll_partial_result, + booth_assignment: other_booth_assignment, + question: question_1, + answer: 'Yes', + amount: 9999) + create(:poll_recount, booth_assignment: booth_assignment, white_amount: 21, null_amount: 44, total_amount: 66) + create(:poll_recount, + booth_assignment: other_booth_assignment, + white_amount: 999, + null_amount: 999, + total_amount: 999) + visit admin_poll_booth_assignment_path(poll, booth_assignment) click_link 'Results' From b6e080abca6525d4e1d0fa583917607812f92962 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 19 Oct 2017 10:25:14 +0200 Subject: [PATCH 575/765] fixes alignment --- app/views/admin/poll/booth_assignments/_results.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/poll/booth_assignments/_results.html.erb b/app/views/admin/poll/booth_assignments/_results.html.erb index 1b3f1ec08..fdbc4da3f 100644 --- a/app/views/admin/poll/booth_assignments/_results.html.erb +++ b/app/views/admin/poll/booth_assignments/_results.html.erb @@ -6,7 +6,7 @@ <%= t("admin.results.index.no_results") %> <% else %> - <%= render "admin/poll/results/recount", resource: @booth_assignment %> + <%= render "admin/poll/results/recount", resource: @booth_assignment %> <%= render "admin/poll/results/result" %> <% end %> \ No newline at end of file From 1ae91017b445bc78e53ef2e8acac2b934f39cf2c Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 19 Oct 2017 10:28:35 +0200 Subject: [PATCH 576/765] adds heading to results by booth table --- app/views/admin/poll/results/_results_by_booth.html.erb | 3 ++- config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/admin/poll/results/_results_by_booth.html.erb b/app/views/admin/poll/results/_results_by_booth.html.erb index 4e2a8bcae..58d7ea83c 100644 --- a/app/views/admin/poll/results/_results_by_booth.html.erb +++ b/app/views/admin/poll/results/_results_by_booth.html.erb @@ -1,4 +1,5 @@ - +

    <%= t("admin.results.results_by_booth.title") %>

    +
    diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 2b6f2988e..38abe6f56 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -658,6 +658,7 @@ en: booth: Booth results: Results see_results: See results + title: "Results by booth" booths: index: title: "List of booths" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 26e2d18dc..3336cdc5b 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -660,6 +660,7 @@ es: booth: Urna results: Resultados see_results: Ver resultados + title: "Resultados por urna" booths: index: title: "Lista de urnas" From 7ddc225d8b60b50d8c7b4d584b2ee6e8eec52c7a Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 19 Oct 2017 10:31:24 +0200 Subject: [PATCH 577/765] fixes alignment for link params --- app/views/admin/poll/results/_results_by_booth.html.erb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/admin/poll/results/_results_by_booth.html.erb b/app/views/admin/poll/results/_results_by_booth.html.erb index 58d7ea83c..9266a58fb 100644 --- a/app/views/admin/poll/results/_results_by_booth.html.erb +++ b/app/views/admin/poll/results/_results_by_booth.html.erb @@ -11,9 +11,8 @@ <% end %> From b8a45eda58f1a98977149e6039733cefbb1dc612 Mon Sep 17 00:00:00 2001 From: Manuel Ortega Date: Thu, 19 Oct 2017 12:10:54 +0200 Subject: [PATCH 578/765] Added legislation process documents New test to ensure document is shown in process show --- spec/features/legislation/processes_spec.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spec/features/legislation/processes_spec.rb b/spec/features/legislation/processes_spec.rb index 0ef5e0c7c..e80e81dba 100644 --- a/spec/features/legislation/processes_spec.rb +++ b/spec/features/legislation/processes_spec.rb @@ -115,6 +115,14 @@ feature 'Legislation' do context 'process page' do context "show" do include_examples "not published permissions", :legislation_process_path + + scenario '#show view has document present' do + process = create(:legislation_process) + document = create(:document, documentable: process) + visit legislation_process_path(process) + + expect(page).to have_content(document.title) + end end context 'debate phase' do From 6e680c187fb50bf560c93cdd4cd7b01bf8b2a1c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 19 Oct 2017 12:17:20 +0200 Subject: [PATCH 579/765] Added new column `most_voted` to Poll::Question::Answers --- app/models/poll/question/answer.rb | 9 ++-- ..._add_most_voted_to_poll_question_answer.rb | 5 ++ db/schema.rb | 54 ++++++++++++++++--- 3 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 db/migrate/20171019095042_add_most_voted_to_poll_question_answer.rb diff --git a/app/models/poll/question/answer.rb b/app/models/poll/question/answer.rb index de6e35d1d..eff45a57a 100644 --- a/app/models/poll/question/answer.rb +++ b/app/models/poll/question/answer.rb @@ -13,6 +13,7 @@ class Poll::Question::Answer < ActiveRecord::Base validates :given_order, presence: true, uniqueness: { scope: :question_id } before_validation :set_order, on: :create + before_save :most_voted def description super.try :html_safe @@ -36,13 +37,15 @@ class Poll::Question::Answer < ActiveRecord::Base Poll::Answer.where(question_id: question, answer: title).count end - def is_winner? + def most_voted answers = question.question_answers .map { |a| Poll::Answer.where(question_id: a.question, answer: a.title).count } - !answers.any?{ |a| a > total_votes } + most_voted = !answers.any?{ |a| a > total_votes } + + self.update_attributes(most_voted: most_voted) end def total_votes_percentage - ((total_votes*100) / question.answers_total_votes).round(2) + ((total_votes*100) / question.answers_total_votes).round(2) rescue 0 end end diff --git a/db/migrate/20171019095042_add_most_voted_to_poll_question_answer.rb b/db/migrate/20171019095042_add_most_voted_to_poll_question_answer.rb new file mode 100644 index 000000000..e32b7e325 --- /dev/null +++ b/db/migrate/20171019095042_add_most_voted_to_poll_question_answer.rb @@ -0,0 +1,5 @@ +class AddMostVotedToPollQuestionAnswer < ActiveRecord::Migration + def change + add_column :poll_question_answers, :most_voted, :boolean + end +end diff --git a/db/schema.rb b/db/schema.rb index 8a03412be..f83358423 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: 20171010143623) do +ActiveRecord::Schema.define(version: 20171019095042) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -486,6 +486,10 @@ ActiveRecord::Schema.define(version: 20171010143623) do t.boolean "draft_publication_enabled", default: false t.boolean "result_publication_enabled", default: false t.boolean "published", default: true + t.date "proposals_phase_start_date" + t.date "proposals_phase_end_date" + t.boolean "proposals_phase_enabled" + t.text "proposals_description" end add_index "legislation_processes", ["allegations_end_date"], name: "index_legislation_processes_on_allegations_end_date", using: :btree @@ -498,6 +502,36 @@ ActiveRecord::Schema.define(version: 20171010143623) do add_index "legislation_processes", ["result_publication_date"], name: "index_legislation_processes_on_result_publication_date", using: :btree add_index "legislation_processes", ["start_date"], name: "index_legislation_processes_on_start_date", using: :btree + create_table "legislation_proposals", force: :cascade do |t| + t.integer "legislation_process_id" + t.string "title", limit: 80 + t.text "description" + t.string "question" + t.string "external_url" + t.integer "author_id" + t.datetime "hidden_at" + t.integer "flags_count", default: 0 + t.datetime "ignored_flag_at" + t.integer "cached_votes_up", default: 0 + t.integer "comments_count", default: 0 + t.datetime "confirmed_hide_at" + t.integer "hot_score", limit: 8, default: 0 + t.integer "confidence_score", default: 0 + t.string "responsible_name", limit: 60 + t.text "summary" + t.string "video_url" + t.tsvector "tsv" + t.integer "geozone_id" + t.datetime "retired_at" + t.string "retired_reason" + t.text "retired_explanation" + t.integer "community_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_index "legislation_proposals", ["legislation_process_id"], name: "index_legislation_proposals_on_legislation_process_id", using: :btree + create_table "legislation_question_options", force: :cascade do |t| t.integer "legislation_question_id" t.string "value" @@ -666,6 +700,7 @@ ActiveRecord::Schema.define(version: 20171010143623) do t.text "description" t.integer "question_id" t.integer "given_order", default: 1 + t.boolean "most_voted" end add_index "poll_question_answers", ["question_id"], name: "index_poll_question_answers_on_question_id", using: :btree @@ -919,16 +954,20 @@ ActiveRecord::Schema.define(version: 20171010143623) do add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree create_table "tags", force: :cascade do |t| - t.string "name", limit: 40 - t.integer "taggings_count", default: 0 - t.integer "debates_count", default: 0 - t.integer "proposals_count", default: 0 - t.integer "spending_proposals_count", default: 0 + t.string "name", limit: 40 + t.integer "taggings_count", default: 0 + t.integer "debates_count", default: 0 + t.integer "proposals_count", default: 0 + t.integer "spending_proposals_count", default: 0 t.string "kind" - t.integer "budget/investments_count", default: 0 + t.integer "budget/investments_count", default: 0 + t.integer "legislation/proposals_count", default: 0 + t.integer "legislation/processes_count", default: 0 end add_index "tags", ["debates_count"], name: "index_tags_on_debates_count", using: :btree + add_index "tags", ["legislation/processes_count"], name: "index_tags_on_legislation/processes_count", using: :btree + add_index "tags", ["legislation/proposals_count"], name: "index_tags_on_legislation/proposals_count", using: :btree add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree add_index "tags", ["proposals_count"], name: "index_tags_on_proposals_count", using: :btree add_index "tags", ["spending_proposals_count"], name: "index_tags_on_spending_proposals_count", using: :btree @@ -1106,6 +1145,7 @@ ActiveRecord::Schema.define(version: 20171010143623) do add_foreign_key "identities", "users" add_foreign_key "images", "users" add_foreign_key "legislation_draft_versions", "legislation_processes" + add_foreign_key "legislation_proposals", "legislation_processes" add_foreign_key "locks", "users" add_foreign_key "managers", "users" add_foreign_key "moderators", "users" From f029cc20165840121d54ab0231fca7e33bd7a6e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 19 Oct 2017 12:17:33 +0200 Subject: [PATCH 580/765] Cached Poll stats methods --- app/models/poll/stats.rb | 118 ++++++++++++++++++++++----------------- 1 file changed, 68 insertions(+), 50 deletions(-) diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index 1df281434..ac45a2aae 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -16,110 +16,128 @@ class Poll end private - + def total_participants - total_participants_web + total_participants_booth + stats_cache('total_participants') { total_participants_web + total_participants_booth } end def total_participants_web - total_web_valid + total_web_white + total_web_null + stats_cache('total_participants_web') { total_web_valid + total_web_white + total_web_null } end - + def total_participants_web_percentage - (total_participants) == 0 ? 0 : total_participants_web * 100 / total_participants + stats_cache('total_participants_web_percentage') { + (total_participants) == 0 ? 0 : total_participants_web * 100 / total_participants + } end def total_participants_booth - voters.where(origin: 'booth').count + stats_cache('total_participants_booth') { voters.where(origin: 'booth').count } end - + def total_participants_booth_percentage - (total_participants) == 0 ? 0 : total_participants_booth * 100 / total_participants.to_f + stats_cache('total_participants_booth_percentage') { + (total_participants) == 0 ? 0 : total_participants_booth * 100 / total_participants.to_f + } end - + def total_web_valid - voters.where(origin: 'web').count + stats_cache('total_web_valid') { voters.where(origin: 'web').count } end - + def valid_percentage_web - (total_valid_votes) == 0 ? 0 : total_web_valid * 100 / total_valid_votes.to_f + stats_cache('valid_percentage_web') { + (total_valid_votes) == 0 ? 0 : total_web_valid * 100 / total_valid_votes.to_f + } end - + def total_web_white - 0 + stats_cache('total_web_white') { 0 } end - + def white_percentage_web - 0 + stats_cache('white_percentage_web') { 0 } end - + def total_web_null - 0 + stats_cache('total_web_null') { 0 } end - + def null_percentage_web - 0 + stats_cache('null_percentage_web') { 0 } end - + def total_booth_valid - recounts.sum(:total_amount) + stats_cache('total_booth_valid') { recounts.sum(:total_amount) } end - + def valid_percentage_booth - (total_valid_votes) == 0 ? 0 : total_booth_valid * 100 / total_valid_votes.to_f + stats_cache('valid_percentage_booth') { + (total_valid_votes) == 0 ? 0 : total_booth_valid * 100 / total_valid_votes.to_f + } end - - def total_booth_white - recounts.sum(:white_amount) + + def total_booth_white + stats_cache('total_booth_white') { recounts.sum(:white_amount) } end - + def white_percentage_booth - (total_white_votes) == 0 ? 0 : total_booth_white * 100 / total_white_votes.to_f + stats_cache('white_percentage_booth') { + (total_white_votes) == 0 ? 0 : total_booth_white * 100 / total_white_votes.to_f + } end - + def total_booth_null - recounts.sum(:null_amount) + stats_cache('total_booth_null') { recounts.sum(:null_amount) } end - + def null_percentage_booth - (total_null_votes == 0) ? 0 : total_booth_null * 100 / total_null_votes.to_f + stats_cache('null_percentage_booth') { + (total_null_votes == 0) ? 0 : total_booth_null * 100 / total_null_votes.to_f + } end - + def total_valid_votes - total_web_valid + total_booth_valid + stats_cache('total_valid_votes') { total_web_valid + total_booth_valid } end - + def total_valid_percentage - (total_participants) == 0 ? 0 : total_valid_votes * 100 / total_participants.to_f + stats_cache('total_valid_percentage'){ + (total_participants) == 0 ? 0 : total_valid_votes * 100 / total_participants.to_f + } end - + def total_white_votes - total_web_white + total_booth_white + stats_cache('total_white_votes') { total_web_white + total_booth_white } end - + def total_white_percentage - (total_participants) == 0 ? 0 : total_white_votes * 100 / total_participants.to_f + stats_cache('total_white_percentage') { + (total_participants) == 0 ? 0 : total_white_votes * 100 / total_participants.to_f + } end - + def total_null_votes - total_web_null + total_booth_null + stats_cache('total_null_votes') { total_web_null + total_booth_null } end - + def total_null_percentage - (total_participants) == 0 ? 0 : total_null_votes * 100 / total_participants.to_f + stats_cache('total_null_percentage') { + (total_participants) == 0 ? 0 : total_null_votes * 100 / total_participants.to_f + } end def voters - @poll.voters + stats_cache('voters') { @poll.voters } end - + def recounts - @poll.recounts + stats_cache('recounts') { @poll.recounts } end def stats_cache(key, &block) - Rails.cache.fetch("polls_stats/#{@poll.id}/#{key}/v7", &block) + Rails.cache.fetch("polls_stats/#{@poll.id}/#{key}", &block) end end -end \ No newline at end of file +end From 8be8bb07f9b681047154a90d0c808ef22ff56f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 19 Oct 2017 12:17:49 +0200 Subject: [PATCH 581/765] Added first poll results tests --- spec/features/polls/results_spec.rb | 26 ++++++++++++++++++++++++++ spec/features/polls/voter_spec.rb | 4 ++-- spec/support/common_actions.rb | 6 +++--- 3 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 spec/features/polls/results_spec.rb diff --git a/spec/features/polls/results_spec.rb b/spec/features/polls/results_spec.rb new file mode 100644 index 000000000..c67ad3869 --- /dev/null +++ b/spec/features/polls/results_spec.rb @@ -0,0 +1,26 @@ +require 'rails_helper' + +feature 'Poll Results' do + scenario 'List each Poll question' do + user = create(:user, :level_two) + + poll = create(:poll) + question1 = create(:poll_question, poll: poll) + answer1 = create(:poll_question_answer, question: question1, title: 'Yes') + answer2 = create(:poll_question_answer, question: question1, title: 'No') + + question2 = create(:poll_question, poll: poll) + answer3 = create(:poll_question_answer, question: question2, title: 'Blue') + answer4 = create(:poll_question_answer, question: question2, title: 'Green') + answer5 = create(:poll_question_answer, question: question2, title: 'Yellow') + + login_as user + vote_for_poll_via_web(poll, question1, 'Yes') + vote_for_poll_via_web(poll, question1, 'Blue') + + visit poll_results_path(poll) + + expect(page).to have_content(question1.title) + expect(page).to have_content(question2.title) + end +end diff --git a/spec/features/polls/voter_spec.rb b/spec/features/polls/voter_spec.rb index ff9b71755..7e451be17 100644 --- a/spec/features/polls/voter_spec.rb +++ b/spec/features/polls/voter_spec.rb @@ -95,7 +95,7 @@ feature "Voter" do scenario "Trying to vote in web and then in booth", :js do login_as user - vote_for_poll_via_web(poll, question) + vote_for_poll_via_web(poll, question, 'Yes') click_link "Sign out" @@ -127,7 +127,7 @@ feature "Voter" do scenario "Trying to vote in web again", :js do login_as user - vote_for_poll_via_web(poll, question) + vote_for_poll_via_web(poll, question, 'Yes') visit poll_path(poll) diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index b87a54d8e..90deab1b5 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -299,12 +299,12 @@ module CommonActions end end - def vote_for_poll_via_web(poll, question) + def vote_for_poll_via_web(poll, question, answer) visit poll_path(poll) within("#poll_question_#{question.id}_answers") do - click_link 'Yes' - expect(page).to_not have_link('Yes') + click_link "#{answer}" + expect(page).to_not have_link("#{answer}") end expect(Poll::Voter.count).to eq(1) From 78fa77b28d8d6f7d334a54c4f4aec576e58084e0 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 19 Oct 2017 12:23:14 +0200 Subject: [PATCH 582/765] fixes styles for poll subnav --- app/assets/stylesheets/layout.scss | 2 ++ app/views/polls/_poll_subnav.html.erb | 42 ++++++++++++++++----------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 06fdfd396..d79a2b37f 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -214,6 +214,8 @@ a { margin-bottom: $line-height / 2; li { + font-size: $base-font-size; + margin-bottom: 0; margin-right: $line-height / 2; @include breakpoint(medium) { diff --git a/app/views/polls/_poll_subnav.html.erb b/app/views/polls/_poll_subnav.html.erb index 9b37e1867..8155e2ef4 100644 --- a/app/views/polls/_poll_subnav.html.erb +++ b/app/views/polls/_poll_subnav.html.erb @@ -1,21 +1,29 @@ -
    +
    -
      -
    • - <%= link_to t("polls.show.results_menu"), - poll_results_path(@poll), - class: (controller_name == "polls" && action_name == "results" ? "is-active" : "") %> -
      • -
    • - <%= link_to t("polls.show.stats_menu"), - poll_stats_path(@poll), - class: (controller_name == "polls" && action_name == "stats" ? "is-active" : "") %> -
      • -
    • - <%= link_to t("polls.show.info_menu"), - poll_path(@poll), - class: (controller_name == "polls" && action_name == "show" ? "is-active" : "") %> -
      • +
        + <% if controller_name == "polls" && action_name == "results" %> +
      • +

        <%= t("polls.show.results_menu") %>

        +
        • + <% else %> +
      • <%= link_to t("polls.show.results_menu"), poll_results_path(@poll) %>
        • + <% end %> + + <% if controller_name == "polls" && action_name == "stats" %> +
      • +

        <%= t("polls.show.stats_menu") %>

        +
        • + <% else %> +
      • <%= link_to t("polls.show.stats_menu"), poll_stats_path(@poll) %>
        • + <% end %> + + <% if controller_name == "polls" && action_name == "show" %> +
      • +

        <%= t("polls.show.info_menu") %>

        +
        • + <% else %> +
      • <%= link_to t("polls.show.info_menu"), poll_path(@poll) %>
        • + <% end %>
    From a0eb6e56a10da349ed3f8c22d84c7a7385c34db2 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 19 Oct 2017 12:23:57 +0200 Subject: [PATCH 583/765] fixes styles for polls tabs, uses underscore for ids --- app/assets/stylesheets/layout.scss | 13 ++++++++----- app/views/polls/_filter_subnav.html.erb | 6 +++--- app/views/polls/show.html.erb | 4 ++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index d79a2b37f..9e6d3bc08 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -318,13 +318,16 @@ a { } .tabs { - border: { - left: 0; - right: 0; - top: 0; - }; + border-left: 0; + border-right: 0; + border-top: 0; margin-bottom: $line-height; + .tabs-title { + font-size: $base-font-size; + margin-bottom: 0; + } + .tabs-title > a { color: $text-medium; margin-bottom: rem-calc(-1); diff --git a/app/views/polls/_filter_subnav.html.erb b/app/views/polls/_filter_subnav.html.erb index b096edaf2..fe43ddf5d 100644 --- a/app/views/polls/_filter_subnav.html.erb +++ b/app/views/polls/_filter_subnav.html.erb @@ -1,8 +1,8 @@ -
    +
    -
      +
      • - <%= link_to "#tab-comments" do %> + <%= link_to "#tab_comments" do %>

        <%= t("polls.show.comments_tab") %> (<%= @poll.comments_count %>) diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 4eabd240b..01bdddc54 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -124,10 +124,10 @@

    -
    +
    <%= render "filter_subnav" %> -
    +
    <%= render "comments" %>
    From e13a48b57219eb2226a6ba65adf642b983965573 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 19 Oct 2017 12:27:22 +0200 Subject: [PATCH 584/765] adds styles to polls stats --- app/assets/stylesheets/layout.scss | 4 + app/assets/stylesheets/participation.scss | 50 ++++++++ app/views/polls/stats.html.erb | 136 +++++++++++++--------- 3 files changed, 134 insertions(+), 56 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 9e6d3bc08..9428c1982 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -381,6 +381,10 @@ a { box-shadow: none; } +.uppercase { + text-transform: uppercase; +} + // 02. Header // ---------- diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index a887d83de..382615739 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -8,6 +8,7 @@ // 06. Budget // 07. Proposals successful // 08. Polls +// 09. Polls results and stats // // 01. Votes and supports @@ -1803,3 +1804,52 @@ } } } + +// 09. Polls results and stats +// --------------------------- + +.polls-results-stats { + + .sidebar { + border-right: 1px solid $border; + + .menu { + padding: 0; + + li a { + color: $link; + } + } + } + + table { + table-layout: fixed; + + caption { + padding: $line-height / 2 0; + text-align: left; + } + + th { + text-align: left; + + &.win { + background: #009fde; + } + } + + td { + + &.win { + background: #ccedf8; + font-weight: bold; + } + } + } + + .number { + font-size: rem-calc(60); + font-weight: bold; + line-height: rem-calc(60); + } +} diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index 20e5411ab..5daaf433a 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -1,25 +1,28 @@ <% provide :title do %><%= @poll.name %><% end %> -
    +
    <%= render "poll_header" %> <%= render "poll_subnav" %> -
    -
    -

    <%= t("polls.show.stats.title") %>

    +
    +
    +

    <%= t("polls.show.stats.title") %>

    +
    -
    + +

    <%= t("polls.show.stats.total_participation") %>

    -

    +

    <%= t("polls.show.stats.total_votes") %>
    - <%= @stats[:total_participants] %> + <%= @stats[:total_participants] %>

    -
    <%= t("admin.results.results_by_booth.booth") %>
    <%= booth_assignment.booth.name %> - <%= link_to t("admin.results.results_by_booth.see_results"), - admin_poll_booth_assignment_path(@poll, booth_assignment, - anchor: "tab-results") %> + <%= link_to t("admin.results.results_by_booth.see_results"), + admin_poll_booth_assignment_path(@poll, booth_assignment, anchor: "tab-results") %>
    + +
    @@ -30,60 +33,81 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + From f20db4e3e4710b63a7a2647471f4203d0cc5c7db Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 19 Oct 2017 13:32:48 +0200 Subject: [PATCH 585/765] Fix user helper expectation --- spec/helpers/users_helper_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb index 55ea8445b..fe2cdd786 100644 --- a/spec/helpers/users_helper_spec.rb +++ b/spec/helpers/users_helper_spec.rb @@ -35,7 +35,7 @@ describe UsersHelper do investment.hide - expect(comment_commentable_title(comment)).to eq '' + comment.commentable.title + ' (This investment has been deleted)' + expect(comment_commentable_title(comment)).to eq '' + comment.commentable.title + ' (This investment project has been deleted)' end end From 3daf9578134d1f512ffcc990b9cb48afee002f65 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 19 Oct 2017 13:35:04 +0200 Subject: [PATCH 586/765] Fix table tag indentation --- app/views/admin/poll/results/_results_by_booth.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/poll/results/_results_by_booth.html.erb b/app/views/admin/poll/results/_results_by_booth.html.erb index 9266a58fb..f270adaab 100644 --- a/app/views/admin/poll/results/_results_by_booth.html.erb +++ b/app/views/admin/poll/results/_results_by_booth.html.erb @@ -1,5 +1,5 @@

    <%= t("admin.results.results_by_booth.title") %>

    -
    <%= t("polls.show.stats.votes") %>
    <%= t("polls.show.stats.valid") %><%= @stats[:total_web_valid] %> - (<%= number_to_percentage(@stats[:valid_percentage_web], - strip_insignificant_zeros: true, - precision: 2) %>)<%= @stats[:total_booth_valid] %> - (<%= number_to_percentage(@stats[:valid_percentage_booth], - strip_insignificant_zeros: true, - precision: 2) %>)<%= @stats[:total_valid_votes] %> - (<%= number_to_percentage(@stats[:total_valid_percentage], - strip_insignificant_zeros: true, - precision: 2) %>)<%= t("polls.show.stats.valid") %> + <%= @stats[:total_web_valid] %> + (<%= number_to_percentage(@stats[:valid_percentage_web], + strip_insignificant_zeros: true, + precision: 2) %>) + + <%= @stats[:total_booth_valid] %> + (<%= number_to_percentage(@stats[:valid_percentage_booth], + strip_insignificant_zeros: true, + precision: 2) %>) + + <%= @stats[:total_valid_votes] %> + (<%= number_to_percentage(@stats[:total_valid_percentage], + strip_insignificant_zeros: true, + precision: 2) %>) +
    <%= t("polls.show.stats.white") %><%= @stats[:total_web_white] %> - (<%= number_to_percentage(@stats[:white_percentage_web], - strip_insignificant_zeros: true, - precision: 2) %>)<%= @stats[:total_booth_white] %> - (<%= number_to_percentage(@stats[:white_percentage_booth], - strip_insignificant_zeros: true, - precision: 2) %>)<%= @stats[:total_white_votes] %> - (<%= number_to_percentage(@stats[:total_white_percentage], - strip_insignificant_zeros: true, - precision: 2) %>)<%= t("polls.show.stats.white") %> + <%= @stats[:total_web_white] %> + (<%= number_to_percentage(@stats[:white_percentage_web], + strip_insignificant_zeros: true, + precision: 2) %>) + + <%= @stats[:total_booth_white] %> + (<%= number_to_percentage(@stats[:white_percentage_booth], + strip_insignificant_zeros: true, + precision: 2) %>) + <%= @stats[:total_white_votes] %> + (<%= number_to_percentage(@stats[:total_white_percentage], + strip_insignificant_zeros: true, + precision: 2) %>) +
    <%= t("polls.show.stats.null_votes") %><%= @stats[:total_web_null] %> - (<%= number_to_percentage(@stats[:null_percentage_web], - strip_insignificant_zeros: true, - precision: 2) %>)<%= @stats[:total_booth_null] %> - (<%= number_to_percentage(@stats[:null_percentage_booth], - strip_insignificant_zeros: true, - precision: 2) %>)<%= @stats[:total_null_votes] %> - (<%= number_to_percentage(@stats[:total_null_percentage], - strip_insignificant_zeros: true, - precision: 2) %>)<%= t("polls.show.stats.null_votes") %> + <%= @stats[:total_web_null] %> + (<%= number_to_percentage(@stats[:null_percentage_web], + strip_insignificant_zeros: true, + precision: 2) %>) + + <%= @stats[:total_booth_null] %> + (<%= number_to_percentage(@stats[:null_percentage_booth], + strip_insignificant_zeros: true, + precision: 2) %>) + + <%= @stats[:total_null_votes] %> + (<%= number_to_percentage(@stats[:total_null_percentage], + strip_insignificant_zeros: true, + precision: 2) %>) +
    <%= t("polls.show.stats.total") %><%= @stats[:total_participants_web] %> - (<%= number_to_percentage(@stats[:total_participants_web_percentage], - strip_insignificant_zeros: true, - precision: 2) %>)<%= @stats[:total_participants_booth] %> - (<%= number_to_percentage(@stats[:total_participants_booth_percentage], - strip_insignificant_zeros: true, - precision: 2) %>)<%= t("polls.show.stats.total") %> + <%= @stats[:total_participants_web] %> + (<%= number_to_percentage(@stats[:total_participants_web_percentage], + strip_insignificant_zeros: true, + precision: 2) %>) + + <%= @stats[:total_participants_booth] %> + (<%= number_to_percentage(@stats[:total_participants_booth_percentage], + strip_insignificant_zeros: true, + precision: 2) %>) + <%= @stats[:total_participants_web] + @stats[:total_participants_booth] %>
    +
    @@ -17,4 +17,4 @@ <% end %> -
    <%= t("admin.results.results_by_booth.booth") %>
    \ No newline at end of file +
    From ae206648a6f5a7e996ff7f07a035cbc52b6fa9e4 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 19 Oct 2017 16:37:44 +0200 Subject: [PATCH 587/765] improves styles for admin administrators views --- .../administrators/_administrator.html.erb | 55 ++++++------ app/views/admin/administrators/index.html.erb | 84 +++++++++++-------- .../administrators/user_not_found.js.erb | 2 +- config/locales/en/admin.yml | 5 +- config/locales/es/admin.yml | 5 +- 5 files changed, 86 insertions(+), 65 deletions(-) diff --git a/app/views/admin/administrators/_administrator.html.erb b/app/views/admin/administrators/_administrator.html.erb index d948e1eed..de480597d 100644 --- a/app/views/admin/administrators/_administrator.html.erb +++ b/app/views/admin/administrators/_administrator.html.erb @@ -1,26 +1,29 @@ -
    - - - - - - - - -
    - <%= administrator.name %> - - <%= administrator.email %> - - <% if administrator.persisted? %> - <%= link_to t('admin.administrators.administrator.delete'), - admin_administrator_path(administrator), - method: :delete, - class: "button hollow alert" %> - <% else %> - <%= link_to t('admin.administrators.administrator.add'),{ controller: "admin/administrators", action: :create, user_id: administrator.user_id }, - method: :post, - class: "button success" %> - <% end %> -
    -
    + + + + + + + + + + + + + +
    <%= t("admin.administrators.index.name") %><%= t("admin.administrators.index.email") %><%= t("admin.shared.actions") %>
    + <%= administrator.name %> + + <%= administrator.email %> + + <% if administrator.persisted? %> + <%= link_to t('admin.administrators.administrator.delete'), + admin_administrator_path(administrator), + method: :delete, + class: "button hollow alert expanded" %> + <% else %> + <%= link_to t('admin.administrators.administrator.add'),{ controller: "admin/administrators", action: :create, user_id: administrator.user_id }, + method: :post, + class: "button success expanded" %> + <% end %> +
    diff --git a/app/views/admin/administrators/index.html.erb b/app/views/admin/administrators/index.html.erb index 1cfbf5079..a98d46618 100644 --- a/app/views/admin/administrators/index.html.erb +++ b/app/views/admin/administrators/index.html.erb @@ -1,46 +1,58 @@ -

    <%= t("admin.administrators.index.title") %>

    +

    <%= t("admin.administrators.index.title") %>

    -
    +
    <%= form_tag search_admin_administrators_path, method: :get, remote: true do %> -
    +
    <%= text_field_tag :email, '', placeholder: t('admin.administrators.search.email_placeholder') %> -
    -
    - <%= submit_tag t('admin.administrators.search.search'), class: 'button' %> + +
    + <%= submit_tag t('admin.administrators.search.search'), class: 'button' %> +
    <% end %>
    -
    +
    -

    <%= page_entries_info @administrators %>

    +<% if @administrators.any? %> +

    <%= page_entries_info @administrators %>

    - - <% @administrators.each do |administrator| %> - - - - - - <% end %> -
    - <%= administrator.name %> - - <%= administrator.email %> - - <% if administrator.persisted? %> - <%= link_to t('admin.administrators.administrator.delete'), - admin_administrator_path(administrator), - method: :delete, - class: "button hollow alert" - %> - <% else %> - <%= link_to t('admin.administrators.administrator.add'), - { controller: "admin/administrators", action: :create, - user_id: administrator.user_id }, - method: :post, - class: "button success" %> - <% end %> -
    + + + + + + + <% @administrators.each do |administrator| %> + + + + + + <% end %> +
    <%= t("admin.administrators.index.name") %><%= t("admin.administrators.index.email") %><%= t("admin.shared.actions") %>
    + <%= administrator.name %> + + <%= administrator.email %> + + <% if administrator.persisted? %> + <%= link_to t('admin.administrators.administrator.delete'), + admin_administrator_path(administrator), + method: :delete, + class: "button hollow alert expanded" + %> + <% else %> + <%= link_to t('admin.administrators.administrator.add'), + { controller: "admin/administrators", action: :create, + user_id: administrator.user_id }, + method: :post, + class: "button success expanded" %> + <% end %> +
    -<%= paginate @administrators %> + <%= paginate @administrators %> +<% else %> +
    + <%= t("admin.administrators.index.no_administrators") %> +
    +<% end %> diff --git a/app/views/admin/administrators/user_not_found.js.erb b/app/views/admin/administrators/user_not_found.js.erb index ba707fc9d..8e979e667 100644 --- a/app/views/admin/administrators/user_not_found.js.erb +++ b/app/views/admin/administrators/user_not_found.js.erb @@ -1 +1 @@ -$("#search-result").html("
    <%= j t('admin.administrators.search.user_not_found') %>
    "); +$("#search-result").html("
    <%= j t('admin.administrators.search.user_not_found') %>
    "); diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 38abe6f56..c0111dea9 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -432,6 +432,9 @@ en: administrators: index: title: Administrators + name: Name + email: Email + no_administrators: There are no administrators. administrator: add: Add delete: Delete @@ -439,7 +442,7 @@ en: search: email_placeholder: Search user by email search: Search - user_not_found: User not found + user_not_found: User not found. moderators: index: title: Moderators diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 3336cdc5b..5cb7badff 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -382,6 +382,9 @@ es: administrators: index: title: Administradores + name: Nombre + email: Email + no_administrators: No hay administradores. administrator: add: Añadir como Administrador delete: Borrar @@ -389,7 +392,7 @@ es: search: email_placeholder: Buscar usuario por email search: Buscar - user_not_found: Usuario no encontrado + user_not_found: Usuario no encontrado. managers: index: title: Gestores From f17d0a663ee8d96edb459306c5cec1f68ce78009 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 19 Oct 2017 18:52:04 +0200 Subject: [PATCH 588/765] improves styles for admin organizations views --- app/views/admin/organizations/index.html.erb | 116 ++++++++++-------- app/views/admin/organizations/search.html.erb | 112 +++++++++-------- config/locales/en/admin.yml | 8 ++ config/locales/es/admin.yml | 8 ++ 4 files changed, 142 insertions(+), 102 deletions(-) diff --git a/app/views/admin/organizations/index.html.erb b/app/views/admin/organizations/index.html.erb index 0ddee4247..b5de10c32 100644 --- a/app/views/admin/organizations/index.html.erb +++ b/app/views/admin/organizations/index.html.erb @@ -1,67 +1,79 @@

    <%= t("admin.organizations.index.title") %>

    - -<%= form_for(Organization.new, url: search_admin_organizations_path, method: :get) do |f| %> -
    -
    +
    + <%= form_for(Organization.new, url: search_admin_organizations_path, method: :get) do |f| %> +
    <%= text_field_tag :term, "", placeholder: t("admin.organizations.index.search_placeholder") %> + +
    + <%= f.submit t("admin.organizations.index.search"), class: "button" %> +
    -
    - <%= f.submit t("admin.organizations.index.search"), class: "button success" %> -
    -
    -<% end %> - + <% end %> +
    <%= render 'shared/filter_subnav', i18n_namespace: "admin.organizations.index" %> -

    <%= page_entries_info @organizations %>

    +<% if @organizations.any? %> +

    <%= page_entries_info @organizations %>

    - - <% hidden = 0 %> - <% @organizations.each do |organization| %> - <% hidden += 1 and next if organization.user.nil? || organization.user.hidden? %> - - - - - - <% if organization.verified? %> - - <% end %> - <% if can? :verify, organization %> +

    <%= organization.name %>

    <%= organization.email %>

    <%= organization.phone_number %>

    <%= organization.responsible_name %>

    		 - - <%= t("admin.organizations.index.verified") %> -
    + <% hidden = 0 %> + + + + + + + + + + <% @organizations.each do |organization| %> + <% hidden += 1 and next if organization.user.nil? || organization.user.hidden? %> + + + + + - <% end %> - <% if organization.rejected? %> - - <% end %> - <% if can? :reject, organization %> - <% end %> - -<% end %> -
    <%= t("admin.organizations.index.name") %><%= t("admin.organizations.index.email") %><%= t("admin.organizations.index.phone_number") %><%= t("admin.organizations.index.responsible_name") %><%= t("admin.shared.status") %><%= t("admin.shared.actions") %>
    <%= organization.name %><%= organization.email %><%= organization.phone_number %><%= organization.responsible_name %> - <%= link_to t("admin.organizations.index.verify"), - verify_admin_organization_path(organization, request.query_parameters), - method: :put, class: "button success expanded" - %> + <% if organization.verified? %> + + <%= t("admin.organizations.index.verified") %> + <% elsif organization.rejected? %> + + <%= t("admin.organizations.index.rejected") %> + <% else %> + + <%= t("admin.organizations.index.pending") %> + <% end %> - - <%= t("admin.organizations.index.rejected") %> - - <%= link_to t("admin.organizations.index.reject"), - reject_admin_organization_path(organization, request.query_parameters), - method: :put, class: "button hollow alert expanded" - %> -
    + <% if can? :verify, organization %> + <%= link_to t("admin.organizations.index.verify"), + verify_admin_organization_path(organization, request.query_parameters), + method: :put, class: "button success small-5" %> + <% end %> -<% if hidden > 0 %> + <% if can? :reject, organization %> + <%= link_to t("admin.organizations.index.reject"), + reject_admin_organization_path(organization, request.query_parameters), + method: :put, class: "button hollow alert small-5"%> + <% end %> + + + <% end %> + + + + <% if hidden > 0 %> +
    + <%= t("admin.organizations.index.hidden_count_html", count: hidden) %> +
    + <% end %> + + <%= paginate @organizations %> +<% else %>
    - <%= t("admin.organizations.index.hidden_count_html", count: hidden) %> + <%= t("admin.organizations.index.no_organizations") %>
    <% end %> - -<%= paginate @organizations %> diff --git a/app/views/admin/organizations/search.html.erb b/app/views/admin/organizations/search.html.erb index 5b5071c5b..3b40764a9 100644 --- a/app/views/admin/organizations/search.html.erb +++ b/app/views/admin/organizations/search.html.erb @@ -1,56 +1,68 @@

    <%= t("admin.organizations.search.title") %>

    - -<%= form_for(Organization.new, url: search_admin_organizations_path, method: :get) do |f| %> -
    -
    +
    + <%= form_for(Organization.new, url: search_admin_organizations_path, method: :get) do |f| %> +
    <%= text_field_tag :term, "", placeholder: t("admin.organizations.index.search_placeholder") %> +
    + <%= f.submit t("admin.organizations.index.search"), class: "button" %> +
    -
    - <%= f.submit t("admin.organizations.index.search"), class: "button success" %> -
    + <% end %> +
    + +<% if @organizations.any? %> +

    <%= page_entries_info @organizations %>

    + + + + + + + + + + + + <% @organizations.each do |organization| %> + + + + + + + + + <% end %> + +
    <%= t("admin.organizations.index.name") %><%= t("admin.organizations.index.email") %><%= t("admin.organizations.index.phone_number") %><%= t("admin.organizations.index.responsible_name") %><%= t("admin.shared.status") %><%= t("admin.shared.actions") %>
    <%= organization.name %><%= organization.email %><%= organization.phone_number %><%= organization.responsible_name %> + <% if organization.verified? %> + + <%= t("admin.organizations.index.verified") %> + <% elsif organization.rejected? %> + + <%= t("admin.organizations.index.rejected") %> + <% else %> + + <%= t("admin.organizations.index.pending") %> + <% end %> + + <% if can? :verify, organization %> + <%= link_to t("admin.organizations.index.verify"), + verify_admin_organization_path(organization, request.query_parameters), + method: :put, class: "button success small-5" %> + <% end %> + + <% if can? :reject, organization %> + <%= link_to t("admin.organizations.index.reject"), + reject_admin_organization_path(organization, request.query_parameters), + method: :put, class: "button hollow alert small-5" %> + <% end %> +
    + + <%= paginate @organizations %> +<% else %> +
    + <%= t("admin.organizations.search.no_results") %>
    <% end %> - - -

    <%= page_entries_info @organizations %>

    - - - <% @organizations.each do |organization| %> - - - - - - <% if organization.verified? %> - - <% end %> - <% if can? :verify, organization %> - - <% end %> - <% if organization.rejected? %> - - <% end %> - <% if can? :reject, organization %> - - <% end %> - -<% end %> -

    <%= organization.name %>

    <%= organization.email %>

    <%= organization.phone_number %>

    <%= organization.responsible_name %>

    		 - - <%= t("admin.organizations.index.verified") %> - - <%= link_to t("admin.organizations.index.verify"), - verify_admin_organization_path(organization, request.query_parameters), - method: :put, class: "button success expanded" - %> - - - <%= t("admin.organizations.index.rejected") %> - <%= link_to t("admin.organizations.index.reject"), - reject_admin_organization_path(organization, request.query_parameters), - method: :put, class: "button hollow alert expanded" - %> -
    - -<%= paginate @organizations %> \ No newline at end of file diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index c0111dea9..e085bc1a9 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -712,6 +712,12 @@ en: hidden_count_html: one: There is also one organisation with no users or with a hidden user. other: There are %{count} organisations with no users or with a hidden user. + name: Name + email: Email + phone_number: Phone + responsible_name: Responsible + status: Status + no_organizations: There are no organizations. reject: Reject rejected: Rejected search: Search @@ -719,8 +725,10 @@ en: title: Organisations verified: Verified verify: Verify + pending: Pending search: title: Search Organisations + no_results: No organizations found. proposals: index: filter: Filter diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 5cb7badff..bcd6fe5eb 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -714,6 +714,12 @@ es: hidden_count_html: one: Hay además una organización sin usuario o con el usuario bloqueado. other: Hay %{count} organizaciones sin usuario o con el usuario bloqueado. + name: Nombre + email: Email + phone_number: Teléfono + responsible_name: Responsable + status: Estado + no_organizations: No hay organizaciones. reject: Rechazar rejected: Rechazada search: Buscar @@ -721,8 +727,10 @@ es: title: Organizaciones verified: Verificada verify: Verificar + pending: Pendiente search: title: Buscar Organizaciones + no_results: No se han encontrado organizaciones. proposals: index: filter: Filtro From bb7040359dabb6d845fcfdbb00b70fa0e93b9fc2 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 19 Oct 2017 19:09:57 +0200 Subject: [PATCH 589/765] fixes i18n key name --- app/views/admin/organizations/index.html.erb | 2 +- app/views/admin/organizations/search.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/organizations/index.html.erb b/app/views/admin/organizations/index.html.erb index b5de10c32..f69b1448e 100644 --- a/app/views/admin/organizations/index.html.erb +++ b/app/views/admin/organizations/index.html.erb @@ -24,7 +24,7 @@ <%= t("admin.organizations.index.email") %> <%= t("admin.organizations.index.phone_number") %> <%= t("admin.organizations.index.responsible_name") %> - <%= t("admin.shared.status") %> + <%= t("admin.organizations.index.status") %> <%= t("admin.shared.actions") %> diff --git a/app/views/admin/organizations/search.html.erb b/app/views/admin/organizations/search.html.erb index 3b40764a9..01b5420bd 100644 --- a/app/views/admin/organizations/search.html.erb +++ b/app/views/admin/organizations/search.html.erb @@ -20,7 +20,7 @@ <%= t("admin.organizations.index.email") %> <%= t("admin.organizations.index.phone_number") %> <%= t("admin.organizations.index.responsible_name") %> - <%= t("admin.shared.status") %> + <%= t("admin.organizations.index.status") %> <%= t("admin.shared.actions") %> From 45d91a7e502eaeb99062b088dba5213b2a24babb Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 19 Oct 2017 19:27:26 +0200 Subject: [PATCH 590/765] Add Poll booth_assignments and :Poll::BoothAssignment manage routes, actions and views --- .../poll/booth_assignments_controller.rb | 4 +++ .../admin/poll/polls_controller.rb | 4 +++ app/models/abilities/administrator.rb | 4 +-- app/views/admin/_menu.html.erb | 7 +++++- .../poll/booth_assignments/manage.html.erb | 25 +++++++++++++++++++ .../poll/polls/booth_assignments.html.erb | 18 +++++++++++++ config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 1 + config/routes.rb | 4 ++- 9 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 app/views/admin/poll/booth_assignments/manage.html.erb create mode 100644 app/views/admin/poll/polls/booth_assignments.html.erb diff --git a/app/controllers/admin/poll/booth_assignments_controller.rb b/app/controllers/admin/poll/booth_assignments_controller.rb index 7998f29a2..221a623ef 100644 --- a/app/controllers/admin/poll/booth_assignments_controller.rb +++ b/app/controllers/admin/poll/booth_assignments_controller.rb @@ -45,6 +45,10 @@ class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController redirect_to admin_poll_booth_assignments_path(@booth_assignment.poll_id), notice: notice end + def manage + @booths = ::Poll::Booth.all + end + private def load_booth_assignment diff --git a/app/controllers/admin/poll/polls_controller.rb b/app/controllers/admin/poll/polls_controller.rb index 5103275fb..8ba6e934e 100644 --- a/app/controllers/admin/poll/polls_controller.rb +++ b/app/controllers/admin/poll/polls_controller.rb @@ -47,6 +47,10 @@ class Admin::Poll::PollsController < Admin::Poll::BaseController redirect_to admin_poll_path(@poll), notice: notice end + def booth_assignments + @polls = Poll.current_or_incoming + end + private def load_geozones diff --git a/app/models/abilities/administrator.rb b/app/models/abilities/administrator.rb index 1bc8d5e0c..704f9be24 100644 --- a/app/models/abilities/administrator.rb +++ b/app/models/abilities/administrator.rb @@ -56,10 +56,10 @@ module Abilities can [:index, :create, :edit, :update, :destroy], Geozone - can [:read, :create, :update, :destroy, :add_question, :search_booths, :search_officers], Poll + can [:read, :create, :update, :destroy, :add_question, :search_booths, :search_officers, :booth_assignments], Poll can [:read, :create, :update, :destroy, :available], Poll::Booth can [:search, :create, :index, :destroy], ::Poll::Officer - can [:create, :destroy], ::Poll::BoothAssignment + can [:create, :destroy, :manage], ::Poll::BoothAssignment can [:create, :destroy], ::Poll::OfficerAssignment can [:read, :create, :update], Poll::Question can :destroy, Poll::Question # , comments_count: 0, votes_up: 0 diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index f2af2c116..0518aa0e3 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -60,7 +60,8 @@ <%= t("admin.menu.title_polls") %>
      > -
    • > +
    • > <%= link_to t('admin.menu.polls'), admin_polls_path %>
      • @@ -84,6 +85,10 @@ action_name == "available" %>> <%= link_to t('admin.menu.poll_shifts'), available_admin_booths_path %> + +
    • > + <%= link_to t('admin.menu.poll_booth_assignments'), booth_assignments_admin_polls_path %> +
    <% end %> diff --git a/app/views/admin/poll/booth_assignments/manage.html.erb b/app/views/admin/poll/booth_assignments/manage.html.erb new file mode 100644 index 000000000..65cec228a --- /dev/null +++ b/app/views/admin/poll/booth_assignments/manage.html.erb @@ -0,0 +1,25 @@ +

    <%= t("admin.booths.index.title") %>

    + +<% if controller_name == "booths" && action_name != "available" %> + <%= link_to t("admin.booths.index.add_booth"), new_admin_booth_path, class: "button success float-right" %> +<% end %> + +<% if @booths.empty? %> +
    + <%= t("admin.booths.index.no_booths") %> +
    +<% end %> + +<% if @booths.any? %> + + + + + + + <% @booths.each do |booth| %> + <% end %> + +
    <%= t("admin.booths.index.name") %><%= t("admin.actions.actions") %>
    + +<% end %> diff --git a/app/views/admin/poll/polls/booth_assignments.html.erb b/app/views/admin/poll/polls/booth_assignments.html.erb new file mode 100644 index 000000000..0d9bf98ce --- /dev/null +++ b/app/views/admin/poll/polls/booth_assignments.html.erb @@ -0,0 +1,18 @@ +

    <%= t("admin.polls.index.title") %>

    + +<% if @polls.any? %> + + + + + + + + <%= render @polls %> + +
    <%= t("admin.polls.index.name") %><%= t("admin.polls.index.dates") %><%= t("admin.actions.actions") %>
    +<% else %> +
    + <%= t("admin.polls.index.no_polls") %> +
    +<% end %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 38abe6f56..a2657a2b3 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -409,6 +409,7 @@ en: poll_officers: Poll officers polls: Polls poll_booths: Booths location + poll_booth_assignments: Booths Assignments poll_shifts: Manage shifts officials: Officials organizations: Organisations diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 3336cdc5b..4c56e131c 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -420,6 +420,7 @@ es: poll_officers: Presidentes de mesa polls: Votaciones poll_booths: Ubicación de urnas + poll_booth_assignments: Asignación de urnas poll_shifts: Asignar turnos officials: Cargos públicos organizations: Organizaciones diff --git a/config/routes.rb b/config/routes.rb index ae4f7280c..6f94594a3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -111,7 +111,7 @@ Rails.application.routes.draw do resources :annotations do get :search, on: :collection end - + resources :polls, only: [:show, :index] do resources :questions, controller: 'polls/questions', shallow: true do post :answer, on: :member @@ -273,10 +273,12 @@ Rails.application.routes.draw do scope module: :poll do resources :polls do + get :booth_assignments, on: :collection patch :add_question, on: :member resources :booth_assignments, only: [:index, :show, :create, :destroy] do get :search_booths, on: :collection + get :manage, on: :collection end resources :officer_assignments, only: [:index, :create, :destroy] do From c52c0a5452f8e1170401dc871834b7c531870dd7 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 19 Oct 2017 19:42:00 +0200 Subject: [PATCH 591/765] Complete Poll list with booth assigment management links --- .../admin/poll/polls/booth_assignments.html.erb | 16 +++++++++++++++- config/locales/en/admin.yml | 2 ++ config/locales/es/admin.yml | 2 ++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/views/admin/poll/polls/booth_assignments.html.erb b/app/views/admin/poll/polls/booth_assignments.html.erb index 0d9bf98ce..819474852 100644 --- a/app/views/admin/poll/polls/booth_assignments.html.erb +++ b/app/views/admin/poll/polls/booth_assignments.html.erb @@ -8,7 +8,21 @@ <%= t("admin.actions.actions") %> - <%= render @polls %> + <% @polls.each do |poll| %> + + + <%= poll.name %> + + + <%= l poll.starts_at.to_date %> - <%= l poll.ends_at.to_date %> + + + <%= link_to t("admin.booth_assignments.manage_assignments"), + manage_admin_poll_booth_assignments_path(poll), + class: "button hollow" %> + + + <% end %> <% else %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index a2657a2b3..863ae8688 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -525,6 +525,8 @@ en: date_missing: "A date must be selected" vote_collection: Collect Votes recount_scrutiny: Recount & Scrutiny + booth_assignments: + manage_assignments: Manage assignments poll_booth_assignments: flash: destroy: "Booth not assigned anymore" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 4c56e131c..a7d4d2c81 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -525,6 +525,8 @@ es: date_missing: "Debe seleccionarse una fecha" vote_collection: Recoger Votos recount_scrutiny: Recuento & Escrutinio + booth_assignments: + manage_assignments: Gestionar asignaciones poll_booth_assignments: flash: destroy: "Urna desasignada" From ca766404bf5af9cc5e8d73f1e25c150029f67d1f Mon Sep 17 00:00:00 2001 From: iagirre Date: Thu, 19 Oct 2017 19:50:06 +0200 Subject: [PATCH 592/765] Added functions to make the polls scenarios more complete --- db/dev_seeds.rb | 94 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 72 insertions(+), 22 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 8c09923d8..54569f59c 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -96,6 +96,11 @@ poll_officer = create_user('poll_officer@consul.dev', 'Paul O. Fisher') poll_officer.create_poll_officer poll_officer.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "2211111111") +poll_officer2 = create_user('poll_officer2@consul.dev', 'Pauline M. Espinosa') +poll_officer2.create_poll_officer +poll_officer2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "3311111111") + + create_user('unverified@consul.dev', 'unverified') level_2 = create_user('leveltwo@consul.dev', 'level 2') @@ -523,40 +528,37 @@ print "Creating polls" puts " ✅" print "Active Polls" -(1..3).each do |i| - poll = Poll.create(name: "Active Poll #{i}", - # slug: "active-poll-#{i}", - starts_at: 1.month.ago, - ends_at: 1.month.from_now, - geozone_restricted: false) -end -(1..5).each do |i| - poll = Poll.create(name: "Active Poll #{i}", - # slug: "active-poll-#{i}", - starts_at: 1.month.ago, - ends_at: 1.month.from_now, - geozone_restricted: true, - geozones: Geozone.reorder("RANDOM()").limit(3)) -end +poll_active = Poll.create(name: "Active Poll", + slug: "active-poll", + starts_at: 1.month.ago, + ends_at: 1.month.from_now, + geozone_restricted: false) + +poll_active_geolocalized = Poll.create(name: "Active Poll Restricted", + slug: "active-poll-restricted", + starts_at: 1.month.ago, + ends_at: 1.month.from_now, + geozone_restricted: true, + geozones: Geozone.reorder("RANDOM()").limit(3)) puts " ✅" print "Upcoming Poll" poll = Poll.create(name: "Upcoming Poll", - # slug: "upcoming-poll", + slug: "upcoming-poll", starts_at: 1.month.from_now, ends_at: 2.months.from_now) puts " ✅" print "Expired Poll" -poll = Poll.create(name: "Expired Poll", - # slug: "expired-poll", +poll_expired = Poll.create(name: "Expired Poll", + slug: "expired-poll", starts_at: 2.months.ago, ends_at: 1.month.ago) puts " ✅" print "Creating Poll Questions" -50.times do +25.times do poll = Poll.reorder("RANDOM()").first author = User.reorder("RANDOM()").first description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " @@ -571,7 +573,7 @@ end puts " ✅" print "Creating Poll Booths" -30.times.each_with_index do |i| +20.times.each_with_index do |i| Poll::Booth.create(name: "Booth #{i}", polls: [Poll.all.sample]) end @@ -591,6 +593,24 @@ print "Creating Poll Officer Assignments" end end +puts " ✅" +print "Creating Poll Shifts for Poll Officers" + +Poll::BoothAssignment.all.each do |booth_assignment| + Poll::Shift.create(booth_id: booth_assignment.booth_id, + officer_id: poll_officer.poll_officer.id, + date: Date.current, + officer_name: poll_officer.poll_officer.name, + officer_email: poll_officer.poll_officer.email, + task: 0) + Poll::Shift.create(booth_id: booth_assignment.booth_id, + officer_id: poll_officer.poll_officer.id, + date: Date.current, + officer_name: poll_officer.poll_officer.name, + officer_email: poll_officer.poll_officer.email, + task: 1) +end + puts " ✅" print "Creating Poll Questions from Proposals" @@ -634,10 +654,40 @@ end puts " ✅" print "Creating Poll Voters" +puts " ✅" +print "For Active Poll" + 10.times do - poll = Poll.all.sample user = User.level_two_verified.sample - Poll::Voter.create(poll: poll, user: user) + Poll::Voter.create(poll_id: poll_active.id, user_id: user.id, document_number: user.document_number, origin: 'web') +end + +puts " ✅" +print "For Active Geolocalized Poll" + +10.times do + user = User.level_two_verified.sample + Poll::Voter.create(poll_id: poll_active_geolocalized.id, user_id: user.id, document_number: user.document_number, origin: 'web') +end + +puts " ✅" +print "For Expired Poll" + +10.times do + user = User.level_two_verified.sample + Poll::Voter.create(poll_id: poll_expired.id, user_id: user.id, document_number: user.document_number, origin: 'web') +end + +puts " ✅" +print "Creating Poll Answers" + +Poll::Voter.all.each do |voter| + voter.poll.questions.each do |question| + answer = question.question_answers.sample + unless answer.nil? + Poll::Answer.create(question_id: question.id, author_id: voter.user_id, answer: answer.title) + end + end end puts " ✅" From 3c20ba0688136f16fe888b719aabdca924393494 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 19 Oct 2017 19:56:22 +0200 Subject: [PATCH 593/765] improve styles for admin officials views --- app/views/admin/officials/edit.html.erb | 18 +++--- app/views/admin/officials/index.html.erb | 58 +++++++++++------ app/views/admin/officials/search.html.erb | 68 ++++++++++++++------ app/views/admin/shared/_user_search.html.erb | 18 +++--- config/locales/en/admin.yml | 5 ++ config/locales/es/admin.yml | 5 ++ 6 files changed, 114 insertions(+), 58 deletions(-) diff --git a/app/views/admin/officials/edit.html.erb b/app/views/admin/officials/edit.html.erb index 4696ea4de..5a17d2445 100644 --- a/app/views/admin/officials/edit.html.erb +++ b/app/views/admin/officials/edit.html.erb @@ -1,20 +1,22 @@ -<%= back_link_to %> +<%= back_link_to admin_officials_path %>
    -
    <%= @user.name %> (<%= @user.email %>)
    -

    <%= t("admin.officials.edit.title") %>

    -
    -
    +
    + <%= @user.name %>
    + <%= @user.email %> +
    + +
    <%= form_for @user, url: admin_official_path(@user) do |f| %> <%= f.text_field :official_position %> <%= f.select :official_level, official_level_options %> + <%= f.submit class: "button" %> <% if @user.official? %> - <%= link_to t("admin.officials.edit.destroy"), admin_official_path(@user), method: :delete, class: 'button hollow alert' %> +
    + <%= link_to t("admin.officials.edit.destroy"), admin_official_path(@user), method: :delete, class: 'delete' %> <% end %> - <%= f.submit class: "button hollow" %> <% end %> -
    diff --git a/app/views/admin/officials/index.html.erb b/app/views/admin/officials/index.html.erb index 078d5bbbc..f4cbdd06c 100644 --- a/app/views/admin/officials/index.html.erb +++ b/app/views/admin/officials/index.html.erb @@ -2,26 +2,42 @@ <%= render 'admin/shared/user_search', url: search_admin_officials_path %> -

    <%= page_entries_info @officials %>

    +<% if @officials.any? %> +

    <%= page_entries_info @officials %>

    - - <% @officials.each do |official| %> - - - - - - <% end %> -
    - <%= link_to official.name, edit_admin_official_path(official) %> - - - <%= official.official_position %> - - (<%= t("admin.officials.level_#{official.official_level}") %>) - - <%= link_to official.official? ? t("admin.officials.search.edit_official") : t("admin.officials.search.make_official"), - edit_admin_official_path(official), class: "button hollow" %> -
    + + + + + + + + + <% @officials.each do |official| %> + + + + + + + <% end %> + +
    <%= t("admin.officials.index.name") %><%= t("admin.officials.index.official_position") %><%= t("admin.officials.index.official_level") %><%= t("admin.shared.actions") %>
    + <%= link_to official.name, edit_admin_official_path(official) %> + + + <%= official.official_position %> + + + <%= t("admin.officials.level_#{official.official_level}") %> + + <%= link_to official.official? ? t("admin.officials.search.edit_official") : t("admin.officials.search.make_official"), + edit_admin_official_path(official), class: "button hollow expanded" %> +
    -<%= paginate @officials %> + <%= paginate @officials %> +<% else %> +
    + <%= t("admin.officials.index.no_officials") %> +
    +<% end %> diff --git a/app/views/admin/officials/search.html.erb b/app/views/admin/officials/search.html.erb index f2d90c143..e2a067c9d 100644 --- a/app/views/admin/officials/search.html.erb +++ b/app/views/admin/officials/search.html.erb @@ -2,24 +2,52 @@ <%= render 'admin/shared/user_search', url: search_admin_officials_path %> -

    <%= page_entries_info @users %>

    +<% if @users.any? %> - - <% @users.each do |user| %> - - - - - - <% end %> -
    - <%= link_to user.name, edit_admin_official_path(user) %> - - - <%= user.official_position %> - - (<%= t("admin.officials.level_#{user.official_level}") %>) - - <%= link_to user.official? ? t("admin.officials.search.edit_official") : t("admin.officials.search.make_official"), - edit_admin_official_path(user), class: "button hollow" %> -
    +

    <%= page_entries_info @users %>

    + + + + + + + + + + <% @users.each do |user| %> + + + + + + + <% end %> + +
    <%= t("admin.officials.index.name") %><%= t("admin.officials.index.official_position") %><%= t("admin.officials.index.official_level") %><%= t("admin.shared.actions") %>
    + <%= link_to user.name, edit_admin_official_path(user) %> + + <% if user.official? %> + + <%= user.official_position %> + + <% else %> + <%= t("admin.officials.level_0") %> + <% end %> + + <%= t("admin.officials.level_#{user.official_level}") %> + + <% if user.official? %> + <%= link_to t("admin.officials.search.edit_official"), + edit_admin_official_path(user), + class: "button hollow expanded" %> + <% else %> + <%= link_to t("admin.officials.search.make_official"), + edit_admin_official_path(user), + class: "button expanded" %> + <% end %> +
    +<% else %> +
    + <%= t("admin.officials.search.no_results") %> +
    +<% end %> \ No newline at end of file diff --git a/app/views/admin/shared/_user_search.html.erb b/app/views/admin/shared/_user_search.html.erb index a964ce549..c553052c2 100644 --- a/app/views/admin/shared/_user_search.html.erb +++ b/app/views/admin/shared/_user_search.html.erb @@ -1,10 +1,10 @@ -<%= form_for(User.new, url: url, as: :user, method: :get) do |f| %> -
    -
    - <%= text_field_tag :name_or_email, "", placeholder: t("admin.shared.user_search.placeholder") %> +
    + <%= form_for(User.new, url: url, as: :user, method: :get) do |f| %> +
    + <%= text_field_tag :name_or_email, "", placeholder: t("admin.shared.user_search.placeholder") %> +
    + <%= f.submit t("admin.shared.user_search.button"), class: "button" %> +
    -
    - <%= f.submit t("admin.shared.user_search.button"), class: "button success" %> -
    -
    -<% end %> \ No newline at end of file + <% end %> +
    diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index e085bc1a9..a6a407a41 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -691,6 +691,10 @@ en: official_updated: Details of official saved index: title: Officials + no_officials: There are no officials. + name: Nombre + official_position: Official position + official_level: Level level_0: Not official level_1: Level 1 level_2: Level 2 @@ -701,6 +705,7 @@ en: edit_official: Edit official make_official: Make official title: 'Official positions: User search' + no_results: Official positions not found. organizations: index: filter: Filter diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index bcd6fe5eb..503cdafc3 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -693,6 +693,10 @@ es: official_updated: Datos del cargo público guardados index: title: Cargos Públicos + no_officials: No hay cargos públicos. + name: Nombre + official_position: Cargo público + official_level: Nivel level_0: No es cargo público level_1: Nivel 1 level_2: Nivel 2 @@ -703,6 +707,7 @@ es: edit_official: Editar cargo público make_official: Convertir en cargo público title: 'Cargos Públicos: Búsqueda de usuarios' + no_results: No se han encontrado cargos públicos. organizations: index: filter: Filtro From 9bb03c9d1a8f2f0483758e53ed1902ec7f70b34a Mon Sep 17 00:00:00 2001 From: iagirre Date: Thu, 19 Oct 2017 20:02:07 +0200 Subject: [PATCH 594/765] Added voters in booths --- db/dev_seeds.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 54569f59c..952fa7378 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -660,6 +660,8 @@ print "For Active Poll" 10.times do user = User.level_two_verified.sample Poll::Voter.create(poll_id: poll_active.id, user_id: user.id, document_number: user.document_number, origin: 'web') + user = User.level_two_verified.sample + Poll::Voter.create(poll_id: poll_active.id, user_id: user.id, document_number: user.document_number, origin: 'booth') end puts " ✅" @@ -668,6 +670,8 @@ print "For Active Geolocalized Poll" 10.times do user = User.level_two_verified.sample Poll::Voter.create(poll_id: poll_active_geolocalized.id, user_id: user.id, document_number: user.document_number, origin: 'web') + user = User.level_two_verified.sample + Poll::Voter.create(poll_id: poll_active_geolocalized.id, user_id: user.id, document_number: user.document_number, origin: 'booth') end puts " ✅" @@ -676,6 +680,8 @@ print "For Expired Poll" 10.times do user = User.level_two_verified.sample Poll::Voter.create(poll_id: poll_expired.id, user_id: user.id, document_number: user.document_number, origin: 'web') + user = User.level_two_verified.sample + Poll::Voter.create(poll_id: poll_expired.id, user_id: user.id, document_number: user.document_number, origin: 'web') end puts " ✅" From fc44abae5ab814e31ebc87c8c3831e8b7c6b8b16 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 19 Oct 2017 20:06:08 +0200 Subject: [PATCH 595/765] improves styles for admin moderators views --- .../admin/moderators/_moderator.html.erb | 56 +++++++------ app/views/admin/moderators/index.html.erb | 84 +++++++++++-------- .../admin/moderators/user_not_found.js.erb | 2 +- config/locales/en/admin.yml | 3 + config/locales/es/admin.yml | 3 + 5 files changed, 86 insertions(+), 62 deletions(-) diff --git a/app/views/admin/moderators/_moderator.html.erb b/app/views/admin/moderators/_moderator.html.erb index 57a29d2e8..c69b559fc 100644 --- a/app/views/admin/moderators/_moderator.html.erb +++ b/app/views/admin/moderators/_moderator.html.erb @@ -1,26 +1,30 @@ -
    - - - - - - - - -
    - <%= moderator.name %> - - <%= moderator.email %> - - <% if moderator.persisted? %> - <%= link_to t('admin.moderators.moderator.delete'), - admin_moderator_path(moderator), - method: :delete, - class: "button hollow alert" %> - <% else %> - <%= link_to t('admin.moderators.moderator.add'),{ controller: "admin/moderators", action: :create, user_id: moderator.user_id }, - method: :post, - class: "button success" %> - <% end %> -
    -
    + + + + + + + + + + + + + + +
    <%= t("admin.moderators.index.name") %><%= t("admin.moderators.index.email") %><%= t("admin.shared.actions") %>
    + <%= moderator.name %> + + <%= moderator.email %> + + <% if moderator.persisted? %> + <%= link_to t('admin.moderators.moderator.delete'), + admin_moderator_path(moderator), + method: :delete, + class: "button hollow alert expanded" %> + <% else %> + <%= link_to t('admin.moderators.moderator.add'),{ controller: "admin/moderators", action: :create, user_id: moderator.user_id }, + method: :post, + class: "button success expanded" %> + <% end %> +
    diff --git a/app/views/admin/moderators/index.html.erb b/app/views/admin/moderators/index.html.erb index 0fc8703fd..d6a9b50bb 100644 --- a/app/views/admin/moderators/index.html.erb +++ b/app/views/admin/moderators/index.html.erb @@ -2,47 +2,61 @@

    <%= t("admin.moderators.index.title") %>

    -
    +
    <%= form_tag search_admin_moderators_path, method: :get, remote: true do %> -
    +
    <%= text_field_tag :email, '', placeholder: t('admin.moderators.search.email_placeholder') %> -
    -
    - <%= submit_tag t('admin.moderators.search.search'), class: 'button' %> +
    + <%= submit_tag t('admin.moderators.search.search'), class: 'button' %> +
    <% end %>
    -
    +
    -

    <%= page_entries_info @moderators %>

    +<% if @moderators.any? %> - - <% @moderators.each do |moderator| %> - - - - - - <% end %> -
    - <%= moderator.name %> - - <%= moderator.email %> - - <% if moderator.persisted? %> - <%= link_to t('admin.moderators.moderator.delete'), - admin_moderator_path(moderator), - method: :delete, - class: "button hollow alert" - %> - <% else %> - <%= link_to t('admin.moderators.moderator.add'), - { controller: "admin/moderators", action: :create, - user_id: moderator.user_id }, - method: :post, - class: "button success" %> - <% end %> -
    +

    <%= page_entries_info @moderators %>

    -<%= paginate @moderators %> + + + + + + + + <% @moderators.each do |moderator| %> + + + + + + <% end %> + +
    <%= t("admin.moderators.index.name") %><%= t("admin.moderators.index.email") %><%= t("admin.shared.actions") %>
    + <%= moderator.name %> + + <%= moderator.email %> + + <% if moderator.persisted? %> + <%= link_to t('admin.moderators.moderator.delete'), + admin_moderator_path(moderator), + method: :delete, + class: "button hollow alert expanded" + %> + <% else %> + <%= link_to t('admin.moderators.moderator.add'), + { controller: "admin/moderators", action: :create, + user_id: moderator.user_id }, + method: :post, + class: "button success expanded" %> + <% end %> +
    + + <%= paginate @moderators %> +<% else %> +
    + <%= t("admin.moderators.index.no_moderators") %> +
    +<% end %> diff --git a/app/views/admin/moderators/user_not_found.js.erb b/app/views/admin/moderators/user_not_found.js.erb index a8573236c..9667d81ed 100644 --- a/app/views/admin/moderators/user_not_found.js.erb +++ b/app/views/admin/moderators/user_not_found.js.erb @@ -1 +1 @@ -$("#search-result").html("
    <%= j t('admin.moderators.search.user_not_found') %>
    "); +$("#search-result").html("
    <%= j t('admin.moderators.search.user_not_found') %>
    "); diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index a6a407a41..ff1d83cd9 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -446,6 +446,9 @@ en: moderators: index: title: Moderators + name: Name + email: Email + no_moderators: There are no moderators. moderator: add: Add delete: Delete diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 503cdafc3..af3ef5830 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -446,6 +446,9 @@ es: moderators: index: title: Moderadores + name: Nombre + email: Email + no_moderators: No hay moderadores. moderator: add: Añadir como Moderador delete: Borrar From f8839434f77d37a2243f3af77ba1f8239248148d Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 19 Oct 2017 20:10:51 +0200 Subject: [PATCH 596/765] Complete booth assignment view list without actions yet --- .../admin/poll/booth_assignments_controller.rb | 1 + .../_booth_assignment.html.erb | 17 +++++++++++++++++ .../poll/booth_assignments/manage.html.erb | 16 ++++++++-------- config/locales/en/admin.yml | 9 +++++++++ config/locales/es/admin.yml | 9 +++++++++ 5 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 app/views/admin/poll/booth_assignments/_booth_assignment.html.erb diff --git a/app/controllers/admin/poll/booth_assignments_controller.rb b/app/controllers/admin/poll/booth_assignments_controller.rb index 221a623ef..ab3f52d11 100644 --- a/app/controllers/admin/poll/booth_assignments_controller.rb +++ b/app/controllers/admin/poll/booth_assignments_controller.rb @@ -47,6 +47,7 @@ class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController def manage @booths = ::Poll::Booth.all + @poll = Poll.find(params[:poll_id]) end private diff --git a/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb b/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb new file mode 100644 index 000000000..06188df9c --- /dev/null +++ b/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb @@ -0,0 +1,17 @@ + + + <%= link_to booth.name, admin_booth_path(booth) %> + + + <%= t("admin.booth_assignments.status.assigned") %> + <%= t("admin.booth_assignments.status.unassigned") %> + + + <%= link_to t("admin.booth_assignments.manage.assign"), + new_admin_booth_shift_path(booth), + class: "button" %> + <%= link_to t("admin.booth_assignments.manage.unassign"), + new_admin_booth_shift_path(booth), + class: "button hollow" %> + + diff --git a/app/views/admin/poll/booth_assignments/manage.html.erb b/app/views/admin/poll/booth_assignments/manage.html.erb index 65cec228a..c76485cc9 100644 --- a/app/views/admin/poll/booth_assignments/manage.html.erb +++ b/app/views/admin/poll/booth_assignments/manage.html.erb @@ -1,25 +1,25 @@ -

    <%= t("admin.booths.index.title") %>

    - -<% if controller_name == "booths" && action_name != "available" %> - <%= link_to t("admin.booths.index.add_booth"), new_admin_booth_path, class: "button success float-right" %> +<%= link_to booth_assignments_admin_polls_path do %> + <%= t("shared.back") %> <% end %> +
    + +

    <%= t("admin.booth_assignments.manage.assignments_list", poll: @poll.name) %>

    <% if @booths.empty? %>
    <%= t("admin.booths.index.no_booths") %>
    -<% end %> - -<% if @booths.any? %> +<% else %> + <% @booths.each do |booth| %> + <%= render partial: "booth_assignment", locals: { booth: booth } %> <% end %>
    <%= t("admin.booths.index.name") %><%= t("admin.booth_assignments.status.assign_status") %> <%= t("admin.actions.actions") %>
    - <% end %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 863ae8688..398744720 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -527,6 +527,15 @@ en: recount_scrutiny: Recount & Scrutiny booth_assignments: manage_assignments: Manage assignments + manage: + assignments_list: "Assignments for poll '%{poll}'" + status: + assign_status: Assignment + assigned: Assigned + unassigned: Unassigned + actions: + assign: Assign booth + unassign: Unassign booth poll_booth_assignments: flash: destroy: "Booth not assigned anymore" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index a7d4d2c81..7169d6017 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -527,6 +527,15 @@ es: recount_scrutiny: Recuento & Escrutinio booth_assignments: manage_assignments: Gestionar asignaciones + manage: + assignments_list: "Asignaciones para la votación '%{poll}'" + status: + assign_status: Asignación + assigned: Asignada + unassigned: No asignada + actions: + assign: Assign booth + unassign: Unassign booth poll_booth_assignments: flash: destroy: "Urna desasignada" From e6efd8ad7d7c385ea5f97a7252dd8a283ac5d0f7 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 19 Oct 2017 20:54:42 +0200 Subject: [PATCH 597/765] Remove assign/unassign booth to poll from poll booth assigments list --- .../booth_assignments/_search_booths_results.html.erb | 9 --------- app/views/admin/poll/booth_assignments/index.html.erb | 7 ------- config/locales/en/admin.yml | 2 -- config/locales/es/admin.yml | 2 -- 4 files changed, 20 deletions(-) diff --git a/app/views/admin/poll/booth_assignments/_search_booths_results.html.erb b/app/views/admin/poll/booth_assignments/_search_booths_results.html.erb index 3fa7fc080..cebde154c 100644 --- a/app/views/admin/poll/booth_assignments/_search_booths_results.html.erb +++ b/app/views/admin/poll/booth_assignments/_search_booths_results.html.erb @@ -12,7 +12,6 @@ <%= t("admin.poll_booth_assignments.index.table_name") %> <%= t("admin.poll_booth_assignments.index.table_location") %> - <%= t("admin.poll_booth_assignments.index.table_assignment") %> @@ -24,14 +23,6 @@ <%= booth.location %> - - <% unless @poll.booth_ids.include?(booth.id) %> - <%= link_to t("admin.poll_booth_assignments.index.add_booth"), - admin_poll_booth_assignments_path(@poll, booth_id: booth.id), - method: :post, - class: "button hollow" %> - <% end %> - <% end %> diff --git a/app/views/admin/poll/booth_assignments/index.html.erb b/app/views/admin/poll/booth_assignments/index.html.erb index f14e59ef1..fcedaec79 100644 --- a/app/views/admin/poll/booth_assignments/index.html.erb +++ b/app/views/admin/poll/booth_assignments/index.html.erb @@ -14,7 +14,6 @@ <%= t("admin.poll_booth_assignments.index.table_name") %> <%= t("admin.poll_booth_assignments.index.table_location") %> - <%= t("admin.poll_booth_assignments.index.table_assignment") %> <% @booth_assignments.each do |booth_assignment| %> @@ -27,12 +26,6 @@ <%= booth_assignment.booth.location %> - - <%= link_to t("admin.poll_booth_assignments.index.remove_booth"), - admin_poll_booth_assignment_path(@poll, booth_assignment), - method: :delete, - class: "button hollow alert" %> - <% end %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 398744720..d991ad85f 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -559,8 +559,6 @@ en: no_booths: "There are no booths assigned to this poll." table_name: "Name" table_location: "Location" - table_assignment: "Assignment" - remove_booth: "Remove booth from poll" add_booth: "Assign booth" polls: index: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 7169d6017..1ac21c633 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -559,8 +559,6 @@ es: no_booths: "No hay urnas asignadas a esta votación." table_name: "Nombre" table_location: "Ubicación" - table_assignment: "Asignación" - remove_booth: "Desasignar urna" add_booth: "Asignar urna" polls: index: From 7507f43ea813a63ac56cd71936ff4097fbeb1d2c Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 19 Oct 2017 21:30:31 +0200 Subject: [PATCH 598/765] Add helper method on Booth model to get booth assigment for a given poll --- app/models/poll/booth.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/poll/booth.rb b/app/models/poll/booth.rb index 04f9d3dea..07e7d2456 100644 --- a/app/models/poll/booth.rb +++ b/app/models/poll/booth.rb @@ -15,5 +15,8 @@ class Poll where(polls: { id: Poll.current_or_incoming }).includes(:polls) end + def assignment_on_poll(poll) + booth_assignments.where(poll: poll).first + end end -end \ No newline at end of file +end From ca9e807cd4134aa4677848fa16c8d08b2d5d4288 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 19 Oct 2017 21:30:57 +0200 Subject: [PATCH 599/765] Add link to booth assignment management at poll booth assigments list --- app/views/admin/poll/booth_assignments/index.html.erb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/views/admin/poll/booth_assignments/index.html.erb b/app/views/admin/poll/booth_assignments/index.html.erb index fcedaec79..39435254b 100644 --- a/app/views/admin/poll/booth_assignments/index.html.erb +++ b/app/views/admin/poll/booth_assignments/index.html.erb @@ -1,10 +1,16 @@ <%= render "/admin/poll/polls/poll_header" %> + +
    <%= render "/admin/poll/polls/subnav" %> <%= render "search_booths" %>

    <%= t("admin.poll_booth_assignments.index.booths_title") %>

    + <%= link_to t("admin.booth_assignments.manage_assignments"), + manage_admin_poll_booth_assignments_path(@poll), + class: "button hollow float-right" %> + <% if @booth_assignments.empty? %>
    <%= t("admin.poll_booth_assignments.index.no_booths") %> From 68b7528bab4f7a44967c01a1bae988d684050482 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 19 Oct 2017 21:31:36 +0200 Subject: [PATCH 600/765] Complete booth assigment partial with assign/unassign buttons and status --- .../_booth_assignment.html.erb | 37 ++++++++++++------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb b/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb index 06188df9c..5956b5342 100644 --- a/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb +++ b/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb @@ -1,17 +1,28 @@ - + + <%= link_to booth.name, admin_booth_path(booth) %> + +<% if booth_assignment.present? %> - <%= link_to booth.name, admin_booth_path(booth) %> - - - <%= t("admin.booth_assignments.status.assigned") %> - <%= t("admin.booth_assignments.status.unassigned") %> + <%= t("admin.booth_assignments.status.assigned") %> - <%= link_to t("admin.booth_assignments.manage.assign"), - new_admin_booth_shift_path(booth), - class: "button" %> - <%= link_to t("admin.booth_assignments.manage.unassign"), - new_admin_booth_shift_path(booth), - class: "button hollow" %> + <%= link_to t("admin.booth_assignments.manage.actions.unassign"), + admin_poll_booth_assignment_path(@poll, booth_assignment, booth_id: booth.id), + method: :delete, + remote: true, + title: t("admin.booth_assignments.manage.actions.unassign"), + class: "button hollow alert" %> - +<% else %> + + <%= t("admin.booth_assignments.status.unassigned") %> + + + <%= link_to t("admin.booth_assignments.manage.actions.assign"), + admin_poll_booth_assignments_path(@poll, booth_id: booth.id), + method: :post, + remote: true, + title: t("admin.booth_assignments.manage.actions.assign"), + class: "button" %> + +<% end %> From ce25780f70f122bd52796b6ce12c5c4decea5b36 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 19 Oct 2017 21:32:09 +0200 Subject: [PATCH 601/765] Use booth assigment partial correctly --- app/views/admin/poll/booth_assignments/manage.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/admin/poll/booth_assignments/manage.html.erb b/app/views/admin/poll/booth_assignments/manage.html.erb index c76485cc9..fab5b8487 100644 --- a/app/views/admin/poll/booth_assignments/manage.html.erb +++ b/app/views/admin/poll/booth_assignments/manage.html.erb @@ -18,7 +18,9 @@ <% @booths.each do |booth| %> - <%= render partial: "booth_assignment", locals: { booth: booth } %> + + <%= render partial: "booth_assignment", locals: { booth: booth, booth_assignment: booth.assignment_on_poll(@poll) } %> + <% end %> From 085e6ecba4c6d19856c2168067cb746cd6dc9718 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 19 Oct 2017 21:32:37 +0200 Subject: [PATCH 602/765] Complete booth assigment create/destroy methods to work with ajax --- .../admin/poll/booth_assignments_controller.rb | 16 ++++++++++++---- .../admin/poll/booth_assignments/create.js.erb | 1 + .../admin/poll/booth_assignments/destroy.js.erb | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 app/views/admin/poll/booth_assignments/create.js.erb create mode 100644 app/views/admin/poll/booth_assignments/destroy.js.erb diff --git a/app/controllers/admin/poll/booth_assignments_controller.rb b/app/controllers/admin/poll/booth_assignments_controller.rb index ab3f52d11..5b9ea9d7b 100644 --- a/app/controllers/admin/poll/booth_assignments_controller.rb +++ b/app/controllers/admin/poll/booth_assignments_controller.rb @@ -23,18 +23,24 @@ class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController end def create - @booth_assignment = ::Poll::BoothAssignment.new(poll_id: booth_assignment_params[:poll_id], - booth_id: booth_assignment_params[:booth_id]) + @poll = Poll.find(booth_assignment_params[:poll_id]) + @booth = Poll::Booth.find(booth_assignment_params[:booth_id]) + @booth_assignment = ::Poll::BoothAssignment.new(poll: @poll, + booth: @booth) if @booth_assignment.save notice = t("admin.poll_booth_assignments.flash.create") else notice = t("admin.poll_booth_assignments.flash.error_create") end - redirect_to admin_poll_booth_assignments_path(@booth_assignment.poll_id), notice: notice + respond_to do |format| + format.js { render layout: false } + end end def destroy + @poll = Poll.find(booth_assignment_params[:poll_id]) + @booth = Poll::Booth.find(booth_assignment_params[:booth_id]) @booth_assignment = ::Poll::BoothAssignment.find(params[:id]) if @booth_assignment.destroy @@ -42,7 +48,9 @@ class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController else notice = t("admin.poll_booth_assignments.flash.error_destroy") end - redirect_to admin_poll_booth_assignments_path(@booth_assignment.poll_id), notice: notice + respond_to do |format| + format.js { render layout: false } + end end def manage diff --git a/app/views/admin/poll/booth_assignments/create.js.erb b/app/views/admin/poll/booth_assignments/create.js.erb new file mode 100644 index 000000000..8b278f7b3 --- /dev/null +++ b/app/views/admin/poll/booth_assignments/create.js.erb @@ -0,0 +1 @@ +$("#<%= dom_id(@booth) %>").html('<%= j render("booth_assignment", booth: @booth, booth_assignment: @booth.assignment_on_poll(@poll)) %>'); diff --git a/app/views/admin/poll/booth_assignments/destroy.js.erb b/app/views/admin/poll/booth_assignments/destroy.js.erb new file mode 100644 index 000000000..8b278f7b3 --- /dev/null +++ b/app/views/admin/poll/booth_assignments/destroy.js.erb @@ -0,0 +1 @@ +$("#<%= dom_id(@booth) %>").html('<%= j render("booth_assignment", booth: @booth, booth_assignment: @booth.assignment_on_poll(@poll)) %>'); From 9b70b90e6a0d5dd295429c480ae6aa12b1367a26 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 19 Oct 2017 22:05:02 +0200 Subject: [PATCH 603/765] Fix texts for booth assignment management --- .../admin/poll/booth_assignments/_booth_assignment.html.erb | 4 ++-- app/views/admin/poll/booth_assignments/manage.html.erb | 2 +- config/locales/en/admin.yml | 1 - config/locales/es/admin.yml | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb b/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb index 5956b5342..7865b201e 100644 --- a/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb +++ b/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb @@ -3,7 +3,7 @@ <% if booth_assignment.present? %> - <%= t("admin.booth_assignments.status.assigned") %> + <%= t("admin.booth_assignments.manage.status.assigned") %> <%= link_to t("admin.booth_assignments.manage.actions.unassign"), @@ -15,7 +15,7 @@ <% else %> - <%= t("admin.booth_assignments.status.unassigned") %> + <%= t("admin.booth_assignments.manage.status.unassigned") %> <%= link_to t("admin.booth_assignments.manage.actions.assign"), diff --git a/app/views/admin/poll/booth_assignments/manage.html.erb b/app/views/admin/poll/booth_assignments/manage.html.erb index fab5b8487..f55e85c74 100644 --- a/app/views/admin/poll/booth_assignments/manage.html.erb +++ b/app/views/admin/poll/booth_assignments/manage.html.erb @@ -13,7 +13,7 @@ - + diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index d991ad85f..3826e9764 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -559,7 +559,6 @@ en: no_booths: "There are no booths assigned to this poll." table_name: "Name" table_location: "Location" - add_booth: "Assign booth" polls: index: title: "List of polls" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 1ac21c633..9bc97c35f 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -559,7 +559,6 @@ es: no_booths: "No hay urnas asignadas a esta votación." table_name: "Nombre" table_location: "Ubicación" - add_booth: "Asignar urna" polls: index: title: "Listado de votaciones" From 17e6a66b80a9e8573c5e82dc031d0d3b8ab7bffe Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 19 Oct 2017 22:33:00 +0200 Subject: [PATCH 604/765] Refactor booth assigment management feature specs to test new assign/unassign feature --- .../admin/poll/booth_assigments_spec.rb | 139 ++++++++++++------ 1 file changed, 91 insertions(+), 48 deletions(-) diff --git a/spec/features/admin/poll/booth_assigments_spec.rb b/spec/features/admin/poll/booth_assigments_spec.rb index 5813e2dac..cceec1a3e 100644 --- a/spec/features/admin/poll/booth_assigments_spec.rb +++ b/spec/features/admin/poll/booth_assigments_spec.rb @@ -7,66 +7,109 @@ feature 'Admin booths assignments' do login_as(admin.user) end - scenario 'Assign booth to poll', :js do - poll = create(:poll) - booth = create(:poll_booth) + feature 'Admin Booth Assignment management' do - visit admin_poll_path(poll) - within('#poll-resources') do - click_link 'Booths (0)' + let!(:poll) { create(:poll) } + let!(:booth) { create(:poll_booth) } + + scenario 'List Polls and Booths to manage', :js do + second_poll = create(:poll) + second_booth = create(:poll_booth) + + visit booth_assignments_admin_polls_path + + expect(page).to have_content(poll.name) + expect(page).to have_content(second_poll.name) + + within("#poll_#{second_poll.id}") do + click_link 'Manage assignments' + end + + expect(page).to have_content "Assignments for poll '#{second_poll.name}'" + + expect(page).to have_content(booth.name) + expect(page).to have_content(second_booth.name) end - expect(page).to have_content 'There are no booths assigned to this poll.' + scenario 'Assign booth to poll', :js do + visit admin_poll_path(poll) + within('#poll-resources') do + click_link 'Booths (0)' + end - fill_in 'search-booths', with: booth.name - click_button 'Search' - expect(page).to have_content(booth.name) + expect(page).to have_content 'There are no booths assigned to this poll.' + expect(page).to_not have_content booth.name - within('#search-booths-results') do - click_link 'Assign booth' + fill_in 'search-booths', with: booth.name + click_button 'Search' + expect(page).to have_content(booth.name) + + visit manage_admin_poll_booth_assignments_path(poll) + + expect(page).to have_content "Assignments for poll '#{poll.name}'" + + within("#poll_booth_#{booth.id}") do + expect(page).to have_content(booth.name) + expect(page).to have_content "Unassigned" + + click_link 'Assign booth' + + expect(page).not_to have_content "Unassigned" + expect(page).to have_content "Assigned" + expect(page).to have_link "Unassign booth" + end + + visit admin_poll_path(poll) + within('#poll-resources') do + click_link 'Booths (1)' + end + + expect(page).to_not have_content 'There are no booths assigned to this poll.' + expect(page).to have_content booth.name end - expect(page).to have_content 'Booth assigned' + scenario 'Unassign booth from poll', :js do + assignment = create(:poll_booth_assignment, poll: poll, booth: booth) - visit admin_poll_path(poll) - within('#poll-resources') do - click_link 'Booths (1)' + visit admin_poll_path(poll) + within('#poll-resources') do + click_link 'Booths (1)' + end + + expect(page).not_to have_content 'There are no booths assigned to this poll.' + expect(page).to have_content booth.name + + fill_in 'search-booths', with: booth.name + click_button 'Search' + expect(page).to have_content(booth.name) + + visit manage_admin_poll_booth_assignments_path(poll) + + expect(page).to have_content "Assignments for poll '#{poll.name}'" + + within("#poll_booth_#{booth.id}") do + expect(page).to have_content(booth.name) + expect(page).to have_content "Assigned" + + click_link 'Unassign booth' + + expect(page).to have_content "Unassigned" + expect(page).not_to have_content "Assigned" + expect(page).to have_link "Assign booth" + end + + visit admin_poll_path(poll) + within('#poll-resources') do + click_link 'Booths (0)' + end + + expect(page).to have_content 'There are no booths assigned to this poll.' + expect(page).not_to have_content booth.name end - - expect(page).to_not have_content 'There are no booths assigned to this poll.' - expect(page).to have_content booth.name - end - - scenario 'Remove booth from poll', :js do - poll = create(:poll) - booth = create(:poll_booth) - assignment = create(:poll_booth_assignment, poll: poll, booth: booth) - - visit admin_poll_path(poll) - within('#poll-resources') do - click_link 'Booths (1)' - end - - expect(page).to_not have_content 'There are no booths assigned to this poll.' - expect(page).to have_content booth.name - - within("#poll_booth_assignment_#{assignment.id}") do - click_link 'Remove booth from poll' - end - - expect(page).to have_content 'Booth not assigned anymore' - - visit admin_poll_path(poll) - within('#poll-resources') do - click_link 'Booths (0)' - end - - expect(page).to have_content 'There are no booths assigned to this poll.' - expect(page).to_not have_content booth.name end feature 'Show' do - scenario 'Lists all assigned poll oficers' do + scenario 'Lists all assigned poll officers' do poll = create(:poll) booth = create(:poll_booth) booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth) From c333522b47f6c9901963ed0b73cd86d125b1176e Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 20 Oct 2017 10:40:07 +0200 Subject: [PATCH 605/765] improves styles for admin activity views --- app/helpers/admin_helper.rb | 2 +- app/views/admin/_menu.html.erb | 2 +- app/views/admin/activity/show.html.erb | 87 +++++++++++++++----------- config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 3 +- 5 files changed, 55 insertions(+), 40 deletions(-) diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index e508cf813..37a186ff1 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -29,7 +29,7 @@ module AdminHelper end def menu_profiles? - ["administrators", "organizations", "officials", "moderators", "valuators", "managers", "users"].include? controller_name + ["administrators", "organizations", "officials", "moderators", "valuators", "managers", "users", "activity"].include? controller_name end def menu_banners? diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index f2af2c116..b573f6b41 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -115,7 +115,7 @@ <%= link_to t("admin.menu.officials"), admin_officials_path %> -
  • > +
  • > <%= link_to t('admin.menu.moderators'), admin_moderators_path%>
    • diff --git a/app/views/admin/activity/show.html.erb b/app/views/admin/activity/show.html.erb index 92ff3e26a..dd4cee125 100644 --- a/app/views/admin/activity/show.html.erb +++ b/app/views/admin/activity/show.html.erb @@ -1,43 +1,56 @@ +<%= back_link_to admin_moderators_path %> +

    <%= t("admin.activity.show.title") %>

    <%= render 'shared/filter_subnav', i18n_namespace: "admin.activity.show" %> -

    <%= page_entries_info @activity %>

    +<% if @activity.any? %> +

    <%= page_entries_info @activity %>

    -
    <%= t("admin.booths.index.name") %><%= t("admin.booth_assignments.status.assign_status") %><%= t("admin.booth_assignments.manage.status.assign_status") %> <%= t("admin.actions.actions") %>
    - - - - - - - <% @activity.each do |activity| %> - - - - - - - <% end %> -
    <%= t("admin.activity.show.type") %><%= t("admin.activity.show.action") %><%= t("admin.activity.show.content") %><%= t("admin.activity.show.by") %>
    - <%= activity.actionable_type.constantize.model_name.human %>
    - <%= l activity.actionable.created_at.to_date %> -     		- <%= t("admin.activity.show.actions.#{activity.action}") %>
    - <%= l activity.created_at.to_date %> -     		- <% case activity.actionable_type %> - <% when "User" %> - <%= activity.actionable.username %> (<%= activity.actionable.email %>) - <% when "Comment" %> - <%= activity.actionable.body %> - <% else %> - <%= activity.actionable.title %> -
    -
    - <%= activity.actionable.description %> -
    - <% end %> -     		<%= activity.user.name %> (<%= activity.user.email %>)
    + + + + + + + + + + + <% @activity.each do |activity| %> + + + + + + <% end %> + +
    <%= t("admin.activity.show.type") %><%= t("admin.activity.show.action") %><%= t("admin.activity.show.content") %><%= t("admin.activity.show.by") %>
    + <%= activity.actionable_type.constantize.model_name.human %>
    + <%= l activity.actionable.created_at.to_date %> +     		+ <%= t("admin.activity.show.actions.#{activity.action}") %>
    + <%= l activity.created_at.to_date %> +     		+ <% case activity.actionable_type %> + <% when "User" %> + <%= activity.actionable.username %> (<%= activity.actionable.email %>) + <% when "Comment" %> + <%= activity.actionable.body %> + <% else %> + <%= activity.actionable.title %> +
    +
    + <%= activity.actionable.description %> +
    + <% end %> +     		+ <%= activity.user.name %> (<%= activity.user.email %>) +
    -<%= paginate @activity %> + <%= paginate @activity %> +<% else %> +
    + <%= t("admin.activity.show.no_activity") %> +
    +<% end %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index ff1d83cd9..d92dcbf05 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -62,6 +62,7 @@ en: on_users: Users title: Moderator activity type: Type + no_activity: There ares no moderators activity. budgets: index: title: Participatory budgets diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index af3ef5830..0fe04d2be 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -60,8 +60,9 @@ es: on_debates: Debates on_proposals: Propuestas on_users: Usuarios - title: Actividad de los Moderadores + title: Actividad de Moderadores type: Tipo + no_activity: No hay actividad de moderadores. budgets: index: title: Presupuestos participativos From 53046dfd4a359efeb43849487bca59f1c6974682 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 20 Oct 2017 11:52:03 +0200 Subject: [PATCH 606/765] improves styles for admin valuators views --- app/views/admin/valuators/_valuator.html.erb | 34 ++++++---- app/views/admin/valuators/index.html.erb | 65 ++++++++++++------- .../admin/valuators/user_not_found.js.erb | 2 +- config/locales/en/admin.yml | 5 ++ config/locales/es/admin.yml | 5 ++ 5 files changed, 71 insertions(+), 40 deletions(-) diff --git a/app/views/admin/valuators/_valuator.html.erb b/app/views/admin/valuators/_valuator.html.erb index e5971391b..e4495ba3b 100644 --- a/app/views/admin/valuators/_valuator.html.erb +++ b/app/views/admin/valuators/_valuator.html.erb @@ -1,7 +1,11 @@ -
    -

    <%= t('admin.valuators.valuator.user_found') %>

    +

    <%= t('admin.valuators.valuator.user_found') %>

    - +
    + + + + + -
    <%= t("admin.valuators.index.name") %><%= t("admin.valuators.index.email") %>
    <%= valuator.name %> @@ -10,19 +14,21 @@ <%= valuator.email %>
    + + - <% unless @valuator.persisted? %> - <%= form_for @valuator, url: admin_valuators_path do |f| %> -
    -
    - <%= f.text_field :description, label: false, placeholder: t('admin.valuators.valuator.description_placeholder') %> +<% unless @valuator.persisted? %> + <%= form_for @valuator, url: admin_valuators_path do |f| %> +
    +
    + <%= f.text_field :description, label: false, placeholder: t('admin.valuators.valuator.description_placeholder') %> + +
    <%= f.hidden_field :user_id %> -
    -
    - <%= f.submit t('admin.valuators.valuator.add'), class: "button success float-left" %> + <%= f.submit t('admin.valuators.valuator.add'), class: "button success" %>
    - <% end %> +
    +
    <% end %> -
    +<% end %> diff --git a/app/views/admin/valuators/index.html.erb b/app/views/admin/valuators/index.html.erb index 30132e66f..ca30006c8 100644 --- a/app/views/admin/valuators/index.html.erb +++ b/app/views/admin/valuators/index.html.erb @@ -1,36 +1,51 @@

    <%= t("admin.valuators.index.title") %>

    -
    +
    <%= form_tag search_admin_valuators_path, method: :get, remote: true do %> -
    +
    <%= text_field_tag :email, '', placeholder: t('admin.valuators.search.email_placeholder') %> -
    -
    - <%= submit_tag t('admin.valuators.search.search'), class: 'button radius' %> +
    + <%= submit_tag t('admin.valuators.search.search'), class: 'button' %> +
    <% end %>
    -
    +
    -

    <%= page_entries_info @valuators %>

    +<% if @valuators.any? %> +

    <%= page_entries_info @valuators %>

    - - <% @valuators.each do |valuator| %> - - - - - - <% end %> -
    - <%= valuator.name %> - - <%= valuator.email %> - - <% if valuator.description.present? %> - <%= valuator.description %> - <% end %> -
    + + + + + + + + <% @valuators.each do |valuator| %> + + + + + + <% end %> + +
    <%= t("admin.valuators.index.name") %><%= t("admin.valuators.index.email") %><%= t("admin.valuators.index.description") %>
    + <%= valuator.name %> + + <%= valuator.email %> + + <% if valuator.description.present? %> + <%= valuator.description %> + <% else %> + <%= t("admin.valuators.index.no_description") %> + <% end %> +
    -<%= paginate @valuators %> + <%= paginate @valuators %> +<% else %> +
    + <%= t("admin.valuators.index.no_valuators") %> +
    +<% end %> diff --git a/app/views/admin/valuators/user_not_found.js.erb b/app/views/admin/valuators/user_not_found.js.erb index af3f83a3f..11b549382 100644 --- a/app/views/admin/valuators/user_not_found.js.erb +++ b/app/views/admin/valuators/user_not_found.js.erb @@ -1 +1 @@ -$("#search-result").html("
    <%= j t('admin.valuators.search.user_not_found') %>
    "); +$("#search-result").html("
    <%= j t('admin.valuators.search.user_not_found') %>
    "); diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index d92dcbf05..fc79e93e5 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -464,6 +464,11 @@ en: valuators: index: title: Valuators + name: Name + email: Email + description: Description + no_description: No description + no_valuators: There are no valuators. valuator: description_placeholder: 'Description (optional)' user_found: User found diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 0fe04d2be..74ba800bb 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -464,6 +464,11 @@ es: valuators: index: title: Evaluadores + name: Nombre + email: Email + description: Descripción + no_description: Sin descripción + no_valuators: No hay evaluadores. valuator: description_placeholder: "Descripción (opcional)" user_found: Usuario encontrado From 870ce7bfe245f68f9dfcf435130b51a6433fe565 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 20 Oct 2017 11:52:24 +0200 Subject: [PATCH 607/765] improves styles for admin managers views --- app/views/admin/managers/_manager.html.erb | 51 ++++++------ app/views/admin/managers/index.html.erb | 77 +++++++++++-------- .../admin/managers/user_not_found.js.erb | 2 +- config/locales/en/admin.yml | 3 + config/locales/es/admin.yml | 3 + 5 files changed, 79 insertions(+), 57 deletions(-) diff --git a/app/views/admin/managers/_manager.html.erb b/app/views/admin/managers/_manager.html.erb index 3e709eb60..e2a59ea75 100644 --- a/app/views/admin/managers/_manager.html.erb +++ b/app/views/admin/managers/_manager.html.erb @@ -1,24 +1,27 @@ -
    - - - - - - -
    - <%= manager.name %> - - <%= manager.email %> - - <% if manager.persisted? %> - <%= link_to t('admin.managers.manager.delete'), - admin_manager_path(manager), - method: :delete, - class: "button hollow alert" - %> - <% else %> - <%= link_to t('admin.managers.manager.add'),{ controller: "admin/managers", action: :create, user_id: manager.user_id }, - method: :post, class: "button success" %> - <% end %> -
    -
    + + + + + + + + + + + +
    <%= t("admin.managers.index.name") %><%= t("admin.managers.index.email") %><%= t("admin.shared.actions") %>
    + <%= manager.name %> + + <%= manager.email %> + + <% if manager.persisted? %> + <%= link_to t('admin.managers.manager.delete'), + admin_manager_path(manager), + method: :delete, + class: "button hollow alert expanded" + %> + <% else %> + <%= link_to t('admin.managers.manager.add'),{ controller: "admin/managers", action: :create, user_id: manager.user_id }, + method: :post, class: "button success expanded" %> + <% end %> +
    diff --git a/app/views/admin/managers/index.html.erb b/app/views/admin/managers/index.html.erb index d479ba303..0eded59b3 100644 --- a/app/views/admin/managers/index.html.erb +++ b/app/views/admin/managers/index.html.erb @@ -1,43 +1,56 @@

    <%= t("admin.managers.index.title") %>

    -
    +
    <%= form_tag search_admin_managers_path, method: :get, remote: true do %> -
    +
    <%= text_field_tag :email, '', placeholder: t('admin.managers.search.email_placeholder') %> -
    -
    - <%= submit_tag t('admin.managers.search.search'), class: 'button' %> +
    + <%= submit_tag t('admin.managers.search.search'), class: 'button' %> +
    <% end %>
    -
    +
    -

    <%= page_entries_info @managers %>

    +<% if @managers.any? %> +

    <%= page_entries_info @managers %>

    - - <% @managers.each do |manager| %> - - - - - - <% end %> -
    - <%= manager.name %> - - <%= manager.email %> - - <% if manager.persisted? %> - <%= link_to t('admin.managers.manager.delete'), - admin_manager_path(manager), - method: :delete, - class: "button hollow alert" - %> - <% else %> - <%= link_to t('admin.managers.manager.add'),{ controller: "admin/managers", action: :create, user_id: manager.user_id }, - method: :post, class: "button success" %> - <% end %> -
    + + + + + + + + <% @managers.each do |manager| %> + + + + + + <% end %> + +
    <%= t("admin.managers.index.name") %><%= t("admin.managers.index.email") %><%= t("admin.shared.actions") %>
    + <%= manager.name %> + + <%= manager.email %> + + <% if manager.persisted? %> + <%= link_to t('admin.managers.manager.delete'), + admin_manager_path(manager), + method: :delete, + class: "button hollow alert expanded" + %> + <% else %> + <%= link_to t('admin.managers.manager.add'),{ controller: "admin/managers", action: :create, user_id: manager.user_id }, + method: :post, class: "button success expanded" %> + <% end %> +
    -<%= paginate @managers %> + <%= paginate @managers %> +<% else %> +
    + <%= t("admin.managers.index.no_managers") %> +
    +<% end %> \ No newline at end of file diff --git a/app/views/admin/managers/user_not_found.js.erb b/app/views/admin/managers/user_not_found.js.erb index 53e9d7e20..c0771b03b 100644 --- a/app/views/admin/managers/user_not_found.js.erb +++ b/app/views/admin/managers/user_not_found.js.erb @@ -1 +1 @@ -$("#search-result").html("
    <%= j t('admin.managers.search.user_not_found') %>
    "); +$("#search-result").html("
    <%= j t('admin.managers.search.user_not_found') %>
    "); diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index fc79e93e5..d3360f0a9 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -383,6 +383,9 @@ en: managers: index: title: Managers + name: Name + email: Email + no_managers: There are no managers. manager: add: Add delete: Delete diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 74ba800bb..ddaac5dd0 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -397,6 +397,9 @@ es: managers: index: title: Gestores + name: Nombre + email: Email + no_managers: No hay gestores. manager: add: Añadir como Gestor delete: Borrar From ef91fc7941cd129391c7c35ebcf2162009b940b1 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 20 Oct 2017 12:29:24 +0200 Subject: [PATCH 608/765] improves styles for admin users views --- app/views/admin/users/_users.html.erb | 40 ++++++++++++++++----------- app/views/admin/users/index.html.erb | 13 +++++---- config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 1 + 4 files changed, 33 insertions(+), 22 deletions(-) diff --git a/app/views/admin/users/_users.html.erb b/app/views/admin/users/_users.html.erb index f3c6af0fa..2c4c4db2e 100644 --- a/app/views/admin/users/_users.html.erb +++ b/app/views/admin/users/_users.html.erb @@ -1,24 +1,32 @@ -

    <%= page_entries_info @users %>

    +<% if @users.any? %> +

    <%= page_entries_info @users %>

    - - - - - + + + + + - <% @users.each do |user| %> - - - - - - - - <% end %> + + <% @users.each do |user| %> + + + + + + + + <% end %> +
    <%= t('admin.users.columns.name') %><%= t('admin.users.columns.email') %><%= t('admin.users.columns.document_number') %><%= t('admin.users.columns.roles') %><%= t('admin.users.columns.verification_level') %><%= t("admin.users.columns.name") %><%= t("admin.users.columns.email") %><%= t("admin.users.columns.document_number") %><%= t("admin.users.columns.roles") %><%= t("admin.users.columns.verification_level") %>
    <%= user.name %><%= user.email %><%= user.document_number %><%= display_user_roles(user) %><%= user.user_type %>
    <%= user.name %><%= user.email %><%= user.document_number %><%= display_user_roles(user) %><%= user.user_type %>
    -<%= paginate @users %> + <%= paginate @users %> +<% else %> +
    + <%= t("admin.users.index.no_users") %> +
    +<% end %> diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb index 2713399ed..ceee64394 100644 --- a/app/views/admin/users/index.html.erb +++ b/app/views/admin/users/index.html.erb @@ -1,16 +1,17 @@

    <%= t("admin.users.index.title") %>

    -
    +
    <%= form_tag admin_users_path, method: :get, remote: true do %> -
    +
    <%= text_field_tag :search, '', placeholder: t('admin.users.search.placeholder') %> -
    -
    - <%= submit_tag t('admin.users.search.search'), class: 'button' %> +
    + <%= submit_tag t('admin.users.search.search'), class: 'button' %> +
    <% end %>
    -
    + +
    <%= render "users" %>
    diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index d3360f0a9..f01129868 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -961,6 +961,7 @@ en: verification_level: Verification level index: title: User + no_users: There are no users. search: placeholder: Search user by email, name or document number search: Search diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index ddaac5dd0..5a25e5ee5 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -963,6 +963,7 @@ es: verification_level: Nivel de verficación index: title: Usuarios + no_users: No hay usuarios. search: placeholder: Buscar usuario por email, nombre o DNI search: Buscar From 90067814e456f1a55028115702df96d304bf95cc Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 20 Oct 2017 13:59:58 +0200 Subject: [PATCH 609/765] moves table ids to fixes specs --- app/views/admin/managers/index.html.erb | 80 ++++++------- app/views/admin/moderators/index.html.erb | 86 +++++++------- app/views/admin/organizations/search.html.erb | 106 +++++++++--------- 3 files changed, 139 insertions(+), 133 deletions(-) diff --git a/app/views/admin/managers/index.html.erb b/app/views/admin/managers/index.html.erb index 0eded59b3..a31998323 100644 --- a/app/views/admin/managers/index.html.erb +++ b/app/views/admin/managers/index.html.erb @@ -13,44 +13,46 @@
    -<% if @managers.any? %> -

    <%= page_entries_info @managers %>

    +
    + <% if @managers.any? %> +

    <%= page_entries_info @managers %>

    - - - - - - - - <% @managers.each do |manager| %> - - - - - - <% end %> - -
    <%= t("admin.managers.index.name") %><%= t("admin.managers.index.email") %><%= t("admin.shared.actions") %>
    - <%= manager.name %> - - <%= manager.email %> - - <% if manager.persisted? %> - <%= link_to t('admin.managers.manager.delete'), - admin_manager_path(manager), - method: :delete, - class: "button hollow alert expanded" - %> - <% else %> - <%= link_to t('admin.managers.manager.add'),{ controller: "admin/managers", action: :create, user_id: manager.user_id }, - method: :post, class: "button success expanded" %> - <% end %> -
    + + + + + + + + <% @managers.each do |manager| %> + + + + + + <% end %> + +
    <%= t("admin.managers.index.name") %><%= t("admin.managers.index.email") %><%= t("admin.shared.actions") %>
    + <%= manager.name %> + + <%= manager.email %> + + <% if manager.persisted? %> + <%= link_to t('admin.managers.manager.delete'), + admin_manager_path(manager), + method: :delete, + class: "button hollow alert expanded" + %> + <% else %> + <%= link_to t('admin.managers.manager.add'),{ controller: "admin/managers", action: :create, user_id: manager.user_id }, + method: :post, class: "button success expanded" %> + <% end %> +
    - <%= paginate @managers %> -<% else %> -
    - <%= t("admin.managers.index.no_managers") %> -
    -<% end %> \ No newline at end of file + <%= paginate @managers %> + <% else %> +
    + <%= t("admin.managers.index.no_managers") %> +
    + <% end %> +
    diff --git a/app/views/admin/moderators/index.html.erb b/app/views/admin/moderators/index.html.erb index d6a9b50bb..061180970 100644 --- a/app/views/admin/moderators/index.html.erb +++ b/app/views/admin/moderators/index.html.erb @@ -15,48 +15,50 @@
    -<% if @moderators.any? %> +
    + <% if @moderators.any? %> -

    <%= page_entries_info @moderators %>

    +

    <%= page_entries_info @moderators %>

    - - - - - - - - <% @moderators.each do |moderator| %> - - - - - - <% end %> - -
    <%= t("admin.moderators.index.name") %><%= t("admin.moderators.index.email") %><%= t("admin.shared.actions") %>
    - <%= moderator.name %> - - <%= moderator.email %> - - <% if moderator.persisted? %> - <%= link_to t('admin.moderators.moderator.delete'), - admin_moderator_path(moderator), - method: :delete, - class: "button hollow alert expanded" - %> - <% else %> - <%= link_to t('admin.moderators.moderator.add'), - { controller: "admin/moderators", action: :create, - user_id: moderator.user_id }, - method: :post, - class: "button success expanded" %> - <% end %> -
    + + + + + + + + <% @moderators.each do |moderator| %> + + + + + + <% end %> + +
    <%= t("admin.moderators.index.name") %><%= t("admin.moderators.index.email") %><%= t("admin.shared.actions") %>
    + <%= moderator.name %> + + <%= moderator.email %> + + <% if moderator.persisted? %> + <%= link_to t('admin.moderators.moderator.delete'), + admin_moderator_path(moderator), + method: :delete, + class: "button hollow alert expanded" + %> + <% else %> + <%= link_to t('admin.moderators.moderator.add'), + { controller: "admin/moderators", action: :create, + user_id: moderator.user_id }, + method: :post, + class: "button success expanded" %> + <% end %> +
    - <%= paginate @moderators %> -<% else %> -
    - <%= t("admin.moderators.index.no_moderators") %> -
    -<% end %> + <%= paginate @moderators %> + <% else %> +
    + <%= t("admin.moderators.index.no_moderators") %> +
    + <% end %> +
    diff --git a/app/views/admin/organizations/search.html.erb b/app/views/admin/organizations/search.html.erb index 01b5420bd..e3d0564cf 100644 --- a/app/views/admin/organizations/search.html.erb +++ b/app/views/admin/organizations/search.html.erb @@ -11,58 +11,60 @@ <% end %>
    -<% if @organizations.any? %> -

    <%= page_entries_info @organizations %>

    +
    + <% if @organizations.any? %> +

    <%= page_entries_info @organizations %>

    - - - - - - - - - - - <% @organizations.each do |organization| %> - - - - - - - + + <% end %> + +
    <%= t("admin.organizations.index.name") %><%= t("admin.organizations.index.email") %><%= t("admin.organizations.index.phone_number") %><%= t("admin.organizations.index.responsible_name") %><%= t("admin.organizations.index.status") %><%= t("admin.shared.actions") %>
    <%= organization.name %><%= organization.email %><%= organization.phone_number %><%= organization.responsible_name %> - <% if organization.verified? %> - - <%= t("admin.organizations.index.verified") %> - <% elsif organization.rejected? %> - - <%= t("admin.organizations.index.rejected") %> - <% else %> - - <%= t("admin.organizations.index.pending") %> - <% end %> - - <% if can? :verify, organization %> - <%= link_to t("admin.organizations.index.verify"), - verify_admin_organization_path(organization, request.query_parameters), - method: :put, class: "button success small-5" %> - <% end %> + + + + + + + + + + + <% @organizations.each do |organization| %> + + + + + + + - - <% end %> - -
    <%= t("admin.organizations.index.name") %><%= t("admin.organizations.index.email") %><%= t("admin.organizations.index.phone_number") %><%= t("admin.organizations.index.responsible_name") %><%= t("admin.organizations.index.status") %><%= t("admin.shared.actions") %>
    <%= organization.name %><%= organization.email %><%= organization.phone_number %><%= organization.responsible_name %> + <% if organization.verified? %> + + <%= t("admin.organizations.index.verified") %> + <% elsif organization.rejected? %> + + <%= t("admin.organizations.index.rejected") %> + <% else %> + + <%= t("admin.organizations.index.pending") %> + <% end %> + + <% if can? :verify, organization %> + <%= link_to t("admin.organizations.index.verify"), + verify_admin_organization_path(organization, request.query_parameters), + method: :put, class: "button success small-5" %> + <% end %> - <% if can? :reject, organization %> - <%= link_to t("admin.organizations.index.reject"), - reject_admin_organization_path(organization, request.query_parameters), - method: :put, class: "button hollow alert small-5" %> - <% end %> -
    + <% if can? :reject, organization %> + <%= link_to t("admin.organizations.index.reject"), + reject_admin_organization_path(organization, request.query_parameters), + method: :put, class: "button hollow alert small-5" %> + <% end %> +
    - <%= paginate @organizations %> -<% else %> -
    - <%= t("admin.organizations.search.no_results") %> -
    -<% end %> + <%= paginate @organizations %> + <% else %> +
    + <%= t("admin.organizations.search.no_results") %> +
    + <% end %> +
    From 9de9a81b8cd641880fdaa03c0fc2940e7f57ebf5 Mon Sep 17 00:00:00 2001 From: Manuel Ortega Date: Fri, 20 Oct 2017 14:12:31 +0200 Subject: [PATCH 610/765] Added reference to event on the .on method('ajax:success',... --- app/assets/javascripts/prevent_double_submission.js.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/prevent_double_submission.js.coffee b/app/assets/javascripts/prevent_double_submission.js.coffee index abb8f8314..56a099730 100644 --- a/app/assets/javascripts/prevent_double_submission.js.coffee +++ b/app/assets/javascripts/prevent_double_submission.js.coffee @@ -25,7 +25,7 @@ App.PreventDoubleSubmission = unless event.target.id == "new_officing_voter" buttons = $(this).find(':button, :submit') App.PreventDoubleSubmission.disable_buttons(buttons) - ).on('ajax:success', -> + ).on('ajax:success', (event) -> unless event.target.id == "new_officing_voter" buttons = $(this).find(':button, :submit') App.PreventDoubleSubmission.reset_buttons(buttons) From b7b0651ccb2363189a288ab637b075b63cdf2e91 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 20 Oct 2017 16:00:03 +0200 Subject: [PATCH 611/765] adds missing i18n on activerecord --- config/locales/en/activerecord.yml | 6 ++++++ config/locales/es/activerecord.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 8ef98b4d1..20c497417 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -31,6 +31,12 @@ en: administrator: one: "Administrator" other: "Administrators" + valuator: + one: "Evaluador" + other: "Evaluadores" + manager: + one: "Manager" + other: "Managers" vote: one: "Vote" other: "Votes" diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index 03de3965d..a29157431 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -31,6 +31,12 @@ es: administrator: one: "Administrador" other: "Administradores" + valuator: + one: "Evaluador" + other: "Evaluadores" + manager: + one: "Gestor" + other: "Gestores" vote: one: "Voto" other: "Votos" From 9bbf0b1ef9a1edba7ca111d06709e4649a39f629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 20 Oct 2017 16:48:54 +0200 Subject: [PATCH 612/765] Improved `most_voted` method --- app/controllers/polls/questions_controller.rb | 4 ++++ app/models/poll/question/answer.rb | 17 ++++++++++------- app/views/polls/results.html.erb | 6 +++--- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/app/controllers/polls/questions_controller.rb b/app/controllers/polls/questions_controller.rb index 407e6d984..6345773f2 100644 --- a/app/controllers/polls/questions_controller.rb +++ b/app/controllers/polls/questions_controller.rb @@ -13,6 +13,10 @@ class Polls::QuestionsController < ApplicationController answer.touch if answer.persisted? answer.save! answer.record_voter_participation(token) + @question.question_answers + .where(question_id: @question, title: answer.answer) + .first + .set_most_voted @answers_by_question_id = { @question.id => params[:answer] } end diff --git a/app/models/poll/question/answer.rb b/app/models/poll/question/answer.rb index eff45a57a..8241aa78e 100644 --- a/app/models/poll/question/answer.rb +++ b/app/models/poll/question/answer.rb @@ -13,7 +13,6 @@ class Poll::Question::Answer < ActiveRecord::Base validates :given_order, presence: true, uniqueness: { scope: :question_id } before_validation :set_order, on: :create - before_save :most_voted def description super.try :html_safe @@ -37,15 +36,19 @@ class Poll::Question::Answer < ActiveRecord::Base Poll::Answer.where(question_id: question, answer: title).count end - def most_voted - answers = question.question_answers - .map { |a| Poll::Answer.where(question_id: a.question, answer: a.title).count } - most_voted = !answers.any?{ |a| a > total_votes } - - self.update_attributes(most_voted: most_voted) + def most_voted? + self.most_voted end def total_votes_percentage ((total_votes*100) / question.answers_total_votes).round(2) rescue 0 end + + def set_most_voted + answers = question.question_answers + .map { |a| Poll::Answer.where(question_id: a.question, answer: a.title).count } + is_most_voted = !answers.any?{ |a| a > self.total_votes } + + self.update(most_voted: is_most_voted) + end end diff --git a/app/views/polls/results.html.erb b/app/views/polls/results.html.erb index f0c9e4a38..c8e9cbfab 100644 --- a/app/views/polls/results.html.erb +++ b/app/views/polls/results.html.erb @@ -17,19 +17,19 @@
    <%- @poll.questions.each do |question| %> - +

    <%= question.title %>

    <%- question.question_answers.each do |answer| %> - + <% end %> <%- question.question_answers.each do |answer| %> - From bb06af3877240597acea5132b5918f8b23baca7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 20 Oct 2017 16:49:25 +0200 Subject: [PATCH 613/765] Improved results tests --- spec/features/polls/results_spec.rb | 35 +++++++++++++++++++++++++---- spec/features/polls/voter_spec.rb | 2 ++ spec/support/common_actions.rb | 2 -- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/spec/features/polls/results_spec.rb b/spec/features/polls/results_spec.rb index c67ad3869..b17fb463a 100644 --- a/spec/features/polls/results_spec.rb +++ b/spec/features/polls/results_spec.rb @@ -1,8 +1,10 @@ require 'rails_helper' feature 'Poll Results' do - scenario 'List each Poll question' do - user = create(:user, :level_two) + scenario 'List each Poll question', :js do + user1 = create(:user, :level_two) + user2 = create(:user, :level_two) + user3 = create(:user, :level_two) poll = create(:poll) question1 = create(:poll_question, poll: poll) @@ -14,13 +16,38 @@ feature 'Poll Results' do answer4 = create(:poll_question_answer, question: question2, title: 'Green') answer5 = create(:poll_question_answer, question: question2, title: 'Yellow') - login_as user + login_as user1 vote_for_poll_via_web(poll, question1, 'Yes') - vote_for_poll_via_web(poll, question1, 'Blue') + vote_for_poll_via_web(poll, question2, 'Blue') + expect(Poll::Voter.count).to eq(1) + logout + + login_as user2 + vote_for_poll_via_web(poll, question1, 'Yes') + vote_for_poll_via_web(poll, question2, 'Green') + expect(Poll::Voter.count).to eq(2) + logout + + login_as user3 + vote_for_poll_via_web(poll, question1, 'No') + vote_for_poll_via_web(poll, question2, 'Yellow') + expect(Poll::Voter.count).to eq(3) + logout visit poll_results_path(poll) expect(page).to have_content(question1.title) expect(page).to have_content(question2.title) + + within("#question_#{question1.id}_results_table") do + expect(find("#answer_#{answer1.id}_result")).to have_content("2 (66.0%)") + expect(find("#answer_#{answer2.id}_result")).to have_content("1 (33.0%)") + end + + within("#question_#{question2.id}_results_table") do + expect(find("#answer_#{answer3.id}_result")).to have_content("1 (33.0%)") + expect(find("#answer_#{answer4.id}_result")).to have_content("1 (33.0%)") + expect(find("#answer_#{answer5.id}_result")).to have_content("1 (33.0%)") + end end end diff --git a/spec/features/polls/voter_spec.rb b/spec/features/polls/voter_spec.rb index 7e451be17..aee0ff522 100644 --- a/spec/features/polls/voter_spec.rb +++ b/spec/features/polls/voter_spec.rb @@ -96,6 +96,7 @@ feature "Voter" do scenario "Trying to vote in web and then in booth", :js do login_as user vote_for_poll_via_web(poll, question, 'Yes') + expect(Poll::Voter.count).to eq(1) click_link "Sign out" @@ -128,6 +129,7 @@ feature "Voter" do scenario "Trying to vote in web again", :js do login_as user vote_for_poll_via_web(poll, question, 'Yes') + expect(Poll::Voter.count).to eq(1) visit poll_path(poll) diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index 90deab1b5..5023c1952 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -306,8 +306,6 @@ module CommonActions click_link "#{answer}" expect(page).to_not have_link("#{answer}") end - - expect(Poll::Voter.count).to eq(1) end def vote_for_poll_via_booth From dfa8f4590aebd51978d5da4879cb307b0f1f0551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 20 Oct 2017 16:57:41 +0200 Subject: [PATCH 614/765] Most voted fix --- app/controllers/polls/questions_controller.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/polls/questions_controller.rb b/app/controllers/polls/questions_controller.rb index 6345773f2..e1fc73805 100644 --- a/app/controllers/polls/questions_controller.rb +++ b/app/controllers/polls/questions_controller.rb @@ -13,10 +13,9 @@ class Polls::QuestionsController < ApplicationController answer.touch if answer.persisted? answer.save! answer.record_voter_participation(token) - @question.question_answers - .where(question_id: @question, title: answer.answer) - .first - .set_most_voted + @question.question_answers.where(question_id: @question).each do |answer| + answer.set_most_voted + end @answers_by_question_id = { @question.id => params[:answer] } end From 796fe333e30eb7523ef92584bf39b2fb347d5c90 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 20 Oct 2017 17:05:23 +0200 Subject: [PATCH 615/765] adds case when topic on notifications controller --- app/controllers/notifications_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb index 16a82de6a..7d833f6a1 100644 --- a/app/controllers/notifications_controller.rb +++ b/app/controllers/notifications_controller.rb @@ -29,6 +29,8 @@ class NotificationsController < ApplicationController case notification.linkable_resource.class.name when "Budget::Investment" budget_investment_path @notification.linkable_resource.budget, @notification.linkable_resource + when "Topic" + community_topic_path @notification.linkable_resource.community, @notification.linkable_resource else url_for @notification.linkable_resource end From 45133a917fb742a9d2eb43a5a10d60806c57648a Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 20 Oct 2017 17:07:44 +0200 Subject: [PATCH 616/765] adds topic notifications specs --- spec/features/notifications_spec.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/spec/features/notifications_spec.rb b/spec/features/notifications_spec.rb index 9925b0d56..75ed91857 100644 --- a/spec/features/notifications_spec.rb +++ b/spec/features/notifications_spec.rb @@ -14,6 +14,12 @@ feature "Notifications" do let(:legislation_question) { create(:legislation_question, process: process, author: administrator) } let(:legislation_annotation) { create(:legislation_annotation, author: author) } + let(:topic) { + proposal = create(:proposal) + community = proposal.community + create(:topic, community: community, author: author) + } + scenario "User commented on my debate", :js do create(:notification, notifiable: debate, user: author) login_as author @@ -40,6 +46,19 @@ feature "Notifications" do expect(page).to have_xpath "//a[@href='#{notification_path(Notification.last)}']" end + scenario "User commented on my topic", :js do + create(:notification, notifiable: topic, user: author) + login_as author + visit root_path + + find(".icon-notification").click + + expect(page).to have_css ".notification", count: 1 + + expect(page).to have_content "Someone commented on" + expect(page).to have_xpath "//a[@href='#{notification_path(Notification.last)}']" + end + scenario "Multiple comments on my proposal", :js do login_as user visit proposal_path proposal From e85c98f4b447c2f30ebe490cb3dec3b64e247a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 20 Oct 2017 17:18:54 +0200 Subject: [PATCH 617/765] Improved results and stats percentages --- app/models/poll/question/answer.rb | 2 +- app/views/polls/results.html.erb | 6 ++-- app/views/polls/stats.html.erb | 44 ++++++++---------------------- 3 files changed, 15 insertions(+), 37 deletions(-) diff --git a/app/models/poll/question/answer.rb b/app/models/poll/question/answer.rb index 8241aa78e..dbf2f2139 100644 --- a/app/models/poll/question/answer.rb +++ b/app/models/poll/question/answer.rb @@ -41,7 +41,7 @@ class Poll::Question::Answer < ActiveRecord::Base end def total_votes_percentage - ((total_votes*100) / question.answers_total_votes).round(2) rescue 0 + question.answers_total_votes == 0 ? 0 : (total_votes * 100) / question.answers_total_votes end def set_most_voted diff --git a/app/views/polls/results.html.erb b/app/views/polls/results.html.erb index c8e9cbfab..697382ed2 100644 --- a/app/views/polls/results.html.erb +++ b/app/views/polls/results.html.erb @@ -1,6 +1,6 @@ <% provide :title do %><%= @poll.name %><% end %> -
    +
    <%= render "poll_header" %> <%= render "poll_subnav" %> @@ -18,7 +18,7 @@
    <%- @poll.questions.each do |question| %>
    ><%= answer.title %>><%= answer.title %>
    > + > <%= answer.total_votes %> (<%= answer.total_votes_percentage %>%)
    -

    <%= question.title %>

    +

    <%= question.title %>

    <%- question.question_answers.each do |answer| %> @@ -31,7 +31,7 @@ <%- question.question_answers.each do |answer| %> <% end %> diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index 5daaf433a..3a4d99dba 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -36,77 +36,55 @@ From b42bacd588e1ee9491f5156a586130d618cd9701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 20 Oct 2017 17:26:32 +0200 Subject: [PATCH 618/765] `most_voted` to false by default --- .../20171019095042_add_most_voted_to_poll_question_answer.rb | 2 +- db/schema.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db/migrate/20171019095042_add_most_voted_to_poll_question_answer.rb b/db/migrate/20171019095042_add_most_voted_to_poll_question_answer.rb index e32b7e325..e4650643b 100644 --- a/db/migrate/20171019095042_add_most_voted_to_poll_question_answer.rb +++ b/db/migrate/20171019095042_add_most_voted_to_poll_question_answer.rb @@ -1,5 +1,5 @@ class AddMostVotedToPollQuestionAnswer < ActiveRecord::Migration def change - add_column :poll_question_answers, :most_voted, :boolean + add_column :poll_question_answers, :most_voted, :boolean, default: false end end diff --git a/db/schema.rb b/db/schema.rb index 29dbe0500..b2c99b9be 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -700,7 +700,7 @@ ActiveRecord::Schema.define(version: 20171019095042) do t.text "description" t.integer "question_id" t.integer "given_order", default: 1 - t.boolean "most_voted" + t.boolean "most_voted", default: false end add_index "poll_question_answers", ["question_id"], name: "index_poll_question_answers_on_question_id", using: :btree From c13268718ad292fc7401e48474aff73217e2adaa Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 20 Oct 2017 18:34:39 +0200 Subject: [PATCH 619/765] fixes line height on menu sidebar --- app/assets/stylesheets/participation.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 20b586f23..ff2af5f2b 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1814,6 +1814,7 @@ li a { color: $link; + line-height: $line-height; } } } From 5ebd630b27b505faf63a7aba298c88ab0ec2f56e Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 20 Oct 2017 18:35:03 +0200 Subject: [PATCH 620/765] adds answer most voted text for screen readers --- app/views/polls/results.html.erb | 7 ++++++- config/locales/en/general.yml | 2 ++ config/locales/es/general.yml | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/views/polls/results.html.erb b/app/views/polls/results.html.erb index 697382ed2..884f341f7 100644 --- a/app/views/polls/results.html.erb +++ b/app/views/polls/results.html.erb @@ -22,7 +22,12 @@ <%- question.question_answers.each do |answer| %> - + <% end %> diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 6e4b9b662..586a90a45 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -513,6 +513,8 @@ en: valid: "Valid" white: "White votes" null_votes: "Invalid" + results: + most_voted_answer: "Most voted answer: " poll_questions: create_question: "Create question" show: diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 2acbb540e..08fe25e1e 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -513,6 +513,8 @@ es: valid: "Válidos" white: "En blanco" null_votes: "Nulos" + results: + most_voted_answer: "Respuesta más votada: " poll_questions: create_question: "Crear pregunta para votación" show: From 9fc35e9087d957fd205d958854bc9f97fac2dfc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 20 Oct 2017 18:44:56 +0200 Subject: [PATCH 621/765] Added `results_enabled` and `stats_enabled` to Poll --- ...20163240_add_results_and_stats_to_polls.rb | 6 ++ db/schema.rb | 56 ++++++++++++++++--- 2 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20171020163240_add_results_and_stats_to_polls.rb diff --git a/db/migrate/20171020163240_add_results_and_stats_to_polls.rb b/db/migrate/20171020163240_add_results_and_stats_to_polls.rb new file mode 100644 index 000000000..af6f82aaa --- /dev/null +++ b/db/migrate/20171020163240_add_results_and_stats_to_polls.rb @@ -0,0 +1,6 @@ +class AddResultsAndStatsToPolls < ActiveRecord::Migration + def change + add_column :polls, :results_enabled, :boolean, default: false + add_column :polls, :stats_enabled, :boolean, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index c3ccbeac7..f8dd19c13 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: 20171017221546) do +ActiveRecord::Schema.define(version: 20171020163240) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -486,6 +486,10 @@ ActiveRecord::Schema.define(version: 20171017221546) do t.boolean "draft_publication_enabled", default: false t.boolean "result_publication_enabled", default: false t.boolean "published", default: true + t.date "proposals_phase_start_date" + t.date "proposals_phase_end_date" + t.boolean "proposals_phase_enabled" + t.text "proposals_description" end add_index "legislation_processes", ["allegations_end_date"], name: "index_legislation_processes_on_allegations_end_date", using: :btree @@ -498,6 +502,36 @@ ActiveRecord::Schema.define(version: 20171017221546) do add_index "legislation_processes", ["result_publication_date"], name: "index_legislation_processes_on_result_publication_date", using: :btree add_index "legislation_processes", ["start_date"], name: "index_legislation_processes_on_start_date", using: :btree + create_table "legislation_proposals", force: :cascade do |t| + t.integer "legislation_process_id" + t.string "title", limit: 80 + t.text "description" + t.string "question" + t.string "external_url" + t.integer "author_id" + t.datetime "hidden_at" + t.integer "flags_count", default: 0 + t.datetime "ignored_flag_at" + t.integer "cached_votes_up", default: 0 + t.integer "comments_count", default: 0 + t.datetime "confirmed_hide_at" + t.integer "hot_score", limit: 8, default: 0 + t.integer "confidence_score", default: 0 + t.string "responsible_name", limit: 60 + t.text "summary" + t.string "video_url" + t.tsvector "tsv" + t.integer "geozone_id" + t.datetime "retired_at" + t.string "retired_reason" + t.text "retired_explanation" + t.integer "community_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_index "legislation_proposals", ["legislation_process_id"], name: "index_legislation_proposals_on_legislation_process_id", using: :btree + create_table "legislation_question_options", force: :cascade do |t| t.integer "legislation_question_id" t.string "value" @@ -666,6 +700,7 @@ ActiveRecord::Schema.define(version: 20171017221546) do t.text "description" t.integer "question_id" t.integer "given_order", default: 1 + t.boolean "most_voted", default: false end add_index "poll_question_answers", ["question_id"], name: "index_poll_question_answers_on_question_id", using: :btree @@ -759,6 +794,8 @@ ActiveRecord::Schema.define(version: 20171017221546) do t.integer "comments_count", default: 0 t.integer "author_id" t.datetime "hidden_at" + t.boolean "results_enabled", default: false + t.boolean "stats_enabled", default: false end add_index "polls", ["starts_at", "ends_at"], name: "index_polls_on_starts_at_and_ends_at", using: :btree @@ -918,16 +955,20 @@ ActiveRecord::Schema.define(version: 20171017221546) do add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree create_table "tags", force: :cascade do |t| - t.string "name", limit: 40 - t.integer "taggings_count", default: 0 - t.integer "debates_count", default: 0 - t.integer "proposals_count", default: 0 - t.integer "spending_proposals_count", default: 0 + t.string "name", limit: 40 + t.integer "taggings_count", default: 0 + t.integer "debates_count", default: 0 + t.integer "proposals_count", default: 0 + t.integer "spending_proposals_count", default: 0 t.string "kind" - t.integer "budget/investments_count", default: 0 + t.integer "budget/investments_count", default: 0 + t.integer "legislation/proposals_count", default: 0 + t.integer "legislation/processes_count", default: 0 end add_index "tags", ["debates_count"], name: "index_tags_on_debates_count", using: :btree + add_index "tags", ["legislation/processes_count"], name: "index_tags_on_legislation/processes_count", using: :btree + add_index "tags", ["legislation/proposals_count"], name: "index_tags_on_legislation/proposals_count", using: :btree add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree add_index "tags", ["proposals_count"], name: "index_tags_on_proposals_count", using: :btree add_index "tags", ["spending_proposals_count"], name: "index_tags_on_spending_proposals_count", using: :btree @@ -1105,6 +1146,7 @@ ActiveRecord::Schema.define(version: 20171017221546) do add_foreign_key "identities", "users" add_foreign_key "images", "users" add_foreign_key "legislation_draft_versions", "legislation_processes" + add_foreign_key "legislation_proposals", "legislation_processes" add_foreign_key "locks", "users" add_foreign_key "managers", "users" add_foreign_key "moderators", "users" From 62b1998ec6ccbb4e9e5571ae044d1bc4deb4883d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 20 Oct 2017 18:45:34 +0200 Subject: [PATCH 622/765] Added `results_enabled` and `stats_enabled` to Poll admin form --- app/controllers/admin/poll/polls_controller.rb | 7 ++++--- app/models/poll.rb | 8 ++++++++ app/views/admin/poll/polls/_form.html.erb | 9 +++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/poll/polls_controller.rb b/app/controllers/admin/poll/polls_controller.rb index 5103275fb..b146f66cc 100644 --- a/app/controllers/admin/poll/polls_controller.rb +++ b/app/controllers/admin/poll/polls_controller.rb @@ -54,9 +54,10 @@ class Admin::Poll::PollsController < Admin::Poll::BaseController end def poll_params - params.require(:poll).permit(:name, :starts_at, :ends_at, :geozone_restricted, :summary, :description, - geozone_ids: [], - image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]) + params.require(:poll).permit(:name, :starts_at, :ends_at, :geozone_restricted, + :summary, :description, :results_enabled,:stats_enabled, + geozone_ids: [], + image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]) end def search_params diff --git a/app/models/poll.rb b/app/models/poll.rb index 27125d8a1..e1a1c2754 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -90,4 +90,12 @@ class Poll < ActiveRecord::Base end end + def results_enabled? + results_enabled + end + + def stats_enabled? + stats_enabled + end + end diff --git a/app/views/admin/poll/polls/_form.html.erb b/app/views/admin/poll/polls/_form.html.erb index aff19d9d7..21f1a97f3 100644 --- a/app/views/admin/poll/polls/_form.html.erb +++ b/app/views/admin/poll/polls/_form.html.erb @@ -53,6 +53,15 @@ +
    +
    + <%= t('admin.polls.new.show_results_and_stats') %> + <%= f.check_box :results_enabled, checked: @poll.results_enabled?, label: t('admin.polls.new.show_results') %> + <%= f.check_box :stats_enabled, checked: @poll.stats_enabled?, label: t('admin.polls.new.show_stats') %> +

    <%= t('admin.polls.new.results_and_stats_reminder') %> +

    +
    +
    <%= f.submit t("admin.polls.#{admin_submit_action(@poll)}.submit_button"), From b64ef9f68972fef5518b08a321fd25813f6f2203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 20 Oct 2017 18:45:43 +0200 Subject: [PATCH 623/765] New translations --- config/locales/en/admin.yml | 4 ++++ config/locales/es/admin.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 38abe6f56..084a0443c 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -560,6 +560,10 @@ en: geozone_restricted: "Restricted to districts" new: title: "New poll" + show_results_and_stats: "Show results and stats" + show_results: "Show results" + show_stats: "Show stats" + results_and_stats_reminder: "Marking these checkboxes the results and/or stats of this poll will be publicly available and every user will see them." submit_button: "Create poll" edit: title: "Edit poll" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 3336cdc5b..c13292f89 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -560,6 +560,10 @@ es: geozone_restricted: "Restringida a los distritos" new: title: "Nueva votación" + show_results_and_stats: "Mostrar resultados y estadísticas" + show_results: "Mostrar resultados" + show_stats: "Mostrar estadísticas" + results_and_stats_reminder: "Si marcas estas casillas los resultados y/o estadísticas de esta votación serán públicos y podrán verlos todos los usuarios." submit_button: "Crear votación" edit: title: "Editar votación" From 8ee35df35f5743b958f7d45ea3658b3dd88df672 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 20 Oct 2017 20:56:01 +0200 Subject: [PATCH 624/765] changes poll title link if results or stats are enabled --- app/views/polls/_poll_group.html.erb | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/app/views/polls/_poll_group.html.erb b/app/views/polls/_poll_group.html.erb index 529e9a99e..9d83d5233 100644 --- a/app/views/polls/_poll_group.html.erb +++ b/app/views/polls/_poll_group.html.erb @@ -19,11 +19,27 @@
    <% if poll.questions.count == 1 %> <% poll.questions.each do |question| %> -

    <%= link_to question.title, poll %>

    +

    + <% if poll.results_enabled? %> + <%= link_to question.title, poll_results_path(poll) %> + <% elsif poll.stats_enabled? %> + <%= link_to question.title, poll_stats_path(poll) %> + <% else %> + <%= link_to question.title, poll %> + <% end %> +

    <%= poll_dates(poll) %> <% end %> <% else %> -

    <%= link_to poll.name, poll %>

    +

    + <% if poll.results_enabled? %> + <%= link_to poll.name, poll_results_path(poll) %> + <% elsif poll.stats_enabled? %> + <%= link_to poll.name, poll_stats_path(poll) %> + <% else %> + <%= link_to poll.name, poll %> + <% end %> +

    <%= poll_dates(poll) %>
      <% poll.questions.each do |question| %> From d21f0aa8a1427e25a7299f8984e89c27bdff8509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 20 Oct 2017 21:11:54 +0200 Subject: [PATCH 625/765] Hide results and stats from poll create form --- app/views/admin/poll/polls/_form.html.erb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/views/admin/poll/polls/_form.html.erb b/app/views/admin/poll/polls/_form.html.erb index 21f1a97f3..4926e28ac 100644 --- a/app/views/admin/poll/polls/_form.html.erb +++ b/app/views/admin/poll/polls/_form.html.erb @@ -53,14 +53,16 @@
    -
    -
    - <%= t('admin.polls.new.show_results_and_stats') %> - <%= f.check_box :results_enabled, checked: @poll.results_enabled?, label: t('admin.polls.new.show_results') %> - <%= f.check_box :stats_enabled, checked: @poll.stats_enabled?, label: t('admin.polls.new.show_stats') %> -

    <%= t('admin.polls.new.results_and_stats_reminder') %> -

    -
    + <% if controller_name == "polls" && action_name == "edit" %> +
    +
    + <%= t('admin.polls.new.show_results_and_stats') %> + <%= f.check_box :results_enabled, checked: @poll.results_enabled?, label: t('admin.polls.new.show_results') %> + <%= f.check_box :stats_enabled, checked: @poll.stats_enabled?, label: t('admin.polls.new.show_stats') %> +

    <%= t('admin.polls.new.results_and_stats_reminder') %> +

    +
    + <% end %>
    From 995289304e24530533dbc8b4f2eaa4402b9559f8 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 19 Oct 2017 22:41:54 +0200 Subject: [PATCH 626/765] Add booth location on booth assigment management list, plus poll links on list --- .../admin/poll/booth_assignments/_booth_assignment.html.erb | 3 +++ app/views/admin/poll/booth_assignments/index.html.erb | 3 +-- app/views/admin/poll/booth_assignments/manage.html.erb | 1 + app/views/admin/poll/polls/booth_assignments.html.erb | 2 +- config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 1 + 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb b/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb index 7865b201e..d78f7be8b 100644 --- a/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb +++ b/app/views/admin/poll/booth_assignments/_booth_assignment.html.erb @@ -1,6 +1,9 @@
    + <% if booth_assignment.present? %> <% end %> diff --git a/app/views/admin/poll/booth_assignments/manage.html.erb b/app/views/admin/poll/booth_assignments/manage.html.erb index f55e85c74..a24fac478 100644 --- a/app/views/admin/poll/booth_assignments/manage.html.erb +++ b/app/views/admin/poll/booth_assignments/manage.html.erb @@ -13,6 +13,7 @@
    > <%= answer.total_votes %> - (<%= answer.total_votes_percentage %>%) + (<%= answer.total_votes_percentage.round(2) %>%)
    <%= t("polls.show.stats.valid") %> <%= @stats[:total_web_valid] %> - (<%= number_to_percentage(@stats[:valid_percentage_web], - strip_insignificant_zeros: true, - precision: 2) %>) + (<%= @stats[:valid_percentage_web].round(2) %>%) <%= @stats[:total_booth_valid] %> - (<%= number_to_percentage(@stats[:valid_percentage_booth], - strip_insignificant_zeros: true, - precision: 2) %>) + (<%= @stats[:valid_percentage_booth].round(2) %>%) <%= @stats[:total_valid_votes] %> - (<%= number_to_percentage(@stats[:total_valid_percentage], - strip_insignificant_zeros: true, - precision: 2) %>) + (<%= @stats[:total_valid_percentage].round(2) %>%)
    <%= t("polls.show.stats.white") %> <%= @stats[:total_web_white] %> - (<%= number_to_percentage(@stats[:white_percentage_web], - strip_insignificant_zeros: true, - precision: 2) %>) + (<%= @stats[:white_percentage_web].round(2) %>%) <%= @stats[:total_booth_white] %> - (<%= number_to_percentage(@stats[:white_percentage_booth], - strip_insignificant_zeros: true, - precision: 2) %>) + (<%= @stats[:white_percentage_booth].round(2) %>%) <%= @stats[:total_white_votes] %> - (<%= number_to_percentage(@stats[:total_white_percentage], - strip_insignificant_zeros: true, - precision: 2) %>) + (<%= @stats[:total_white_percentage].round(2) %>%)
    <%= t("polls.show.stats.null_votes") %> <%= @stats[:total_web_null] %> - (<%= number_to_percentage(@stats[:null_percentage_web], - strip_insignificant_zeros: true, - precision: 2) %>) + (<%= @stats[:null_percentage_web].round(2) %>%) <%= @stats[:total_booth_null] %> - (<%= number_to_percentage(@stats[:null_percentage_booth], - strip_insignificant_zeros: true, - precision: 2) %>) + (<%= @stats[:null_percentage_booth].round(2) %>%) <%= @stats[:total_null_votes] %> - (<%= number_to_percentage(@stats[:total_null_percentage], - strip_insignificant_zeros: true, - precision: 2) %>) + (<%= @stats[:total_null_percentage].round(2) %>%)
    <%= t("polls.show.stats.total") %> <%= @stats[:total_participants_web] %> - (<%= number_to_percentage(@stats[:total_participants_web_percentage], - strip_insignificant_zeros: true, - precision: 2) %>) + (<%= @stats[:total_participants_web_percentage].round(2) %>%) <%= @stats[:total_participants_booth] %> - (<%= number_to_percentage(@stats[:total_participants_booth_percentage], - strip_insignificant_zeros: true, - precision: 2) %>) + (<%= @stats[:total_participants_booth_percentage].round(2) %>%) <%= @stats[:total_participants_web] + @stats[:total_participants_booth] %>
    ><%= answer.title %>> + <% if answer.most_voted %> + <%= t ("polls.show.results.most_voted_answer") %> + <% end %> + <%= answer.title %> +
    <%= link_to booth.name, admin_booth_path(booth) %> + <%= booth.location || t("admin.booths.index.no_location") %> + <%= t("admin.booth_assignments.manage.status.assigned") %> diff --git a/app/views/admin/poll/booth_assignments/index.html.erb b/app/views/admin/poll/booth_assignments/index.html.erb index 39435254b..75cbe889f 100644 --- a/app/views/admin/poll/booth_assignments/index.html.erb +++ b/app/views/admin/poll/booth_assignments/index.html.erb @@ -1,6 +1,5 @@ <%= render "/admin/poll/polls/poll_header" %> -
    <%= render "/admin/poll/polls/subnav" %> <%= render "search_booths" %> @@ -30,7 +29,7 @@
    		- <%= booth_assignment.booth.location %> + <%= booth_assignment.booth.location || t("admin.booths.index.no_location") %>
    + diff --git a/app/views/admin/poll/polls/booth_assignments.html.erb b/app/views/admin/poll/polls/booth_assignments.html.erb index 819474852..ad5dc6211 100644 --- a/app/views/admin/poll/polls/booth_assignments.html.erb +++ b/app/views/admin/poll/polls/booth_assignments.html.erb @@ -11,7 +11,7 @@ <% @polls.each do |poll| %> From 96f588566a970e05e591703c851dcc6db199299c Mon Sep 17 00:00:00 2001 From: decabeza Date: Sun, 22 Oct 2017 01:06:03 +0200 Subject: [PATCH 637/765] changes id name to specs --- app/views/polls/_filter_subnav.html.erb | 2 +- app/views/polls/show.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/polls/_filter_subnav.html.erb b/app/views/polls/_filter_subnav.html.erb index fe43ddf5d..88ee5beb9 100644 --- a/app/views/polls/_filter_subnav.html.erb +++ b/app/views/polls/_filter_subnav.html.erb @@ -2,7 +2,7 @@
    • - <%= link_to "#tab_comments" do %> + <%= link_to "#tab-comments" do %>

      <%= t("polls.show.comments_tab") %> (<%= @poll.comments_count %>) diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 01bdddc54..839b8725a 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -127,7 +127,7 @@
      <%= render "filter_subnav" %> -
      +
      <%= render "comments" %>
      From 928186045a9623878c3ed3a73871dd07bc4a7a9d Mon Sep 17 00:00:00 2001 From: Manuel Ortega Date: Sun, 22 Oct 2017 14:25:15 +0200 Subject: [PATCH 638/765] Moved 'del usuario' text form view to locale files --- app/views/admin/budget_investments/_written_by_author.html.erb | 2 +- config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/admin/budget_investments/_written_by_author.html.erb b/app/views/admin/budget_investments/_written_by_author.html.erb index 467d81481..8cf2eca57 100644 --- a/app/views/admin/budget_investments/_written_by_author.html.erb +++ b/app/views/admin/budget_investments/_written_by_author.html.erb @@ -58,6 +58,6 @@ <%= safe_html_with_links @investment.description %>

      - <%= t("admin.budget_investments.show.tags") %> del usuario: + <%= t("admin.budget_investments.show.user_tags") %>: <%= @investment.tag_list.sort.join(', ') %>

      diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 398ce6421..38365f777 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -157,6 +157,7 @@ en: dossier: Dossier edit_dossier: Edit dossier tags: Tags + user_tags: User tags undefined: Undefined milestone: Milestone new_milestone: Create new milestone diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index e3a52977d..19563a880 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -157,6 +157,7 @@ es: dossier: Informe edit_dossier: Editar informe tags: Etiquetas + user_tags: Etiquetas del usuario undefined: Sin definir milestone: Seguimiento new_milestone: Crear nuevo hito @@ -181,7 +182,7 @@ es: assigned_valuators: Evaluadores select_heading: Seleccionar partida submit_button: Actualizar - user_tags: Etiquetas asignadas por el usuario + user_tags: Etiquetas asignadas por el usuario tags: Etiquetas tags_placeholder: "Escribe las etiquetas que desees separadas por comas (,)" undefined: Sin definir From 97331cb1c956b485f3663669dc1c2a7f38aeb35d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sat, 21 Oct 2017 17:07:21 +0200 Subject: [PATCH 639/765] Fix `direct_messages_max_per_day` set to nil When set to nil, it should mean not zero, but "infinite". --- app/models/direct_message.rb | 1 + spec/models/direct_message_spec.rb | 60 ++++++++++++++++++------------ 2 files changed, 37 insertions(+), 24 deletions(-) diff --git a/app/models/direct_message.rb b/app/models/direct_message.rb index ae14e652d..7c652c83e 100644 --- a/app/models/direct_message.rb +++ b/app/models/direct_message.rb @@ -13,6 +13,7 @@ class DirectMessage < ActiveRecord::Base def max_per_day return if errors.any? max = Setting[:direct_message_max_per_day] + return unless max if sender.direct_messages_sent.today.count >= max.to_i errors.add(:title, I18n.t('activerecord.errors.models.direct_message.attributes.max_per_day.invalid')) diff --git a/spec/models/direct_message_spec.rb b/spec/models/direct_message_spec.rb index 28b30b0ce..913f22a58 100644 --- a/spec/models/direct_message_spec.rb +++ b/spec/models/direct_message_spec.rb @@ -4,10 +4,6 @@ describe DirectMessage do let(:direct_message) { build(:direct_message) } - before(:each) do - Setting[:direct_message_max_per_day] = 3 - end - it "should be valid" do expect(direct_message).to be_valid end @@ -33,32 +29,48 @@ describe DirectMessage do end describe "maximum number of direct messages per day" do + context "when set" do + before(:each) do + Setting[:direct_message_max_per_day] = 3 + end - it "should not be valid if above maximum" do - sender = create(:user) - direct_message1 = create(:direct_message, sender: sender) - direct_message2 = create(:direct_message, sender: sender) - direct_message3 = create(:direct_message, sender: sender) + it "should not be valid if above maximum" do + sender = create(:user) + direct_message1 = create(:direct_message, sender: sender) + direct_message2 = create(:direct_message, sender: sender) + direct_message3 = create(:direct_message, sender: sender) - direct_message4 = build(:direct_message, sender: sender) - expect(direct_message4).to_not be_valid + direct_message4 = build(:direct_message, sender: sender) + expect(direct_message4).to_not be_valid + end + + it "should be valid if below maximum" do + sender = create(:user) + direct_message1 = create(:direct_message, sender: sender) + direct_message2 = create(:direct_message, sender: sender) + + direct_message3 = build(:direct_message) + expect(direct_message).to be_valid + end + + it "should be valid if no direct_messages sent" do + direct_message = build(:direct_message) + + expect(direct_message).to be_valid + end end - it "should be valid if below maximum" do - sender = create(:user) - direct_message1 = create(:direct_message, sender: sender) - direct_message2 = create(:direct_message, sender: sender) + context "when unset" do + before(:each) do + Setting[:direct_message_max_per_day] = nil + end - direct_message3 = build(:direct_message) - expect(direct_message).to be_valid + it "should be valid" do + direct_message = build(:direct_message) + + expect(direct_message).to be_valid + end end - - it "should be valid if no direct_messages sent" do - direct_message = build(:direct_message) - - expect(direct_message).to be_valid - end - end describe "scopes" do From 6b5c29f23ec2429119fe7dc63e5d4922460bd896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 23 Oct 2017 12:25:51 +0200 Subject: [PATCH 640/765] Added tests --- spec/features/admin/poll/polls_spec.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb index 2a2d26ea5..8180a89f2 100644 --- a/spec/features/admin/poll/polls_spec.rb +++ b/spec/features/admin/poll/polls_spec.rb @@ -60,6 +60,10 @@ feature 'Admin polls' do fill_in 'poll_ends_at', with: end_date.strftime("%d/%m/%Y") fill_in 'poll_summary', with: "Upcoming poll's summary. This poll..." fill_in 'poll_description', with: "Upcomming poll's description. This poll..." + + expect(page).to_not have_css("#poll_results_enabled") + expect(page).to_not have_css("#poll_stats_enabled") + click_button "Create poll" expect(page).to have_content "Poll created successfully" @@ -79,6 +83,9 @@ feature 'Admin polls' do expect(page).to have_css("img[alt='#{poll.image.title}']") + expect(page).to have_css("#poll_results_enabled") + expect(page).to have_css("#poll_stats_enabled") + fill_in "poll_name", with: "Next Poll" fill_in 'poll_ends_at', with: end_date.strftime("%d/%m/%Y") From fad5841d8ff501279d4193c81ae3e5876339ae96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 23 Oct 2017 12:57:41 +0200 Subject: [PATCH 641/765] Improvements --- app/models/poll.rb | 8 ------- db/schema.rb | 52 ++++++---------------------------------------- 2 files changed, 6 insertions(+), 54 deletions(-) diff --git a/app/models/poll.rb b/app/models/poll.rb index e1a1c2754..27125d8a1 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -90,12 +90,4 @@ class Poll < ActiveRecord::Base end end - def results_enabled? - results_enabled - end - - def stats_enabled? - stats_enabled - end - end diff --git a/db/schema.rb b/db/schema.rb index f8dd19c13..506153b6a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -486,10 +486,6 @@ ActiveRecord::Schema.define(version: 20171020163240) do t.boolean "draft_publication_enabled", default: false t.boolean "result_publication_enabled", default: false t.boolean "published", default: true - t.date "proposals_phase_start_date" - t.date "proposals_phase_end_date" - t.boolean "proposals_phase_enabled" - t.text "proposals_description" end add_index "legislation_processes", ["allegations_end_date"], name: "index_legislation_processes_on_allegations_end_date", using: :btree @@ -502,36 +498,6 @@ ActiveRecord::Schema.define(version: 20171020163240) do add_index "legislation_processes", ["result_publication_date"], name: "index_legislation_processes_on_result_publication_date", using: :btree add_index "legislation_processes", ["start_date"], name: "index_legislation_processes_on_start_date", using: :btree - create_table "legislation_proposals", force: :cascade do |t| - t.integer "legislation_process_id" - t.string "title", limit: 80 - t.text "description" - t.string "question" - t.string "external_url" - t.integer "author_id" - t.datetime "hidden_at" - t.integer "flags_count", default: 0 - t.datetime "ignored_flag_at" - t.integer "cached_votes_up", default: 0 - t.integer "comments_count", default: 0 - t.datetime "confirmed_hide_at" - t.integer "hot_score", limit: 8, default: 0 - t.integer "confidence_score", default: 0 - t.string "responsible_name", limit: 60 - t.text "summary" - t.string "video_url" - t.tsvector "tsv" - t.integer "geozone_id" - t.datetime "retired_at" - t.string "retired_reason" - t.text "retired_explanation" - t.integer "community_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "legislation_proposals", ["legislation_process_id"], name: "index_legislation_proposals_on_legislation_process_id", using: :btree - create_table "legislation_question_options", force: :cascade do |t| t.integer "legislation_question_id" t.string "value" @@ -700,7 +666,6 @@ ActiveRecord::Schema.define(version: 20171020163240) do t.text "description" t.integer "question_id" t.integer "given_order", default: 1 - t.boolean "most_voted", default: false end add_index "poll_question_answers", ["question_id"], name: "index_poll_question_answers_on_question_id", using: :btree @@ -955,20 +920,16 @@ ActiveRecord::Schema.define(version: 20171020163240) do add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree create_table "tags", force: :cascade do |t| - t.string "name", limit: 40 - t.integer "taggings_count", default: 0 - t.integer "debates_count", default: 0 - t.integer "proposals_count", default: 0 - t.integer "spending_proposals_count", default: 0 + t.string "name", limit: 40 + t.integer "taggings_count", default: 0 + t.integer "debates_count", default: 0 + t.integer "proposals_count", default: 0 + t.integer "spending_proposals_count", default: 0 t.string "kind" - t.integer "budget/investments_count", default: 0 - t.integer "legislation/proposals_count", default: 0 - t.integer "legislation/processes_count", default: 0 + t.integer "budget/investments_count", default: 0 end add_index "tags", ["debates_count"], name: "index_tags_on_debates_count", using: :btree - add_index "tags", ["legislation/processes_count"], name: "index_tags_on_legislation/processes_count", using: :btree - add_index "tags", ["legislation/proposals_count"], name: "index_tags_on_legislation/proposals_count", using: :btree add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree add_index "tags", ["proposals_count"], name: "index_tags_on_proposals_count", using: :btree add_index "tags", ["spending_proposals_count"], name: "index_tags_on_spending_proposals_count", using: :btree @@ -1146,7 +1107,6 @@ ActiveRecord::Schema.define(version: 20171020163240) do add_foreign_key "identities", "users" add_foreign_key "images", "users" add_foreign_key "legislation_draft_versions", "legislation_processes" - add_foreign_key "legislation_proposals", "legislation_processes" add_foreign_key "locks", "users" add_foreign_key "managers", "users" add_foreign_key "moderators", "users" From b1e91cdc03acf3072d6d5b27c8d14965d2d0cb53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 23 Oct 2017 12:57:52 +0200 Subject: [PATCH 642/765] Tests improvements --- spec/features/admin/poll/polls_spec.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb index 8180a89f2..210b2ff6a 100644 --- a/spec/features/admin/poll/polls_spec.rb +++ b/spec/features/admin/poll/polls_spec.rb @@ -88,12 +88,20 @@ feature 'Admin polls' do fill_in "poll_name", with: "Next Poll" fill_in 'poll_ends_at', with: end_date.strftime("%d/%m/%Y") + check 'poll_results_enabled' + check 'poll_stats_enabled' click_button "Update poll" expect(page).to have_content "Poll updated successfully" expect(page).to have_content "Next Poll" expect(page).to have_content I18n.l(end_date.to_date) + + click_link "Edit poll" + + expect(page).to have_field('poll_results_enabled', checked: true) + expect(page).to have_field('poll_stats_enabled', checked: true) + end scenario 'Edit from index' do From f38f333fe55288919254f0c6412de2a90b632757 Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 23 Oct 2017 13:02:37 +0200 Subject: [PATCH 643/765] undo changes on poll title links --- app/views/polls/_poll_group.html.erb | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/app/views/polls/_poll_group.html.erb b/app/views/polls/_poll_group.html.erb index 9d83d5233..529e9a99e 100644 --- a/app/views/polls/_poll_group.html.erb +++ b/app/views/polls/_poll_group.html.erb @@ -19,27 +19,11 @@
      <% if poll.questions.count == 1 %> <% poll.questions.each do |question| %> -

      - <% if poll.results_enabled? %> - <%= link_to question.title, poll_results_path(poll) %> - <% elsif poll.stats_enabled? %> - <%= link_to question.title, poll_stats_path(poll) %> - <% else %> - <%= link_to question.title, poll %> - <% end %> -

      +

      <%= link_to question.title, poll %>

      <%= poll_dates(poll) %> <% end %> <% else %> -

      - <% if poll.results_enabled? %> - <%= link_to poll.name, poll_results_path(poll) %> - <% elsif poll.stats_enabled? %> - <%= link_to poll.name, poll_stats_path(poll) %> - <% else %> - <%= link_to poll.name, poll %> - <% end %> -

      +

      <%= link_to poll.name, poll %>

      <%= poll_dates(poll) %>
        <% poll.questions.each do |question| %> From 84f67db26d777397381c4b4f21aa5263b717522c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 23 Oct 2017 14:17:25 +0200 Subject: [PATCH 644/765] Added restrictions to access Poll results and stats --- app/models/abilities/administrator.rb | 2 +- app/models/abilities/everyone.rb | 4 +- app/views/polls/_poll_subnav.html.erb | 58 +++++++++++++++------------ app/views/polls/show.html.erb | 2 +- 4 files changed, 37 insertions(+), 29 deletions(-) diff --git a/app/models/abilities/administrator.rb b/app/models/abilities/administrator.rb index 704f9be24..1274229b5 100644 --- a/app/models/abilities/administrator.rb +++ b/app/models/abilities/administrator.rb @@ -56,7 +56,7 @@ module Abilities can [:index, :create, :edit, :update, :destroy], Geozone - can [:read, :create, :update, :destroy, :add_question, :search_booths, :search_officers, :booth_assignments], Poll + can [:read, :create, :update, :destroy, :add_question, :search_booths, :search_officers, :booth_assignments, :results, :stats], Poll can [:read, :create, :update, :destroy, :available], Poll::Booth can [:search, :create, :index, :destroy], ::Poll::Officer can [:create, :destroy, :manage], ::Poll::BoothAssignment diff --git a/app/models/abilities/everyone.rb b/app/models/abilities/everyone.rb index 4d2fe4434..32f948a5a 100644 --- a/app/models/abilities/everyone.rb +++ b/app/models/abilities/everyone.rb @@ -6,7 +6,9 @@ module Abilities can [:read, :map], Debate can [:read, :map, :summary, :share], Proposal can :read, Comment - can [:read, :results, :stats], Poll + can :read, Poll + cannot :results, Poll, results_enabled: false + cannot :stats, Poll, stats_enabled: false can :read, Poll::Question can [:read, :welcome], Budget can :read, SpendingProposal diff --git a/app/views/polls/_poll_subnav.html.erb b/app/views/polls/_poll_subnav.html.erb index 8155e2ef4..371571896 100644 --- a/app/views/polls/_poll_subnav.html.erb +++ b/app/views/polls/_poll_subnav.html.erb @@ -1,29 +1,35 @@ -
        -
        -
          - <% if controller_name == "polls" && action_name == "results" %> -
        • -

          <%= t("polls.show.results_menu") %>

          -
          • - <% else %> -
        • <%= link_to t("polls.show.results_menu"), poll_results_path(@poll) %>
          • - <% end %> +<% if current_user.administrator? || (@poll.expired? && (@poll.results_enabled? || @poll.stats_enabled?)) %> +
          +
          +
            + <% if current_user.administrator? || @poll.results_enabled? %> + <% if controller_name == "polls" && action_name == "results" %> +
          • +

            <%= t("polls.show.results_menu") %>

            +
            • + <% else %> +
          • <%= link_to t("polls.show.results_menu"), poll_results_path(@poll) %>
            • + <% end %> + <% end %> - <% if controller_name == "polls" && action_name == "stats" %> -
          • -

            <%= t("polls.show.stats_menu") %>

            -
            • - <% else %> -
          • <%= link_to t("polls.show.stats_menu"), poll_stats_path(@poll) %>
            • - <% end %> + <% if current_user.administrator? || @poll.stats_enabled? %> + <% if controller_name == "polls" && action_name == "stats" %> +
          • +

            <%= t("polls.show.stats_menu") %>

            +
            • + <% else %> +
          • <%= link_to t("polls.show.stats_menu"), poll_stats_path(@poll) %>
            • + <% end %> + <% end %> - <% if controller_name == "polls" && action_name == "show" %> -
          • -

            <%= t("polls.show.info_menu") %>

            -
            • - <% else %> -
          • <%= link_to t("polls.show.info_menu"), poll_path(@poll) %>
            • - <% end %> -
          + <% if controller_name == "polls" && action_name == "show" %> +
        • +

          <%= t("polls.show.info_menu") %>

          +
          • + <% else %> +
        • <%= link_to t("polls.show.info_menu"), poll_path(@poll) %>
          • + <% end %> +
        +
        -
      +<% end %> diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 839b8725a..709fcc2a2 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -15,7 +15,7 @@

    <% else %> - <% if current_user && @poll.voted_in_web?(current_user) %> + <% if current_user && @poll.voted_in_web?(current_user) && !@poll.expired? %>
    <%= t("polls.show.already_voted_in_web") %>
    From 9ce704571765006cae2d392cc7162d8d08a28d6a Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 23 Oct 2017 15:17:35 +0200 Subject: [PATCH 645/765] fixes specs --- app/views/polls/_poll_subnav.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/polls/_poll_subnav.html.erb b/app/views/polls/_poll_subnav.html.erb index 371571896..67325fa3a 100644 --- a/app/views/polls/_poll_subnav.html.erb +++ b/app/views/polls/_poll_subnav.html.erb @@ -1,4 +1,5 @@ -<% if current_user.administrator? || (@poll.expired? && (@poll.results_enabled? || @poll.stats_enabled?)) %> +<% if current_user && current_user.administrator? || + (@poll.expired? && (@poll.results_enabled? || @poll.stats_enabled?)) %>
      From f7dce94a451608c0dea70a766b065d63ce1f0acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 23 Oct 2017 15:50:53 +0200 Subject: [PATCH 646/765] Added tests for Poll results and stats views --- spec/features/polls/polls_spec.rb | 71 ++++++++++++++++++++++++++++--- 1 file changed, 64 insertions(+), 7 deletions(-) diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb index 7bf51473f..424787468 100644 --- a/spec/features/polls/polls_spec.rb +++ b/spec/features/polls/polls_spec.rb @@ -367,17 +367,74 @@ feature 'Polls' do end end - + context "Results and stats" do - scenario "See polls statistics", :js do + scenario "Show poll results and stats if enabled and poll expired" do + poll = create(:poll, :expired, results_enabled: true, stats_enabled: true) user = create(:user) - poll = create(:poll, summary: "Summary", description: "Description") + login_as user visit poll_path(poll) - - click_link "Participation statistics" - - expect(page).to have_content("Total participation") + + expect(page).to have_content("Poll results") + expect(page).to have_content("Participation statistics") + + visit poll_results_path(poll) + expect(page.driver.status_code).to eq(200) + + visit poll_stats_path(poll) + expect(page.driver.status_code).to eq(200) + end + + scenario "Don't show poll results and stats if not enabled" do + poll = create(:poll, :expired, results_enabled: false, stats_enabled: false) + user = create(:user) + + login_as user + visit poll_path(poll) + + expect(page).to_not have_content("Poll results") + expect(page).to_not have_content("Participation statistics") + + visit poll_results_path(poll) + expect(page).to have_content("You do not have permission to carry out the action 'results' on poll.") + + visit poll_stats_path(poll) + expect(page).to have_content("You do not have permission to carry out the action 'stats' on poll.") + end + + scenario "Don't show poll results and stats if is not expired" do + poll = create(:poll, :current, results_enabled: true, stats_enabled: true) + user = create(:user) + + login_as user + visit poll_path(poll) + + expect(page).to_not have_content("Poll results") + expect(page).to_not have_content("Participation statistics") + + visit poll_results_path(poll) + expect(page).to have_content("You do not have permission to carry out the action 'results' on poll.") + + visit poll_stats_path(poll) + expect(page).to have_content("You do not have permission to carry out the action 'stats' on poll.") + end + + scenario "Show poll results and stats if user is administrator" do + poll = create(:poll, :current, results_enabled: false, stats_enabled: false) + user = create(:administrator).user + + login_as user + visit poll_path(poll) + + expect(page).to have_content("Poll results") + expect(page).to have_content("Participation statistics") + + visit poll_results_path(poll) + expect(page.driver.status_code).to eq(200) + + visit poll_stats_path(poll) + expect(page.driver.status_code).to eq(200) end end end From 568303c3ff0587617a297b611661710c8f33d2c6 Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 23 Oct 2017 17:26:17 +0200 Subject: [PATCH 647/765] adds data equalizer for results and stats sidebar --- app/assets/stylesheets/participation.scss | 8 +++++++- app/views/polls/results.html.erb | 6 +++--- app/views/polls/stats.html.erb | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index ff2af5f2b..81757d78c 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1807,7 +1807,13 @@ .polls-results-stats { .sidebar { - border-right: 1px solid $border; + border-bottom: 1px solid $border; + margin-bottom: $line-height; + + @include breakpoint(medium) { + border-bottom: 0; + border-right: 1px solid $border; + } .menu { padding: 0; diff --git a/app/views/polls/results.html.erb b/app/views/polls/results.html.erb index 07ca75bc3..7fc1be105 100644 --- a/app/views/polls/results.html.erb +++ b/app/views/polls/results.html.erb @@ -5,9 +5,9 @@ <%= render "poll_subnav" %> -
      -

      Preguntas

      +
      +
        <%- @poll.questions.each do |question| %>
      • <%=link_to question.title, "##{question.title.parameterize}" %>
        • @@ -15,7 +15,7 @@
      -
      +
      <%- @poll.questions.each do |question| %>
    <%= t("admin.booths.index.name") %><%= t("admin.booths.index.location") %> <%= t("admin.booth_assignments.manage.status.assign_status") %> <%= t("admin.actions.actions") %>
    - <%= poll.name %> + <%= link_to poll.name, admin_poll_path(poll) %> <%= l poll.starts_at.to_date %> - <%= l poll.ends_at.to_date %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 3826e9764..aa0fc0f8a 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -675,6 +675,7 @@ en: add_booth: "Add booth" name: "Name" location: "Location" + no_location: "No Location" new: title: "New booth" name: "Name" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 9bc97c35f..2ff4449ec 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -677,6 +677,7 @@ es: add_booth: "Añadir urna" name: "Nombre" location: "Ubicación" + no_location: "Sin Ubicación" new: title: "Nueva urna" name: "Nombre" From 3531060476c35ec200ca544a62cfe0523f1751c1 Mon Sep 17 00:00:00 2001 From: Manuel Ortega Date: Sat, 21 Oct 2017 16:53:41 +0200 Subject: [PATCH 627/765] Added partial in order to show documents collection. Added DocumentsHelper method in order to show documents link with humanized file type and file size --- app/helpers/documents_helper.rb | 7 +++++++ app/views/documents/_additional_document.html.erb | 3 +++ app/views/documents/_additional_documents.html.erb | 10 +--------- app/views/documents/_documents.html.erb | 4 +--- 4 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 app/views/documents/_additional_document.html.erb diff --git a/app/helpers/documents_helper.rb b/app/helpers/documents_helper.rb index 70eb6a27f..cbc94c9bb 100644 --- a/app/helpers/documents_helper.rb +++ b/app/helpers/documents_helper.rb @@ -54,4 +54,11 @@ module DocumentsHelper "direct_upload[resource_relation]": "documents") end + def document_item_link(document) + link_to "#{document.title} (#{document.humanized_content_type} | \ + #{number_to_human_size(document.attachment_file_size)})".html_safe, + document.attachment.url, + target: "_blank", + title: t("shared.target_blank_html") + end end diff --git a/app/views/documents/_additional_document.html.erb b/app/views/documents/_additional_document.html.erb new file mode 100644 index 000000000..8c079590e --- /dev/null +++ b/app/views/documents/_additional_document.html.erb @@ -0,0 +1,3 @@ +

      +<%= document_item_link(document) %> +

    diff --git a/app/views/documents/_additional_documents.html.erb b/app/views/documents/_additional_documents.html.erb index 2c8791dad..db2344c74 100644 --- a/app/views/documents/_additional_documents.html.erb +++ b/app/views/documents/_additional_documents.html.erb @@ -6,15 +6,7 @@

    <%= t('proposals.show.title_external_url') %>

    - <% documents.each do |document| %> -

      - <%= link_to "#{document.title} (#{document.humanized_content_type} | \ - #{number_to_human_size(document.attachment_file_size)})".html_safe, - document.attachment.url, - target: "_blank", - title: t("shared.target_blank_html") %> -

    - <% end %> + <%= render partial: 'documents/additional_document', collection: documents, as: :document %> diff --git a/app/views/documents/_documents.html.erb b/app/views/documents/_documents.html.erb index e36d88207..bcdf39a32 100644 --- a/app/views/documents/_documents.html.erb +++ b/app/views/documents/_documents.html.erb @@ -14,9 +14,7 @@
    - <% documents.each do |document| %> - <%= render "documents/document", document: document %> - <% end %> + <%= render partial: "documents/document", collection: documents %>
    From 5b40696f4f71f3fdebde55fc6be36ea249cf1628 Mon Sep 17 00:00:00 2001 From: decabeza Date: Sat, 21 Oct 2017 17:34:45 +0200 Subject: [PATCH 628/765] shows admin shortcuts menu only to admin users --- .../admin/shared/_admin_shortcuts.html.erb | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/app/views/admin/shared/_admin_shortcuts.html.erb b/app/views/admin/shared/_admin_shortcuts.html.erb index 7ead6d419..8a292d6bb 100644 --- a/app/views/admin/shared/_admin_shortcuts.html.erb +++ b/app/views/admin/shared/_admin_shortcuts.html.erb @@ -1,10 +1,12 @@ -
  • - <%= link_to admin_stats_path, title: t("admin.menu.stats") do %> - - <% end %> -
    • -
  • - <%= link_to admin_settings_path, title: t("admin.menu.settings") do %> - - <% end %> -
    • +<% if current_user.administrator? %> +
  • + <%= link_to admin_stats_path, title: t("admin.menu.stats") do %> + + <% end %> +
    • +
  • + <%= link_to admin_settings_path, title: t("admin.menu.settings") do %> + + <% end %> +
    • +<% end %> \ No newline at end of file From 668745f3e1d56559152abd264affe9fde0ba2e87 Mon Sep 17 00:00:00 2001 From: decabeza Date: Sat, 21 Oct 2017 17:36:44 +0200 Subject: [PATCH 629/765] moves officing menu outside of admin dropdown --- app/helpers/users_helper.rb | 6 +----- app/views/shared/_admin_login_items.html.erb | 11 +++++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 111a80267..da340bb46 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -52,12 +52,8 @@ module UsersHelper current_user && current_user.manager? end - def current_poll_officer? - current_user && current_user.poll_officer? - end - def show_admin_menu? - current_administrator? || current_moderator? || current_valuator? || current_manager? || current_poll_officer? + current_administrator? || current_moderator? || current_valuator? || current_manager? end def interests_title_text(user) diff --git a/app/views/shared/_admin_login_items.html.erb b/app/views/shared/_admin_login_items.html.erb index 9634874f9..a9e6fa4b9 100644 --- a/app/views/shared/_admin_login_items.html.erb +++ b/app/views/shared/_admin_login_items.html.erb @@ -26,12 +26,11 @@ <%= link_to t("layouts.header.management"), management_sign_in_path %> <% end %> - - <% if current_user.administrator? || current_user.poll_officer? %> -
  • - <%= link_to t("layouts.header.officing"), officing_root_path %> -
    • - <% end %> <% end %> +<% if current_user && current_user.poll_officer? %> +
  • + <%= link_to t("layouts.header.officing"), officing_root_path %> +
    • +<% end %> From 573961a3218a6c81c78b7f4370af9213f7b69bf0 Mon Sep 17 00:00:00 2001 From: decabeza Date: Sat, 21 Oct 2017 17:37:14 +0200 Subject: [PATCH 630/765] avoids admin access to officing panel --- app/controllers/officing/base_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/officing/base_controller.rb b/app/controllers/officing/base_controller.rb index 97ef23d30..07cf4cfa5 100644 --- a/app/controllers/officing/base_controller.rb +++ b/app/controllers/officing/base_controller.rb @@ -7,6 +7,6 @@ class Officing::BaseController < ApplicationController skip_authorization_check def verify_officer - raise CanCan::AccessDenied unless current_user.try(:poll_officer?) || current_user.try(:administrator?) + raise CanCan::AccessDenied unless current_user.try(:poll_officer?) end end \ No newline at end of file From 47d626619fcab1a6372b1ac516bbf39962364dd6 Mon Sep 17 00:00:00 2001 From: decabeza Date: Sat, 21 Oct 2017 17:37:37 +0200 Subject: [PATCH 631/765] adds specs for admin access to officing --- spec/features/officing_spec.rb | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/spec/features/officing_spec.rb b/spec/features/officing_spec.rb index 338b416ea..b208b735c 100644 --- a/spec/features/officing_spec.rb +++ b/spec/features/officing_spec.rb @@ -55,7 +55,22 @@ feature 'Poll Officing' do expect(page).to have_content "You do not have permission to access this page" end - scenario 'Access as an poll officer is authorized' do + scenario 'Access as an administrator is not authorized' do + create(:administrator, user: user) + create(:poll) + login_as(user) + visit root_path + + expect(page).to_not have_link("Polling officers") + visit officing_root_path + + expect(current_path).not_to eq(officing_root_path) + expect(current_path).to eq(root_path) + expect(page).to have_content "You do not have permission to access this page" + end + + scenario 'Access as an administrator with poll officer role is authorized' do + create(:administrator, user: user) create(:poll_officer, user: user) create(:poll) login_as(user) @@ -68,8 +83,8 @@ feature 'Poll Officing' do expect(page).to_not have_content "You do not have permission to access this page" end - scenario 'Access as an administrator is authorized' do - create(:administrator, user: user) + scenario 'Access as an poll officer is authorized' do + create(:poll_officer, user: user) create(:poll) login_as(user) visit root_path From 3b2f3ae40bf57e6f7ea35bc3f0186855bd3c3945 Mon Sep 17 00:00:00 2001 From: decabeza Date: Sat, 21 Oct 2017 18:20:09 +0200 Subject: [PATCH 632/765] changes admin menu order --- app/views/admin/_menu.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index 0518aa0e3..2cc44711f 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -80,15 +80,15 @@ <%= link_to t('admin.menu.poll_booths'), admin_booths_path %> +
  • > + <%= link_to t('admin.menu.poll_booth_assignments'), booth_assignments_admin_polls_path %> +
    • +
  • > <%= link_to t('admin.menu.poll_shifts'), available_admin_booths_path %>
    • - -
  • > - <%= link_to t('admin.menu.poll_booth_assignments'), booth_assignments_admin_polls_path %> -
    • <% end %> From e0a1a73e0b2b8c95ab2d0089866a56c1d8645831 Mon Sep 17 00:00:00 2001 From: decabeza Date: Sat, 21 Oct 2017 18:20:26 +0200 Subject: [PATCH 633/765] fixes active class on polls admin menu --- app/views/admin/_menu.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index 2cc44711f..f3abf04aa 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -60,8 +60,8 @@ <%= t("admin.menu.title_polls") %>
      > -
    • > +
    • > <%= link_to t('admin.menu.polls'), admin_polls_path %>
      • From 70713e08c3469965bb2930404743486b88a78d5b Mon Sep 17 00:00:00 2001 From: decabeza Date: Sat, 21 Oct 2017 18:25:30 +0200 Subject: [PATCH 634/765] adds missing space --- app/controllers/admin/poll/polls_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/poll/polls_controller.rb b/app/controllers/admin/poll/polls_controller.rb index b146f66cc..0860e8518 100644 --- a/app/controllers/admin/poll/polls_controller.rb +++ b/app/controllers/admin/poll/polls_controller.rb @@ -55,7 +55,7 @@ class Admin::Poll::PollsController < Admin::Poll::BaseController def poll_params params.require(:poll).permit(:name, :starts_at, :ends_at, :geozone_restricted, - :summary, :description, :results_enabled,:stats_enabled, + :summary, :description, :results_enabled, :stats_enabled, geozone_ids: [], image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]) end From f8e5f791b34154767c3d93cccd1d5d6e18e65e4b Mon Sep 17 00:00:00 2001 From: decabeza Date: Sat, 21 Oct 2017 18:25:58 +0200 Subject: [PATCH 635/765] adds missing p close tag --- app/views/admin/poll/polls/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/poll/polls/_form.html.erb b/app/views/admin/poll/polls/_form.html.erb index 4926e28ac..c0439af7b 100644 --- a/app/views/admin/poll/polls/_form.html.erb +++ b/app/views/admin/poll/polls/_form.html.erb @@ -59,7 +59,7 @@ <%= t('admin.polls.new.show_results_and_stats') %> <%= f.check_box :results_enabled, checked: @poll.results_enabled?, label: t('admin.polls.new.show_results') %> <%= f.check_box :stats_enabled, checked: @poll.stats_enabled?, label: t('admin.polls.new.show_stats') %> -

      <%= t('admin.polls.new.results_and_stats_reminder') %> +

      <%= t('admin.polls.new.results_and_stats_reminder') %>

      <% end %> From 3f2189b12406de3bf80eba1962c57d53fe6f4a12 Mon Sep 17 00:00:00 2001 From: decabeza Date: Sat, 21 Oct 2017 20:07:13 +0200 Subject: [PATCH 636/765] removes unnecessary blank space :sweat_smile: --- app/views/polls/results.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/polls/results.html.erb b/app/views/polls/results.html.erb index 884f341f7..07ca75bc3 100644 --- a/app/views/polls/results.html.erb +++ b/app/views/polls/results.html.erb @@ -24,7 +24,7 @@ <%- question.question_answers.each do |answer| %>
    		> <% if answer.most_voted %> - <%= t ("polls.show.results.most_voted_answer") %> + <%= t("polls.show.results.most_voted_answer") %> <% end %> <%= answer.title %>

    <%= question.title %>

    diff --git a/app/views/polls/stats.html.erb b/app/views/polls/stats.html.erb index 3a4d99dba..a89277ac4 100644 --- a/app/views/polls/stats.html.erb +++ b/app/views/polls/stats.html.erb @@ -5,7 +5,7 @@ <%= render "poll_subnav" %> -
    +

    <%= t("polls.show.stats.title") %>

    From 358449c87431f4a4d82bcf0b562720ccbcc828d3 Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 23 Oct 2017 17:26:34 +0200 Subject: [PATCH 648/765] adds missing i18n --- app/views/polls/results.html.erb | 2 +- config/locales/en/general.yml | 1 + config/locales/es/general.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/polls/results.html.erb b/app/views/polls/results.html.erb index 7fc1be105..4373da22d 100644 --- a/app/views/polls/results.html.erb +++ b/app/views/polls/results.html.erb @@ -5,9 +5,9 @@ <%= render "poll_subnav" %> -

    Preguntas

    +

    <%= t("polls.show.results.title") %>

      <%- @poll.questions.each do |question| %>
    • <%=link_to question.title, "##{question.title.parameterize}" %>
      • diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 586a90a45..926410b51 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -514,6 +514,7 @@ en: white: "White votes" null_votes: "Invalid" results: + title: "Questions" most_voted_answer: "Most voted answer: " poll_questions: create_question: "Create question" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 08fe25e1e..f82ba9ed7 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -514,6 +514,7 @@ es: white: "En blanco" null_votes: "Nulos" results: + title: "Preguntas" most_voted_answer: "Respuesta más votada: " poll_questions: create_question: "Crear pregunta para votación" From f9458b9ef0401e7b97700a6e837b17fcfffa27fa Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 23 Oct 2017 19:09:57 +0200 Subject: [PATCH 649/765] Show booth associated to current/recounting/incoming polls on shift management admin panel --- app/models/poll/booth.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/poll/booth.rb b/app/models/poll/booth.rb index 07e7d2456..b9cba45b1 100644 --- a/app/models/poll/booth.rb +++ b/app/models/poll/booth.rb @@ -12,7 +12,7 @@ class Poll end def self.available - where(polls: { id: Poll.current_or_incoming }).includes(:polls) + where(polls: { id: Poll.current_or_recounting_or_incoming }).includes(:polls) end def assignment_on_poll(poll) From da00ac947e38e926b26aacd4e8909ccf57f042de Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 23 Oct 2017 19:56:26 +0200 Subject: [PATCH 650/765] replaces link on poll title if results or stats are enabled --- app/views/polls/_poll_group.html.erb | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/app/views/polls/_poll_group.html.erb b/app/views/polls/_poll_group.html.erb index 529e9a99e..9d83d5233 100644 --- a/app/views/polls/_poll_group.html.erb +++ b/app/views/polls/_poll_group.html.erb @@ -19,11 +19,27 @@
      <% if poll.questions.count == 1 %> <% poll.questions.each do |question| %> -

      <%= link_to question.title, poll %>

      +

      + <% if poll.results_enabled? %> + <%= link_to question.title, poll_results_path(poll) %> + <% elsif poll.stats_enabled? %> + <%= link_to question.title, poll_stats_path(poll) %> + <% else %> + <%= link_to question.title, poll %> + <% end %> +

      <%= poll_dates(poll) %> <% end %> <% else %> -

      <%= link_to poll.name, poll %>

      +

      + <% if poll.results_enabled? %> + <%= link_to poll.name, poll_results_path(poll) %> + <% elsif poll.stats_enabled? %> + <%= link_to poll.name, poll_stats_path(poll) %> + <% else %> + <%= link_to poll.name, poll %> + <% end %> +

      <%= poll_dates(poll) %>
        <% poll.questions.each do |question| %> From e11957a91cb070e6eb86d4202135470a3c5221bc Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 23 Oct 2017 19:56:39 +0200 Subject: [PATCH 651/765] adds specs for poll title link --- spec/features/polls/polls_spec.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb index 424787468..8fe23d2ea 100644 --- a/spec/features/polls/polls_spec.rb +++ b/spec/features/polls/polls_spec.rb @@ -59,6 +59,22 @@ feature 'Polls' do expect(page).to have_link('Incoming') expect(page).to_not have_link('Expired') end + + scenario "Poll title link to stats if enabled" do + poll = create(:poll, name: "Poll with stats", stats_enabled: true) + + visit polls_path + + expect(page).to have_link("Poll with stats", href: poll_stats_path(poll)) + end + + scenario "Poll title link to results if enabled" do + poll = create(:poll, name: "Poll with results", stats_enabled: true, results_enabled: true) + + visit polls_path + + expect(page).to have_link("Poll with results", href: poll_results_path(poll)) + end end context 'Show' do From 81e4978747190b27ed8668d95c2f428477e2c42b Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 23 Oct 2017 19:56:49 +0200 Subject: [PATCH 652/765] removes blank space --- app/views/polls/_poll_subnav.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/polls/_poll_subnav.html.erb b/app/views/polls/_poll_subnav.html.erb index 67325fa3a..76d9b4508 100644 --- a/app/views/polls/_poll_subnav.html.erb +++ b/app/views/polls/_poll_subnav.html.erb @@ -1,4 +1,4 @@ -<% if current_user && current_user.administrator? || +<% if current_user && current_user.administrator? || (@poll.expired? && (@poll.results_enabled? || @poll.stats_enabled?)) %>
        From aa7dbaa9c497d02446bf11874ad1be6837bd45c6 Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 23 Oct 2017 20:13:11 +0200 Subject: [PATCH 653/765] replace eq200 to text content on specs --- spec/features/polls/polls_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb index 8fe23d2ea..82180cb23 100644 --- a/spec/features/polls/polls_spec.rb +++ b/spec/features/polls/polls_spec.rb @@ -396,10 +396,10 @@ feature 'Polls' do expect(page).to have_content("Participation statistics") visit poll_results_path(poll) - expect(page.driver.status_code).to eq(200) + expect(page).to have_content("Questions") visit poll_stats_path(poll) - expect(page.driver.status_code).to eq(200) + expect(page).to have_content("Participation data") end scenario "Don't show poll results and stats if not enabled" do @@ -447,10 +447,10 @@ feature 'Polls' do expect(page).to have_content("Participation statistics") visit poll_results_path(poll) - expect(page.driver.status_code).to eq(200) + expect(page).to have_content("Questions") visit poll_stats_path(poll) - expect(page.driver.status_code).to eq(200) + expect(page).to have_content("Participation data") end end end From 2081114628f8558aafb12870e8cefb518da32fee Mon Sep 17 00:00:00 2001 From: decabeza Date: Mon, 23 Oct 2017 20:14:21 +0200 Subject: [PATCH 654/765] adds missing i18n --- app/views/polls/results.html.erb | 2 +- config/locales/en/general.yml | 1 + config/locales/es/general.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/polls/results.html.erb b/app/views/polls/results.html.erb index 07ca75bc3..5f2b973bd 100644 --- a/app/views/polls/results.html.erb +++ b/app/views/polls/results.html.erb @@ -7,7 +7,7 @@
        -

        Preguntas

        +

        <%= t("polls.show.results.title") %>

          <%- @poll.questions.each do |question| %>
        • <%=link_to question.title, "##{question.title.parameterize}" %>
          • diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 586a90a45..926410b51 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -514,6 +514,7 @@ en: white: "White votes" null_votes: "Invalid" results: + title: "Questions" most_voted_answer: "Most voted answer: " poll_questions: create_question: "Create question" diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 08fe25e1e..f82ba9ed7 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -514,6 +514,7 @@ es: white: "En blanco" null_votes: "Nulos" results: + title: "Preguntas" most_voted_answer: "Respuesta más votada: " poll_questions: create_question: "Crear pregunta para votación" From 3adfbcb830c427b8bc63f171a6527b04c11998ae Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 23 Oct 2017 20:17:42 +0200 Subject: [PATCH 655/765] Fix Shift date ranges when poll is on recounting phase --- app/controllers/admin/poll/shifts_controller.rb | 2 ++ app/helpers/shifts_helper.rb | 2 ++ app/views/admin/poll/shifts/_form.html.erb | 8 ++++---- config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 1 + 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/poll/shifts_controller.rb b/app/controllers/admin/poll/shifts_controller.rb index 89bb68999..1261f2951 100644 --- a/app/controllers/admin/poll/shifts_controller.rb +++ b/app/controllers/admin/poll/shifts_controller.rb @@ -6,6 +6,8 @@ class Admin::Poll::ShiftsController < Admin::Poll::BaseController def new load_shifts @shift = ::Poll::Shift.new + @voting_polls = @booth.polls.current_or_incoming + @recount_polls = @booth.polls.current_or_recounting_or_incoming end def create diff --git a/app/helpers/shifts_helper.rb b/app/helpers/shifts_helper.rb index 3a55feb4f..7ea17baf2 100644 --- a/app/helpers/shifts_helper.rb +++ b/app/helpers/shifts_helper.rb @@ -1,10 +1,12 @@ module ShiftsHelper def shift_vote_collection_dates(booth, polls) + return [] if polls.blank? date_options((start_date(polls)..end_date(polls)), Poll::Shift.tasks[:vote_collection], booth) end def shift_recount_scrutiny_dates(booth, polls) + return [] if polls.blank? dates = polls.map(&:ends_at).map(&:to_date).sort.inject([]) do |total, date| initial_date = date < Date.current ? Date.current : date total << (initial_date..date + Poll::RECOUNT_DURATION).to_a diff --git a/app/views/admin/poll/shifts/_form.html.erb b/app/views/admin/poll/shifts/_form.html.erb index 07e07381f..230864218 100644 --- a/app/views/admin/poll/shifts/_form.html.erb +++ b/app/views/admin/poll/shifts/_form.html.erb @@ -3,7 +3,7 @@
          - <%= t("admin.poll_shifts.new.new_shift") %> + <%= t("admin.poll_shifts.new.new_shift") %>
          @@ -24,12 +24,12 @@
          <%= select 'shift[date]', 'vote_collection_date', - options_for_select(shift_vote_collection_dates(@booth, @booth.polls.current_or_incoming)), - { prompt: t("admin.poll_shifts.new.select_date"), + options_for_select(shift_vote_collection_dates(@booth, @vote_collection_polls)), + { prompt: @voting_polls.present? ? t("admin.poll_shifts.new.select_date") : t("admin.poll_shifts.new.no_voting_days"), label: false }, class: 'js-shift-vote-collection-dates' %> <%= select 'shift[date]', 'recount_scrutiny_date', - options_for_select(shift_recount_scrutiny_dates(@booth, @booth.polls.current_or_recounting_or_incoming)), + options_for_select(shift_recount_scrutiny_dates(@booth, @recount_polls)), { prompt: t("admin.poll_shifts.new.select_date"), label: false }, class: 'js-shift-recount-scrutiny-dates', diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 2e5e38dc2..50e0b84ff 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -515,6 +515,7 @@ en: search_officer_placeholder: Search officer search_officer_text: Search for an officer to assign a new shift select_date: "Select day" + no_voting_days: "Los dias de votación terminaron" select_task: "Select task" table_shift: "Shift" table_email: "Email" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 06ffa6c52..76747ecf2 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -515,6 +515,7 @@ es: search_officer_placeholder: Buscar presidentes de mesa search_officer_text: Busca al presidente de mesa para asignar un turno select_date: "Seleccionar día" + no_voting_days: "Voting days ended" select_task: "Seleccionar tarea" table_shift: "Turno" table_email: "Email" From 39a0d814274ebcc823f111950c6f1912b3e61ae3 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 23 Oct 2017 20:44:27 +0200 Subject: [PATCH 656/765] Fix current_user access when not anonymous user visits --- app/views/polls/_poll_subnav.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/polls/_poll_subnav.html.erb b/app/views/polls/_poll_subnav.html.erb index 76d9b4508..779c5c8d5 100644 --- a/app/views/polls/_poll_subnav.html.erb +++ b/app/views/polls/_poll_subnav.html.erb @@ -3,7 +3,7 @@
            - <% if current_user.administrator? || @poll.results_enabled? %> + <% if current_user && current_user.administrator? || @poll.results_enabled? %> <% if controller_name == "polls" && action_name == "results" %>

          • <%= t("polls.show.results_menu") %>

            @@ -13,7 +13,7 @@ <% end %> <% end %> - <% if current_user.administrator? || @poll.stats_enabled? %> + <% if current_user && current_user.administrator? || @poll.stats_enabled? %> <% if controller_name == "polls" && action_name == "stats" %>

          • <%= t("polls.show.stats_menu") %>

            From 608ca48b32bfc3648f4e18f9cf87e99d09d8428f Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 23 Oct 2017 21:02:23 +0200 Subject: [PATCH 657/765] Add Recounting and Expired with stats&results polls to dev seeds --- db/dev_seeds.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 8c09923d8..ba6ad3962 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -546,6 +546,13 @@ poll = Poll.create(name: "Upcoming Poll", starts_at: 1.month.from_now, ends_at: 2.months.from_now) +puts " ✅" +print "Recounting Poll" +poll = Poll.create(name: "Recounting Poll", + # slug: "recounting-poll", + starts_at: 1.months.ago, + ends_at: 5.days.ago) + puts " ✅" print "Expired Poll" poll = Poll.create(name: "Expired Poll", @@ -553,6 +560,15 @@ poll = Poll.create(name: "Expired Poll", starts_at: 2.months.ago, ends_at: 1.month.ago) +puts " ✅" +print "Expired Poll with Stats & Results" +poll = Poll.create(name: "Expired Poll with Stats & Results", + # slug: "expired-poll-with-stats-and-results", + starts_at: 2.months.ago, + ends_at: 1.month.ago, + results_enabled: true, + stats_enabled: true) + puts " ✅" print "Creating Poll Questions" From ca63e4998f2e5b71f968cde76d62a8d2bddffab2 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 23 Oct 2017 21:34:13 +0200 Subject: [PATCH 658/765] adds permissions for poll's results and stats --- app/models/abilities/everyone.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/abilities/everyone.rb b/app/models/abilities/everyone.rb index 32f948a5a..dd692c269 100644 --- a/app/models/abilities/everyone.rb +++ b/app/models/abilities/everyone.rb @@ -7,8 +7,12 @@ module Abilities can [:read, :map, :summary, :share], Proposal can :read, Comment can :read, Poll - cannot :results, Poll, results_enabled: false - cannot :stats, Poll, stats_enabled: false + can :results, Poll do |poll| + poll.expired? && poll.results_enabled? + end + can :stats, Poll do |poll| + poll.expired? && poll.stats_enabled? + end can :read, Poll::Question can [:read, :welcome], Budget can :read, SpendingProposal From 21c7ff15fed56543026b1df363b3416eb0314aa8 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 23 Oct 2017 21:34:28 +0200 Subject: [PATCH 659/765] fixes routes for poll's results and stats --- app/views/polls/_poll_group.html.erb | 8 ++++---- app/views/polls/_poll_subnav.html.erb | 4 ++-- config/routes.rb | 6 ++++-- spec/features/polls/polls_spec.rb | 20 ++++++++++---------- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/app/views/polls/_poll_group.html.erb b/app/views/polls/_poll_group.html.erb index 9d83d5233..93174e157 100644 --- a/app/views/polls/_poll_group.html.erb +++ b/app/views/polls/_poll_group.html.erb @@ -21,9 +21,9 @@ <% poll.questions.each do |question| %>

            <% if poll.results_enabled? %> - <%= link_to question.title, poll_results_path(poll) %> + <%= link_to question.title, results_poll_path(poll) %> <% elsif poll.stats_enabled? %> - <%= link_to question.title, poll_stats_path(poll) %> + <%= link_to question.title, stats_poll_path(poll) %> <% else %> <%= link_to question.title, poll %> <% end %> @@ -33,9 +33,9 @@ <% else %>

            <% if poll.results_enabled? %> - <%= link_to poll.name, poll_results_path(poll) %> + <%= link_to poll.name, results_poll_path(poll) %> <% elsif poll.stats_enabled? %> - <%= link_to poll.name, poll_stats_path(poll) %> + <%= link_to poll.name, stats_poll_path(poll) %> <% else %> <%= link_to poll.name, poll %> <% end %> diff --git a/app/views/polls/_poll_subnav.html.erb b/app/views/polls/_poll_subnav.html.erb index 779c5c8d5..112f267ee 100644 --- a/app/views/polls/_poll_subnav.html.erb +++ b/app/views/polls/_poll_subnav.html.erb @@ -9,7 +9,7 @@

            <%= t("polls.show.results_menu") %>

            • <% else %> -
          • <%= link_to t("polls.show.results_menu"), poll_results_path(@poll) %>
            • +
          • <%= link_to t("polls.show.results_menu"), results_poll_path(@poll) %>
            • <% end %> <% end %> @@ -19,7 +19,7 @@

            <%= t("polls.show.stats_menu") %>

            <% else %> -
          • <%= link_to t("polls.show.stats_menu"), poll_stats_path(@poll) %>
            • +
          • <%= link_to t("polls.show.stats_menu"), stats_poll_path(@poll) %>
            • <% end %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index fe38eb9b4..5d54a7c3b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -113,8 +113,10 @@ Rails.application.routes.draw do end resources :polls, only: [:show, :index] do - get :stats - get :results + member do + get :stats + get :results + end resources :questions, controller: 'polls/questions', shallow: true do post :answer, on: :member end diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb index 82180cb23..8629a1087 100644 --- a/spec/features/polls/polls_spec.rb +++ b/spec/features/polls/polls_spec.rb @@ -65,7 +65,7 @@ feature 'Polls' do visit polls_path - expect(page).to have_link("Poll with stats", href: poll_stats_path(poll)) + expect(page).to have_link("Poll with stats", href: stats_poll_path(poll)) end scenario "Poll title link to results if enabled" do @@ -73,7 +73,7 @@ feature 'Polls' do visit polls_path - expect(page).to have_link("Poll with results", href: poll_results_path(poll)) + expect(page).to have_link("Poll with results", href: results_poll_path(poll)) end end @@ -395,10 +395,10 @@ feature 'Polls' do expect(page).to have_content("Poll results") expect(page).to have_content("Participation statistics") - visit poll_results_path(poll) + visit results_poll_path(poll) expect(page).to have_content("Questions") - visit poll_stats_path(poll) + visit stats_poll_path(poll) expect(page).to have_content("Participation data") end @@ -412,10 +412,10 @@ feature 'Polls' do expect(page).to_not have_content("Poll results") expect(page).to_not have_content("Participation statistics") - visit poll_results_path(poll) + visit results_poll_path(poll) expect(page).to have_content("You do not have permission to carry out the action 'results' on poll.") - visit poll_stats_path(poll) + visit stats_poll_path(poll) expect(page).to have_content("You do not have permission to carry out the action 'stats' on poll.") end @@ -429,10 +429,10 @@ feature 'Polls' do expect(page).to_not have_content("Poll results") expect(page).to_not have_content("Participation statistics") - visit poll_results_path(poll) + visit results_poll_path(poll) expect(page).to have_content("You do not have permission to carry out the action 'results' on poll.") - visit poll_stats_path(poll) + visit stats_poll_path(poll) expect(page).to have_content("You do not have permission to carry out the action 'stats' on poll.") end @@ -446,10 +446,10 @@ feature 'Polls' do expect(page).to have_content("Poll results") expect(page).to have_content("Participation statistics") - visit poll_results_path(poll) + visit results_poll_path(poll) expect(page).to have_content("Questions") - visit poll_stats_path(poll) + visit stats_poll_path(poll) expect(page).to have_content("Participation data") end end From b8dd93748f6a4c50e6b54978144e4aac47bfa3e9 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 23 Oct 2017 21:34:49 +0200 Subject: [PATCH 660/765] removes unnecessary code --- app/controllers/polls_controller.rb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb index aa93581cc..708f68abb 100644 --- a/app/controllers/polls_controller.rb +++ b/app/controllers/polls_controller.rb @@ -3,8 +3,6 @@ class PollsController < ApplicationController load_and_authorize_resource - before_filter :set_poll, only: [:stats, :results] - has_filters %w{current expired incoming} has_orders %w{most_voted newest oldest}, only: :show @@ -36,10 +34,4 @@ class PollsController < ApplicationController def results end - private - - def set_poll - @poll = Poll.find(params[:poll_id]) - end - end From 1259d473c6bded544fd66dabf26d7fb6b0cc625e Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 23 Oct 2017 22:13:53 +0200 Subject: [PATCH 661/765] fixes spec --- spec/features/polls/results_spec.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spec/features/polls/results_spec.rb b/spec/features/polls/results_spec.rb index b17fb463a..326344dd9 100644 --- a/spec/features/polls/results_spec.rb +++ b/spec/features/polls/results_spec.rb @@ -6,7 +6,7 @@ feature 'Poll Results' do user2 = create(:user, :level_two) user3 = create(:user, :level_two) - poll = create(:poll) + poll = create(:poll, results_enabled: true) question1 = create(:poll_question, poll: poll) answer1 = create(:poll_question_answer, question: question1, title: 'Yes') answer2 = create(:poll_question_answer, question: question1, title: 'No') @@ -34,7 +34,9 @@ feature 'Poll Results' do expect(Poll::Voter.count).to eq(3) logout - visit poll_results_path(poll) + poll.update(ends_at: 1.day.ago) + + visit results_poll_path(poll) expect(page).to have_content(question1.title) expect(page).to have_content(question2.title) From 13e0c6cc3afaf0c961f62d2c7959955673e843e0 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 23 Oct 2017 22:25:36 +0200 Subject: [PATCH 662/765] Fix voting_polls variable typo on shift creation --- app/views/admin/poll/shifts/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/poll/shifts/_form.html.erb b/app/views/admin/poll/shifts/_form.html.erb index 230864218..7e2930751 100644 --- a/app/views/admin/poll/shifts/_form.html.erb +++ b/app/views/admin/poll/shifts/_form.html.erb @@ -24,7 +24,7 @@
            <%= select 'shift[date]', 'vote_collection_date', - options_for_select(shift_vote_collection_dates(@booth, @vote_collection_polls)), + options_for_select(shift_vote_collection_dates(@booth, @voting_polls)), { prompt: @voting_polls.present? ? t("admin.poll_shifts.new.select_date") : t("admin.poll_shifts.new.no_voting_days"), label: false }, class: 'js-shift-vote-collection-dates' %> From f548f0a1dbc9f430c6a9cd0935233a7a100ce947 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 23 Oct 2017 22:25:36 +0200 Subject: [PATCH 663/765] Fix voting_polls variable typo on shift creation --- app/views/admin/poll/shifts/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/poll/shifts/_form.html.erb b/app/views/admin/poll/shifts/_form.html.erb index 230864218..7e2930751 100644 --- a/app/views/admin/poll/shifts/_form.html.erb +++ b/app/views/admin/poll/shifts/_form.html.erb @@ -24,7 +24,7 @@
            <%= select 'shift[date]', 'vote_collection_date', - options_for_select(shift_vote_collection_dates(@booth, @vote_collection_polls)), + options_for_select(shift_vote_collection_dates(@booth, @voting_polls)), { prompt: @voting_polls.present? ? t("admin.poll_shifts.new.select_date") : t("admin.poll_shifts.new.no_voting_days"), label: false }, class: 'js-shift-vote-collection-dates' %> From 231a14c428bbf8983f157e8593f3238b91238978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 25 Oct 2017 12:52:59 +0200 Subject: [PATCH 664/765] Fixed broken tests --- app/controllers/legislation/proposals_controller.rb | 1 - app/views/legislation/processes/_key_dates.html.erb | 10 +++++----- app/views/legislation/proposals/_form.html.erb | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/controllers/legislation/proposals_controller.rb b/app/controllers/legislation/proposals_controller.rb index 85072a419..d762bb99c 100644 --- a/app/controllers/legislation/proposals_controller.rb +++ b/app/controllers/legislation/proposals_controller.rb @@ -28,7 +28,6 @@ class Legislation::ProposalsController < Legislation::BaseController def create @proposal = Legislation::Proposal.new(proposal_params.merge(author: current_user)) - recover_documents_from_cache(@proposal) if @proposal.save redirect_to share_legislation_process_proposal_path(params[:process_id], @proposal), notice: I18n.t('flash.actions.create.proposal') diff --git a/app/views/legislation/processes/_key_dates.html.erb b/app/views/legislation/processes/_key_dates.html.erb index 0bc95bef5..bf8961d86 100644 --- a/app/views/legislation/processes/_key_dates.html.erb +++ b/app/views/legislation/processes/_key_dates.html.erb @@ -6,7 +6,7 @@
              <% if process.debate_phase.enabled? %> -
            • > +
            • > <%= link_to debate_legislation_process_path(process) do %>

              <%= t('legislation.processes.shared.debate_dates') %>

              <%= format_date(process.debate_start_date) %> - <%= format_date(process.debate_end_date) %>

              @@ -15,7 +15,7 @@ <% end %> <% if process.proposals_phase.enabled? %> -
            • > +
            • > <%= link_to proposals_legislation_process_path(process) do %>

              <%= t('legislation.processes.shared.proposals_dates') %>

              <%= format_date(process.proposals_phase_start_date) %> - <%= format_date(process.proposals_phase_end_date) %>

              @@ -24,7 +24,7 @@ <% end %> <% if process.draft_publication.enabled? %> -
            • > +
            • > <%= link_to draft_publication_legislation_process_path(process) do %>

              <%= t('legislation.processes.shared.draft_publication_date') %>

              <%= format_date(process.draft_publication_date) %>

              @@ -33,7 +33,7 @@ <% end %> <% if process.allegations_phase.enabled? %> -
            • > +
            • > <%= link_to allegations_legislation_process_path(process) do %>

              <%= t('legislation.processes.shared.allegations_dates') %>

              <%= format_date(process.allegations_start_date) %> - <%= format_date(process.allegations_end_date) %>

              @@ -42,7 +42,7 @@ <% end %> <% if process.result_publication.enabled? %> -
            • > +
            • > <%= link_to result_publication_legislation_process_path(process) do %>

              <%= t('legislation.processes.shared.result_publication_date') %>

              <%= format_date(process.result_publication_date) %>

              diff --git a/app/views/legislation/proposals/_form.html.erb b/app/views/legislation/proposals/_form.html.erb index 798266ba1..4efbeb4e2 100644 --- a/app/views/legislation/proposals/_form.html.erb +++ b/app/views/legislation/proposals/_form.html.erb @@ -49,7 +49,7 @@
            - <%= render 'documents/nested_documents', documentable: @proposal %> + <%= render 'documents/nested_documents', documentable: @proposal, f: f %>
            From 8ef4afb07d90a739824d4cf9e00fd88772ade8d9 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Mon, 23 Oct 2017 12:39:36 -0400 Subject: [PATCH 665/765] Enable search by name/email for Administrators --- .../admin/administrators_controller.rb | 14 ++--- .../administrators/_administrator.html.erb | 26 ---------- app/views/admin/administrators/index.html.erb | 27 +++------- .../admin/administrators/search.html.erb | 29 +++++++++++ app/views/admin/administrators/search.js.erb | 1 - .../administrators/user_not_found.js.erb | 1 - config/locales/en/admin.yml | 4 +- config/locales/es/admin.yml | 4 +- spec/features/admin/administrators_spec.rb | 52 ++++++++++++++++++- 9 files changed, 91 insertions(+), 67 deletions(-) delete mode 100644 app/views/admin/administrators/_administrator.html.erb create mode 100644 app/views/admin/administrators/search.html.erb delete mode 100644 app/views/admin/administrators/search.js.erb delete mode 100644 app/views/admin/administrators/user_not_found.js.erb diff --git a/app/controllers/admin/administrators_controller.rb b/app/controllers/admin/administrators_controller.rb index 938a7570d..3467ee0c0 100644 --- a/app/controllers/admin/administrators_controller.rb +++ b/app/controllers/admin/administrators_controller.rb @@ -6,16 +6,10 @@ class Admin::AdministratorsController < Admin::BaseController end def search - @user = User.find_by(email: params[:email]) - - respond_to do |format| - if @user - @administrator = Administrator.find_or_initialize_by(user: @user) - format.js - else - format.js { render "user_not_found" } - end - end + @users = User.search(params[:name_or_email]) + .includes(:administrator) + .page(params[:page]) + .for_render end def create diff --git a/app/views/admin/administrators/_administrator.html.erb b/app/views/admin/administrators/_administrator.html.erb deleted file mode 100644 index d948e1eed..000000000 --- a/app/views/admin/administrators/_administrator.html.erb +++ /dev/null @@ -1,26 +0,0 @@ -
            -
    - - - - - - - -
    - <%= administrator.name %> - - <%= administrator.email %> - - <% if administrator.persisted? %> - <%= link_to t('admin.administrators.administrator.delete'), - admin_administrator_path(administrator), - method: :delete, - class: "button hollow alert" %> - <% else %> - <%= link_to t('admin.administrators.administrator.add'),{ controller: "admin/administrators", action: :create, user_id: administrator.user_id }, - method: :post, - class: "button success" %> - <% end %> -
    -
    diff --git a/app/views/admin/administrators/index.html.erb b/app/views/admin/administrators/index.html.erb index 1cfbf5079..b23a85d61 100644 --- a/app/views/admin/administrators/index.html.erb +++ b/app/views/admin/administrators/index.html.erb @@ -1,39 +1,24 @@

    <%= t("admin.administrators.index.title") %>

    -
    - <%= form_tag search_admin_administrators_path, method: :get, remote: true do %> -
    - <%= text_field_tag :email, '', placeholder: t('admin.administrators.search.email_placeholder') %> -
    -
    - <%= submit_tag t('admin.administrators.search.search'), class: 'button' %> -
    - <% end %> -
    - -
    +<%= render 'admin/shared/user_search', url: search_admin_administrators_path %>

    <%= page_entries_info @administrators %>

    <% @administrators.each do |administrator| %> - - + +
    - <%= administrator.name %> - - <%= administrator.email %> - <%= administrator.name %><%= administrator.email %> <% if administrator.persisted? %> <%= link_to t('admin.administrators.administrator.delete'), admin_administrator_path(administrator), method: :delete, - class: "button hollow alert" - %> + class: "button hollow alert" %> <% else %> <%= link_to t('admin.administrators.administrator.add'), - { controller: "admin/administrators", action: :create, + { controller: "admin/administrators", + action: :create, user_id: administrator.user_id }, method: :post, class: "button success" %> diff --git a/app/views/admin/administrators/search.html.erb b/app/views/admin/administrators/search.html.erb new file mode 100644 index 000000000..3f3c269f1 --- /dev/null +++ b/app/views/admin/administrators/search.html.erb @@ -0,0 +1,29 @@ +

    <%= t("admin.administrators.search.title") %>

    + +<%= render 'admin/shared/user_search', url: search_admin_administrators_path %> + +

    <%= page_entries_info @users %>

    + + + <% @users.each do |user| %> + + + + + + <% end %> +
    <%= user.name %><%= user.email %> + <% if user.administrator? && user.administrator.persisted? %> + <%= link_to t('admin.administrators.administrator.delete'), + admin_administrator_path(user), + method: :delete, + class: "button hollow alert" %> + <% else %> + <%= link_to t('admin.administrators.administrator.add'), + { controller: "admin/administrators", + action: :create, + user_id: user }, + method: :post, + class: "button success" %> + <% end %> +
    diff --git a/app/views/admin/administrators/search.js.erb b/app/views/admin/administrators/search.js.erb deleted file mode 100644 index 1c30d9595..000000000 --- a/app/views/admin/administrators/search.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#search-result").html("<%= j render 'administrator', administrator: @administrator %>"); diff --git a/app/views/admin/administrators/user_not_found.js.erb b/app/views/admin/administrators/user_not_found.js.erb deleted file mode 100644 index ba707fc9d..000000000 --- a/app/views/admin/administrators/user_not_found.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#search-result").html("
    <%= j t('admin.administrators.search.user_not_found') %>
    "); diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 50e0b84ff..29117be66 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -438,9 +438,7 @@ en: delete: Delete restricted_removal: "Sorry, you can't remove yourself from the administrators" search: - email_placeholder: Search user by email - search: Search - user_not_found: User not found + title: 'Administrators: User search' moderators: index: title: Moderators diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 76747ecf2..d998e1f33 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -387,9 +387,7 @@ es: delete: Borrar restricted_removal: "Lo sentimos, no puedes eliminarte a ti mismo de la lista" search: - email_placeholder: Buscar usuario por email - search: Buscar - user_not_found: Usuario no encontrado + title: 'Administradores: Búsqueda de usuarios' managers: index: title: Gestores diff --git a/spec/features/admin/administrators_spec.rb b/spec/features/admin/administrators_spec.rb index bef57b75d..4e2091d11 100644 --- a/spec/features/admin/administrators_spec.rb +++ b/spec/features/admin/administrators_spec.rb @@ -16,7 +16,7 @@ feature 'Admin administrators' do end scenario 'Create Administrator', :js do - fill_in 'email', with: @user.email + fill_in 'name_or_email', with: @user.email click_button 'Search' expect(page).to have_content @user.name @@ -41,5 +41,53 @@ feature 'Admin administrators' do expect(page).to have_content I18n.t("admin.administrators.administrator.restricted_removal") end end -end + context 'Search' do + + background do + user = create(:user, username: 'Bernard Sumner', email: 'bernard@sumner.com') + user2 = create(:user, username: 'Tony Soprano', email: 'tony@soprano.com') + @administrator1 = create(:administrator, user: user) + @administrator2 = create(:administrator, user: user2) + visit admin_administrators_path + end + + scenario 'returns no results if search term is empty' do + expect(page).to have_content(@administrator1.name) + expect(page).to have_content(@administrator2.name) + + fill_in 'name_or_email', with: ' ' + click_button 'Search' + + expect(page).to have_content('Administrators: User search') + expect(page).to have_content('users cannot be found') + expect(page).to_not have_content(@administrator1.name) + expect(page).to_not have_content(@administrator2.name) + end + + scenario 'search by name' do + expect(page).to have_content(@administrator1.name) + expect(page).to have_content(@administrator2.name) + + fill_in 'name_or_email', with: 'Sumn' + click_button 'Search' + + expect(page).to have_content('Administrators: User search') + expect(page).to have_content(@administrator1.name) + expect(page).to_not have_content(@administrator2.name) + end + + scenario 'search by email' do + expect(page).to have_content(@administrator1.email) + expect(page).to have_content(@administrator2.email) + + fill_in 'name_or_email', with: @administrator2.email + click_button 'Search' + + expect(page).to have_content('Administrators: User search') + expect(page).to have_content(@administrator2.email) + expect(page).to_not have_content(@administrator1.email) + end + end + +end From 41f1f4e695ca5a5cdd55777acb10323e42e51973 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Mon, 23 Oct 2017 13:25:03 -0400 Subject: [PATCH 666/765] Enable search by name/email for Moderators --- .../admin/moderators_controller.rb | 14 ++--- .../admin/moderators/_moderator.html.erb | 26 ---------- app/views/admin/moderators/index.html.erb | 24 ++------- app/views/admin/moderators/search.html.erb | 29 +++++++++++ app/views/admin/moderators/search.js.erb | 1 - .../admin/moderators/user_not_found.js.erb | 1 - config/locales/en/admin.yml | 4 +- config/locales/es/admin.yml | 4 +- spec/features/admin/moderators_spec.rb | 52 ++++++++++++++++++- 9 files changed, 90 insertions(+), 65 deletions(-) delete mode 100644 app/views/admin/moderators/_moderator.html.erb create mode 100644 app/views/admin/moderators/search.html.erb delete mode 100644 app/views/admin/moderators/search.js.erb delete mode 100644 app/views/admin/moderators/user_not_found.js.erb diff --git a/app/controllers/admin/moderators_controller.rb b/app/controllers/admin/moderators_controller.rb index 2566c0c02..cd5072aa8 100644 --- a/app/controllers/admin/moderators_controller.rb +++ b/app/controllers/admin/moderators_controller.rb @@ -6,16 +6,10 @@ class Admin::ModeratorsController < Admin::BaseController end def search - @user = User.find_by(email: params[:email]) - - respond_to do |format| - if @user - @moderator = Moderator.find_or_initialize_by(user: @user) - format.js - else - format.js { render "user_not_found" } - end - end + @users = User.search(params[:name_or_email]) + .includes(:moderator) + .page(params[:page]) + .for_render end def create diff --git a/app/views/admin/moderators/_moderator.html.erb b/app/views/admin/moderators/_moderator.html.erb deleted file mode 100644 index 57a29d2e8..000000000 --- a/app/views/admin/moderators/_moderator.html.erb +++ /dev/null @@ -1,26 +0,0 @@ -
    - - - - - - - - -
    - <%= moderator.name %> - - <%= moderator.email %> - - <% if moderator.persisted? %> - <%= link_to t('admin.moderators.moderator.delete'), - admin_moderator_path(moderator), - method: :delete, - class: "button hollow alert" %> - <% else %> - <%= link_to t('admin.moderators.moderator.add'),{ controller: "admin/moderators", action: :create, user_id: moderator.user_id }, - method: :post, - class: "button success" %> - <% end %> -
    -
    diff --git a/app/views/admin/moderators/index.html.erb b/app/views/admin/moderators/index.html.erb index 0fc8703fd..735a193ff 100644 --- a/app/views/admin/moderators/index.html.erb +++ b/app/views/admin/moderators/index.html.erb @@ -2,30 +2,15 @@

    <%= t("admin.moderators.index.title") %>

    -
    - <%= form_tag search_admin_moderators_path, method: :get, remote: true do %> -
    - <%= text_field_tag :email, '', placeholder: t('admin.moderators.search.email_placeholder') %> -
    -
    - <%= submit_tag t('admin.moderators.search.search'), class: 'button' %> -
    - <% end %> -
    - -
    +<%= render 'admin/shared/user_search', url: search_admin_moderators_path %>

    <%= page_entries_info @moderators %>

    <% @moderators.each do |moderator| %> - - + + - diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index e94f803c5..b44179ab2 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -454,7 +454,6 @@ en: title: Valuators valuator: description_placeholder: 'Description (optional)' - user_found: User found add: Add to valuators search: title: 'Valuators: User search' diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 48ea7b4d2..53e01b38b 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -454,7 +454,6 @@ es: title: Evaluadores valuator: description_placeholder: "Descripción (opcional)" - user_found: Usuario encontrado add: Añadir como evaluador search: title: 'Evaluadores: Búsqueda de usuarios' diff --git a/spec/features/admin/valuators_spec.rb b/spec/features/admin/valuators_spec.rb index 10db62933..86f2c89e9 100644 --- a/spec/features/admin/valuators_spec.rb +++ b/spec/features/admin/valuators_spec.rb @@ -2,30 +2,30 @@ require 'rails_helper' feature 'Admin valuators' do background do - @admin = create(:administrator) - @user = create(:user, username: 'Jose Luis Balbin') + @admin = create(:administrator) + @user = create(:user, username: 'Jose Luis Balbin') @valuator = create(:valuator) login_as(@admin.user) visit admin_valuators_path end scenario 'Index' do - expect(page).to have_content @valuator.name - expect(page).to have_content @valuator.email - expect(page).to_not have_content @user.name + expect(page).to have_content(@valuator.name) + expect(page).to have_content(@valuator.email) + expect(page).to_not have_content(@user.name) end - pending 'Create Valuator', :js do + scenario 'Create Valuator', :js do fill_in 'name_or_email', with: @user.email click_button 'Search' - expect(page).to have_content @user.name + expect(page).to have_content(@user.name) fill_in 'valuator_description', with: 'environmental expert' click_button 'Add to valuators' - within("#valuators") do - expect(page).to have_content @user.name - expect(page).to have_content 'environmental expert' + within('#valuators') do + expect(page).to have_content(@user.name) + expect(page).to have_content('environmental expert') end end From b5f2f9aa214256bb1ef0f64fb38bd9b65395fd7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 25 Oct 2017 16:42:24 +0200 Subject: [PATCH 670/765] Added `cached_votes_total` and `cached_votes_down` to Legislation Proposals --- app/models/legislation/proposal.rb | 10 +++++++++- ...142440_add_cached_votes_to_legislation_proposals.rb | 6 ++++++ db/schema.rb | 4 +++- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20171025142440_add_cached_votes_to_legislation_proposals.rb diff --git a/app/models/legislation/proposal.rb b/app/models/legislation/proposal.rb index 5ced1529d..32badbb46 100644 --- a/app/models/legislation/proposal.rb +++ b/app/models/legislation/proposal.rb @@ -80,10 +80,18 @@ class Legislation::Proposal < ActiveRecord::Base /\A#{Setting["proposal_code_prefix"]}-\d\d\d\d-\d\d-(\d*)\z/.match(terms) end - def total_votes + def likes cached_votes_up end + def dislikes + cached_votes_down + end + + def total_votes + cached_votes_total + end + def voters User.active.where(id: votes_for.voters) end diff --git a/db/migrate/20171025142440_add_cached_votes_to_legislation_proposals.rb b/db/migrate/20171025142440_add_cached_votes_to_legislation_proposals.rb new file mode 100644 index 000000000..92544ddb6 --- /dev/null +++ b/db/migrate/20171025142440_add_cached_votes_to_legislation_proposals.rb @@ -0,0 +1,6 @@ +class AddCachedVotesToLegislationProposals < ActiveRecord::Migration + def change + add_column :legislation_proposals, :cached_votes_total, :integer, default: 0 + add_column :legislation_proposals, :cached_votes_down, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index f8dd19c13..05faf6f36 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: 20171020163240) do +ActiveRecord::Schema.define(version: 20171025142440) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -528,6 +528,8 @@ ActiveRecord::Schema.define(version: 20171020163240) do t.integer "community_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "cached_votes_total", default: 0 + t.integer "cached_votes_down", default: 0 end add_index "legislation_proposals", ["legislation_process_id"], name: "index_legislation_proposals_on_legislation_process_id", using: :btree From 276baedcfaf2ae7c6627562b3584ca2ad09e08b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 25 Oct 2017 16:42:55 +0200 Subject: [PATCH 671/765] Added votes to Legislation Proposals --- .../legislation/proposals_controller.rb | 2 +- .../legislation/proposals/_votes.html.erb | 70 ++++++++++++------- 2 files changed, 46 insertions(+), 26 deletions(-) diff --git a/app/controllers/legislation/proposals_controller.rb b/app/controllers/legislation/proposals_controller.rb index d762bb99c..fa35ea171 100644 --- a/app/controllers/legislation/proposals_controller.rb +++ b/app/controllers/legislation/proposals_controller.rb @@ -42,7 +42,7 @@ class Legislation::ProposalsController < Legislation::BaseController end def vote - @proposal.register_vote(current_user, 'yes') + @proposal.register_vote(current_user, params[:value]) set_legislation_proposal_votes(@proposal) end diff --git a/app/views/legislation/proposals/_votes.html.erb b/app/views/legislation/proposals/_votes.html.erb index b294acf45..cfc80aa1b 100644 --- a/app/views/legislation/proposals/_votes.html.erb +++ b/app/views/legislation/proposals/_votes.html.erb @@ -1,40 +1,60 @@ -
    - - <%= t("proposals.proposal.supports", count: proposal.total_votes) %>  - - -
    - <% if voted_for?(@legislation_proposal_votes, proposal) %> -
    - <%= t("proposals.proposal.already_supported") %> -
    - <% elsif user_signed_in? && proposal.votable_by?(current_user) %> - <%= link_to vote_url, - class: "button button-support small expanded", - title: t('proposals.proposal.support_title'), method: "post", remote: true do %> - <%= t("proposals.proposal.support") %> +<% voted_classes = css_classes_for_vote(@legislation_proposal_votes, proposal) %> +
    +
    + <% if user_signed_in? %> + <%= link_to vote_legislation_process_proposal_path(process_id: proposal.process, id: proposal, value: 'yes'), + class: "like #{voted_classes[:in_favor]}", title: t('votes.agree'), method: "post", remote: true do %> + + <%= t('votes.agree') %> + + <%= votes_percentage('likes', proposal) %> <% end %> <% else %> -
    - <%= t("proposals.proposal.support") %> + <% end %>
    + + +
    + <% if user_signed_in? %> + <%= link_to vote_legislation_process_proposal_path(process_id: proposal.process, id: proposal, value: 'no'), class: "unlike #{voted_classes[:against]}", title: t('votes.disagree'), method: "post", remote: true do %> + + <%= t('votes.disagree') %> + + <%= votes_percentage('dislikes', proposal) %> + <% end %> + <% else %> +
    + + <%= t('votes.disagree') %> + + <%= votes_percentage('dislikes', proposal) %> +
    + <% end %> +
    + + + <%= t("proposals.proposal.votes", count: proposal.total_votes) %> + + <% if user_signed_in? && current_user.organization? %> - <% elsif user_signed_in? && !proposal.votable_by?(current_user) %> -
    - + <% elsif user_signed_in? && !proposal.votable_by?(current_user)%> + <% elsif !user_signed_in? %>
    From 1b4756e073271862de30269c001a239b27ff4adb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 25 Oct 2017 16:43:16 +0200 Subject: [PATCH 672/765] Front improvements and new translations --- app/assets/stylesheets/participation.scss | 5 ++++- app/views/legislation/processes/proposals.html.erb | 2 +- app/views/legislation/proposals/_featured_proposal.html.erb | 2 +- app/views/legislation/proposals/_proposal.html.erb | 2 +- config/locales/en/general.yml | 4 ++++ config/locales/es/general.yml | 4 ++++ 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 81757d78c..40d546999 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -855,7 +855,9 @@ } .debate, -.debate-show { +.debate-show, +.proposal-show, +.legislation-proposals { .votes { @include votes; @@ -870,6 +872,7 @@ } } +.proposal-show .votes, .debate-show .votes { border: 0; padding: $line-height / 2 0; diff --git a/app/views/legislation/processes/proposals.html.erb b/app/views/legislation/processes/proposals.html.erb index 5883658b7..c1b0abfaf 100644 --- a/app/views/legislation/processes/proposals.html.erb +++ b/app/views/legislation/processes/proposals.html.erb @@ -8,7 +8,7 @@
    -
    +
    <% if @process.proposals.empty? %>

    <%= t('.empty_questions') %>

    diff --git a/app/views/legislation/proposals/_featured_proposal.html.erb b/app/views/legislation/proposals/_featured_proposal.html.erb index 5500b2418..63a0e6c2c 100644 --- a/app/views/legislation/proposals/_featured_proposal.html.erb +++ b/app/views/legislation/proposals/_featured_proposal.html.erb @@ -17,7 +17,7 @@  •  <% end %> - <%= t("proposals.proposal.supports", count: proposal.total_votes) %> + <%= t("proposals.proposal.votes", count: proposal.total_votes) %>
    diff --git a/app/views/legislation/proposals/_proposal.html.erb b/app/views/legislation/proposals/_proposal.html.erb index 92becc805..0916f0de5 100644 --- a/app/views/legislation/proposals/_proposal.html.erb +++ b/app/views/legislation/proposals/_proposal.html.erb @@ -50,7 +50,7 @@
    -
    +
    <%= render 'legislation/proposals/votes', { proposal: proposal, vote_url: vote_legislation_process_proposal_path(proposal.legislation_process_id, proposal, value: 'yes') } %>
    diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 926410b51..107aaecaa 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -421,6 +421,10 @@ en: one: 1 support other: "%{count} supports" zero: No supports + votes: + one: 1 vote + other: "%{count} votes" + zero: No votes supports_necessary: "%{number} supports needed" total_percent: 100% archived: "This proposal has been archived and can't collect supports." diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index f82ba9ed7..ca88d8c1d 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -421,6 +421,10 @@ es: one: 1 apoyo other: "%{count} apoyos" zero: Sin apoyos + votes: + one: 1 voto + other: "%{count} votos" + zero: Sin votos supports_necessary: "%{number} apoyos necesarios" total_percent: 100% archived: "Esta propuesta ha sido archivada y ya no puede recoger apoyos." From b556617a80108c1aa119a1703158261b74df55a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 25 Oct 2017 16:43:25 +0200 Subject: [PATCH 673/765] Changed permissions to vote Legislation Proposals and Answers --- app/models/abilities/common.rb | 1 + app/models/abilities/everyone.rb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/abilities/common.rb b/app/models/abilities/common.rb index 310cc743e..8f289f986 100644 --- a/app/models/abilities/common.rb +++ b/app/models/abilities/common.rb @@ -67,6 +67,7 @@ module Abilities can :vote, Legislation::Proposal can :vote_featured, Legislation::Proposal + can :create, Legislation::Answer can :create, Budget::Investment, budget: { phase: "accepting" } can :suggest, Budget::Investment, budget: { phase: "accepting" } diff --git a/app/models/abilities/everyone.rb b/app/models/abilities/everyone.rb index 258e030bd..a3720803e 100644 --- a/app/models/abilities/everyone.rb +++ b/app/models/abilities/everyone.rb @@ -27,7 +27,6 @@ module Abilities can [:read, :debate, :draft_publication, :allegations, :result_publication, :proposals], Legislation::Process, published: true can [:read, :changes, :go_to_version], Legislation::DraftVersion can [:read], Legislation::Question - can [:create], Legislation::Answer can [:read, :map, :share], Legislation::Proposal can [:search, :comments, :read, :create, :new_comment], Legislation::Annotation end From 2d95069a7b4b211e96d621541a8330b625c6c05a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Wed, 25 Oct 2017 17:55:55 +0200 Subject: [PATCH 674/765] Missing translations --- app/views/legislation/processes/proposals.html.erb | 2 +- config/locales/en/legislation.yml | 3 +++ config/locales/es/legislation.yml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/views/legislation/processes/proposals.html.erb b/app/views/legislation/processes/proposals.html.erb index c1b0abfaf..102766755 100644 --- a/app/views/legislation/processes/proposals.html.erb +++ b/app/views/legislation/processes/proposals.html.erb @@ -11,7 +11,7 @@
    <% if @process.proposals.empty? %>
    -

    <%= t('.empty_questions') %>

    +

    <%= t('.empty_proposals') %>

    <% else %> <%= render @process.proposals %> diff --git a/config/locales/en/legislation.yml b/config/locales/en/legislation.yml index 37f9c02aa..8afaf4de3 100644 --- a/config/locales/en/legislation.yml +++ b/config/locales/en/legislation.yml @@ -49,6 +49,8 @@ en: processes: header: view_process_information: View process information + proposals: + empty_proposals: There are no proposals debate: empty_questions: There aren't any questions participate: Participate in the debate @@ -86,6 +88,7 @@ en: draft_publication_date: Draft publication allegations_dates: Allegations result_publication_date: Final result publication + proposals_dates: Proposals questions: comments: comment_button: Publish answer diff --git a/config/locales/es/legislation.yml b/config/locales/es/legislation.yml index 32617e808..5c04d2fa5 100644 --- a/config/locales/es/legislation.yml +++ b/config/locales/es/legislation.yml @@ -49,6 +49,8 @@ es: processes: header: view_process_information: Ver información del proceso + proposals: + empty_proposals: No hay propuestas debate: empty_questions: No hay preguntas participate: Realiza tus aportaciones al debate previo participando en los siguientes temas. From 1e4926528878eeb706d7994819433ab688c8e692 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 25 Oct 2017 18:40:17 +0200 Subject: [PATCH 675/765] improves admin administrators views --- app/views/admin/administrators/index.html.erb | 82 ++++++++++--------- .../admin/administrators/search.html.erb | 59 ++++++++----- spec/features/admin/administrators_spec.rb | 2 +- 3 files changed, 80 insertions(+), 63 deletions(-) diff --git a/app/views/admin/administrators/index.html.erb b/app/views/admin/administrators/index.html.erb index edb548ab4..44b423f39 100644 --- a/app/views/admin/administrators/index.html.erb +++ b/app/views/admin/administrators/index.html.erb @@ -2,45 +2,47 @@ <%= render 'admin/shared/user_search', url: search_admin_administrators_path %> -<% if @administrators.any? %> -

    <%= page_entries_info @administrators %>

    +
    + <% if @administrators.any? %> +

    <%= page_entries_info @administrators %>

    -
    - <%= moderator.name %> - - <%= moderator.email %> - <%= moderator.name %><%= moderator.email %> <% if moderator.persisted? %> <%= link_to t('admin.moderators.moderator.delete'), @@ -35,7 +20,8 @@ %> <% else %> <%= link_to t('admin.moderators.moderator.add'), - { controller: "admin/moderators", action: :create, + { controller: "admin/moderators", + action: :create, user_id: moderator.user_id }, method: :post, class: "button success" %> diff --git a/app/views/admin/moderators/search.html.erb b/app/views/admin/moderators/search.html.erb new file mode 100644 index 000000000..89e9dc9a7 --- /dev/null +++ b/app/views/admin/moderators/search.html.erb @@ -0,0 +1,29 @@ +

    <%= t("admin.moderators.search.title") %>

    + +<%= render 'admin/shared/user_search', url: search_admin_moderators_path %> + +

    <%= page_entries_info @users %>

    + + + <% @users.each do |user| %> + + + + + + <% end %> +
    <%= user.name %><%= user.email %> + <% if user.moderator? && user.moderator.persisted? %> + <%= link_to t('admin.moderators.moderator.delete'), + admin_moderator_path(user), + method: :delete, + class: "button hollow alert" %> + <% else %> + <%= link_to t('admin.moderators.moderator.add'), + { controller: "admin/moderators", + action: :create, + user_id: user }, + method: :post, + class: "button success" %> + <% end %> +
    diff --git a/app/views/admin/moderators/search.js.erb b/app/views/admin/moderators/search.js.erb deleted file mode 100644 index 887d8aa3a..000000000 --- a/app/views/admin/moderators/search.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#search-result").html("<%= j render 'moderator', moderator: @moderator %>"); diff --git a/app/views/admin/moderators/user_not_found.js.erb b/app/views/admin/moderators/user_not_found.js.erb deleted file mode 100644 index a8573236c..000000000 --- a/app/views/admin/moderators/user_not_found.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#search-result").html("
    <%= j t('admin.moderators.search.user_not_found') %>
    "); diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 29117be66..d18a2daef 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -446,9 +446,7 @@ en: add: Add delete: Delete search: - email_placeholder: Search user by email - search: Search - user_not_found: User not found + title: 'Moderators: User search' newsletters: index: title: Newsletters diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index d998e1f33..ecb4e5179 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -446,9 +446,7 @@ es: add: Añadir como Moderador delete: Borrar search: - email_placeholder: Buscar usuario por email - search: Buscar - user_not_found: Usuario no encontrado + title: 'Moderadores: Búsqueda de usuarios' newsletters: index: title: Envío de newsletters diff --git a/spec/features/admin/moderators_spec.rb b/spec/features/admin/moderators_spec.rb index e8e29b182..2c2994d62 100644 --- a/spec/features/admin/moderators_spec.rb +++ b/spec/features/admin/moderators_spec.rb @@ -16,7 +16,7 @@ feature 'Admin moderators' do end scenario 'Create Moderator', :js do - fill_in 'email', with: @user.email + fill_in 'name_or_email', with: @user.email click_button 'Search' expect(page).to have_content @user.name @@ -33,5 +33,53 @@ feature 'Admin moderators' do expect(page).to_not have_content @moderator.name end end -end + context 'Search' do + + background do + user = create(:user, username: 'Elizabeth Bathory', email: 'elizabeth@bathory.com') + user2 = create(:user, username: 'Ada Lovelace', email: 'ada@lovelace.com') + @moderator1 = create(:moderator, user: user) + @moderator2 = create(:moderator, user: user2) + visit admin_moderators_path + end + + scenario 'returns no results if search term is empty' do + expect(page).to have_content(@moderator1.name) + expect(page).to have_content(@moderator2.name) + + fill_in 'name_or_email', with: ' ' + click_button 'Search' + + expect(page).to have_content('Moderators: User search') + expect(page).to have_content('users cannot be found') + expect(page).to_not have_content(@moderator1.name) + expect(page).to_not have_content(@moderator2.name) + end + + scenario 'search by name' do + expect(page).to have_content(@moderator1.name) + expect(page).to have_content(@moderator2.name) + + fill_in 'name_or_email', with: 'Eliz' + click_button 'Search' + + expect(page).to have_content('Moderators: User search') + expect(page).to have_content(@moderator1.name) + expect(page).to_not have_content(@moderator2.name) + end + + scenario 'search by email' do + expect(page).to have_content(@moderator1.email) + expect(page).to have_content(@moderator2.email) + + fill_in 'name_or_email', with: @moderator2.email + click_button 'Search' + + expect(page).to have_content('Moderators: User search') + expect(page).to have_content(@moderator2.email) + expect(page).to_not have_content(@moderator1.email) + end + end + +end From 59c97b4db7c655b942a930e2e7b2d44f651856c1 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Mon, 23 Oct 2017 15:18:23 -0400 Subject: [PATCH 667/765] Enable search by name/email for Valuators --- app/controllers/admin/valuators_controller.rb | 16 ++---- app/views/admin/valuators/index.html.erb | 27 ++-------- app/views/admin/valuators/search.html.erb | 19 +++++++ app/views/admin/valuators/search.js.erb | 1 - .../admin/valuators/user_not_found.js.erb | 1 - config/locales/en/admin.yml | 4 +- config/locales/es/admin.yml | 4 +- spec/features/admin/valuators_spec.rb | 53 +++++++++++++++++-- 8 files changed, 80 insertions(+), 45 deletions(-) create mode 100644 app/views/admin/valuators/search.html.erb delete mode 100644 app/views/admin/valuators/search.js.erb delete mode 100644 app/views/admin/valuators/user_not_found.js.erb diff --git a/app/controllers/admin/valuators_controller.rb b/app/controllers/admin/valuators_controller.rb index 4b52a753e..d567a38b2 100644 --- a/app/controllers/admin/valuators_controller.rb +++ b/app/controllers/admin/valuators_controller.rb @@ -6,16 +6,10 @@ class Admin::ValuatorsController < Admin::BaseController end def search - @user = User.find_by(email: params[:email]) - - respond_to do |format| - if @user - @valuator = Valuator.find_or_initialize_by(user: @user) - format.js - else - format.js { render "user_not_found" } - end - end + @users = User.search(params[:name_or_email]) + .includes(:valuator) + .page(params[:page]) + .for_render end def create @@ -36,4 +30,4 @@ class Admin::ValuatorsController < Admin::BaseController params.require(:valuator).permit(:user_id, :description) end -end \ No newline at end of file +end diff --git a/app/views/admin/valuators/index.html.erb b/app/views/admin/valuators/index.html.erb index 30132e66f..d496b1ecd 100644 --- a/app/views/admin/valuators/index.html.erb +++ b/app/views/admin/valuators/index.html.erb @@ -1,34 +1,15 @@

    <%= t("admin.valuators.index.title") %>

    -
    - <%= form_tag search_admin_valuators_path, method: :get, remote: true do %> -
    - <%= text_field_tag :email, '', placeholder: t('admin.valuators.search.email_placeholder') %> -
    -
    - <%= submit_tag t('admin.valuators.search.search'), class: 'button radius' %> -
    - <% end %> -
    - -
    +<%= render 'admin/shared/user_search', url: search_admin_valuators_path %>

    <%= page_entries_info @valuators %>

    <% @valuators.each do |valuator| %> - - - + + + <% end %>
    - <%= valuator.name %> - - <%= valuator.email %> - - <% if valuator.description.present? %> - <%= valuator.description %> - <% end %> - <%= valuator.name %><%= valuator.email %><%= valuator.description if valuator.description.present? %>
    diff --git a/app/views/admin/valuators/search.html.erb b/app/views/admin/valuators/search.html.erb new file mode 100644 index 000000000..8ca18322d --- /dev/null +++ b/app/views/admin/valuators/search.html.erb @@ -0,0 +1,19 @@ +

    <%= t("admin.valuators.search.title") %>

    + +<%= render 'admin/shared/user_search', url: search_admin_valuators_path %> + +

    <%= page_entries_info @users %>

    + + + <% @users.each do |user| %> + + + + + + <% end %> +
    <%= user.name %><%= user.email %> + <% if user.valuator? && user.valuator.description.present? %> + <%= user.valuator.description %> + <% end %> +
    diff --git a/app/views/admin/valuators/search.js.erb b/app/views/admin/valuators/search.js.erb deleted file mode 100644 index 4068c146e..000000000 --- a/app/views/admin/valuators/search.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#search-result").html("<%= j render 'valuator', valuator: @valuator %>"); diff --git a/app/views/admin/valuators/user_not_found.js.erb b/app/views/admin/valuators/user_not_found.js.erb deleted file mode 100644 index af3f83a3f..000000000 --- a/app/views/admin/valuators/user_not_found.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#search-result").html("
    <%= j t('admin.valuators.search.user_not_found') %>
    "); diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index d18a2daef..6bb8bfecf 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -459,9 +459,7 @@ en: user_found: User found add: Add to valuators search: - email_placeholder: Search user by email - search: Search - user_not_found: User not found + title: 'Valuators: User search' summary: title: Valuator summary for investment projects valuator_name: Valuator diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index ecb4e5179..94700154a 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -459,9 +459,7 @@ es: user_found: Usuario encontrado add: Añadir como evaluador search: - email_placeholder: Buscar usuario por email - search: Buscar - user_not_found: Usuario no encontrado + title: 'Evaluadores: Búsqueda de usuarios' summary: title: Resumen de evaluación de propuestas de inversión valuator_name: Evaluador diff --git a/spec/features/admin/valuators_spec.rb b/spec/features/admin/valuators_spec.rb index d95432474..10db62933 100644 --- a/spec/features/admin/valuators_spec.rb +++ b/spec/features/admin/valuators_spec.rb @@ -15,8 +15,8 @@ feature 'Admin valuators' do expect(page).to_not have_content @user.name end - scenario 'Create Valuator', :js do - fill_in 'email', with: @user.email + pending 'Create Valuator', :js do + fill_in 'name_or_email', with: @user.email click_button 'Search' expect(page).to have_content @user.name @@ -29,5 +29,52 @@ feature 'Admin valuators' do end end -end + context 'Search' do + background do + user = create(:user, username: 'David Foster Wallace', email: 'david@wallace.com') + user2 = create(:user, username: 'Steven Erikson', email: 'steven@erikson.com') + @valuator1 = create(:valuator, user: user) + @valuator2 = create(:valuator, user: user2) + visit admin_valuators_path + end + + scenario 'returns no results if search term is empty' do + expect(page).to have_content(@valuator1.name) + expect(page).to have_content(@valuator2.name) + + fill_in 'name_or_email', with: ' ' + click_button 'Search' + + expect(page).to have_content('Valuators: User search') + expect(page).to have_content('users cannot be found') + expect(page).to_not have_content(@valuator1.name) + expect(page).to_not have_content(@valuator2.name) + end + + scenario 'search by name' do + expect(page).to have_content(@valuator1.name) + expect(page).to have_content(@valuator2.name) + + fill_in 'name_or_email', with: 'Foster' + click_button 'Search' + + expect(page).to have_content('Valuators: User search') + expect(page).to have_content(@valuator1.name) + expect(page).to_not have_content(@valuator2.name) + end + + scenario 'search by email' do + expect(page).to have_content(@valuator1.email) + expect(page).to have_content(@valuator2.email) + + fill_in 'name_or_email', with: @valuator2.email + click_button 'Search' + + expect(page).to have_content('Valuators: User search') + expect(page).to have_content(@valuator2.email) + expect(page).to_not have_content(@valuator1.email) + end + end + +end From 91aa6e3302905aa78e448dc543e175a543db184d Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Mon, 23 Oct 2017 15:49:27 -0400 Subject: [PATCH 668/765] Enable search by name/email for Managers --- app/controllers/admin/managers_controller.rb | 14 ++--- app/views/admin/managers/_manager.html.erb | 24 --------- app/views/admin/managers/index.html.erb | 36 +++++-------- app/views/admin/managers/search.html.erb | 29 +++++++++++ app/views/admin/managers/search.js.erb | 1 - .../admin/managers/user_not_found.js.erb | 1 - config/locales/en/admin.yml | 4 +- config/locales/es/admin.yml | 4 +- spec/features/admin/managers_spec.rb | 52 ++++++++++++++++++- 9 files changed, 97 insertions(+), 68 deletions(-) delete mode 100644 app/views/admin/managers/_manager.html.erb create mode 100644 app/views/admin/managers/search.html.erb delete mode 100644 app/views/admin/managers/search.js.erb delete mode 100644 app/views/admin/managers/user_not_found.js.erb diff --git a/app/controllers/admin/managers_controller.rb b/app/controllers/admin/managers_controller.rb index 5023a1380..865ead3be 100644 --- a/app/controllers/admin/managers_controller.rb +++ b/app/controllers/admin/managers_controller.rb @@ -6,16 +6,10 @@ class Admin::ManagersController < Admin::BaseController end def search - @user = User.find_by(email: params[:email]) - - respond_to do |format| - if @user - @manager = Manager.find_or_initialize_by(user: @user) - format.js - else - format.js { render "user_not_found" } - end - end + @users = User.search(params[:name_or_email]) + .includes(:manager) + .page(params[:page]) + .for_render end def create diff --git a/app/views/admin/managers/_manager.html.erb b/app/views/admin/managers/_manager.html.erb deleted file mode 100644 index 3e709eb60..000000000 --- a/app/views/admin/managers/_manager.html.erb +++ /dev/null @@ -1,24 +0,0 @@ -
    - - - - - - -
    - <%= manager.name %> - - <%= manager.email %> - - <% if manager.persisted? %> - <%= link_to t('admin.managers.manager.delete'), - admin_manager_path(manager), - method: :delete, - class: "button hollow alert" - %> - <% else %> - <%= link_to t('admin.managers.manager.add'),{ controller: "admin/managers", action: :create, user_id: manager.user_id }, - method: :post, class: "button success" %> - <% end %> -
    -
    diff --git a/app/views/admin/managers/index.html.erb b/app/views/admin/managers/index.html.erb index d479ba303..2291f8384 100644 --- a/app/views/admin/managers/index.html.erb +++ b/app/views/admin/managers/index.html.erb @@ -1,39 +1,27 @@

    <%= t("admin.managers.index.title") %>

    -
    - <%= form_tag search_admin_managers_path, method: :get, remote: true do %> -
    - <%= text_field_tag :email, '', placeholder: t('admin.managers.search.email_placeholder') %> -
    -
    - <%= submit_tag t('admin.managers.search.search'), class: 'button' %> -
    - <% end %> -
    - -
    +<%= render 'admin/shared/user_search', url: search_admin_managers_path %>

    <%= page_entries_info @managers %>

    <% @managers.each do |manager| %> - - + + diff --git a/app/views/admin/managers/search.html.erb b/app/views/admin/managers/search.html.erb new file mode 100644 index 000000000..c6ea3c2cd --- /dev/null +++ b/app/views/admin/managers/search.html.erb @@ -0,0 +1,29 @@ +

    <%= t("admin.managers.search.title") %>

    + +<%= render 'admin/shared/user_search', url: search_admin_managers_path %> + +

    <%= page_entries_info @users %>

    + +
    - <%= manager.name %> - - <%= manager.email %> - <%= manager.name %><%= manager.email %> <% if manager.persisted? %> <%= link_to t('admin.managers.manager.delete'), - admin_manager_path(manager), - method: :delete, - class: "button hollow alert" - %> + admin_manager_path(manager), + method: :delete, + class: "button hollow alert" %> <% else %> - <%= link_to t('admin.managers.manager.add'),{ controller: "admin/managers", action: :create, user_id: manager.user_id }, - method: :post, class: "button success" %> + <%= link_to t('admin.managers.manager.add'), + { controller: "admin/managers", + action: :create, + user_id: manager.user_id }, + method: :post, + class: "button success" %> <% end %>
    + <% @users.each do |user| %> + + + + + + <% end %> +
    <%= user.name %><%= user.email %> + <% if user.manager? && user.manager.persisted? %> + <%= link_to t('admin.managers.manager.delete'), + admin_manager_path(user), + method: :delete, + class: "button hollow alert" %> + <% else %> + <%= link_to t('admin.managers.manager.add'), + { controller: "admin/managers", + action: :create, + user_id: user }, + method: :post, + class: "button success" %> + <% end %> +
    diff --git a/app/views/admin/managers/search.js.erb b/app/views/admin/managers/search.js.erb deleted file mode 100644 index e54b84293..000000000 --- a/app/views/admin/managers/search.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#search-result").html("<%= j render 'manager', manager: @manager %>"); diff --git a/app/views/admin/managers/user_not_found.js.erb b/app/views/admin/managers/user_not_found.js.erb deleted file mode 100644 index 53e9d7e20..000000000 --- a/app/views/admin/managers/user_not_found.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#search-result").html("
    <%= j t('admin.managers.search.user_not_found') %>
    "); diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 6bb8bfecf..e94f803c5 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -386,9 +386,7 @@ en: add: Add delete: Delete search: - email_placeholder: Search user by email - search: Search - user_not_found: User not found + title: 'Managers: User search' menu: activity: Moderator activity admin: Admin menu diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 94700154a..48ea7b4d2 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -395,9 +395,7 @@ es: add: Añadir como Gestor delete: Borrar search: - email_placeholder: Buscar usuario por email - search: Buscar - user_not_found: Usuario no encontrado + title: 'Gestores: Búsqueda de usuarios' menu: activity: Actividad de moderadores admin: Menú de administración diff --git a/spec/features/admin/managers_spec.rb b/spec/features/admin/managers_spec.rb index 54b8cc77a..5fe1b3892 100644 --- a/spec/features/admin/managers_spec.rb +++ b/spec/features/admin/managers_spec.rb @@ -16,7 +16,7 @@ feature 'Admin managers' do end scenario 'Create Manager', :js do - fill_in 'email', with: @user.email + fill_in 'name_or_email', with: @user.email click_button 'Search' expect(page).to have_content @user.name @@ -34,4 +34,52 @@ feature 'Admin managers' do end end -end \ No newline at end of file + context 'Search' do + + background do + user = create(:user, username: 'Taylor Swift', email: 'taylor@swift.com') + user2 = create(:user, username: 'Stephanie Corneliussen', email: 'steph@mrrobot.com') + @manager1 = create(:manager, user: user) + @manager2 = create(:manager, user: user2) + visit admin_managers_path + end + + scenario 'returns no results if search term is empty' do + expect(page).to have_content(@manager1.name) + expect(page).to have_content(@manager2.name) + + fill_in 'name_or_email', with: ' ' + click_button 'Search' + + expect(page).to have_content('Managers: User search') + expect(page).to have_content('users cannot be found') + expect(page).to_not have_content(@manager1.name) + expect(page).to_not have_content(@manager2.name) + end + + scenario 'search by name' do + expect(page).to have_content(@manager1.name) + expect(page).to have_content(@manager2.name) + + fill_in 'name_or_email', with: 'Taylor' + click_button 'Search' + + expect(page).to have_content('Managers: User search') + expect(page).to have_content(@manager1.name) + expect(page).to_not have_content(@manager2.name) + end + + scenario 'search by email' do + expect(page).to have_content(@manager1.email) + expect(page).to have_content(@manager2.email) + + fill_in 'name_or_email', with: @manager2.email + click_button 'Search' + + expect(page).to have_content('Managers: User search') + expect(page).to have_content(@manager2.email) + expect(page).to_not have_content(@manager1.email) + end + end + +end From cd8cf4229413cccc926eac4fe1af0d1c0eb0fd79 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Wed, 25 Oct 2017 10:13:07 -0400 Subject: [PATCH 669/765] 'Add to valuators' option added to Valuators search view --- app/views/admin/valuators/_valuator.html.erb | 28 -------------------- app/views/admin/valuators/search.html.erb | 10 ++++++- config/locales/en/admin.yml | 1 - config/locales/es/admin.yml | 1 - spec/features/admin/valuators_spec.rb | 20 +++++++------- 5 files changed, 19 insertions(+), 41 deletions(-) delete mode 100644 app/views/admin/valuators/_valuator.html.erb diff --git a/app/views/admin/valuators/_valuator.html.erb b/app/views/admin/valuators/_valuator.html.erb deleted file mode 100644 index e5971391b..000000000 --- a/app/views/admin/valuators/_valuator.html.erb +++ /dev/null @@ -1,28 +0,0 @@ -
    -

    <%= t('admin.valuators.valuator.user_found') %>

    - - - - - - -
    - <%= valuator.name %> - - <%= valuator.email %> -
    - - <% unless @valuator.persisted? %> - <%= form_for @valuator, url: admin_valuators_path do |f| %> -
    -
    - <%= f.text_field :description, label: false, placeholder: t('admin.valuators.valuator.description_placeholder') %> - <%= f.hidden_field :user_id %> -
    -
    - <%= f.submit t('admin.valuators.valuator.add'), class: "button success float-left" %> -
    -
    - <% end %> - <% end %> -
    diff --git a/app/views/admin/valuators/search.html.erb b/app/views/admin/valuators/search.html.erb index 8ca18322d..4663a944b 100644 --- a/app/views/admin/valuators/search.html.erb +++ b/app/views/admin/valuators/search.html.erb @@ -9,9 +9,17 @@
    <%= user.name %> <%= user.email %> + <% if user.valuator? && user.valuator.description.present? %> <%= user.valuator.description %> + <% else %> + <%= form_for Valuator.new(user: user), url: admin_valuators_path do |f| %> + <%= f.text_field :description, + label: false, + placeholder: t("admin.valuators.valuator.description_placeholder") %> + <%= f.hidden_field :user_id %> + <%= f.submit t("admin.valuators.valuator.add"), class: "button success float-left" %> + <% end %> <% end %>
    - - - - - - <% @administrators.each do |administrator| %> - - - - - - <% end %> -
    <%= t("admin.administrators.index.name") %><%= t("admin.administrators.index.email") %><%= t("admin.shared.actions") %>
    - <%= administrator.name %> - - <%= administrator.email %> - - <% if administrator.persisted? %> - <%= link_to t('admin.administrators.administrator.delete'), - admin_administrator_path(administrator), - method: :delete, - class: "button hollow alert expanded" - %> - <% else %> - <%= link_to t('admin.administrators.administrator.add'), - { controller: "admin/administrators", action: :create, - user_id: administrator.user_id }, - method: :post, - class: "button success expanded" %> - <% end %> -
    + + + + + + + <% @administrators.each do |administrator| %> + + + + + + <% end %> +
    <%= t("admin.administrators.index.name") %><%= t("admin.administrators.index.email") %><%= t("admin.shared.actions") %>
    + <%= administrator.name %> + + <%= administrator.email %> + + <% if administrator.persisted? %> + <%= link_to t('admin.administrators.administrator.delete'), + admin_administrator_path(administrator), + method: :delete, + class: "button hollow alert expanded" + %> + <% else %> + <%= link_to t('admin.administrators.administrator.add'), + { controller: "admin/administrators", action: :create, + user_id: administrator.user_id }, + method: :post, + class: "button success expanded" %> + <% end %> +
    - <%= paginate @administrators %> -<% else %> -
    - <%= t("admin.administrators.index.no_administrators") %> -
    -<% end %> + <%= paginate @administrators %> + <% else %> +
    + <%= t("admin.administrators.index.no_administrators") %> +
    + <% end %> + diff --git a/app/views/admin/administrators/search.html.erb b/app/views/admin/administrators/search.html.erb index 3f3c269f1..d8ab78511 100644 --- a/app/views/admin/administrators/search.html.erb +++ b/app/views/admin/administrators/search.html.erb @@ -2,28 +2,43 @@ <%= render 'admin/shared/user_search', url: search_admin_administrators_path %> -

    <%= page_entries_info @users %>

    +
    + <% if @users.any? %> +

    <%= page_entries_info @users %>

    - - <% @users.each do |user| %> - - - -
    <%= user.name %><%= user.email %> - <% if user.administrator? && user.administrator.persisted? %> - <%= link_to t('admin.administrators.administrator.delete'), - admin_administrator_path(user), - method: :delete, - class: "button hollow alert" %> - <% else %> - <%= link_to t('admin.administrators.administrator.add'), - { controller: "admin/administrators", - action: :create, - user_id: user }, - method: :post, - class: "button success" %> + + + + + + + + <% @users.each do |user| %> + + + + + <% end %> - - + +
    <%= t("admin.administrators.index.name") %><%= t("admin.administrators.index.email") %><%= t("admin.shared.actions") %>
    <%= user.name %><%= user.email %> + <% if user.administrator? && user.administrator.persisted? %> + <%= link_to t('admin.administrators.administrator.delete'), + admin_administrator_path(user), + method: :delete, + class: "button hollow alert expanded" %> + <% else %> + <%= link_to t('admin.administrators.administrator.add'), + { controller: "admin/administrators", + action: :create, + user_id: user }, + method: :post, + class: "button success expanded" %> + <% end %> +
    + <% else %> +
    + <%= t("admin.shared.no_search_results") %> +
    <% end %> -
    +
    diff --git a/spec/features/admin/administrators_spec.rb b/spec/features/admin/administrators_spec.rb index 4e2091d11..c39d5ade5 100644 --- a/spec/features/admin/administrators_spec.rb +++ b/spec/features/admin/administrators_spec.rb @@ -60,7 +60,7 @@ feature 'Admin administrators' do click_button 'Search' expect(page).to have_content('Administrators: User search') - expect(page).to have_content('users cannot be found') + expect(page).to have_content('No results found') expect(page).to_not have_content(@administrator1.name) expect(page).to_not have_content(@administrator2.name) end From 0f4c03e407ef50c73ef12a33ca035a34878795c2 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 25 Oct 2017 18:43:19 +0200 Subject: [PATCH 676/765] improves admin moderators views --- app/views/admin/moderators/index.html.erb | 84 +++++++++++----------- app/views/admin/moderators/search.html.erb | 60 ++++++++++------ spec/features/admin/moderators_spec.rb | 2 +- 3 files changed, 80 insertions(+), 66 deletions(-) diff --git a/app/views/admin/moderators/index.html.erb b/app/views/admin/moderators/index.html.erb index 596d49671..be067d73d 100644 --- a/app/views/admin/moderators/index.html.erb +++ b/app/views/admin/moderators/index.html.erb @@ -5,48 +5,48 @@ <%= render 'admin/shared/user_search', url: search_admin_moderators_path %>
    -<% if @moderators.any? %> -

    <%= page_entries_info @moderators %>

    + <% if @moderators.any? %> +

    <%= page_entries_info @moderators %>

    - - - - - - - - <% @moderators.each do |moderator| %> - - - - - - <% end %> - -
    <%= t("admin.moderators.index.name") %><%= t("admin.moderators.index.email") %><%= t("admin.shared.actions") %>
    - <%= moderator.name %> - - <%= moderator.email %> - - <% if moderator.persisted? %> - <%= link_to t('admin.moderators.moderator.delete'), - admin_moderator_path(moderator), - method: :delete, - class: "button hollow alert expanded" - %> - <% else %> - <%= link_to t('admin.moderators.moderator.add'), - { controller: "admin/moderators", action: :create, - user_id: moderator.user_id }, - method: :post, - class: "button success expanded" %> - <% end %> -
    + + + + + + + + <% @moderators.each do |moderator| %> + + + + + + <% end %> + +
    <%= t("admin.moderators.index.name") %><%= t("admin.moderators.index.email") %><%= t("admin.shared.actions") %>
    + <%= moderator.name %> + + <%= moderator.email %> + + <% if moderator.persisted? %> + <%= link_to t('admin.moderators.moderator.delete'), + admin_moderator_path(moderator), + method: :delete, + class: "button hollow alert expanded" + %> + <% else %> + <%= link_to t('admin.moderators.moderator.add'), + { controller: "admin/moderators", action: :create, + user_id: moderator.user_id }, + method: :post, + class: "button success expanded" %> + <% end %> +
    - <%= paginate @moderators %> -<% else %> -
    - <%= t("admin.moderators.index.no_moderators") %> -
    -<% end %> + <%= paginate @moderators %> + <% else %> +
    + <%= t("admin.moderators.index.no_moderators") %> +
    + <% end %>
    diff --git a/app/views/admin/moderators/search.html.erb b/app/views/admin/moderators/search.html.erb index 89e9dc9a7..a7ad117f9 100644 --- a/app/views/admin/moderators/search.html.erb +++ b/app/views/admin/moderators/search.html.erb @@ -2,28 +2,42 @@ <%= render 'admin/shared/user_search', url: search_admin_moderators_path %> -

    <%= page_entries_info @users %>

    +
    + <% if @users.any? %> +

    <%= page_entries_info @users %>

    - - <% @users.each do |user| %> - - - - - +
    <%= user.name %><%= user.email %> - <% if user.moderator? && user.moderator.persisted? %> - <%= link_to t('admin.moderators.moderator.delete'), - admin_moderator_path(user), - method: :delete, - class: "button hollow alert" %> - <% else %> - <%= link_to t('admin.moderators.moderator.add'), - { controller: "admin/moderators", - action: :create, - user_id: user }, - method: :post, - class: "button success" %> - <% end %> -
    + + + + + + + <% @users.each do |user| %> + + + + + + <% end %> +
    <%= t("admin.moderators.index.name") %><%= t("admin.moderators.index.email") %><%= t("admin.shared.actions") %>
    <%= user.name %><%= user.email %> + <% if user.moderator? && user.moderator.persisted? %> + <%= link_to t('admin.moderators.moderator.delete'), + admin_moderator_path(user), + method: :delete, + class: "button hollow alert" %> + <% else %> + <%= link_to t('admin.moderators.moderator.add'), + { controller: "admin/moderators", + action: :create, + user_id: user }, + method: :post, + class: "button success" %> + <% end %> +
    + <% else %> +
    + <%= t("admin.shared.no_search_results") %> +
    <% end %> -
    +
    diff --git a/spec/features/admin/moderators_spec.rb b/spec/features/admin/moderators_spec.rb index 2c2994d62..8a32762f1 100644 --- a/spec/features/admin/moderators_spec.rb +++ b/spec/features/admin/moderators_spec.rb @@ -52,7 +52,7 @@ feature 'Admin moderators' do click_button 'Search' expect(page).to have_content('Moderators: User search') - expect(page).to have_content('users cannot be found') + expect(page).to have_content('No results found') expect(page).to_not have_content(@moderator1.name) expect(page).to_not have_content(@moderator2.name) end From 2131c651f6b8f0febb22145dc34a01176d612701 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 25 Oct 2017 18:47:26 +0200 Subject: [PATCH 677/765] improves admin valuators views --- app/views/admin/valuators/index.html.erb | 70 ++++++++++++----------- app/views/admin/valuators/search.html.erb | 55 +++++++++++------- spec/features/admin/valuators_spec.rb | 2 +- 3 files changed, 72 insertions(+), 55 deletions(-) diff --git a/app/views/admin/valuators/index.html.erb b/app/views/admin/valuators/index.html.erb index bcb723029..622d01307 100644 --- a/app/views/admin/valuators/index.html.erb +++ b/app/views/admin/valuators/index.html.erb @@ -2,39 +2,41 @@ <%= render 'admin/shared/user_search', url: search_admin_valuators_path %> -<% if @valuators.any? %> -

    <%= page_entries_info @valuators %>

    +
    + <% if @valuators.any? %> +

    <%= page_entries_info @valuators %>

    - - - - - - - - <% @valuators.each do |valuator| %> - - - - - - <% end %> - -
    <%= t("admin.valuators.index.name") %><%= t("admin.valuators.index.email") %><%= t("admin.valuators.index.description") %>
    - <%= valuator.name %> - - <%= valuator.email %> - - <% if valuator.description.present? %> - <%= valuator.description %> - <% else %> - <%= t("admin.valuators.index.no_description") %> - <% end %> -
    + + + + + + + + <% @valuators.each do |valuator| %> + + + + + + <% end %> + +
    <%= t("admin.valuators.index.name") %><%= t("admin.valuators.index.email") %><%= t("admin.valuators.index.description") %>
    + <%= valuator.name %> + + <%= valuator.email %> + + <% if valuator.description.present? %> + <%= valuator.description %> + <% else %> + <%= t("admin.valuators.index.no_description") %> + <% end %> +
    - <%= paginate @valuators %> -<% else %> -
    - <%= t("admin.valuators.index.no_valuators") %> -
    -<% end %> + <%= paginate @valuators %> + <% else %> +
    + <%= t("admin.valuators.index.no_valuators") %> +
    + <% end %> +
    diff --git a/app/views/admin/valuators/search.html.erb b/app/views/admin/valuators/search.html.erb index 4663a944b..9f5448c43 100644 --- a/app/views/admin/valuators/search.html.erb +++ b/app/views/admin/valuators/search.html.erb @@ -2,26 +2,41 @@ <%= render 'admin/shared/user_search', url: search_admin_valuators_path %> -

    <%= page_entries_info @users %>

    +
    + <% if @users.any? %> +

    <%= page_entries_info @users %>

    - - <% @users.each do |user| %> - - - -
    <%= user.name %><%= user.email %> - <% if user.valuator? && user.valuator.description.present? %> - <%= user.valuator.description %> - <% else %> - <%= form_for Valuator.new(user: user), url: admin_valuators_path do |f| %> - <%= f.text_field :description, - label: false, - placeholder: t("admin.valuators.valuator.description_placeholder") %> - <%= f.hidden_field :user_id %> - <%= f.submit t("admin.valuators.valuator.add"), class: "button success float-left" %> - <% end %> + + + + + + + + <% @users.each do |user| %> + + + + + <% end %> - - + +
    <%= t("admin.valuators.index.name") %><%= t("admin.valuators.index.email") %><%= t("admin.valuators.index.description") %>
    <%= user.name %><%= user.email %> + <% if user.valuator? && user.valuator.description.present? %> + <%= user.valuator.description %> + <% else %> + <%= form_for Valuator.new(user: user), url: admin_valuators_path do |f| %> + <%= f.text_field :description, + label: false, + placeholder: t("admin.valuators.valuator.description_placeholder") %> + <%= f.hidden_field :user_id %> + <%= f.submit t("admin.valuators.valuator.add"), class: "button success float-left" %> + <% end %> + <% end %> +
    + <% else %> +
    + <%= t("admin.shared.no_search_results") %> +
    <% end %> -
    +
    diff --git a/spec/features/admin/valuators_spec.rb b/spec/features/admin/valuators_spec.rb index 86f2c89e9..bb631cbc3 100644 --- a/spec/features/admin/valuators_spec.rb +++ b/spec/features/admin/valuators_spec.rb @@ -47,7 +47,7 @@ feature 'Admin valuators' do click_button 'Search' expect(page).to have_content('Valuators: User search') - expect(page).to have_content('users cannot be found') + expect(page).to have_content('No results found') expect(page).to_not have_content(@valuator1.name) expect(page).to_not have_content(@valuator2.name) end From 4b7a0358e5012b7cceaefe781bd4f11cee8898c7 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 25 Oct 2017 18:50:30 +0200 Subject: [PATCH 678/765] improves admin managers views --- app/views/admin/managers/search.html.erb | 61 +++++++++++++++--------- spec/features/admin/managers_spec.rb | 2 +- 2 files changed, 39 insertions(+), 24 deletions(-) diff --git a/app/views/admin/managers/search.html.erb b/app/views/admin/managers/search.html.erb index c6ea3c2cd..cad2c7100 100644 --- a/app/views/admin/managers/search.html.erb +++ b/app/views/admin/managers/search.html.erb @@ -2,28 +2,43 @@ <%= render 'admin/shared/user_search', url: search_admin_managers_path %> -

    <%= page_entries_info @users %>

    +
    + <% if @users.any? %> +

    <%= page_entries_info @users %>

    - - <% @users.each do |user| %> - - - - - +
    <%= user.name %><%= user.email %> - <% if user.manager? && user.manager.persisted? %> - <%= link_to t('admin.managers.manager.delete'), - admin_manager_path(user), - method: :delete, - class: "button hollow alert" %> - <% else %> - <%= link_to t('admin.managers.manager.add'), - { controller: "admin/managers", - action: :create, - user_id: user }, - method: :post, - class: "button success" %> - <% end %> -
    + + + + + + + <% @users.each do |user| %> + + + + + + <% end %> + +
    <%= t("admin.managers.index.name") %><%= t("admin.managers.index.email") %><%= t("admin.shared.actions") %>
    <%= user.name %><%= user.email %> + <% if user.manager? && user.manager.persisted? %> + <%= link_to t('admin.managers.manager.delete'), + admin_manager_path(user), + method: :delete, + class: "button hollow alert expanded" %> + <% else %> + <%= link_to t('admin.managers.manager.add'), + { controller: "admin/managers", + action: :create, + user_id: user }, + method: :post, + class: "button success expanded" %> + <% end %> +
    + <% else %> +
    + <%= t("admin.shared.no_search_results") %> +
    <% end %> - +
    diff --git a/spec/features/admin/managers_spec.rb b/spec/features/admin/managers_spec.rb index 5fe1b3892..e59b1da4c 100644 --- a/spec/features/admin/managers_spec.rb +++ b/spec/features/admin/managers_spec.rb @@ -52,7 +52,7 @@ feature 'Admin managers' do click_button 'Search' expect(page).to have_content('Managers: User search') - expect(page).to have_content('users cannot be found') + expect(page).to have_content('No results found') expect(page).to_not have_content(@manager1.name) expect(page).to_not have_content(@manager2.name) end From c53181843530d91a3871fe7ed902121fb8e5fb9a Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 25 Oct 2017 18:52:35 +0200 Subject: [PATCH 679/765] add missing class for buttons --- app/views/admin/moderators/search.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/admin/moderators/search.html.erb b/app/views/admin/moderators/search.html.erb index a7ad117f9..7fc479b8a 100644 --- a/app/views/admin/moderators/search.html.erb +++ b/app/views/admin/moderators/search.html.erb @@ -17,19 +17,19 @@ <%= user.name %> <%= user.email %> - + <% if user.moderator? && user.moderator.persisted? %> <%= link_to t('admin.moderators.moderator.delete'), admin_moderator_path(user), method: :delete, - class: "button hollow alert" %> + class: "button hollow alert expanded" %> <% else %> <%= link_to t('admin.moderators.moderator.add'), { controller: "admin/moderators", action: :create, user_id: user }, method: :post, - class: "button success" %> + class: "button success expanded" %> <% end %> From 2542b2c695b2411ee71425d22e49f3750ebff5f2 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 25 Oct 2017 19:02:04 +0200 Subject: [PATCH 680/765] improves admin valuators search form --- app/views/admin/valuators/search.html.erb | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app/views/admin/valuators/search.html.erb b/app/views/admin/valuators/search.html.erb index 9f5448c43..2710cb44d 100644 --- a/app/views/admin/valuators/search.html.erb +++ b/app/views/admin/valuators/search.html.erb @@ -11,22 +11,31 @@ <%= t("admin.valuators.index.name") %> <%= t("admin.valuators.index.email") %> <%= t("admin.valuators.index.description") %> + <%= t("admin.shared.actions") %> <% @users.each do |user| %> <%= user.name %> <%= user.email %> - - <% if user.valuator? && user.valuator.description.present? %> - <%= user.valuator.description %> + + <% if user.valuator? %> + <% if user.valuator.description.present? %> + <%= user.valuator.description %> + <% else %> + <%= t("admin.valuators.index.no_description") %> + <% end %> <% else %> + <%= t("admin.valuators.index.no_description") %> + <% end %> + + <% unless user.valuator? %> <%= form_for Valuator.new(user: user), url: admin_valuators_path do |f| %> <%= f.text_field :description, label: false, placeholder: t("admin.valuators.valuator.description_placeholder") %> <%= f.hidden_field :user_id %> - <%= f.submit t("admin.valuators.valuator.add"), class: "button success float-left" %> + <%= f.submit t("admin.valuators.valuator.add"), class: "button success expanded" %> <% end %> <% end %> From f0c119f7a64650cecefcac069158c45b8fe8048f Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 25 Oct 2017 19:27:44 +0200 Subject: [PATCH 681/765] removes unused i18n keys --- config/locales/en/admin.yml | 3 --- config/locales/es/admin.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index b41d864b7..a2062f8ce 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -443,9 +443,6 @@ en: delete: Delete restricted_removal: "Sorry, you can't remove yourself from the administrators" search: - email_placeholder: Search user by email - search: Search - user_not_found: User not found. title: "Administrators: User search" moderators: index: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 459c291bd..1c7d0fa74 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -391,9 +391,6 @@ es: delete: Borrar restricted_removal: "Lo sentimos, no puedes eliminarte a ti mismo de la lista" search: - email_placeholder: Buscar usuario por email - search: Buscar - user_not_found: Usuario no encontrado. title: "Administradores: Búsqueda de usuarios" managers: index: From f15ef5b66b686fd2493d33467225b50c92000564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 26 Oct 2017 16:56:30 +0200 Subject: [PATCH 682/765] Removed Legislation Proposals suggestions in form --- app/views/legislation/proposals/_form.html.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/legislation/proposals/_form.html.erb b/app/views/legislation/proposals/_form.html.erb index 4efbeb4e2..2cf43c3b9 100644 --- a/app/views/legislation/proposals/_form.html.erb +++ b/app/views/legislation/proposals/_form.html.erb @@ -6,9 +6,8 @@
    <%= f.label :title, t("proposals.form.proposal_title") %> - <%= f.text_field :title, maxlength: Legislation::Proposal.title_max_length, placeholder: t("proposals.form.proposal_title"), label: false, data: {js_suggest_result: "js_suggest_result", js_suggest: "#js-suggest", js_url: suggest_proposals_path}%> + <%= f.text_field :title, maxlength: Legislation::Proposal.title_max_length, placeholder: t("proposals.form.proposal_title"), label: false %>
    -
    <%= f.invisible_captcha :subtitle %> From 73d6a0924278cf739ee0acd8d0c158dc25ecd00a Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 26 Oct 2017 17:09:57 +0200 Subject: [PATCH 683/765] removes duplicated label on legislation proposal form --- app/views/legislation/proposals/_form.html.erb | 3 +-- config/locales/en/legislation.yml | 3 +++ config/locales/es/legislation.yml | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/views/legislation/proposals/_form.html.erb b/app/views/legislation/proposals/_form.html.erb index 4efbeb4e2..c9fac3a9b 100644 --- a/app/views/legislation/proposals/_form.html.erb +++ b/app/views/legislation/proposals/_form.html.erb @@ -58,11 +58,10 @@
    - <%= f.label :tag_list, t("proposals.form.tags_label") %> + <%= f.label :tag_list, t("legislation.proposals.form.tags_label") %>

    <%= t("proposals.form.tags_instructions") %>

    - <%= f.label :category_tag_list, t("proposals.form.tag_category_label") %> <% @process.tag_list_on(:customs).each do |tag| %> <%= tag %> <% end %> diff --git a/config/locales/en/legislation.yml b/config/locales/en/legislation.yml index 8afaf4de3..6d130e1c2 100644 --- a/config/locales/en/legislation.yml +++ b/config/locales/en/legislation.yml @@ -120,3 +120,6 @@ en: shared: share: Share share_comment: Comment on %{version_name} from process draft %{process_name} + proposals: + form: + tags_label: "Categories" \ No newline at end of file diff --git a/config/locales/es/legislation.yml b/config/locales/es/legislation.yml index 5c04d2fa5..fe5804e91 100644 --- a/config/locales/es/legislation.yml +++ b/config/locales/es/legislation.yml @@ -120,3 +120,6 @@ es: shared: share: Compartir share_comment: Comentario sobre la %{version_name} del borrador del proceso %{process_name} + proposals: + form: + tags_label: "Categorías" \ No newline at end of file From 658d115c91e592537bf5e7746e3cca04e0677cac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Thu, 26 Oct 2017 17:13:04 +0200 Subject: [PATCH 684/765] Removed share view for Legislation Proposals --- .../legislation/proposals_controller.rb | 8 +-- .../legislation/proposals/share.html.erb | 51 ------------------- config/routes.rb | 1 - 3 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 app/views/legislation/proposals/share.html.erb diff --git a/app/controllers/legislation/proposals_controller.rb b/app/controllers/legislation/proposals_controller.rb index fa35ea171..ee4d10c06 100644 --- a/app/controllers/legislation/proposals_controller.rb +++ b/app/controllers/legislation/proposals_controller.rb @@ -30,7 +30,7 @@ class Legislation::ProposalsController < Legislation::BaseController @proposal = Legislation::Proposal.new(proposal_params.merge(author: current_user)) if @proposal.save - redirect_to share_legislation_process_proposal_path(params[:process_id], @proposal), notice: I18n.t('flash.actions.create.proposal') + redirect_to legislation_process_proposal_path(params[:process_id], @proposal), notice: I18n.t('flash.actions.create.proposal') else render :new end @@ -46,12 +46,6 @@ class Legislation::ProposalsController < Legislation::BaseController set_legislation_proposal_votes(@proposal) end - def share - if Setting['proposal_improvement_path'].present? - @proposal_improvement_path = Setting['proposal_improvement_path'] - end - end - private def proposal_params diff --git a/app/views/legislation/proposals/share.html.erb b/app/views/legislation/proposals/share.html.erb deleted file mode 100644 index 8ea0f7e98..000000000 --- a/app/views/legislation/proposals/share.html.erb +++ /dev/null @@ -1,51 +0,0 @@ -<% provide :title do %><%= @proposal.title %><% end %> -<% provide :social_media_meta_tags do %> -<%= render "shared/social_media_meta_tags", - social_url: proposal_url(@proposal), - social_title: @proposal.title, - social_description: @proposal.summary %> -<% end %> -<% content_for :canonical do %> - <%= render "shared/canonical", href: proposal_url(@proposal) %> -<% end %> - -<% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @legislation_proposal_votes] do %> -
    -
    -
    - -

    <%= t("proposals.proposal.created") %>

    - -

    - <%= t("proposals.proposal.share.guide") %>
    - <%= t("proposals.proposal.share.edit") %> -

    - - <%= render partial: 'shared/social_share', locals: { - title: @proposal.title, - url: proposal_url(@proposal) - } %> - - <% if @proposal_improvement_path.present? %> -
    -

    <%= t("proposals.proposal.improve_info") %>

    - <%= link_to t("proposals.proposal.improve_info_link"), @proposal_improvement_path, class: "button" %> -
    - <% end %> - -
    - <%= link_to t("proposals.proposal.share.view_proposal"), legislation_process_proposal_path(@proposal.legislation_process_id, @proposal) %> -
    -
    - -
    -
    -

    - <%= @proposal.title %>
    - <%= t("proposals.show.code") %> <%= @proposal.code %> -

    -
    -
    -
    -
    -<% end %> diff --git a/config/routes.rb b/config/routes.rb index d98ca98e2..491127439 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -139,7 +139,6 @@ Rails.application.routes.draw do post :vote put :flag put :unflag - get :share end collection do get :map From 00309aa157c8342a0e131e27cb0c272808760d70 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 26 Oct 2017 17:51:10 +0200 Subject: [PATCH 685/765] changes message for not verified users --- app/views/legislation/proposals/_votes.html.erb | 4 ++-- config/locales/en/legislation.yml | 3 ++- config/locales/es/legislation.yml | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/legislation/proposals/_votes.html.erb b/app/views/legislation/proposals/_votes.html.erb index cfc80aa1b..79e332e82 100644 --- a/app/views/legislation/proposals/_votes.html.erb +++ b/app/views/legislation/proposals/_votes.html.erb @@ -49,10 +49,10 @@ <%= t("votes.organizations") %>

    - <% elsif user_signed_in? && !proposal.votable_by?(current_user)%> + <% elsif user_signed_in? && !proposal.votable_by?(current_user) %> diff --git a/config/locales/en/legislation.yml b/config/locales/en/legislation.yml index 6d130e1c2..4924e1f3f 100644 --- a/config/locales/en/legislation.yml +++ b/config/locales/en/legislation.yml @@ -122,4 +122,5 @@ en: share_comment: Comment on %{version_name} from process draft %{process_name} proposals: form: - tags_label: "Categories" \ No newline at end of file + tags_label: "Categories" + not_verified: "For vote proposals %{verify_account}." \ No newline at end of file diff --git a/config/locales/es/legislation.yml b/config/locales/es/legislation.yml index fe5804e91..19038c747 100644 --- a/config/locales/es/legislation.yml +++ b/config/locales/es/legislation.yml @@ -122,4 +122,5 @@ es: share_comment: Comentario sobre la %{version_name} del borrador del proceso %{process_name} proposals: form: - tags_label: "Categorías" \ No newline at end of file + tags_label: "Categorías" + not_verified: Para votar propuestas %{verify_account}. \ No newline at end of file From dea820f3e8159431cf9d6dd66e22b8d7b031dd56 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 26 Oct 2017 17:58:15 +0200 Subject: [PATCH 686/765] removes follow button on proposal show --- app/views/legislation/proposals/show.html.erb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/views/legislation/proposals/show.html.erb b/app/views/legislation/proposals/show.html.erb index 48dae91b6..6a7a9286c 100644 --- a/app/views/legislation/proposals/show.html.erb +++ b/app/views/legislation/proposals/show.html.erb @@ -102,12 +102,7 @@ url: proposal_url(@proposal) } %> - <% if current_user %> - <%= render 'follows/follow_button', follow: find_or_build_follow(current_user, @proposal) %> - <% end %> - <%= render 'communities/access_button', community: @proposal.community %> -
    From 50b2ab5a6956e6ed333cc002153ae936ba2e6325 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 26 Oct 2017 18:47:18 +0200 Subject: [PATCH 687/765] adds categories list on proposal sidebar --- app/views/legislation/processes/proposals.html.erb | 1 + app/views/legislation/proposals/_categories.html.erb | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/views/legislation/processes/proposals.html.erb b/app/views/legislation/processes/proposals.html.erb index 102766755..a6346671e 100644 --- a/app/views/legislation/processes/proposals.html.erb +++ b/app/views/legislation/processes/proposals.html.erb @@ -21,6 +21,7 @@

    <%= link_to t("proposals.index.start_proposal"), new_legislation_process_proposal_path(@process), class: 'button expanded' %>

    + <%= render 'legislation/proposals/categories', taggable: @process %>
    diff --git a/app/views/legislation/proposals/_categories.html.erb b/app/views/legislation/proposals/_categories.html.erb index a694eb555..d0c34d23f 100644 --- a/app/views/legislation/proposals/_categories.html.erb +++ b/app/views/legislation/proposals/_categories.html.erb @@ -3,10 +3,12 @@
      - <% @categories.each do |category| %> + <% @process.tag_list_on(:customs).each do |tag| %>
    • - <% css_class = { class: 'active' } if params[:search] == category.name %> - <%= link_to category.name, proposals_path(search: category.name), css_class || {} %> + <% css_class = { class: 'active' } if params[:search] == tag %> + <%= link_to tag, + legislation_process_proposals_path(process_id: @process, search: tag), + css_class || {} %>
      • <% end %>
    From 702bfec248835bed6f5d366f8b58ce71cbf77789 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 26 Oct 2017 18:47:44 +0200 Subject: [PATCH 688/765] removes unnecessary legislation proposal index view --- .../legislation/proposals/index.html.erb | 102 ------------------ 1 file changed, 102 deletions(-) delete mode 100644 app/views/legislation/proposals/index.html.erb diff --git a/app/views/legislation/proposals/index.html.erb b/app/views/legislation/proposals/index.html.erb deleted file mode 100644 index 69a8df4a3..000000000 --- a/app/views/legislation/proposals/index.html.erb +++ /dev/null @@ -1,102 +0,0 @@ -<% provide :title do %><%= t('proposals.index.title') %><% end %> -<% content_for :header_addon do %> - <%= render "shared/search_form", - search_path: proposals_path(page: 1), - i18n_namespace: "proposals.index.search_form" %> -<% end %> -<% content_for :canonical do %> - <%= render "shared/canonical", href: proposals_url %> -<% end %> - -
    - <% if @search_terms || @advanced_search_terms || @tag_filter || params[:retired].present? %> -
    -
    -
    - <% if @search_terms || @advanced_search_terms %> -

    <%= t("shared.search_results") %>

    -

    - <%= page_entries_info @proposals %> - <% if !@advanced_search_terms %> - <%= t("proposals.index.search_results_html", count: @proposals.size, search_term: @search_terms) %> - <% end %> -

    - <% elsif @tag_filter %> -

    <%= t("shared.search_results") %>

    -

    - <%= page_entries_info @proposals %> - <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %> -

    - <% elsif params[:retired].present? %> -

    <%= t("proposals.index.retired_proposals") %>

    - <% end %> -
    -
    -
    - <% else %> - <%= render "shared/section_header", i18n_namespace: "proposals.index.section_header", image: "proposals" %> - <% end %> - -
    -
    - - <% if has_banners? %> - <%= render "shared/banner" %> - <% end %> - - <% if @featured_proposals.present? %> - - <% end %> - - <%= render("shared/advanced_search", search_path: proposals_path(page: 1)) unless params[:retired].present? %> - - <%= render 'shared/order_links', i18n_namespace: "proposals.index" %> - - <% if @proposals.any? %> -
    - <%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button expanded' %> -
    - <% end %> - -
    - <%= render partial: 'proposals/proposal', collection: @proposals %> - <%= paginate @proposals %> - - <% unless @search_terms || @advanced_search_terms || @tag_filter %> -
    -

    - <%= t("proposals.index.section_footer.title") %> -

    -

    <%= t("proposals.index.section_footer.help_text_1") %>

    -

    <%= t("proposals.index.section_footer.help_text_2", - org: link_to(setting['org_name'], new_user_registration_path)).html_safe %>

    -

    <%= t("proposals.index.section_footer.help_text_3") %>

    -
    - <% end %> -
    -
    - -
    - -
    - -
    -
    From bb61b76790aef864fa88f2619104bf0321d2c90e Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 26 Oct 2017 18:48:07 +0200 Subject: [PATCH 689/765] removes communities partial on proposals show --- app/views/legislation/proposals/show.html.erb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/legislation/proposals/show.html.erb b/app/views/legislation/proposals/show.html.erb index 6a7a9286c..bdabe926f 100644 --- a/app/views/legislation/proposals/show.html.erb +++ b/app/views/legislation/proposals/show.html.erb @@ -101,8 +101,6 @@ title: @proposal.title, url: proposal_url(@proposal) } %> - - <%= render 'communities/access_button', community: @proposal.community %>
    From 4019786a26d6a06697cf5833fde97c9aa8623b68 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 26 Oct 2017 19:01:03 +0200 Subject: [PATCH 690/765] hides vote buttons if process proposal phase are closed --- .../legislation/proposals/_votes.html.erb | 72 ++++++++++--------- config/locales/en/legislation.yml | 3 +- config/locales/es/legislation.yml | 3 +- 3 files changed, 42 insertions(+), 36 deletions(-) diff --git a/app/views/legislation/proposals/_votes.html.erb b/app/views/legislation/proposals/_votes.html.erb index 79e332e82..f56c0ead2 100644 --- a/app/views/legislation/proposals/_votes.html.erb +++ b/app/views/legislation/proposals/_votes.html.erb @@ -1,43 +1,47 @@ <% voted_classes = css_classes_for_vote(@legislation_proposal_votes, proposal) %>
    -
    - <% if user_signed_in? %> - <%= link_to vote_legislation_process_proposal_path(process_id: proposal.process, id: proposal, value: 'yes'), - class: "like #{voted_classes[:in_favor]}", title: t('votes.agree'), method: "post", remote: true do %> - - <%= t('votes.agree') %> - - <%= votes_percentage('likes', proposal) %> + <% if @process.proposals_phase.open? %> +
    + <% if user_signed_in? %> + <%= link_to vote_legislation_process_proposal_path(process_id: proposal.process, id: proposal, value: 'yes'), + class: "like #{voted_classes[:in_favor]}", title: t('votes.agree'), method: "post", remote: true do %> + + <%= t('votes.agree') %> + + <%= votes_percentage('likes', proposal) %> + <% end %> + <% else %> + <% end %> - <% else %> - - <% end %> -
    +
    - + -
    - <% if user_signed_in? %> - <%= link_to vote_legislation_process_proposal_path(process_id: proposal.process, id: proposal, value: 'no'), class: "unlike #{voted_classes[:against]}", title: t('votes.disagree'), method: "post", remote: true do %> - - <%= t('votes.disagree') %> - - <%= votes_percentage('dislikes', proposal) %> +
    + <% if user_signed_in? %> + <%= link_to vote_legislation_process_proposal_path(process_id: proposal.process, id: proposal, value: 'no'), class: "unlike #{voted_classes[:against]}", title: t('votes.disagree'), method: "post", remote: true do %> + + <%= t('votes.disagree') %> + + <%= votes_percentage('dislikes', proposal) %> + <% end %> + <% else %> +
    + + <%= t('votes.disagree') %> + + <%= votes_percentage('dislikes', proposal) %> +
    <% end %> - <% else %> -
    - - <%= t('votes.disagree') %> - - <%= votes_percentage('dislikes', proposal) %> -
    - <% end %> -
    +
    + <% else %> +

    <%= t("legislation.proposals.closed") %>

    + <% end %> <%= t("proposals.proposal.votes", count: proposal.total_votes) %> diff --git a/config/locales/en/legislation.yml b/config/locales/en/legislation.yml index 4924e1f3f..5dd0d0196 100644 --- a/config/locales/en/legislation.yml +++ b/config/locales/en/legislation.yml @@ -123,4 +123,5 @@ en: proposals: form: tags_label: "Categories" - not_verified: "For vote proposals %{verify_account}." \ No newline at end of file + not_verified: "For vote proposals %{verify_account}." + closed: "This process has been closed and can not receive votes." \ No newline at end of file diff --git a/config/locales/es/legislation.yml b/config/locales/es/legislation.yml index 19038c747..0ded24d65 100644 --- a/config/locales/es/legislation.yml +++ b/config/locales/es/legislation.yml @@ -123,4 +123,5 @@ es: proposals: form: tags_label: "Categorías" - not_verified: Para votar propuestas %{verify_account}. \ No newline at end of file + not_verified: Para votar propuestas %{verify_account}. + closed: "Este proceso se ha cerrado y ya no puede recoger votos." \ No newline at end of file From f068eef6ce7644768caa7d9c63086075bf296a78 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 26 Oct 2017 19:01:18 +0200 Subject: [PATCH 691/765] changes back link on proposal show --- app/views/legislation/proposals/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/legislation/proposals/show.html.erb b/app/views/legislation/proposals/show.html.erb index bdabe926f..8ad9e4f54 100644 --- a/app/views/legislation/proposals/show.html.erb +++ b/app/views/legislation/proposals/show.html.erb @@ -14,7 +14,7 @@
    - <%= back_link_to %> + <%= back_link_to legislation_process_proposals_path(process_id: @process) %>

    <%= @proposal.title %>

    <% if @proposal.conflictive? %> From 69f29b4f49279544d8a0b94ec3de27cb0412b9b8 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 26 Oct 2017 19:07:47 +0200 Subject: [PATCH 692/765] shows create button and categories only if proposals phase is open --- app/views/legislation/processes/proposals.html.erb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/legislation/processes/proposals.html.erb b/app/views/legislation/processes/proposals.html.erb index a6346671e..cf6bd25b2 100644 --- a/app/views/legislation/processes/proposals.html.erb +++ b/app/views/legislation/processes/proposals.html.erb @@ -19,10 +19,12 @@
    -
    -

    <%= link_to t("proposals.index.start_proposal"), new_legislation_process_proposal_path(@process), class: 'button expanded' %>

    - <%= render 'legislation/proposals/categories', taggable: @process %> -
    + <% if @process.proposals_phase.open? %> +
    +

    <%= link_to t("proposals.index.start_proposal"), new_legislation_process_proposal_path(@process), class: 'button expanded' %>

    + <%= render 'legislation/proposals/categories', taggable: @process %> +
    + <% end %>
    From 392a787a2de90b2806dc3099ab0dcded6ae8361b Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 26 Oct 2017 19:09:02 +0200 Subject: [PATCH 693/765] hides only the create button --- app/views/legislation/processes/proposals.html.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/legislation/processes/proposals.html.erb b/app/views/legislation/processes/proposals.html.erb index cf6bd25b2..6159e9143 100644 --- a/app/views/legislation/processes/proposals.html.erb +++ b/app/views/legislation/processes/proposals.html.erb @@ -19,12 +19,12 @@
    - <% if @process.proposals_phase.open? %> -
    +
    + <% if @process.proposals_phase.open? %>

    <%= link_to t("proposals.index.start_proposal"), new_legislation_process_proposal_path(@process), class: 'button expanded' %>

    - <%= render 'legislation/proposals/categories', taggable: @process %> -
    - <% end %> + <% end %> + <%= render 'legislation/proposals/categories', taggable: @process %> +
    From 4e06fc52ce24e29ad36a65ca7aade2cc19859bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 27 Oct 2017 10:40:28 +0200 Subject: [PATCH 694/765] Removed `question`, `external_url` and `responsible_name` fields from legislation proposal form --- .../legislation/proposals/_form.html.erb | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/app/views/legislation/proposals/_form.html.erb b/app/views/legislation/proposals/_form.html.erb index 495a78190..23c61a671 100644 --- a/app/views/legislation/proposals/_form.html.erb +++ b/app/views/legislation/proposals/_form.html.erb @@ -11,17 +11,6 @@ <%= f.invisible_captcha :subtitle %> -
    - <%= f.label :question, t("proposals.form.proposal_question") %> -

    - <%= t("proposals.form.proposal_question_example_html") %> -

    - <%= f.text_field :question, maxlength: Legislation::Proposal.question_max_length, - placeholder: t("proposals.form.proposal_question"), - label: false, - aria: {describedby: "question-help-text"} %> -
    -
    <%= f.label :summary, t("proposals.form.proposal_summary") %>

    <%= t("proposals.form.proposal_summary_note") %>

    @@ -42,11 +31,6 @@ aria: {describedby: "video-url-help-text"} %>
    -
    - <%= f.label :external_url, t("proposals.form.proposal_external_url") %> - <%= f.text_field :external_url, placeholder: t("proposals.form.proposal_external_url"), label: false %> -
    -
    <%= render 'documents/nested_documents', documentable: @proposal, f: f %>
    @@ -74,15 +58,6 @@ aria: {describedby: "tag-list-help-text"} %>
    - <% if current_user.unverified? %> -
    - <%= f.label :responsible_name, t("proposals.form.proposal_responsible_name") %> -

    <%= t("proposals.form.proposal_responsible_name_note") %>

    - <%= f.text_field :responsible_name, placeholder: t("proposals.form.proposal_responsible_name"), label: false, - aria: {describedby: "responsible-name-help-text"} %> -
    - <% end %> -
    <% if @proposal.new_record? %> <%= f.label :terms_of_service do %> From 5ae31a6d0189d1ce8315399d81aee4cd2e1614b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Fri, 27 Oct 2017 10:43:37 +0200 Subject: [PATCH 695/765] Prevent `responsible_name` and `question` from validation --- app/controllers/legislation/proposals_controller.rb | 7 ++++--- app/models/legislation/proposal.rb | 4 ---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/controllers/legislation/proposals_controller.rb b/app/controllers/legislation/proposals_controller.rb index ee4d10c06..6aec36057 100644 --- a/app/controllers/legislation/proposals_controller.rb +++ b/app/controllers/legislation/proposals_controller.rb @@ -49,9 +49,10 @@ class Legislation::ProposalsController < Legislation::BaseController private def proposal_params - params.require(:legislation_proposal).permit(:legislation_process_id, :title, :question, :summary, :description, :external_url, :video_url, - :responsible_name, :tag_list, :terms_of_service, :geozone_id, - documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id] ) + params.require(:legislation_proposal).permit(:legislation_process_id, :title, + :question, :summary, :description, :video_url, :tag_list, + :terms_of_service, :geozone_id, + documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id] ) end def resource_model diff --git a/app/models/legislation/proposal.rb b/app/models/legislation/proposal.rb index 32badbb46..ec3dc6410 100644 --- a/app/models/legislation/proposal.rb +++ b/app/models/legislation/proposal.rb @@ -25,15 +25,11 @@ class Legislation::Proposal < ActiveRecord::Base has_many :comments, as: :commentable validates :title, presence: true - validates :question, presence: true validates :summary, presence: true validates :author, presence: true - validates :responsible_name, presence: true validates :title, length: { in: 4..Legislation::Proposal.title_max_length } validates :description, length: { maximum: Legislation::Proposal.description_max_length } - validates :question, length: { in: 10..Legislation::Proposal.question_max_length } - validates :responsible_name, length: { in: 6..Legislation::Proposal.responsible_name_max_length } validates :terms_of_service, acceptance: { allow_nil: false }, on: :create From 301645b032c060f73139cf2fd7cb6d8692a4f44b Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 25 Oct 2017 15:41:23 +0200 Subject: [PATCH 696/765] Remove slugs from Poll, column not present yet --- db/dev_seeds.rb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 3e504325a..645cc2794 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -100,7 +100,6 @@ poll_officer2 = create_user('poll_officer2@consul.dev', 'Pauline M. Espinosa') poll_officer2.create_poll_officer poll_officer2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "3311111111") - create_user('unverified@consul.dev', 'unverified') level_2 = create_user('leveltwo@consul.dev', 'level 2') @@ -529,13 +528,15 @@ print "Creating polls" puts " ✅" print "Active Polls" poll_active = Poll.create(name: "Active Poll", - slug: "active-poll", + # TODO: Uncomment when Poll get slugs + # slug: "active-poll", starts_at: 1.month.ago, ends_at: 1.month.from_now, geozone_restricted: false) poll_active_geolocalized = Poll.create(name: "Active Poll Restricted", - slug: "active-poll-restricted", + # TODO: Uncomment when Poll get slugs + # slug: "active-poll-restricted", starts_at: 1.month.ago, ends_at: 1.month.from_now, geozone_restricted: true, @@ -544,13 +545,15 @@ poll_active_geolocalized = Poll.create(name: "Active Poll Restricted", puts " ✅" print "Upcoming Poll" poll = Poll.create(name: "Upcoming Poll", - slug: "upcoming-poll", + # TODO: Uncomment when Poll get slugs + # slug: "upcoming-poll", starts_at: 1.month.from_now, ends_at: 2.months.from_now) puts " ✅" print "Recounting Poll" poll = Poll.create(name: "Recounting Poll", + # TODO: Uncomment when Poll get slugs # slug: "recounting-poll", starts_at: 1.months.ago, ends_at: 5.days.ago) @@ -558,13 +561,15 @@ poll = Poll.create(name: "Recounting Poll", puts " ✅" print "Expired Poll" poll_expired = Poll.create(name: "Expired Poll", - slug: "expired-poll", + # TODO: Uncomment when Poll get slugs + # slug: "expired-poll", starts_at: 2.months.ago, ends_at: 1.month.ago) puts " ✅" print "Expired Poll with Stats & Results" poll = Poll.create(name: "Expired Poll with Stats & Results", + # TODO: Uncomment when Poll get slugs # slug: "expired-poll-with-stats-and-results", starts_at: 2.months.ago, ends_at: 1.month.ago, @@ -611,7 +616,7 @@ end puts " ✅" print "Creating Poll Shifts for Poll Officers" - + Poll::BoothAssignment.all.each do |booth_assignment| Poll::Shift.create(booth_id: booth_assignment.booth_id, officer_id: poll_officer.poll_officer.id, From 6f6d48560f2c4a5f5e831ea5270f970124ffe0e2 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 25 Oct 2017 15:42:05 +0200 Subject: [PATCH 697/765] Small style fixes by rubocop on dev seeds --- db/dev_seeds.rb | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 645cc2794..c3f9cc4e1 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -1,5 +1,4 @@ require 'database_cleaner' - DatabaseCleaner.clean_with :truncation print "Creating Settings" @@ -528,19 +527,19 @@ print "Creating polls" puts " ✅" print "Active Polls" poll_active = Poll.create(name: "Active Poll", - # TODO: Uncomment when Poll get slugs - # slug: "active-poll", - starts_at: 1.month.ago, - ends_at: 1.month.from_now, - geozone_restricted: false) + # TODO: Uncomment when Poll get slugs + # slug: "active-poll", + starts_at: 1.month.ago, + ends_at: 1.month.from_now, + geozone_restricted: false) poll_active_geolocalized = Poll.create(name: "Active Poll Restricted", - # TODO: Uncomment when Poll get slugs - # slug: "active-poll-restricted", - starts_at: 1.month.ago, - ends_at: 1.month.from_now, - geozone_restricted: true, - geozones: Geozone.reorder("RANDOM()").limit(3)) + # TODO: Uncomment when Poll get slugs + # slug: "active-poll-restricted", + starts_at: 1.month.ago, + ends_at: 1.month.from_now, + geozone_restricted: true, + geozones: Geozone.reorder("RANDOM()").limit(3)) puts " ✅" print "Upcoming Poll" @@ -555,16 +554,16 @@ print "Recounting Poll" poll = Poll.create(name: "Recounting Poll", # TODO: Uncomment when Poll get slugs # slug: "recounting-poll", - starts_at: 1.months.ago, + starts_at: 1.month.ago, ends_at: 5.days.ago) puts " ✅" print "Expired Poll" poll_expired = Poll.create(name: "Expired Poll", - # TODO: Uncomment when Poll get slugs - # slug: "expired-poll", - starts_at: 2.months.ago, - ends_at: 1.month.ago) + # TODO: Uncomment when Poll get slugs + # slug: "expired-poll", + starts_at: 2.months.ago, + ends_at: 1.month.ago) puts " ✅" print "Expired Poll with Stats & Results" From 959f2fbf90232c015df1238256275517ea9be548 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 25 Oct 2017 16:03:21 +0200 Subject: [PATCH 698/765] Add section and log functions to use rails logger instead of puts and print on dev_seeds --- db/dev_seeds.rb | 1299 +++++++++++++++++++++++------------------------ 1 file changed, 629 insertions(+), 670 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index c3f9cc4e1..3dffab721 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -1,358 +1,356 @@ require 'database_cleaner' DatabaseCleaner.clean_with :truncation +@logger = Logger.new(STDOUT) +@logger.formatter = proc { |_severity, _datetime, _progname, msg| msg } -print "Creating Settings" -Setting.create(key: 'official_level_1_name', value: 'Empleados públicos') -Setting.create(key: 'official_level_2_name', value: 'Organización Municipal') -Setting.create(key: 'official_level_3_name', value: 'Directores generales') -Setting.create(key: 'official_level_4_name', value: 'Concejales') -Setting.create(key: 'official_level_5_name', value: 'Alcaldesa') -Setting.create(key: 'max_ratio_anon_votes_on_debates', value: '50') -Setting.create(key: 'max_votes_for_debate_edit', value: '1000') -Setting.create(key: 'max_votes_for_proposal_edit', value: '1000') -Setting.create(key: 'proposal_code_prefix', value: 'MAD') -Setting.create(key: 'votes_for_proposal_success', value: '100') -Setting.create(key: 'months_to_archive_proposals', value: '12') -Setting.create(key: 'comments_body_max_length', value: '1000') - -Setting.create(key: 'twitter_handle', value: '@consul_dev') -Setting.create(key: 'twitter_hashtag', value: '#consul_dev') -Setting.create(key: 'facebook_handle', value: 'CONSUL') -Setting.create(key: 'youtube_handle', value: 'CONSUL') -Setting.create(key: 'telegram_handle', value: 'CONSUL') -Setting.create(key: 'instagram_handle', value: 'CONSUL') -Setting.create(key: 'blog_url', value: '/blog') -Setting.create(key: 'url', value: 'http://localhost:3000') -Setting.create(key: 'org_name', value: 'CONSUL') -Setting.create(key: 'place_name', value: 'City') -Setting.create(key: 'feature.debates', value: "true") -Setting.create(key: 'feature.polls', value: "true") -Setting.create(key: 'feature.spending_proposals', value: nil) -Setting.create(key: 'feature.spending_proposal_features.voting_allowed', value: nil) -Setting.create(key: 'feature.budgets', value: "true") -Setting.create(key: 'feature.twitter_login', value: "true") -Setting.create(key: 'feature.facebook_login', value: "true") -Setting.create(key: 'feature.google_login', value: "true") -Setting.create(key: 'feature.signature_sheets', value: "true") -Setting.create(key: 'feature.legislation', value: "true") -Setting.create(key: 'feature.user.recommendations', value: "true") -Setting.create(key: 'feature.community', value: "true") -Setting.create(key: 'feature.map', value: "true") -Setting.create(key: 'per_page_code_head', value: "") -Setting.create(key: 'per_page_code_body', value: "") -Setting.create(key: 'comments_body_max_length', value: '1000') -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/') -Setting.create(key: 'min_age_to_participate', value: '16') -Setting.create(key: 'proposal_improvement_path', value: nil) -Setting.create(key: 'map_latitude', value: 51.48) -Setting.create(key: 'map_longitude', value: 0.0) -Setting.create(key: 'map_zoom', value: 10) - -puts " ✅" -print "Creating Geozones" - -Geozone.create(name: "city") -Geozone.create(name: "Existent District", census_code: "01") -('A'..'Z').each { |i| Geozone.create(name: "District #{i}", external_code: i.ord, census_code: i.ord) } - -puts " ✅" -print "Creating Users" - -def create_user(email, username = Faker::Name.name) - pwd = '12345678' - User.create!( - username: username, - email: email, - password: pwd, - password_confirmation: pwd, - confirmed_at: Time.current, - terms_of_service: "1", - gender: ['Male', 'Female'].sample, - date_of_birth: rand((Time.current - 80.years)..(Time.current - 16.years)), - public_activity: (rand(1..100) > 30) - ) +def section(section_title) + @logger.info section_title + yield + log(' ✅') end -admin = create_user('admin@consul.dev', 'admin') -admin.create_administrator -admin.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "1111111111") +def log(msg) + @logger.info "#{msg}\n" +end -moderator = create_user('mod@consul.dev', 'mod') -moderator.create_moderator +section "Creating Settings" do + Setting.create(key: 'official_level_1_name', value: 'Empleados públicos') + Setting.create(key: 'official_level_2_name', value: 'Organización Municipal') + Setting.create(key: 'official_level_3_name', value: 'Directores generales') + Setting.create(key: 'official_level_4_name', value: 'Concejales') + Setting.create(key: 'official_level_5_name', value: 'Alcaldesa') + Setting.create(key: 'max_ratio_anon_votes_on_debates', value: '50') + Setting.create(key: 'max_votes_for_debate_edit', value: '1000') + Setting.create(key: 'max_votes_for_proposal_edit', value: '1000') + Setting.create(key: 'proposal_code_prefix', value: 'MAD') + Setting.create(key: 'votes_for_proposal_success', value: '100') + Setting.create(key: 'months_to_archive_proposals', value: '12') + Setting.create(key: 'comments_body_max_length', value: '1000') -manager = create_user('manager@consul.dev', 'manager') -manager.create_manager + Setting.create(key: 'twitter_handle', value: '@consul_dev') + Setting.create(key: 'twitter_hashtag', value: '#consul_dev') + Setting.create(key: 'facebook_handle', value: 'CONSUL') + Setting.create(key: 'youtube_handle', value: 'CONSUL') + Setting.create(key: 'telegram_handle', value: 'CONSUL') + Setting.create(key: 'instagram_handle', value: 'CONSUL') + Setting.create(key: 'blog_url', value: '/blog') + Setting.create(key: 'url', value: 'http://localhost:3000') + Setting.create(key: 'org_name', value: 'CONSUL') + Setting.create(key: 'place_name', value: 'City') + Setting.create(key: 'feature.debates', value: "true") + Setting.create(key: 'feature.polls', value: "true") + Setting.create(key: 'feature.spending_proposals', value: nil) + Setting.create(key: 'feature.spending_proposal_features.voting_allowed', value: nil) + Setting.create(key: 'feature.budgets', value: "true") + Setting.create(key: 'feature.twitter_login', value: "true") + Setting.create(key: 'feature.facebook_login', value: "true") + Setting.create(key: 'feature.google_login', value: "true") + Setting.create(key: 'feature.signature_sheets', value: "true") + Setting.create(key: 'feature.legislation', value: "true") + Setting.create(key: 'feature.user.recommendations', value: "true") + Setting.create(key: 'feature.community', value: "true") + Setting.create(key: 'feature.map', value: "true") + Setting.create(key: 'per_page_code_head', value: "") + Setting.create(key: 'per_page_code_body', value: "") + Setting.create(key: 'comments_body_max_length', value: '1000') + 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/') + Setting.create(key: 'min_age_to_participate', value: '16') + Setting.create(key: 'proposal_improvement_path', value: nil) + Setting.create(key: 'map_latitude', value: 51.48) + Setting.create(key: 'map_longitude', value: 0.0) + Setting.create(key: 'map_zoom', value: 10) +end -valuator = create_user('valuator@consul.dev', 'valuator') -valuator.create_valuator -valuator.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "2111111111") +section "Creating Geozones" do + Geozone.create(name: "city") + Geozone.create(name: "Existent District", census_code: "01") + ('A'..'Z').each { |i| Geozone.create(name: "District #{i}", external_code: i.ord, census_code: i.ord) } +end -poll_officer = create_user('poll_officer@consul.dev', 'Paul O. Fisher') -poll_officer.create_poll_officer -poll_officer.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "2211111111") +section "Creating Users" do + def create_user(email, username = Faker::Name.name) + pwd = '12345678' + User.create!( + username: username, + email: email, + password: pwd, + password_confirmation: pwd, + confirmed_at: Time.current, + terms_of_service: "1", + gender: ['Male', 'Female'].sample, + date_of_birth: rand((Time.current - 80.years)..(Time.current - 16.years)), + public_activity: (rand(1..100) > 30) + ) + end -poll_officer2 = create_user('poll_officer2@consul.dev', 'Pauline M. Espinosa') -poll_officer2.create_poll_officer -poll_officer2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "3311111111") + admin = create_user('admin@consul.dev', 'admin') + admin.create_administrator + admin.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "1111111111") -create_user('unverified@consul.dev', 'unverified') + moderator = create_user('mod@consul.dev', 'mod') + moderator.create_moderator -level_2 = create_user('leveltwo@consul.dev', 'level 2') -level_2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: "2222222222", document_type: "1") + manager = create_user('manager@consul.dev', 'manager') + manager.create_manager -verified = create_user('verified@consul.dev', 'verified') -verified.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "3333333333") + @valuator = create_user('valuator@consul.dev', 'valuator') + @valuator.create_valuator + @valuator.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "2111111111") -(1..10).each do |i| - org_name = Faker::Company.name - org_user = create_user("org#{i}@consul.dev", org_name) - org_responsible_name = Faker::Name.name - org = org_user.create_organization(name: org_name, responsible_name: org_responsible_name) + poll_officer = create_user('poll_officer@consul.dev', 'Paul O. Fisher') + poll_officer.create_poll_officer + poll_officer.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "2211111111") - verified = [true, false].sample - if verified - org.verify - else - org.reject + poll_officer2 = create_user('poll_officer2@consul.dev', 'Pauline M. Espinosa') + poll_officer2.create_poll_officer + poll_officer2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "3311111111") + + create_user('unverified@consul.dev', 'unverified') + + level_2 = create_user('leveltwo@consul.dev', 'level 2') + level_2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: "2222222222", document_type: "1") + + verified = create_user('verified@consul.dev', 'verified') + verified.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "3333333333") + + (1..10).each do |i| + org_name = Faker::Company.name + org_user = create_user("org#{i}@consul.dev", org_name) + org_responsible_name = Faker::Name.name + org = org_user.create_organization(name: org_name, responsible_name: org_responsible_name) + + verified = [true, false].sample + if verified + org.verify + else + org.reject + end + end + + (1..5).each do |i| + official = create_user("official#{i}@consul.dev") + official.update(official_level: i, official_position: "Official position #{i}") + end + + (1..100).each do |i| + user = create_user("user#{i}@consul.dev") + level = [1, 2, 3].sample + if level >= 2 + user.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: Faker::Number.number(10), document_type: "1", geozone: Geozone.reorder("RANDOM()").first) + end + if level == 3 + user.update(verified_at: Time.current, document_number: Faker::Number.number(10)) + end + end + + org_user_ids = User.organizations.pluck(:id) + @not_org_users = User.where(['users.id NOT IN(?)', org_user_ids]) +end + +section "Creating Tags Categories" do + ActsAsTaggableOn::Tag.category.create!(name: "Asociaciones") + ActsAsTaggableOn::Tag.category.create!(name: "Cultura") + ActsAsTaggableOn::Tag.category.create!(name: "Deportes") + ActsAsTaggableOn::Tag.category.create!(name: "Derechos Sociales") + ActsAsTaggableOn::Tag.category.create!(name: "Economía") + ActsAsTaggableOn::Tag.category.create!(name: "Empleo") + ActsAsTaggableOn::Tag.category.create!(name: "Equidad") + ActsAsTaggableOn::Tag.category.create!(name: "Sostenibilidad") + ActsAsTaggableOn::Tag.category.create!(name: "Participación") + ActsAsTaggableOn::Tag.category.create!(name: "Movilidad") + ActsAsTaggableOn::Tag.category.create!(name: "Medios") + ActsAsTaggableOn::Tag.category.create!(name: "Salud") + ActsAsTaggableOn::Tag.category.create!(name: "Transparencia") + ActsAsTaggableOn::Tag.category.create!(name: "Seguridad y Emergencias") + ActsAsTaggableOn::Tag.category.create!(name: "Medio Ambiente") +end + +section "Creating Debates" do + tags = Faker::Lorem.words(25) + 30.times do + author = User.reorder("RANDOM()").first + description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " + debate = Debate.create!(author: author, + title: Faker::Lorem.sentence(3).truncate(60), + created_at: rand((Time.current - 1.week)..Time.current), + description: description, + tag_list: tags.sample(3).join(','), + geozone: Geozone.reorder("RANDOM()").first, + terms_of_service: "1") + end + + tags = ActsAsTaggableOn::Tag.where(kind: 'category') + 30.times do + author = User.reorder("RANDOM()").first + description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " + debate = Debate.create!(author: author, + title: Faker::Lorem.sentence(3).truncate(60), + created_at: rand((Time.current - 1.week)..Time.current), + description: description, + tag_list: tags.sample(3).join(','), + geozone: Geozone.reorder("RANDOM()").first, + terms_of_service: "1") end end -(1..5).each do |i| - official = create_user("official#{i}@consul.dev") - official.update(official_level: i, official_position: "Official position #{i}") -end - -(1..100).each do |i| - user = create_user("user#{i}@consul.dev") - level = [1, 2, 3].sample - if level >= 2 - user.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: Faker::Number.number(10), document_type: "1", geozone: Geozone.reorder("RANDOM()").first) - end - if level == 3 - user.update(verified_at: Time.current, document_number: Faker::Number.number(10)) +section "Creating Proposals" do + tags = Faker::Lorem.words(25) + 30.times do + author = User.reorder("RANDOM()").first + description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " + proposal = Proposal.create!(author: author, + title: Faker::Lorem.sentence(3).truncate(60), + question: Faker::Lorem.sentence(3) + "?", + summary: Faker::Lorem.sentence(3), + responsible_name: Faker::Name.name, + external_url: Faker::Internet.url, + description: description, + created_at: rand((Time.current - 1.week)..Time.current), + tag_list: tags.sample(3).join(','), + geozone: Geozone.reorder("RANDOM()").first, + terms_of_service: "1") end end -org_user_ids = User.organizations.pluck(:id) -not_org_users = User.where(['users.id NOT IN(?)', org_user_ids]) - -puts " ✅" -print "Creating Tags Categories" - -ActsAsTaggableOn::Tag.category.create!(name: "Asociaciones") -ActsAsTaggableOn::Tag.category.create!(name: "Cultura") -ActsAsTaggableOn::Tag.category.create!(name: "Deportes") -ActsAsTaggableOn::Tag.category.create!(name: "Derechos Sociales") -ActsAsTaggableOn::Tag.category.create!(name: "Economía") -ActsAsTaggableOn::Tag.category.create!(name: "Empleo") -ActsAsTaggableOn::Tag.category.create!(name: "Equidad") -ActsAsTaggableOn::Tag.category.create!(name: "Sostenibilidad") -ActsAsTaggableOn::Tag.category.create!(name: "Participación") -ActsAsTaggableOn::Tag.category.create!(name: "Movilidad") -ActsAsTaggableOn::Tag.category.create!(name: "Medios") -ActsAsTaggableOn::Tag.category.create!(name: "Salud") -ActsAsTaggableOn::Tag.category.create!(name: "Transparencia") -ActsAsTaggableOn::Tag.category.create!(name: "Seguridad y Emergencias") -ActsAsTaggableOn::Tag.category.create!(name: "Medio Ambiente") - -puts " ✅" -print "Creating Debates" - -tags = Faker::Lorem.words(25) -30.times do - author = User.reorder("RANDOM()").first - description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " - debate = Debate.create!(author: author, - title: Faker::Lorem.sentence(3).truncate(60), - created_at: rand((Time.current - 1.week)..Time.current), - description: description, - tag_list: tags.sample(3).join(','), - geozone: Geozone.reorder("RANDOM()").first, - terms_of_service: "1") +section "Creating Archived Proposals" do + tags = Faker::Lorem.words(25) + 5.times do + author = User.reorder("RANDOM()").first + description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " + proposal = Proposal.create!(author: author, + title: Faker::Lorem.sentence(3).truncate(60), + question: Faker::Lorem.sentence(3) + "?", + summary: Faker::Lorem.sentence(3), + responsible_name: Faker::Name.name, + external_url: Faker::Internet.url, + description: description, + tag_list: tags.sample(3).join(','), + geozone: Geozone.reorder("RANDOM()").first, + terms_of_service: "1", + created_at: Setting["months_to_archive_proposals"].to_i.months.ago) + end end -tags = ActsAsTaggableOn::Tag.where(kind: 'category') -30.times do - author = User.reorder("RANDOM()").first - description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " - debate = Debate.create!(author: author, - title: Faker::Lorem.sentence(3).truncate(60), - created_at: rand((Time.current - 1.week)..Time.current), - description: description, - tag_list: tags.sample(3).join(','), - geozone: Geozone.reorder("RANDOM()").first, - terms_of_service: "1") +section "Creating Successful Proposals" do + tags = Faker::Lorem.words(25) + 10.times do + author = User.reorder("RANDOM()").first + description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " + proposal = Proposal.create!(author: author, + title: Faker::Lorem.sentence(3).truncate(60), + question: Faker::Lorem.sentence(3) + "?", + summary: Faker::Lorem.sentence(3), + responsible_name: Faker::Name.name, + external_url: Faker::Internet.url, + description: description, + created_at: rand((Time.current - 1.week)..Time.current), + tag_list: tags.sample(3).join(','), + geozone: Geozone.reorder("RANDOM()").first, + terms_of_service: "1", + cached_votes_up: Setting["votes_for_proposal_success"]) + end + + tags = ActsAsTaggableOn::Tag.where(kind: 'category') + 30.times do + author = User.reorder("RANDOM()").first + description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " + proposal = Proposal.create!(author: author, + title: Faker::Lorem.sentence(3).truncate(60), + question: Faker::Lorem.sentence(3) + "?", + summary: Faker::Lorem.sentence(3), + responsible_name: Faker::Name.name, + external_url: Faker::Internet.url, + description: description, + created_at: rand((Time.current - 1.week)..Time.current), + tag_list: tags.sample(3).join(','), + geozone: Geozone.reorder("RANDOM()").first, + terms_of_service: "1") + end end -puts " ✅" -print "Creating Proposals" - -tags = Faker::Lorem.words(25) -30.times do - author = User.reorder("RANDOM()").first - description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " - proposal = Proposal.create!(author: author, - title: Faker::Lorem.sentence(3).truncate(60), - question: Faker::Lorem.sentence(3) + "?", - summary: Faker::Lorem.sentence(3), - responsible_name: Faker::Name.name, - external_url: Faker::Internet.url, - description: description, - created_at: rand((Time.current - 1.week)..Time.current), - tag_list: tags.sample(3).join(','), - geozone: Geozone.reorder("RANDOM()").first, - terms_of_service: "1") +section "Commenting Debates" do + 100.times do + author = User.reorder("RANDOM()").first + debate = Debate.reorder("RANDOM()").first + Comment.create!(user: author, + created_at: rand(debate.created_at..Time.current), + commentable: debate, + body: Faker::Lorem.sentence) + end end -puts " ✅" -print "Creating Archived Proposals" - -tags = Faker::Lorem.words(25) -5.times do - author = User.reorder("RANDOM()").first - description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " - proposal = Proposal.create!(author: author, - title: Faker::Lorem.sentence(3).truncate(60), - question: Faker::Lorem.sentence(3) + "?", - summary: Faker::Lorem.sentence(3), - responsible_name: Faker::Name.name, - external_url: Faker::Internet.url, - description: description, - tag_list: tags.sample(3).join(','), - geozone: Geozone.reorder("RANDOM()").first, - terms_of_service: "1", - created_at: Setting["months_to_archive_proposals"].to_i.months.ago) +section "Commenting Proposals" do + 100.times do + author = User.reorder("RANDOM()").first + proposal = Proposal.reorder("RANDOM()").first + Comment.create!(user: author, + created_at: rand(proposal.created_at..Time.current), + commentable: proposal, + body: Faker::Lorem.sentence) + end end -puts " ✅" -print "Creating Successful Proposals" - -tags = Faker::Lorem.words(25) -10.times do - author = User.reorder("RANDOM()").first - description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " - proposal = Proposal.create!(author: author, - title: Faker::Lorem.sentence(3).truncate(60), - question: Faker::Lorem.sentence(3) + "?", - summary: Faker::Lorem.sentence(3), - responsible_name: Faker::Name.name, - external_url: Faker::Internet.url, - description: description, - created_at: rand((Time.current - 1.week)..Time.current), - tag_list: tags.sample(3).join(','), - geozone: Geozone.reorder("RANDOM()").first, - terms_of_service: "1", - cached_votes_up: Setting["votes_for_proposal_success"]) +section "Commenting Comments" do + 200.times do + author = User.reorder("RANDOM()").first + parent = Comment.reorder("RANDOM()").first + Comment.create!(user: author, + created_at: rand(parent.created_at..Time.current), + commentable_id: parent.commentable_id, + commentable_type: parent.commentable_type, + body: Faker::Lorem.sentence, + parent: parent) + end end -tags = ActsAsTaggableOn::Tag.where(kind: 'category') -30.times do - author = User.reorder("RANDOM()").first - description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " - proposal = Proposal.create!(author: author, - title: Faker::Lorem.sentence(3).truncate(60), - question: Faker::Lorem.sentence(3) + "?", - summary: Faker::Lorem.sentence(3), - responsible_name: Faker::Name.name, - external_url: Faker::Internet.url, - description: description, - created_at: rand((Time.current - 1.week)..Time.current), - tag_list: tags.sample(3).join(','), - geozone: Geozone.reorder("RANDOM()").first, - terms_of_service: "1") +section "Voting Debates, Proposals & Comments" do + 100.times do + voter = @not_org_users.level_two_or_three_verified.reorder("RANDOM()").first + vote = [true, false].sample + debate = Debate.reorder("RANDOM()").first + debate.vote_by(voter: voter, vote: vote) + end + + 100.times do + voter = @not_org_users.reorder("RANDOM()").first + vote = [true, false].sample + comment = Comment.reorder("RANDOM()").first + comment.vote_by(voter: voter, vote: vote) + end + + 100.times do + voter = @not_org_users.level_two_or_three_verified.reorder("RANDOM()").first + proposal = Proposal.reorder("RANDOM()").first + proposal.vote_by(voter: voter, vote: true) + end end -puts " ✅" -print "Commenting Debates" +section "Flagging Debates & Comments" do + 40.times do + debate = Debate.reorder("RANDOM()").first + flagger = User.where(["users.id <> ?", debate.author_id]).reorder("RANDOM()").first + Flag.flag(flagger, debate) + end -100.times do - author = User.reorder("RANDOM()").first - debate = Debate.reorder("RANDOM()").first - Comment.create!(user: author, - created_at: rand(debate.created_at..Time.current), - commentable: debate, - body: Faker::Lorem.sentence) + 40.times do + comment = Comment.reorder("RANDOM()").first + flagger = User.where(["users.id <> ?", comment.user_id]).reorder("RANDOM()").first + Flag.flag(flagger, comment) + end + + 40.times do + proposal = Proposal.reorder("RANDOM()").first + flagger = User.where(["users.id <> ?", proposal.author_id]).reorder("RANDOM()").first + Flag.flag(flagger, proposal) + end end -puts " ✅" -print "Commenting Proposals" - -100.times do - author = User.reorder("RANDOM()").first - proposal = Proposal.reorder("RANDOM()").first - Comment.create!(user: author, - created_at: rand(proposal.created_at..Time.current), - commentable: proposal, - body: Faker::Lorem.sentence) -end - -puts " ✅" -print "Commenting Comments" - -200.times do - author = User.reorder("RANDOM()").first - parent = Comment.reorder("RANDOM()").first - Comment.create!(user: author, - created_at: rand(parent.created_at..Time.current), - commentable_id: parent.commentable_id, - commentable_type: parent.commentable_type, - body: Faker::Lorem.sentence, - parent: parent) -end - -puts " ✅" -print "Voting Debates, Proposals & Comments" - -100.times do - voter = not_org_users.level_two_or_three_verified.reorder("RANDOM()").first - vote = [true, false].sample - debate = Debate.reorder("RANDOM()").first - debate.vote_by(voter: voter, vote: vote) -end - -100.times do - voter = not_org_users.reorder("RANDOM()").first - vote = [true, false].sample - comment = Comment.reorder("RANDOM()").first - comment.vote_by(voter: voter, vote: vote) -end - -100.times do - voter = not_org_users.level_two_or_three_verified.reorder("RANDOM()").first - proposal = Proposal.reorder("RANDOM()").first - proposal.vote_by(voter: voter, vote: true) -end - -puts " ✅" -print "Flagging Debates & Comments" - -40.times do - debate = Debate.reorder("RANDOM()").first - flagger = User.where(["users.id <> ?", debate.author_id]).reorder("RANDOM()").first - Flag.flag(flagger, debate) -end - -40.times do - comment = Comment.reorder("RANDOM()").first - flagger = User.where(["users.id <> ?", comment.user_id]).reorder("RANDOM()").first - Flag.flag(flagger, comment) -end - -40.times do - proposal = Proposal.reorder("RANDOM()").first - flagger = User.where(["users.id <> ?", proposal.author_id]).reorder("RANDOM()").first - Flag.flag(flagger, proposal) -end - -puts " ✅" -print "Creating Spending Proposals" - +section "Creating Spending Proposals" do tags = Faker::Lorem.words(10) - 60.times do geozone = Geozone.reorder("RANDOM()").first author = User.reorder("RANDOM()").first @@ -373,200 +371,181 @@ tags = Faker::Lorem.words(10) price: rand(1000000), terms_of_service: "1") end - -puts " ✅" -print "Creating Valuation Assignments" - -(1..17).to_a.sample.times do - SpendingProposal.reorder("RANDOM()").first.valuators << valuator.valuator end -puts " ✅" -print "Creating Budgets" +section "Creating Valuation Assignments" do + (1..17).to_a.sample.times do + SpendingProposal.reorder("RANDOM()").first.valuators << @valuator.valuator + end +end -Budget::PHASES.each_with_index do |phase, i| - descriptions = Hash[Budget::PHASES.map do |p| - ["description_#{p}", - "

    #{Faker::Lorem.paragraphs(2).join('

    ')}

    "] - end] - budget = Budget.create!( - descriptions.merge( - name: (Date.current - 10 + i).to_s, - currency_symbol: "€", - phase: phase +section "Creating Budgets" do + Budget::PHASES.each_with_index do |phase, i| + descriptions = Hash[Budget::PHASES.map do |p| + ["description_#{p}", + "

    #{Faker::Lorem.paragraphs(2).join('

    ')}

    "] + end] + budget = Budget.create!( + descriptions.merge( + name: (Date.current - 10 + i).to_s, + currency_symbol: "€", + phase: phase + ) ) - ) - (1..([1, 2, 3].sample)).each do |i| - group = budget.groups.create!(name: "#{Faker::StarWars.planet} #{i}") + (1..([1, 2, 3].sample)).each do |i| + group = budget.groups.create!(name: "#{Faker::StarWars.planet} #{i}") - geozones = Geozone.reorder("RANDOM()").limit([2, 5, 6, 7].sample) - geozones.each do |geozone| - group.headings << group.headings.create!(name: "#{geozone.name} #{i}", - price: rand(1..100) * 100000, - population: rand(1..50) * 10000) + geozones = Geozone.reorder("RANDOM()").limit([2, 5, 6, 7].sample) + geozones.each do |geozone| + group.headings << group.headings.create!(name: "#{geozone.name} #{i}", + price: rand(1..100) * 100000, + population: rand(1..50) * 10000) + end end end end -puts " ✅" -print "Creating Investments" -tags = Faker::Lorem.words(10) -100.times do - heading = Budget::Heading.reorder("RANDOM()").first +section "Creating Investments" do + tags = Faker::Lorem.words(10) + 100.times do + heading = Budget::Heading.reorder("RANDOM()").first - investment = Budget::Investment.create!( - author: User.reorder("RANDOM()").first, - heading: heading, - group: heading.group, - budget: heading.group.budget, - title: Faker::Lorem.sentence(3).truncate(60), - external_url: Faker::Internet.url, - description: "

    #{Faker::Lorem.paragraphs.join('

    ')}

    ", - created_at: rand((Time.current - 1.week)..Time.current), - feasibility: %w{undecided unfeasible feasible feasible feasible feasible}.sample, - unfeasibility_explanation: Faker::Lorem.paragraph, - valuation_finished: [false, true].sample, - tag_list: tags.sample(3).join(','), - price: rand(1..100) * 100000, - terms_of_service: "1" - ) + investment = Budget::Investment.create!( + author: User.reorder("RANDOM()").first, + heading: heading, + group: heading.group, + budget: heading.group.budget, + title: Faker::Lorem.sentence(3).truncate(60), + external_url: Faker::Internet.url, + description: "

    #{Faker::Lorem.paragraphs.join('

    ')}

    ", + created_at: rand((Time.current - 1.week)..Time.current), + feasibility: %w{undecided unfeasible feasible feasible feasible feasible}.sample, + unfeasibility_explanation: Faker::Lorem.paragraph, + valuation_finished: [false, true].sample, + tag_list: tags.sample(3).join(','), + price: rand(1..100) * 100000, + terms_of_service: "1" + ) + end end -puts " ✅" -print "Balloting Investments" -Budget.balloting.last.investments.each do |investment| - investment.update(selected: true, feasibility: "feasible") +section "Balloting Investments" do + Budget.balloting.last.investments.each do |investment| + investment.update(selected: true, feasibility: "feasible") + end end -puts " ✅" -print "Winner Investments" - -budget = Budget.where(phase: "finished").last -100.times do - heading = budget.headings.reorder("RANDOM()").first - investment = Budget::Investment.create!( - author: User.reorder("RANDOM()").first, - heading: heading, - group: heading.group, - budget: heading.group.budget, - title: Faker::Lorem.sentence(3).truncate(60), - external_url: Faker::Internet.url, - description: "

    #{Faker::Lorem.paragraphs.join('

    ')}

    ", - created_at: rand((Time.current - 1.week)..Time.current), - feasibility: "feasible", - valuation_finished: true, - selected: true, - price: rand(10000..heading.price), - terms_of_service: "1" - ) -end -budget.headings.each do |heading| - Budget::Result.new(budget, heading).calculate_winners +section "Winner Investments" do + budget = Budget.where(phase: "finished").last + 100.times do + heading = budget.headings.reorder("RANDOM()").first + investment = Budget::Investment.create!( + author: User.reorder("RANDOM()").first, + heading: heading, + group: heading.group, + budget: heading.group.budget, + title: Faker::Lorem.sentence(3).truncate(60), + external_url: Faker::Internet.url, + description: "

    #{Faker::Lorem.paragraphs.join('

    ')}

    ", + created_at: rand((Time.current - 1.week)..Time.current), + feasibility: "feasible", + valuation_finished: true, + selected: true, + price: rand(10000..heading.price), + terms_of_service: "1" + ) + end + budget.headings.each do |heading| + Budget::Result.new(budget, heading).calculate_winners + end end -puts " ✅" -print "Creating Valuation Assignments" - -(1..50).to_a.sample.times do - Budget::Investment.reorder("RANDOM()").first.valuators << valuator.valuator +section "Creating Valuation Assignments" do + (1..50).to_a.sample.times do + Budget::Investment.reorder("RANDOM()").first.valuators << @valuator.valuator + end end -puts " ✅" -print "Ignoring flags in Debates, comments & proposals" - -Debate.flagged.reorder("RANDOM()").limit(10).each(&:ignore_flag) -Comment.flagged.reorder("RANDOM()").limit(30).each(&:ignore_flag) -Proposal.flagged.reorder("RANDOM()").limit(10).each(&:ignore_flag) - -puts " ✅" -print "Hiding debates, comments & proposals" - -Comment.with_hidden.flagged.reorder("RANDOM()").limit(30).each(&:hide) -Debate.with_hidden.flagged.reorder("RANDOM()").limit(5).each(&:hide) -Proposal.with_hidden.flagged.reorder("RANDOM()").limit(10).each(&:hide) - -puts " ✅" -print "Confirming hiding in debates, comments & proposals" - -Comment.only_hidden.flagged.reorder("RANDOM()").limit(10).each(&:confirm_hide) -Debate.only_hidden.flagged.reorder("RANDOM()").limit(5).each(&:confirm_hide) -Proposal.only_hidden.flagged.reorder("RANDOM()").limit(5).each(&:confirm_hide) - -puts " ✅" -print "Creating banners" - -Proposal.last(3).each do |proposal| - title = Faker::Lorem.sentence(word_count = 3) - description = Faker::Lorem.sentence(word_count = 12) - banner = Banner.create!(title: title, - description: description, - style: ["banner-style banner-style-one", "banner-style banner-style-two", - "banner-style banner-style-three"].sample, - image: ["banner-img banner-img-one", "banner-img banner-img-two", - "banner-img banner-img-three"].sample, - target_url: Rails.application.routes.url_helpers.proposal_path(proposal), - post_started_at: rand((Time.current - 1.week)..(Time.current - 1.day)), - post_ended_at: rand((Time.current - 1.day)..(Time.current + 1.week)), - created_at: rand((Time.current - 1.week)..Time.current)) +section "Ignoring flags in Debates, comments & proposals" do + Debate.flagged.reorder("RANDOM()").limit(10).each(&:ignore_flag) + Comment.flagged.reorder("RANDOM()").limit(30).each(&:ignore_flag) + Proposal.flagged.reorder("RANDOM()").limit(10).each(&:ignore_flag) end -puts " ✅" -print "Creating proposal notifications" - -100.times do |i| - ProposalNotification.create!(title: "Proposal notification title #{i}", - body: "Proposal notification body #{i}", - author: User.reorder("RANDOM()").first, - proposal: Proposal.reorder("RANDOM()").first) +section "Hiding debates, comments & proposals" do + Comment.with_hidden.flagged.reorder("RANDOM()").limit(30).each(&:hide) + Debate.with_hidden.flagged.reorder("RANDOM()").limit(5).each(&:hide) + Proposal.with_hidden.flagged.reorder("RANDOM()").limit(10).each(&:hide) end -puts " ✅" -print "Creating polls" +section "Confirming hiding in debates, comments & proposals" do + Comment.only_hidden.flagged.reorder("RANDOM()").limit(10).each(&:confirm_hide) + Debate.only_hidden.flagged.reorder("RANDOM()").limit(5).each(&:confirm_hide) + Proposal.only_hidden.flagged.reorder("RANDOM()").limit(5).each(&:confirm_hide) +end -puts " ✅" -print "Active Polls" -poll_active = Poll.create(name: "Active Poll", - # TODO: Uncomment when Poll get slugs - # slug: "active-poll", - starts_at: 1.month.ago, - ends_at: 1.month.from_now, - geozone_restricted: false) +section "Creating banners" do + Proposal.last(3).each do |proposal| + title = Faker::Lorem.sentence(word_count = 3) + description = Faker::Lorem.sentence(word_count = 12) + banner = Banner.create!(title: title, + description: description, + style: ["banner-style banner-style-one", "banner-style banner-style-two", + "banner-style banner-style-three"].sample, + image: ["banner-img banner-img-one", "banner-img banner-img-two", + "banner-img banner-img-three"].sample, + target_url: Rails.application.routes.url_helpers.proposal_path(proposal), + post_started_at: rand((Time.current - 1.week)..(Time.current - 1.day)), + post_ended_at: rand((Time.current - 1.day)..(Time.current + 1.week)), + created_at: rand((Time.current - 1.week)..Time.current)) + end +end -poll_active_geolocalized = Poll.create(name: "Active Poll Restricted", - # TODO: Uncomment when Poll get slugs - # slug: "active-poll-restricted", - starts_at: 1.month.ago, - ends_at: 1.month.from_now, - geozone_restricted: true, - geozones: Geozone.reorder("RANDOM()").limit(3)) +section "Creating proposal notifications" do + 100.times do |i| + ProposalNotification.create!(title: "Proposal notification title #{i}", + body: "Proposal notification body #{i}", + author: User.reorder("RANDOM()").first, + proposal: Proposal.reorder("RANDOM()").first) + end +end + +section "Creating polls" do + +@poll_active = Poll.create(name: "Active Poll", + # TODO: Uncomment when Poll get slugs + # slug: "active-poll", + starts_at: 1.month.ago, + ends_at: 1.month.from_now, + geozone_restricted: false) + +@poll_active_geolocalized = Poll.create(name: "Active Poll Restricted", + # TODO: Uncomment when Poll get slugs + # slug: "active-poll-restricted", + starts_at: 1.month.ago, + ends_at: 1.month.from_now, + geozone_restricted: true, + geozones: Geozone.reorder("RANDOM()").limit(3)) -puts " ✅" -print "Upcoming Poll" poll = Poll.create(name: "Upcoming Poll", # TODO: Uncomment when Poll get slugs # slug: "upcoming-poll", starts_at: 1.month.from_now, ends_at: 2.months.from_now) -puts " ✅" -print "Recounting Poll" poll = Poll.create(name: "Recounting Poll", # TODO: Uncomment when Poll get slugs # slug: "recounting-poll", starts_at: 1.month.ago, ends_at: 5.days.ago) -puts " ✅" -print "Expired Poll" -poll_expired = Poll.create(name: "Expired Poll", - # TODO: Uncomment when Poll get slugs - # slug: "expired-poll", - starts_at: 2.months.ago, - ends_at: 1.month.ago) +@poll_expired = Poll.create(name: "Expired Poll", + # TODO: Uncomment when Poll get slugs + # slug: "expired-poll", + starts_at: 2.months.ago, + ends_at: 1.month.ago) -puts " ✅" -print "Expired Poll with Stats & Results" poll = Poll.create(name: "Expired Poll with Stats & Results", # TODO: Uncomment when Poll get slugs # slug: "expired-poll-with-stats-and-results", @@ -574,220 +553,200 @@ poll = Poll.create(name: "Expired Poll with Stats & Results", ends_at: 1.month.ago, results_enabled: true, stats_enabled: true) - -puts " ✅" -print "Creating Poll Questions" - -25.times do - poll = Poll.reorder("RANDOM()").first - author = User.reorder("RANDOM()").first - description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " - open_at = rand(2.months.ago..2.months.from_now) - question = Poll::Question.create!(author: author, - title: Faker::Lorem.sentence(3).truncate(60), - poll: poll) - Faker::Lorem.words((2..4).to_a.sample).each do |answer| - Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) - end end -puts " ✅" -print "Creating Poll Booths" -20.times.each_with_index do |i| - Poll::Booth.create(name: "Booth #{i}", polls: [Poll.all.sample]) -end - -puts " ✅" -print "Creating Booth Assignments" -Poll::Booth.all.each do |booth| - Poll::BoothAssignment.create(booth: booth, poll: Poll.all.sample) -end - -puts " ✅" -print "Creating Poll Officer Assignments" -(1..15).to_a.sample.times do |i| - Poll::BoothAssignment.all.sample(i).each do |booth_assignment| - Poll::OfficerAssignment.create(officer: poll_officer.poll_officer, - booth_assignment: booth_assignment, - date: booth_assignment.poll.starts_at) - end -end - -puts " ✅" -print "Creating Poll Shifts for Poll Officers" - -Poll::BoothAssignment.all.each do |booth_assignment| - Poll::Shift.create(booth_id: booth_assignment.booth_id, - officer_id: poll_officer.poll_officer.id, - date: Date.current, - officer_name: poll_officer.poll_officer.name, - officer_email: poll_officer.poll_officer.email, - task: 0) - Poll::Shift.create(booth_id: booth_assignment.booth_id, - officer_id: poll_officer.poll_officer.id, - date: Date.current, - officer_name: poll_officer.poll_officer.name, - officer_email: poll_officer.poll_officer.email, - task: 1) -end - -puts " ✅" -print "Creating Poll Questions from Proposals" - -3.times do - proposal = Proposal.reorder("RANDOM()").first - poll = Poll.current.first - question = Poll::Question.create(poll: poll) - Faker::Lorem.words((2..4).to_a.sample).each do |answer| - Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) - end - question.copy_attributes_from_proposal(proposal) - question.save! -end - -puts " ✅" -print "Creating Successful Proposals" - -10.times do - proposal = Proposal.reorder("RANDOM()").first - poll = Poll.current.first - question = Poll::Question.create(poll: poll) - Faker::Lorem.words((2..4).to_a.sample).each do |answer| - Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) - end - question.copy_attributes_from_proposal(proposal) - question.save! -end - -puts " ✅" -print "Commenting Poll Questions" - -30.times do - author = User.reorder("RANDOM()").first - question = Poll::Question.reorder("RANDOM()").first - Comment.create!(user: author, - created_at: rand(question.created_at..Time.current), - commentable: question, - body: Faker::Lorem.sentence) -end - -puts " ✅" -print "Creating Poll Voters" - -puts " ✅" -print "For Active Poll" - -10.times do - user = User.level_two_verified.sample - Poll::Voter.create(poll_id: poll_active.id, user_id: user.id, document_number: user.document_number, origin: 'web') - user = User.level_two_verified.sample - Poll::Voter.create(poll_id: poll_active.id, user_id: user.id, document_number: user.document_number, origin: 'booth') -end - -puts " ✅" -print "For Active Geolocalized Poll" - -10.times do - user = User.level_two_verified.sample - Poll::Voter.create(poll_id: poll_active_geolocalized.id, user_id: user.id, document_number: user.document_number, origin: 'web') - user = User.level_two_verified.sample - Poll::Voter.create(poll_id: poll_active_geolocalized.id, user_id: user.id, document_number: user.document_number, origin: 'booth') -end - -puts " ✅" -print "For Expired Poll" - -10.times do - user = User.level_two_verified.sample - Poll::Voter.create(poll_id: poll_expired.id, user_id: user.id, document_number: user.document_number, origin: 'web') - user = User.level_two_verified.sample - Poll::Voter.create(poll_id: poll_expired.id, user_id: user.id, document_number: user.document_number, origin: 'web') -end - -puts " ✅" -print "Creating Poll Answers" - -Poll::Voter.all.each do |voter| - voter.poll.questions.each do |question| - answer = question.question_answers.sample - unless answer.nil? - Poll::Answer.create(question_id: question.id, author_id: voter.user_id, answer: answer.title) +section "Creating Poll Questions" do + 25.times do + poll = Poll.reorder("RANDOM()").first + author = User.reorder("RANDOM()").first + description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " + open_at = rand(2.months.ago..2.months.from_now) + question = Poll::Question.create!(author: author, + title: Faker::Lorem.sentence(3).truncate(60), + poll: poll) + Faker::Lorem.words((2..4).to_a.sample).each do |answer| + Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) end end end -puts " ✅" -print "Creating Poll Recounts" - -Poll.all.each do |poll| - poll.booth_assignments.each do |booth_assignment| - officer_assignment = poll.officer_assignments.first - author = Poll::Officer.first.user - - Poll::Recount.create!(officer_assignment: officer_assignment, - booth_assignment: booth_assignment, - author: author, - date: poll.ends_at, - white_amount: rand(0..10), - null_amount: rand(0..10), - total_amount: rand(100..9999), - origin: "booth") +section "Creating Poll Booths" do + 20.times.each_with_index do |i| + Poll::Booth.create(name: "Booth #{i}", polls: [Poll.all.sample]) end end -puts " ✅" -print "Creating Poll Results" +section "Creating Booth Assignments" do + Poll::Booth.all.each do |booth| + Poll::BoothAssignment.create(booth: booth, poll: Poll.all.sample) + end +end -Poll.all.each do |poll| - poll.booth_assignments.each do |booth_assignment| - officer_assignment = poll.officer_assignments.first - author = Poll::Officer.first.user +# section "Creating Poll Officer Assignments" do +# (1..15).to_a.sample.times do |i| +# Poll::BoothAssignment.all.sample(i).each do |booth_assignment| +# Poll::OfficerAssignment.create(officer: poll_officer.poll_officer, +# booth_assignment: booth_assignment, +# date: booth_assignment.poll.starts_at) +# end +# end +# end - poll.questions.each do |question| - question.question_answers.each do |answer| - Poll::PartialResult.create!(officer_assignment: officer_assignment, - booth_assignment: booth_assignment, - date: Date.current, - question: question, - answer: answer.title, - author: author, - amount: rand(999), - origin: "booth") +section "Creating Poll Shifts for Poll Officers" do + Poll::BoothAssignment.all.each do |booth_assignment| + # TODO: Create vote_collection on correct date ranges + Poll::Shift.create(booth_id: booth_assignment.booth_id, + officer: Poll::Officer.first, + date: Date.current, + officer_name: Poll::Officer.first.name, + officer_email: Poll::Officer.first.email, + task: :vote_collection) + # TODO: Create recount_scrutiny shifts on correct date ranges + # Poll::Shift.create(booth_id: booth_assignment.booth_id, + # officer_id: poll_officer.poll_officer.id, + # date: Date.current, + # officer_name: poll_officer.poll_officer.name, + # officer_email: poll_officer.poll_officer.email, + # task: 1) + end +end + +section "Creating Poll Questions from Proposals" do + 3.times do + proposal = Proposal.reorder("RANDOM()").first + poll = Poll.current.first + question = Poll::Question.create(poll: poll) + Faker::Lorem.words((2..4).to_a.sample).each do |answer| + Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) + end + question.copy_attributes_from_proposal(proposal) + question.save! + end +end + +section "Creating Successful Proposals" do + 10.times do + proposal = Proposal.reorder("RANDOM()").first + poll = Poll.current.first + question = Poll::Question.create(poll: poll) + Faker::Lorem.words((2..4).to_a.sample).each do |answer| + Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) + end + question.copy_attributes_from_proposal(proposal) + question.save! + end +end + +section "Commenting Poll Questions" do + 30.times do + author = User.reorder("RANDOM()").first + question = Poll::Question.reorder("RANDOM()").first + Comment.create!(user: author, + created_at: rand(question.created_at..Time.current), + commentable: question, + body: Faker::Lorem.sentence) + end +end + +section "Creating Poll Voters" do + 10.times do + user = User.level_two_verified.sample + Poll::Voter.create(poll_id: @poll_active.id, user_id: user.id, document_number: user.document_number, origin: 'web') + user = User.level_two_verified.sample + Poll::Voter.create(poll_id: @poll_active.id, user_id: user.id, document_number: user.document_number, origin: 'booth') + end + 10.times do + user = User.level_two_verified.sample + Poll::Voter.create(poll_id: @poll_active_geolocalized.id, user_id: user.id, document_number: user.document_number, origin: 'web') + user = User.level_two_verified.sample + Poll::Voter.create(poll_id: @poll_active_geolocalized.id, user_id: user.id, document_number: user.document_number, origin: 'booth') + end + 10.times do + user = User.level_two_verified.sample + Poll::Voter.create(poll_id: @poll_expired.id, user_id: user.id, document_number: user.document_number, origin: 'web') + user = User.level_two_verified.sample + Poll::Voter.create(poll_id: @poll_expired.id, user_id: user.id, document_number: user.document_number, origin: 'web') + end +end + +section "Creating Poll Answers" do + Poll::Voter.all.each do |voter| + voter.poll.questions.each do |question| + answer = question.question_answers.sample + unless answer.nil? + Poll::Answer.create(question_id: question.id, author_id: voter.user_id, answer: answer.title) end end end - end -puts " ✅" -print "Creating legislation processes" +section "Creating Poll Recounts" do + Poll.all.each do |poll| + poll.booth_assignments.each do |booth_assignment| + officer_assignment = poll.officer_assignments.first + author = Poll::Officer.first.user -5.times do - process = ::Legislation::Process.create!(title: Faker::Lorem.sentence(3).truncate(60), - description: Faker::Lorem.paragraphs.join("\n\n"), - summary: Faker::Lorem.paragraph, - additional_info: Faker::Lorem.paragraphs.join("\n\n"), - start_date: Date.current - 3.days, - end_date: Date.current + 3.days, - debate_start_date: Date.current - 3.days, - debate_end_date: Date.current - 1.day, - draft_publication_date: Date.current + 1.day, - allegations_start_date: Date.current + 2.days, - allegations_end_date: Date.current + 3.days, - result_publication_date: Date.current + 4.days, - debate_phase_enabled: true, - allegations_phase_enabled: true, - draft_publication_enabled: true, - result_publication_enabled: true, - published: true) -end - -::Legislation::Process.all.each do |process| - (1..3).each do |i| - version = process.draft_versions.create!(title: "Version #{i}", - body: Faker::Lorem.paragraphs.join("\n\n")) + Poll::Recount.create!(officer_assignment: officer_assignment, + booth_assignment: booth_assignment, + author: author, + date: poll.ends_at, + white_amount: rand(0..10), + null_amount: rand(0..10), + total_amount: rand(100..9999), + origin: "booth") + end end end -puts " ✅" -puts "All dev seeds created successfuly 👍" +section "Creating Poll Results" do + Poll.all.each do |poll| + poll.booth_assignments.each do |booth_assignment| + officer_assignment = poll.officer_assignments.first + author = Poll::Officer.first.user + + poll.questions.each do |question| + question.question_answers.each do |answer| + Poll::PartialResult.create!(officer_assignment: officer_assignment, + booth_assignment: booth_assignment, + date: Date.current, + question: question, + answer: answer.title, + author: author, + amount: rand(999), + origin: "booth") + end + end + end + end +end + +section "Creating legislation processes" do + 5.times do + process = ::Legislation::Process.create!(title: Faker::Lorem.sentence(3).truncate(60), + description: Faker::Lorem.paragraphs.join("\n\n"), + summary: Faker::Lorem.paragraph, + additional_info: Faker::Lorem.paragraphs.join("\n\n"), + start_date: Date.current - 3.days, + end_date: Date.current + 3.days, + debate_start_date: Date.current - 3.days, + debate_end_date: Date.current - 1.day, + draft_publication_date: Date.current + 1.day, + allegations_start_date: Date.current + 2.days, + allegations_end_date: Date.current + 3.days, + result_publication_date: Date.current + 4.days, + debate_phase_enabled: true, + allegations_phase_enabled: true, + draft_publication_enabled: true, + result_publication_enabled: true, + published: true) + end + + ::Legislation::Process.all.each do |process| + (1..3).each do |i| + version = process.draft_versions.create!(title: "Version #{i}", + body: Faker::Lorem.paragraphs.join("\n\n")) + end + end +end + +log "All dev seeds created successfuly 👍" From d80aff3af179cf4aa0b5d0fe7495770bd535a11b Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 25 Oct 2017 16:04:30 +0200 Subject: [PATCH 699/765] Fix long lines on dev_seed --- db/dev_seeds.rb | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 3dffab721..b372938cc 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -89,7 +89,8 @@ section "Creating Users" do admin = create_user('admin@consul.dev', 'admin') admin.create_administrator - admin.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "1111111111") + admin.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", + verified_at: Time.current, document_number: "1111111111") moderator = create_user('mod@consul.dev', 'mod') moderator.create_moderator @@ -99,23 +100,28 @@ section "Creating Users" do @valuator = create_user('valuator@consul.dev', 'valuator') @valuator.create_valuator - @valuator.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "2111111111") + @valuator.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", + verified_at: Time.current, document_number: "2111111111") poll_officer = create_user('poll_officer@consul.dev', 'Paul O. Fisher') poll_officer.create_poll_officer - poll_officer.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "2211111111") + poll_officer.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", + verified_at: Time.current, document_number: "2211111111") poll_officer2 = create_user('poll_officer2@consul.dev', 'Pauline M. Espinosa') poll_officer2.create_poll_officer - poll_officer2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "3311111111") + poll_officer2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", + verified_at: Time.current, document_number: "3311111111") create_user('unverified@consul.dev', 'unverified') level_2 = create_user('leveltwo@consul.dev', 'level 2') - level_2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: "2222222222", document_type: "1") + level_2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: "2222222222", + document_type: "1") verified = create_user('verified@consul.dev', 'verified') - verified.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "3333333333") + verified.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", + verified_at: Time.current, document_number: "3333333333") (1..10).each do |i| org_name = Faker::Company.name @@ -140,7 +146,8 @@ section "Creating Users" do user = create_user("user#{i}@consul.dev") level = [1, 2, 3].sample if level >= 2 - user.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: Faker::Number.number(10), document_type: "1", geozone: Geozone.reorder("RANDOM()").first) + user.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, + document_number: Faker::Number.number(10), document_type: "1", geozone: Geozone.reorder("RANDOM()").first) end if level == 3 user.update(verified_at: Time.current, document_number: Faker::Number.number(10)) From 015f85f9db8e7805e85758152287849dc2b6de99 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 25 Oct 2017 16:06:17 +0200 Subject: [PATCH 700/765] Fix shadowing outer local variable issue on dev_seeds --- db/dev_seeds.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index b372938cc..83bf7dc5a 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -400,12 +400,12 @@ section "Creating Budgets" do ) ) - (1..([1, 2, 3].sample)).each do |i| - group = budget.groups.create!(name: "#{Faker::StarWars.planet} #{i}") + (1..([1, 2, 3].sample)).each do |k| + group = budget.groups.create!(name: "#{Faker::StarWars.planet} #{k}") geozones = Geozone.reorder("RANDOM()").limit([2, 5, 6, 7].sample) geozones.each do |geozone| - group.headings << group.headings.create!(name: "#{geozone.name} #{i}", + group.headings << group.headings.create!(name: "#{geozone.name} #{k}", price: rand(1..100) * 100000, population: rand(1..50) * 10000) end From d05fc42c5a8ba4391bc0901f194d7a245dd28bb5 Mon Sep 17 00:00:00 2001 From: BertoCQ Date: Mon, 6 Nov 2017 19:33:46 +0100 Subject: [PATCH 701/765] Add Maria Checa to contributors --- CONTRIBUTING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fabf10a0a..eb7d0dc34 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,8 +5,9 @@ * Raimond García [github](https://github.com/voodoorai2000) | [twitter](https://twitter.com/voodoorai2000) * Juanjo Bazán [github](https://github.com/xuanxu) | [twitter](https://twitter.com/xuanxu) * Enrique García Cota [github](https://github.com/kikito) | [twitter](https://twitter.com/otikik) -* Alberto García Cabeza [github](https://github.com/decabeza) | [twitter](https://twitter.com/decabeza) +* Alberto García Cabeza [github](https://github.com/decabeza * Alberto Calderón [github](https://github.com/bertocq) | [twitter](https://twitter.com/bertocq) +* Maria Checa [github](https://github.com/MariaCheca) ## Code of conduct From f778071682554d0de43d30125769a613d719c4ba Mon Sep 17 00:00:00 2001 From: BertoCQ Date: Mon, 6 Nov 2017 19:34:05 +0100 Subject: [PATCH 702/765] Add Maria Checa to contributors --- CONTRIBUTING_ES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING_ES.md b/CONTRIBUTING_ES.md index 6b77c0f42..c05556fb1 100644 --- a/CONTRIBUTING_ES.md +++ b/CONTRIBUTING_ES.md @@ -5,8 +5,9 @@ * Raimond García [github](https://github.com/voodoorai2000) | [twitter](https://twitter.com/voodoorai2000) * Juanjo Bazán [github](https://github.com/xuanxu) | [twitter](https://twitter.com/xuanxu) * Enrique García Cota [github](https://github.com/kikito) | [twitter](https://twitter.com/otikik) -* Alberto García Cabeza [github](https://github.com/decabeza) | [twitter](https://twitter.com/decabeza) +* Alberto García Cabeza [github](https://github.com/decabeza) * Alberto Calderón [github](https://github.com/bertocq) | [twitter](https://twitter.com/bertocq) +* Maria Checa [github](https://github.com/MariaCheca) ## Código de conducta From dadeaf4c507f39ac2ede9f6dc2d6e2fc5148a859 Mon Sep 17 00:00:00 2001 From: BertoCQ Date: Mon, 6 Nov 2017 19:34:24 +0100 Subject: [PATCH 703/765] Fix typo in contributors.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index eb7d0dc34..076512ea3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,7 @@ * Raimond García [github](https://github.com/voodoorai2000) | [twitter](https://twitter.com/voodoorai2000) * Juanjo Bazán [github](https://github.com/xuanxu) | [twitter](https://twitter.com/xuanxu) * Enrique García Cota [github](https://github.com/kikito) | [twitter](https://twitter.com/otikik) -* Alberto García Cabeza [github](https://github.com/decabeza +* Alberto García Cabeza [github](https://github.com/decabeza) * Alberto Calderón [github](https://github.com/bertocq) | [twitter](https://twitter.com/bertocq) * Maria Checa [github](https://github.com/MariaCheca) From f3831de31cb77445a67b9afc96a9fc05a3ed3f29 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 8 Nov 2017 11:56:49 +0100 Subject: [PATCH 704/765] fixes typo introduced while fixing conflicts --- app/controllers/admin/legislation/processes_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/legislation/processes_controller.rb b/app/controllers/admin/legislation/processes_controller.rb index f2c7ed59c..8c790b023 100644 --- a/app/controllers/admin/legislation/processes_controller.rb +++ b/app/controllers/admin/legislation/processes_controller.rb @@ -58,7 +58,7 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll :draft_publication_enabled, :result_publication_enabled, :published, - documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy] + documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], :proposals_description, :custom_list ) From 644ea9629fb5260a426e2c58142c67d988ce1572 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Wed, 8 Nov 2017 12:05:02 +0100 Subject: [PATCH 705/765] uses correct order for permitted params --- app/controllers/admin/legislation/processes_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/legislation/processes_controller.rb b/app/controllers/admin/legislation/processes_controller.rb index 8c790b023..37f547883 100644 --- a/app/controllers/admin/legislation/processes_controller.rb +++ b/app/controllers/admin/legislation/processes_controller.rb @@ -58,9 +58,9 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll :draft_publication_enabled, :result_publication_enabled, :published, - documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], :proposals_description, - :custom_list + :custom_list, + documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy] ) end From 317542261db3d9b881480a3f056fbb319ee8df97 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 9 Nov 2017 12:35:14 +0100 Subject: [PATCH 706/765] Add helper function to generate unique document numbers --- db/dev_seeds.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 83bf7dc5a..bc113c41e 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -87,6 +87,12 @@ section "Creating Users" do ) end + def unique_document_number + @document_number ||= 12345678 + @document_number = @document_number + 1 + @document_number.to_s + end + admin = create_user('admin@consul.dev', 'admin') admin.create_administrator admin.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", From 5d9684904851f6df804032e83258a57d24e40703 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 9 Nov 2017 12:38:40 +0100 Subject: [PATCH 707/765] Make use of unique_document_number on users --- db/dev_seeds.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index bc113c41e..87b4221f3 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -96,7 +96,7 @@ section "Creating Users" do admin = create_user('admin@consul.dev', 'admin') admin.create_administrator admin.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", - verified_at: Time.current, document_number: "1111111111") + verified_at: Time.current, document_number: unique_document_number) moderator = create_user('mod@consul.dev', 'mod') moderator.create_moderator @@ -107,27 +107,27 @@ section "Creating Users" do @valuator = create_user('valuator@consul.dev', 'valuator') @valuator.create_valuator @valuator.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", - verified_at: Time.current, document_number: "2111111111") + verified_at: Time.current, document_number: unique_document_number) poll_officer = create_user('poll_officer@consul.dev', 'Paul O. Fisher') poll_officer.create_poll_officer poll_officer.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", - verified_at: Time.current, document_number: "2211111111") + verified_at: Time.current, document_number: unique_document_number) poll_officer2 = create_user('poll_officer2@consul.dev', 'Pauline M. Espinosa') poll_officer2.create_poll_officer poll_officer2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", - verified_at: Time.current, document_number: "3311111111") + verified_at: Time.current, document_number: unique_document_number) create_user('unverified@consul.dev', 'unverified') level_2 = create_user('leveltwo@consul.dev', 'level 2') - level_2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: "2222222222", + level_2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: unique_document_number, document_type: "1") verified = create_user('verified@consul.dev', 'verified') verified.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", - verified_at: Time.current, document_number: "3333333333") + verified_at: Time.current, document_number: unique_document_number) (1..10).each do |i| org_name = Faker::Company.name @@ -153,10 +153,10 @@ section "Creating Users" do level = [1, 2, 3].sample if level >= 2 user.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, - document_number: Faker::Number.number(10), document_type: "1", geozone: Geozone.reorder("RANDOM()").first) + document_number: unique_document_number, document_type: "1", geozone: Geozone.reorder("RANDOM()").first) end if level == 3 - user.update(verified_at: Time.current, document_number: Faker::Number.number(10)) + user.update(verified_at: Time.current, document_number: unique_document_number) end end From 33e111bcb7ec1c3d14273c70a1a69312e4c2b97d Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 9 Nov 2017 12:42:22 +0100 Subject: [PATCH 708/765] Remove class valuator variable and just find first Valuator whenever needed --- db/dev_seeds.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 87b4221f3..688fe2cd5 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -104,9 +104,9 @@ section "Creating Users" do manager = create_user('manager@consul.dev', 'manager') manager.create_manager - @valuator = create_user('valuator@consul.dev', 'valuator') - @valuator.create_valuator - @valuator.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", + valuator = create_user('valuator@consul.dev', 'valuator') + valuator.create_valuator + valuator.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: unique_document_number) poll_officer = create_user('poll_officer@consul.dev', 'Paul O. Fisher') @@ -388,7 +388,7 @@ end section "Creating Valuation Assignments" do (1..17).to_a.sample.times do - SpendingProposal.reorder("RANDOM()").first.valuators << @valuator.valuator + SpendingProposal.reorder("RANDOM()").first.valuators << Valuator.first end end @@ -476,7 +476,7 @@ end section "Creating Valuation Assignments" do (1..50).to_a.sample.times do - Budget::Investment.reorder("RANDOM()").first.valuators << @valuator.valuator + Budget::Investment.reorder("RANDOM()").first.valuators << Valuator.first end end From 597d740198b60ee7609cf2fbfe3454b82e0d8fd5 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 9 Nov 2017 12:43:49 +0100 Subject: [PATCH 709/765] Remove unnecesary blank spaces on tags creation --- db/dev_seeds.rb | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 688fe2cd5..5bc0a777f 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -165,21 +165,21 @@ section "Creating Users" do end section "Creating Tags Categories" do - ActsAsTaggableOn::Tag.category.create!(name: "Asociaciones") - ActsAsTaggableOn::Tag.category.create!(name: "Cultura") - ActsAsTaggableOn::Tag.category.create!(name: "Deportes") - ActsAsTaggableOn::Tag.category.create!(name: "Derechos Sociales") - ActsAsTaggableOn::Tag.category.create!(name: "Economía") - ActsAsTaggableOn::Tag.category.create!(name: "Empleo") - ActsAsTaggableOn::Tag.category.create!(name: "Equidad") - ActsAsTaggableOn::Tag.category.create!(name: "Sostenibilidad") - ActsAsTaggableOn::Tag.category.create!(name: "Participación") - ActsAsTaggableOn::Tag.category.create!(name: "Movilidad") - ActsAsTaggableOn::Tag.category.create!(name: "Medios") - ActsAsTaggableOn::Tag.category.create!(name: "Salud") - ActsAsTaggableOn::Tag.category.create!(name: "Transparencia") - ActsAsTaggableOn::Tag.category.create!(name: "Seguridad y Emergencias") - ActsAsTaggableOn::Tag.category.create!(name: "Medio Ambiente") + ActsAsTaggableOn::Tag.category.create!(name: "Asociaciones") + ActsAsTaggableOn::Tag.category.create!(name: "Cultura") + ActsAsTaggableOn::Tag.category.create!(name: "Deportes") + ActsAsTaggableOn::Tag.category.create!(name: "Derechos Sociales") + ActsAsTaggableOn::Tag.category.create!(name: "Economía") + ActsAsTaggableOn::Tag.category.create!(name: "Empleo") + ActsAsTaggableOn::Tag.category.create!(name: "Equidad") + ActsAsTaggableOn::Tag.category.create!(name: "Sostenibilidad") + ActsAsTaggableOn::Tag.category.create!(name: "Participación") + ActsAsTaggableOn::Tag.category.create!(name: "Movilidad") + ActsAsTaggableOn::Tag.category.create!(name: "Medios") + ActsAsTaggableOn::Tag.category.create!(name: "Salud") + ActsAsTaggableOn::Tag.category.create!(name: "Transparencia") + ActsAsTaggableOn::Tag.category.create!(name: "Seguridad y Emergencias") + ActsAsTaggableOn::Tag.category.create!(name: "Medio Ambiente") end section "Creating Debates" do From 607423c1a8104b363cdbe51b370cb0ef37f49076 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 9 Nov 2017 12:46:44 +0100 Subject: [PATCH 710/765] Move not org users query to correct section, avoiding class variable usage --- db/dev_seeds.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 5bc0a777f..5f09c3b38 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -159,9 +159,6 @@ section "Creating Users" do user.update(verified_at: Time.current, document_number: unique_document_number) end end - - org_user_ids = User.organizations.pluck(:id) - @not_org_users = User.where(['users.id NOT IN(?)', org_user_ids]) end section "Creating Tags Categories" do @@ -321,22 +318,23 @@ section "Commenting Comments" do end section "Voting Debates, Proposals & Comments" do + not_org_users = User.where(['users.id NOT IN(?)', User.organizations.pluck(:id)]) 100.times do - voter = @not_org_users.level_two_or_three_verified.reorder("RANDOM()").first + voter = not_org_users.level_two_or_three_verified.reorder("RANDOM()").first vote = [true, false].sample debate = Debate.reorder("RANDOM()").first debate.vote_by(voter: voter, vote: vote) end 100.times do - voter = @not_org_users.reorder("RANDOM()").first + voter = not_org_users.reorder("RANDOM()").first vote = [true, false].sample comment = Comment.reorder("RANDOM()").first comment.vote_by(voter: voter, vote: vote) end 100.times do - voter = @not_org_users.level_two_or_three_verified.reorder("RANDOM()").first + voter = not_org_users.level_two_or_three_verified.reorder("RANDOM()").first proposal = Proposal.reorder("RANDOM()").first proposal.vote_by(voter: voter, vote: true) end From 5a188474c5aa271a808942ae1be9091a7d142eca Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 9 Nov 2017 12:57:16 +0100 Subject: [PATCH 711/765] Replace the usage of reorder with RANDOM() posgtresql function, for all & sample --- db/dev_seeds.rb | 90 ++++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 5f09c3b38..fc937051d 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -153,7 +153,7 @@ section "Creating Users" do level = [1, 2, 3].sample if level >= 2 user.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, - document_number: unique_document_number, document_type: "1", geozone: Geozone.reorder("RANDOM()").first) + document_number: unique_document_number, document_type: "1", geozone: Geozone.all.sample) end if level == 3 user.update(verified_at: Time.current, document_number: unique_document_number) @@ -182,27 +182,27 @@ end section "Creating Debates" do tags = Faker::Lorem.words(25) 30.times do - author = User.reorder("RANDOM()").first + author = User.all.sample description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " debate = Debate.create!(author: author, title: Faker::Lorem.sentence(3).truncate(60), created_at: rand((Time.current - 1.week)..Time.current), description: description, tag_list: tags.sample(3).join(','), - geozone: Geozone.reorder("RANDOM()").first, + geozone: Geozone.all.sample, terms_of_service: "1") end tags = ActsAsTaggableOn::Tag.where(kind: 'category') 30.times do - author = User.reorder("RANDOM()").first + author = User.all.sample description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " debate = Debate.create!(author: author, title: Faker::Lorem.sentence(3).truncate(60), created_at: rand((Time.current - 1.week)..Time.current), description: description, tag_list: tags.sample(3).join(','), - geozone: Geozone.reorder("RANDOM()").first, + geozone: Geozone.all.sample, terms_of_service: "1") end end @@ -210,7 +210,7 @@ end section "Creating Proposals" do tags = Faker::Lorem.words(25) 30.times do - author = User.reorder("RANDOM()").first + author = User.all.sample description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " proposal = Proposal.create!(author: author, title: Faker::Lorem.sentence(3).truncate(60), @@ -221,7 +221,7 @@ section "Creating Proposals" do description: description, created_at: rand((Time.current - 1.week)..Time.current), tag_list: tags.sample(3).join(','), - geozone: Geozone.reorder("RANDOM()").first, + geozone: Geozone.all.sample, terms_of_service: "1") end end @@ -229,7 +229,7 @@ end section "Creating Archived Proposals" do tags = Faker::Lorem.words(25) 5.times do - author = User.reorder("RANDOM()").first + author = User.all.sample description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " proposal = Proposal.create!(author: author, title: Faker::Lorem.sentence(3).truncate(60), @@ -239,7 +239,7 @@ section "Creating Archived Proposals" do external_url: Faker::Internet.url, description: description, tag_list: tags.sample(3).join(','), - geozone: Geozone.reorder("RANDOM()").first, + geozone: Geozone.all.sample, terms_of_service: "1", created_at: Setting["months_to_archive_proposals"].to_i.months.ago) end @@ -248,7 +248,7 @@ end section "Creating Successful Proposals" do tags = Faker::Lorem.words(25) 10.times do - author = User.reorder("RANDOM()").first + author = User.all.sample description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " proposal = Proposal.create!(author: author, title: Faker::Lorem.sentence(3).truncate(60), @@ -259,14 +259,14 @@ section "Creating Successful Proposals" do description: description, created_at: rand((Time.current - 1.week)..Time.current), tag_list: tags.sample(3).join(','), - geozone: Geozone.reorder("RANDOM()").first, + geozone: Geozone.all.sample, terms_of_service: "1", cached_votes_up: Setting["votes_for_proposal_success"]) end tags = ActsAsTaggableOn::Tag.where(kind: 'category') 30.times do - author = User.reorder("RANDOM()").first + author = User.all.sample description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " proposal = Proposal.create!(author: author, title: Faker::Lorem.sentence(3).truncate(60), @@ -277,15 +277,15 @@ section "Creating Successful Proposals" do description: description, created_at: rand((Time.current - 1.week)..Time.current), tag_list: tags.sample(3).join(','), - geozone: Geozone.reorder("RANDOM()").first, + geozone: Geozone.all.sample, terms_of_service: "1") end end section "Commenting Debates" do 100.times do - author = User.reorder("RANDOM()").first - debate = Debate.reorder("RANDOM()").first + author = User.all.sample + debate = Debate.all.sample Comment.create!(user: author, created_at: rand(debate.created_at..Time.current), commentable: debate, @@ -295,8 +295,8 @@ end section "Commenting Proposals" do 100.times do - author = User.reorder("RANDOM()").first - proposal = Proposal.reorder("RANDOM()").first + author = User.all.sample + proposal = Proposal.all.sample Comment.create!(user: author, created_at: rand(proposal.created_at..Time.current), commentable: proposal, @@ -306,8 +306,8 @@ end section "Commenting Comments" do 200.times do - author = User.reorder("RANDOM()").first - parent = Comment.reorder("RANDOM()").first + author = User.all.sample + parent = Comment.all.sample Comment.create!(user: author, created_at: rand(parent.created_at..Time.current), commentable_id: parent.commentable_id, @@ -320,42 +320,42 @@ end section "Voting Debates, Proposals & Comments" do not_org_users = User.where(['users.id NOT IN(?)', User.organizations.pluck(:id)]) 100.times do - voter = not_org_users.level_two_or_three_verified.reorder("RANDOM()").first + voter = not_org_users.level_two_or_three_verified.all.sample vote = [true, false].sample - debate = Debate.reorder("RANDOM()").first + debate = Debate.all.sample debate.vote_by(voter: voter, vote: vote) end 100.times do - voter = not_org_users.reorder("RANDOM()").first + voter = not_org_users.all.sample vote = [true, false].sample - comment = Comment.reorder("RANDOM()").first + comment = Comment.all.sample comment.vote_by(voter: voter, vote: vote) end 100.times do - voter = not_org_users.level_two_or_three_verified.reorder("RANDOM()").first - proposal = Proposal.reorder("RANDOM()").first + voter = not_org_users.level_two_or_three_verified.all.sample + proposal = Proposal.all.sample proposal.vote_by(voter: voter, vote: true) end end section "Flagging Debates & Comments" do 40.times do - debate = Debate.reorder("RANDOM()").first - flagger = User.where(["users.id <> ?", debate.author_id]).reorder("RANDOM()").first + debate = Debate.all.sample + flagger = User.where(["users.id <> ?", debate.author_id]).all.sample Flag.flag(flagger, debate) end 40.times do - comment = Comment.reorder("RANDOM()").first - flagger = User.where(["users.id <> ?", comment.user_id]).reorder("RANDOM()").first + comment = Comment.all.sample + flagger = User.where(["users.id <> ?", comment.user_id]).all.sample Flag.flag(flagger, comment) end 40.times do - proposal = Proposal.reorder("RANDOM()").first - flagger = User.where(["users.id <> ?", proposal.author_id]).reorder("RANDOM()").first + proposal = Proposal.all.sample + flagger = User.where(["users.id <> ?", proposal.author_id]).all.sample Flag.flag(flagger, proposal) end end @@ -363,8 +363,8 @@ end section "Creating Spending Proposals" do tags = Faker::Lorem.words(10) 60.times do - geozone = Geozone.reorder("RANDOM()").first - author = User.reorder("RANDOM()").first + geozone = Geozone.all.sample + author = User.all.sample description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " feasible_explanation = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " valuation_finished = [true, false].sample @@ -386,7 +386,7 @@ end section "Creating Valuation Assignments" do (1..17).to_a.sample.times do - SpendingProposal.reorder("RANDOM()").first.valuators << Valuator.first + SpendingProposal.all.sample.valuators << Valuator.first end end @@ -420,10 +420,10 @@ end section "Creating Investments" do tags = Faker::Lorem.words(10) 100.times do - heading = Budget::Heading.reorder("RANDOM()").first + heading = Budget::Heading.all.sample investment = Budget::Investment.create!( - author: User.reorder("RANDOM()").first, + author: User.all.sample, heading: heading, group: heading.group, budget: heading.group.budget, @@ -450,9 +450,9 @@ end section "Winner Investments" do budget = Budget.where(phase: "finished").last 100.times do - heading = budget.headings.reorder("RANDOM()").first + heading = budget.headings.all.sample investment = Budget::Investment.create!( - author: User.reorder("RANDOM()").first, + author: User.all.sample, heading: heading, group: heading.group, budget: heading.group.budget, @@ -474,7 +474,7 @@ end section "Creating Valuation Assignments" do (1..50).to_a.sample.times do - Budget::Investment.reorder("RANDOM()").first.valuators << Valuator.first + Budget::Investment.all.sample.valuators << Valuator.first end end @@ -517,8 +517,8 @@ section "Creating proposal notifications" do 100.times do |i| ProposalNotification.create!(title: "Proposal notification title #{i}", body: "Proposal notification body #{i}", - author: User.reorder("RANDOM()").first, - proposal: Proposal.reorder("RANDOM()").first) + author: User.all.sample, + proposal: Proposal.all.sample) end end @@ -624,7 +624,7 @@ end section "Creating Poll Questions from Proposals" do 3.times do - proposal = Proposal.reorder("RANDOM()").first + proposal = Proposal.all.sample poll = Poll.current.first question = Poll::Question.create(poll: poll) Faker::Lorem.words((2..4).to_a.sample).each do |answer| @@ -637,7 +637,7 @@ end section "Creating Successful Proposals" do 10.times do - proposal = Proposal.reorder("RANDOM()").first + proposal = Proposal.all.sample poll = Poll.current.first question = Poll::Question.create(poll: poll) Faker::Lorem.words((2..4).to_a.sample).each do |answer| @@ -650,8 +650,8 @@ end section "Commenting Poll Questions" do 30.times do - author = User.reorder("RANDOM()").first - question = Poll::Question.reorder("RANDOM()").first + author = User.all.sample + question = Poll::Question.all.sample Comment.create!(user: author, created_at: rand(question.created_at..Time.current), commentable: question, From a4a4f3beb27314698d2e4560e50abef8b7bb29be Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 9 Nov 2017 13:02:18 +0100 Subject: [PATCH 712/765] Refactor Poll creation section, no need to use variables and big date ranges --- db/dev_seeds.rb | 70 ++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index fc937051d..d24e4a9a5 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -524,46 +524,46 @@ end section "Creating polls" do -@poll_active = Poll.create(name: "Active Poll", - # TODO: Uncomment when Poll get slugs - # slug: "active-poll", - starts_at: 1.month.ago, - ends_at: 1.month.from_now, - geozone_restricted: false) + Poll.create(name: "Current Poll", + # TODO: Uncomment when Poll get slugs + # slug: "current-poll", + starts_at: 7.days.ago, + ends_at: 7.days.from_now, + geozone_restricted: false) -@poll_active_geolocalized = Poll.create(name: "Active Poll Restricted", - # TODO: Uncomment when Poll get slugs - # slug: "active-poll-restricted", - starts_at: 1.month.ago, - ends_at: 1.month.from_now, - geozone_restricted: true, - geozones: Geozone.reorder("RANDOM()").limit(3)) + Poll.create(name: "Current Poll Geozone Restricted", + # TODO: Uncomment when Poll get slugs + # slug: "current-poll-geozone-restricted", + starts_at: 5.days.ago, + ends_at: 5.days.from_now, + geozone_restricted: true, + geozones: Geozone.reorder("RANDOM()").limit(3)) -poll = Poll.create(name: "Upcoming Poll", - # TODO: Uncomment when Poll get slugs - # slug: "upcoming-poll", - starts_at: 1.month.from_now, - ends_at: 2.months.from_now) + Poll.create(name: "Incoming Poll", + # TODO: Uncomment when Poll get slugs + # slug: "incoming-poll", + starts_at: 1.month.from_now, + ends_at: 2.months.from_now) -poll = Poll.create(name: "Recounting Poll", - # TODO: Uncomment when Poll get slugs - # slug: "recounting-poll", - starts_at: 1.month.ago, - ends_at: 5.days.ago) + Poll.create(name: "Recounting Poll", + # TODO: Uncomment when Poll get slugs + # slug: "recounting-poll", + starts_at: 15.days.ago, + ends_at: 2.days.ago) -@poll_expired = Poll.create(name: "Expired Poll", - # TODO: Uncomment when Poll get slugs - # slug: "expired-poll", - starts_at: 2.months.ago, - ends_at: 1.month.ago) + Poll.create(name: "Expired Poll without Stats & Results", + # TODO: Uncomment when Poll get slugs + # slug: "expired-poll-without-stats-and-results", + starts_at: 2.months.ago, + ends_at: 1.month.ago) -poll = Poll.create(name: "Expired Poll with Stats & Results", - # TODO: Uncomment when Poll get slugs - # slug: "expired-poll-with-stats-and-results", - starts_at: 2.months.ago, - ends_at: 1.month.ago, - results_enabled: true, - stats_enabled: true) + Poll.create(name: "Expired Poll with Stats & Results", + # TODO: Uncomment when Poll get slugs + # slug: "expired-poll-with-stats-and-results", + starts_at: 2.months.ago, + ends_at: 1.month.ago, + results_enabled: true, + stats_enabled: true) end section "Creating Poll Questions" do From cf76898308195b513e37581f54b6dd001e081358 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 9 Nov 2017 13:04:12 +0100 Subject: [PATCH 713/765] Refactor Poll Question & Answer creation section --- db/dev_seeds.rb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index d24e4a9a5..ed56c8e01 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -566,17 +566,17 @@ section "Creating polls" do stats_enabled: true) end -section "Creating Poll Questions" do - 25.times do - poll = Poll.reorder("RANDOM()").first - author = User.reorder("RANDOM()").first - description = "

    #{Faker::Lorem.paragraphs.join('

    ')}

    " - open_at = rand(2.months.ago..2.months.from_now) - question = Poll::Question.create!(author: author, - title: Faker::Lorem.sentence(3).truncate(60), - poll: poll) - Faker::Lorem.words((2..4).to_a.sample).each do |answer| - Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) +section "Creating Poll Questions & Answers" do + Poll.all.each do |poll| + (1..4).to_a.sample.times do + question = Poll::Question.create!(author: User.all.sample, + title: Faker::Lorem.sentence(3).truncate(60) + '?', + poll: poll) + Faker::Lorem.words((2..4).to_a.sample).each do |answer| + Poll::Question::Answer.create!(question: question, + title: answer.capitalize, + description: "

    #{Faker::Lorem.paragraphs.join('

    ')}

    ") + end end end end From 896f91e2497643511f7b6fcd689bd2e08559c40d Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 9 Nov 2017 13:04:54 +0100 Subject: [PATCH 714/765] Refactor Booth and Booth Assignment creation into just one section --- db/dev_seeds.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index ed56c8e01..9ee94cfc1 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -581,15 +581,9 @@ section "Creating Poll Questions & Answers" do end end -section "Creating Poll Booths" do - 20.times.each_with_index do |i| - Poll::Booth.create(name: "Booth #{i}", polls: [Poll.all.sample]) - end -end - -section "Creating Booth Assignments" do - Poll::Booth.all.each do |booth| - Poll::BoothAssignment.create(booth: booth, poll: Poll.all.sample) +section "Creating Poll Booths & BoothAssignments" do + 20.times do |i| + Poll::Booth.create(name: "Booth #{i}", location: Faker::Address.street_address, polls: [Poll.all.sample]) end end From af460b3eea47df76b61ac7a0e2014f0da62877fa Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 9 Nov 2017 13:05:47 +0100 Subject: [PATCH 715/765] Refactor Poll Officer Assignment creation into Poll Shift creation section --- db/dev_seeds.rb | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 9ee94cfc1..09c9adff4 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -587,32 +587,25 @@ section "Creating Poll Booths & BoothAssignments" do end end -# section "Creating Poll Officer Assignments" do -# (1..15).to_a.sample.times do |i| -# Poll::BoothAssignment.all.sample(i).each do |booth_assignment| -# Poll::OfficerAssignment.create(officer: poll_officer.poll_officer, -# booth_assignment: booth_assignment, -# date: booth_assignment.poll.starts_at) -# end -# end -# end - section "Creating Poll Shifts for Poll Officers" do - Poll::BoothAssignment.all.each do |booth_assignment| - # TODO: Create vote_collection on correct date ranges - Poll::Shift.create(booth_id: booth_assignment.booth_id, - officer: Poll::Officer.first, - date: Date.current, - officer_name: Poll::Officer.first.name, - officer_email: Poll::Officer.first.email, - task: :vote_collection) - # TODO: Create recount_scrutiny shifts on correct date ranges - # Poll::Shift.create(booth_id: booth_assignment.booth_id, - # officer_id: poll_officer.poll_officer.id, - # date: Date.current, - # officer_name: poll_officer.poll_officer.name, - # officer_email: poll_officer.poll_officer.email, - # task: 1) + Poll.all.each do |poll| + Poll::BoothAssignment.where(poll: poll).each do |booth_assignment| + Poll::Officer.all.each do |poll_officer| + { + vote_collection: (poll.starts_at.to_datetime..poll.ends_at.to_datetime), + recount_scrutiny: (poll.ends_at.to_datetime..poll.ends_at.to_datetime + Poll::RECOUNT_DURATION) + }.each do |task_name, task_dates| + task_dates.each do |shift_date| + Poll::Shift.create(booth: booth_assignment.booth, + officer: poll_officer, + date: shift_date, + officer_name: poll_officer.name, + officer_email: poll_officer.email, + task: task_name) + end + end + end + end end end From 517b0359031b99cbc2d6c5097e77da5a9962a017 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 9 Nov 2017 13:13:02 +0100 Subject: [PATCH 716/765] Reposition Poll Question from Proposal and Successful Proposal sections to end of script --- db/dev_seeds.rb | 52 ++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 09c9adff4..d9d928321 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -609,32 +609,6 @@ section "Creating Poll Shifts for Poll Officers" do end end -section "Creating Poll Questions from Proposals" do - 3.times do - proposal = Proposal.all.sample - poll = Poll.current.first - question = Poll::Question.create(poll: poll) - Faker::Lorem.words((2..4).to_a.sample).each do |answer| - Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) - end - question.copy_attributes_from_proposal(proposal) - question.save! - end -end - -section "Creating Successful Proposals" do - 10.times do - proposal = Proposal.all.sample - poll = Poll.current.first - question = Poll::Question.create(poll: poll) - Faker::Lorem.words((2..4).to_a.sample).each do |answer| - Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) - end - question.copy_attributes_from_proposal(proposal) - question.save! - end -end - section "Commenting Poll Questions" do 30.times do author = User.all.sample @@ -718,6 +692,32 @@ section "Creating Poll Results" do end end +section "Creating Poll Questions from Proposals" do + 3.times do + proposal = Proposal.all.sample + poll = Poll.current.first + question = Poll::Question.create(poll: poll) + Faker::Lorem.words((2..4).to_a.sample).each do |answer| + Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) + end + question.copy_attributes_from_proposal(proposal) + question.save! + end +end + +section "Creating Successful Proposals" do + 10.times do + proposal = Proposal.all.sample + poll = Poll.current.first + question = Poll::Question.create(poll: poll) + Faker::Lorem.words((2..4).to_a.sample).each do |answer| + Poll::Question::Answer.create!(question: question, title: answer.capitalize, description: Faker::ChuckNorris.fact) + end + question.copy_attributes_from_proposal(proposal) + question.save! + end +end + section "Creating legislation processes" do 5.times do process = ::Legislation::Process.create!(title: Faker::Lorem.sentence(3).truncate(60), From 063ba4c4f4c535f793477b362ba2c66e6dd0916d Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 9 Nov 2017 13:13:15 +0100 Subject: [PATCH 717/765] Refactor Poll Voters creation to make it more realistic --- db/dev_seeds.rb | 47 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index d9d928321..9e52c45c1 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -621,32 +621,29 @@ section "Commenting Poll Questions" do end section "Creating Poll Voters" do - 10.times do - user = User.level_two_verified.sample - Poll::Voter.create(poll_id: @poll_active.id, user_id: user.id, document_number: user.document_number, origin: 'web') - user = User.level_two_verified.sample - Poll::Voter.create(poll_id: @poll_active.id, user_id: user.id, document_number: user.document_number, origin: 'booth') - end - 10.times do - user = User.level_two_verified.sample - Poll::Voter.create(poll_id: @poll_active_geolocalized.id, user_id: user.id, document_number: user.document_number, origin: 'web') - user = User.level_two_verified.sample - Poll::Voter.create(poll_id: @poll_active_geolocalized.id, user_id: user.id, document_number: user.document_number, origin: 'booth') - end - 10.times do - user = User.level_two_verified.sample - Poll::Voter.create(poll_id: @poll_expired.id, user_id: user.id, document_number: user.document_number, origin: 'web') - user = User.level_two_verified.sample - Poll::Voter.create(poll_id: @poll_expired.id, user_id: user.id, document_number: user.document_number, origin: 'web') - end -end + (Poll.expired + Poll.current + Poll.recounting).uniq.each do |poll| + level_two_verified_users = User.level_two_verified + level_two_verified_users = level_two_verified_users.where(geozone_id: poll.geozone_ids) if poll.geozone_restricted? -section "Creating Poll Answers" do - Poll::Voter.all.each do |voter| - voter.poll.questions.each do |question| - answer = question.question_answers.sample - unless answer.nil? - Poll::Answer.create(question_id: question.id, author_id: voter.user_id, answer: answer.title) + level_two_verified_users.each_with_index do |user, i| + if i.even? + poll.questions.each do |question| + next unless [true, false].sample + Poll::Answer.create!(question_id: question.id, author: user, answer: question.question_answers.sample.title) + end + Poll::Voter.create!(document_type: user.document_type, + document_number: user.document_number, + user: user, + poll: poll, + origin: 'web', + token: SecureRandom.hex(32)) + else + Poll::Voter.create!(document_type: user.document_type, + document_number: user.document_number, + user: user, + poll: poll, + officer: Poll::Officer.all.sample, + origin: 'booth') end end end From e154d8eb3f40b8e2f41ec347bd6397e171d02749 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 9 Nov 2017 14:51:08 +0100 Subject: [PATCH 718/765] Add trailing random letter to unique_document_number output --- db/dev_seeds.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 9e52c45c1..1edad0f77 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -89,8 +89,8 @@ section "Creating Users" do def unique_document_number @document_number ||= 12345678 - @document_number = @document_number + 1 - @document_number.to_s + @document_number += 1 + "#{@document_number}#{[*'A'..'Z'].sample}" end admin = create_user('admin@consul.dev', 'admin') From 045982e981b3d49cf88c2a82133c3342128d85ac Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 9 Nov 2017 15:24:27 +0100 Subject: [PATCH 719/765] Fix line lenght on dev_seeds --- db/dev_seeds.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 1edad0f77..e788fe240 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -122,8 +122,8 @@ section "Creating Users" do create_user('unverified@consul.dev', 'unverified') level_2 = create_user('leveltwo@consul.dev', 'level 2') - level_2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: unique_document_number, - document_type: "1") + level_2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, + document_number: unique_document_number, document_type: "1") verified = create_user('verified@consul.dev', 'verified') verified.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", From 0e8d171018aff17122593c0957016f4250e56b35 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 9 Nov 2017 15:39:48 +0100 Subject: [PATCH 720/765] Extract vote poll on web/booth and randmon question answering to helper functions on Poll Voter section --- db/dev_seeds.rb | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index e788fe240..872ce7d32 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -621,29 +621,41 @@ section "Commenting Poll Questions" do end section "Creating Poll Voters" do + + def vote_poll_on_booth(user, poll) + Poll::Voter.create!(document_type: user.document_type, + document_number: user.document_number, + user: user, + poll: poll, + origin: 'booth', + officer: Poll::Officer.all.sample) + end + + def vote_poll_on_web(user, poll) + randomly_answer_questions(poll, user) + Poll::Voter.create!(document_type: user.document_type, + document_number: user.document_number, + user: user, + poll: poll, + origin: 'web', + token: SecureRandom.hex(32)) + end + + def randomly_answer_poll_questions(poll, user) + poll.questions.each do |question| + next unless [true, false].sample + Poll::Answer.create!(question_id: question.id, author: user, answer: question.question_answers.sample.title) + end + end + (Poll.expired + Poll.current + Poll.recounting).uniq.each do |poll| level_two_verified_users = User.level_two_verified level_two_verified_users = level_two_verified_users.where(geozone_id: poll.geozone_ids) if poll.geozone_restricted? - level_two_verified_users.each_with_index do |user, i| if i.even? - poll.questions.each do |question| - next unless [true, false].sample - Poll::Answer.create!(question_id: question.id, author: user, answer: question.question_answers.sample.title) - end - Poll::Voter.create!(document_type: user.document_type, - document_number: user.document_number, - user: user, - poll: poll, - origin: 'web', - token: SecureRandom.hex(32)) + vote_poll_on_web(user, poll) else - Poll::Voter.create!(document_type: user.document_type, - document_number: user.document_number, - user: user, - poll: poll, - officer: Poll::Officer.all.sample, - origin: 'booth') + vote_poll_on_booth(user, poll) end end end From a1325f4c7def8ad451027cdafee8f34482a2f931 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 9 Nov 2017 15:41:08 +0100 Subject: [PATCH 721/765] Refactor Poll Voters distribution between web and booth --- db/dev_seeds.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index 872ce7d32..d94373abb 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -651,13 +651,9 @@ section "Creating Poll Voters" do (Poll.expired + Poll.current + Poll.recounting).uniq.each do |poll| level_two_verified_users = User.level_two_verified level_two_verified_users = level_two_verified_users.where(geozone_id: poll.geozone_ids) if poll.geozone_restricted? - level_two_verified_users.each_with_index do |user, i| - if i.even? - vote_poll_on_web(user, poll) - else - vote_poll_on_booth(user, poll) - end - end + user_groups = level_two_verified_users.in_groups(2) + user_groups.first.each { |user| vote_poll_on_booth(user, poll) } + user_groups.second.compact.each { |user| vote_poll_on_web(user, poll) } end end From a15391e4e1fec97796aff36ce34484fd8be3b3ba Mon Sep 17 00:00:00 2001 From: Bertocq Date: Sat, 11 Nov 2017 10:08:30 +0100 Subject: [PATCH 722/765] Exclude development gems from travis build --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8836964a6..4eb86bbf6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ addons: rvm: - "2.3.2" cache: bundler +bundler_args: --without development before_script: - "for i in config/*.example; do cp \"$i\" \"${i/.example}\"; done" - bundle exec rake db:setup @@ -15,4 +16,4 @@ env: - CI_NODE_TOTAL=2 matrix: - CI_NODE_INDEX=0 - - CI_NODE_INDEX=1 \ No newline at end of file + - CI_NODE_INDEX=1 From 495a99359ceb57790d273538df6c6b713c19cdd6 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Sat, 11 Nov 2017 18:58:59 +0100 Subject: [PATCH 723/765] Move rubocop from development & test gemfile group to just development --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 7f9579b73..409f763e9 100644 --- a/Gemfile +++ b/Gemfile @@ -67,7 +67,6 @@ group :development, :test do gem 'launchy', '~> 2.4.3' gem 'letter_opener_web', '~> 1.3.1' gem 'quiet_assets', '~> 1.1.0' - gem 'rubocop', '~> 0.49.1', require: false gem 'spring', '~> 2.0.1' gem 'spring-commands-rspec', '~> 1.0.4' end @@ -87,6 +86,7 @@ group :development do gem "capistrano-rails", '~> 1.2.3', require: false gem 'capistrano3-delayed-job', '~> 1.7.3' gem 'mdl', '~> 0.4.0', require: false + gem 'rubocop', '~> 0.49.1', require: false gem 'rvm1-capistrano3', '~> 1.4.0', require: false gem 'scss_lint', '~> 0.54.0', require: false gem 'web-console', '~> 3.3.0' From cd66ba5d5495ee363e3588980fc160a8c7ba6fc4 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 02:22:00 +0100 Subject: [PATCH 724/765] Rubocop autocorrections --- .../legislation/proposals_controller.rb | 10 +-- app/helpers/admin_helper.rb | 2 +- app/models/legislation/proposal.rb | 9 +-- app/models/poll/question/answer.rb | 8 +-- app/models/poll/stats.rb | 64 +++++++++---------- app/models/user.rb | 1 - spec/features/notifications_spec.rb | 4 +- spec/models/poll/stats_spec.rb | 26 ++++---- spec/support/common_actions.rb | 4 +- 9 files changed, 63 insertions(+), 65 deletions(-) diff --git a/app/controllers/legislation/proposals_controller.rb b/app/controllers/legislation/proposals_controller.rb index 6aec36057..70fdbea33 100644 --- a/app/controllers/legislation/proposals_controller.rb +++ b/app/controllers/legislation/proposals_controller.rb @@ -22,8 +22,10 @@ class Legislation::ProposalsController < Legislation::BaseController super set_legislation_proposal_votes(@process.proposals) @document = Document.new(documentable: @proposal) - redirect_to legislation_process_proposal_path(params[:process_id], @proposal), - status: :moved_permanently if request.path != legislation_process_proposal_path(params[:process_id], @proposal) + if request.path != legislation_process_proposal_path(params[:process_id], @proposal) + redirect_to legislation_process_proposal_path(params[:process_id], @proposal), + status: :moved_permanently + end end def create @@ -50,9 +52,9 @@ class Legislation::ProposalsController < Legislation::BaseController def proposal_params params.require(:legislation_proposal).permit(:legislation_process_id, :title, - :question, :summary, :description, :video_url, :tag_list, + :question, :summary, :description, :video_url, :tag_list, :terms_of_service, :geozone_id, - documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id] ) + documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id]) end def resource_model diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index d71173060..88f10935f 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -29,7 +29,7 @@ module AdminHelper end def menu_profiles? - ["administrators", "organizations", "officials", "moderators", "valuators", "managers", "users", "activity"].include? controller_name + %w[administrators organizations officials moderators valuators managers users activity].include? controller_name end def menu_banners? diff --git a/app/models/legislation/proposal.rb b/app/models/legislation/proposal.rb index ec3dc6410..56eaac24b 100644 --- a/app/models/legislation/proposal.rb +++ b/app/models/legislation/proposal.rb @@ -57,8 +57,7 @@ class Legislation::Proposal < ActiveRecord::Base tag_list.join(' ') => 'B', geozone.try(:name) => 'B', summary => 'C', - description => 'D' - } + description => 'D'} end def self.search(terms) @@ -69,7 +68,7 @@ class Legislation::Proposal < ActiveRecord::Base def self.search_by_code(terms) matched_code = match_code(terms) results = where(id: matched_code[1]) if matched_code - return results if (results.present? && results.first.code == terms) + return results if results.present? && results.first.code == terms end def self.match_code(terms) @@ -105,9 +104,7 @@ class Legislation::Proposal < ActiveRecord::Base end def register_vote(user, vote_value) - if votable_by?(user) - vote_by(voter: user, vote: vote_value) - end + vote_by(voter: user, vote: vote_value) if votable_by?(user) end def code diff --git a/app/models/poll/question/answer.rb b/app/models/poll/question/answer.rb index dbf2f2139..5641b39f5 100644 --- a/app/models/poll/question/answer.rb +++ b/app/models/poll/question/answer.rb @@ -37,7 +37,7 @@ class Poll::Question::Answer < ActiveRecord::Base end def most_voted? - self.most_voted + most_voted end def total_votes_percentage @@ -46,9 +46,9 @@ class Poll::Question::Answer < ActiveRecord::Base def set_most_voted answers = question.question_answers - .map { |a| Poll::Answer.where(question_id: a.question, answer: a.title).count } - is_most_voted = !answers.any?{ |a| a > self.total_votes } + .map { |a| Poll::Answer.where(question_id: a.question, answer: a.title).count } + is_most_voted = answers.none?{ |a| a > total_votes } - self.update(most_voted: is_most_voted) + update(most_voted: is_most_voted) end end diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index ac45a2aae..03d870f69 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -7,11 +7,11 @@ class Poll def generate stats = %w[total_participants total_participants_web total_web_valid total_web_white total_web_null - total_participants_booth total_booth_valid total_booth_white total_booth_null - total_valid_votes total_white_votes total_null_votes valid_percentage_web valid_percentage_booth - total_valid_percentage white_percentage_web white_percentage_booth total_white_percentage - null_percentage_web null_percentage_booth total_null_percentage total_participants_web_percentage - total_participants_booth_percentage] + total_participants_booth total_booth_valid total_booth_white total_booth_null + total_valid_votes total_white_votes total_null_votes valid_percentage_web valid_percentage_booth + total_valid_percentage white_percentage_web white_percentage_booth total_white_percentage + null_percentage_web null_percentage_booth total_null_percentage total_participants_web_percentage + total_participants_booth_percentage] stats.map { |stat_name| [stat_name.to_sym, send(stat_name)] }.to_h end @@ -26,9 +26,9 @@ class Poll end def total_participants_web_percentage - stats_cache('total_participants_web_percentage') { - (total_participants) == 0 ? 0 : total_participants_web * 100 / total_participants - } + stats_cache('total_participants_web_percentage') do + total_participants == 0 ? 0 : total_participants_web * 100 / total_participants + end end def total_participants_booth @@ -36,9 +36,9 @@ class Poll end def total_participants_booth_percentage - stats_cache('total_participants_booth_percentage') { - (total_participants) == 0 ? 0 : total_participants_booth * 100 / total_participants.to_f - } + stats_cache('total_participants_booth_percentage') do + total_participants == 0 ? 0 : total_participants_booth * 100 / total_participants.to_f + end end def total_web_valid @@ -46,9 +46,9 @@ class Poll end def valid_percentage_web - stats_cache('valid_percentage_web') { - (total_valid_votes) == 0 ? 0 : total_web_valid * 100 / total_valid_votes.to_f - } + stats_cache('valid_percentage_web') do + total_valid_votes == 0 ? 0 : total_web_valid * 100 / total_valid_votes.to_f + end end def total_web_white @@ -72,9 +72,9 @@ class Poll end def valid_percentage_booth - stats_cache('valid_percentage_booth') { - (total_valid_votes) == 0 ? 0 : total_booth_valid * 100 / total_valid_votes.to_f - } + stats_cache('valid_percentage_booth') do + total_valid_votes == 0 ? 0 : total_booth_valid * 100 / total_valid_votes.to_f + end end def total_booth_white @@ -82,9 +82,9 @@ class Poll end def white_percentage_booth - stats_cache('white_percentage_booth') { - (total_white_votes) == 0 ? 0 : total_booth_white * 100 / total_white_votes.to_f - } + stats_cache('white_percentage_booth') do + total_white_votes == 0 ? 0 : total_booth_white * 100 / total_white_votes.to_f + end end def total_booth_null @@ -92,9 +92,9 @@ class Poll end def null_percentage_booth - stats_cache('null_percentage_booth') { - (total_null_votes == 0) ? 0 : total_booth_null * 100 / total_null_votes.to_f - } + stats_cache('null_percentage_booth') do + total_null_votes == 0 ? 0 : total_booth_null * 100 / total_null_votes.to_f + end end def total_valid_votes @@ -102,9 +102,9 @@ class Poll end def total_valid_percentage - stats_cache('total_valid_percentage'){ - (total_participants) == 0 ? 0 : total_valid_votes * 100 / total_participants.to_f - } + stats_cache('total_valid_percentage') do + total_participants == 0 ? 0 : total_valid_votes * 100 / total_participants.to_f + end end def total_white_votes @@ -112,9 +112,9 @@ class Poll end def total_white_percentage - stats_cache('total_white_percentage') { - (total_participants) == 0 ? 0 : total_white_votes * 100 / total_participants.to_f - } + stats_cache('total_white_percentage') do + total_participants == 0 ? 0 : total_white_votes * 100 / total_participants.to_f + end end def total_null_votes @@ -122,9 +122,9 @@ class Poll end def total_null_percentage - stats_cache('total_null_percentage') { - (total_participants) == 0 ? 0 : total_null_votes * 100 / total_participants.to_f - } + stats_cache('total_null_percentage') do + total_participants == 0 ? 0 : total_null_votes * 100 / total_participants.to_f + end end def voters diff --git a/app/models/user.rb b/app/models/user.rb index a212c1b5c..527ae3abc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -102,7 +102,6 @@ class User < ActiveRecord::Base voted.each_with_object({}) { |v, h| h[v.votable_id] = v.value } end - def spending_proposal_votes(spending_proposals) voted = votes.for_spending_proposals(spending_proposals) voted.each_with_object({}) { |v, h| h[v.votable_id] = v.value } diff --git a/spec/features/notifications_spec.rb b/spec/features/notifications_spec.rb index 75ed91857..fee0da813 100644 --- a/spec/features/notifications_spec.rb +++ b/spec/features/notifications_spec.rb @@ -14,11 +14,11 @@ feature "Notifications" do let(:legislation_question) { create(:legislation_question, process: process, author: administrator) } let(:legislation_annotation) { create(:legislation_annotation, author: author) } - let(:topic) { + let(:topic) do proposal = create(:proposal) community = proposal.community create(:topic, community: community, author: author) - } + end scenario "User commented on my debate", :js do create(:notification, notifiable: debate, user: author) diff --git a/spec/models/poll/stats_spec.rb b/spec/models/poll/stats_spec.rb index ee431fa97..16f055d36 100644 --- a/spec/models/poll/stats_spec.rb +++ b/spec/models/poll/stats_spec.rb @@ -1,9 +1,9 @@ require 'rails_helper' describe Poll::Stats do - - describe "Calculate stats" do - it "Generate the correct stats" do + + describe "Calculate stats" do + it "Generate the correct stats" do poll = create(:poll) booth = create(:poll_booth) booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth) @@ -12,22 +12,22 @@ describe Poll::Stats do create(:poll_voter, poll: poll) create(:poll_recount, origin: 'booth', white_amount: 1, null_amount: 0, total_amount: 2, booth_assignment_id: booth_assignment.id) stats = Poll::Stats.new(poll).generate - + expect(stats[:total_participants]).to eq(5) expect(stats[:total_participants_web]).to eq(2) - expect(stats[:total_participants_booth]).to eq(3) - expect(stats[:total_valid_votes]).to eq(4) - expect(stats[:total_white_votes]).to eq(1) - expect(stats[:total_null_votes]).to eq(0) - + expect(stats[:total_participants_booth]).to eq(3) + expect(stats[:total_valid_votes]).to eq(4) + expect(stats[:total_white_votes]).to eq(1) + expect(stats[:total_null_votes]).to eq(0) + expect(stats[:total_web_valid]).to eq(2) expect(stats[:total_web_white]).to eq(0) expect(stats[:total_web_null]).to eq(0) - + expect(stats[:total_booth_valid]).to eq(2) expect(stats[:total_booth_white]).to eq(1) expect(stats[:total_booth_null]).to eq(0) - + expect(stats[:total_participants_web_percentage]).to eq(40) expect(stats[:total_participants_booth_percentage]).to eq(60) expect(stats[:valid_percentage_web]).to eq(50) @@ -39,7 +39,7 @@ describe Poll::Stats do expect(stats[:total_valid_percentage]).to eq(80) expect(stats[:total_white_percentage]).to eq(20) expect(stats[:total_null_percentage]).to eq(0) - end + end end - + end \ No newline at end of file diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb index 5023c1952..c1c7bfd2a 100644 --- a/spec/support/common_actions.rb +++ b/spec/support/common_actions.rb @@ -303,8 +303,8 @@ module CommonActions visit poll_path(poll) within("#poll_question_#{question.id}_answers") do - click_link "#{answer}" - expect(page).to_not have_link("#{answer}") + click_link answer.to_s + expect(page).to_not have_link(answer.to_s) end end From a34118dbb0ec152d4675545f9d9619fab1909c6b Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 02:23:49 +0100 Subject: [PATCH 725/765] Fix Lint/ShadowingOuterLocalVariable rubocop issue --- app/controllers/polls/questions_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/polls/questions_controller.rb b/app/controllers/polls/questions_controller.rb index e1fc73805..73e7fa160 100644 --- a/app/controllers/polls/questions_controller.rb +++ b/app/controllers/polls/questions_controller.rb @@ -13,8 +13,8 @@ class Polls::QuestionsController < ApplicationController answer.touch if answer.persisted? answer.save! answer.record_voter_participation(token) - @question.question_answers.where(question_id: @question).each do |answer| - answer.set_most_voted + @question.question_answers.where(question_id: @question).each do |question_answer| + question_answer.set_most_voted end @answers_by_question_id = { @question.id => params[:answer] } From bfd1a75af740b8196dc00c0d07e13097dda50779 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 02:24:37 +0100 Subject: [PATCH 726/765] Fix Lint/RequireParentheses rubocop issue --- app/helpers/admin_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index 88f10935f..faa90d6af 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -17,7 +17,7 @@ module AdminHelper end def menu_moderated_content? - ["proposals", "debates", "comments", "hidden_users"].include? controller_name && controller.class.parent != Admin::Legislation + ["proposals", "debates", "comments", "hidden_users"].include?(controller_name) && controller.class.parent != Admin::Legislation end def menu_budget? From db54273dad00f3623da4ed633db5f79b5b6132e1 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 02:27:38 +0100 Subject: [PATCH 727/765] Replace == 0 comparisions for .zero? --- app/models/poll/question/answer.rb | 2 +- app/models/poll/stats.rb | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/models/poll/question/answer.rb b/app/models/poll/question/answer.rb index 5641b39f5..1c10e2b5c 100644 --- a/app/models/poll/question/answer.rb +++ b/app/models/poll/question/answer.rb @@ -41,7 +41,7 @@ class Poll::Question::Answer < ActiveRecord::Base end def total_votes_percentage - question.answers_total_votes == 0 ? 0 : (total_votes * 100) / question.answers_total_votes + question.answers_total_votes.zero? ? 0 : (total_votes * 100) / question.answers_total_votes end def set_most_voted diff --git a/app/models/poll/stats.rb b/app/models/poll/stats.rb index 03d870f69..f07795a73 100644 --- a/app/models/poll/stats.rb +++ b/app/models/poll/stats.rb @@ -27,7 +27,7 @@ class Poll def total_participants_web_percentage stats_cache('total_participants_web_percentage') do - total_participants == 0 ? 0 : total_participants_web * 100 / total_participants + total_participants.zero? ? 0 : total_participants_web * 100 / total_participants end end @@ -37,7 +37,7 @@ class Poll def total_participants_booth_percentage stats_cache('total_participants_booth_percentage') do - total_participants == 0 ? 0 : total_participants_booth * 100 / total_participants.to_f + total_participants.zero? ? 0 : total_participants_booth * 100 / total_participants.to_f end end @@ -47,7 +47,7 @@ class Poll def valid_percentage_web stats_cache('valid_percentage_web') do - total_valid_votes == 0 ? 0 : total_web_valid * 100 / total_valid_votes.to_f + total_valid_votes.zero? ? 0 : total_web_valid * 100 / total_valid_votes.to_f end end @@ -73,7 +73,7 @@ class Poll def valid_percentage_booth stats_cache('valid_percentage_booth') do - total_valid_votes == 0 ? 0 : total_booth_valid * 100 / total_valid_votes.to_f + total_valid_votes.zero? ? 0 : total_booth_valid * 100 / total_valid_votes.to_f end end @@ -83,7 +83,7 @@ class Poll def white_percentage_booth stats_cache('white_percentage_booth') do - total_white_votes == 0 ? 0 : total_booth_white * 100 / total_white_votes.to_f + total_white_votes.zero? ? 0 : total_booth_white * 100 / total_white_votes.to_f end end @@ -93,7 +93,7 @@ class Poll def null_percentage_booth stats_cache('null_percentage_booth') do - total_null_votes == 0 ? 0 : total_booth_null * 100 / total_null_votes.to_f + total_null_votes.zero? ? 0 : total_booth_null * 100 / total_null_votes.to_f end end @@ -103,7 +103,7 @@ class Poll def total_valid_percentage stats_cache('total_valid_percentage') do - total_participants == 0 ? 0 : total_valid_votes * 100 / total_participants.to_f + total_participants.zero? ? 0 : total_valid_votes * 100 / total_participants.to_f end end @@ -113,7 +113,7 @@ class Poll def total_white_percentage stats_cache('total_white_percentage') do - total_participants == 0 ? 0 : total_white_votes * 100 / total_participants.to_f + total_participants.zero? ? 0 : total_white_votes * 100 / total_participants.to_f end end @@ -123,7 +123,7 @@ class Poll def total_null_percentage stats_cache('total_null_percentage') do - total_participants == 0 ? 0 : total_null_votes * 100 / total_participants.to_f + total_participants.zero? ? 0 : total_null_votes * 100 / total_participants.to_f end end From dc116cc3fe55b2ef2d439f7aab08f6c8ce319263 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 02:31:55 +0100 Subject: [PATCH 728/765] Fix line lenght above 140 --- spec/helpers/users_helper_spec.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb index fe2cdd786..92ba3d6e4 100644 --- a/spec/helpers/users_helper_spec.rb +++ b/spec/helpers/users_helper_spec.rb @@ -17,7 +17,8 @@ describe UsersHelper do debate.hide - expect(comment_commentable_title(comment)).to eq '' + comment.commentable.title + ' (This debate has been deleted)' + expect(comment_commentable_title(comment)).to eq('' + comment.commentable.title + + ' (This debate has been deleted)') end it "should return the appropriate message for deleted proposals" do @@ -26,7 +27,8 @@ describe UsersHelper do proposal.hide - expect(comment_commentable_title(comment)).to eq '' + comment.commentable.title + ' (This proposal has been deleted)' + expect(comment_commentable_title(comment)).to eq('' + comment.commentable.title + + ' (This proposal has been deleted)') end it "should return the appropriate message for deleted budget investment" do @@ -35,7 +37,8 @@ describe UsersHelper do investment.hide - expect(comment_commentable_title(comment)).to eq '' + comment.commentable.title + ' (This investment project has been deleted)' + expect(comment_commentable_title(comment)).to eq('' + comment.commentable.title + + ' (This investment project has been deleted)') end end @@ -48,7 +51,8 @@ describe UsersHelper do it "should return a hint if the commentable has been deleted" do comment = create(:comment) comment.commentable.hide - expect(comment_commentable_title(comment)).to eq '' + comment.commentable.title + ' (This debate has been deleted)' + expect(comment_commentable_title(comment)).to eq('' + comment.commentable.title + + ' (This debate has been deleted)') end end From f45cfc108a4a8873f358d8b2ba040fda59bac175 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 02:34:00 +0100 Subject: [PATCH 729/765] Fix Style/AccessorMethodName rubocop issue --- app/controllers/legislation/base_controller.rb | 2 +- app/controllers/legislation/processes_controller.rb | 2 +- app/controllers/legislation/proposals_controller.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/legislation/base_controller.rb b/app/controllers/legislation/base_controller.rb index c08ffc444..b1d01a676 100644 --- a/app/controllers/legislation/base_controller.rb +++ b/app/controllers/legislation/base_controller.rb @@ -3,7 +3,7 @@ class Legislation::BaseController < ApplicationController feature_flag :legislation - def set_legislation_proposal_votes(proposals) + def legislation_proposal_votes(proposals) @legislation_proposal_votes = current_user ? current_user.legislation_proposal_votes(proposals) : {} end end diff --git a/app/controllers/legislation/processes_controller.rb b/app/controllers/legislation/processes_controller.rb index d788d3bf3..7cde7b6d2 100644 --- a/app/controllers/legislation/processes_controller.rb +++ b/app/controllers/legislation/processes_controller.rb @@ -88,7 +88,7 @@ class Legislation::ProcessesController < Legislation::BaseController @phase = :proposals_phase if @process.proposals_phase.started? - set_legislation_proposal_votes(@process.proposals) + legislation_proposal_votes(@process.proposals) render :proposals else render :phase_not_open diff --git a/app/controllers/legislation/proposals_controller.rb b/app/controllers/legislation/proposals_controller.rb index 70fdbea33..6b5e1c973 100644 --- a/app/controllers/legislation/proposals_controller.rb +++ b/app/controllers/legislation/proposals_controller.rb @@ -20,7 +20,7 @@ class Legislation::ProposalsController < Legislation::BaseController def show super - set_legislation_proposal_votes(@process.proposals) + legislation_proposal_votes(@process.proposals) @document = Document.new(documentable: @proposal) if request.path != legislation_process_proposal_path(params[:process_id], @proposal) redirect_to legislation_process_proposal_path(params[:process_id], @proposal), @@ -45,7 +45,7 @@ class Legislation::ProposalsController < Legislation::BaseController def vote @proposal.register_vote(current_user, params[:value]) - set_legislation_proposal_votes(@proposal) + legislation_proposal_votes(@proposal) end private From ceb6786b7c20b6e2a39da7c1950ab2fd1636b8ed Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 02:35:17 +0100 Subject: [PATCH 730/765] Style correction on method call without parenthesis --- app/helpers/admin_helper.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index faa90d6af..40c5f8b84 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -13,7 +13,7 @@ module AdminHelper end def menu_tags? - ["tags"].include? controller_name + ["tags"].include?(controller_name) end def menu_moderated_content? @@ -21,23 +21,23 @@ module AdminHelper end def menu_budget? - ["spending_proposals"].include? controller_name + ["spending_proposals"].include?(controller_name) end def menu_polls? - %w[polls questions officers booths officer_assignments booth_assignments recounts results shifts questions answers].include? controller_name + %w[polls questions officers booths officer_assignments booth_assignments recounts results shifts questions answers].include?(controller_name) end def menu_profiles? - %w[administrators organizations officials moderators valuators managers users activity].include? controller_name + %w[administrators organizations officials moderators valuators managers users activity].include?(controller_name) end def menu_banners? - ["banners"].include? controller_name + ["banners"].include?(controller_name) end def menu_customization? - ["pages", "images", "content_blocks"].include? controller_name + ["pages", "images", "content_blocks"].include?(controller_name) end def official_level_options From 93e2e270c33b4cd4e9b12c448aa3e9f10b387041 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 02:16:13 +0100 Subject: [PATCH 731/765] Avoid final new empty lines on yml translation files --- .editorconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.editorconfig b/.editorconfig index 0e3ab2a51..619c27623 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,3 +11,6 @@ insert_final_newline = true [*.md] trim_trailing_whitespace = false + +[*.yml] +insert_final_newline = false From f44d1556d93d1426fe9835e3f9dd95a8dbe48773 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 02:16:55 +0100 Subject: [PATCH 732/765] Remove unnecesary --- and final empty lines on english base translation files --- config/locales/en/activerecord.yml | 2 +- config/locales/en/admin.yml | 3 +-- config/locales/en/budgets.yml | 2 +- config/locales/en/community.yml | 2 +- config/locales/en/devise.yml | 3 +-- config/locales/en/devise_views.yml | 3 +-- config/locales/en/documents.yml | 6 +----- config/locales/en/general.yml | 3 +-- config/locales/en/images.yml | 5 +---- config/locales/en/kaminari.yml | 3 +-- config/locales/en/legislation.yml | 1 - config/locales/en/mailers.yml | 3 +-- config/locales/en/management.yml | 3 +-- config/locales/en/moderation.yml | 3 +-- config/locales/en/officing.yml | 3 +-- config/locales/en/pages.yml | 3 +-- config/locales/en/rails.yml | 4 +--- config/locales/en/responders.yml | 3 +-- config/locales/en/settings.yml | 2 +- config/locales/en/social_share_button.yml | 2 +- config/locales/en/valuation.yml | 5 +---- config/locales/en/verification.yml | 3 +-- 22 files changed, 21 insertions(+), 46 deletions(-) diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 20c497417..bceaf5106 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -281,4 +281,4 @@ en: attributes: image: image_width: "Width must be %{required_width}px" - image_height: "Height must be %{required_height}px" + image_height: "Height must be %{required_height}px" \ No newline at end of file diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 483777d6f..823d7084b 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -1,4 +1,3 @@ ---- en: admin: header: @@ -1059,4 +1058,4 @@ en: updated_at: Updated at status_draft: Draft status_published: Published - locale: Language + locale: Language \ No newline at end of file diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index 1f29370bb..ac6445329 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -151,4 +151,4 @@ en: amount_available: Available budget accepted: "Accepted spending proposal: " discarded: "Discarded spending proposal: " - incompatibles: Incompatibles + incompatibles: Incompatibles \ No newline at end of file diff --git a/config/locales/en/community.yml b/config/locales/en/community.yml index 068c98998..137787563 100644 --- a/config/locales/en/community.yml +++ b/config/locales/en/community.yml @@ -55,4 +55,4 @@ en: recommendation_three: Enjoy this space, the voices that fill it, it's yours too. topics: show: - login_to_comment: You must %{signin} or %{signup} to leave a comment. + login_to_comment: You must %{signin} or %{signup} to leave a comment. \ No newline at end of file diff --git a/config/locales/en/devise.yml b/config/locales/en/devise.yml index 29bc0a620..c6d146f7a 100644 --- a/config/locales/en/devise.yml +++ b/config/locales/en/devise.yml @@ -1,5 +1,4 @@ # Additional translations at https://github.com/plataformatec/devise/wiki/I18n - en: devise: password_expired: @@ -68,4 +67,4 @@ en: not_saved: one: "1 error prevented this %{resource} from being saved:" other: "%{count} errors prevented this %{resource} from being saved:" - equal_to_current_password: "must be different than the current password." + equal_to_current_password: "must be different than the current password." \ No newline at end of file diff --git a/config/locales/en/devise_views.yml b/config/locales/en/devise_views.yml index 081f1d7d0..b3b2681eb 100644 --- a/config/locales/en/devise_views.yml +++ b/config/locales/en/devise_views.yml @@ -1,4 +1,3 @@ ---- en: devise_views: confirmations: @@ -127,4 +126,4 @@ en: instructions_1_html: Please check your email - we have sent you a link to confirm your account. instructions_2_html: Once confirmed, you may begin participation. thank_you_html: Thank you for registering for the website. You must now confirm your email address. - title: Modify your email + title: Modify your email \ No newline at end of file diff --git a/config/locales/en/documents.yml b/config/locales/en/documents.yml index 05dc9ad9a..3719fd230 100644 --- a/config/locales/en/documents.yml +++ b/config/locales/en/documents.yml @@ -3,7 +3,6 @@ en: tab: Documents no_documents: Don't have uploaded documents max_documents_allowed_reached_html: You have reached the maximum number of documents allowed! You have to delete one before you can upload another. - form: title: Documents title_placeholder: Add a descriptive title for the document @@ -11,18 +10,15 @@ en: delete_button: Remove document note: "You can upload up to a maximum of %{max_documents_allowed} documents of following content types: %{accepted_content_types}, up to %{max_file_size} MB per file." add_new_document: Add new document - actions: destroy: notice: Document was deleted successfully. alert: Cannot destroy document. confirm: Are you sure you want to delete the document? This action cannot be undone! - buttons: download_document: Dowload file destroy_document: Destroy - errors: messages: in_between: must be in between %{min} and %{max} - wrong_content_type: content type %{content_type} does not match any of accepted content types %{accepted_content_types} + wrong_content_type: content type %{content_type} does not match any of accepted content types %{accepted_content_types} \ No newline at end of file diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 107aaecaa..6e87e6983 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -1,4 +1,3 @@ ---- en: account: show: @@ -812,4 +811,4 @@ en: user_permission_votes: Participate on final voting invisible_captcha: sentence_for_humans: "If you are human, ignore this field" - timestamp_error_message: "Sorry, that was too quick! Please resubmit." + timestamp_error_message: "Sorry, that was too quick! Please resubmit." \ No newline at end of file diff --git a/config/locales/en/images.yml b/config/locales/en/images.yml index afd8b2308..375da86a4 100644 --- a/config/locales/en/images.yml +++ b/config/locales/en/images.yml @@ -1,7 +1,6 @@ en: images: remove_image: Remove image - form: title: Descriptive image title_placeholder: Add a descriptive title for the image @@ -12,14 +11,12 @@ en: title_placeholder: Add a descriptive title for the image admin_title: "Main image of the poll" admin_alt_text: "Alternative text for the image" - actions: destroy: notice: Image was deleted successfully. alert: Cannot destroy image. confirm: Are you sure you want to delete the image? This action cannot be undone! - errors: messages: in_between: must be in between %{min} and %{max} - wrong_content_type: content type %{content_type} does not match any of accepted content types %{accepted_content_types} + wrong_content_type: content type %{content_type} does not match any of accepted content types %{accepted_content_types} \ No newline at end of file diff --git a/config/locales/en/kaminari.yml b/config/locales/en/kaminari.yml index ab88794b6..d4789a4a5 100644 --- a/config/locales/en/kaminari.yml +++ b/config/locales/en/kaminari.yml @@ -1,4 +1,3 @@ ---- en: helpers: page_entries_info: @@ -20,4 +19,4 @@ en: last: Last next: Next previous: Previous - truncate: "…" + truncate: "…" \ No newline at end of file diff --git a/config/locales/en/legislation.yml b/config/locales/en/legislation.yml index 5dd0d0196..57929670a 100644 --- a/config/locales/en/legislation.yml +++ b/config/locales/en/legislation.yml @@ -1,4 +1,3 @@ ---- en: legislation: annotations: diff --git a/config/locales/en/mailers.yml b/config/locales/en/mailers.yml index 3b6706929..2000cd9a5 100644 --- a/config/locales/en/mailers.yml +++ b/config/locales/en/mailers.yml @@ -1,4 +1,3 @@ ---- en: mailers: no_reply: "This message was sent from an email address that does not accept replies." @@ -100,4 +99,4 @@ en: participate_url: "participate in the final voting" thanks: "Thank you again for participating." sincerely: "Sincererly" - signatory: "DEPARTMENT OF PUBLIC PARTICIPATION" + signatory: "DEPARTMENT OF PUBLIC PARTICIPATION" \ No newline at end of file diff --git a/config/locales/en/management.yml b/config/locales/en/management.yml index 8aabd7994..ced2d0644 100644 --- a/config/locales/en/management.yml +++ b/config/locales/en/management.yml @@ -1,4 +1,3 @@ ---- en: management: account: @@ -130,4 +129,4 @@ en: title: User's invites create: success_html: %{count} invitations have been sent. - title: User's invites + title: User's invites \ No newline at end of file diff --git a/config/locales/en/moderation.yml b/config/locales/en/moderation.yml index fa270424a..f6648d49d 100644 --- a/config/locales/en/moderation.yml +++ b/config/locales/en/moderation.yml @@ -1,4 +1,3 @@ ---- en: moderation: comments: @@ -75,4 +74,4 @@ en: search: Search search_placeholder: email or name of user title: Block users - notice_hide: User blocked. All of this user's debates and comments have been hidden. + notice_hide: User blocked. All of this user's debates and comments have been hidden. \ No newline at end of file diff --git a/config/locales/en/officing.yml b/config/locales/en/officing.yml index 2275bfeb4..42003da98 100644 --- a/config/locales/en/officing.yml +++ b/config/locales/en/officing.yml @@ -1,4 +1,3 @@ ---- en: officing: header: @@ -64,4 +63,4 @@ en: submit: Confirm vote success: "Vote introduced!" can_vote: - submit_disable_with: "Wait, confirming vote..." + submit_disable_with: "Wait, confirming vote..." \ No newline at end of file diff --git a/config/locales/en/pages.yml b/config/locales/en/pages.yml index d1884cbad..c0b8f3a0b 100644 --- a/config/locales/en/pages.yml +++ b/config/locales/en/pages.yml @@ -1,4 +1,3 @@ ---- en: pages: census_terms: To confirm the account, you must be 16 or older and be registered, having provided the information requested previously, will verify. By accepting the verification process, you also consent to the verification of this information, as well as the contact methods featuring in said files. The data provided will be acquired and processed in a file mentioned previously in the terms and conditions of use for the Portal. @@ -81,4 +80,4 @@ en: info_code: 'Now introduce the code you received in letter:' password: Password submit: Verify my account - title: Verify your account + title: Verify your account \ No newline at end of file diff --git a/config/locales/en/rails.yml b/config/locales/en/rails.yml index 27ae10dbf..3b093abc4 100644 --- a/config/locales/en/rails.yml +++ b/config/locales/en/rails.yml @@ -18,8 +18,6 @@ # # To learn more, please read the Rails Internationalization guide # available at http://guides.rubyonrails.org/i18n.html. - ---- en: date: abbr_day_names: @@ -225,4 +223,4 @@ en: default: "%a, %d %b %Y %H:%M:%S %z" long: "%B %d, %Y %H:%M" short: "%d %b %H:%M" - pm: pm + pm: pm \ No newline at end of file diff --git a/config/locales/en/responders.yml b/config/locales/en/responders.yml index 88f68a955..bbee89b5e 100644 --- a/config/locales/en/responders.yml +++ b/config/locales/en/responders.yml @@ -1,4 +1,3 @@ ---- en: flash: actions: @@ -32,4 +31,4 @@ en: budget_investment: "Investment project deleted succesfully." error: "Could not delete" topic: "Topic deleted successfully." - poll_question_answer_video: "Answer video deleted successfully." + poll_question_answer_video: "Answer video deleted successfully." \ No newline at end of file diff --git a/config/locales/en/settings.yml b/config/locales/en/settings.yml index 44e767a6e..0d5862408 100644 --- a/config/locales/en/settings.yml +++ b/config/locales/en/settings.yml @@ -52,4 +52,4 @@ en: meta_keywords: "Keywords (SEO)" verification_offices_url: Verification offices URL min_age_to_participate: Minimum age needed to participate - proposal_improvement_path: Proposal improvement info internal link + proposal_improvement_path: Proposal improvement info internal link \ No newline at end of file diff --git a/config/locales/en/social_share_button.yml b/config/locales/en/social_share_button.yml index 2715c46ab..b2aa209fd 100644 --- a/config/locales/en/social_share_button.yml +++ b/config/locales/en/social_share_button.yml @@ -17,4 +17,4 @@ en: plurk: "Plurk" pinterest: "Pinterest" email: "Email" - telegram: "Telegram" + telegram: "Telegram" \ No newline at end of file diff --git a/config/locales/en/valuation.yml b/config/locales/en/valuation.yml index e07cbc520..761ac2154 100644 --- a/config/locales/en/valuation.yml +++ b/config/locales/en/valuation.yml @@ -1,4 +1,3 @@ ---- en: valuation: header: @@ -122,6 +121,4 @@ en: internal_comments_html: Internal comments save: Save changes notice: - valuate: "Dossier updated" - - + valuate: "Dossier updated" \ No newline at end of file diff --git a/config/locales/en/verification.yml b/config/locales/en/verification.yml index 598532354..ec29a50ff 100644 --- a/config/locales/en/verification.yml +++ b/config/locales/en/verification.yml @@ -1,4 +1,3 @@ ---- en: verification: alert: @@ -109,4 +108,4 @@ en: explanation: We currently hold the following details on the Register; please select a method for your confirmation code to be sent. phone_title: Phone numbers title: Available information - use_another_phone: Use other phone + use_another_phone: Use other phone \ No newline at end of file From db91fefc2a44b3fad3a576bfcb06c71dea650b88 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 02:17:31 +0100 Subject: [PATCH 733/765] Update spanish translations with fixes --- config/locales/es/activerecord.yml | 29 ++--- config/locales/es/admin.yml | 77 +++++++------- config/locales/es/budgets.yml | 28 ++--- config/locales/es/community.yml | 2 +- config/locales/es/devise.yml | 6 +- config/locales/es/devise_views.yml | 35 +++--- config/locales/es/documents.yml | 15 +-- config/locales/es/general.yml | 106 +++++++++--------- config/locales/es/images.yml | 13 +-- config/locales/es/kaminari.yml | 7 +- config/locales/es/legislation.yml | 9 +- config/locales/es/mailers.yml | 23 ++-- config/locales/es/management.yml | 21 ++-- config/locales/es/moderation.yml | 15 ++- config/locales/es/officing.yml | 25 +++-- config/locales/es/pages.yml | 9 +- config/locales/es/rails.yml | 124 +++++++++++----------- config/locales/es/responders.yml | 5 +- config/locales/es/social_share_button.yml | 2 +- config/locales/es/valuation.yml | 21 ++-- config/locales/es/verification.yml | 13 ++- 21 files changed, 277 insertions(+), 308 deletions(-) diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index a29157431..d0d3294cd 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -43,15 +43,15 @@ es: organization: one: "Organización" other: "Organizaciones" - proposal: - one: "Propuesta ciudadana" - other: "Propuestas ciudadanas" poll/booth: one: "urna" other: "urnas" poll/officer: one: "presidente de mesa" other: "presidentes de mesa" + proposal: + one: "Propuesta ciudadana" + other: "Propuestas ciudadanas" spending_proposal: one: "Propuesta de inversión" other: "Propuestas de inversión" @@ -65,11 +65,11 @@ es: one: Bloque other: Bloques legislation/process: - one: "Proceso" - other: "Procesos" + one: "Proceso" + other: "Procesos" legislation/draft_versions: - one: "Versión borrador" - other: "Versiones borrador" + one: "Versión borrador" + other: "Versiones borrador" legislation/draft_texts: one: "Borrador" other: "Borradores" @@ -101,20 +101,21 @@ es: phase: "Fase" currency_symbol: "Divisa" budget/investment: - administrator_id: "Administrador" - description: "Descripción" - external_url: "Enlace a documentación adicional" heading_id: "Partida presupuestaria" title: "Título" + description: "Descripción" + external_url: "Enlace a documentación adicional" location: "Ubicación" + administrator_id: "Administrador" organization_name: "Si estás proponiendo en nombre de una organización o colectivo, escribe su nombre" image: "Imagen descriptiva de la propuesta de inversión" - comment: - body: "Comentario" - user: "Usuario" + image_title: "Título de la imagen" budget/investment/milestone: title: "Título" description: "Descripción" + comment: + body: "Comentario" + user: "Usuario" debate: author: "Autor" description: "Opinión" @@ -127,7 +128,7 @@ es: description: "Descripción" terms_of_service: "Términos de servicio" user: - login: Email o nombre de usuario + login: "Email o nombre de usuario" email: "Correo electrónico" username: "Nombre de usuario" password_confirmation: "Confirmación de contraseña" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 648fdb8a6..8d0b6cbf8 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -1,11 +1,10 @@ ---- es: admin: header: title: Administración actions: actions: Acciones - confirm: "¿Estás seguro?" + confirm: '¿Estás seguro?' confirm_hide: Confirmar hide: Ocultar hide_author: Bloquear al autor @@ -27,8 +26,8 @@ es: preview: Vista previa banner: title: Título - description: Descripción - target_url: Enlace + description: Descripción + target_url: Enlace style: Estilo image: Imagen post_started_at: Inicio de publicación @@ -41,7 +40,7 @@ es: form: error: one: "error impidió guardar el banner" - other: "errores impidieron guardar el banner." + other: 'errores impidieron guardar el banner.' new: creating: Crear banner activity: @@ -60,7 +59,7 @@ es: on_debates: Debates on_proposals: Propuestas on_users: Usuarios - title: Actividad de Moderadores + title: Actividad de los Moderadores type: Tipo no_activity: No hay actividad de moderadores. budgets: @@ -80,7 +79,7 @@ es: edit_groups: Editar grupos de partidas edit_budget: Editar presupuesto create: - notice: ¡Nueva campaña de presupuestos participativos creada con éxito! + notice: '¡Nueva campaña de presupuestos participativos creada con éxito!' update: notice: Campaña de presupuestos participativos actualizada edit: @@ -148,7 +147,7 @@ es: assigned_admin: Administrador asignado assigned_valuators: Evaluadores asignados classification: Clasificación - info: "%{budget_name} - Grupo: %{group_name} - Propuesta de inversión %{id}" + info: '%{budget_name} - Grupo: %{group_name} - Propuesta de inversión %{id}' edit: Editar edit_classification: Editar clasificación by: Autor @@ -170,7 +169,7 @@ es: "true": Seleccionado "false": No seleccionado winner: - title: Ganador + title: Ganadora "true": "Si" "false": "No" edit: @@ -392,18 +391,6 @@ es: comments_count: Número de comentarios question_option_fields: remove_option: Eliminar - administrators: - index: - title: Administradores - name: Nombre - email: Email - no_administrators: No hay administradores. - administrator: - add: Añadir como Administrador - delete: Borrar - restricted_removal: "Lo sentimos, no puedes eliminarte a ti mismo de la lista" - search: - title: "Administradores: Búsqueda de usuarios" managers: index: title: Gestores @@ -419,16 +406,16 @@ es: activity: Actividad de moderadores admin: Menú de administración banner: Gestionar banners + poll_questions: Preguntas ciudadanas proposals_topics: Temas de propuestas - poll_questions: Preguntas de votaciones budgets: Presupuestos participativos geozones: Gestionar distritos hidden_comments: Comentarios ocultos hidden_debates: Debates ocultos hidden_proposals: Propuestas ocultas hidden_users: Usuarios bloqueados - managers: Gestores administrators: Administradores + managers: Gestores moderators: Moderadores newsletter: Envío de Newsletters valuators: Evaluadores @@ -456,6 +443,18 @@ es: title_site_customization: Personalizar sitio legislation: Legislación colaborativa users: Usuarios + administrators: + index: + title: Administradores + name: Nombre + email: Email + no_administrators: No hay administradores. + administrator: + add: Añadir como Administrador + delete: Borrar + restricted_removal: "Lo sentimos, no puedes eliminarte a ti mismo de la lista" + search: + title: 'Administradores: Búsqueda de usuarios' moderators: index: title: Moderadores @@ -480,7 +479,7 @@ es: no_description: Sin descripción no_valuators: No hay evaluadores. valuator: - description_placeholder: "Descripción (opcional)" + description_placeholder: 'Descripción (opcional)' add: Añadir como evaluador search: title: 'Evaluadores: Búsqueda de usuarios' @@ -553,8 +552,8 @@ es: assigned: Asignada unassigned: No asignada actions: - assign: Assign booth - unassign: Unassign booth + assign: Asignar urna + unassign: Asignar urna poll_booth_assignments: flash: destroy: "Urna desasignada" @@ -571,8 +570,8 @@ es: results: "Resultados" date: "Fecha" count_final: "Recuento final (presidente de mesa)" - count_by_system: "Votos (automático)" - total_system: "Votos totales acumulados(automático)" + count_by_system: "Votos (automático)" + total_system: Votos totales acumulados(automático) index: booths_title: "Listado de urnas asignadas" no_booths: "No hay urnas asignadas a esta votación." @@ -613,8 +612,8 @@ es: title: "Preguntas de votaciones" create: "Crear pregunta ciudadana" no_questions: "No hay ninguna pregunta ciudadana." - filter_poll: "Filtrar por votación" - select_poll: "Seleccionar votación" + filter_poll: Filtrar por votación + select_poll: Seleccionar votación questions_tab: "Preguntas" successful_proposals_tab: "Propuestas que han superado el umbral" create_question: "Crear pregunta para votación" @@ -651,8 +650,6 @@ es: answers: new: title: Nueva respuesta - video_url: Video externo - documents: Documentos (1) show: title: Título description: Descripción @@ -666,7 +663,7 @@ es: title: Vídeos add_video: Añadir vídeo video_title: Título - video_url: External video + video_url: Vídeo externo new: title: Nuevo video edit: @@ -683,9 +680,9 @@ es: title: "Resultados" no_results: "No hay resultados" result: - table_whites: Papeletas totalmente en blanco - table_nulls: Papeletas nulas - table_total: Papeletas totales + table_whites: "Papeletas totalmente en blanco" + table_nulls: "Papeletas nulas" + table_total: "Papeletas totales" table_answer: Respuesta table_votes: Votos results_by_booth: @@ -818,8 +815,8 @@ es: search_results: "Resultados de la búsqueda" no_search_results: "No se han encontrado resultados." actions: Acciones - title: "Título" - description: "Descripción" + title: Título + description: Descripción spending_proposals: index: geozone_filter_all: Todos los ámbitos de actuación @@ -848,7 +845,7 @@ es: assigned_valuators: Evaluadores asignados back: Volver classification: Clasificación - heading: Propuesta de inversión %{id} + heading: "Propuesta de inversión %{id}" edit: Editar edit_classification: Editar clasificación association_name: Asociación @@ -891,7 +888,7 @@ es: form: error: one: "error impidió guardar el distrito" - other: "errores impidieron guardar el distrito." + other: 'errores impidieron guardar el distrito.' edit: form: submit_button: Guardar cambios diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index 5c76c8abe..e3e92fe52 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -11,7 +11,7 @@ es: one: "Has votado una propuesta." other: "Has votado %{count} propuestas." voted_info_html: "Puedes cambiar tus votos en cualquier momento hasta el cierre de esta fase.
    No hace falta que gastes todo el dinero disponible." - zero: "Todavía no has votado ninguna propuesta de inversión." + zero: Todavía no has votado ninguna propuesta de inversión. reasons_for_not_balloting: not_logged_in: Necesitas %{signin} o %{signup} para continuar. not_verified: Las propuestas de inversión sólo pueden ser apoyadas por usuarios verificados, %{verify_account}. @@ -51,9 +51,9 @@ es: help_text_4: "Para conseguir el mayor número de apoyos y votos posible, elige un titular descriptivo y comprensible de tu proyecto. Después tienes un espacio para desarrollar el planteamiento de tu propuesta. Aporta todos los datos y explicaciones, e incluso documentos e imágenes, para ayudar a otras personas participantes a entender mejor lo que planteas." investments: form: - tags_instructions: "Etiqueta esta propuesta. Puedes elegir entre las categorías propuestas o introducir las que desees" - tags_label: Temas tag_category_label: "Categorías" + tags_instructions: "Etiqueta esta propuesta. Puedes elegir entre las categorías propuestas o introducir las que desees" + tags_label: Etiquetas tags_placeholder: "Escribe las etiquetas que desees separadas por una coma (',')" map_location: "Ubicación en el mapa" map_location_instructions: "Navega por el mapa hasta la ubicación y coloca el marcador." @@ -61,9 +61,9 @@ es: index: title: Presupuestos participativos unfeasible: Propuestas de inversión no viables - unfeasible_text: Las propuestas presentadas deben cumplir una serie de criterios (legalidad, concreción, ser competencia del Ayuntamiento, no superar el tope del presupuesto; %{definitions}) para ser declaradas viables y llegar hasta la fase de votación final. Todas las propuestas que no cumplen estos criterios son marcadas como inviables y publicadas en la siguiente lista, junto con su informe de inviabilidad. + unfeasible_text: "Las propuestas presentadas deben cumplir una serie de criterios (legalidad, concreción, ser competencia del Ayuntamiento, no superar el tope del presupuesto; %{definitions}) para ser declaradas viables y llegar hasta la fase de votación final. Todas las propuestas que no cumplen estos criterios son marcadas como inviables y publicadas en la siguiente lista, junto con su informe de inviabilidad." unfeasible_text_definitions: ver definiciones aquí - by_heading: "Propuestas de inversión con ámbito: %{heading}" + by_heading: 'Propuestas de inversión con ámbito: %{heading}' search_form: button: Buscar placeholder: Buscar propuestas de inversión... @@ -78,10 +78,10 @@ es: other: "Has votado %{count} propuestas por un valor de %{amount_spent}" voted_info: Puedes %{link} en cualquier momento hasta el cierre de esta fase. No hace falta que gastes todo el dinero disponible. voted_info_link: cambiar tus votos - different_heading_assigned_html: "Ya apoyaste propuestas de otra sección del presupuesto: %{heading_link}" + different_heading_assigned_html: 'Ya apoyaste propuestas de otra sección del presupuesto: %{heading_link}' change_ballot: "Si cambias de opinión puedes borrar tus votos en %{check_ballot} y volver a empezar." check_ballot_link: "revisar mis votos" - zero: "Todavía no has votado ninguna propuesta de inversión en este ámbito del presupuesto." + zero: Todavía no has votado ninguna propuesta de inversión en este ámbito del presupuesto. verified_only: "Para crear una nueva propuesta de inversión %{verify}." verify_account: "verifica tu cuenta" create: "Crear propuesta de inversión" @@ -114,22 +114,22 @@ es: wrong_price_format: Solo puede incluir caracteres numéricos investment: add: Votar - already_added: "Ya has añadido esta propuesta de inversión" + already_added: Ya has añadido esta propuesta de inversión already_supported: Ya has apoyado esta propuesta. ¡Compártelo! support_title: Apoyar esta propuesta confirm_group: "Sólo puedes apoyar propuestas en un distrito. Si sigues adelante no podrás cambiar esta decisión. ¿Estás seguro?" supports: + zero: Sin apoyos one: 1 apoyo other: "%{count} apoyos" - zero: Sin apoyos give_support: Apoyar header: check_ballot: Revisar mis votos - different_heading_assigned_html: "Ya apoyaste propuestas de otra sección del presupuesto: %{heading_link}" + different_heading_assigned_html: 'Ya apoyaste propuestas de otra sección del presupuesto: %{heading_link}' change_ballot: "Si cambias de opinión puedes borrar tus votos en %{check_ballot} y volver a empezar." check_ballot_link: "revisar mis votos" progress_bar: - available: "Disponible: " + available: 'Disponible: ' show: group: Grupo phase: Fase actual @@ -147,8 +147,8 @@ es: ballot_lines_count: Votos hide_discarded_link: Ocultar descartadas show_all_link: Mostrar todas - price: Coste + price: Coste total amount_available: Presupuesto disponible - accepted: "Propuesta de inversión aceptada: " - discarded: "Propuesta de inversión descartada: " + accepted: 'Propuesta de inversión aceptada: ' + discarded: 'Propuesta de inversión descartada: ' incompatibles: Incompatibles diff --git a/config/locales/es/community.yml b/config/locales/es/community.yml index 8013c116c..abfe24a67 100644 --- a/config/locales/es/community.yml +++ b/config/locales/es/community.yml @@ -28,9 +28,9 @@ es: edit_button: Editar destroy_button: Eliminar comments: + zero: Sin comentarios one: 1 Comentario other: "%{count} Comentarios" - zero: Sin comentarios topic: create: Crear un tema edit: Editar tema diff --git a/config/locales/es/devise.yml b/config/locales/es/devise.yml index 6ede31f7d..103b33243 100644 --- a/config/locales/es/devise.yml +++ b/config/locales/es/devise.yml @@ -37,11 +37,7 @@ es: updated: "Tu contraseña ha cambiado correctamente. Has sido identificado correctamente." updated_not_active: "Tu contraseña se ha cambiado correctamente." registrations: - destroyed: - "¡Adiós! Tu cuenta ha sido cancelada. Esperamos volver a verte pronto. Le informamos que de conformidad con su petición, - sus datos personales registrados como usuario de la Web y que forman parte del fichero 'Fichero' - cuyo responsable es 'Responsable', han sido cancelados en los términos de lo previsto en el artículo 16 de la - Ley Orgánica 15/1999 de Protección de Datos de Carácter Personal y del artículo 31 de su Reglamento de desarrollo (RD 1720/2007)." + destroyed: "¡Adiós! Tu cuenta ha sido cancelada. Esperamos volver a verte pronto. Le informamos que de conformidad con su petición, sus datos personales registrados como usuario de la Web y que forman parte del fichero 'Fichero' cuyo responsable es 'Responsable', han sido cancelados en los términos de lo previsto en el artículo 16 de la Ley Orgánica 15/1999 de Protección de Datos de Carácter Personal y del artículo 31 de su Reglamento de desarrollo (RD 1720/2007)." signed_up: "¡Bienvenido! Has sido identificado." signed_up_but_inactive: "Te has registrado correctamente, pero no has podido iniciar sesión porque tu cuenta no ha sido activada." signed_up_but_locked: "Te has registrado correctamente, pero no has podido iniciar sesión porque tu cuenta está bloqueada." diff --git a/config/locales/es/devise_views.yml b/config/locales/es/devise_views.yml index 184454654..aee940d5f 100644 --- a/config/locales/es/devise_views.yml +++ b/config/locales/es/devise_views.yml @@ -1,4 +1,3 @@ ---- es: devise_views: confirmations: @@ -42,8 +41,8 @@ es: new: email_label: Email organization_name_label: Nombre de la organización - password_confirmation_label: Confirmar contraseña - password_label: Contraseña + password_confirmation_label: Repite la contraseña anterior + password_label: Contraseña que utilizarás para acceder a este sitio web phone_number_label: Teléfono responsible_name_label: Nombre y apellidos de la persona responsable del colectivo responsible_name_note: Será la persona representante de la asociación/colectivo en cuyo nombre se presenten las propuestas @@ -51,7 +50,7 @@ es: title: Registrarse como organización / colectivo success: back_to_index: Entendido, volver a la página principal - instructions_1_html: En breve nos pondremos en contacto contigo para verificar que realmente representas a este colectivo. + instructions_1_html: "En breve nos pondremos en contacto contigo para verificar que realmente representas a este colectivo." instructions_2_html: Mientras revisa tu correo electrónico, te hemos enviado un enlace para confirmar tu cuenta. instructions_3_html: Una vez confirmado, podrás empezar a participar como colectivo no verificado. thank_you_html: Gracias por registrar tu colectivo en la web. Ahora está pendiente de verificación. @@ -65,22 +64,22 @@ es: new: email_label: Email send_submit: Recibir instrucciones - title: "¿Has olvidado tu contraseña?" + title: '¿Has olvidado tu contraseña?' sessions: new: login_label: Email o nombre de usuario - password_label: Contraseña + password_label: Contraseña que utilizarás para acceder a este sitio web remember_me: Recordarme submit: Entrar - title: Entrar + title: Iniciar sesión shared: links: login: Entrar - new_confirmation: "¿No has recibido instrucciones para confirmar tu cuenta?" - new_password: "¿Olvidaste tu contraseña?" - new_unlock: "¿No has recibido instrucciones para desbloquear?" + new_confirmation: '¿No has recibido instrucciones para confirmar tu cuenta?' + new_password: '¿Olvidaste tu contraseña?' + new_unlock: '¿No has recibido instrucciones para desbloquear?' signin_with_provider: Entrar con %{provider} - signup: "¿No tienes una cuenta? %{signup_link}" + signup: '¿No tienes una cuenta? %{signup_link}' signup_link: Regístrate unlocks: new: @@ -91,13 +90,13 @@ es: registrations: delete_form: erase_reason_label: Razón de la baja - info: Esta acción no se puede deshacer. Una vez que des de baja tu cuenta, no podrás volver a hacer login con ella. - info_reason: Si quieres, escribe el motivo por el que te das de baja (opcional). - submit: Borrar mi cuenta + info: Esta acción no se puede deshacer. Una vez que des de baja tu cuenta, no podrás volver a entrar con ella. + info_reason: Si quieres, escribe el motivo por el que te das de baja (opcional) + submit: Darme de baja title: Darme de baja edit: current_password_label: Contraseña actual - edit: Editar + edit: Editar propuesta email_label: Email leave_blank: Dejar en blanco si no deseas cambiarla need_current: Necesitamos tu contraseña actual para confirmar los cambios @@ -108,7 +107,7 @@ es: new: cancel: Cancelar login email_label: Tu correo electrónico - organization_signup: "¿Representas a una organización / colectivo? %{signup_link}" + organization_signup: '¿Representas a una organización / colectivo? %{signup_link}' organization_signup_link: Regístrate aquí password_confirmation_label: Repite la contraseña anterior password_label: Contraseña que utilizarás para acceder a este sitio web @@ -118,8 +117,8 @@ es: terms_link: condiciones de uso terms_title: Al registrarte aceptas las condiciones de uso title: Registrarse - username_is_available: "Nombre de usuario disponible" - username_is_not_available: "Nombre de usuario ya existente" + username_is_available: Nombre de usuario disponible + username_is_not_available: Nombre de usuario ya existente username_label: Nombre de usuario username_note: Nombre público que aparecerá en tus publicaciones success: diff --git a/config/locales/es/documents.yml b/config/locales/es/documents.yml index 2afae1be9..0e57897e6 100644 --- a/config/locales/es/documents.yml +++ b/config/locales/es/documents.yml @@ -2,27 +2,22 @@ es: documents: tab: Documentos no_documents: No hay documentos subidos - upload_document: Subir documento - max_documents_allowed_reached_html: ¡Has alcanzado el número máximo de documentos permitidos! Tienes que eliminar uno antes de poder subir otro. - + max_documents_allowed_reached_html: '¡Has alcanzado el número máximo de documentos permitidos! Tienes que eliminar uno antes de poder subir otro.' form: title: Documentos title_placeholder: Añade un título descriptivo para el documento attachment_label: Selecciona un documento delete_button: Eliminar documento - note: "Puedes subir hasta un máximo de %{max_documents_allowed} documentos en los formatos: %{accepted_content_types}, y de hasta %{max_file_size} MB por archivo." + note: 'Puedes subir hasta un máximo de %{max_documents_allowed} documentos en los formatos: %{accepted_content_types}, y de hasta %{max_file_size} MB por archivo.' add_new_document: Añadir nuevo documento - actions: destroy: - notice: "El documento se ha eliminado correctamente." - alert: "El documento no se ha podido eliminar." - confirm: "¿Está seguro de que desea eliminar el documento? Esta acción no se puede deshacer!" - + notice: El documento se ha eliminado correctamente. + alert: El documento no se ha podido eliminar. + confirm: '¿Está seguro de que desea eliminar el documento? Esta acción no se puede deshacer!' buttons: download_document: Descargar archivo destroy_document: Eliminar - errors: messages: in_between: debe estar entre %{min} y %{max} diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index ca88d8c1d..0d0b4b849 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -1,4 +1,3 @@ ---- es: account: show: @@ -48,14 +47,14 @@ es: deleted: Este comentario ha sido eliminado moderator: Moderador responses: + zero: Sin respuestas one: 1 Respuesta other: "%{count} Respuestas" - zero: Sin respuestas user_deleted: Usuario eliminado votes: + zero: Sin votos one: 1 voto other: "%{count} votos" - zero: Sin votos form: comment_as_admin: Comentar como administrador comment_as_moderator: Comentar como moderador @@ -80,13 +79,13 @@ es: submit_button: Empieza un debate debate: comments: + zero: Sin comentarios one: 1 Comentario other: "%{count} Comentarios" - zero: Sin comentarios votes: + zero: Sin votos one: 1 voto other: "%{count} votos" - zero: Sin votos edit: editing: Editar debate form: @@ -99,7 +98,7 @@ es: tags_label: Temas tags_placeholder: "Escribe las etiquetas que desees separadas por coma (',')" index: - featured_debates: Destacados + featured_debates: Destacar filter_topic: one: " con el tema '%{topic}'" other: " con el tema '%{topic}'" @@ -150,9 +149,9 @@ es: show: author_deleted: Usuario eliminado comments: + zero: Sin comentarios one: 1 Comentario other: "%{count} Comentarios" - zero: Sin comentarios comments_title: Comentarios edit_debate_link: Editar debate flag: Este debate ha sido marcado como inapropiado por varios usuarios. @@ -164,7 +163,7 @@ es: submit_button: Guardar cambios errors: messages: - user_not_found: No se encontró el usuario + user_not_found: Usuario no encontrado invalid_date_range: "El rango de fechas no es válido" form: accept_terms: Acepto la %{policy} y las %{conditions} @@ -201,34 +200,34 @@ es: accessibility: Accesibilidad conditions: Condiciones de uso consul: aplicación CONSUL - consul_url: https://github.com/consul/consul + consul_url: 'https://github.com/consul/consul' contact_us: Para asistencia técnica entra en copyright: CONSUL, %{year} description: Este portal usa la %{consul} que es %{open_source}. faq: Asistencia técnica open_data_text: Todos los datos del Ayuntamiento son tuyos. open_data_title: Datos Abiertos - open_source: software libre - open_source_url: http://www.gnu.org/licenses/agpl-3.0.html + open_source: software de código abierto + open_source_url: 'http://www.gnu.org/licenses/agpl-3.0.html' participation_text: Decide cómo debe ser la ciudad que quieres. participation_title: Participación privacy: Política de privacidad transparency_text: Obtén cualquier información sobre la ciudad. transparency_title: Transparencia - transparency_url: https://transparency.consul + transparency_url: 'https://transparency.consul' header: administration_menu: Admin - administration: Administrar + administration: Administración available_locales: Idiomas disponibles collaborative_legislation: Procesos legislativos debates: Debates external_link_blog: Blog external_link_opendata: Datos abiertos - external_link_opendata_url: https://opendata.consul + external_link_opendata_url: 'https://opendata.consul' external_link_transparency: Transparencia - external_link_transparency_url: https://transparency.consul + external_link_transparency_url: 'https://transparency.consul' locale: 'Idioma:' - logo: CONSUL logo + logo: Logo de CONSUL management: Gestión moderation: Moderar valuation: Evaluación @@ -240,7 +239,7 @@ es: new_notifications: one: Tienes una nueva notificación other: Tienes %{count} notificaciones nuevas - no_notifications: No tienes notificaciones nuevas + no_notifications: "No tienes notificaciones nuevas" open: abierto open_city_slogan_html: Existen ciudades gobernadas directamente por sus habitantes, que debaten sobre temas que les preocupan, proponen ideas para mejorar sus vidas y deciden entre todas y todos las que se llevan a cabo. open_city_title: La ciudad que quieres será la ciudad que quieras @@ -248,7 +247,7 @@ es: proposals: Propuestas poll_questions: Votaciones budgets: Presupuestos participativos - spending_proposals: "Propuestas de inversión" + spending_proposals: Propuestas de inversión admin: watch_form_message: 'Has realizado cambios que no han sido guardados. ¿Seguro que quieres abandonar la página?' legacy_legislation: @@ -257,7 +256,7 @@ es: text: Para comentar este documento debes %{sign_in} o %{sign_up}. Después selecciona el texto que quieres comentar y pulsa en el botón con el lápiz. text_sign_in: iniciar sesión text_sign_up: registrarte - title: "¿Cómo puedo comentar este documento?" + title: '¿Cómo puedo comentar este documento?' locale: Español notifications: index: @@ -276,7 +275,7 @@ es: map: title: "Distritos" proposal_for_district: "Crea una propuesta para tu distrito" - select_district: "Ámbito de actuación" + select_district: Ámbito de actuación start_proposal: Crea una propuesta omniauth: facebook: @@ -284,7 +283,8 @@ es: sign_up: Regístrate con Facebook name: Facebook finish_signup: - title: Añade tu email + title: "Detalles adicionales de tu cuenta" + username_warning: "Debido a que hemos cambiado la forma en la que nos conectamos con redes sociales y es posible que tu nombre de usuario aparezca como 'ya en uso', incluso si antes podías acceder con él. Si es tu caso, por favor elige un nombre de usuario distinto." google_oauth2: sign_in: Entra con Google sign_up: Regístrate con Google @@ -296,9 +296,6 @@ es: info_sign_in: "Entra con:" info_sign_up: "Regístrate con:" or_fill: "O rellena el siguiente formulario:" - finish_signup: - title: "Detalles adicionales de tu cuenta" - username_warning: "Debido a que hemos cambiado la forma en la que nos conectamos con redes sociales y es posible que tu nombre de usuario aparezca como 'ya en uso', incluso si antes podías acceder con él. Si es tu caso, por favor elige un nombre de usuario distinto." proposals: create: form: @@ -323,7 +320,7 @@ es: done: Realizada other: Otra form: - geozone: "Ámbito de actuación" + geozone: Ámbito de actuación proposal_external_url: Enlace a documentación adicional proposal_question: Pregunta de la propuesta proposal_question_example_html: "Debe ser resumida en una pregunta cuya respuesta sea Sí o No.
    Ej. '¿Está usted de acuerdo en peatonalizar la calle Mayor?'" @@ -335,9 +332,9 @@ es: proposal_title: Título de la propuesta proposal_video_url: Enlace a vídeo externo proposal_video_url_note: Puedes añadir un enlace a YouTube o Vimeo + tag_category_label: "Categorías" tags_instructions: "Etiqueta esta propuesta. Puedes elegir entre las categorías propuestas o introducir las que desees" tags_label: Temas - tag_category_label: "Categorías" tags_placeholder: "Escribe las etiquetas que desees separadas por una coma (',')" map_location: "Ubicación en el mapa" map_location_instructions: "Navega por el mapa hasta la ubicación y coloca el marcador." @@ -375,7 +372,7 @@ es: one: " que contiene '%{search_term}'" other: " que contienen '%{search_term}'" select_order: Ordenar por - select_order_long: Estas viendo las propuestas + select_order_long: 'Estas viendo las propuestas' start_proposal: Crea una propuesta title: Propuestas ciudadanas top: Top semanal @@ -393,7 +390,7 @@ es: new: form: submit_button: Crear propuesta - more_info: "¿Cómo funcionan las propuestas ciudadanas?" + more_info: '¿Cómo funcionan las propuestas ciudadanas?' recommendation_one: No escribas el título de la propuesta o frases enteras en mayúsculas. En internet eso se considera gritar. Y a nadie le gusta que le griten. recommendation_three: Disfruta de este espacio, de las voces que lo llenan, también es tuyo. recommendation_two: Cualquier propuesta o comentario que implique una acción ilegal será eliminada, también las que tengan la intención de sabotear los espacios de propuesta, todo lo demás está permitido. @@ -406,25 +403,25 @@ es: share: guide: "Compártela para que la gente empiece a apoyarla." edit: "Antes de que se publique podrás modificar el texto a tu gusto." - view_proposal: "Ahora no, ir a mi propuesta" + view_proposal: Ahora no, ir a mi propuesta improve_info: "Mejora tu campaña y consigue más apoyos" improve_info_link: "Ver más información" - already_supported: "¡Ya has apoyado esta propuesta, compártela!" + already_supported: '¡Ya has apoyado esta propuesta, compártela!' comments: + zero: Sin comentarios one: 1 Comentario other: "%{count} Comentarios" - zero: Sin comentarios reason_for_supports_necessary: 1% del Censo support: Apoyar support_title: Apoyar esta propuesta supports: + zero: Sin apoyos one: 1 apoyo other: "%{count} apoyos" - zero: Sin apoyos votes: + zero: Sin votos one: 1 voto other: "%{count} votos" - zero: Sin votos supports_necessary: "%{number} apoyos necesarios" total_percent: 100% archived: "Esta propuesta ha sido archivada y ya no puede recoger apoyos." @@ -434,9 +431,9 @@ es: author_deleted: Usuario eliminado code: 'Código de la propuesta:' comments: + zero: Sin comentarios one: 1 Comentario other: "%{count} Comentarios" - zero: Sin comentarios comments_tab: Comentarios edit_proposal_link: Editar propuesta flag: Esta propuesta ha sido marcada como inapropiada por varios usuarios. @@ -445,8 +442,8 @@ es: retired_warning: "El autor de esta propuesta considera que ya no debe seguir recogiendo apoyos." retired_warning_link_to_explanation: Revisa su explicación antes de apoyarla. retired: Propuesta retirada por el autor - send_notification: Enviar notificación share: Compartir + send_notification: Enviar notificación no_notifications: "Esta propuesta no tiene notificaciones." embed_video_title: "Vídeo en %{proposal}" title_external_url: "Documentación adicional" @@ -471,7 +468,7 @@ es: participate_button_expired: "Votación terminada" no_geozone_restricted: "Toda la ciudad" geozone_restricted: "Distritos" - geozone_info: "Pueden participar las personas empadronadas en: " + geozone_info: 'Pueden participar las personas empadronadas en: ' already_answer: "Ya has participado en esta votación" section_header: icon_alt: Icono de Votaciones @@ -519,9 +516,9 @@ es: null_votes: "Nulos" results: title: "Preguntas" - most_voted_answer: "Respuesta más votada: " + most_voted_answer: 'Respuesta más votada: ' poll_questions: - create_question: "Crear pregunta para votación" + create_question: "Crear pregunta" show: vote_answer: "Votar %{answer}" voted: "Has votado %{answer}" @@ -539,10 +536,10 @@ es: shared: edit: 'Editar' save: 'Guardar' - delete: 'Borrar' - "yes": "Sí" + delete: Borrar + "yes": "Si" "no": "No" - search_results: "Resultados de búsqueda" + search_results: "Resultados de la búsqueda" advanced_search: author_type: 'Por categoría de autor' author_type_blank: 'Elige una categoría' @@ -560,7 +557,6 @@ es: search: 'Filtrar' title: 'Búsqueda avanzada' to: 'Hasta' - delete: 'Borrar' author_info: author_deleted: Usuario eliminado back: Volver @@ -578,10 +574,10 @@ es: destroy: notice_html: "¡Has dejado de seguir este proyecto de inverisión!
    Ya no recibirás más notificaciones relacionadas con este proyecto." proposal: - create: - notice_html: "¡Ahora estás siguiendo esta propuesta ciudadana!
    Te notificaremos los cambios a medida que se produzcan para que estés al día." - destroy: - notice_html: "¡Has dejado de seguir esta propuesta ciudadana!
    Ya no recibirás más notificaciones relacionadas con esta propuesta." + create: + notice_html: "¡Ahora estás siguiendo esta propuesta ciudadana!
    Te notificaremos los cambios a medida que se produzcan para que estés al día." + destroy: + notice_html: "¡Has dejado de seguir esta propuesta ciudadana!
    Ya no recibirás más notificaciones relacionadas con esta propuesta." hide: Ocultar print: print_button: Imprimir esta información @@ -614,7 +610,7 @@ es: target_blank_html: " (se abre en ventana nueva)" you_are_in: "Estás en" unflag: Deshacer denuncia - unfollow: Dejar de seguir + unfollow: "Dejar de seguir" unfollow_entity: "Dejar de seguir %{entity}" outline: budget: Presupuestos participativos @@ -638,7 +634,7 @@ es: association_name: 'Nombre de la asociación' description: Descripción detallada external_url: Enlace a documentación adicional - geozone: "Ámbito de actuación" + geozone: Ámbito de actuación submit_buttons: create: Crear new: Crear @@ -646,7 +642,7 @@ es: index: title: Presupuestos participativos unfeasible: Propuestas de inversión no viables - by_geozone: "Propuestas de inversión con ámbito: %{geozone}" + by_geozone: 'Propuestas de inversión con ámbito: %{geozone}' search_form: button: Buscar placeholder: Propuestas de inversión... @@ -660,7 +656,7 @@ es: unfeasible: No viables start_spending_proposal: Crea una propuesta de inversión new: - more_info: "¿Cómo funcionan los presupuestos participativos?" + more_info: '¿Cómo funcionan los presupuestos participativos?' recommendation_one: Es fundamental que haga referencia a una actuación presupuestable. recommendation_three: Intenta detallar lo máximo posible la propuesta para que el equipo de gobierno encargado de estudiarla tenga las menor dudas posibles. recommendation_two: Cualquier propuesta o comentario que implique acciones ilegales será eliminada. @@ -677,9 +673,9 @@ es: support: Apoyar support_title: Apoyar este proyecto supports: + zero: Sin apoyos one: 1 apoyo other: "%{count} apoyos" - zero: Sin apoyos stats: index: visits: Visitas @@ -699,11 +695,11 @@ es: users: direct_messages: new: - body_label: "Mensaje" + body_label: Mensaje direct_messages_bloqued: "Este usuario ha decidido no recibir mensajes privados" - submit_button: "Enviar mensaje" + submit_button: Enviar mensaje title: Enviar mensaje privado a %{receiver} - title_label: "Título" + title_label: Título verified_only: Para enviar un mensaje privado %{verify_account} verify_account: verifica tu cuenta authenticate: Necesitas %{signin} o %{signup}. @@ -797,7 +793,7 @@ es: verification: i_dont_have_an_account: No tengo cuenta, quiero crear una y verificarla i_have_an_account: Ya tengo una cuenta que quiero verificar - question: ¿Tienes ya una cuenta en %{org_name}? + question: '¿Tienes ya una cuenta en %{org_name}?' title: Verificación de cuenta welcome: go_to_index: Ahora no, ver propuestas diff --git a/config/locales/es/images.yml b/config/locales/es/images.yml index e842f3f5c..f18d9636f 100644 --- a/config/locales/es/images.yml +++ b/config/locales/es/images.yml @@ -1,23 +1,20 @@ es: images: remove_image: Eliminar imagen - form: title: Imagen descriptiva + title_placeholder: Añade un título descriptivo para la imagen attachment_label: Selecciona una imagen delete_button: Eliminar imagen - note: "Puedes subir una imagen en los formatos: %{accepted_content_types}, y de hasta %{max_file_size} MB por archivo." + note: 'Puedes subir una imagen en los formatos: %{accepted_content_types}, y de hasta %{max_file_size} MB por archivo.' add_new_image: Añadir imagen - title_placeholder: Añade un título descriptivo para la imagen admin_title: "Imagen principal de la votación" admin_alt_text: "Texto alternativo para la imagen" - actions: destroy: - notice: "La imagen se ha eliminado correctamente." - alert: "La imagen no se ha podido eliminar." - confirm: "¿Está seguro de que desea eliminar la imagen? Esta acción no se puede deshacer!" - + notice: La imagen se ha eliminado correctamente. + alert: La imagen no se ha podido eliminar. + confirm: '¿Está seguro de que desea eliminar la imagen? Esta acción no se puede deshacer!' errors: messages: in_between: debe estar entre %{min} y %{max} diff --git a/config/locales/es/kaminari.yml b/config/locales/es/kaminari.yml index 7cf5bf57e..81c74af68 100644 --- a/config/locales/es/kaminari.yml +++ b/config/locales/es/kaminari.yml @@ -1,23 +1,22 @@ ---- es: helpers: page_entries_info: entry: + zero: Entradas one: entrada other: entradas - zero: entradas more_pages: display_entries: Mostrando %{first} - %{last} de un total de %{total} %{entry_name} one_page: display_entries: + zero: "No se han encontrado %{entry_name}" one: Hay 1 %{entry_name} other: Hay %{count} %{entry_name} - zero: No se han encontrado %{entry_name} views: pagination: + current: Estás en la página first: Primera last: Última next: Siguiente previous: Anterior truncate: "…" - current: Estás en la página diff --git a/config/locales/es/legislation.yml b/config/locales/es/legislation.yml index 0ded24d65..e2a6a63a6 100644 --- a/config/locales/es/legislation.yml +++ b/config/locales/es/legislation.yml @@ -1,4 +1,3 @@ ---- es: legislation: annotations: @@ -20,8 +19,8 @@ es: signup: registrarte index: title: Comentarios - see_in_context: Ver en contexto comments_about: Comentarios sobre + see_in_context: Ver en contexto comments_count: one: "%{count} comentario" other: "%{count} comentarios" @@ -78,7 +77,7 @@ es: phase_not_open: not_open: Esta fase del proceso todavía no está abierta phase_empty: - empty: No hay nada publicado todavía + empty: No hay nada publicado todavía process: see_latest_comments: Ver últimas aportaciones see_latest_comments_title: Aportar a este proceso @@ -123,5 +122,5 @@ es: proposals: form: tags_label: "Categorías" - not_verified: Para votar propuestas %{verify_account}. - closed: "Este proceso se ha cerrado y ya no puede recoger votos." \ No newline at end of file + not_verified: "Para votar propuestas %{verify_account}." + closed: "Este proceso se ha cerrado y ya no puede recoger votos." diff --git a/config/locales/es/mailers.yml b/config/locales/es/mailers.yml index dc51148f8..e92774d2b 100644 --- a/config/locales/es/mailers.yml +++ b/config/locales/es/mailers.yml @@ -1,4 +1,3 @@ ---- es: mailers: no_reply: "Este mensaje se ha enviado desde una dirección de correo electrónico que no admite respuestas." @@ -23,7 +22,7 @@ es: title: Nueva respuesta a tu comentario unfeasible_spending_proposal: hi: "Estimado usuario," - new_html: "Por todo ello, te invitamos a que elabores una nueva propuesta que se ajuste a las condiciones de este proceso. Esto lo puedes hacer en este enlace: %{url}." + new_html: 'Por todo ello, te invitamos a que elabores una nueva propuesta que se ajuste a las condiciones de este proceso. Esto lo puedes hacer en este enlace: %{url}.' new_href: "nueva propuesta de inversión" reconsider_html: "Si consideras que la propuesta rechazada cumple los requisitos para mantenerla como propuesta de inversión, podrás comunicarlo, en el plazo de 48 horas, al correo example@consul.es, indicando necesariamente para su tramitación el código %{code} como asunto del correo, correspondiente a tu propuesta." sincerely: "Atentamente" @@ -31,6 +30,16 @@ es: sorry: "Sentimos las molestias ocasionadas y volvemos a darte las gracias por tu inestimable participación." subject: "Tu propuesta de inversión '%{code}' ha sido marcada como inviable" unfeasible_html: "Desde el Ayuntamiento queremos agradecer tu participación en los Presupuestos Participativos. Lamentamos informarte de que tu propuesta '%{title}' quedará excluida de este proceso participativo por el siguiente motivo:" + budget_investment_unfeasible: + hi: "Estimado usuario," + new_html: 'Por todo ello, te invitamos a que elabores un nuevo proyecto de gasto que se ajuste a las condiciones de este proceso. Esto lo puedes hacer en este enlace: %{url}.' + new_href: "nueva propuesta de inversión" + reconsider_html: "Si consideras que el proyecto rechazado cumple los requisitos para mantenerlo como proyecto de gasto, podrás comunicarlo, en el plazo de 48 horas, al correo example@consul.es, indicando necesariamente para su tramitación el código %{code} como asunto del correo, correspondiente a tu proyecto." + sincerely: "Atentamente" + signatory: "DIRECCIÓN GENERAL DE PARTICIPACIÓN CIUDADANA" + sorry: "Sentimos las molestias ocasionadas y volvemos a darte las gracias por tu inestimable participación." + subject: "Tu propuesta de inversión '%{code}' ha sido marcada como inviable" + unfeasible_html: "Desde el Ayuntamiento queremos agradecer tu participación en los Presupuestos Participativos. Lamentamos informarte de que tu proyecto '%{title}' quedará excluido de este proceso participativo por el siguiente motivo:" proposal_notification_digest: info: "A continuación te mostramos las nuevas notificaciones que han publicado los autores de las propuestas que estás apoyando en %{org_name}." title: "Notificaciones de propuestas en %{org_name}" @@ -63,16 +72,6 @@ es: sincerely: "Atentamente," signatory: "DIRECCIÓN GENERAL DE PARTICIPACIÓN CIUDADANA" share: "Comparte tu proyecto" - budget_investment_unfeasible: - hi: "Estimado usuario," - new_html: "Por todo ello, te invitamos a que elabores un nuevo proyecto de gasto que se ajuste a las condiciones de este proceso. Esto lo puedes hacer en este enlace: %{url}." - new_href: "nueva propuesta de inversión" - reconsider_html: "Si consideras que el proyecto rechazado cumple los requisitos para mantenerlo como proyecto de gasto, podrás comunicarlo, en el plazo de 48 horas, al correo example@consul.es, indicando necesariamente para su tramitación el código %{code} como asunto del correo, correspondiente a tu proyecto." - sincerely: "Atentamente" - signatory: "DIRECCIÓN GENERAL DE PARTICIPACIÓN CIUDADANA" - sorry: "Sentimos las molestias ocasionadas y volvemos a darte las gracias por tu inestimable participación." - subject: "Tu propuesta de inversión '%{code}' ha sido marcada como inviable" - unfeasible_html: "Desde el Ayuntamiento queremos agradecer tu participación en los Presupuestos Participativos. Lamentamos informarte de que tu proyecto '%{title}' quedará excluido de este proceso participativo por el siguiente motivo:" budget_investment_selected: subject: "Tu propuesta de inversión '%{code}' ha sido seleccionada" hi: "Estimado/a usuario/a" diff --git a/config/locales/es/management.yml b/config/locales/es/management.yml index 87358a438..5b889f2aa 100644 --- a/config/locales/es/management.yml +++ b/config/locales/es/management.yml @@ -1,4 +1,3 @@ ---- es: management: account: @@ -29,7 +28,7 @@ es: not_in_census_info: 'Las personas no empadronadas pueden participar en el Portal de Gobierno Abierto con las siguientes posibilidades:' please_check_account_data: Compruebe que los datos anteriores son correctos para proceder a verificar la cuenta completamente. title: Gestión de usuarios - under_age: No tienes edad suficiente para verificar tu cuenta. + under_age: "No tienes edad suficiente para verificar tu cuenta." verify: Verificar usuario email_label: Email date_of_birth: Fecha de nacimiento @@ -63,12 +62,12 @@ es: support_proposals: Apoyar propuestas vote_proposals: Participar en las votaciones finales print: - proposals_info: Haz tu propuesta en http://url.consul + proposals_info: 'Haz tu propuesta en http://url.consul' proposals_note: Las propuestas más apoyadas serán llevadas a votación. Y si las acepta una mayoría, el Ayuntamiento las llevará a cabo. proposals_title: 'Propuestas:' - spending_proposals_info: Participa en http://url.consul + spending_proposals_info: 'Participa en http://url.consul' spending_proposals_note: Los presupuestos participativos se invertirán en las propuestas de inversión más apoyadas. - budget_investments_info: Participa en http://url.consul + budget_investments_info: 'Participa en http://url.consul' budget_investments_note: Los presupuestos participativos se invertirán en las propuestas de inversión más apoyadas. print_info: Imprimir esta información proposals: @@ -99,7 +98,7 @@ es: create: Crear propuesta de inversión filters: unfeasible: Propuestas de inversión no viables - by_geozone: "Propuestas de inversión con ámbito: %{geozone}" + by_geozone: 'Propuestas de inversión con ámbito: %{geozone}' print: print_button: Imprimir search_results: @@ -115,17 +114,17 @@ es: create_user_submit: Crear usuario create_user_success_html: Hemos enviado un correo electrónico a %{email} para verificar que es suya. El correo enviado contiene un link que el usuario deberá pulsar. Entonces podrá seleccionar una clave de acceso, y entrar en la web de participación. autogenerated_password_html: "Se ha asignado la contraseña %{password} a este usuario. Puede modificarla desde el apartado 'Mi cuenta' de la web." - email_optional_label: "Email (recomendado pero opcional)" + email_optional_label: Email (recomendado pero opcional) erased_notice: Cuenta de usuario borrada. - erased_by_manager: "Borrada por el manager: %{manager}" + erased_by_manager: 'Borrada por el manager: %{manager}' erase_account_link: Borrar cuenta - erase_account_confirm: ¿Seguro que quieres borrar a este usuario? Esta acción no se puede deshacer - erase_warning: Esta acción no se puede deshacer. Por favor asegurese de que quiere eliminar esta cuenta. + erase_account_confirm: '¿Seguro que quieres borrar a este usuario? Esta acción no se puede deshacer' + erase_warning: Esta acción no se puede deshacer. Por favor asegúrese de que quiere eliminar esta cuenta. erase_submit: Borrar cuenta user_invites: new: label: Emails - info: "Introduce los emails separados por ','" + info: "Introduce los emails separados por comas (',')" submit: Enviar invitaciones title: Invitaciones para usuarios create: diff --git a/config/locales/es/moderation.yml b/config/locales/es/moderation.yml index b41ba0fbf..43fc98790 100644 --- a/config/locales/es/moderation.yml +++ b/config/locales/es/moderation.yml @@ -1,13 +1,10 @@ ---- es: moderation: - header: - title: Moderación comments: index: block_authors: Bloquear autores - confirm: "¿Estás seguro?" - filter: Filtrar + confirm: '¿Estás seguro?' + filter: Filtro filters: all: Todos pending_flag_review: Pendientes @@ -24,11 +21,11 @@ es: title: Comentarios dashboard: index: - title: Moderación + title: Moderar debates: index: block_authors: Bloquear autores - confirm: "¿Estás seguro?" + confirm: '¿Estás seguro?' filter: Filtrar filters: all: Todos @@ -44,6 +41,8 @@ es: created_at: Más nuevos flags: Más denunciados title: Debates + header: + title: Moderación menu: flagged_comments: Comentarios flagged_debates: Debates @@ -52,7 +51,7 @@ es: proposals: index: block_authors: Bloquear autores - confirm: "¿Estás seguro?" + confirm: '¿Estás seguro?' filter: Filtro filters: all: Todas diff --git a/config/locales/es/officing.yml b/config/locales/es/officing.yml index f9c3213fa..6832311a7 100644 --- a/config/locales/es/officing.yml +++ b/config/locales/es/officing.yml @@ -1,4 +1,3 @@ ---- es: officing: header: @@ -8,14 +7,14 @@ es: title: Presidir mesa de votaciones info: Aquí puedes validar documentos de ciudadanos y guardar los resultados de las urnas menu: - voters: "Validar documento y votar" - total_recounts: "Recuento total y escrutinio" + voters: Validar documento y votar + total_recounts: Recuento total y escrutinio polls: final: - title: "Listado de votaciones finalizadas" - no_polls: "No tienes permiso para recuento final en ninguna votación reciente" - select_poll: "Selecciona votación" - add_results: "Añadir resultados" + title: Listado de votaciones finalizadas + no_polls: No tienes permiso para recuento final en ninguna votación reciente + select_poll: Selecciona votación + add_results: Añadir resultados results: flash: create: "Datos guardados" @@ -35,12 +34,12 @@ es: see_results: "Ver resultados" index: no_results: "No hay resultados" - results: "Resultados" + results: Resultados table_answer: Respuesta table_votes: Votos - table_whites: Papeletas totalmente en blanco - table_nulls: Papeletas nulas - table_total: Papeletas totales + table_whites: "Papeletas totalmente en blanco" + table_nulls: "Papeletas nulas" + table_total: "Papeletas totales" residence: flash: create: "Documento verificado con el Padrón" @@ -49,7 +48,7 @@ es: title: Validar documento document_number: "Número de documento (incluida letra)" submit: Validar documento - error_verifying_census: El Padrón no pudo verificar este documento. + error_verifying_census: "El Padrón no pudo verificar este documento." form_errors: evitaron verificar este documento no_assignments: "Hoy no tienes turno de presidente de mesa" voters: @@ -60,7 +59,7 @@ es: table_actions: Acciones show: can_vote: Puede votar - error_already_voted: "Ya ha participado en esta votación" + error_already_voted: Ya ha participado en esta votación. submit: Confirmar voto success: "¡Voto introducido!" can_vote: diff --git a/config/locales/es/pages.yml b/config/locales/es/pages.yml index d67568b2d..a3e0db7e0 100644 --- a/config/locales/es/pages.yml +++ b/config/locales/es/pages.yml @@ -1,4 +1,3 @@ ---- es: pages: census_terms: Para verificar la cuenta hay que tener 16 años o más y estar empadronado aportando los datos indicados anteriormente, los cuales serán contrastados. Aceptando el proceso de verificación acepta dar su consentimiento para contrastar dicha información, así como medios de contacto que figuren en dichos ficheros. Los datos aportados serán incorporados y tratados en un fichero indicado anteriormente en las condiciones de uso del portal. @@ -53,7 +52,7 @@ es: button: "Ver preguntas frecuentes" page: title: "Preguntas Frecuentes" - description: "Utiliza esta página para resolver las Preguntas frencuentes a los usuarios del sitio." + description: "Utiliza esta página para resolver las Preguntas frecuentes a los usuarios del sitio." faq_1_title: "Pregunta 1" faq_1_description: "Este es un ejemplo para la descripción de la pregunta uno." other: @@ -62,13 +61,13 @@ es: how_to_use: text: |- Utilízalo en tu municipio libremente o ayúdanos a mejorarlo, es software libre. - + Este Portal de Gobierno Abierto usa la [aplicación CONSUL](https://github.com/consul/consul 'github consul') que es software libre, con [licencia AGPLv3](http://www.gnu.org/licenses/agpl-3.0.html 'AGPLv3 gnu' ), esto significa en palabras sencillas, que cualquiera puede libremente usar el código, copiarlo, verlo en detalle, modificarlo, y redistribuirlo al mundo con las modificaciones que quiera (manteniendo el que otros puedan a su vez hacer lo mismo). Porque creemos que la cultura es mejor y más rica cuando se libera. - + Si eres programador, puedes ver el código y ayudarnos a mejorarlo en [aplicación CONSUL](https://github.com/consul/consul 'github consul'). titles: how_to_use: Utilízalo en tu municipio - privacy: Política de Privacidad + privacy: Política de privacidad titles: accessibility: Accesibilidad conditions: Condiciones de uso diff --git a/config/locales/es/rails.yml b/config/locales/es/rails.yml index 31cc02e92..bc43f5429 100644 --- a/config/locales/es/rails.yml +++ b/config/locales/es/rails.yml @@ -1,58 +1,55 @@ ---- es: date: abbr_day_names: - - dom - - lun - - mar - - mié - - jue - - vie - - sáb + - dom + - lun + - mar + - mié + - jue + - vie + - sáb abbr_month_names: - - - - ene - - feb - - mar - - abr - - may - - jun - - jul - - ago - - sep - - oct - - nov - - dic + 1: ene + 2: feb + 3: mar + 4: abr + 5: may + 6: jun + 7: jul + 8: ago + 9: sep + 10: oct + 11: nov + 12: dic day_names: - - domingo - - lunes - - martes - - miércoles - - jueves - - viernes - - sábado + - domingo + - lunes + - martes + - miércoles + - jueves + - viernes + - sábado formats: default: "%d/%m/%Y" long: "%d de %B de %Y" short: "%d de %b" month_names: - - - - enero - - febrero - - marzo - - abril - - mayo - - junio - - julio - - agosto - - septiembre - - octubre - - noviembre - - diciembre + 1: enero + 2: febrero + 3: marzo + 4: abril + 5: mayo + 6: junio + 7: julio + 8: agosto + 9: septiembre + 10: octubre + 11: noviembre + 12: diciembre order: - - :day - - :month - - :year + - :day + - :mes + - :year datetime: distance_in_words: about_x_hours: @@ -86,6 +83,9 @@ es: x_months: one: 1 mes other: "%{count} meses" + x_years: + one: '%{count} año' + other: "%{count} años" x_seconds: one: 1 segundo other: "%{count} segundos" @@ -113,24 +113,27 @@ es: invalid: no es válido less_than: debe ser menor que %{count} less_than_or_equal_to: debe ser menor que o igual a %{count} + model_invalid: 'Error de validación: %{errors}' not_a_number: no es un número not_an_integer: debe ser un entero odd: debe ser impar - record_invalid: 'La validación falló: %{errors}' - restrict_dependent_destroy: - one: No se puede eliminar el registro porque existe un %{record} dependiente - many: No se puede eliminar el registro porque existen %{record} dependientes + required: debe existir taken: ya está en uso - too_long: es demasiado largo (%{count} caracteres máximo) - too_short: es demasiado corto (%{count} caracteres mínimo) - wrong_length: no tiene la longitud correcta (%{count} caracteres exactos) + too_long: + one: es demasiado largo (máximo %{count} caracteres) + other: es demasiado largo (máximo %{count} caracteres) + too_short: + one: es demasiado corto (mínimo %{count} caracteres) + other: es demasiado corto (mínimo %{count} caracteres) + wrong_length: + one: longitud inválida (debería tener %{count} caracteres) + other: longitud inválida (debería tener %{count} caracteres) other_than: debe ser distinto de %{count} - invalid_date: "no es una fecha valida" template: body: 'Se encontraron problemas con los siguientes campos:' header: one: No se pudo guardar este/a %{model} porque se encontró 1 error - other: No se pudo guardar este/a %{model} porque se encontraron %{count} errores + other: "No se pudo guardar este/a %{model} porque se encontraron %{count} errores" helpers: select: prompt: Por favor seleccione @@ -163,10 +166,8 @@ es: quadrillion: mil billones thousand: mil trillion: billón - unit: '' format: - delimiter: '' - precision: 1 + precision: 3 significant: true strip_insignificant_zeros: true storage_units: @@ -174,17 +175,14 @@ es: units: byte: one: Byte - other: Bytes + other: Byte gb: GB kb: KB mb: MB tb: TB percentage: format: - delimiter: '' - precision: - format: - delimiter: '' + format: "%n%" support: array: last_word_connector: " y " @@ -193,8 +191,8 @@ es: time: am: am formats: + datetime: "%d/%m/%Y %H:%M:%S" default: "%A, %d de %B de %Y %H:%M:%S %z" long: "%d de %B de %Y %H:%M" short: "%d de %b %H:%M" - datetime: "%d/%m/%Y %H:%M:%S" - pm: pm \ No newline at end of file + pm: pm diff --git a/config/locales/es/responders.yml b/config/locales/es/responders.yml index 01f19d96e..cf3d11d6f 100644 --- a/config/locales/es/responders.yml +++ b/config/locales/es/responders.yml @@ -1,4 +1,3 @@ ---- es: flash: actions: @@ -11,7 +10,7 @@ es: poll_question_answer: "Respuesta creada correctamente" poll_question_answer_video: "Vídeo creado correctamente" proposal: "Propuesta creada correctamente." - proposal_notification: "Tu message ha sido enviado correctamente." + proposal_notification: "Tu mensaje ha sido enviado correctamente." spending_proposal: "Propuesta de inversión creada correctamente. Puedes acceder a ella desde %{activity}" budget_investment: "Propuesta de inversión creada correctamente." signature_sheet: "Hoja de firmas creada correctamente" @@ -21,9 +20,9 @@ es: update: notice: "%{resource_name} actualizado correctamente." debate: "Debate actualizado correctamente." - proposal: "Propuesta actualizada correctamente." poll: "Votación actualizada correctamente." poll_booth: "Urna actualizada correctamente." + proposal: "Propuesta actualizada correctamente." spending_proposal: "Propuesta de inversión actualizada correctamente." budget_investment: "Propuesta de inversión actualizada correctamente" topic: "Tema actualizado correctamente." diff --git a/config/locales/es/social_share_button.yml b/config/locales/es/social_share_button.yml index 1c49ef4f5..d624f0b0b 100644 --- a/config/locales/es/social_share_button.yml +++ b/config/locales/es/social_share_button.yml @@ -7,7 +7,7 @@ es: douban: "Douban" qq: "Qzone" tqq: "Tqq" - delicious: "Delicious" + delicious: "Delicioso" baidu: "Baidu.com" kaixin001: "Kaixin001.com" renren: "Renren.com" diff --git a/config/locales/es/valuation.yml b/config/locales/es/valuation.yml index b3a5c32ca..7c3109ab0 100644 --- a/config/locales/es/valuation.yml +++ b/config/locales/es/valuation.yml @@ -1,4 +1,3 @@ ---- es: valuation: header: @@ -25,8 +24,8 @@ es: valuation_open: Abiertas valuating: En evaluación valuation_finished: Evaluación finalizada - title: Propuestas de inversión assigned_to: "Asignadas a %{valuator}" + title: Propuestas de inversión edit: Editar informe valuators_assigned: one: Evaluador asignado @@ -62,16 +61,16 @@ es: dossier: Informe price_html: "Coste (%{currency}) (dato público)" price_first_year_html: "Coste en el primer año (%{currency}) (opcional, dato no público)" - price_explanation_html: "Informe de coste (opcional, dato público)" + price_explanation_html: Informe de coste (opcional, dato público) feasibility: Viabilidad feasible: Viable unfeasible: Inviable undefined_feasible: Sin decidir - feasible_explanation_html: "Informe de inviabilidad (en caso de que lo sea, dato público)" + feasible_explanation_html: Informe de inviabilidad (en caso de que lo sea, dato público) valuation_finished: Informe finalizado - duration_html: "Plazo de ejecución (opcional, dato no público)" - internal_comments_html: "Comentarios y observaciones (para responsables internos, dato no público)" - save: Guardar cambios + duration_html: Plazo de ejecución (opcional, dato no público) + internal_comments_html: Comentarios y observaciones (para responsables internos, dato no público) + save: Guardar Cambios notice: valuate: "Dossier actualizado" spending_proposals: @@ -111,15 +110,15 @@ es: price_html: "Coste (%{currency}) (dato público)" price_first_year_html: "Coste en el primer año (%{currency}) (opcional, privado)" currency: "€" - price_explanation_html: "Informe de coste (opcional, dato público)" + price_explanation_html: Informe de coste (opcional, dato público) feasibility: Viabilidad feasible: Viable not_feasible: Inviable undefined_feasible: Sin decidir - feasible_explanation_html: "Informe de inviabilidad (en caso de que lo sea, dato público)" + feasible_explanation_html: Informe de inviabilidad (en caso de que lo sea, dato público) valuation_finished: Informe finalizado - time_scope_html: "Plazo de ejecución (opcional, dato no público)" - internal_comments_html: "Comentarios y observaciones (para responsables internos, dato no público)" + time_scope_html: Plazo de ejecución (opcional, dato no público) + internal_comments_html: Comentarios y observaciones (para responsables internos, dato no público) save: Guardar cambios notice: valuate: "Informe actualizado" diff --git a/config/locales/es/verification.yml b/config/locales/es/verification.yml index c08900cdf..0f3039db0 100644 --- a/config/locales/es/verification.yml +++ b/config/locales/es/verification.yml @@ -1,4 +1,3 @@ ---- es: verification: alert: @@ -33,7 +32,7 @@ es: office: Verificarte presencialmente en cualquier %{office} offices: Oficina de Atención al Ciudadano send_letter: Solicitar una carta por correo postal - title: "¡Felicidades!" + title: '¡Felicidades!' user_permission_info: Con tu cuenta ya puedes... update: flash: @@ -51,7 +50,7 @@ es: accept_terms_text: Acepto %{terms_url} al Padrón accept_terms_text_title: Acepto los términos de acceso al Padrón date_of_birth: Fecha de nacimiento - document_number: Número de documento + document_number: DNI/Pasaporte/Tarjeta de residencia document_number_help_title: Ayuda document_number_help_text_html: 'DNI: 12345678A
    Pasaporte: AAA000001
    Tarjeta de residencia: X1234567P' document_type: @@ -76,14 +75,14 @@ es: edit: confirmation_code: Introduce el código que has recibido en tu móvil resend_sms_link: Solicitar un nuevo código - resend_sms_text: "¿No has recibido un mensaje de texto con tu código de confirmación?" + resend_sms_text: '¿No has recibido un mensaje de texto con tu código de confirmación?' submit_button: Enviar title: SMS de confirmación new: phone: Introduce tu teléfono móvil para recibir el código - phone_format_html: "(Ejemplo: 612345678 ó +34612345678)" + phone_format_html: '(Ejemplo: 612345678 ó +34612345678)' phone_note: Sólo usaremos tu teléfono para enviarte un código, nunca te contactaremos. - phone_placeholder: "Ejemplo: 612345678 ó +34612345678" + phone_placeholder: 'Ejemplo: 612345678 ó +34612345678' submit_button: Enviar title: SMS de confirmación update: @@ -100,7 +99,7 @@ es: user_permission_info: Al verificar tus datos podrás... user_permission_proposal: Crear nuevas propuestas user_permission_support_proposal: Apoyar propuestas - user_permission_votes: Participar en las votaciones finales + user_permission_votes: Participar en las votaciones finales* verified_user: form: submit_button: Enviar código From 8fa2ce9b61928f19ccf0d0143cb674bd3ea181d6 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 02:17:50 +0100 Subject: [PATCH 734/765] Update other language translations files and folders --- config/locales/ar/rails.yml | 13 + config/locales/ast/activemodel.yml | 17 + config/locales/ast/pages.yml | 4 + config/locales/ast/rails.yml | 13 + config/locales/ca/activemodel.yml | 18 + config/locales/ca/activerecord.yml | 51 ++ config/locales/ca/pages.yml | 4 + config/locales/ca/rails.yml | 13 + config/locales/fr/activemodel.yml | 5 - config/locales/fr/pages.yml | 27 +- config/locales/fr/rails.yml | 194 ++------ config/locales/fr/valuation.yml | 25 +- config/locales/gl/rails.yml | 13 + config/locales/he/rails.yml | 13 + config/locales/it/activemodel.yml | 22 + config/locales/it/community.yml | 4 + config/locales/it/documents.yml | 3 + config/locales/it/general.yml | 756 +++++++++++++++++++++++++++++ config/locales/it/images.yml | 3 + config/locales/it/rails.yml | 13 + config/locales/nl/rails.yml | 136 ++---- config/locales/nl/valuation.yml | 127 ----- config/locales/pt-BR/rails.yml | 13 + config/locales/sv-SE/rails.yml | 13 + 24 files changed, 1103 insertions(+), 397 deletions(-) create mode 100644 config/locales/ar/rails.yml create mode 100644 config/locales/ast/activemodel.yml create mode 100644 config/locales/ast/pages.yml create mode 100644 config/locales/ast/rails.yml create mode 100644 config/locales/ca/activemodel.yml create mode 100644 config/locales/ca/activerecord.yml create mode 100644 config/locales/ca/pages.yml create mode 100644 config/locales/ca/rails.yml create mode 100644 config/locales/gl/rails.yml create mode 100644 config/locales/he/rails.yml create mode 100644 config/locales/it/activemodel.yml create mode 100644 config/locales/it/community.yml create mode 100644 config/locales/it/documents.yml create mode 100644 config/locales/it/general.yml create mode 100644 config/locales/it/images.yml create mode 100644 config/locales/it/rails.yml delete mode 100644 config/locales/nl/valuation.yml create mode 100644 config/locales/pt-BR/rails.yml create mode 100644 config/locales/sv-SE/rails.yml diff --git a/config/locales/ar/rails.yml b/config/locales/ar/rails.yml new file mode 100644 index 000000000..6e502dcf0 --- /dev/null +++ b/config/locales/ar/rails.yml @@ -0,0 +1,13 @@ +ar: + number: + currency: + format: + significant: false + strip_insignificant_zeros: false + format: + significant: false + strip_insignificant_zeros: false + human: + format: + significant: true + strip_insignificant_zeros: true diff --git a/config/locales/ast/activemodel.yml b/config/locales/ast/activemodel.yml new file mode 100644 index 000000000..33e39657c --- /dev/null +++ b/config/locales/ast/activemodel.yml @@ -0,0 +1,17 @@ +ast: + activemodel: + models: + verification: + sms: "SMS" + attributes: + verification: + residence: + document_type: "Tipu de documentu" + document_number: "Númberu de documentu (incluyendo lletres)" + date_of_birth: "Fecha de nacencia" + postal_code: "Códigu postal" + sms: + phone: "Teléfonu" + confirmation_code: "Códigu de confirmación" + officing/residence: + year_of_birth: "Añu de nacencia" diff --git a/config/locales/ast/pages.yml b/config/locales/ast/pages.yml new file mode 100644 index 000000000..c1136994d --- /dev/null +++ b/config/locales/ast/pages.yml @@ -0,0 +1,4 @@ +ast: + pages: + verify: + email: Email diff --git a/config/locales/ast/rails.yml b/config/locales/ast/rails.yml new file mode 100644 index 000000000..a53afebd6 --- /dev/null +++ b/config/locales/ast/rails.yml @@ -0,0 +1,13 @@ +ast: + number: + currency: + format: + significant: false + strip_insignificant_zeros: false + format: + significant: false + strip_insignificant_zeros: false + human: + format: + significant: true + strip_insignificant_zeros: true diff --git a/config/locales/ca/activemodel.yml b/config/locales/ca/activemodel.yml new file mode 100644 index 000000000..e2870cff8 --- /dev/null +++ b/config/locales/ca/activemodel.yml @@ -0,0 +1,18 @@ +ca: + activemodel: + models: + verification: + residence: "Residència" + sms: "SMS" + attributes: + verification: + residence: + document_type: "Tipus de document" + document_number: "Número de document (incloent-hi lletres)" + date_of_birth: "Data de naixement" + postal_code: "Codi postal" + sms: + phone: "Telèfon" + confirmation_code: "Codi de confirmació" + officing/residence: + year_of_birth: "Any de naixement" diff --git a/config/locales/ca/activerecord.yml b/config/locales/ca/activerecord.yml new file mode 100644 index 000000000..328182f43 --- /dev/null +++ b/config/locales/ca/activerecord.yml @@ -0,0 +1,51 @@ +ca: + activerecord: + models: + activity: + one: "activitat" + other: "activitats" + budget: + one: "Pressupost participatiu" + other: "Pressupostos participatius" + budget/investment/milestone: + one: "fita" + other: "fites" + comment: + one: "Comentari" + other: "Comentaris" + debate: + one: "Debat" + other: "Debats" + tag: + one: "Eriqueta" + other: "Etiquetes" + user: + one: "Usuari" + other: "Usuaris" + moderator: + one: "Moderador" + other: "Moderadors" + administrator: + one: "Administrador" + other: "Administradors" + vote: + one: "Vot" + other: "Vots" + organization: + one: "Organització" + other: "Organitzacions" + poll/booth: + one: "urna" + other: "urnes" + poll/officer: + one: "president de taula" + other: "presidents de taula" + proposal: + one: "Proposta ciutadana" + other: "Propostes ciutadanes" + spending_proposal: + one: "Proposta d'inversió" + other: "Propostes d'inversió" + attributes: + spending_proposal: + administrator_id: "Administrador" diff --git a/config/locales/ca/pages.yml b/config/locales/ca/pages.yml new file mode 100644 index 000000000..bead272ca --- /dev/null +++ b/config/locales/ca/pages.yml @@ -0,0 +1,4 @@ +ca: + pages: + verify: + email: Correu electrònic diff --git a/config/locales/ca/rails.yml b/config/locales/ca/rails.yml new file mode 100644 index 000000000..f814bd216 --- /dev/null +++ b/config/locales/ca/rails.yml @@ -0,0 +1,13 @@ +ca: + number: + currency: + format: + significant: false + strip_insignificant_zeros: false + format: + significant: false + strip_insignificant_zeros: false + human: + format: + significant: true + strip_insignificant_zeros: true diff --git a/config/locales/fr/activemodel.yml b/config/locales/fr/activemodel.yml index 8cfc22a2e..f22b0077e 100644 --- a/config/locales/fr/activemodel.yml +++ b/config/locales/fr/activemodel.yml @@ -14,10 +14,5 @@ fr: sms: phone: "Téléphone" confirmation_code: "Code de confirmation" - email: - recipient: "Courriel" officing/residence: - document_type: "Type de document" - document_number: "Numéro du document (en incluant les lettres)" year_of_birth: "Année de naissance" - diff --git a/config/locales/fr/pages.yml b/config/locales/fr/pages.yml index dcb57d400..61f86a360 100644 --- a/config/locales/fr/pages.yml +++ b/config/locales/fr/pages.yml @@ -1,4 +1,3 @@ ---- fr: pages: census_terms: Pour confirmer ce compte, vous devez être âgé(e) de 16 ans ou plus, et avoir été recensé avec les données indiquées ci-dessus, lesquelles seront vérifiées. En acceptant le processus de vérification, vous donnez également votre consentement au recoupement de cette information, ainsi que les moyens de communication qui figurent dans ce fichier. Les données fournies seront intégrées et traitées dans le fichier indiqué dans les conditions d'utilisations du portail. @@ -7,7 +6,7 @@ fr: more_info: title: "Découvrez %{org_name}" subtitle: "Découvrez tout ce qu'il est possible de faire avec ce site" - guide: "Ce guide explique chaque section de %{org_name}. Vous pouvez avoir plus d'information dans les liens 'Informations détaillées'." + guide: 'Ce guide explique chaque section de %{org_name}. Vous pouvez avoir plus d''information dans les liens ''Informations détaillées''.' menu: debates: "Débats" proposals: "Propositions" @@ -20,7 +19,7 @@ fr: feature_1_link: "vous inscrire sur %{org_name}" feature_2_html: "Les débats peuvent être notés en utilisant les boutons Je suis d'accord ou Je ne suis pas d'accord que vous trouverez dans chacun d'eux." image_alt: "Boutons pour noter les débats" - figcaption: "Les boutons 'Je suis d'accord' et 'Je ne suis pas d'accord' pour noter les débats." + figcaption: 'Les boutons ''Je suis d''accord'' et ''Je ne suis pas d''accord'' pour noter les débats.' proposals: title: "Propositions" description: "Faites une proposition sur ce que vous souhaitez que la mairie entreprenne et soutenez les propositions d'autres personnes." @@ -53,28 +52,12 @@ fr: button: "Voir les questions fréquemment posées" other: how_to_use: "Utiliser %{org_name} dans votre ville" - world: "Participation citoyenne dans le monde" - facts: "Éléments sur la participation citoyenne et la démocratie directe" how_to_use: text: |- Utilisez le librement pour votre gouvernement ou aider nous à l'améliorer, c'est un logiciel libre. - + Ce portail de Gouvernement Ouvert utilise l'[application Consul](https://github.com/consul/consul 'consul github') qui est un logiciel libre, sous [licence AGPLv3](http://www.gnu.org/licenses/agpl-3.0.html 'AGPLv3 gnu' ), ce qui, en quelques mots, signifie que tout le monde peut utiliser le code librement, le copier, le voir en détail, le modifier et le redistribuer avec ces modifications (permettant à d'autres d'en faire de même). Car nous pensons que la culture est meilleure et plus riche quand elle est libre. - + Si vous êtes un développeur, vous pouvez voir le code et nous aider à l'améliorer en allant sur l'[applicationConsul](https://github.com/consul/consul 'consul github'). - titles: - how_to_use: Utilisez-le pour votre gouvernement - privacy: Politique de confidentialité - titles: - accessibility: Accessibilité - conditions: Conditions d'utilisations - more_info: "Plus d'information à propos %{org_name}" - privacy: Politique de confidentialité verify: - code: Code que vous avez reçu par lettre - email: Courriel - info: "Pour vérifier votre compte saisissez vos données d'accès :" - info_code: 'Saisissez maintenant le code reçu par lettre :' - password: Mot de passe - submit: Confirmer mon compte - title: Confirmer mon compte + email: Email diff --git a/config/locales/fr/rails.yml b/config/locales/fr/rails.yml index 43561ec2d..d4055d82c 100644 --- a/config/locales/fr/rails.yml +++ b/config/locales/fr/rails.yml @@ -1,160 +1,69 @@ -# Files in the config/locales directory are used for internationalization -# and are automatically loaded by Rails. If you want to use locales other -# than English, add the necessary files in this directory. -# -# To use the locales, use `I18n.t`: -# -# I18n.t 'hello' -# -# In views, this is aliased to just `t`: -# -# <%= t('hello') %> -# -# To use a different locale, set it with `I18n.locale`: -# -# I18n.locale = :es -# -# This would use the information in config/locales/es.yml. -# -# To learn more, please read the Rails Internationalization guide -# available at http://guides.rubyonrails.org/i18n.html. - fr: date: abbr_day_names: - - dim - - lun - - mar - - mer - - jeu - - ven - - sam + - dim + - lun + - mar + - mer + - jeu + - ven + - sam abbr_month_names: - - jan - - fév - - mar - - avr - - mai - - jun - - jul - - aoû - - sep - - oct - - nov - - déc + 1: fév + 2: mar + 3: avr + 4: mai + 5: jun + 6: jul + 7: aoû + 8: sep + 9: oct + 10: nov + 11: déc + 12: Déc day_names: - - dimanche - - lundi - - mardi - - mercredi - - jeudi - - vendredi - - samedi + - dimanche + - lundi + - mardi + - mercredi + - jeudi + - vendredi + - samedi formats: default: "%d/%m/%Y" long: "%d %B %Y" short: "%d %b" month_names: - - janvier - - février - - mars - - avril - - mai - - juin - - juillet - - août - - septembre - - octobre - - novembre - - décembre - order: - - :jour - - :mois - - :année + 1: février + 2: mars + 3: avril + 4: mai + 5: juin + 12: Décembre datetime: distance_in_words: - about_x_hours: - one: environ 1 heure - other: environ %{count} heures - about_x_months: - one: environ 1 mois - other: environ %{count} mois - about_x_years: - one: environ 1 an - other: environ %{count} ans - almost_x_years: - one: presque 1 an - other: presque %{count} ans - half_a_minute: demi-minute - less_than_x_minutes: - one: moins d'1 minute - other: moins de %{count} minutes - less_than_x_seconds: - one: moins d'1 seconde - other: moins de %{count} secondes - over_x_years: - one: plus d'1 an - other: plus de %{count} ans - x_days: - one: 1 jour - other: "%{count} jours" x_minutes: one: 1 minute - other: "%{count} minutes" - x_months: - one: 1 mois other: "%{count} mois" - x_seconds: - one: 1 seconde - other: "%{count} secondes" - prompts: - day: Jour - hour: Heure - minute: Minutes - month: Mois - second: Secondes - year: Année + x_years: + one: 1 an + other: "%{count} jours" errors: format: "%{attribute} %{message}" messages: - accepted: doit être accepté - blank: ne peut pas être vide - present: doit être vide - confirmation: ne coïncide pas - empty: ne peut pas être vide - equal_to: doit être égal à %{count} - even: doit être pair - exclusion: est réservé - greater_than: doit être plus grand que %{count} - greater_than_or_equal_to: doit être plus grand que ou égal à %{count} - inclusion: n'est pas inclus dans la liste - invalid: n'est pas valide - less_than: doit être plus petit que %{count} - less_than_or_equal_to: doit être plus petit que ou égal à %{count} - not_a_number: n'est pas un nombre - not_an_integer: doit être un nombre entier - odd: doit être impair - record_invalid: 'La validation a échoué: %{errors}' - restrict_dependent_destroy: - one: Impossible de supprimer l'enregistrement car il existe un %{record} dépendant - many: Impossible de supprimer l'enregistrement car il existe des %{record} dépendants - taken: est déjà utilisé - too_long: est trop long (%{count} caractères maximum) - too_short: est trop court (%{count} caractères minimum) - wrong_length: n'a pas la bonne longueur (%{count} caractères attendus) - other_than: doit être différent de %{count} - invalid_date: "n'est pas une date valide" - template: - body: 'Des problèmes ont été trouvés avec les champs suivants :' - header: - one: Impossible d'enregistrer ce/cette %{model} car 1 erreur a été trouvée - other: Impossible d'enregistrer ce/cette %{model} car %{count} erreurs ont été trouvées + model_invalid: 'La validation omise : %{errors}' + required: doit exister + too_long: + one: est trop long (maximum est de 1 caractère) + other: est trop long (maximum est %{count} caractères) + too_short: + one: est trop long (maximum est de 1 caractère) + other: est trop long (maximum est %{count} caractères) + wrong_length: + one: est la mauvaise longueur (soit 1 caractère) + other: est la longueur incorrecte (devrait être %{count} caractères) helpers: - select: - prompt: Veuillez sélectionner submit: - create: Créer %{model} - submit: Enregistrer %{model} update: Actualiser %{model} number: currency: @@ -181,9 +90,7 @@ fr: quadrillion: quadrillion thousand: mille trillion: trillion - unit: '' format: - delimiter: '' precision: 1 significant: true strip_insignificant_zeros: true @@ -199,10 +106,7 @@ fr: tb: TO percentage: format: - delimiter: '' - precision: - format: - delimiter: '' + format: "%n %" support: array: last_word_connector: " et " @@ -211,8 +115,8 @@ fr: time: am: du matin formats: + datetime: "%d/%m/%Y %H:%M:%S" default: "%A, %d %B %Y %H:%M:%S %z" long: "%d %B %Y %H:%M" short: "%d %b %H:%M" - datetime: "%d/%m/%Y %H:%M:%S" - pm: "de l'après-midi" + pm: de l'après-midi diff --git a/config/locales/fr/valuation.yml b/config/locales/fr/valuation.yml index 1e1941ce2..2894f2393 100644 --- a/config/locales/fr/valuation.yml +++ b/config/locales/fr/valuation.yml @@ -1,4 +1,3 @@ ---- fr: valuation: header: @@ -14,9 +13,9 @@ fr: current: Ouvert finished: Terminé table_name: Nom - table_phase: Phase + table_phase: Phase de table_assigned_investments_valuation_open: Propositions d'investissement assignées avec une évaluation ouverte - table_actions: Actions + table_actions: Statut des votes evaluate: Évaluer budget_investments: index: @@ -35,7 +34,7 @@ fr: table_id: ID table_title: Titre table_heading_name: Nom du titre - table_actions: Actions + table_actions: Statut des votes show: back: Retour title: Propositions d'investissement @@ -62,15 +61,15 @@ fr: dossier: Rapport price_html: "Coût (%{currency})" price_first_year_html: "Coût durant la première année (%{currency}) (optionnel, données non publiques)" - price_explanation_html: "Informations sur le coût (optionnel, données publiques)" + price_explanation_html: Informations sur le coût (optionnel, données publiques) feasibility: Faisabilité feasible: Faisable unfeasible: Infaisable undefined_feasible: Indécis - feasible_explanation_html: "Informations sur la non-viabilité (le cas échéant, données publiques)" + feasible_explanation_html: Informations sur la non-viabilité (le cas échéant, données publiques) valuation_finished: Évaluation terminée - duration_html: "Délai d'exécution (optionnel, données non publiques)" - internal_comments_html: "Commentaires et observations (pour les responsables internes, données non publiques)" + duration_html: Délai d'exécution (optionnel, données non publiques) + internal_comments_html: Commentaires et observations (pour les responsables internes, données non publiques) save: Enregistrer les changements notice: valuate: "Rapport mis-à-jour" @@ -111,17 +110,15 @@ fr: price_html: "Coût (%{currency}) (données publiques)" price_first_year_html: "Coût durant la première année (%{currency}) (optionnel, données non publiques)" currency: "€" - price_explanation_html: "Informations sur le coût (optionnel, données publiques)" + price_explanation_html: Informations sur le coût (optionnel, données publiques) feasibility: Faisabilité feasible: Faisable not_feasible: Infaisable undefined_feasible: Indécis - feasible_explanation_html: "Informations sur la non-viabilité (le cas échéant, données publiques)" + feasible_explanation_html: Informations sur la non-viabilité (le cas échéant, données publiques) valuation_finished: Évaluation terminée - time_scope_html: "Délai d'exécution (optionnel, données non publiques)" - internal_comments_html: "Commentaires et observations (pour les responsables internes, données non publiques)" + time_scope_html: Délai d'exécution (optionnel, données non publiques) + internal_comments_html: Commentaires et observations (pour les responsables internes, données non publiques) save: Enregistrer les changements notice: valuate: "Informations actualisées" - - diff --git a/config/locales/gl/rails.yml b/config/locales/gl/rails.yml new file mode 100644 index 000000000..9dda51249 --- /dev/null +++ b/config/locales/gl/rails.yml @@ -0,0 +1,13 @@ +gl: + number: + currency: + format: + significant: false + strip_insignificant_zeros: false + format: + significant: false + strip_insignificant_zeros: false + human: + format: + significant: true + strip_insignificant_zeros: true diff --git a/config/locales/he/rails.yml b/config/locales/he/rails.yml new file mode 100644 index 000000000..853576daa --- /dev/null +++ b/config/locales/he/rails.yml @@ -0,0 +1,13 @@ +he: + number: + currency: + format: + significant: false + strip_insignificant_zeros: false + format: + significant: false + strip_insignificant_zeros: false + human: + format: + significant: true + strip_insignificant_zeros: true diff --git a/config/locales/it/activemodel.yml b/config/locales/it/activemodel.yml new file mode 100644 index 000000000..9a8b71a8b --- /dev/null +++ b/config/locales/it/activemodel.yml @@ -0,0 +1,22 @@ +it: + activemodel: + models: + verification: + residence: "Residenza" + sms: "SMS" + attributes: + verification: + residence: + document_type: "Tipo Documento di identità" + document_number: "N. Documento" + date_of_birth: "Data di nascita" + postal_code: "CAP" + sms: + phone: "Telefono" + confirmation_code: "Codice di conferma" + email: + recipient: "E-mail" + officing/residence: + document_type: "Tipo Documento di identità" + document_number: "Numero del documento (lettere incluse)" + year_of_birth: "Anno di nascita" diff --git a/config/locales/it/community.yml b/config/locales/it/community.yml new file mode 100644 index 000000000..c976b29ee --- /dev/null +++ b/config/locales/it/community.yml @@ -0,0 +1,4 @@ +it: + community: + sidebar: + title: Comunità diff --git a/config/locales/it/documents.yml b/config/locales/it/documents.yml new file mode 100644 index 000000000..565fb4d90 --- /dev/null +++ b/config/locales/it/documents.yml @@ -0,0 +1,3 @@ +it: + documents: + tab: Documenti diff --git a/config/locales/it/general.yml b/config/locales/it/general.yml new file mode 100644 index 000000000..c0309e872 --- /dev/null +++ b/config/locales/it/general.yml @@ -0,0 +1,756 @@ +it: + account: + show: + email_on_comment_label: "" + email_on_comment_reply_label: "" + erase_account_link: "" + finish_verification: "" + notifications: "" + organization_name_label: "" + organization_responsible_name_placeholder: "" + personal: "" + phone_number_label: "" + public_activity_label: "" + public_interests_label: "" + public_interests_my_title_list: "" + public_interests_user_title_list: "" + public_interests_my_empty_list: "" + public_interests_user_empty_list: "" + save_changes_submit: "" + subscription_to_website_newsletter_label: "" + email_on_direct_message_label: "" + email_digest_label: "" + official_position_badge_label: "" + title: "" + user_permission_debates: "" + user_permission_info: "" + user_permission_proposal: "" + user_permission_support_proposal: "" + user_permission_title: "" + user_permission_verify: "" + user_permission_verify_info: "" + user_permission_votes: "" + username_label: "" + verified_account: "" + verify_my_account: "" + application: + close: "" + menu: "" + comments: + comments_closed: "" + verified_only: "" + verify_account: "" + comment: + admin: "" + author: "" + deleted: "" + moderator: "" + responses: + one: "" + other: "" + user_deleted: "" + votes: + one: "" + other: "" + form: + comment_as_admin: "" + comment_as_moderator: "" + leave_comment: "" + orders: + most_voted: "" + newest: "" + oldest: "" + most_commented: "" + select_order: "" + show: + return_to_commentable: '' + comments_helper: + comment_button: "" + comment_link: "" + comments_title: "" + reply_button: "" + reply_link: "" + debates: + create: + form: + submit_button: "" + debate: + comments: + one: "" + other: "" + votes: + one: "" + other: "" + edit: + editing: "" + form: + submit_button: "" + show_link: "" + form: + debate_text: "" + debate_title: "" + tags_instructions: "" + tags_label: "" + tags_placeholder: "" + index: + featured_debates: "" + filter_topic: + one: "" + other: "" + orders: + confidence_score: "" + created_at: "" + hot_score: "" + most_commented: "" + relevance: "" + search_form: + button: "" + placeholder: "" + title: "" + search_results_html: + one: "" + other: "" + select_order: "" + start_debate: "" + title: "" + section_header: + icon_alt: "" + title: "" + help: "" + section_footer: + title: "" + description: "" + help_text_1: "" + help_text_2: '' + help_text_3: "" + proposals_link: "" + budget_link: "" + new: + form: + submit_button: "" + info: "" + info_link: "" + more_info: "" + recommendation_four: "" + recommendation_one: "" + recommendation_three: "" + recommendation_two: "" + recommendations_title: "" + start_new: "" + show: + author_deleted: "" + comments: + one: "" + other: "" + comments_title: "" + edit_debate_link: "" + flag: "" + login_to_comment: "" + share: "" + update: + form: + submit_button: "" + errors: + messages: + user_not_found: "" + invalid_date_range: "" + form: + accept_terms: "" + accept_terms_title: "" + conditions: "" + debate: "" + direct_message: "" + error: "" + errors: "" + not_saved: '' + policy: "" + proposal: "" + proposal_notification: "" + spending_proposal: "" + budget/investment: "" + poll/shift: "" + user: "" + verification/sms: "" + signature_sheet: "" + document: "" + topic: "" + geozones: + none: "" + all: "" + layouts: + application: + chrome: "" + firefox: "" + ie: "" + ie_title: "" + footer: + accessibility: "" + conditions: "" + consul: "" + consul_url: "" + contact_us: "" + copyright: "" + description: "" + faq: "" + open_data_text: "" + open_data_title: "" + open_source: "" + open_source_url: "" + participation_text: "" + participation_title: "" + privacy: "" + transparency_text: "" + transparency_title: "" + transparency_url: "" + header: + administration_menu: "" + administration: "" + available_locales: "" + collaborative_legislation: "" + debates: "" + external_link_blog: "" + external_link_opendata: "" + external_link_opendata_url: "" + external_link_transparency: "" + external_link_transparency_url: "" + locale: '' + logo: "" + management: "" + moderation: "" + valuation: "" + officing: "" + more_info: "" + my_account_link: "" + my_activity_link: "" + notifications: "" + new_notifications: + one: "" + other: "" + no_notifications: "" + open: "" + open_city_slogan_html: "" + open_city_title: "" + open_gov: "" + proposals: "" + poll_questions: "" + budgets: "" + spending_proposals: "" + admin: + watch_form_message: '' + legacy_legislation: + help: + alt: "" + text: "" + text_sign_in: "" + text_sign_up: "" + title: "" + locale: "" + notifications: + index: + comments_on: + one: "" + other: "" + empty_notifications: "" + mark_all_as_read: "" + proposal_notification: + one: "" + other: "" + replies_to: + one: "" + other: "" + title: "" + map: + title: "" + proposal_for_district: "" + select_district: "" + start_proposal: "" + omniauth: + facebook: + sign_in: "" + sign_up: "" + name: "" + finish_signup: + title: "" + username_warning: "" + google_oauth2: + sign_in: "" + sign_up: "" + name: "" + twitter: + sign_in: "" + sign_up: "" + name: "" + info_sign_in: "" + info_sign_up: "" + or_fill: "" + proposals: + create: + form: + submit_button: "" + edit: + editing: "" + form: + submit_button: "" + show_link: "" + retire_form: + title: "" + warning: "" + retired_reason_label: "" + retired_reason_blank: "" + retired_explanation_label: "" + retired_explanation_placeholder: "" + submit_button: "" + retire_options: + duplicated: "" + started: "" + unfeasible: "" + done: "" + other: "" + form: + geozone: "" + proposal_external_url: "" + proposal_question: "" + proposal_question_example_html: "" + proposal_responsible_name: "" + proposal_responsible_name_note: "" + proposal_summary: "" + proposal_summary_note: "" + proposal_text: "" + proposal_title: "" + proposal_video_url: "" + proposal_video_url_note: "" + tag_category_label: "" + tags_instructions: "" + tags_label: "" + tags_placeholder: "" + index: + featured_proposals: "" + filter_topic: + one: "" + other: "" + orders: + confidence_score: "" + created_at: "" + hot_score: "" + most_commented: "" + relevance: "" + archival_date: "" + retired_proposals: "" + retired_proposals_link: "" + retired_links: + all: "" + duplicated: "" + started: "" + unfeasible: "" + done: "" + other: "" + search_form: + button: "" + placeholder: "" + title: "" + search_results_html: + one: "" + other: "" + select_order: "" + select_order_long: '' + start_proposal: "" + title: "" + top: "" + top_link_proposals: "" + section_header: + icon_alt: "" + title: "" + help: "" + section_footer: + title: "" + description: "" + help_text_1: "" + help_text_2: "" + help_text_3: "" + new: + form: + submit_button: "" + more_info: "" + recommendation_one: "" + recommendation_three: "" + recommendation_two: "" + recommendations_title: "" + start_new: "" + notice: + retired: "" + proposal: + created: "" + share: + guide: "" + edit: "" + view_proposal: "" + improve_info: "" + improve_info_link: "" + already_supported: "" + comments: + one: "" + other: "" + reason_for_supports_necessary: "" + support: "" + support_title: "" + supports: + one: "" + other: "" + supports_necessary: "" + total_percent: "" + archived: "" + successful: "" + voting: "" + show: + author_deleted: "" + code: '' + comments: + one: "" + other: "" + comments_tab: "" + edit_proposal_link: "" + flag: "" + login_to_comment: "" + notifications_tab: "" + retired_warning: "" + retired_warning_link_to_explanation: "" + retired: "" + share: "" + send_notification: "" + no_notifications: "" + embed_video_title: "" + title_external_url: "" + title_video_url: "" + author: "" + update: + form: + submit_button: "" + polls: + all: "" + no_dates: "" + dates: "" + final_date: "" + index: + filters: + current: "" + incoming: "" + expired: "" + title: "" + participate_button: "" + participate_button_incoming: "" + participate_button_expired: "" + no_geozone_restricted: "" + geozone_restricted: "" + geozone_info: "" + can_answer: "" + cant_answer: "" + cant_answer_not_logged_in: "" + cant_answer_verify: "" + already_answer: "" + section_header: + icon_alt: "" + title: "" + help: "" + section_footer: + title: "" + description: "" + help_text_1: "" + help_text_2: "" + show: + dates_title: "" + cant_answer_not_logged_in: "" + signin: "" + signup: "" + cant_answer_verify_html: "" + verify_link: "" + cant_answer_incoming: "" + cant_answer_expired: "" + poll_questions: + create_question: "" + default_valid_answers: "" + show: + answer_this_question: "" + original_proposal: "" + author: "" + dates_title: "" + more_info: "" + not_logged_in: "" + signin: "" + signup: "" + cant_answer_verify_html: "" + verify_link: "" + cant_answer_incoming: "" + cant_answer_expired: "" + cant_answer_wrong_geozone: "" + vote_answer: "" + voted: "" + poll: "" + proposal_notifications: + new: + title: "" + title_label: "" + body_label: "" + submit_button: "" + info_about_receivers_html: "" + proposal_page: "" + show: + back: "" + shared: + edit: '' + save: '' + delete: "" + comments: + title: '' + login_to_comment: '' + "yes": "" + "no": "" + search_results: "" + advanced_search: + author_type: '' + author_type_blank: '' + date: '' + date_placeholder: '' + date_range_blank: '' + date_1: '' + date_2: '' + date_3: '' + date_4: '' + date_5: '' + from: '' + general: '' + general_placeholder: '' + search: '' + title: '' + to: '' + author_info: + author_deleted: "" + back: "" + check: "" + check_all: "" + check_none: "" + collective: "" + flag: "" + follow: "" + follow_entity: "" + followable: + budget_investment: + create: + notice_html: "" + destroy: + notice_html: "" + proposal: + create: + notice_html: "" + destroy: + notice_html: "" + hide: "" + print: + print_button: "" + search: "" + show: "" + suggest: + debate: + found: + one: "" + other: "" + message: "" + see_all: "" + budget_investment: + found: + one: "" + other: "" + message: "" + see_all: "" + proposal: + found: + one: "" + other: "" + message: "" + see_all: "" + tags_cloud: + tags: "" + districts: "" + districts_list: "" + categories: "" + target_blank_html: "" + you_are_in: "" + unflag: "" + unfollow: "" + unfollow_entity: "" + outline: + budget: "" + searcher: "" + go_to_page: "" + social: + blog: "" + facebook: "" + twitter: "" + youtube: "" + whatsapp: "" + telegram: "" + instagram: "" + spending_proposals: + form: + association_name_label: '' + association_name: '' + description: "" + external_url: "" + geozone: "" + submit_buttons: + create: "" + new: "" + title: "" + index: + title: "" + unfeasible: "" + by_geozone: "" + search_form: + button: "" + placeholder: "" + title: "" + search_results: + one: "" + other: "" + sidebar: + geozones: "" + feasibility: "" + unfeasible: "" + start_spending_proposal: "" + new: + more_info: "" + recommendation_one: "" + recommendation_three: "" + recommendation_two: "" + recommendations_title: "" + start_new: "" + show: + author_deleted: "" + code: '' + share: "" + wrong_price_format: "" + spending_proposal: + spending_proposal: "" + already_supported: "" + support: "" + support_title: "" + supports: + one: "" + other: "" + stats: + index: + visits: "" + debates: "" + proposals: "" + comments: "" + proposal_votes: "" + debate_votes: "" + comment_votes: "" + votes: "" + verified_users: "" + unverified_users: "" + unauthorized: + default: "" + manage: + all: "" + users: + direct_messages: + new: + body_label: "" + direct_messages_bloqued: "" + submit_button: "" + title: "" + title_label: "" + verified_only: "" + verify_account: "" + authenticate: "" + signin: "" + signup: "" + show: + receiver: "" + show: + deleted: "" + deleted_debate: "" + deleted_proposal: "" + deleted_budget_investment: "" + filters: + comments: + one: "" + other: "" + debates: + one: "" + other: "" + proposals: + one: "" + other: "" + budget_investments: + one: "" + other: "" + follows: + one: "" + other: "" + no_activity: "" + no_private_messages: "" + private_activity: "" + send_private_message: "" + proposals: + send_notification: "" + retire: "" + retired: "" + see: "" + votes: + agree: "" + anonymous: "" + comment_unauthenticated: "" + disagree: "" + organizations: "" + signin: "" + signup: "" + supports: "" + unauthenticated: "" + verified_only: "" + verify_account: "" + spending_proposals: + not_logged_in: "" + not_verified: "" + organization: "" + unfeasible: "" + not_voting_allowed: "" + budget_investments: + not_logged_in: "" + not_verified: "" + organization: "" + unfeasible: "" + not_voting_allowed: "" + different_heading_assigned: "" + welcome: + debates: + description: "" + title: "" + decide: + description: "" + title: "" + do: + description: "" + title: "" + proposal: + description: "" + title: "" + verification: + i_dont_have_an_account: "" + i_have_an_account: "" + question: "" + title: "" + welcome: + go_to_index: "" + title: "" + user_permission_debates: "" + user_permission_info: "" + user_permission_proposal: "" + user_permission_support_proposal: "" + user_permission_verify: "" + user_permission_verify_info: "" + user_permission_verify_my_account: "" + user_permission_votes: "" + invisible_captcha: + sentence_for_humans: "" + timestamp_error_message: "" diff --git a/config/locales/it/images.yml b/config/locales/it/images.yml new file mode 100644 index 000000000..7698aa371 --- /dev/null +++ b/config/locales/it/images.yml @@ -0,0 +1,3 @@ +it: + images: + remove_image: Rimuovere immagine diff --git a/config/locales/it/rails.yml b/config/locales/it/rails.yml new file mode 100644 index 000000000..6500a297e --- /dev/null +++ b/config/locales/it/rails.yml @@ -0,0 +1,13 @@ +it: + number: + currency: + format: + significant: false + strip_insignificant_zeros: false + format: + significant: false + strip_insignificant_zeros: false + human: + format: + significant: true + strip_insignificant_zeros: true diff --git a/config/locales/nl/rails.yml b/config/locales/nl/rails.yml index d5613a3d7..6430e5f4f 100644 --- a/config/locales/nl/rails.yml +++ b/config/locales/nl/rails.yml @@ -1,81 +1,55 @@ -# Files in the config/locales directory are used for internationalization -# and are automatically loaded by Rails. If you want to use locales other -# than English, add the necessary files in this directory. -# -# To use the locales, use `I18n.t`: -# -# I18n.t 'hello' -# -# In views, this is aliased to just `t`: -# -# <%= t('hello') %> -# -# To use a different locale, set it with `I18n.locale`: -# -# I18n.locale = :es -# -# This would use the information in config/locales/es.yml. -# -# To learn more, please read the Rails Internationalization guide -# available at http://guides.rubyonrails.org/i18n.html. - nl: - time: - formats: - datetime: "%Y-%m-%d %H:%M:%S" date: abbr_day_names: - - zo - - ma - - di - - wo - - do - - vr - - za + - zo + - ma + - di + - wo + - do + - vr + - za abbr_month_names: - - - - jan - - feb - - mrt - - apr - - mei - - jun - - jul - - aug - - sep - - okt - - nov - - dec + 1: jan + 2: feb + 3: mrt + 4: apr + 5: mei + 6: jun + 7: jul + 8: aug + 9: sep + 10: okt + 11: nov + 12: dec day_names: - - zondag - - maandag - - dinsdag - - woensdag - - donderdag - - vrijdag - - zaterdag + - zondag + - maandag + - dinsdag + - woensdag + - donderdag + - vrijdag + - zaterdag formats: default: "%d-%m-%Y" long: "%e %B %Y" short: "%e %b" month_names: - - - - januari - - februari - - maart - - april - - mei - - juni - - juli - - augustus - - september - - oktober - - november - - december + 1: januari + 2: februari + 3: maart + 4: april + 5: mei + 6: juni + 7: juli + 8: augustus + 9: september + 10: oktober + 11: november + 12: december order: - - :day - - :month - - :year + - :day + - ': month' + - :year datetime: distance_in_words: about_x_hours: @@ -109,6 +83,9 @@ nl: x_months: one: 1 maand other: "%{count} maanden" + x_years: + one: '%{count} jaar' + other: "%{count} jaar" x_seconds: one: 1 seconde other: "%{count} seconden" @@ -136,14 +113,10 @@ nl: invalid: is ongeldig less_than: moet minder zijn dan %{count} less_than_or_equal_to: moet minder dan of gelijk zijn aan %{count} - model_invalid: "Validatie mislukt: %{errors}" + model_invalid: 'Validatie mislukt: %{errors}' not_a_number: is geen getal not_an_integer: moet een geheel getal zijn odd: moet oneven zijn - record_invalid: 'Validatie mislukt: %{errors}' - restrict_dependent_destroy: - one: Kan item niet verwijderen omdat %{record} afhankelijk is - many: Kan item niet verwijderen omdat afhankelijke %{record} bestaan required: moet bestaan taken: is al in gebruik too_long: @@ -159,15 +132,15 @@ nl: template: body: 'Er zijn problemen met de volgende velden:' header: - one: "%{model} niet opgeslagen: 1 fout gevonden" + one: '%{model} niet opgeslagen: 1 fout gevonden' other: "%{model} niet opgeslagen: %{count} fouten gevonden" helpers: select: prompt: Maak een keuze submit: - create: "%{model} toevoegen" - submit: "%{model} opslaan" - update: "%{model} bijwerken" + create: '%{model} toevoegen' + submit: '%{model} opslaan' + update: '%{model} bijwerken' number: currency: format: @@ -193,9 +166,7 @@ nl: quadrillion: biljard thousand: duizend trillion: biljoen - unit: '' format: - delimiter: '' precision: 3 significant: true strip_insignificant_zeros: true @@ -211,20 +182,17 @@ nl: tb: TB percentage: format: - delimiter: '' format: "%n%" - precision: - format: - delimiter: '' support: array: last_word_connector: " en " two_words_connector: " en " words_connector: ", " time: - am: "'s ochtends" + am: '''s ochtends' formats: + datetime: "%Y-%m-%d %H:%M:%S" default: "%a %d %b %Y %H:%M:%S %Z" long: "%d %B %Y %H:%M" short: "%d %b %H:%M" - pm: "'s middags" + pm: '''s middags' diff --git a/config/locales/nl/valuation.yml b/config/locales/nl/valuation.yml deleted file mode 100644 index 5ff8a79c8..000000000 --- a/config/locales/nl/valuation.yml +++ /dev/null @@ -1,127 +0,0 @@ ---- -nl: - valuation: - header: - title: Valuation - menu: - title: Valuation - budgets: Participatory budgets - spending_proposals: Spending proposals - budgets: - index: - title: Participatory budgets - filters: - 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 - filters: - valuation_open: Open - valuating: Under valuation - valuation_finished: Valuation finished - assigned_to: "Assigned to %{valuator}" - title: Investment projects - 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 - info: Author info - by: Sent by - sent: Sent at - heading: Heading - dossier: Dossier - edit_dossier: Edit dossier - price: Price - price_first_year: Cost during the first year - currency: "€" - feasibility: Feasibility - feasible: Feasible - unfeasible: Unfeasible - undefined: Undefined - valuation_finished: Valuation finished - duration: Time scope - internal_comments: Internal comments - responsibles: Responsibles - assigned_admin: Assigned admin - assigned_valuators: Assigned valuators - edit: - dossier: Dossier - price_html: "Price (%{currency})" - price_first_year_html: "Cost during the first year (%{currency}) (optional, data not public)" - price_explanation_html: Price explanation - feasibility: Feasibility - feasible: Feasible - unfeasible: Not feasible - undefined_feasible: Pending - feasible_explanation_html: Feasibility explanation - valuation_finished: Valuation finished - duration_html: Time scope - internal_comments_html: Internal comments - save: Save changes - notice: - valuate: "Dossier updated" - spending_proposals: - index: - geozone_filter_all: All zones - filters: - valuation_open: Open - valuating: Under valuation - valuation_finished: Valuation finished - title: Investment projects for participatory budgeting - edit: Edit - show: - back: Back - heading: Investment project - info: Author info - association_name: Asociación - by: Sent by - sent: Sent at - geozone: Scope - dossier: Dossier - edit_dossier: Edit 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 - time_scope: Time scope - internal_comments: Internal comments - responsibles: Responsibles - assigned_admin: Assigned admin - assigned_valuators: Assigned valuators - edit: - dossier: Dossier - price_html: "Price (%{currency})" - price_first_year_html: "Cost during the first year (%{currency})" - currency: "€" - price_explanation_html: Price explanation - feasibility: Feasibility - feasible: Feasible - not_feasible: Not feasible - undefined_feasible: Pending - feasible_explanation_html: Feasibility explanation - valuation_finished: Valuation finished - time_scope_html: Time scope - internal_comments_html: Internal comments - save: Save changes - notice: - valuate: "Dossier updated" - - diff --git a/config/locales/pt-BR/rails.yml b/config/locales/pt-BR/rails.yml new file mode 100644 index 000000000..2a5eab69c --- /dev/null +++ b/config/locales/pt-BR/rails.yml @@ -0,0 +1,13 @@ +pt-BR: + number: + currency: + format: + significant: false + strip_insignificant_zeros: false + format: + significant: false + strip_insignificant_zeros: false + human: + format: + significant: true + strip_insignificant_zeros: true diff --git a/config/locales/sv-SE/rails.yml b/config/locales/sv-SE/rails.yml new file mode 100644 index 000000000..9d92c753c --- /dev/null +++ b/config/locales/sv-SE/rails.yml @@ -0,0 +1,13 @@ +sv: + number: + currency: + format: + significant: false + strip_insignificant_zeros: false + format: + significant: false + strip_insignificant_zeros: false + human: + format: + significant: true + strip_insignificant_zeros: true From ff2ec80c587da951b6049b9ab1680837b7db85fa Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 10:25:32 +0100 Subject: [PATCH 735/765] Add api time format on rails translation file --- config/locales/en/rails.yml | 1 + config/locales/es/rails.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/locales/en/rails.yml b/config/locales/en/rails.yml index 3b093abc4..403552887 100644 --- a/config/locales/en/rails.yml +++ b/config/locales/en/rails.yml @@ -223,4 +223,5 @@ en: default: "%a, %d %b %Y %H:%M:%S %z" long: "%B %d, %Y %H:%M" short: "%d %b %H:%M" + api: "%Y-%m-%d %H" pm: pm \ No newline at end of file diff --git a/config/locales/es/rails.yml b/config/locales/es/rails.yml index bc43f5429..5d6eaff0c 100644 --- a/config/locales/es/rails.yml +++ b/config/locales/es/rails.yml @@ -195,4 +195,5 @@ es: default: "%A, %d de %B de %Y %H:%M:%S %z" long: "%d de %B de %Y %H:%M" short: "%d de %b %H:%M" - pm: pm + api: "%d-%m-%Y %H" + pm: pm \ No newline at end of file From f55935d8bd38ba74eec813fc83bf8bdd65c3eee6 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 13:01:37 +0100 Subject: [PATCH 736/765] Small yml fixes, removing trailing new lines --- config/locales/es/documents.yml | 2 +- config/locales/es/verification.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/es/documents.yml b/config/locales/es/documents.yml index 0e57897e6..bd3866137 100644 --- a/config/locales/es/documents.yml +++ b/config/locales/es/documents.yml @@ -21,4 +21,4 @@ es: errors: messages: in_between: debe estar entre %{min} y %{max} - wrong_content_type: El tipo de contenido %{content_type} del archivo no coincide con ninguno de los tipos de contenido aceptados %{accepted_content_types} + wrong_content_type: El tipo de contenido %{content_type} del archivo no coincide con ninguno de los tipos de contenido aceptados %{accepted_content_types} \ No newline at end of file diff --git a/config/locales/es/verification.yml b/config/locales/es/verification.yml index 0f3039db0..120cad17a 100644 --- a/config/locales/es/verification.yml +++ b/config/locales/es/verification.yml @@ -108,4 +108,4 @@ es: explanation: Actualmente disponemos de los siguientes datos en el Padrón, selecciona donde quieres que enviemos el código de confirmación. phone_title: Teléfonos title: Información disponible - use_another_phone: Utilizar otro teléfono + use_another_phone: Utilizar otro teléfono \ No newline at end of file From fa38e80c1d96bcc2c88434bc1ce9b8fcffa7a6ee Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 13:04:04 +0100 Subject: [PATCH 737/765] Fix crowdin bad translation for rails order --- config/locales/es/rails.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/es/rails.yml b/config/locales/es/rails.yml index 5d6eaff0c..4967085a8 100644 --- a/config/locales/es/rails.yml +++ b/config/locales/es/rails.yml @@ -48,7 +48,7 @@ es: 12: diciembre order: - :day - - :mes + - :month - :year datetime: distance_in_words: From d8991b51ff14d034c5564f1c586d115f219676c5 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 13:06:24 +0100 Subject: [PATCH 738/765] Fix helper function name typo at dev seeds --- db/dev_seeds.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index d94373abb..60493e0a5 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -641,7 +641,7 @@ section "Creating Poll Voters" do token: SecureRandom.hex(32)) end - def randomly_answer_poll_questions(poll, user) + def randomly_answer_questions(poll, user) poll.questions.each do |question| next unless [true, false].sample Poll::Answer.create!(question_id: question.id, author: user, answer: question.question_answers.sample.title) From f84bc38782f36799320a3136f3d1772f79d5ff9a Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 13:24:34 +0100 Subject: [PATCH 739/765] Fix rails month bad change from crowdin adding numbers to months --- config/locales/es/rails.yml | 48 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/config/locales/es/rails.yml b/config/locales/es/rails.yml index 4967085a8..e7fa6dd42 100644 --- a/config/locales/es/rails.yml +++ b/config/locales/es/rails.yml @@ -9,18 +9,18 @@ es: - vie - sáb abbr_month_names: - 1: ene - 2: feb - 3: mar - 4: abr - 5: may - 6: jun - 7: jul - 8: ago - 9: sep - 10: oct - 11: nov - 12: dic + - ene + - feb + - mar + - abr + - may + - jun + - jul + - ago + - sep + - oct + - nov + - dic day_names: - domingo - lunes @@ -34,18 +34,18 @@ es: long: "%d de %B de %Y" short: "%d de %b" month_names: - 1: enero - 2: febrero - 3: marzo - 4: abril - 5: mayo - 6: junio - 7: julio - 8: agosto - 9: septiembre - 10: octubre - 11: noviembre - 12: diciembre + - enero + - febrero + - marzo + - abril + - mayo + - junio + - julio + - agosto + - septiembre + - octubre + - noviembre + - diciembre order: - :day - :month From bd30862a7865ff832cf5f4ee763c8a85815055d2 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 13 Nov 2017 13:26:43 +0100 Subject: [PATCH 740/765] Remove bad indented months on ymls from number to dash --- config/locales/fr/rails.yml | 36 ++++++++++++------------ config/locales/nl/rails.yml | 48 ++++++++++++++++---------------- config/locales/pt-BR/general.yml | 1 - 3 files changed, 42 insertions(+), 43 deletions(-) diff --git a/config/locales/fr/rails.yml b/config/locales/fr/rails.yml index d4055d82c..a9ec187bd 100644 --- a/config/locales/fr/rails.yml +++ b/config/locales/fr/rails.yml @@ -9,18 +9,18 @@ fr: - ven - sam abbr_month_names: - 1: fév - 2: mar - 3: avr - 4: mai - 5: jun - 6: jul - 7: aoû - 8: sep - 9: oct - 10: nov - 11: déc - 12: Déc + - fév + - mar + - avr + - mai + - jun + - jul + - aoû + - sep + - oct + - nov + - déc + - Déc day_names: - dimanche - lundi @@ -34,12 +34,12 @@ fr: long: "%d %B %Y" short: "%d %b" month_names: - 1: février - 2: mars - 3: avril - 4: mai - 5: juin - 12: Décembre + - février + - mars + - avril + - mai + - juin + - Décembre datetime: distance_in_words: x_minutes: diff --git a/config/locales/nl/rails.yml b/config/locales/nl/rails.yml index 6430e5f4f..574380f47 100644 --- a/config/locales/nl/rails.yml +++ b/config/locales/nl/rails.yml @@ -9,18 +9,18 @@ nl: - vr - za abbr_month_names: - 1: jan - 2: feb - 3: mrt - 4: apr - 5: mei - 6: jun - 7: jul - 8: aug - 9: sep - 10: okt - 11: nov - 12: dec + - jan + - feb + - mrt + - apr + - mei + - jun + - jul + - aug + - sep + - okt + - nov + - dec day_names: - zondag - maandag @@ -34,18 +34,18 @@ nl: long: "%e %B %Y" short: "%e %b" month_names: - 1: januari - 2: februari - 3: maart - 4: april - 5: mei - 6: juni - 7: juli - 8: augustus - 9: september - 10: oktober - 11: november - 12: december + - januari + - februari + - maart + - april + - mei + - juni + - juli + - augustus + - september + - oktober + - november + - december order: - :day - ': month' diff --git a/config/locales/pt-BR/general.yml b/config/locales/pt-BR/general.yml index 816c14fa2..bfe4124f7 100644 --- a/config/locales/pt-BR/general.yml +++ b/config/locales/pt-BR/general.yml @@ -362,7 +362,6 @@ pt-BR: - Sex - Sab abbr_month_names: - - - Jan - Fev - Mar From 3e42182551389877eba4cb207299717e2082d67a Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 14 Nov 2017 04:33:05 -0600 Subject: [PATCH 741/765] added Dockerfile and docker-compose.yml --- Dockerfile | 37 +++++++++++++++++++++++++++++++++++++ Gemfile | 3 ++- config/database.yml.example | 8 +++++--- docker-compose.yml | 28 ++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..9d47c6d9b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,37 @@ +# # Select ubuntu as the base image +FROM coreapps/ruby2.3 + +# Install essential Linux packages +RUN apt-get update -qq && apt-get install -y build-essential libpq-dev postgresql-client nodejs + + + +# Define where our application will live inside the image +ENV RAILS_ROOT /var/www/consul + +# Create application home. App server will need the pids dir so just create everything in one shot +RUN mkdir -p $RAILS_ROOT/tmp/pids + +# Set our working directory inside the image +WORKDIR $RAILS_ROOT + +# Use the Gemfiles as Docker cache markers. Always bundle before copying app src. +# (the src likely changed and we don't want to invalidate Docker's cache too early) +# http://ilikestuffblog.com/2014/01/06/how-to-skip-bundle-install-when-deploying-a-rails-app-to-docker/ +COPY Gemfile Gemfile + +COPY Gemfile.lock Gemfile.lock + +# Prevent bundler warnings; ensure that the bundler version executed is >= that which created Gemfile.lock +RUN gem install bundler + +# Finish establishing our Ruby enviornment +RUN bundle install --full-index + +# Copy the Rails application into place +COPY . . + +# Define the script we want run once the container boots +# Use the "exec" form of CMD so our script shuts down gracefully on SIGTERM (i.e. `docker stop`) +#CMD [ "config/containers/app_cmd.sh" ] +CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0"] diff --git a/Gemfile b/Gemfile index 409f763e9..da8c87841 100644 --- a/Gemfile +++ b/Gemfile @@ -92,4 +92,5 @@ group :development do gem 'web-console', '~> 3.3.0' end -eval_gemfile './Gemfile_custom' +#this is crashing with the Dockerfile +#eval_gemfile './Gemfile_custom' diff --git a/config/database.yml.example b/config/database.yml.example index 2f8b7463f..dc1efbd7e 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -1,10 +1,12 @@ default: &default adapter: postgresql encoding: unicode - host: localhost + #host: localhost + host: database #<--the name of the db in the docker-compose pool: 5 - username: - password: + port: 5432 + username: postgres + password: <%= ENV['POSTGRES_PASSWORD'] %> development: &development <<: *default diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000000000..701653da1 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,28 @@ +# service configuration for our database +database: + + # use the preferred version of the official Postgres image + # see https://hub.docker.com/_/postgres/ + image: postgres:9.4.5 + + # persist the database between containers by storing it in a volume + volumes: + - docker-example-postgres:/var/lib/postgresql/data + +# service configuration for our dockerized Rails app +app: + + # use the Dockerfile next to this file + build: . + + # rely on the RAILS_ENV value of the host machine + # environment: + #RAILS_ENV: $RAILS_ENV + + # makes the app container aware of the DB container + links: + - database + + # expose the port we configured Unicorn to bind to + ports: + - "3000:3000" From 2fba146c9baac3cc1d6629bb5470e526d27f1fc6 Mon Sep 17 00:00:00 2001 From: denialtorres Date: Tue, 14 Nov 2017 04:35:23 -0600 Subject: [PATCH 742/765] Update README.md --- README.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/README.md b/README.md index 48f6bfcb8..405ba1960 100644 --- a/README.md +++ b/README.md @@ -76,3 +76,42 @@ Code published under AFFERO GPL v3 (see [LICENSE-AGPLv3.txt](LICENSE-AGPLv3.txt) ## Contributions See [CONTRIBUTING.md](CONTRIBUTING.md) + + +## Working with Docker + +Prerequisites +------------- + +You should have installed Docker and Docker Compose in your machine. + +The First step is to build the container + + sudo docker build -t consul . + Then run + + + sudo docker-compose up -d database + to create your application and database images. + +Once built you can initialize your development DB and populate it with + + sudo docker-compose run app rake db:create + sudo docker-compose run app rake db:migrate + sudo docker-compose run app rake db:seed + +Now we can finally run the application with + + + sudo docker-compose up + +To verify the containers are up execute **sudo docker ps .** You should see output similar to this: + +![enter image description here](https://i.imgur.com/ASvzXrd.png) + +now you can enter to localhost:3000 + +to verify that CONSUL is running + +![enter image description here](https://i.imgur.com/Fl3XOIg.png) + From f32fae3065bb12b9f22e7e30d17a6c00ac9d0dd0 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 14 Nov 2017 05:00:18 -0600 Subject: [PATCH 743/765] separate database.yml configs files for each scenario --- config/database-docker.yml.example | 28 ++++++++++++++++++++++++++++ config/database.yml.example | 8 +++----- 2 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 config/database-docker.yml.example diff --git a/config/database-docker.yml.example b/config/database-docker.yml.example new file mode 100644 index 000000000..dc1efbd7e --- /dev/null +++ b/config/database-docker.yml.example @@ -0,0 +1,28 @@ +default: &default + adapter: postgresql + encoding: unicode + #host: localhost + host: database #<--the name of the db in the docker-compose + pool: 5 + port: 5432 + username: postgres + password: <%= ENV['POSTGRES_PASSWORD'] %> + +development: &development + <<: *default + database: consul_development + +# The staging, preproduction and production dbs are only needed +# for running rake assets:precompile locally before deploying +staging: + <<: *development + +preproduction: + <<: *development + +production: + <<: *development + +test: + <<: *default + database: consul_test diff --git a/config/database.yml.example b/config/database.yml.example index dc1efbd7e..2f8b7463f 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -1,12 +1,10 @@ default: &default adapter: postgresql encoding: unicode - #host: localhost - host: database #<--the name of the db in the docker-compose + host: localhost pool: 5 - port: 5432 - username: postgres - password: <%= ENV['POSTGRES_PASSWORD'] %> + username: + password: development: &development <<: *default From ff09e623ff7462043f3337598f45f58da2129447 Mon Sep 17 00:00:00 2001 From: denialtorres Date: Tue, 14 Nov 2017 05:03:36 -0600 Subject: [PATCH 744/765] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 405ba1960..02f50c9a3 100644 --- a/README.md +++ b/README.md @@ -85,6 +85,12 @@ Prerequisites You should have installed Docker and Docker Compose in your machine. +Also if you are going to work with docker first replace the database.yml with the preconfigured file made it to work it + + + cp config/database-docker.yml.example config/database.yml + + The First step is to build the container sudo docker build -t consul . From 285ab9f9d56ab232a390214f3fc9b29848e63ef5 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Tue, 14 Nov 2017 09:48:52 -0400 Subject: [PATCH 745/765] Update Rails to version 4.2.10 --- Gemfile | 11 ++++---- Gemfile.lock | 80 +++++++++++++++++++++++++++------------------------- 2 files changed, 48 insertions(+), 43 deletions(-) diff --git a/Gemfile b/Gemfile index 409f763e9..b0c7f2e9a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '4.2.9' +gem 'rails', '4.2.10' gem 'acts-as-taggable-on', '~> 4.0.0' gem 'acts_as_votable', '~> 0.10.0' @@ -37,7 +37,6 @@ gem 'paperclip', '~> 5.1.0' gem 'paranoia', '~> 2.3.1' gem 'pg', '~> 0.21.0' gem 'pg_search', '~> 2.0.1' -gem 'rails-assets-markdown-it', '~> 8.2.1', source: 'https://rails-assets.org' gem 'redcarpet', '~> 3.4.0' gem 'responders', '~> 2.4.0' gem 'rinku', '~> 2.0.2', require: 'rails_rinku' @@ -53,15 +52,17 @@ gem 'turnout', '~> 2.4.0' gem 'uglifier', '~> 3.2.0' gem 'unicorn', '~> 5.3.0' gem 'whenever', '~> 0.9.7', require: false + source 'https://rails-assets.org' do gem 'rails-assets-leaflet' + gem 'rails-assets-markdown-it', '~> 8.2.1' end group :development, :test do - gem "bullet", '~> 5.5.1' + gem 'bullet', '~> 5.5.1' gem 'byebug', '~> 9.1.0' gem 'factory_girl_rails', '~> 4.8.0' - gem "faker", '~> 1.7.3' + gem 'faker', '~> 1.7.3' gem 'i18n-tasks', '~> 0.9.15' gem 'knapsack', '~> 1.13.3' gem 'launchy', '~> 2.4.3' @@ -83,7 +84,7 @@ end group :development do gem 'capistrano', '~> 3.8.1', require: false gem 'capistrano-bundler', '~> 1.2', require: false - gem "capistrano-rails", '~> 1.2.3', require: false + gem 'capistrano-rails', '~> 1.2.3', require: false gem 'capistrano3-delayed-job', '~> 1.7.3' gem 'mdl', '~> 0.4.0', require: false gem 'rubocop', '~> 0.49.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index b3bdaed90..8bfbbb27c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,36 +2,36 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actionmailer (4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) + actionmailer (4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.9) - actionview (= 4.2.9) - activesupport (= 4.2.9) + actionpack (4.2.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.9) - activesupport (= 4.2.9) + actionview (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.9) - activesupport (= 4.2.9) + activejob (4.2.10) + activesupport (= 4.2.10) globalid (>= 0.3.0) - activemodel (4.2.9) - activesupport (= 4.2.9) + activemodel (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) - activerecord (4.2.9) - activemodel (= 4.2.9) - activesupport (= 4.2.9) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) arel (~> 6.0) - activesupport (4.2.9) + activesupport (4.2.10) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -117,6 +117,7 @@ GEM term-ansicolor (~> 1.3) thor (~> 0.19.4) tins (~> 1.6) + crass (1.0.3) daemons (1.2.4) dalli (2.7.6) database_cleaner (1.6.1) @@ -172,7 +173,7 @@ GEM railties (>= 4.1) tzinfo (~> 1.2, >= 1.2.2) geocoder (1.4.4) - globalid (0.4.0) + globalid (0.4.1) activesupport (>= 4.2.0) graphiql-rails (1.4.2) rails @@ -187,7 +188,8 @@ GEM httpi (2.4.2) rack socksify - i18n (0.8.6) + i18n (0.9.1) + concurrent-ruby (~> 1.0) i18n-tasks (0.9.18) activesupport (>= 4.0.2) ast (>= 2.1.0) @@ -239,10 +241,11 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - loofah (2.0.3) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) + mail (2.7.0) + mini_mime (>= 0.1.1) mdl (0.4.0) kramdown (~> 1.12, >= 1.12.0) mixlib-cli (~> 1.7, >= 1.7.0) @@ -251,6 +254,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.2) + mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.10.3) mixlib-cli (1.7.0) @@ -323,16 +327,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.9) - actionmailer (= 4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) - activemodel (= 4.2.9) - activerecord (= 4.2.9) - activesupport (= 4.2.9) + rails (4.2.10) + actionmailer (= 4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + activemodel (= 4.2.10) + activerecord (= 4.2.10) + activesupport (= 4.2.10) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.9) + railties (= 4.2.10) sprockets-rails rails-assets-leaflet (1.1.0) rails-assets-markdown-it (8.2.2) @@ -344,15 +348,15 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.9) - actionpack (= 4.2.9) - activesupport (= 4.2.9) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake raindrops (0.18.0) - rake (12.0.0) + rake (12.2.1) redcarpet (3.4.0) referer-parser (0.3.0) request_store (1.3.2) @@ -456,7 +460,7 @@ GEM rack (>= 1.3, < 3) rack-accept (~> 0.4) tilt (>= 1.4, < 3) - tzinfo (1.2.3) + tzinfo (1.2.4) thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) @@ -542,7 +546,7 @@ DEPENDENCIES pg_search (~> 2.0.1) poltergeist (~> 1.15.0) quiet_assets (~> 1.1.0) - rails (= 4.2.9) + rails (= 4.2.10) rails-assets-leaflet! rails-assets-markdown-it (~> 8.2.1)! redcarpet (~> 3.4.0) @@ -569,4 +573,4 @@ DEPENDENCIES whenever (~> 0.9.7) BUNDLED WITH - 1.15.3 + 1.15.4 From a715df3431c29d0c647940c114128580e1d719ee Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 15 Nov 2017 08:10:14 -0600 Subject: [PATCH 746/765] fix the warning of secret_key for devise --- Dockerfile | 3 +++ Gemfile | 2 +- config/initializers/devise.rb | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d47c6d9b..adfc146f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update -qq && apt-get install -y build-essential libpq-dev postgresq + # Define where our application will live inside the image ENV RAILS_ROOT /var/www/consul @@ -22,6 +23,8 @@ COPY Gemfile Gemfile COPY Gemfile.lock Gemfile.lock +COPY Gemfile_custom Gemfile_custom + # Prevent bundler warnings; ensure that the bundler version executed is >= that which created Gemfile.lock RUN gem install bundler diff --git a/Gemfile b/Gemfile index da8c87841..ed3337438 100644 --- a/Gemfile +++ b/Gemfile @@ -93,4 +93,4 @@ group :development do end #this is crashing with the Dockerfile -#eval_gemfile './Gemfile_custom' +eval_gemfile './Gemfile_custom' diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index a0b6ac249..6acce5068 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -6,7 +6,7 @@ Devise.setup do |config| # confirmation, reset password and unlock tokens in the database. # Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key` # by default. You can change it below and use your own secret key. - # config.secret_key = Rails.application.secrets.secret_key_base + config.secret_key = Rails.application.secrets.secret_key_base # ==> Mailer Configuration # Configure the e-mail address which will be shown in Devise::Mailer, From 2041c9b8bb749a93de05bddd9bb5885ed91e20e9 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 15 Nov 2017 08:53:37 -0600 Subject: [PATCH 747/765] modify docker compose to working with the code in realtime --- docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 701653da1..d5399089e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,3 +26,6 @@ app: # expose the port we configured Unicorn to bind to ports: - "3000:3000" + # map our application source code, in full, to the application root of our container + volumes: + - .:/var/www/consul From c58ea7e8a4c5e40391a6e4b5d2dd90e39843bdd9 Mon Sep 17 00:00:00 2001 From: denialtorres Date: Wed, 15 Nov 2017 09:00:59 -0600 Subject: [PATCH 748/765] add new commands --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 02f50c9a3..70cd5ed06 100644 --- a/README.md +++ b/README.md @@ -105,6 +105,13 @@ Once built you can initialize your development DB and populate it with sudo docker-compose run app rake db:create sudo docker-compose run app rake db:migrate sudo docker-compose run app rake db:seed + sudo docker-compose run app rake db:dev_seed + +If you want to run the rails console just run in another terminal: + + + `sudo docker-compose run app rails console` + Now we can finally run the application with From 924dae61b63e81fa4b8dc0126c142f2ded26dd4d Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 15 Nov 2017 17:43:16 +0100 Subject: [PATCH 749/765] Add UTC time zone to default datetime values on schema --- .../20171115164152_add_time_zone_to_default_datetimes.rb | 6 ++++++ db/schema.rb | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20171115164152_add_time_zone_to_default_datetimes.rb diff --git a/db/migrate/20171115164152_add_time_zone_to_default_datetimes.rb b/db/migrate/20171115164152_add_time_zone_to_default_datetimes.rb new file mode 100644 index 000000000..13bc51264 --- /dev/null +++ b/db/migrate/20171115164152_add_time_zone_to_default_datetimes.rb @@ -0,0 +1,6 @@ +class AddTimeZoneToDefaultDatetimes < ActiveRecord::Migration + def change + change_column_default :users, :password_changed_at, DateTime.new(2015, 1, 1, 1, 1, 1, '+00:00') + change_column_default :locks, :locked_until, DateTime.new(2000, 1, 1, 1, 1, 1, '+00:00') + end +end diff --git a/db/schema.rb b/db/schema.rb index 05faf6f36..f2dd62428 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: 20171025142440) do +ActiveRecord::Schema.define(version: 20171115164152) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -572,7 +572,7 @@ ActiveRecord::Schema.define(version: 20171025142440) do create_table "locks", force: :cascade do |t| t.integer "user_id" t.integer "tries", default: 0 - t.datetime "locked_until", default: '2000-01-01 00:01:01', null: false + t.datetime "locked_until", default: '2000-01-01 01:01:01', null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false end @@ -1042,7 +1042,7 @@ ActiveRecord::Schema.define(version: 20171025142440) do t.boolean "email_digest", default: true t.boolean "email_on_direct_message", default: true t.boolean "official_position_badge", default: false - t.datetime "password_changed_at", default: '2015-01-01 00:01:01', null: false + t.datetime "password_changed_at", default: '2015-01-01 01:01:01', null: false t.boolean "created_from_signature", default: false t.integer "failed_email_digests_count", default: 0 t.text "former_users_data_log", default: "" From 95571d63db76a882949057d711e454d19bba4b15 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 15 Nov 2017 17:53:05 +0100 Subject: [PATCH 750/765] Fixes on docker usage instructions --- Dockerfile | 3 --- Gemfile | 1 - README.md | 63 ++++++++++++++++++++++++++++++++---------------------- 3 files changed, 37 insertions(+), 30 deletions(-) diff --git a/Dockerfile b/Dockerfile index adfc146f4..af49d3a30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,6 @@ FROM coreapps/ruby2.3 # Install essential Linux packages RUN apt-get update -qq && apt-get install -y build-essential libpq-dev postgresql-client nodejs - - - # Define where our application will live inside the image ENV RAILS_ROOT /var/www/consul diff --git a/Gemfile b/Gemfile index 811cfae4f..b0c7f2e9a 100644 --- a/Gemfile +++ b/Gemfile @@ -93,5 +93,4 @@ group :development do gem 'web-console', '~> 3.3.0' end -#this is crashing with the Dockerfile eval_gemfile './Gemfile_custom' diff --git a/README.md b/README.md index 70cd5ed06..9e1a79ca6 100644 --- a/README.md +++ b/README.md @@ -80,51 +80,62 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) ## Working with Docker -Prerequisites -------------- +### Prerequisites You should have installed Docker and Docker Compose in your machine. -Also if you are going to work with docker first replace the database.yml with the preconfigured file made it to work it +On macos just: +```bash +brew install docker +brew install docker-compose +``` - cp config/database-docker.yml.example config/database.yml +### Installation +Then lets create our secrets and database config files based on examples: -The First step is to build the container +```bash +cp config/secrets.yml.example config/secrets.yml +cp config/database-docker.yml.example config/database.yml +``` - sudo docker build -t consul . - Then run - +Then you'll have to build the container with: +```bash +sudo docker build -t consul . +``` - sudo docker-compose up -d database - to create your application and database images. +Create your app database images: -Once built you can initialize your development DB and populate it with +```bash +sudo docker-compose up -d database +``` - sudo docker-compose run app rake db:create - sudo docker-compose run app rake db:migrate - sudo docker-compose run app rake db:seed - sudo docker-compose run app rake db:dev_seed +Once built you can initialize your development DB and populate it with: +``` +sudo docker-compose run app rake db:create +sudo docker-compose run app rake db:migrate +sudo docker-compose run app rake db:seed +sudo docker-compose run app rake db:dev_seed +``` -If you want to run the rails console just run in another terminal: +### Running local CONSUL with Docker +Now we can finally run the application with: +```bash +sudo docker-compose up +``` - `sudo docker-compose run app rails console` - +And you'll be able to acces it at your browser visiting [http://localhost:3000](http://localhost:3000) -Now we can finally run the application with +Additionally, if you want to run the rails console just run in another terminal: - - sudo docker-compose up +```bash +sudo docker-compose run app rails console +``` To verify the containers are up execute **sudo docker ps .** You should see output similar to this: ![enter image description here](https://i.imgur.com/ASvzXrd.png) -now you can enter to localhost:3000 - -to verify that CONSUL is running - -![enter image description here](https://i.imgur.com/Fl3XOIg.png) From 454e5e07a1386a91b7ebc60861c65cd9f7270415 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 15 Nov 2017 18:50:46 +0100 Subject: [PATCH 751/765] Update macos and linux docker & docker compose installation --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index 9e1a79ca6..f0a7c890b 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,22 @@ On macos just: ```bash brew install docker brew install docker-compose +brew cask install docker +``` + +On linux: +```bash +# Install Docker +sudo apt-get update +sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D +sudo apt-add-repository 'deb https://apt.dockerproject.org/repo ubuntu-xenial main' +sudo apt-get update +apt-cache policy docker-engine +sudo apt-get install -y docker-engine + +# Install Docker Compose +sudo curl -o /usr/local/bin/docker-compose -L "https://github.com/docker/compose/releases/download/1.15.0/docker-compose-$(uname -s)-$(uname -m)" +sudo chmod +x /usr/local/bin/docker-compose ``` ### Installation From b8877fd1ec0120b3b8f6f7e8c01d8d4184a09afd Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 15 Nov 2017 18:55:46 +0100 Subject: [PATCH 752/765] Update docker installation guides --- README.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f0a7c890b..e63c07b26 100644 --- a/README.md +++ b/README.md @@ -84,25 +84,31 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) You should have installed Docker and Docker Compose in your machine. -On macos just: +#### Macos ```bash brew install docker brew install docker-compose brew cask install docker +open -a docker ``` -On linux: +You'll be asked to give Docker app permissions and type your password, then you're set. + +#### Linux + +1. Install Docker: ```bash -# Install Docker sudo apt-get update sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D sudo apt-add-repository 'deb https://apt.dockerproject.org/repo ubuntu-xenial main' sudo apt-get update apt-cache policy docker-engine sudo apt-get install -y docker-engine +``` -# Install Docker Compose +2. Install Docker Compose +```bash sudo curl -o /usr/local/bin/docker-compose -L "https://github.com/docker/compose/releases/download/1.15.0/docker-compose-$(uname -s)-$(uname -m)" sudo chmod +x /usr/local/bin/docker-compose ``` From 0a2dae867203c424d3b0296fca0f04d6ac8bbb87 Mon Sep 17 00:00:00 2001 From: Manuel Ortega Date: Wed, 15 Nov 2017 19:23:03 +0100 Subject: [PATCH 753/765] Fixed link back from moderation dashboard to root_path Passing the organization name to the locale yml file --- app/views/moderation/dashboard/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/moderation/dashboard/index.html.erb b/app/views/moderation/dashboard/index.html.erb index acdfa954a..d621f7555 100644 --- a/app/views/moderation/dashboard/index.html.erb +++ b/app/views/moderation/dashboard/index.html.erb @@ -1,4 +1,4 @@ -<%= link_to t("admin.dashboard.index.back") + " " + setting['org_name'], root_path, class: "button float-right" %> +<%= link_to t("admin.dashboard.index.back", org: setting['org_name']), root_path, class: "button float-right" %>

    <%= t("moderation.dashboard.index.title") %>

    From 1c2240b2cca80b7599989b1cba5f8a1c5ed766e3 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 15 Nov 2017 23:17:40 +0100 Subject: [PATCH 754/765] Increase moderation dashboard scenario to check back link text --- spec/features/moderation_spec.rb | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/spec/features/moderation_spec.rb b/spec/features/moderation_spec.rb index ad4042425..a39dc6477 100644 --- a/spec/features/moderation_spec.rb +++ b/spec/features/moderation_spec.rb @@ -93,17 +93,27 @@ feature 'Moderation' do expect(page).to_not have_link('Valuation') end - scenario 'Moderation dashboard' do - create(:moderator, user: user) - login_as(user) - visit root_path + context 'Moderation dashboard' do + background do + Setting['org_name'] = 'OrgName' + end - click_link 'Moderation' + after do + Setting['org_name'] = 'CONSUL' + end - expect(current_path).to eq(moderation_root_path) - expect(page).to have_css('#moderation_menu') - expect(page).to_not have_css('#admin_menu') - expect(page).to_not have_css('#valuation_menu') + scenario 'Contains correct elements' do + create(:moderator, user: user) + login_as(user) + visit root_path + + click_link 'Moderation' + + expect(page).to have_link('Go back to OrgName') + expect(current_path).to eq(moderation_root_path) + expect(page).to have_css('#moderation_menu') + expect(page).to_not have_css('#admin_menu') + expect(page).to_not have_css('#valuation_menu') + end end - end From 1e11d6ecf1cae02376c70baf1987b310e5a07b4f Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 16 Nov 2017 07:58:24 +0100 Subject: [PATCH 755/765] Reference to documentation for docker local development --- README.md | 84 ++----------------------------------------------------- 1 file changed, 2 insertions(+), 82 deletions(-) diff --git a/README.md b/README.md index e63c07b26..3e160b438 100644 --- a/README.md +++ b/README.md @@ -78,86 +78,6 @@ Code published under AFFERO GPL v3 (see [LICENSE-AGPLv3.txt](LICENSE-AGPLv3.txt) See [CONTRIBUTING.md](CONTRIBUTING.md) -## Working with Docker - -### Prerequisites - -You should have installed Docker and Docker Compose in your machine. - -#### Macos - -```bash -brew install docker -brew install docker-compose -brew cask install docker -open -a docker -``` - -You'll be asked to give Docker app permissions and type your password, then you're set. - -#### Linux - -1. Install Docker: -```bash -sudo apt-get update -sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D -sudo apt-add-repository 'deb https://apt.dockerproject.org/repo ubuntu-xenial main' -sudo apt-get update -apt-cache policy docker-engine -sudo apt-get install -y docker-engine -``` - -2. Install Docker Compose -```bash -sudo curl -o /usr/local/bin/docker-compose -L "https://github.com/docker/compose/releases/download/1.15.0/docker-compose-$(uname -s)-$(uname -m)" -sudo chmod +x /usr/local/bin/docker-compose -``` - -### Installation - -Then lets create our secrets and database config files based on examples: - -```bash -cp config/secrets.yml.example config/secrets.yml -cp config/database-docker.yml.example config/database.yml -``` - -Then you'll have to build the container with: -```bash -sudo docker build -t consul . -``` - -Create your app database images: - -```bash -sudo docker-compose up -d database -``` - -Once built you can initialize your development DB and populate it with: -``` -sudo docker-compose run app rake db:create -sudo docker-compose run app rake db:migrate -sudo docker-compose run app rake db:seed -sudo docker-compose run app rake db:dev_seed -``` - -### Running local CONSUL with Docker - -Now we can finally run the application with: -```bash -sudo docker-compose up -``` - -And you'll be able to acces it at your browser visiting [http://localhost:3000](http://localhost:3000) - -Additionally, if you want to run the rails console just run in another terminal: - -```bash -sudo docker-compose run app rails console -``` - -To verify the containers are up execute **sudo docker ps .** You should see output similar to this: - -![enter image description here](https://i.imgur.com/ASvzXrd.png) - +## Local development with Docker +Please check the documentation at https://consul_docs.gitbooks.io/docs/content From bb1e5e4608f904013482a8ffc4d19969889ed564 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Fri, 17 Nov 2017 00:21:16 +0100 Subject: [PATCH 756/765] Fixed output --- app/helpers/legislation_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/legislation_helper.rb b/app/helpers/legislation_helper.rb index 3a993d683..a93c2fa47 100644 --- a/app/helpers/legislation_helper.rb +++ b/app/helpers/legislation_helper.rb @@ -1,6 +1,6 @@ module LegislationHelper def format_date(date) - l(date, format: "%d %b %Y") if date + l(date, format: "%d %h %Y") if date end def format_date_for_calendar_form(date) From 4e086de4935bc9e23ab18d3f1ce48042dd979c8e Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Thu, 26 Oct 2017 16:03:39 -0400 Subject: [PATCH 757/765] Add 'Delete' button to Valuators index/search views --- app/views/admin/valuators/index.html.erb | 17 ++++++++++------- app/views/admin/valuators/search.html.erb | 7 ++++++- config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 1 + 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app/views/admin/valuators/index.html.erb b/app/views/admin/valuators/index.html.erb index 622d01307..dfb93ed80 100644 --- a/app/views/admin/valuators/index.html.erb +++ b/app/views/admin/valuators/index.html.erb @@ -1,6 +1,6 @@

    <%= t("admin.valuators.index.title") %>

    -<%= render 'admin/shared/user_search', url: search_admin_valuators_path %> +<%= render "admin/shared/user_search", url: search_admin_valuators_path %>
    <% if @valuators.any? %> @@ -11,16 +11,13 @@ <%= t("admin.valuators.index.name") %> <%= t("admin.valuators.index.email") %> <%= t("admin.valuators.index.description") %> + <%= t("admin.actions.actions") %> <% @valuators.each do |valuator| %> - - <%= valuator.name %> - - - <%= valuator.email %> - + <%= valuator.name %> + <%= valuator.email %> <% if valuator.description.present? %> <%= valuator.description %> @@ -28,6 +25,12 @@ <%= t("admin.valuators.index.no_description") %> <% end %> + + <%= link_to t("admin.valuators.valuator.delete"), + admin_valuator_path(valuator), + method: :delete, + class: "button hollow alert expanded" %> + <% end %> diff --git a/app/views/admin/valuators/search.html.erb b/app/views/admin/valuators/search.html.erb index 2710cb44d..b383e554d 100644 --- a/app/views/admin/valuators/search.html.erb +++ b/app/views/admin/valuators/search.html.erb @@ -29,7 +29,12 @@ <%= t("admin.valuators.index.no_description") %> <% end %> - <% unless user.valuator? %> + <% if user.valuator? %> + <%= link_to t("admin.valuators.valuator.delete"), + admin_valuator_path(user), + method: :delete, + class: "button hollow alert expanded" %> + <% else %> <%= form_for Valuator.new(user: user), url: admin_valuators_path do |f| %> <%= f.text_field :description, label: false, diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 823d7084b..911428b01 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -481,6 +481,7 @@ en: valuator: description_placeholder: 'Description (optional)' add: Add to valuators + delete: Delete search: title: 'Valuators: User search' summary: diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 8d0b6cbf8..8b97a4ec0 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -481,6 +481,7 @@ es: valuator: description_placeholder: 'Descripción (opcional)' add: Añadir como evaluador + delete: Borrar search: title: 'Evaluadores: Búsqueda de usuarios' summary: From db86cc52166c41dfc681623369a26bc067bc0ef1 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Thu, 26 Oct 2017 16:12:03 -0400 Subject: [PATCH 758/765] Enable 'destroy' action for Valuator on controller --- app/controllers/admin/valuators_controller.rb | 5 +++++ app/models/abilities/administrator.rb | 2 +- config/routes.rb | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/valuators_controller.rb b/app/controllers/admin/valuators_controller.rb index d567a38b2..8b454a1a2 100644 --- a/app/controllers/admin/valuators_controller.rb +++ b/app/controllers/admin/valuators_controller.rb @@ -19,6 +19,11 @@ class Admin::ValuatorsController < Admin::BaseController redirect_to admin_valuators_path end + def destroy + @valuator.destroy + redirect_to admin_valuators_path + end + def summary @valuators = Valuator.order(spending_proposals_count: :desc) end diff --git a/app/models/abilities/administrator.rb b/app/models/abilities/administrator.rb index 951f06249..3f136f913 100644 --- a/app/models/abilities/administrator.rb +++ b/app/models/abilities/administrator.rb @@ -43,7 +43,7 @@ module Abilities can [:search, :create, :index, :destroy], ::Administrator can [:search, :create, :index, :destroy], ::Moderator - can [:search, :create, :index, :summary], ::Valuator + can [:search, :create, :index, :destroy, :summary], ::Valuator can [:search, :create, :index, :destroy], ::Manager can [:search, :index], ::User diff --git a/config/routes.rb b/config/routes.rb index 491127439..9ce97f45b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -272,7 +272,7 @@ Rails.application.routes.draw do get :search, on: :collection end - resources :valuators, only: [:index, :create] do + resources :valuators, only: [:index, :create, :destroy] do get :search, on: :collection get :summary, on: :collection end From 6e28e9a5bed89db4fe9bc2fe30e49f5b60d68d0f Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Thu, 26 Oct 2017 16:24:17 -0400 Subject: [PATCH 759/765] Add test for 'Delete Valuator' scenario --- spec/features/admin/valuators_spec.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spec/features/admin/valuators_spec.rb b/spec/features/admin/valuators_spec.rb index bb631cbc3..f1dfa68b3 100644 --- a/spec/features/admin/valuators_spec.rb +++ b/spec/features/admin/valuators_spec.rb @@ -29,6 +29,14 @@ feature 'Admin valuators' do end end + scenario 'Delete Valuator' do + click_link 'Delete' + + within('#valuators') do + expect(page).to_not have_content(@valuator.name) + end + end + context 'Search' do background do From 554188f8d02b4651e750fe87d1d114ca0e5d7028 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Sat, 18 Nov 2017 10:43:54 +0100 Subject: [PATCH 760/765] Expect pagination url links to contain full path including domain --- spec/features/proposals_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 81f7fb998..28049644b 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -38,7 +38,7 @@ feature 'Proposals' do within("ul.pagination") do expect(page).to have_content("1") - expect(page).to have_content("2") + expect(page).to have_link('2', href: 'http://www.example.com/proposals?page=2') expect(page).to_not have_content("3") click_link "Next", exact: false end From f4af87f8a1c7d0b3e15b9bede58288b583ebd408 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Sat, 18 Nov 2017 10:44:30 +0100 Subject: [PATCH 761/765] Add kaminari url path helper function --- app/helpers/application_helper.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 369cabe84..4aecb615c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -60,4 +60,8 @@ module ApplicationHelper def format_price(number) number_to_currency(number, precision: 0, locale: I18n.default_locale) end + + def kaminari_path(url) + "#{root_url}#{url.delete('/')}" + end end From b2e59272ccb5da7e2da036d0b13a8073180265ab Mon Sep 17 00:00:00 2001 From: Bertocq Date: Sat, 18 Nov 2017 10:44:52 +0100 Subject: [PATCH 762/765] Use kaminari url path helper on kaminari partials --- app/views/kaminari/_first_page.html.erb | 2 +- app/views/kaminari/_last_page.html.erb | 2 +- app/views/kaminari/_next_page.html.erb | 2 +- app/views/kaminari/_page.html.erb | 2 +- app/views/kaminari/_prev_page.html.erb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/kaminari/_first_page.html.erb b/app/views/kaminari/_first_page.html.erb index b9802389d..e8afb0431 100644 --- a/app/views/kaminari/_first_page.html.erb +++ b/app/views/kaminari/_first_page.html.erb @@ -1,3 +1,3 @@
  • - <%= link_to t("views.pagination.first").html_safe, url, :remote => remote %> + <%= link_to t("views.pagination.first").html_safe, kaminari_path(url), :remote => remote %>
    • diff --git a/app/views/kaminari/_last_page.html.erb b/app/views/kaminari/_last_page.html.erb index 179f6e7fc..5a49bd7e2 100644 --- a/app/views/kaminari/_last_page.html.erb +++ b/app/views/kaminari/_last_page.html.erb @@ -1,3 +1,3 @@
  • - <%= link_to t("views.pagination.last").html_safe, url, :remote => remote %> + <%= link_to t("views.pagination.last").html_safe, kaminari_path(url), :remote => remote %>
    • diff --git a/app/views/kaminari/_next_page.html.erb b/app/views/kaminari/_next_page.html.erb index f305b1b7d..11c700900 100644 --- a/app/views/kaminari/_next_page.html.erb +++ b/app/views/kaminari/_next_page.html.erb @@ -1,3 +1,3 @@
  • - <%= link_to t("views.pagination.next").html_safe, url, :rel => "next", :remote => remote %> + <%= link_to t("views.pagination.next").html_safe, kaminari_path(url), :rel => "next", :remote => remote %>
    • diff --git a/app/views/kaminari/_page.html.erb b/app/views/kaminari/_page.html.erb index 12610dada..7b380fe4f 100644 --- a/app/views/kaminari/_page.html.erb +++ b/app/views/kaminari/_page.html.erb @@ -5,6 +5,6 @@ <% else %>
  • - <%= link_to page, url, {:remote => remote, :rel => page.next? ? "next" : page.prev? ? "prev" : nil} %> + <%= link_to page, kaminari_path(url), {:remote => remote, :rel => page.next? ? "next" : page.prev? ? "prev" : nil} %>
    • <% end %> diff --git a/app/views/kaminari/_prev_page.html.erb b/app/views/kaminari/_prev_page.html.erb index 902a8c89e..aba1d9369 100644 --- a/app/views/kaminari/_prev_page.html.erb +++ b/app/views/kaminari/_prev_page.html.erb @@ -1,3 +1,3 @@
  • - <%= link_to t("views.pagination.previous").html_safe, url, :rel => "prev", :remote => remote %> + <%= link_to t("views.pagination.previous").html_safe, kaminari_path(url), :rel => "prev", :remote => remote %>
    • From 886a3a0e2a89114230f3758a44454202d1e953b6 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Sat, 18 Nov 2017 10:52:38 +0100 Subject: [PATCH 763/765] Add missing activerecord error messages in english & spanish --- config/locales/en/activerecord.yml | 7 ++++++- config/locales/es/activerecord.yml | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index bceaf5106..0e0c20dfd 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -281,4 +281,9 @@ en: attributes: image: image_width: "Width must be %{required_width}px" - image_height: "Height must be %{required_height}px" \ No newline at end of file + image_height: "Height must be %{required_height}px" + messages: + record_invalid: "Validation failed: %{errors}" + restrict_dependent_destroy: + has_one: "Cannot delete record because a dependent %{record} exists" + has_many: "Cannot delete record because dependent %{record} exist" \ No newline at end of file diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index d0d3294cd..b52f0bdb8 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -277,3 +277,8 @@ es: image: image_width: "Debe tener %{required_width}px de ancho" image_height: "Debe tener %{required_height}px de alto" + messages: + record_invalid: "La validación falló: %{errors}" + restrict_dependent_destroy: + has_one: No se puede eliminar el registro porque existe un %{record} dependiente + has_many: No se puede eliminar el registro porque existen %{record} dependientes \ No newline at end of file From b2c03192bb35aa45cabf22a6aa2f96633ce2e9c4 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Sun, 19 Nov 2017 13:33:49 +0100 Subject: [PATCH 764/765] Fix kaminari path url helper function --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4aecb615c..3191a2ab9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -62,6 +62,6 @@ module ApplicationHelper end def kaminari_path(url) - "#{root_url}#{url.delete('/')}" + "#{root_url.chomp("\/")}#{url}" end end From 21b2a11339bc2769d4155b9e3f36b9ca280719d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= Date: Tue, 21 Nov 2017 14:31:03 +0100 Subject: [PATCH 765/765] adds poll comments to API --- app/models/comment.rb | 6 ++++-- app/models/poll.rb | 1 + spec/lib/graphql_spec.rb | 29 +++++++++++++++++++++++++++-- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/app/models/comment.rb b/app/models/comment.rb index 8e3024d06..ccfc04602 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -30,9 +30,11 @@ class Comment < ActiveRecord::Base scope :sort_by_flags, -> { order(flags_count: :desc, updated_at: :desc) } scope :public_for_api, -> do where(%{(comments.commentable_type = 'Debate' and comments.commentable_id in (?)) or - (comments.commentable_type = 'Proposal' and comments.commentable_id in (?))}, + (comments.commentable_type = 'Proposal' and comments.commentable_id in (?)) or + (comments.commentable_type = 'Poll' and comments.commentable_id in (?))}, Debate.public_for_api.pluck(:id), - Proposal.public_for_api.pluck(:id)) + Proposal.public_for_api.pluck(:id), + Poll.public_for_api.pluck(:id)) end scope :sort_by_most_voted, -> { order(confidence_score: :desc, created_at: :desc) } diff --git a/app/models/poll.rb b/app/models/poll.rb index 27125d8a1..ffb4e36f4 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -28,6 +28,7 @@ class Poll < ActiveRecord::Base scope :recounting, -> { Poll.where(ends_at: (Date.current.beginning_of_day - RECOUNT_DURATION)..Date.current.beginning_of_day) } scope :published, -> { where('published = ?', true) } scope :by_geozone_id, ->(geozone_id) { where(geozones: {id: geozone_id}.joins(:geozones)) } + scope :public_for_api, -> { all } scope :sort_for_list, -> { order(:geozone_restricted, :starts_at, :name) } diff --git a/spec/lib/graphql_spec.rb b/spec/lib/graphql_spec.rb index d6ea071e2..4f03e0f6a 100644 --- a/spec/lib/graphql_spec.rb +++ b/spec/lib/graphql_spec.rb @@ -282,15 +282,16 @@ describe 'ConsulSchema' do end describe 'Comments' do - it 'only returns comments from proposals and debates' do + it 'only returns comments from proposals, debates and polls' do proposal_comment = create(:comment, commentable: create(:proposal)) debate_comment = create(:comment, commentable: create(:debate)) + poll_comment = create(:comment, commentable: create(:poll)) spending_proposal_comment = build(:comment, commentable: create(:spending_proposal)).save(skip_validation: true) response = execute('{ comments { edges { node { commentable_type } } } }') received_commentables = extract_fields(response, 'comments', 'commentable_type') - expect(received_commentables).to match_array ['Proposal', 'Debate'] + expect(received_commentables).to match_array ['Proposal', 'Debate', 'Poll'] end it 'displays comments of authors even if public activity is set to false' do @@ -355,6 +356,19 @@ describe 'ConsulSchema' do expect(received_comments).to match_array [visible_debate_comment.body] end + it 'does not include comments from hidden polls' do + visible_poll = create(:poll) + hidden_poll = create(:poll, hidden_at: Time.current) + + visible_poll_comment = create(:comment, commentable: visible_poll) + hidden_poll_comment = create(:comment, commentable: hidden_poll) + + response = execute('{ comments { edges { node { body } } } }') + received_comments = extract_fields(response, 'comments', 'body') + + expect(received_comments).to match_array [visible_poll_comment.body] + end + it 'does not include comments of debates that are not public' do not_public_debate = create(:debate, :hidden) not_public_debate_comment = create(:comment, commentable: not_public_debate) @@ -377,6 +391,17 @@ describe 'ConsulSchema' do expect(received_comments).to_not include(not_public_proposal_comment.body) end + it 'does not include comments of polls that are not public' do + not_public_poll = create(:poll) + not_public_poll_comment = create(:comment, commentable: not_public_poll) + allow(Comment).to receive(:public_for_api).and_return([]) + + response = execute('{ comments { edges { node { body } } } }') + received_comments = extract_fields(response, 'comments', 'body') + + expect(received_comments).to_not include(not_public_poll_comment.body) + end + it 'only returns date and hour for created_at' do created_at = Time.zone.parse("2017-12-31 9:30:15") create(:comment, created_at: created_at)