biovision-poll 0.1.180917.0 → 0.2.200324.1

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

@@ -1,16 +1,17 @@
 <div class="data">
   <div><%= admin_user_link(entity.user) %></div>
   <div class="info">
-    <%= entity.ip %>,
     <%= time_tag(entity.created_at) %>
   </div>
   <div class="secondary info">
-    <%= t('activerecord.attributes.poll_vote.footprint') %>:
-    <%= entity.footprint %>
+    <%= t('attributes.slug') %>:
+    <%= entity.slug %>
   </div>
-  <% unless entity.agent.nil? %>
       <div class="secondary info">
         <%= entity.agent.name %>
       </div>
-  <% end %>
+  <div class="secondary info">
+    <%= entity.uuid %>
+  </div>
+  <%= render partial: 'admin/poll_votes/entity/data', locals: { entity: entity } %>
 </div>

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

@@ -1,6 +1,3 @@
-<div class="image">
-  <%= poll_image_preview(entity) %>
-</div>
 <div class="data">
   <div><%= admin_poll_link(entity) %></div>
   <% unless entity.description.blank? %>
@@ -39,6 +36,7 @@
   %>
 
   <ul class="actions">
+    <li><%= world_icon(poll_path(id: entity.id)) %></li>
     <li><%= edit_icon(edit_poll_path(id: entity.id)) %></li>
   </ul>
 </div>

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

@@ -1,16 +1,22 @@
 <% content_for :meta_title, t('.title', page: current_page) %>
 <% content_for :breadcrumbs do %>
-    <span><%= t('admin.polls.nav_item.text') %></span>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <span><%= t('.nav_text') %></span>
 <% end %>
 
 <article>
   <h1><%= t('.heading') %></h1>
+
   <ul class="actions">
     <li><%= back_icon(admin_path) %></li>
     <li><%= create_icon(new_poll_path) %></li>
   </ul>
 
   <%= paginate @collection %>
-  <%= render partial: 'shared/admin/list', locals: { collection: @collection } %>
+  <%=
+    render(
+        partial: 'shared/admin/list', locals: { collection: @collection }
+    )
+  %>
   <%= paginate @collection %>
 </article>

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

@@ -1,6 +1,7 @@
 <% content_for :meta_title, t('.title', name: @entity.name) %>
 <% content_for :breadcrumbs do %>
-  <%= link_to(t('admin.polls.nav_item.text'), admin_polls_path) %>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <%= link_to(t('admin.polls.index.nav_text'), admin_polls_path) %>
   <span><%= @entity.name %></span>
 <% end %>
 
@@ -25,43 +26,44 @@
     </nav>
   <% end %>
 
-  <% unless @entity.image.blank? %>
-    <figure>
-      <%= poll_image_medium(@entity) %>
-      <figcaption><%= t('activerecord.attributes.poll.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.name') %></dt>
-    <dd>
-      <%= @entity.name %>
-    </dd>
-
-    <% unless @entity.description.blank? %>
-      <dt><%= t('activerecord.attributes.poll.description') %></dt>
+    <div>
+      <dt><%= t('activerecord.attributes.poll.name') %></dt>
       <dd>
-        <%= @entity.description %>
+        <%= @entity.name %>
       </dd>
+    </div>
+
+    <% unless @entity.description.blank? %>
+      <div>
+        <dt><%= t('activerecord.attributes.poll.description') %></dt>
+        <dd>
+          <div class="text">
+            <%= @entity.description %>
+          </div>
+        </dd>
+      </div>
+    <% end %>
+
+    <% unless @entity.end_date.blank? %>
+      <div>
+        <dt><%= t('activerecord.attributes.poll.end_date') %></dt>
+        <dd><%= time_tag(@entity.end_date) %></dd>
+      </div>
     <% end %>
+
+    <%= render partial: 'shared/entity/uuid', locals: { entity: @entity } %>
+    <%= render partial: 'shared/entity/timestamps', locals: { entity: @entity } %>
   </dl>
 
