biovision-poll 0.1.180917.0 → 0.2.200324.1

data/app/views/poll_questions/edit.html.erb

@@ -1,12 +1,13 @@
 <% content_for :meta_title, t('.title') %>
 <% 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) %>
-    <span><%= t(:edit) %></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) %>
+  <span><%= t('.nav_text') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">

data/app/views/poll_questions/new.html.erb

@@ -1,17 +1,18 @@
 <% content_for :meta_title, t('.title') %>
 <% content_for :breadcrumbs do %>
-    <%= link_to(t('admin.polls.nav_item.text'), admin_polls_path) %>
-    <%= admin_poll_link(@entity.poll) unless @entity.poll.nil? %>
-    <span><%= t('.heading') %></span>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <%= link_to(t('admin.polls.index.nav_text'), admin_polls_path) %>
+  <%= admin_poll_link(@entity.poll) unless @entity.poll.nil? %>
+  <span><%= t('.nav_text') %></span>
 <% end %>
 
 <article>
   <h1><%= t('.title') %></h1>
 
   <% unless @entity.poll_id.nil? %>
-      <ul class="actions">
-        <li><%= return_icon(admin_poll_path(id: @entity.poll_id)) %></li>
-      </ul>
+    <ul class="actions">
+      <li><%= return_icon(admin_poll_path(id: @entity.poll_id)) %></li>
+    </ul>
   <% end %>
 
   <%= render partial: 'form', locals: { entity: @entity } %>

data/app/views/polls/_form.html.erb

@@ -1,49 +1,71 @@
 <% model_name = entity.class.to_s.underscore %>
-<%= form_with model: entity, html: { id: "#{model_name}-form" } do |f| %>
+<%=
+  form_with(
+      model: entity,
+      html: {
+          id: "#{model_name}-form",
+          data: { check_url: check_polls_path }
+      }
+  ) do |f|
+%>
   <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
 
-  <dl>
-    <dt><%= f.label :name %></dt>
-    <dd>
-      <%=
-        f.text_field(
-            :name,
-            id:          "#{model_name}_name",
-            required:    true,
-            size:        nil,
-            maxlength:   Poll::NAME_LIMIT,
-            placeholder: t('.placeholders.name')
-        )
-      %>
-      <div class="guideline"><%= t('.guidelines.name') %></div>
-    </dd>
+  <dl class="fields">
+    <div>
+      <dt><%= f.label :name %></dt>
+      <dd>
+        <%=
+          f.text_field(
+              :name,
+              class: 'input-text',
+              data: {
+                  check: :name
+              },
+              maxlength: Poll::NAME_LIMIT,
+              placeholder: t('.placeholders.name'),
+              required: true,
+              size: nil
+          )
+        %>
+        <div class="check-result-error" data-field="name"></div>
+        <div class="guideline"><%= t('.guidelines.name') %></div>
+      </dd>
+    </div>
 
-<!--
-    <dt><%= f.label :description %></dt>
-    <dd>
-      <%=
-        f.text_field(
-            :description,
-            id:          "#{model_name}_description",
-            size:        nil,
-            maxlength:   Poll::DESCRIPTION_LIMIT,
-            placeholder: t('.placeholders.description')
-        )
-      %>
-      <div class="guideline"><%= t('.guidelines.description') %></div>
-    </dd>
+    <!--
+    <div>
+      <dt><%= f.label :description %></dt>
+      <dd>
+        <%=
+          f.text_field(
+              :description,
+              class: 'input-text',
+              data: {
+                  check: :description
+              },
+              maxlength: Poll::DESCRIPTION_LIMIT,
+              placeholder: t('.placeholders.description'),
+              size: nil,
+          )
+        %>
+        <div class="check-result-error" data-field="description"></div>
+        <div class="guideline"><%= t('.guidelines.description') %></div>
+      </dd>
+    </div>
 -->
 
-    <dt><%= f.label :end_date %></dt>
-    <dd>
-      <%=
-        f.date_field(
-            :end_date,
-            id:   "#{model_name}_end_date",
-            size: 10
-        )
-      %>
-    </dd>
+    <div>
+      <dt><%= f.label :end_date %></dt>
+      <dd>
+        <%=
+          f.date_field(
+              :end_date,
+              class: 'input-text',
+              size: 10
+          )
+        %>
+      </dd>
+    </div>
 
     <%= render(partial: 'shared/forms/entity_flags', locals: { f: f }) %>
   </dl>
@@ -51,6 +73,7 @@
   <%= render 'shared/forms/state_container' %>
 
   <div class="buttons">
