decidim-elections 0.23.3 → 0.24.1

data/app/queries/decidim/votings/published_votings.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    # This query filters published votings only.
+    class PublishedVotings < Rectify::Query
+      def query
+        Decidim::Votings::Voting.published
+      end
+    end
+  end
+end

data/app/services/decidim/votings/voting_search.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    # Service that encapsulates all logic related to filtering votings.
+    class VotingSearch < Searchlight::Search
+      # Public: Initializes the service.
+      # page        - The page number to paginate the results.
+      # per_page    - The number of proposals to return per page.
+      def initialize(options = {})
+        super(options)
+      end
+
+      def base_query
+        Decidim::Votings::Voting.where(organization: options[:organization]).published
+      end
+
+      # Handle the search_text filter
+      def search_search_text
+        query
+          .where("title->>'#{current_locale}' ILIKE ?", "%#{search_text}%")
+          .or(
+            query.where("description->>'#{current_locale}' 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
+
+      private
+
+      def current_locale
+        I18n.locale.to_s
+      end
+    end
+  end
+end

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

@@ -30,12 +30,24 @@
                 <%= answer.linked_resources(:proposals, "related_proposals").count %>
               </td>
               <td class="table-list__actions">
+                <% if election.results? %>
+                  <% if answer.selected %>
+                    <%= icon_link_to "circle-check", unselect_election_question_answer_path(election, question, answer), t("answers.select.disable", scope: "decidim.elections.admin"), class: "action-icon--success", method: :put %>
+                  <% else %>
+                    <%= icon_link_to "circle-x", select_election_question_answer_path(election, question, answer), t("answers.select.enable", scope: "decidim.elections.admin"), class: "action-icon", method: :put %>
+                  <% end %>
+                <% end %>
+
                 <% if allowed_to? :update, :answer, election: election, question: question, answer: answer %>
                   <%= icon_link_to "pencil", edit_election_question_answer_path(election, question, answer), t("actions.edit", scope: "decidim.elections"), class: "action-icon--edit" %>
+                <% else %>
+                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img" %>
                 <% end %>
 
                 <% if allowed_to? :delete, :answer, election: election, question: question, answer: answer %>
                   <%= icon_link_to "circle-x", election_question_answer_path(election, question, answer), 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/elections/index.html.erb

@@ -15,6 +15,7 @@
             <th><%= t("models.election.fields.title", scope: "decidim.elections") %></th>
             <th><%= t("models.election.fields.start_time", scope: "decidim.elections") %></th>
             <th><%= t("models.election.fields.end_time", scope: "decidim.elections") %></th>
+            <th><%= t("models.election.fields.bb_status", scope: "decidim.elections") %></th>
             <th class="actions"><%= t("actions.title", scope: "decidim.elections") %></th>
           </tr>
         </thead>
@@ -34,10 +35,15 @@
                   <%= l election.end_time, format: :long %>
                 <% end %>
               </td>
+              <td><%= t("steps.#{election.bb_status || "create_election"}.title", scope: "decidim.elections.admin") %></td>
               <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" %>
+                <%= icon_link_to "list", election_questions_path(election), t("actions.manage_questions", scope: "decidim.elections"), class: "action-icon--manage-questions" %>
+
+                <% if allowed_to? :read, :steps, election: election %>
+                  <%= icon_link_to "project", election_steps_path(election), t("actions.manage_steps", scope: "decidim.elections"), class: "action-icon--manage-steps" %>
+                <% end %>
 
                 <% 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" %>
@@ -45,6 +51,12 @@
                   <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img" %>
                 <% end %>
 
+                <% if allowed_to? :update, :questionnaire, questionnaire: election.questionnaire %>
+                  <%= icon_link_to "people", edit_feedback_form_path(election), t("actions.feedback", scope: "decidim.elections"), class: "action-icon--survey" %>
+                <% else %>
+                  <%= icon "people", 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 %>

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

@@ -2,7 +2,7 @@
   <% if @form.origin_components.any? %>
     <div class="card">
       <div class="card-divider">
-        <h2 class="card-title"><%= title %></h2>
+        <h2 class="card-title"><%= t(".title") %></h2>
       </div>
 
       <div class="card-section">

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

@@ -36,14 +36,18 @@
                 <% 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" %>
+                <%= icon_link_to "list", election_question_answers_path(election, question), t("actions.manage_answers", scope: "decidim.elections"), class: "action-icon--manage-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" %>
+                <% else %>
+                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img" %>
                 <% end %>
 
                 <% if allowed_to? :delete, :question, election: election, question: question %>
                   <%= icon_link_to "circle-x", election_question_path(election, question), 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/shared/_trustees_secondary_nav.html.erb

@@ -0,0 +1,3 @@
+<li <% if is_active_link?(engine_router.trustees_path) %> class="is-active" <% end %>>
+    <%= aria_selected_link_to "Trustees", engine_router.trustees_path %>
+</li>

data/app/views/decidim/elections/admin/steps/_create_election.html.erb

@@ -0,0 +1,38 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %></h2>
+  </div>
+
+  <div class="card-section">
+    <ul class="no-bullet-indented">
+      <% form.messages.each do |key, value| %>
+        <% if form.errors.include?(key) %>
+          <li><%= icon "x", role: "img", "aria-hidden": true %>&nbsp;<%= form.errors.messages[key][0].html_safe %></li>
+        <% else %>
+          <li><%= icon "check", role: "img", "aria-hidden": true %>&nbsp;<%= value.html_safe %></li>
+        <% end %>
+      <% end %>
+    </ul>
+
+    <h4><%= t(".trustees") %></h4>
+    <ul class="no-bullet-indented">
+      <% if form.participatory_space_trustees.none? %>
+        <li><%= t(".no_trustees") %></li>
+      <% end %>
+
+      <% form.participatory_space_trustees.map {|trustee| [trustee, form.trustees.none? || form.trustees.include?(trustee)] }
+                                          .sort_by {|trustee, used| used ? 0 : 1}
+                                          .each do |trustee, used| %>
+        <li <%= "class=text-muted" if !used %>>
+          <%= icon trustee.public_key ? "check" : "x", role: "img", "aria-hidden": true %>
+          <%= trustee.user.name || trustee.name %> <%= t(".public_key.#{used}").html_safe %>
+          <% if used %>
+            <%= f.hidden_field :trustee_ids, multiple: true, value: trustee.id %>
+          <% else %>
+            <%= t(".not_used_trustee") %>
+          <% end %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>

data/app/views/decidim/elections/admin/steps/_created.html.erb

@@ -0,0 +1,16 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %></h2>
+  </div>
+
+  <div class="card-section">
+    <h4><%= t(".trustees") %></h4>
+    <ul>
+      <% election.trustees.each do |trustee| %>
+        <li>
+          <%= trustee.name %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>

data/app/views/decidim/elections/admin/steps/_key_ceremony.html.erb

@@ -0,0 +1,16 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %></h2>
+  </div>
+
+  <div class="card-section">
+    <h4><%= t(".trustees") %></h4>
+    <ul>
+      <% election.trustees.each do |trustee| %>
+        <li>
+          <%= trustee.name %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>

data/app/views/decidim/elections/admin/steps/_key_ceremony_ended.html.erb

@@ -0,0 +1,15 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %></h2>
+  </div>
+
+  <div class="card-section">
+    <% form.messages.each do |key, value| %>
+      <% if form.errors.include?(key) %>
+        <p><%= form.errors.messages[key][0].html_safe %></p>
+      <% else %>
+        <p><%= value.html_safe %></p>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/elections/admin/steps/_tally.html.erb

@@ -0,0 +1,17 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %></h2>
+  </div>
+
+  <div class="card-section">
+    <h4><%= t(".trustees") %></h4>
+    <ul>
+      <% election.trustees.each do |trustee| %>
+        <li>
+          <%= trustee.name %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+  </div>
+</div>

data/app/views/decidim/elections/admin/steps/_tally_ended.html.erb

@@ -0,0 +1,9 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %></h2>
+  </div>
+
+  <div class="card-section">
+    Tally ended
+  </div>
+</div>

data/app/views/decidim/elections/admin/steps/_vote.html.erb

@@ -0,0 +1,21 @@
+<div id="vote-stats" data-refresh-url="<%= election_step_stats_path(election, current_step) %>">
+  <%= render(partial: "vote_stats") %>
+</div>
+
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %></h2>
+  </div>
+
+  <div class="card-section">
+    <% form.messages.each do |key, value| %>
+      <% if form.errors.include?(key) %>
+        <p><%= form.errors.messages[key][0].html_safe %></p>
+      <% else %>
+        <p><%= value.html_safe %></p>
+      <% end %>
+    <% end %>
+  </div>
+</div>
+
+<%= javascript_include_tag("decidim/elections/admin/vote_statistics") %>

data/app/views/decidim/elections/admin/steps/_vote_ended.html.erb

@@ -0,0 +1,15 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %></h2>
+  </div>
+
+  <div class="card-section">
+    <% form.messages.each do |key, value| %>
+      <% if form.errors.include?(key) %>
+        <p><%= form.errors.messages[key][0].html_safe %></p>
+      <% else %>
+        <p><%= value.html_safe %></p>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/elections/admin/steps/_vote_stats.html.erb

@@ -0,0 +1,31 @@
+<div class="card" data-vote-status="<%= election.bb_status %>">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
+    </h2>
+  </div>
+  <div class="table-scroll">
+    <% if vote_stats.values.sum == 0 %>
+      <div class="card-section">
+        <p><%= t(".no_vote_statistics_yet") %></p>
+      </div>
+    <% else %>
+    <table class="table-list users_count">
+      <thead>
+        <tr>
+          <th></th>
+          <th><%= t(".votes") %></th>
+          <th><%= t(".voters") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td></td>
+          <td><%= vote_stats[:votes] %></td>
+          <td><%= vote_stats[:voters] %></td>
+        </tr>
+      </tbody>
+    </table>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,43 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= translated_attribute(election.title) %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <% steps(current_step).each_with_index do |step, i| %>
+      <% if i > 0 %>&nbsp;&gt;&nbsp;<% end %>
+      <span class="<%= step.last %>"><%= t("steps.#{step.first}.title", scope: "decidim.elections.admin") %></span>
+    <% end %>
+  </div>
+</div>
+
+<% if @form %>
+  <%= decidim_form_for(@form, url: election_step_path(election, current_step), method: :patch, html: { class: "form step #{current_step}" }) do |f| %>
+    <%= render partial: current_step.to_s, locals: { form: @form, f: f } %>
+
+    <div class="button--double form-general-submit">
+      <%= f.hidden_field :current_step %>
+      <%= f.button type: :submit, class: "button", disabled: @form.invalid? do %>
+        <% if @form.pending_action %>
+          <span class='loading-spinner'></span> <%= t("steps.processing", scope: "decidim.elections.admin") %>
+        <% else %>
+          <%= t("steps.#{current_step}.submit", scope: "decidim.elections.admin") %>
+        <% end %>
+      <% end %>
+    </div>
+
+    <% if @form.pending_action %>
+      <div id="pending_action"
+           data-api-endpoint-url="<%= Rails.application.secrets.bulletin_board[:server] %>"
+           data-message-id="<%= @form.pending_action.message_id %>"></div>
+
+      <%= javascript_include_tag "decidim/elections/admin/pending_action" %>
+    <% end %>
+  <% end %>
+<% else %>
+  <div class="content <%= current_step %>">
+    <%= render partial: current_step.to_s %>
+  </div>
+<% end %>

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

@@ -0,0 +1,19 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= title %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="user-fields">
+      <div class="row column user-fields--user-picker">
+        <% prompt_options = { url: decidim_admin.users_organization_url, placeholder: t(".select_user") } %>
+        <%= form.autocomplete_select(:user_id, form.object.user.presence,  { multiple: false }, prompt_options) do |user|
+          { value: user.id, label: "#{user.name} (@#{user.nickname})" }
+        end %>
+      </div>
+    </div>
+  </div>
+
+</div>

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

@@ -0,0 +1,64 @@
+<div class="card" id="trustees">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
+      <%= link_to t("actions.new", scope: "decidim.elections", name: t("models.trustee.name", scope: "decidim.elections.admin")), new_trustee_path, class: "button tiny button--title new" %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.trustees_participatory_space.fields.name", scope: "decidim.elections") %></th>
+            <th><%= t("models.trustees_participatory_space.fields.email", scope: "decidim.elections") %></th>
+            <th><%= t("models.trustees_participatory_space.fields.public_key", scope: "decidim.elections") %></th>
+            <th><%= t("models.trustees_participatory_space.fields.notification", scope: "decidim.elections") %></th>
+            <th><%= t("models.trustees_participatory_space.fields.status", scope: "decidim.elections") %></th>
+            <th class="actions"><%= t("actions.title", scope: "decidim.elections") %></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% trustees.each do |trustee| %>
+            <tr>
+              <td>
+                <%= trustee.user.name %>
+              </td>
+              <td>
+                <%= trustee.user.email %>
+              </td>
+              <td>
+                <%= present(trustee).public_key_thumbprint %>
+              </td>
+              <td>
+                <%= trustee.created_at.ctime %>
+              </td>
+              <td>
+                <% if trustee_current_participatory_space(trustee).considered %>
+                  <%= t("models.trustees_participatory_space.fields.considered", scope: "decidim.elections") %>
+                <% else %>
+                  <%= t("models.trustees_participatory_space.fields.inactive", scope: "decidim.elections") %>
+                <% end %>
+              </td>
+              <td class="table-list__actions">
+                <% if allowed_to?(:update, :trustee_participatory_space, trustee_participatory_space: trustee_current_participatory_space(trustee)) %>
+                  <%= icon_link_to considered_icon_action_for(trustee), edit_trustee_path(trustee_current_participatory_space(trustee)), considered_label_action_for(trustee), class: "action-icon--edit" %>
+                <% else %>
+                  <%= icon considered_icon_action_for(trustee), class: "action-icon action-icon--disabled", role: "img" %>
+                <% end %>
+
+                <% if allowed_to?(:delete, :trustee_participatory_space, trustee_participatory_space: trustee_current_participatory_space(trustee)) %>
+                  <%= icon_link_to "circle-x", trustee_path(trustee_current_participatory_space(trustee)), 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>
+          <% end %>
+        </tbody>
+      </table>
+      <%= paginate trustees, theme: "decidim" %>
+    </div>
+  </div>
+</div>