biovision-poll 0.1.180917.0 → 0.2.200324.1

data/app/models/poll_answer.rb

@@ -1,30 +1,48 @@
+# frozen_string_literal: true
+
+# Answer to poll question
+# 
+# Attributes:
+#   created_at [DateTime]
+#   data [jsonb]
+#   poll_question_id [PollQuestion]
+#   poll_votes_count [integer]
+#   priority [integer]
+#   simple_image_id [SimpleImage], optional
+#   text [string]
+#   updated_at [DateTime]
+#   uuid [uuid]
 class PollAnswer < ApplicationRecord
-  TEXT_LIMIT = 140
-  PRIORITY_RANGE = (1..50)
+  include Checkable
+  include HasSimpleImage
+  include HasUuid
+  include NestedPriority
 
-  mount_uploader :image, PollImageUploader
+  TEXT_LIMIT = 140
 
   belongs_to :poll_question, counter_cache: true
   has_many :poll_votes, dependent: :delete_all
 
-  after_initialize :set_next_priority
-
   before_validation { self.text = text.to_s.strip }
-  before_validation :normalize_priority
 
   validates_presence_of :text
   validates_length_of :text, maximum: TEXT_LIMIT
-  validates_uniqueness_of :text, scope: [:poll_question_id]
+  validates_uniqueness_of :text, scope: :poll_question_id
 
-  scope :ordered_by_priority, -> { order('priority asc, text asc') }
-  scope :siblings, ->(item) { where(poll_question_id: item.poll_question_id) }
+  scope :list_for_visitors, -> { ordered_by_priority }
+  scope :list_for_administration, -> { ordered_by_priority }
+
+  # @param [PollAnswer] entity
+  def self.siblings(entity)
+    where(poll_question_id: entity&.poll_question_id)
+  end
 
   def self.entity_parameters
-    %i(image text)
+    %i[text simple_image_id]
   end
 
   def self.creation_parameters
-    entity_parameters + %i(poll_question_id)
+    entity_parameters + %i[poll_question_id]
   end
 
   # @param [User] user
@@ -39,29 +57,4 @@ class PollAnswer < ApplicationRecord
   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
-    adjacent     = self.class.siblings(self).find_by(priority: new_priority)
-    if adjacent.is_a?(self.class) && (adjacent.id != id)
-      adjacent.update!(priority: priority)
-    end
-    update(priority: new_priority)
-
-    self.class.siblings(self).map { |e| [e.id, e.priority] }.to_h
-  end
-
-  private
-
-  def set_next_priority
-    if id.nil? && priority == 1
-      self.priority = self.class.siblings(self).maximum(:priority).to_i + 1
-    end
-  end
-
-  def normalize_priority
-    self.priority = PRIORITY_RANGE.first if priority < PRIORITY_RANGE.first
-    self.priority = PRIORITY_RANGE.last if priority > PRIORITY_RANGE.last
-  end
 end

data/app/models/poll_question.rb

@@ -1,36 +1,55 @@
+# frozen_string_literal: true
+
+# Poll question
+# 
+# Attributes:
+#   comment [string], optional
+#   created_at [DateTime]
+#   data [jsonb]
+#   multiple_choice [boolean]
+#   poll_answers_count [integer]
+#   poll_id [Poll]
+#   priority [integer]
+#   simple_image_id [SimpleImage], optional
+#   text [string]
+#   updated_at [DateTime]
+#   uuid [uuid]
 class PollQuestion < ApplicationRecord
+  include Checkable
+  include HasSimpleImage
+  include HasUuid
+  include NestedPriority
   include Toggleable
 
-  TEXT_LIMIT     = 140
-  COMMENT_LIMIT  = 140
-  PRIORITY_RANGE = (1..100)
+  COMMENT_LIMIT = 255
+  TEXT_LIMIT = 255
 
   toggleable :multiple_choice
 
-  mount_uploader :image, PollImageUploader
-
   belongs_to :poll, counter_cache: true
   has_many :poll_answers, dependent: :delete_all
 
-  after_initialize :set_next_priority
-
   before_validation { self.text = text.to_s.strip }
