decidim-elections 0.22.0 → 0.23.0

data/app/services/decidim/elections/election_search.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Elections
+    # This class handles search and filtering of elections.
+    class ElectionSearch < ResourceSearch
+      # Public: Initializes the service.
+      # component     - A Decidim::Component to get the election from.
+      # page        - The page number to paginate the results.
+      # per_page    - The number of proposals to return per page.
+      def initialize(options = {})
+        super(Election.all, options)
+      end
+
+      # Handle the search_text filter
+      def search_search_text
+        query
+          .where("decidim_elections_elections.title::text ILIKE ?", "%#{search_text}%")
+          .or(query.where("decidim_elections_elections.description::text ILIKE ?", "%#{search_text}%"))
+      end
+
+      # Handle the state filter
+      def search_state
+        active = state.member?("active") ? query.active : nil
+        upcoming = state.member?("upcoming") ? query.upcoming : nil
+        finished = state.member?("finished") ? query.finished : nil
+
+        query
+          .where(id: upcoming)
+          .or(query.where(id: active))
+          .or(query.where(id: finished))
+      end
+    end
+  end
+end

data/app/types/decidim/elections/election_question_type.rb

@@ -15,10 +15,10 @@ module Decidim
       field :id, !types.ID, "The internal ID of this question"
       field :title, !Decidim::Core::TranslatedFieldType, "The title for this question"
       field :description, !Decidim::Core::TranslatedFieldType, "The description for this question"
-      field :maxSelections, !types.Int, "The maximum number of posible selections for this question", property: :max_selections
+      field :maxSelections, !types.Int, "The maximum number of possible selections for this question", property: :max_selections
       field :weight, types.Int, "The ordering weight for this question"
       field :randomAnswersOrder, types.Boolean, "Should this question order answers in random order?", property: :random_answers_order
-
+      field :minSelections, !types.Int, "The minimum number of possible selections for this question", property: :min_selections
       field :answers, !types[Decidim::Elections::ElectionAnswerType], "The answers for this question"
     end
   end

data/app/types/decidim/elections/election_type.rb

@@ -5,6 +5,7 @@ module Decidim
     # This type represents an Election.
     ElectionType = GraphQL::ObjectType.define do
       interfaces [
+        -> { Decidim::Core::AttachableInterface },
         -> { Decidim::Core::TraceableInterface }
       ]
 
@@ -13,12 +14,12 @@ module Decidim
 
       field :id, !types.ID, "The internal ID of this election"
       field :title, !Decidim::Core::TranslatedFieldType, "The title for this election"
-      field :subtitle, !Decidim::Core::TranslatedFieldType, "The subtitle for this election"
       field :description, !Decidim::Core::TranslatedFieldType, "The description for this election"
       field :startTime, !Decidim::Core::DateTimeType, "The start time for this election", property: :start_time
       field :endTime, !Decidim::Core::DateTimeType, "The end time for this election", property: :end_time
       field :createdAt, Decidim::Core::DateTimeType, "When this election was created", property: :created_at
       field :updatedAt, Decidim::Core::DateTimeType, "When this election was updated", property: :updated_at
+      field :publishedAt, Decidim::Core::DateTimeType, "When this election was published", property: :published_at
 
       field :questions, !types[Decidim::Elections::ElectionQuestionType], "The questions for this election"
     end

data/app/types/decidim/elections/elections_type.rb

@@ -25,7 +25,7 @@ module Decidim
 
     module ElectionsTypeHelper
       def self.base_scope(component)
-        Election.where(component: component)
+        Election.where(component: component).where.not(published_at: nil)
       end
     end
   end

data/app/views/decidim/elections/admin/answers/index.html.erb

@@ -6,6 +6,7 @@
       <%= t(".title") %>
 
       <%= link_to t("actions.new", scope: "decidim.elections", name: t("models.answer.name", scope: "decidim.elections.admin")), new_election_question_answer_path(election, question), class: "button tiny button--title" if allowed_to? :create, :answer, election: election, question: question %>
+      <%= link_to t("actions.import", scope: "decidim.elections", name: t("models.answer.name", scope: "decidim.elections.admin")), new_election_question_proposals_import_path(election, question), class: "button tiny button--title" if allowed_to? :import_proposals, :answer, election: election, question: question %>
     </h2>
   </div>
 
@@ -23,7 +24,7 @@
           <% answers.each do |answer| %>
             <tr data-id="<%= question.id %>">
               <td>
