biovision-poll 0.0.170908 → 0.1.180917.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a178bf343ce1bc3f702577d444db93e3efdd58e6
-  data.tar.gz: 2997c450eb8e26ea18da19910aef9f1e9f5c0698
+SHA256:
+  metadata.gz: e673d23a9adf4f6fd8b9a31e41d117bc29cd0821a687e4b5a650f83cbe400035
+  data.tar.gz: dca9cfa8d1ab77d328e39ee1930b4a24112f0dca08695a45d8a22ad13239216a
 SHA512:
-  metadata.gz: 8f5217cc9b0e0bb6a367da4dddab9ed70fa88e9fbfd79f2a6e7d1f0e79fa5b4846697200b3fed8a99414718bc5ff175e2eac6474ac7ed4c65e22bcb7f2ef593d
-  data.tar.gz: 45ba435cc521559641c5eb4e86d19878d8e32d92e8b22971ccb9596a3620214a05992676b51c7f4bb8df471739f3efc83e123fbee62a4fcf35093fa0b3b05ff5
+  metadata.gz: 2b2e12f2d66ab1451ec17c5b5190a85a5f993b59bede884793e5cff0b37435dae42fa28844e5fc23c288e41ab0b22b1adb14f953b94bfbb77b5be06852b0e338
+  data.tar.gz: acde6ad3f720aedec127251e1a0e78824240220ff70fefcd554c57beb990eab5a1b98e0f5b6e541f98be3a0c5985d8a1621738e9690c8f518da3e4a344441208

data/app/controllers/admin/poll_answers_controller.rb

@@ -1,5 +1,6 @@
 class Admin::PollAnswersController < AdminController
   include ToggleableEntity
+  include EntityPriority
 
   before_action :set_entity
 

data/app/controllers/admin/poll_questions_controller.rb

@@ -1,5 +1,6 @@
 class Admin::PollQuestionsController < AdminController
   include ToggleableEntity
+  include EntityPriority
 
   before_action :set_entity
 

data/app/controllers/admin/polls_controller.rb

@@ -12,6 +12,29 @@ class Admin::PollsController < AdminController
   def show
   end
 
+  # get /admin/polls/:id/users
+  def users
+    @collection = @entity.poll_users.list_for_administration
+  end
+
+  # post /admin/polls/:id/users
+  def add_user
+    user = User.find_by(id: params[:user_id])
+
+    @entity.add_user(user) unless user.nil?
+
+    render :users
+  end
+
+  # delete /admin/polls/:id/users/:user_id
+  def remove_user
+    user = User.find_by(id: params[:user_id])
+
+    @entity.remove_user(user) unless user.nil?
+
+    render :users
+  end
+
   private
 
   def restrict_access

data/app/controllers/poll_answers_controller.rb

@@ -5,9 +5,9 @@ class PollAnswersController < AdminController
   def create
     @entity = PollAnswer.new(creation_parameters)
     if @entity.save
-      redirect_to admin_poll_answer_path(@entity.id)
+      form_processed_ok(admin_poll_question_path(id: @entity.poll_question_id))
     else
-      render :new, status: :bad_request
+      form_processed_with_error(:new)
     end
   end
 
@@ -18,9 +18,9 @@ class PollAnswersController < AdminController
   # patch /poll_answers/:id
   def update
     if @entity.update(entity_parameters)
-      redirect_to admin_poll_answer_path(@entity.id), notice: t('poll_answers.update.success')
+      form_processed_ok(admin_poll_question_path(id: @entity.poll_question_id))
     else
-      render :edit, status: :bad_request
+      form_processed_with_error(:edit)
     end
   end
 
@@ -29,7 +29,7 @@ class PollAnswersController < AdminController
     if @entity.destroy
       flash[:notice] = t('poll_answers.destroy.success')
     end
-    redirect_to(admin_poll_path(@entity.id))
+    redirect_to(admin_poll_question_path(id: @entity.poll_question_id))
   end
 
   protected

data/app/controllers/poll_questions_controller.rb

@@ -5,9 +5,9 @@ class PollQuestionsController < AdminController
   def create
     @entity = PollQuestion.new(creation_parameters)
     if @entity.save