-    <%= f.button t(:save), type: :submit, class: 'button-save' %>
+    <%= hidden_field_tag :entity_id, entity.id %>
+    <%= f.button t(:save), class: 'button-save' %>
   </div>
 <% end %>

data/app/views/polls/_poll.html.erb

@@ -2,21 +2,26 @@
   <h1><%= poll.name %></h1>
 
   <% if poll.editable_by?(current_user) %>
-      <ul class="actions">
-        <li><%= gear_icon(admin_poll_path(id: poll.id)) %></li>
-      </ul>
+    <ul class="actions">
+      <li><%= gear_icon(admin_poll_path(id: poll.id)) %></li>
+    </ul>
   <% end %>
 
   <div class="description"><%= poll.description %></div>
 
-  <%= form_tag results_poll_path(id: poll.id), method: :post do %>
+  <% if @entity.voted?(current_user) %>
+    <div class="message-box-notice"><%= t('.you_have_voted') %></div>
+    <nav><%= link_to(t('.see_results'), results_poll_path(id: poll.id), class: 'button-nav') %></nav>
+  <% else %>
+    <%= form_tag results_poll_path(id: poll.id), method: :post do %>
       <%= render poll.poll_questions.ordered_by_priority %>
 
       <div class="buttons">
-        <%= button_tag t('.answer'), type: :submit %>
+        <%= button_tag t('.answer'), type: :submit, class: 'button-primary' %>
         <% if poll.open_results? %>
-            <%= link_to('Результаты', results_poll_path(id: poll.id), class: 'nav-button') %>
+          <%= link_to('Результаты', results_poll_path(id: poll.id), class: 'button-nav') %>
         <% end %>
       </div>
+    <% end %>
   <% end %>
 </article>

data/app/views/polls/edit.html.erb

@@ -1,11 +1,12 @@
 <% content_for :meta_title, t('.title') %>
 <% content_for :breadcrumbs do %>
-    <%= link_to(t('admin.polls.nav_item.text'), admin_polls_path) %>
-    <%= admin_poll_link(@entity) %>
-    <span><%= t(:edit) %></span>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <%= link_to(t('admin.polls.index.nav_text'), admin_polls_path) %>
+  <%= admin_poll_link(@entity) %>
+  <span><%= t('.nav_text') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">

data/app/views/polls/new.html.erb

@@ -1,7 +1,8 @@
 <% content_for :meta_title, t('.title') %>
 <% content_for :breadcrumbs do %>
-    <%= link_to(t('admin.polls.nav_item.text'), admin_polls_path) %>
-    <span><%= t(:create) %></span>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <%= link_to(t('admin.polls.index.nav_text'), admin_polls_path) %>
+  <span><%= t('.nav_text') %></span>
 <% end %>
 
 <article>

data/app/views/polls/results.html.erb

@@ -3,4 +3,26 @@
 <article>
   <h1><%= @entity.name %></h1>
   <h2><%= t('.heading') %></h2>
+
+  <% if component_handler.allow? %>
+    <ul class="actions">
+      <li><%= gear_icon(admin_poll_path(id: @entity.id)) %></li>
+    </ul>
+  <% end %>
+
+  <div class="biovision-poll-results">
+    <% @entity.poll_questions.list_for_visitors.each do |question| %>
+      <table>
+        <caption><%= question.text %></caption>
+        <tbody>
+        <% question.poll_answers.each do |answer| %>
+          <tr>
+            <th><%= answer.text %></th>
+            <td><%= answer.vote_percent %>%</td>
+          </tr>
+        <% end %>
+        </tbody>
+      </table>
+    <% end %>
+  </div>
 </article>

data/config/locales/polls-ru.yml

@@ -1,16 +1,16 @@
 ru:
-  poll_question_count:
-    zero: "вопросов нет"
-    one: "%{count} вопрос"
-    few: "%{count} вопроса"
-    many: "%{count} вопросов"
-    other: "%{count} вопросов"
   poll_answer_count:
     zero: "ответов нет"
     one: "%{count} ответ"
     few: "%{count} ответа"
     many: "%{count} ответов"
     other: "%{count} ответов"
+  poll_question_count:
+    zero: "вопросов нет"
+    one: "%{count} вопрос"
+    few: "%{count} вопроса"
+    many: "%{count} вопросов"
+    other: "%{count} вопросов"
   poll_vote_count:
     zero: "голосов нет"
     one: "%{count} голос"
@@ -27,51 +27,45 @@ ru:
     attributes:
       poll:
         active: "Можно голосовать"
+        allow_comments: "Разрешить комментарии"
         anonymous_votes: "Разрешить анонимные голоса"
         description: "Описание"
         end_date: "Дата окончания"
         exclusive: "Эксклюзивный"