-                <%= link_to translated_attribute(answer.title), edit_election_question_answer_path(election, question, answer) %>
+                <%= translated_attribute(answer.title) %>
               </td>
               <td>
                 <%= answer.linked_resources(:proposals, "related_proposals").count %>

data/app/views/decidim/elections/admin/elections/_form.html.erb

@@ -8,10 +8,6 @@
       <%= form.translated :text_field, :title, autofocus: true %>
     </div>
 
-    <div class="row column">
-      <%= form.translated :text_field, :subtitle %>
-    </div>
-
     <div class="row column">
       <%= form.translated :editor, :description %>
     </div>
@@ -24,5 +20,7 @@
         <%= form.datetime_field :end_time %>
       </div>
     </div>
+
+    <%= render partial: "decidim/admin/shared/gallery", locals: { form: form } %>
   </div>
 </div>

data/app/views/decidim/elections/admin/elections/index.html.erb

@@ -22,7 +22,7 @@
           <% elections.each do |election| %>
             <tr data-id="<%= election.id %>">
               <td>
-                <%= link_to translated_attribute(election.title), election_questions_path(election) %>
+                <%= link_to translated_attribute(election.title), resource_locator(election).path %>
               </td>
               <td>
                 <% if election.start_time %>
@@ -37,12 +37,34 @@
               <td class="table-list__actions">
                 <%= icon_link_to "eye", resource_locator(election).path, t("actions.preview", scope: "decidim.elections"), class: "action-icon--preview", target: :blank %>
 
+                <%= icon_link_to "list", election_questions_path(election), t("actions.edit_questions", scope: "decidim.elections"), class: "action-icon--edit-questions" %>
+
                 <% if allowed_to? :update, :election, election: election %>
                   <%= icon_link_to "pencil", edit_election_path(election), t("actions.edit", scope: "decidim.elections"), class: "action-icon--edit" %>
+                <% else %>
+                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img" %>
+                <% end %>
+
+                <% if election.published? %>
+                  <% if allowed_to?(:unpublish, :election, election: election) %>
+                    <%= icon_link_to "x", url_for(action: :unpublish, id: election, controller: "elections"), t("actions.unpublish", scope: "decidim.elections"), class: "action-icon--unpublish", method: :put %>
+                  <% else %>
+                    <%= icon "x", class: "action-icon action-icon--disabled", role: "img" %>
+                  <% end %>
+                <% else %>
+                  <% if allowed_to?(:publish, :election, election: election) %>
+                    <%= icon_link_to "check", url_for(action: :publish, id: election, controller: "elections"), t("actions.publish", scope: "decidim.elections"), class: "action-icon--publish", method: :put %>
+                  <% else %>
+                    <%= icon "check", class: "action-icon action-icon--disabled", role: "img" %>
+                  <% end %>
                 <% end %>
 
