biovision-poll 0.0.170908 → 0.1.180917.0

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

@@ -1,54 +1,62 @@
-<%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+<% model_name = entity.class.to_s.underscore %>
+<%= form_with model: entity, html: { id: "#{model_name}-form" } do |f| %>
+  <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+  <dl>
+    <% unless entity.id.nil? %>
+      <dt><%= t('activerecord.attributes.poll_question.poll_id') %></dt>
+      <dd><%= admin_poll_link(entity.poll) %></dd>
+    <% end %>
 
-<%= form_for entity do |f| %>
-<!--
-    <figure class="preview" id="poll-question-image">
-      <% if entity.image.blank? %>
-          <% image_path = 'biovision/base/placeholders/image.svg' %>
-      <% else %>
-          <% image_path = entity.image.url %>
-      <% end %>
-      <%= label_tag(:poll_question_image, image_tag(image_path, alt: t('activerecord.attributes.poll.image'))) %>
-      <figcaption>
-        <%= f.label :image %>
-        <%= f.file_field :image, accept: 'image/jpeg,image/png', data: { image: 'poll-question-image' } %>
-        <div class="guideline"><%= t('.guidelines.image') %></div>
-      </figcaption>
-    </figure>
--->
-
-    <dl>
-      <% unless entity.id.nil? %>
-          <dt><%= t('activerecord.attributes.poll_question.poll_id') %></dt>
-          <dd><%= admin_poll_link(entity.poll) %></dd>
-      <% end %>
+    <dt><%= f.label :priority %></dt>
+    <dd>
+      <%=
+        f.number_field(
+            :priority,
+            id:       "#{model_name}_priority",
+            in:       PollQuestion::PRIORITY_RANGE,
+            required: true
+        )
+      %>
+    </dd>
 
-      <dt><%= f.label :priority %></dt>
-      <dd>
-        <%= f.number_field :priority, in: PollQuestion::PRIORITY_RANGE, required: true %>
-      </dd>
+    <dt><%= f.label :text %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :text,
+            id:          "#{model_name}_text",
+            required:    true,
+            size:        nil,
+            maxlength:   PollQuestion::TEXT_LIMIT,
+            placeholder: t('.placeholders.text')
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.text') %></div>
+    </dd>
 
-      <dt><%= f.label :text %></dt>
-      <dd>
-        <%= f.text_field :text, required: true, size: nil, maxlength: PollQuestion::TEXT_LIMIT, placeholder: t('.placeholders.text') %>
-        <div class="guideline"><%= t('.guidelines.text') %></div>
-      </dd>
+<!--
+    <dt><%= f.label :comment %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :comment,
+            id:          "#{model_name}_comment",
+            size:        nil,
+            maxlength:   PollQuestion::COMMENT_LIMIT,
+            placeholder: t('.placeholders.comment')
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.comment') %></div>
+    </dd>
+-->
 
-      <dt><%= f.label :comment %></dt>
-      <dd>
-        <%= f.text_field :comment, size: nil, maxlength: PollQuestion::COMMENT_LIMIT, placeholder: t('.placeholders.comment') %>
-        <div class="guideline"><%= t('.guidelines.comment') %></div>
-      </dd>
-    </dl>
+    <%= render(partial: 'shared/forms/entity_flags', locals: { f: f }) %>
+  </dl>
 
-    <ul class="flags">
-      <% PollQuestion.toggleable_attributes.each do |flag| %>
-          <li><%= f.check_box flag %><%= f.label flag %></li>
-      <% end %>
-    </ul>
+  <%= render 'shared/forms/state_container' %>
 
-    <div class="buttons">
-      <%= f.hidden :poll_id if entity.id.nil? %>
-      <%= f.button t(:save), type: :submit %>
-    </div>
+  <div class="buttons">
+    <%= f.hidden_field :poll_id if entity.id.nil? %>
+    <%= f.button t(:save), type: :submit, class: 'button-save' %>
+  </div>
 <% end %>

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

@@ -0,0 +1,10 @@
+<section>
+  <h2><%= poll_question.text %></h2>
+  <% unless poll_question.comment.blank? %>
+      <div class="description"><%= poll_question.comment %></div>
+  <% end %>
+
+  <div class="answers">
+    <%= render poll_question.poll_answers.ordered_by_priority %>
+  </div>
+</section>

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

@@ -10,7 +10,7 @@
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">
-    <li><%= return_icon(admin_poll_question_path(@entity.id)) %></li>
+    <li><%= return_icon(admin_poll_question_path(id: @entity.id)) %></li>
     <li class="danger"><%= destroy_icon(@entity) %></li>
   </ul>
 

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