+  <%= render partial: 'admin/polls/entity/data', locals: { entity: @entity } %>
+
   <%=
     render(
         partial: 'shared/admin/toggleable',
-        locals:  {
+        locals: {
             entity: @entity,
-            url:    toggle_admin_poll_path(id: @entity.id)
+            url: toggle_admin_poll_path(id: @entity.id)
         }
     )
   %>
@@ -72,7 +74,7 @@
     <%=
       render(
           partial: 'shared/admin/list_with_priority',
-          locals:  { collection: @entity.poll_questions.ordered_by_priority }
+          locals: { collection: @entity.poll_questions.ordered_by_priority }
       )
     %>
   </section>
@@ -84,7 +86,7 @@
       <%=
         render(
             partial: 'poll_questions/form',
-            locals:  { entity: @entity.poll_questions.new }
+            locals: { entity: @entity.poll_questions.new }
         )
       %>
     </section>

data/app/views/admin/polls/users.html.erb

@@ -1,6 +1,7 @@
 <% content_for :meta_title, t('.title', name: @entity.name, page: current_page) %>
 <% content_for :breadcrumbs do %>
-  <%= link_to(t('admin.polls.nav_item.text'), admin_polls_path) %>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <%= link_to(t('admin.polls.index.nav_text'), admin_polls_path) %>
   <%= admin_poll_link(@entity) %>
   <span><%= t('.heading') %></span>
 <% end %>

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

@@ -1,44 +1,50 @@
 <% 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_poll_questions_path }
+      }
+  ) do |f|
+%>
   <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
-  <dl>
+
+  <dl class="fields">
     <% unless entity.id.nil? %>
-      <dt><%= t('activerecord.attributes.poll_answer.poll_question_id') %></dt>
-      <dd><%= admin_poll_question_link(entity.poll_question) %></dd>
+      <div>
+        <dt><%= t('activerecord.attributes.poll_answer.poll_question_id') %></dt>
+        <dd><%= admin_poll_question_link(entity.poll_question) %></dd>
+      </div>
     <% end %>
 
-    <dt><%= f.label :priority %></dt>
-    <dd>
-      <%=
-        f.number_field(
-            :priority,
-            id:       "#{model_name}_priority",
-            in:       PollAnswer::PRIORITY_RANGE,
-            required: true
-        )
-      %>
-    </dd>
+    <%= render partial: 'shared/forms/priority', locals: { f: f } %>
 
-    <dt><%= f.label :text %></dt>
-    <dd>
-      <%=
-        f.text_field(
-            :text,
-            id:          "#{model_name}_text",
-            required:    true,
-            size:        nil,
-            maxlength:   PollAnswer::TEXT_LIMIT,
-            placeholder: t('.placeholders.text')
-        )
-      %>
-      <div class="guideline"><%= t('.guidelines.text') %></div>
-    </dd>
+    <div>
+      <dt><%= f.label :text %></dt>
+      <dd>
+        <%=
+          f.text_field(
+              :text,
+              class: 'input-text',
+              data: { check: :text },
+              maxlength: PollAnswer::TEXT_LIMIT,
+              placeholder: t('.placeholders.text'),
+              required: true,
+              size: nil
+          )
+        %>
+        <div class="check-result-error" data-field="name"></div>
+        <div class="guideline"><%= t('.guidelines.text') %></div>
+      </dd>
+    </div>
   </dl>
 
   <%= render 'shared/forms/state_container' %>
 
   <div class="buttons">
+    <%= hidden_field_tag :entity_id, entity.id %>
     <%= f.hidden_field :poll_question_id if entity.id.nil? %>
-    <%= f.button t(:save), type: :submit, class: 'button-save' %>
+    <%= f.button t(:save), class: 'button-save' %>
   </div>
 <% end %>

data/app/views/poll_answers/_poll_answer.html.erb

@@ -1,6 +1,26 @@
+<% question = poll_answer.poll_question %>
 <div>
   <% qid = poll_answer.poll_question_id %>
   <% field_id = "poll_votes_#{qid}_#{poll_answer.id}" %>
