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 01/52] 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 02/52] 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 03/52] 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 04/52] 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 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 05/52] 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 06/52] 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 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 07/52] 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 08/52] 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 09/52] 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 10/52] 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 11/52] 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 12/52] 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] %>

- + +
@@ -30,60 +33,81 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + 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 13/52] 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| %> -
<%= 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] %>
+

<%= 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 14/52] 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 15/52] 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 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 16/52] 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 17/52] `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 18/52] 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 19/52] 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 20/52] 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 21/52] 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 22/52] 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 23/52] 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 24/52] 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 70713e08c3469965bb2930404743486b88a78d5b Mon Sep 17 00:00:00 2001 From: decabeza Date: Sat, 21 Oct 2017 18:25:30 +0200 Subject: [PATCH 25/52] 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 26/52] 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 27/52] 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| %>
From 96f588566a970e05e591703c851dcc6db199299c Mon Sep 17 00:00:00 2001 From: decabeza Date: Sun, 22 Oct 2017 01:06:03 +0200 Subject: [PATCH 28/52] 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 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 29/52] 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 30/52] 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 31/52] 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 32/52] 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 33/52] 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 34/52] 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 35/52] 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 36/52] 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| %>
> <%= 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 %> +
> <% 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 37/52] 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 38/52] 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 39/52] 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 40/52] 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 41/52] 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 42/52] 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 43/52] 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 44/52] 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 45/52] 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 46/52] 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 47/52] 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 48/52] 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 49/52] 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 50/52] 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 51/52] 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 52/52] 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' %>