@@ -10,7 +10,7 @@
 
   <% unless @entity.poll_id.nil? %>
       <ul class="actions">
-        <li><%= return_icon(admin_poll_path(@entity.poll_id)) %></li>
+        <li><%= return_icon(admin_poll_path(id: @entity.poll_id)) %></li>
       </ul>
   <% end %>
 

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

@@ -1,46 +1,56 @@
-<%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+<% model_name = entity.class.to_s.underscore %>
+<%= form_with model: entity, html: { id: "#{model_name}-form" } do |f| %>
+  <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
 
-<%= form_for entity do |f| %>
-    <figure class="preview" id="poll-image">
-      <% if entity.image.blank? %>
-          <% image_path = 'biovision/base/placeholders/image.svg' %>
-      <% else %>
-          <% image_path = entity.image.url %>
-      <% end %>
-      <%= label_tag(:poll_image, image_tag(image_path, alt: t('activerecord.attributes.poll.image'))) %>
-      <figcaption>
-        <%= f.label :image %>
-        <%= f.file_field :image, accept: 'image/jpeg,image/png', data: { image: 'poll-image' } %>
-        <div class="guideline"><%= t('.guidelines.image') %></div>
-      </figcaption>
-    </figure>
+  <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>
-      <dt><%= f.label :name %></dt>
-      <dd>
-        <%= f.text_field :name, required: true, size: nil, maxlength: Poll::NAME_LIMIT, placeholder: t('.placeholders.name') %>
-        <div class="guideline"><%= t('.guidelines.name') %></div>
-      </dd>
+<!--
+    <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>
+-->
 
-      <dt><%= f.label :description %></dt>
-      <dd>
-        <%= f.text_field :description, size: nil, maxlength: Poll::DESCRIPTION_LIMIT, placeholder: t('.placeholders.description') %>
-        <div class="guideline"><%= t('.guidelines.description') %></div>
-      </dd>
+    <dt><%= f.label :end_date %></dt>
+    <dd>
+      <%=
+        f.date_field(
+            :end_date,
+            id:   "#{model_name}_end_date",
+            size: 10
+        )
+      %>
+    </dd>
 
-      <dt><%= f.label :end_date %></dt>
-      <dd>
-        <%= f.date_field :end_date %>
-      </dd>
-    </dl>
+    <%= render(partial: 'shared/forms/entity_flags', locals: { f: f }) %>
+  </dl>
 
-    <ul class="flags">
-      <% Poll.toggleable_attributes.each do |flag| %>
-          <li><%= f.check_box flag %><%= f.label flag %></li>
-      <% end %>
-    </ul>
+  <%= render 'shared/forms/state_container' %>
 
-    <div class="buttons">
-      <%= f.button t(:save), type: :submit %>
-    </div>
+  <div class="buttons">
+    <%= f.button t(:save), type: :submit, class: 'button-save' %>
+  </div>
 <% end %>

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

@@ -0,0 +1,11 @@
+<% if collection.any? %>
+    <ul class="biovision-polls">
+      <% collection.each do |entity| %>
+          <li>
+            <%= render partial: 'polls/entity/in_list', locals: { entity: entity } %>
+          </li>
+      <% end %>
+    </ul>
+<% else %>
+    <div class="message-box-warning"><%= t('.no_polls') %></div>
+<% end %>

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

@@ -0,0 +1,22 @@
+<article class="biovision-poll">
+  <h1><%= poll.name %></h1>
+
+  <% if poll.editable_by?(current_user) %>
+      <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 %>
+      <%= render poll.poll_questions.ordered_by_priority %>
+
+      <div class="buttons">
+        <%= button_tag t('.answer'), type: :submit %>
+        <% if poll.open_results? %>
+            <%= link_to('Результаты', results_poll_path(id: poll.id), class: 'nav-button') %>
+        <% end %>
+      </div>
+  <% end %>
+</article>

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

@@ -9,7 +9,7 @@
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">
-    <li><%= return_icon(admin_poll_path(@entity.id)) %></li>
+    <li><%= return_icon(admin_poll_path(id: @entity.id)) %></li>
     <li class="danger"><%= destroy_icon(@entity) %></li>
   </ul>
 

data/app/views/polls/entity/_in_list.html.erb

