decidim-elections 0.26.2 → 0.26.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8219848da3b47bb1de74d7c35c5d9f2f1b98ee394a1d9e07201cfc3760e8650
-  data.tar.gz: 8c2a725b532393fc5ddbdcbc2db2e320ce288e3b067e22524277097409f1ffa5
+  metadata.gz: 8ec0e86b7444f64ee3b9a825db1950f6dbfd337abf7ea93ca577d4637225d99d
+  data.tar.gz: 2303d3bad0bfc976ee51ba20cd5cc0b4722706f2a7b216cda95d47a1a6c71d63
 SHA512:
-  metadata.gz: 668655440f14e989272e753a90332751b8d10ed8b8b63a7b0cbd14ef1fde3f4e79edaf9d6f499f00318ba1862ef1be157a7407806d30ed60dd2d274299f70968
-  data.tar.gz: 82341a653e8ee97716326601b815ce8d6f90811b94b92e057f1ae4983614d835253e5b3d6d59671c7ccd76d8d18db28bb3505aac69b750bedbba96bb688442e0
+  metadata.gz: b74806f59ce7fe4cdb2a78e3a7fe813ff345e0024a01e8cb270e865c2dbd671faef589490a9d7d5393d50ca413c8affe79ef9007861ab5f2db6436033f0ce58f
+  data.tar.gz: 2a915f400a8549614a12be707202a991376f1b732bc171b74a27e423b6c1cae88840cb837ce07f55987ef184a32e185d884dd6b0099b35c7c8c2934138a680cc

data/app/cells/decidim/votings/content_blocks/highlighted_votings/show.erb

@@ -8,7 +8,7 @@
           <div class="column">
             <%= link_to decidim_votings.voting_path(voting), class: "card card--voting card--mini" do %>
               <div aria-hidden="true" class="card__image-top"
-                style="background-image:url(<%= voting.attached_uploader(:banner_image).path %>)"></div>
+                style="background-image:url('<%= voting.attached_uploader(:banner_image).path %>')"></div>
               <div class="card__content">
                 <span class="card__title card__link"><%= translated_attribute voting.title %></span>
               </div>

data/app/cells/decidim/votings/content_blocks/highlighted_votings_cell.rb

@@ -37,6 +37,7 @@ module Decidim
         def cache_hash
           hash = []
           hash.push(I18n.locale)
+          hash.push(highlighted_votings.map(&:cache_key_with_version))
           hash.join(Decidim.cache_key_separator)
         end
       end

data/app/cells/decidim/votings/content_blocks/landing_page/description/show.erb

@@ -1,4 +1,4 @@
-<div class="row section voting-description-cell">
+<div class="row section voting-description-cell mt-m">
   <div class="columns">
     <% if introductory_image.attached? %>
       <div id="introductory-image" class="columns medium-4 mediumlarge-5">

data/app/cells/decidim/votings/content_blocks/landing_page/header/show.erb

@@ -1,4 +1,4 @@
-<section class="extended hero" style="background-image:url(<%= current_participatory_space.attached_uploader(:banner_image).path %>);">
+<section class="extended hero" style="background-image:url('<%= current_participatory_space.attached_uploader(:banner_image).path %>');">
   <div class="hero__container">
     <div class="row">
       <div class="columns large-10 text-left">
@@ -24,6 +24,6 @@
   </div>
 </section>
 
-<section class="section">
+<section>
   <%= extended_navigation_bar(navigation_items) %>
 </section>

data/app/commands/decidim/elections/admin/create_question.rb