-  before_validation :normalize_priority
 
   validates_presence_of :text
   validates_length_of :text, maximum: TEXT_LIMIT
   validates_length_of :comment, maximum: COMMENT_LIMIT
-  validates_uniqueness_of :text, scope: [:poll_id]
+  validates_uniqueness_of :text, scope: :poll_id
+
+  scope :list_for_visitors, -> { ordered_by_priority }
+  scope :list_for_administration, -> { ordered_by_priority }
 
-  scope :ordered_by_priority, -> { order('priority asc, text asc') }
-  scope :siblings, ->(item) { where(poll_id: item.poll_id) }
+  # @param [PollQuestion] entity
+  def self.siblings(entity)
+    where(poll_id: entity&.poll_id)
+  end
 
   def self.entity_parameters
-    PollQuestion.toggleable_attributes + %i(image text comment)
+    PollQuestion.toggleable_attributes + %i[comment simple_image_id text]
   end
 
   def self.creation_parameters
-    entity_parameters + %i(poll_id)
+    entity_parameters + %i[poll_id]
   end
 
   # @param [User] user
@@ -39,31 +58,6 @@ class PollQuestion < ApplicationRecord
   end
 
   def vote_count
-    poll_answers.pluck(:poll_votes_count).reduce(&:+)
-  end
-
-  # @param [Integer] delta
-  def change_priority(delta)
-    new_priority = priority + delta
-    adjacent     = self.class.siblings(self).find_by(priority: new_priority)
-    if adjacent.is_a?(self.class) && (adjacent.id != id)
-      adjacent.update!(priority: priority)
-    end
-    update(priority: new_priority)
-
-    self.class.siblings(self).map { |e| [e.id, e.priority] }.to_h
-  end
-
-  private
-
-  def set_next_priority
-    if id.nil? && priority == 1
-      self.priority = self.class.siblings(self).maximum(:priority).to_i + 1
-    end
-  end
-
-  def normalize_priority
-    self.priority = PRIORITY_RANGE.first if priority < PRIORITY_RANGE.first
-    self.priority = PRIORITY_RANGE.last if priority > PRIORITY_RANGE.last
+    poll_answers.pluck(:poll_votes_count).sum
   end
 end

data/app/models/poll_user.rb

@@ -1,10 +1,19 @@
+# frozen_string_literal: true
+
+# User allowed to vote in poll
+# 
+# Attributes:
+#   created_at [DateTime]
+#   poll_id [Poll]
+#   user_id [User]
+#   updated_at [DateTime]
 class PollUser < ApplicationRecord
   include HasOwner
 
   belongs_to :poll
   belongs_to :user
 
-  validates_uniqueness_of :user_id, scope: [:poll_id]
+  validates_uniqueness_of :user_id, scope: :poll_id
 
   scope :list_for_administration, -> { order('id desc') }
 end

data/app/models/poll_vote.rb

@@ -1,21 +1,36 @@
+# frozen_string_literal: true
+
+# Vote for poll answer
+# 
+# Attributes:
+#   agent_id [Agent], optional
+#   created_at [DateTime]
+#   data [jsonb]
+#   ip [inet], optional
+#   poll_answer_id [PollAnswer]
+#   slug [string]
+#   updated_at [DateTime]
+#   user_id [User], optional
+#   uuid [uuid]
 class PollVote < ApplicationRecord
-  PER_PAGE = 20
+  include HasOwner
+  include HasUuid
 
   belongs_to :poll_answer, counter_cache: true
   belongs_to :user
   belongs_to :agent, optional: true
 
-  before_save { self.footprint = "#{user_id}:#{ip}:#{agent_id}" }
-
   scope :recent, -> { order('id desc') }
+  scope :list_for_visitors, -> { recent }
+  scope :list_for_administration, -> { recent }
 
   # @param [Integer] page
   def self.page_for_administration(page = 1)
-    recent.page(page).per(PER_PAGE)
+    list_for_administration.page(page)
   end
 
   # @param [Integer] page
   def self.page_for_visitors(page = 1)
-    recent.page(page).per(PER_PAGE)
+    list_for_visitors.page(page)
   end
 end