@@ -0,0 +1,20 @@
+<div class="name"><%= poll_link(entity) %></div>
+<% unless entity.description.blank? %>
+    <div class="description"><%= entity.description %></div>
+<% end %>
+<div class="info">
+  <div class="user"><%= user_link(entity.user) %></div>
+  <div class="question_count"><%= t(:poll_question_count, count: entity.poll_questions_count) %></div>
+  <% if entity.active? %>
+      <div class="state active">
+        <%= t('activerecord.attributes.poll.active') %>
+        <% unless entity.end_date.blank? %>
+            <%= t('.until') %> <%= time_tag(entity.end_date) %>
+        <% end %>
+      </div>
+  <% else %>
+      <div class="state inactive">
+        <%= t('.poll_ended') %>
+      </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,9 @@
+<% content_for :meta_title, t('.title', page: current_page) %>
+
+<article>
+  <h1><%= t('.heading') %></h1>
+
+  <%= paginate @collection %>
+  <%= render partial: 'list', locals: { collection: @collection } %>
+  <%= paginate @collection %>
+</article>

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

@@ -0,0 +1,6 @@
+<% content_for :meta_title, t('.title', name: @entity.name) %>
+
+<article>
+  <h1><%= @entity.name %></h1>
+  <h2><%= t('.heading') %></h2>
+</article>

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

@@ -0,0 +1,3 @@
+<% content_for :meta_title, t('.title', name: @entity.name) %>
+
+<%= render @entity %>

data/config/locales/polls-ru.yml

@@ -22,13 +22,15 @@ ru:
       poll: "Опрос"
       poll_answer: "Ответ на вопрос"
       poll_question: "Вопрос"
+      poll_user: "Допущенный к голосованию пользователь"
       poll_vote: "Голос в опросе"
     attributes:
       poll:
         active: "Можно голосовать"
-        anonymous_votes: "Разрешить анонммные голоса"
+        anonymous_votes: "Разрешить анонимные голоса"
         description: "Описание"
         end_date: "Дата окончания"
+        exclusive: "Эксклюзивный"
         image: "Картинка"
         name: "Название"
         open_results: "Результаты видны всем"
@@ -54,8 +56,12 @@ ru:
         poll_id: "Опрос"
         priority: "Порядок сортировки"
         text: "Текст"
+      poll_user:
+        poll: "Опрос"
+        user: "Пользователь"
+        user_id: "Пользователь"
       poll_vote:
-        footprint: "Отпечаток"
+        slug: "Идентификатор"
         poll_answer: "Ответ"
         user: "Пользователь"
   admin:
@@ -68,12 +74,24 @@ ru:
         title: "Опросы, страница %{page}"
       show:
         title: "Опрос «%{name}»"
+        allowed_users: "Допущенные пользователи"
+      users:
+        title: "Опрос «%{name}»: допущенные пользователи, страница %{page}"
+        heading: "Допущенные пользователи"
+      entity:
+        user_filter:
+          heading: "Добавить пользователя"
+          add_user: "Добавить пользователя"
     poll_questions:
       show:
         title: "Опрос «%{poll}»: %{question}"
     poll_answers:
       show:
         title: "Опрос «%{poll}»: %{question} — «%{answer}»"
+    index:
+      dashboard:
+        biovision_poll:
+          heading: "Опросы"
   polls:
     new:
       heading: "Новый опрос"
@@ -93,6 +111,22 @@ ru:
       placeholders:
         description: "Нужно проголосовать за лучший вариант"
         name: "О принятии какого-либо решения"
+    index:
+      title: "Опросы, страница %{page}"
+      heading: "Опросы"
+    list:
+      no_polls: "Опросов нет"
+    entity:
+      in_list:
+        until: "до"
+        poll_ended: "Опрос окончен"
+    show:
+      title: "Опрос «%{name}»"
+    poll:
+      answer: "Ответить"
+    results:
+      title: "Результаты опроса «%{name}»"
+      heading: "Результаты опроса"
   poll_questions:
     new:
       heading: "Новый вопрос"

data/config/routes.rb

@@ -1,18 +1,35 @@
-Biovision::Poll::Engine.routes.draw do
-  resources :polls
-  resources :poll_questions, :poll_answers, except: [:index, :new, :show]
+Rails.application.routes.draw do
+  resources :polls, :poll_questions, :poll_answers, only: %i[update destroy]
 
-  namespace :admin do
-    resources :polls, only: [:index, :show] do
+  scope '(:locale)', constraints: { locale: /ru|en|sv/ } do
+    resources :polls, except: %i[update destroy] do
       member do
-        post 'toggle', defaults: { format: :json }
+        post 'results' => :answer
+        get 'results'
       end
     end
-    resources :poll_questions, only: [:show] do
-      member do
-        post 'toggle', defaults: { format: :json }
+    resources :poll_questions, :poll_answers, only: %i[create edit]
+
+    namespace :admin do
+      resources :polls, only: %i[index show] 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
     end
-    resources :poll_answers, only: [:show]
   end
 end