-      redirect_to admin_poll_question_path(@entity.id)
+      form_processed_ok(admin_poll_question_path(id: @entity.id))
     else
-      render :new, status: :bad_request
+      form_processed_with_error(:new)
     end
   end
 
@@ -18,9 +18,9 @@ class PollQuestionsController < AdminController
   # patch /poll_questions/:id
   def update
     if @entity.update(entity_parameters)
-      redirect_to admin_poll_question_path(@entity.id), notice: t('poll_questions.update.success')
+      form_processed_ok(admin_poll_question_path(id: @entity.id))
     else
-      render :edit, status: :bad_request
+      form_processed_with_error(:edit)
     end
   end
 
@@ -29,7 +29,7 @@ class PollQuestionsController < AdminController
     if @entity.destroy
       flash[:notice] = t('poll_questions.destroy.success')
     end
-    redirect_to(admin_poll_path(@entity.poll_id))
+    redirect_to(admin_poll_path(id: @entity.poll_id))
   end
 
   protected

data/app/controllers/polls_controller.rb

@@ -1,8 +1,13 @@
 class PollsController < ApplicationController
-  before_action :restrict_access, except: [:index, :show]
-  before_action :set_entity, only: [:edit, :update, :destroy]
+  before_action :restrict_access, except: [:index, :show, :results, :answer]
+  before_action :set_entity, except: [:index, :new, :create]
   
-  layout 'admin', except: [:index, :show]
+  layout 'admin', except: [:index, :show, :results]
+
+  # get /polls
+  def index
+    @collection = Poll.page_for_visitors(current_page)
+  end
 
   # get /polls/new
   def new
@@ -11,11 +16,18 @@ class PollsController < ApplicationController
 
   # post /polls
   def create
-    @entity = Poll.new(entity_parameters)
+    @entity = Poll.new(creation_parameters)
     if @entity.save
-      redirect_to(admin_poll_path(@entity.id))
+      form_processed_ok(admin_poll_path(id: @entity.id))
     else
-      render :new, status: :bad_request
+      form_processed_with_error(:new)
+    end
+  end
+
+  # get /polls/:id
+  def show
+    unless @entity.visible_to?(current_user)
+      redirect_to polls_path
     end
   end
 
@@ -26,9 +38,9 @@ class PollsController < ApplicationController
   # patch /polls/:id
   def update
     if @entity.update(entity_parameters)
-      redirect_to admin_poll_path(@entity), notice: t('polls.update.success')
+      form_processed_ok(admin_poll_path(id: @entity.id))
     else
-      render :edit, status: :bad_request
+      form_processed_with_error(:edit)
     end
   end
 
@@ -40,6 +52,18 @@ class PollsController < ApplicationController
     redirect_to(admin_polls_path)
   end
 
+  # post /polls/:id/results
+  def answer
+    @entity.process_answers(current_user, params.require(:answer))
+
+    redirect_to root_path(id: @entity.id)
+  end
+
+  # get /polls/:id/results
+  def results
+    redirect_to poll_path(id: @entity.id) unless @entity.show_results?(current_user)
+  end
+
   protected
 
   def restrict_access
@@ -56,4 +80,8 @@ class PollsController < ApplicationController
   def entity_parameters
     params.require(:poll).permit(Poll.entity_parameters)
   end
+
+  def creation_parameters
+    entity_parameters.merge(owner_for_entity(true))
+  end
 end

data/app/helpers/polls_helper.rb

@@ -1,17 +1,22 @@
 module PollsHelper
   # @param [Poll] entity
   def admin_poll_link(entity)
-    link_to(entity.name, admin_poll_path(entity.id))
+    link_to(entity.name, admin_poll_path(id: entity.id))
   end
 
   # @param [PollQuestion] entity
   def admin_poll_question_link(entity)
-    link_to(entity.text, admin_poll_question_path(entity.id))
+    link_to(entity.text, admin_poll_question_path(id: entity.id))
+  end
+
+  # @param [PollAnswer] entity
+  def admin_poll_answer_link(entity)
+    link_to(entity.text, admin_poll_answer_path(id: entity.id))
   end
 
   # @param [Poll] entity
   def poll_link(entity)
-    link_to(entity.name, poll_path(entity.id))
+    link_to(entity.name, poll_path(id: entity.id))
   end
 
   # @param [Poll] entity