data/app/services/biovision/components/polls_component.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Biovision
+  module Components
+    # Managing polls
+    class PollsComponent < BaseComponent
+
+      protected
+
+      # @param [Hash] data
+      # @return [Hash]
+      def normalize_settings(data)
+        result = {}
+        numbers = %w[answer_limit question_limit]
+        numbers.each { |f| result[f] = data[f].to_i }
+
+        result
+      end
+    end
+  end
+end

data/app/views/admin/components/links/_polls.html.erb

@@ -0,0 +1 @@
+<li><%= render 'admin/polls/nav_item' %></li>

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

@@ -1,6 +1,3 @@
-<div class="image">
-  <%= poll_image_preview(entity) %>
-</div>
 <div class="data">
   <div><%= admin_poll_answer_link(entity) %></div>
   <div class="secondary info">

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

@@ -1,9 +1,10 @@
 <% content_for :meta_title, t('.title', poll: @entity.poll.name, answer: @entity.poll_question.text, question: @entity.text) %>
 <% content_for :breadcrumbs do %>
-    <%= link_to(t('admin.polls.nav_item.text'), admin_polls_path) %>
-    <%= admin_poll_link(@entity.poll) %>
-    <%= admin_poll_question_link(@entity.poll_question) %>
-    <span><%= @entity.priority %>: <%= @entity.text %></span>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <%= link_to(t('admin.polls.index.nav_text'), admin_polls_path) %>
+  <%= admin_poll_link(@entity.poll) %>
+  <%= admin_poll_question_link(@entity.poll_question) %>
+  <span><%= @entity.priority %>: <%= @entity.text %></span>
 <% end %>
 
 <article>
@@ -14,40 +15,29 @@
     <li><%= edit_icon(edit_poll_answer_path(id: @entity.id)) %></li>
   </ul>
 
-  <% unless @entity.image.blank? %>
-      <figure>
-        <%= poll_image_medium(@entity) %>
-        <figcaption><%= t('activerecord.attributes.poll_answer.image') %></figcaption>
-      </figure>
-  <% end %>
-
   <dl>
-    <dt><%= t(:created_at) %></dt>
-    <dd>
-      <%= time_tag(@entity.created_at) %>
-    </dd>
-
-    <dt><%= t(:updated_at) %></dt>
-    <dd>
-      <%= time_tag(@entity.updated_at) %>
-    </dd>
-
-    <dt><%= t('activerecord.attributes.poll_answer.priority') %></dt>
-    <dd>
-      <%= @entity.priority %>
-    </dd>
-
-    <dt><%= t('activerecord.attributes.poll_answer.poll_question_id') %></dt>
-    <dd>
-      <%= admin_poll_question_link(@entity.poll_question) %>
-    </dd>
-
-    <dt><%= t('activerecord.attributes.poll_answer.text') %></dt>
-    <dd>
-      <%= @entity.text %>
-    </dd>
+    <div>
+      <dt><%= t('activerecord.attributes.poll_answer.poll_question_id') %></dt>
+      <dd>
+        <%= admin_poll_question_link(@entity.poll_question) %>
+      </dd>
+    </div>
+
+    <%= render partial: 'shared/entity/priority', locals: { entity: @entity } %>
+
+    <div>
+      <dt><%= t('activerecord.attributes.poll_answer.text') %></dt>
+      <dd>
+        <div class="text"><%= @entity.text %></div>
+      </dd>
+    </div>
+
+    <%= render partial: 'shared/entity/uuid', locals: { entity: @entity } %>
+    <%= render partial: 'shared/entity/timestamps', locals: { entity: @entity } %>
   </dl>
 
+  <%= render partial: 'admin/poll_answers/entity/data', locals: { entity: @entity } %>
+
   <section>
     <h2><%= t(:poll_vote_count, count: @entity.poll_votes_count) %></h2>
 

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

@@ -1,6 +1,3 @@
-<div class="image">
-  <%= poll_image_preview(entity) %>
-</div>
 <div class="data">
   <div><%= admin_poll_question_link(entity) %></div>
   <% unless entity.comment.blank? %>
@@ -9,11 +6,15 @@
     </div>
   <% end %>
   <div class="secondary info">