@@ -30,7 +30,6 @@ module Decidim
           attributes = {
             election: form.election,
             title: form.title,
-            description: form.description,
             max_selections: form.max_selections,
             weight: form.weight,
             random_answers_order: form.random_answers_order,

data/app/commands/decidim/elections/admin/import_proposals_to_elections.rb

@@ -77,7 +77,10 @@ module Decidim
         end
 
         def proposal_already_copied?(original_proposal)
-          original_proposal.linked_resources(:answers, "related_proposals").any? do |answer|
+          # Note: we are including also answers from unpublished components
+          # because otherwise duplicates could be created until the component is
+          # published.
+          original_proposal.linked_resources(:answers, "related_proposals", component_published: false).any? do |answer|
             answer.question == target_question
           end
         end

data/app/commands/decidim/elections/admin/setup_election.rb

@@ -94,7 +94,9 @@ module Decidim
               weight: question.weight,
               max_selections: question.max_selections,
               title: flatten_translations(question.title),
-              description: flatten_translations(question.description),
+              # the bulletin_board gem (ruby client) expects a description for the question
+              # as development is in a separate repository, let's send an empty content for the moment
+              description: {},
               answers: question_answers_data(question)
             }
           end

data/app/commands/decidim/elections/admin/update_question.rb

@@ -33,7 +33,6 @@ module Decidim
         def update_question!
           attributes = {
             title: form.title,
-            description: form.description,
             max_selections: form.max_selections,
             weight: form.weight,
             random_answers_order: form.random_answers_order,

data/app/controllers/decidim/elections/elections_controller.rb

@@ -57,8 +57,8 @@ module Decidim
       end
 
       def paginated_elections
-        @paginated_elections ||= paginate(search.results.published)
-        @paginated_elections = reorder(@paginated_elections)
+        @paginated_elections ||= reorder(search.results.published)
+        @paginated_elections = paginate(@paginated_elections)
       end
 
       def scheduled_elections

data/app/controllers/decidim/votings/admin/imports_controller.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    module Admin
+      # This controller allows importing things.
+      # It is targeted for customizations for importing things that lives under
+      # a voting space.
+      class ImportsController < Decidim::Admin::ImportsController
+        include VotingAdmin
+      end
+    end
+  end
+end

data/app/controllers/decidim/votings/votings_controller.rb

@@ -129,8 +129,8 @@ module Decidim
       end
 
       def paginated_votings
-        @paginated_votings ||= paginate(search.results.published)
-        @paginated_votings = reorder(@paginated_votings)
+        @paginated_votings ||= reorder(search.results.published)
+        @paginated_votings = paginate(@paginated_votings)
       end
 
       def promoted_votings

data/app/forms/decidim/elections/admin/question_form.rb

@@ -8,14 +8,12 @@ module Decidim
         include TranslatableAttributes
 
         translatable_attribute :title, String
-        translatable_attribute :description, String
         attribute :max_selections, Integer, default: 1
         attribute :weight, Integer, default: 0
         attribute :random_answers_order, Boolean, default: true
         attribute :min_selections, Integer, default: 1
 
         validates :title, translatable_presence: true
-        validates :description, translatable_presence: true
         validates :max_selections, presence: true, numericality: { greater_than_or_equal_to: 1 }
 
         def election

data/app/forms/decidim/elections/admin/setup_form.rb

@@ -13,6 +13,12 @@ module Decidim
           validations.each do |message, t_args, valid|
             errors.add(message, I18n.t("steps.create_election.errors.#{message}", **t_args, scope: "decidim.elections.admin")) unless valid
           end
+
+          if needs_census?
+            census_validations.each do |message, t_args, valid|
+              errors.add(message, I18n.t("steps.create_election.errors.#{message}", **t_args, scope: "decidim.elections.admin")) unless valid
+            end
+          end
         end
 
         def current_step; end
@@ -34,17 +40,34 @@ module Decidim
             [:minimum_answers, {}, election.minimum_answers?],
             [:max_selections, {}, election.valid_questions?],
             [:published, {}, election.published_at.present?],
+            [:component_published, {}, election.component.published?],
             [:time_before, { hours: Decidim::Elections.setup_minimum_hours_before_start }, election.minimum_hours_before_start?],
             [:trustees_number, { number: bulletin_board.number_of_trustees }, participatory_space_trustees_with_public_key.size >= bulletin_board.number_of_trustees]
           ].freeze
         end
 