-  <%= radio_button_tag "poll_votes_#{qid}", poll_answer.id, false, required: true, id: field_id %>
+  <% if question.multiple_choice? %>
+    <%=
+      check_box_tag(
+          "answer[#{qid}][]",
+          poll_answer.id,
+          false,
+          id: field_id
+      )
+    %>
+  <% else %>
+    <%=
+      radio_button_tag(
+          "answer[#{qid}][]",
+          poll_answer.id,
+          false,
+          required: true,
+          id: field_id
+      )
+    %>
+  <% end %>
   <%= label_tag(field_id, poll_answer.text) %>
-</div>
+</div>

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

@@ -1,10 +1,11 @@
 <% 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.poll_question) %>
-    <%= admin_poll_answer_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.poll_question) %>
+  <%= admin_poll_answer_link(@entity) %>
+  <span><%= t('.nav_text') %></span>
 <% end %>
 
 <article class="entity-page">

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

@@ -1,18 +1,19 @@
 <% 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? %>
-    <%= admin_poll_question_link(@entity.poll_question) unless @entity.poll_question.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? %>
+  <%= admin_poll_question_link(@entity.poll_question) unless @entity.poll_question.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_question_path(id: @entity.poll_question_id)) %></li>
-      </ul>
+    <ul class="actions">
+      <li><%= return_icon(admin_poll_question_path(id: @entity.poll_question_id)) %></li>
+    </ul>
   <% end %>
 
   <%= render partial: 'form', locals: { entity: @entity } %>

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

@@ -1,53 +1,62 @@
 <% 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_poll_questions_path }
+      }
+  ) do |f|
+%>
   <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
-  <dl>
+
+  <dl class="fields">
     <% unless entity.id.nil? %>
-      <dt><%= t('activerecord.attributes.poll_question.poll_id') %></dt>
-      <dd><%= admin_poll_link(entity.poll) %></dd>
+      <div>
+        <dt><%= t('attributes.poll') %></dt>
+        <dd><%= admin_poll_link(entity.poll) %></dd>
+      </div>
     <% end %>
 
-    <dt><%= f.label :priority %></dt>
-    <dd>
-      <%=
-        f.number_field(
-            :priority,
-            id:       "#{model_name}_priority",
-            in:       PollQuestion::PRIORITY_RANGE,
-            required: true
-        )
-      %>
-    </dd>
+    <%= render partial: 'shared/forms/priority', locals: { f: f } %>
 
-    <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>
+    <div>
+      <dt><%= f.label :text %></dt>
+      <dd>
+        <%=
+          f.text_field(
+              :text,
+              class: 'input-text',
+              data: { check: :name },
+              maxlength: PollQuestion::TEXT_LIMIT,
+              placeholder: t('.placeholders.text'),
+              required: true,
+              size: nil
+          )
+        %>
+        <div class="check-result-error" data-field="name"></div>
+        <div class="guideline"><%= t('.guidelines.text') %></div>
+      </dd>
+    </div>
 
 <!--
-    <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>
+    <div>
+      <dt><%= f.label :comment %></dt>
+      <dd>
+        <%=
+          f.text_field(
+              :comment,
+              class: 'input-text',
+              data: { check: :comment },
+              maxlength: PollQuestion::COMMENT_LIMIT,
+              placeholder: t('.placeholders.comment'),
+              size: nil
+          )
+        %>
+        <div class="check-result-error" data-field="comment"></div>
+        <div class="guideline"><%= t('.guidelines.comment') %></div>
+      </dd>
+    </div>
 -->
 
     <%= render(partial: 'shared/forms/entity_flags', locals: { f: f }) %>
@@ -56,7 +65,8 @@
   <%= render 'shared/forms/state_container' %>
 
   <div class="buttons">
+    <%= hidden_field_tag :entity_id, entity.id %>
     <%= f.hidden_field :poll_id if entity.id.nil? %>
-    <%= f.button t(:save), type: :submit, class: 'button-save' %>
+    <%= f.button t(:save), class: 'button-save' %>
   </div>
 <% end %>