-    <%= t(:poll_answer_count, count: entity.poll_answers_count) %>
+    <%= t(:poll_answer_count, count: entity.poll_answers_count) %>,
+    <%= t(:poll_vote_count, count: entity.vote_count) %>
     <% if entity.poll_answers.any? %>
       <ol>
         <% entity.poll_answers.ordered_by_priority.each do |answer| %>
-          <li><%= admin_poll_answer_link(answer) %></li>
+          <li>
+            <%= admin_poll_answer_link(answer) %>:
+            <%= answer.poll_votes_count %> (<%= answer.vote_percent %>%)
+          </li>
         <% end %>
       </ol>
     <% end %>

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

@@ -1,8 +1,9 @@
 <% content_for :meta_title, t('.title', poll: @entity.poll.name, question: @entity.text) %>
 <% content_for :breadcrumbs do %>
-    <%= link_to(t('admin.polls.nav_item.text'), admin_polls_path) %>
-    <%= admin_poll_link(@entity.poll) %>
-    <span><%= @entity.priority %>: <%= @entity.text %></span>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <%= link_to(t('admin.polls.index.nav_text'), admin_polls_path) %>
+  <%= admin_poll_link(@entity.poll) %>
+  <span><%= @entity.priority %>: <%= @entity.text %></span>
 <% end %>
 
 <article>
@@ -13,47 +14,38 @@
     <li><%= edit_icon(edit_poll_question_path(id: @entity.id)) %></li>
   </ul>
 
-  <% unless @entity.image.blank? %>
-      <figure>
-        <%= poll_image_medium(@entity) %>
-        <figcaption><%= t('activerecord.attributes.poll_question.image') %></figcaption>
-      </figure>
-  <% end %>
-
   <dl>
-    <dt><%= t(:created_at) %></dt>
-    <dd>
-      <%= time_tag(@entity.created_at) %>
-    </dd>
-
-    <dt><%= t(:updated_at) %></dt>
-    <dd>
-      <%= time_tag(@entity.updated_at) %>
-    </dd>
+    <div>
+      <dt><%= t('attributes.poll') %></dt>
+      <dd>
+        <%= admin_poll_link(@entity.poll) %>
+      </dd>
+    </div>
 
-    <dt><%= t('activerecord.attributes.poll_question.poll_id') %></dt>
-    <dd>
-      <%= admin_poll_link(@entity.poll) %>
-    </dd>
+    <%= render partial: 'shared/entity/priority', locals: { entity: @entity } %>
 
-    <dt><%= t('activerecord.attributes.poll_question.priority') %></dt>
-    <dd>
-      <%= @entity.priority %>
-    </dd>
-
-    <dt><%= t('activerecord.attributes.poll_question.text') %></dt>
-    <dd>
-      <%= @entity.text %>
-    </dd>
+    <div>
+      <dt><%= t('activerecord.attributes.poll_question.text') %></dt>
+      <dd>
+        <div class="text"><%= @entity.text %></div>
+      </dd>
+    </div>
 
     <% unless @entity.comment.blank? %>
+      <div>
         <dt><%= t('activerecord.attributes.poll_question.comment') %></dt>
         <dd>
-          <%= @entity.comment %>
+          <div class="text"><%= @entity.comment %></div>
         </dd>
+      </div>
     <% end %>
+
+    <%= render partial: 'shared/entity/uuid', locals: { entity: @entity } %>
+    <%= render partial: 'shared/entity/timestamps', locals: { entity: @entity } %>
   </dl>
 
+  <%= render partial: 'admin/poll_questions/entity/data', locals: { entity: @entity } %>
+
   <%=
     render(
         partial: 'shared/admin/toggleable',
@@ -76,10 +68,10 @@
   </section>
 
   <% if @entity.poll_answers.count < 10 %>
-      <section>
-        <h2><%= t('poll_answers.new.heading') %></h2>
+    <section>
+      <h2><%= t('poll_answers.new.heading') %></h2>
 
-        <%= render partial: 'poll_answers/form', locals: { entity: @entity.poll_answers.new } %>
-      </section>
+      <%= render partial: 'poll_answers/form', locals: { entity: @entity.poll_answers.new } %>
+    </section>
   <% end %>
 </article>