data/app/models/poll.rb

@@ -6,23 +6,24 @@ class Poll < ApplicationRecord
   NAME_LIMIT        = 140
   DESCRIPTION_LIMIT = 255
 
-  toggleable %i(active anonymous_votes open_results show_on_homepage visible)
+  toggleable %i[active anonymous_votes open_results show_on_homepage visible exclusive]
 
   mount_uploader :image, PollImageUploader
 
   belongs_to :user
   belongs_to :agent, optional: true
-  belongs_to :region, optional: true
-  belongs_to :pollable, polymorphic: true
+  belongs_to :region, optional: true if Gem.loaded_specs.key?('biovision-regions')
+  belongs_to :pollable, polymorphic: true, optional: true
   has_many :poll_questions, dependent: :delete_all
+  has_many :poll_users, dependent: :delete_all
 
-  validates_presence_of :name, :description
+  validates_presence_of :name
   validates_length_of :name, maximum: NAME_LIMIT
   validates_length_of :description, maximum: DESCRIPTION_LIMIT
 
   scope :recent, -> { order('id desc') }
   scope :visible, -> { where(visible: true) }
-  scope :active, -> { where(active: true).where('end_date >= now() or end_date is null') }
+  scope :active, -> { visible.where('active = true and (end_date is null or (date(end_date) >= date(now())))') }
 
   # @param [Integer] page
   def self.page_for_administration(page = 1)
@@ -50,7 +51,65 @@ class Poll < ApplicationRecord
     visible? || owned_by?(user)
   end
 
+  # @param [User] user
+  def votable_by?(user)
+    return false if user.nil? || voted?(user)
+    if exclusive?
+      includes?(user)
+    # elsif anonymous_votes?
+    else
+      true
+    end
+  end
+
+  # @param [User] user
+  def voted?(user)
+    PollVote.where(poll_answer_id: answer_ids, user: user).exists?
+  end
+
+  # @param [User] user
+  def show_results?(user)
+    open_results? || editable_by?(user)
+  end
+
   def regional?
     !region_id.nil?
   end
+
+  # @param [User] user
+  def includes?(user)
+    poll_users.owned_by(user).exists?
+  end
+
+  # @param [User] user
+  def add_user(user)
+    PollUser.create(poll: self, user: user)
+  end
+
+  # @param [User] user
+  def remove_user(user)
+    poll_users.owned_by(user).delete_all
+  end
+
+  def answer_ids
+    PollAnswer.where(poll_question_id: poll_questions.pluck(:id)).pluck(:id)
+  end
+
+  # @param [User] user
+  # @param [Hash] answers
+  def process_answers(user, answers)
+    return unless votable_by?(user)
+    answers.each do |question_id, answer_ids|
+      question = PollQuestion.find_by(id: question_id)
+      next if question.nil? || question.poll_id != id
+      if question.multiple_choice?
+        answers = question.poll_answers.where(id: answer_ids)
+      else
+        answers = question.poll_answers.where(id: answer_ids.first)
+      end
+      answers.each do |answer|
+        PollVote.create(poll_answer: answer, user: user)
+      end
+    end
+  end
 end

data/app/models/poll_answer.rb

@@ -1,5 +1,6 @@
 class PollAnswer < ApplicationRecord
   TEXT_LIMIT = 140
+  PRIORITY_RANGE = (1..50)
 
   mount_uploader :image, PollImageUploader
 
@@ -35,6 +36,10 @@ class PollAnswer < ApplicationRecord
     poll_question&.poll
   end
 
+  def vote_percent
+    poll_votes_count.to_f / poll_question.vote_count * 100
+  end
+
   # @param [Integer] delta
   def change_priority(delta)
     new_priority = priority + delta

data/app/models/poll_question.rb

@@ -38,6 +38,10 @@ class PollQuestion < ApplicationRecord
     poll.editable_by?(user)
   end
 
+  def vote_count
+    poll_answers.pluck(:poll_votes_count).reduce(&:+)
+  end
+
   # @param [Integer] delta
   def change_priority(delta)
     new_priority = priority + delta

data/app/models/poll_user.rb