+                <%= resource_permissions_link(election) %>
+
                 <% if allowed_to? :delete, :election, election: election %>
                   <%= icon_link_to "circle-x", election_path(election), t("actions.destroy", scope: "decidim.elections"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.elections") } %>
+                <% else %>
+                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
                 <% end %>
               </td>
             </tr>

data/app/views/decidim/elections/admin/proposals_imports/new.html.erb

@@ -0,0 +1,24 @@
+<%= decidim_form_for(@form, url: election_question_proposals_import_path, html: { class: "form import_proposals" }) do |f| %>
+  <% if @form.origin_components.any? %>
+    <div class="card">
+      <div class="card-divider">
+        <h2 class="card-title"><%= title %></h2>
+      </div>
+
+      <div class="card-section">
+        <div class="row column">
+          <%= f.select :origin_component_id, @form.origin_components_collection, prompt: t(".select_component") %>
+        </div>
+        <div class="row column">
+          <%= f.check_box :import_all_accepted_proposals %>
+        </div>
+      </div>
+    </div>
+
+    <div class="button--double form-general-submit">
+      <%= f.submit t(".create") %>
+    </div>
+  <% else %>
+    <p><%= t(".no_components") %></p>
+  <% end %>
+<% end %>

data/app/views/decidim/elections/admin/questions/_form.html.erb

@@ -23,5 +23,9 @@
     <div class="row column">
       <%= form.check_box :random_answers_order %>
     </div>
+
+    <div class="row column">
+      <%= form.check_box :min_selections, {}, "0", "1" %>
+    </div>
   </div>
 </div>

data/app/views/decidim/elections/admin/questions/index.html.erb

@@ -23,7 +23,7 @@
           <% questions.each do |question| %>
             <tr data-id="<%= question.id %>">
               <td>
-                <%= link_to translated_attribute(question.title), election_question_answers_path(election, question) %>
+                <%= translated_attribute(question.title) %>
               </td>
               <td>
                 <%= question.answers.count %>
@@ -36,6 +36,8 @@
                 <% end %>
               </td>
               <td class="table-list__actions">
+                <%= icon_link_to "list", election_question_answers_path(election, question), t("actions.edit_answers", scope: "decidim.elections"), class: "action-icon--edit-answers" %>
+
                 <% if allowed_to? :update, :question, election: election, question: question %>
                   <%= icon_link_to "pencil", edit_election_question_path(election, question), t("actions.edit", scope: "decidim.elections"), class: "action-icon--edit" %>
                 <% end %>

data/app/views/decidim/elections/elections/_count.html.erb

@@ -0,0 +1 @@
+<%= t(".elections_count", count: paginated_elections.total_count) %>

data/app/views/decidim/elections/elections/_election.html.erb

@@ -0,0 +1 @@
+<%= card_for election, from: election %>

data/app/views/decidim/elections/elections/_elections.html.erb

@@ -0,0 +1,24 @@
+<% if elections.none? %>
+  <div class="callout warning">
+    <%= t("decidim.elections.warnings.no_elections_warning") %>
+  </div>
+<% elsif scheduled_elections.none? %>
+  <div class="callout warning">
+    <%= t("decidim.elections.warnings.no_scheduled_elections_warning") %>
+  </div>
+<% end %>
+
+<div class="collection-sort-controls row small-up-1 medium-up-3 card-grid">
+  <div class="column">
+    <%= order_selector available_orders, i18n_scope: "decidim.elections.orders" %>
+  </div>
+  <div class="column">
+    <%= render partial: "decidim/shared/results_per_page" %>
+  </div>
+</div>
+
+<div class="row small-up-1 medium-up-2 card-grid">
+  <%= render paginated_elections %>
+</div>
+
+<%= decidim_paginate paginated_elections %>

data/app/views/decidim/elections/elections/_filters.html.erb

@@ -0,0 +1,24 @@
+<%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "elections" } %>
+
+<%= filter_form_for filter do |form| %>
+  <div class="filters__section">
+    <div class="filters__search">
+      <div class="input-group">
+        <%= form.search_field :search_text,
+                              label: false,
+                              class: "input-group-field",
+                              placeholder: t(".search"),
+                              title: t(".search"),
+                              data: { disable_dynamic_change: true } %>
+        <div class="input-group-button">
+          <button type="submit" class="button" aria-controls="elections">
+            <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <%= form.check_boxes_tree :state, state_filter_values, legend_title: t(".state") %>
+  <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
+<% end %>

data/app/views/decidim/elections/elections/_filters_small_view.html.erb

@@ -0,0 +1,18 @@
+<div class="filters-controls hide-for-mediumlarge">
+  <button data-open="filter-box" class="filters-controls__trigger">
+    <%= t ".filter" %>
+    <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t(".unfold"), role: "img" %>
+  </button>
+</div>
+
+<div class="reveal" id="filter-box" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
+    <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="filters">
+    <%= render partial: "filters" %>
+  </div>
+</div>

data/app/views/decidim/elections/elections/index.html.erb

@@ -1 +1,25 @@
 <%= render partial: "decidim/shared/component_announcement" %>
+
+<section class="section row">
+  <div class="columns">
+    <div class="row">
+      <h2 id="elections-count" class="order-by__text section-heading">
+        <%= render partial: "count" %>
+      </h2>
+    </div>
+
+    <div class="row">
+      <div class="columns mediumlarge-4 large-3">
+        <%= render partial: "filters_small_view" %>
+        <div class="card card--secondary show-for-mediumlarge">
+          <%= render partial: "filters" %>
+        </div>
+      </div>
+      <div id="elections" class="columns mediumlarge-8 large-9" aria-live="polite">
+        <%= render partial: "elections" %>
+      </div>
+    </div>
+  </div>
+</section>
+
+<%= javascript_include_tag("decidim/filters") %>

data/app/views/decidim/elections/elections/index.js.erb