-        image: "Картинка"
         name: "Название"
         open_results: "Результаты видны всем"
         pollable_id: "Связанный объект"
         pollable_type: "Тип связанного объекта"
-        region: "Регион"
-        region_id: "Регион"
         show_on_homepage: "Показывать на главной"
-        user: "Пользователь"
-        user_id: "Пользователь"
-        visible: "Показывать"
       poll_answer:
-        image: "Картинка"
         poll_question: "Вопрос"
         poll_question_id: "Вопрос"
-        priority: "Порядок сортировки"
         text: "Текст"
       poll_question:
         comment: "Комментарий"
-        image: "Картинка"
         multiple_choice: "Множественный выбор"
-        poll: "Опрос"
-        poll_id: "Опрос"
-        priority: "Порядок сортировки"
         text: "Текст"
-      poll_user:
-        poll: "Опрос"
-        user: "Пользователь"
-        user_id: "Пользователь"
       poll_vote:
-        slug: "Идентификатор"
         poll_answer: "Ответ"
-        user: "Пользователь"
+  attributes:
+    poll: "Опрос"
+    poll_id: "Опрос"
+  biovision:
+    components:
+      polls:
+        name: "Опросы"
+        settings:
+          answer_limit: "Лимит ответов"
+          question_limit: "Лимит вопросов"
   admin:
     polls:
       nav_item:
         description: "Управление опросами"
-        text: "Опросы"
+        text: "Список опросов"
       index:
-        heading: "Опросы"
+        heading: "Список опросов"
         title: "Опросы, страница %{page}"
+        nav_text: "Список опросов"
       show:
         title: "Опрос «%{name}»"
         allowed_users: "Допущенные пользователи"
@@ -96,9 +90,11 @@ ru:
     new:
       heading: "Новый опрос"
       title: "Новый опрос"
+      nav_text: "Создать опрос"
     edit:
       heading: "Редактирование опроса"
       title: "Редактирование опроса"
+      nav_text: "Редактировать"
     update:
       success: "Опрос успешно изменён"
     destroy:
@@ -124,6 +120,8 @@ ru:
       title: "Опрос «%{name}»"
     poll:
       answer: "Ответить"
+      you_have_voted: "Вы уже проголосовали"
+      see_results: "Посмотреть результаты"
     results:
       title: "Результаты опроса «%{name}»"
       heading: "Результаты опроса"
@@ -131,9 +129,11 @@ ru:
     new:
       heading: "Новый вопрос"
       title: "Новый вопрос"
+      nav_text: "Добавить вопрос"
     edit:
       heading: "Редактирование вопроса"
       title: "Редактирование вопроса"
+      nav_text: "Редактировать вопрос"
     update:
       success: "Вопрос успешно изменён"
     destroy:
@@ -150,9 +150,11 @@ ru:
     new:
       heading: "Новый ответ на вопрос"
       title: "Новый ответ на вопрос"
+      nav_text: "Добавить ответ"
     edit:
       heading: "Редактирование ответа на вопрос"
       title: "Редактирование ответа на вопрос"
+      nav_text: "Редактировать ответ"
     update:
       success: "Ответ на вопрос успешно изменён"
     destroy:

data/config/routes.rb

@@ -1,35 +1,39 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
+  concern :check do
+    post :check, on: :collection, defaults: { format: :json }
+  end
+
+  concern :toggle do
+    post :toggle, on: :member, defaults: { format: :json }
+  end
+
+  concern :priority do
+    post :priority, on: :member, defaults: { format: :json }
+  end
+
   resources :polls, :poll_questions, :poll_answers, only: %i[update destroy]
 
   scope '(:locale)', constraints: { locale: /ru|en|sv/ } do
-    resources :polls, except: %i[update destroy] do
+    resources :polls, except: %i[update destroy], concerns: :check do
       member do
         post 'results' => :answer
         get 'results'
       end
     end
-    resources :poll_questions, :poll_answers, only: %i[create edit]
+    resources :poll_questions, :poll_answers, only: %i[create edit], concerns: :check
 
     namespace :admin do
-      resources :polls, only: %i[index show] do
+      resources :polls, only: %i[index show], concerns: :toggle do
         member do
-          post 'toggle', defaults: { format: :json }
           get 'users'
           post 'users' => :add_user, defaults: { format: :json }
           delete 'users/:user_id' => :remove_user, as: :user, defaults: { format: :json }
         end
       end