@@ -0,0 +1,10 @@
+class PollUser < ApplicationRecord
+  include HasOwner
+
+  belongs_to :poll
+  belongs_to :user
+
+  validates_uniqueness_of :user_id, scope: [:poll_id]
+
+  scope :list_for_administration, -> { order('id desc') }
+end

data/app/views/admin/index/dashboard/_biovision_poll.html.erb

@@ -0,0 +1,10 @@
+<% if current_user_in_group?(:poll_managers) %>
+  <nav>
+    <div class="heading" id="biovision-poll-nav-heading">
+      <%= t('.heading') %>
+    </div>
+    <ul aria-labelledby="biovision-poll-nav-heading">
+      <li><%= render 'admin/polls/nav_item' %></li>
+    </ul>
+  </nav>
+<% end %>

data/app/views/admin/poll_answers/entity/_in_list.html.erb

@@ -2,19 +2,18 @@
   <%= poll_image_preview(entity) %>
 </div>
 <div class="data">
-  <div><%= admin_poll_question_link(entity) %></div>
-  <% unless entity.comment.blank? %>
-      <div class="info">
-        <%= entity.comment %>
-      </div>
-  <% end %>
-  <% if entity.poll_answers.any? %>
-      <div><%= entity.poll_answers.count %></div>
-  <% end %>
-
-  <%= redner partial: 'admin/polls/toggleable', locals: { entity: entity } %>
+  <div><%= admin_poll_answer_link(entity) %></div>
+  <div class="secondary info">
+    <%= t(:poll_vote_count, count: entity.poll_votes_count) %>
+  </div>
 
   <ul class="actions">
-    <li><%= edit_icon(edit_poll_path(entity)) %></li>
+    <li><%= edit_icon(edit_poll_answer_path(id: entity.id)) %></li>
+    <%=
+      render(
+          partial: 'shared/actions/priority_changer',
+          locals: { path: priority_admin_poll_answer_path(id: entity.id) }
+      )
+    %>
   </ul>
 </div>

data/app/views/admin/poll_answers/show.html.erb

@@ -10,8 +10,8 @@
   <h1><%= @entity.text %></h1>
 
   <ul class="actions">
-    <li><%= return_icon(admin_poll_question_path(@entity.poll_question_id)) %></li>
-    <li><%= edit_icon(edit_poll_answer_path(@entity.id)) %></li>
+    <li><%= return_icon(admin_poll_question_path(id: @entity.poll_question_id)) %></li>
+    <li><%= edit_icon(edit_poll_answer_path(id: @entity.id)) %></li>
   </ul>
 
   <% unless @entity.image.blank? %>

data/app/views/admin/poll_questions/entity/_in_list.html.erb

@@ -4,17 +4,38 @@
 <div class="data">
   <div><%= admin_poll_question_link(entity) %></div>
   <% unless entity.comment.blank? %>
-      <div class="info">
-        <%= entity.comment %>
-      </div>
-  <% end %>
-  <% if entity.poll_answers.any? %>
-      <div><%= entity.poll_answers.count %></div>
+    <div class="info">
+      <%= entity.comment %>
+    </div>
   <% end %>
+  <div class="secondary info">
+    <%= t(:poll_answer_count, count: entity.poll_answers_count) %>
+    <% if entity.poll_answers.any? %>
+      <ol>
+        <% entity.poll_answers.ordered_by_priority.each do |answer| %>
+          <li><%= admin_poll_answer_link(answer) %></li>
+        <% end %>
+      </ol>
+    <% end %>
+  </div>
 
-  <%= redner partial: 'admin/polls/toggleable', locals: { entity: entity } %>
+  <%=
+    render(
+        partial: 'shared/admin/toggleable',
+        locals:  {
+            entity: entity,
+            url:    toggle_admin_poll_question_path(id: entity.id)
+        }
+    )
+  %>
 
   <ul class="actions">
-    <li><%= edit_icon(edit_poll_path(entity)) %></li>
+    <li><%= edit_icon(edit_poll_question_path(id: entity.id)) %></li>
+    <%=
+      render(
+          partial: 'shared/actions/priority_changer',
+          locals:  { path: priority_admin_poll_question_path(id: entity.id) }
+      )
+    %>
   </ul>
 </div>