+        def census_validations
+          return [] unless needs_census?
+
+          @census_validations ||= [
+            [:census_uploaded, {}, census.present? && census.data.exists?],
+            [:census_codes_generated, {}, census_codes_generated?],
+            [:census_frozen, {}, census&.freeze?]
+          ].freeze
+        end
+
         def messages
           @messages ||= validations.map do |message, t_args, _valid|
             [message, I18n.t("steps.create_election.requirements.#{message}", **t_args, scope: "decidim.elections.admin")]
           end.to_h
         end
 
+        def census_messages
+          @census_messages ||= census_validations.to_h do |message, t_args, _valid|
+            [message, I18n.t("steps.create_election.requirements.#{message}", **t_args, scope: "decidim.elections.admin")]
+          end
+        end
+
         def participatory_space_trustees
           @participatory_space_trustees ||= Decidim::Elections::Trustees::ByParticipatorySpace.new(election.component.participatory_space).to_a
         end
@@ -57,6 +80,26 @@ module Decidim
           @bulletin_board ||= context[:bulletin_board] || Decidim::Elections.bulletin_board
         end
 
+        def needs_census?
+          vote_flow.is_a?(Decidim::Votings::CensusVoteFlow)
+        end
+
+        def vote_flow
+          @vote_flow ||= election.participatory_space.try(:vote_flow_for, election)
+        end
+
+        def census_codes_generated?
+          return unless needs_census?
+
+          census&.codes_generated? || census&.exporting_codes? || census&.freeze?
+        end
+
+        def census
+          return unless needs_census?
+
+          @census ||= election.component.participatory_space.dataset
+        end
+
         def main_button?
           true
         end

data/app/models/decidim/elections/election.rb

@@ -86,7 +86,7 @@ module Decidim
       #
       # Returns a boolean.
       def minimum_answers?
-        questions.all? { |question| question.answers.size > 1 }
+        questions.any? && questions.all? { |question| question.answers.size > 1 }
       end
 
       # Public: Checks if the election results are published and election finished
@@ -107,7 +107,7 @@ module Decidim
       #
       # Returns a boolean.
       def valid_questions?
-        questions.all?(&:valid_max_selection?)
+        questions.any? && questions.all?(&:valid_max_selection?)
       end
 
       # Public: Gets the voting period status of the election

data/app/models/decidim/elections/question.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     # The data store for a Question in the Decidim::Elections component. It stores a
-    # title, description and a maximum number of selection that voters can choose.
+    # title and a maximum number of selection that voters can choose.
     class Question < ApplicationRecord
       include Decidim::Resourceable
       include Traceable

data/app/packs/src/decidim/elections/admin/pending_action.js