-      resources :poll_questions, only: :show do
-        member do
-          post 'toggle', defaults: { format: :json }
-          post 'priority', defaults: { format: :json }
-        end
-      end
-      resources :poll_answers, only: :show do
-        member do
-          post 'priority', defaults: { format: :json }
-        end
-      end
+      resources :poll_questions, only: :show, concerns: %i[priority toggle]
+      resources :poll_answers, only: :show, concerns: :priority
     end
   end
 end

data/db/migrate/20200323000001_create_biovision_polls.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+# Create component entry and tables for polls component
+class CreateBiovisionPolls < ActiveRecord::Migration[5.1]
+  def up
+    create_component
+    create_polls unless Poll.table_exists?
+    create_poll_questions unless PollQuestion.table_exists?
+    create_poll_answers unless PollAnswer.table_exists?
+    create_poll_votes unless PollVote.table_exists?
+    create_poll_users unless PollUser.table_exists?
+  end
+
+  def down
+    drop_table :poll_users if PollUser.table_exists?
+    drop_table :poll_votes if PollVote.table_exists?
+    drop_table :poll_answers if PollAnswer.table_exists?
+    drop_table :poll_questions if PollQuestion.table_exists?
+    drop_table :polls if Poll.table_exists?
+  end
+
+  private
+
+  def create_component
+    attributes = {
+      slug: Biovision::Components::PollsComponent.slug,
+      settings: {
+        answer_limit: 10,
+        question_limit: 10
+      }
+    }
+    BiovisionComponent.create(attributes)
+  end
+
+  def create_polls
+    create_table :polls, comment: 'Polls' do |t|
+      t.uuid :uuid, null: false
+      t.references :language, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.references :user, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.references :simple_image, foreign_key: { on_update: :cascade, on_delete: :nullify }
+      t.references :agent, foreign_key: { on_update: :cascade, on_delete: :nullify }
+      t.inet :ip
+      t.integer :pollable_id
+      t.string :pollable_type
+      t.timestamps
+      t.boolean :visible, default: true, null: false
+      t.boolean :active, default: true, null: false
+      t.boolean :show_on_homepage, default: true, null: false
+      t.boolean :anonymous_votes, default: true, null: false
+      t.boolean :open_results, default: true, null: false
+      t.boolean :exclusive, default: false, null: false
+      t.boolean :allow_comments, default: true, null: false
+      t.date :end_date
+      t.integer :poll_questions_count, default: 0, null: false
+      t.integer :comments_count, default: 0, null: false
+      t.string :name
+      t.string :description
+      t.jsonb :data, default: {}, null: false
+    end
+
+    add_index :polls, :uuid, unique: true
+    add_index :polls, :data, using: :gin
+  end
+
+  def create_poll_questions
+    create_table :poll_questions, comment: 'Poll questions' do |t|
+      t.uuid :uuid, null: false
+      t.references :poll, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.references :simple_image, foreign_key: { on_update: :cascade, on_delete: :nullify }
+      t.integer :priority, limit: 2, default: 1, null: false
+      t.timestamps
+      t.integer :poll_answers_count, default: 0, null: false
+      t.boolean :multiple_choice, default: false, null: false
+      t.string :text, null: false
+      t.string :comment
+      t.jsonb :data, default: {}, null: false
+    end
+
+    add_index :poll_questions, :uuid, unique: true
+    add_index :poll_questions, :data, using: :gin
+  end
+
+  def create_poll_answers
+    create_table :poll_answers, comment: 'Answers for poll questions' do |t|
+      t.uuid :uuid, null: false
+      t.references :poll_question, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.references :simple_image, foreign_key: { on_update: :cascade, on_delete: :nullify }
+      t.integer :priority, limit: 2, default: 1, null: false
+      t.timestamps
+      t.integer :poll_votes_count, default: 0, null: false
+      t.string :text, null: false
+      t.jsonb :data, default: {}, null: false
+    end
+
+    add_index :poll_answers, :uuid, unique: true
+    add_index :poll_answers, :data, using: :gin
+  end
+
+  def create_poll_votes
+    create_table :poll_votes, comment: 'Votes for poll answers' do |t|
+      t.uuid :uuid, null: false
+      t.references :poll_answer, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.references :user, foreign_key: true, on_update: :cascade, on_delete: :cascade
+      t.references :agent, foreign_key: true, on_update: :cascade, on_delete: :nullify
+      t.inet :ip
+      t.timestamps
+      t.string :slug
+      t.jsonb :data, default: {}, null: false
+    end
+
+    add_index :poll_votes, :uuid, unique: true
+  end
+
+  def create_poll_users
+    create_table :poll_users, comment: 'Allowed users in exclusive polls' do |t|
+      t.timestamps
+      t.references :poll, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.references :user, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+    end
+  end
+end