@@ -0,0 +1,10 @@
+var $elections = $('#elections');
+var $electionsCount = $('#elections-count');
+var $orderFilterInput = $('.order_filter');
+
+$elections.html('<%= j(render partial: "elections").strip.html_safe %>');
+$electionsCount.html('<%= j(render partial: "count").strip.html_safe %>');
+$orderFilterInput.val('<%= order %>');
+
+var $dropdownMenu = $('.dropdown.menu', $elections);
+$dropdownMenu.foundation();

data/app/views/decidim/elections/elections/show.html.erb

@@ -0,0 +1,62 @@
+<% add_decidim_meta_tags(
+  title: translated_attribute(election.title),
+  description: translated_attribute(election.description)
+) %>
+
+<%
+edit_link(
+  resource_locator(election).edit,
+  :update,
+  :election,
+  election: election
+)
+%>
+
+<%= render partial: "decidim/shared/component_announcement" %>
+
+<div class="row">
+  <div class="columns">
+
+    <% unless single? %>
+      <%= link_to :elections, class: "small hollow" do %>
+        <%= icon "caret-left", class: "icon--small" %>
+        <%= t(".back") %>
+      <% end %>
+    <% end %>
+
+    <h1 class="heading2">
+      <%== present(election).title %>
+    </h1>
+    <p>
+      <%= t(".voting_period_status.#{election.voting_period_status}",
+            start_time: "<strong>#{l election.start_time, format: :long}</strong>",
+            end_time: "<strong>#{l election.end_time, format: :long}</strong>").html_safe %>
+    </p>
+  </div>
+</div>
+<div class="row section">
+  <% if election.attachments.first.present? && election.attachments.first.file.content_type.start_with?("image") %>
+    <div class="columns medium-4 mediumlarge-5">
+      <img src="<%= election.attachments.first.url %>" alt="">
+    </div>
+  <% end %>
+  <div class="columns medium-8 mediumlarge-7">
+    <div class="section">
+      <%= decidim_sanitize(simple_format(translated_attribute(election.description))) %>
+
+      <% if election.published? && election.ongoing? %>
+        <%= action_authorized_link_to :vote, new_election_vote_path(election.id), resource: election, class: "title-action__action button small" do %>
+          <%= t(".vote") %>
+        <% end %>
+      <% else %>
+        <span class="title-action__action button small disabled"><%= t(".vote") %></span>
+      <% end %>
+
+      <% if allowed_to? :preview, :election, election: election %>
+        <%= link_to new_election_vote_path(election.id), class: "title-action__action button small" do %>
+          <%= t(".preview") %>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/elections/votes/_election_votes_confirm.html.erb

@@ -0,0 +1,53 @@
+<%= render("election_votes_header", header_title: t("decidim.elections.votes.header.confirm")) %>
+
+<div class="focus__content evote">
+  <div class="row">
+    <h1 class="heading2">
+      <%= t("decidim.elections.votes.confirm.header") %>
+    </h1>
+    <p>
+      <%= t("decidim.elections.votes.confirm.intro").html_safe %>
+    </p>
+
+    <dl class="evote__confirm">
+      <dt>
+        <% questions.each_with_index do |question, question_index| %>
+          <strong class="evote__confirm-label">
+            <%= t("decidim.elections.votes.confirm.question", count: question_index + 1) %>:
+           </strong>
+          <strong>
+            <%= translated_attribute(question.title) %>
+          </strong>
+          <dd id="edit-step-<%= question_index+1 %>">
+            <strong class="evote__confirm-label">
+              <%= t("decidim.elections.votes.confirm.answer") %>
+              (<%= link_to(
+                  "#{t("decidim.elections.votes.confirm.edit")}<span class='show-for-sr'>
+                    #{t("decidim.elections.votes.confirm.answer_number", number: question_index + 1)}</span>".html_safe,
+                  "#",
+                  class: "evote__edit-answer",
+                  data: {
+                    toggle: ["step-#{question_index}", "step-#{questions_count}"].join(" ")
+                  }
+                ) %>):
+            </strong>
+            <ul>
+              <% question.answers.each do |answer| %>
+                <li class="confirmed_answer hide" id="<%= answer.id %>">
+                  <%= translated_attribute(answer.title) %>
+                </li>
+              <% end %>
+              <% if question.min_selections == 0 %>
+                <li class="<%= "hide nota_input_#{question.id}" %>">
+                  <%= t("decidim.elections.votes.confirm.nota_option") %>
+                </li>
+              <% end %>
+            </ul>
+          </dd>
+        <% end %>
+      </dt>
+    </dl>
+  </div>
+</div>
+
+<%= render("election_votes_confirm_footer") %>