@@ -1,3 +1,5 @@
+// show a message to the user if comunication is lost
+import "src/decidim/elections/broken_promises_handler";
 import { Client } from "@decidim/decidim-bulletin_board";
 
 $(() => {

data/app/packs/src/decidim/elections/admin/trustees_process.js

@@ -1,3 +1,5 @@
+// show a message to the user if comunication is lost
+import "src/decidim/elections/broken_promises_handler";
 import {
   Client,
   Election,

data/app/packs/src/decidim/elections/broken_promises_handler.js

@@ -0,0 +1,11 @@
+/* Fallback for non-handled failed promises */
+window.addEventListener("unhandledrejection", (event) => {
+  console.log("broken", event)
+  $("#server-failure .tech-info").html(event.reason);
+  if (event.reason.toString().indexOf("fetch") === -1) {
+    $("#server-failure .communication_error").addClass("hide");
+    $("#server-failure .generic_error").removeClass("hide");
+  }
+  $("#server-failure").foundation("open");
+});
+

data/app/packs/src/decidim/elections/trustee/key_ceremony.js

@@ -1,3 +1,6 @@
+// show a message to the user if comunication is lost
+import "src/decidim/elections/broken_promises_handler";
+
 import {
   KeyCeremonyComponent,
   MessageIdentifier,

data/app/packs/src/decidim/elections/trustee/tally.js

@@ -1,3 +1,6 @@
+// show a message to the user if comunication is lost
+import "src/decidim/elections/broken_promises_handler";
+
 import {
   TallyComponent,
   IdentificationKeys,

data/app/packs/src/decidim/elections/voter/casting-vote.js

@@ -1,3 +1,6 @@
+// show a message to the user if comunication is lost
+import "src/decidim/elections/broken_promises_handler";
+
 import { Client } from "@decidim/decidim-bulletin_board";
 
 $(async () => {

data/app/packs/src/decidim/elections/voter/setup-vote.js

@@ -1,5 +1,7 @@
 /* eslint-disable require-jsdoc */
 
+// show a message to the user if comunication is lost
+import "src/decidim/elections/broken_promises_handler";
 import { VoteComponent } from "@decidim/decidim-bulletin_board";
 
 import * as VotingSchemesDummy from "@decidim/voting_schemes-dummy";
@@ -46,5 +48,12 @@ export default function setupVoteComponent($voteWrapper) {
   });
 }
 
+/* Fallback for non-handled failed promises */
+window.addEventListener("unhandledrejection", (event) => {
+  $("#server-failure .tech-info").html(event.reason);
+  $("#server-failure").foundation("open");
+});
+
 window.Decidim = window.Decidim || {};
 window.Decidim.setupVoteComponent = setupVoteComponent;
+

data/app/packs/src/decidim/votings/in-person-vote.js

@@ -1,3 +1,6 @@
+// show a message to the user if comunication is lost
+import "src/decidim/elections/broken_promises_handler";
+
 import { Client } from "@decidim/decidim-bulletin_board";
 
 $(async () => {

data/app/permissions/decidim/votings/admin/permissions.rb

@@ -59,7 +59,8 @@ module Decidim
             :monitoring_committee_verify_elections,
             :monitoring_committee_election_result, :monitoring_committee_election_results,
             :census,
-            :ballot_style, :ballot_styles
+            :ballot_style, :ballot_styles,
+            :component_data
           ].member? permission_action.subject
 
           case permission_action.subject
@@ -130,6 +131,8 @@ module Decidim
             end
           when :ballot_styles
             toggle_allow(user.admin?) if permission_action.action == :read
+          when :component_data
+            toggle_allow(user.admin?) if permission_action.action == :import
           end
         end
 

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

@@ -8,10 +8,6 @@
       <%= form.translated :text_field, :title, autofocus: true %>
     </div>
 
-    <div class="row column">
-      <%= form.translated :editor, :description %>
-    </div>
-
     <div class="row column">
       <%= form.number_field :max_selections, step: 1, min: 0 %>
     </div>

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

@@ -14,10 +14,23 @@
       <% end %>
     </ul>
 
+    <% if form.needs_census? %>
+      <h4><%= t(".census") %></h4>
+      <ul class="no-bullet-indented">
+        <% form.census_messages.each do |key, value| %>
+          <% if form.errors.include?(key) %>
+            <li><%= icon "x", class: "text-alert", role: "img", "aria-hidden": true %>&nbsp;<%= form.errors.messages[key][0].html_safe %></li>
+          <% else %>
+            <li><%= icon "check", class: "text-success", role: "img", "aria-hidden": true %>&nbsp;<%= value.html_safe %></li>
+          <% end %>
+        <% end %>
+      </ul>
+    <% end %>
+
     <h4><%= t(".trustees") %></h4>
     <ul class="no-bullet-indented">
       <% if form.participatory_space_trustees.none? %>
-        <li><%= t(".no_trustees") %></li>
+        <li><%= icon "x", class: "text-alert", role: "img", "aria-hidden": true %>&nbsp;<%= t(".no_trustees") %></li>
       <% end %>
 
       <% form.participatory_space_trustees.map {|trustee| [trustee, form.trustees.none? || form.trustees.include?(trustee)] }

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

@@ -43,3 +43,5 @@
     <%= render partial: current_step.to_s %>
   </div>
 <% end %>
+
+<%= render "decidim/elections/shared/broken_promises_modal" %>

data/app/views/decidim/elections/shared/_broken_promises_modal.html.erb

@@ -0,0 +1,33 @@
+<% i18n_scope ||= "decidim.elections.connection.failed" %>
+
+<div class="reveal" id="server-failure" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title">
+      <%= t("modal.title", scope: i18n_scope) %>
+    </h3>
+
+    <button class="close-button" data-close aria-label="<%= t("modal.close", scope: i18n_scope) %>"
+      type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+
+  <div class="row">
+    <p class="communication_error">
+      <%= t("modal.communication_lost", scope: i18n_scope).html_safe %>
+    </p>
+    <p class="generic_error hide">
+      <%= t("modal.generic_error", scope: i18n_scope).html_safe %>
+    </p>
+
+    <p class="help-text tech-info"></p>
+  </div>
+
+  <div class="row">
+    <div class="column flex-center">
+      <button class="button primary expanded" data-close type="button">
+        <%= t("modal.close", scope: i18n_scope) %>
+      </button>
+    </div>
+  </div>
+</div>

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

@@ -18,5 +18,8 @@
     <%= render("#{current_step}_steps") %>
   </div>
 
+  <%= render "decidim/elections/shared/broken_promises_modal" %>
+
   <%= javascript_pack_tag "decidim_elections_trustee_#{current_step}" %>
+
 <% end %>

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

@@ -0,0 +1,28 @@
+<div class="reveal" id="server-failure" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title">
+      <%= t("modal.title", scope: "decidim.elections.votes.failed") %>
+    </h3>
+
+    <button class="close-button" data-close aria-label="<%= t("modal.close", scope: "decidim.elections.votes.failed") %>"
+      type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+
+  <div class="row">
+    <p>
+      <%= t("modal.communication_lost", scope: "decidim.elections.votes.failed").html_safe %>
+    </p>
+
+    <p class="help-text tech-info"></p>
+  </div>
+
+  <div class="row">
+    <div class="column flex-center">
+      <button class="button primary expanded" data-close type="button">
+        <%= t("modal.close", scope: "decidim.elections.votes.failed") %>
+      </button>
+    </div>
+  </div>
+</div>

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

@@ -22,4 +22,6 @@
   <%= form_tag election_vote_path(election, id: vote.encrypted_vote_hash), method: :patch, class: "update_vote_status" %>
 </div>
 
+<%= render "decidim/elections/shared/broken_promises_modal" %>
+
 <%= javascript_pack_tag "decidim_elections_voter_casting_vote" %>

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

@@ -59,9 +59,12 @@
   </div>
 </div>
 
+<%= render "decidim/elections/shared/broken_promises_modal" %>
+
 <% if preview_mode? %>
   <%= javascript_pack_tag "decidim_elections_voter_setup_preview" %>
 <% else %>
   <%= javascript_pack_tag "decidim_elections_voter_setup_vote" %>
 <% end %>
+
 <%= javascript_pack_tag "decidim_elections_voter_new_vote" %>

data/app/views/decidim/votings/polling_officer_zone/in_person_votes/new.html.erb

@@ -18,4 +18,6 @@
   <% end %>
 </div>
 
+<%= render "decidim/elections/shared/broken_promises_modal" %>
+
 <%= javascript_pack_tag "decidim_votings_in_person_vote" %>

data/app/views/decidim/votings/polling_officer_zone/in_person_votes/show.html.erb

@@ -22,4 +22,6 @@
   <%= form_tag polling_officer_election_in_person_vote_path(polling_officer, election, in_person_vote), method: :patch, class: "update_vote_status" %>
 </div>
 
+<%= render "decidim/elections/shared/broken_promises_modal" %>
+
 <%= javascript_pack_tag "decidim_votings_in_person_vote" %>

data/app/views/decidim/votings/votings/_promoted_voting.html.erb

@@ -13,7 +13,7 @@
     </div>
     <div class="columns mediumlarge-8 large-6 card--process__column">
       <div class="card--full__image"
-           style="background-image:url(<%= promoted_voting.attached_uploader(:banner_image).path %>)">
+           style="background-image:url('<%= promoted_voting.attached_uploader(:banner_image).path %>')">
         <div class="card__content row collapse">
           <div class="large-6 large-offset-6 columns">
             <%= link_to voting_path(promoted_voting), class: "button expanded button--sc" do %>

data/config/locales/ar.yml

@@ -5,8 +5,6 @@ ar:
         description: الوصف
       election:
         description: الوصف
-      question:
-        description: الوصف
   decidim:
     elections:
       admin:

data/config/locales/ca.yml

@@ -12,7 +12,6 @@ ca:
         start_time: La votació comença el
         title: Títol
       question:
-        description: Descripció
         max_selections: Número màxim d'opcions
         min_selections: Cap de les opcions anteriors
         title: Títol
@@ -231,12 +230,17 @@ ca:
             success: La pregunta s'ha actualitzat correctament
         steps:
           create_election:
+            census: Cens
             errors:
+              census_codes_generated: Els codis d'accés al cens no s'han pogut generar.
+              census_frozen: Els codis d'accés al cens no s'han pogut exportar.
+              census_uploaded: No s'ha pujat el cens per a aquestes eleccions.
+              component_published: L'elecció <strong>no està publicada</strong>.
               max_selections: Les preguntes no tenen un <strong>valor correcte per quantitat de respostes</strong>
               minimum_answers: Les preguntes han de tenir <strong>almenys dues respostes</strong>.
               minimum_questions: L'elecció <strong>ha de tenir almenys una pregunta</strong>.
               published: L'elecció <strong>no està publicada</strong>.
-              time_before: L'hora d'inici és en <strong>menys de 3 hores</strong> abans de que comenci l'elecció.
+              time_before: L'hora d'inici és en <strong>menys de %{hours} hores </strong> abans de que comenci l'elecció.
               trustees_number: L'espai de participació <strong>ha de tenir almenys %{number} garants amb clau pública</strong>.
             invalid: S'ha produït un error en configurar aquesta elecció
             no_trustees: No hi ha garants configurats per aquest espai de participació
@@ -245,6 +249,10 @@ ca:
               'false': no té una <strong>clau pública</strong>
               'true': té una <strong>clau pública</strong>
             requirements:
+              census_codes_generated: S'han generat els codis d'accés al cens.
+              census_frozen: S'han exportat els codis per al cens i el cens ha quedat congelat.
+              census_uploaded: El cens s'ha pujat.
+              component_published: L'elecció està <strong>publicada</strong>.
               max_selections: Totes les preguntes tenen un valor correcte per <strong>màxim de respostes</strong>.
               minimum_answers: Cada pregunta té <strong>almenys 2 respostes</strong>.
               minimum_questions: L'elecció té <strong>almenys 1 pregunta</strong>.
@@ -357,6 +365,13 @@ ca:
           update: "%{user_name} ha actualitzat l'elecció %{resource_name} a %{space_name}"
         trustee:
           create: "%{user_name} ha assignat a la usuària %{trustee_user} com a garant"
+      connection:
+        failed:
+          modal:
+            close: Tancar
+            communication_lost: Malauradament, sembla que la comunicació amb el servidor de votació (Bulletin Board) s'ha perdut.<br>Pot ser que la connexió a Internet estigui avariada o que el servidor de destí estigui massa ocupat.<br>Pots provar-ho més tard o posar-te en contacte amb el servei d'assistència si aquest problema persisteix.
+            generic_error: Malauradament, s'ha produït un error desconegut. És probable que el teu navegador no estigui suportat o que estiguis fent servir el mode "d'incògnit" o "privat" que no són compatibles.
+            title: Alguna cosa ha anat malament
       election_m:
         badge_name:
           finished: Acabada
@@ -639,6 +654,10 @@ ca:
         failed:
           header: Vot fallit
           lead: El teu vot no s'ha enviat!
+          modal:
+            close: Tancar
+            communication_lost: Malauradament, sembla que la comunicació amb el servidor de votació (Bulletin Board) s'ha perdut.<br>Pot ser que la connexió a Internet estigui avariada o que el servidor de destí estigui massa ocupat.<br>Pots provar-ho més tard o posar-te en contacte amb el servei d'assistència si aquest problema persisteix.
+            title: Alguna cosa ha anat malament
           text: Alguna cosa ha anat malament. Si us plau, torna-ho a provar.
           try_again: Prova-ho de nou
         header: