decidim-elections 0.27.0.rc1 → 0.27.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11ba350fe95a17c5fdacb0d334da600c9661fefd43617ee0324655acc3a18bc8
-  data.tar.gz: 39b15243a85e5e7bc6d04bea37945c23e849a26e36ad421a855779ca2f681c8d
+  metadata.gz: 0a9d0e7b818e7b18b41b673e93de27e1fa8e18d6178ce6d6661a183d8a6ad0cd
+  data.tar.gz: 795b89104805c5bef9df57b3e1cb2ddd138be0c81af4edfd10692cfd1f72ffab
 SHA512:
-  metadata.gz: fac8953cc1dca3a079f3970efe597a3cf19c63cf60dde0443c0511060881bd4b424a434cab13f544a8a4d31a8d571ae2593c1f65c1ee465af81b87c599dac1f2
-  data.tar.gz: 180c6299a0f8a5e8a5451396865d82824e01e858431e570e2279240d4bd7026e1abdd97f887e05739db83aab32bcb204cfdd7b9a1e9b7e14b4feb00d7f52ba03
+  metadata.gz: 66820408502f8df42988d377a372dffb476f7e82bd06afd8f41040f61b3c0e0b3040dc632f2d637a0f7f32417d467846e205b8921697f8d9553723c7150ab676
+  data.tar.gz: dabdab39fff2e5ac223dfc5a0b5fe2dde1697b96babdfc770b2c6952048d53f58de39e7c085e3fb72939fc19a8e17017062abddbfc80311bf8a350604fac0a74

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

@@ -33,12 +33,9 @@ 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
-
-        def cache_expiry_time
-          10.minutes
-        end
       end
     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/votings/census/admin/create_dataset.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "English"
 require "csv"
 
 module Decidim
@@ -55,7 +56,7 @@ module Decidim
               current_user,
               {
                 voting: form.current_participatory_space,
-                file: form.file,
+                filename: form.file.filename.to_s,
                 csv_row_raw_count: csv_row_count,
                 status: :creating_data
               },
@@ -64,27 +65,34 @@ module Decidim
           end
 
           def csv_header_invalid?
-            CSV.parse_line(File.open(file_path), col_sep: ";", headers: true, header_converters: :symbol).headers != expected_headers
+            headers.blank? || headers != expected_headers
           end
 
           def headers
+            @headers ||= CSV.parse_line(File.open(file_path), col_sep: ";", headers: true, header_converters: :symbol)&.headers
+          end
+
+          def no_ballot_headers
             [:document_id, :document_type, :date_of_birth, :full_name, :full_address, :postal_code, :mobile_phone_number, :email_address]
           end
 
           def ballot_style_headers
-            headers.push(:ballot_style_code)
+            no_ballot_headers.push(:ballot_style_code)
           end
 
           def expected_headers
-            @expected_headers ||= form.current_participatory_space.has_ballot_styles? ? ballot_style_headers : headers
+            @expected_headers ||= form.current_participatory_space.has_ballot_styles? ? ballot_style_headers : no_ballot_headers
           end
 
           def csv_row_count
             @csv_row_count ||= file_lines_count - 1
           end
 
+          # count lines in the most resource-efficient way using ruby, handles milions of lines with minimal memory footprint
           def file_lines_count
-            `wc -l "#{file_path.shellescape}"`.strip.split.first.to_i
+            lines = 0
+            File.foreach(file_path) { lines += 1 }
+            lines
           end
         end
       end

data/app/commands/decidim/votings/census/admin/launch_access_codes_export.rb

@@ -19,6 +19,8 @@ module Decidim
           def call
             return broadcast(:invalid) unless valid?
 
+            UpdateDataset.call(dataset, { status: :exporting_codes }, user)
+
             ExportAccessCodesJob.perform_later(dataset, user)
 
             broadcast(:ok)
@@ -29,7 +31,7 @@ module Decidim
           private
 
           def valid?
-            user.present? && dataset&.data&.present? && dataset.codes_generated?
+            user.present? && dataset&.data&.exists? && dataset.codes_generated?
           end
         end
       end

data/app/commands/decidim/votings/census/admin/launch_access_codes_generation.rb

@@ -31,7 +31,7 @@ module Decidim
           private
 
           def valid?
-            user.present? && dataset&.data&.present? && dataset.data_created?
+            user.present? && dataset&.data&.exists? && dataset.data_created?
           end
 
           def update_dataset_status(dataset, status, user)

data/app/controllers/decidim/votings/census/admin/census_controller.rb

@@ -8,12 +8,12 @@ module Decidim
         class CensusController < Admin::ApplicationController
           helper_method :votings, :current_participatory_space, :current_census, :census_steps, :current_census_action_view,
                         :user_email, :ballot_style_callout_text, :ballot_style_callout_level, :ballot_style_code_header
-          helper_method :admin_voting_census_path, :admin_status_voting_census_path, :generate_access_codes_path, :export_access_codes_path
+          helper_method :admin_voting_census_path, :admin_status_voting_census_path, :generate_access_codes_path, :export_access_codes_path, :waiting_status?
 
           def show
             enforce_permission_to :manage, :census, voting: current_participatory_space
 
-            flash[:notice] = "Finished processing #{current_census.file}" if current_census.data_created?
+            flash[:notice] = "Finished processing #{current_census.filename}" if current_census.data_created?
 
             @form = form(DatasetForm).instance
           end
@@ -184,6 +184,10 @@ module Decidim
           def ballot_style_code_header
             "Ballot Style Code"
           end
+
+          def waiting_status?
+            current_census.creating_data? || current_census.generating_codes? || current_census.exporting_codes?
+          end
         end
       end
     end

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
@@ -40,12 +46,28 @@ module Decidim
           ].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.to_h do |message, t_args, _valid|
             [message, I18n.t("steps.create_election.requirements.#{message}", **t_args, scope: "decidim.elections.admin")]
           end
         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
@@ -58,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

@@ -89,7 +89,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
@@ -110,7 +110,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/votings/census/dataset.rb

@@ -21,7 +21,7 @@ module Decidim
 
         enum status: [:init_data, :creating_data, :data_created, :generating_codes, :codes_generated, :exporting_codes, :freeze]
 
-        validates :file, presence: true
+        validates :filename, presence: true
 
         alias participatory_space voting
 

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,12 +48,6 @@ 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/admin/update_census_dataset_status.js

@@ -8,6 +8,6 @@ $(() => {
     }
   }
 
-  // 1 minute
-  setInterval(updateCensusDatasetStatus, 60000);
+  // 10 seconds
+  setInterval(updateCensusDatasetStatus, 10000);
 });

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/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/{votes/_server_error_modal.html.erb → shared/_broken_promises_modal.html.erb}

@@ -1,18 +1,23 @@
+<% 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: "decidim.elections.votes.failed") %>
+      <%= t("modal.title", scope: i18n_scope) %>
     </h3>
 
-    <button class="close-button" data-close aria-label="<%= t("modal.close", scope: "decidim.elections.votes.failed") %>"
+    <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>
-      <%= t("modal.communication_lost", scope: "decidim.elections.votes.failed").html_safe %>
+    <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>
@@ -21,7 +26,7 @@
   <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") %>
+        <%= t("modal.close", scope: i18n_scope) %>
       </button>
     </div>
   </div>

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

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

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

@@ -22,6 +22,8 @@
   <%= 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" %>
+
 <% content_for :js_content do %>
   <%= javascript_pack_tag "decidim_elections_voter_casting_vote" %>
 <% end %>

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

@@ -59,7 +59,7 @@
   </div>
 </div>
 
-<%= render "server_error_modal" %>
+<%= render "decidim/elections/shared/broken_promises_modal" %>
 
 <% content_for :js_content do %>
 

data/app/views/decidim/votings/census/admin/census/_creating_data.html.erb

@@ -4,7 +4,7 @@
                         scope: "decidim.votings.census.admin.census",
                         processed_count: current_census.csv_row_processed_count,
                         raw_count: current_census.csv_row_raw_count,
-                        file: current_census.file)}" %>
+                        file: current_census.filename)}" %>
 
   <%= cell("decidim/announcement", info_message, callout_class: "warning") %>
 </div>

data/app/views/decidim/votings/census/admin/census/_exporting_codes.html.erb

@@ -1,3 +1,3 @@
 <div class="card-section" id="census-creating-data-wrapper" data-update-status-url="<%= admin_status_voting_census_path %>">
-  <%= cell("decidim/announcement", "<span class='loading-spinner'></span> &nbsp;#{t("exporting_access_codes.info_message", scope: "decidim.votings.census.admin.census")}", callout_class: "warning") %>
+  <%= cell("decidim/announcement", "<span class='loading-spinner'></span> &nbsp;#{t("exporting_access_codes.info_message", scope: "decidim.votings.census.admin.census", email: user_email)}", callout_class: "warning") %>
 </div>

data/app/views/decidim/votings/census/admin/census/_freeze.html.erb

@@ -1,3 +1,5 @@
 <div class="card-section">
   <%= cell("decidim/announcement", t("freeze.callout", scope: "decidim.votings.census.admin.census", email: user_email), callout_class: "warning" ) %>
+
+  <p><%= t("freeze.help_html", scope: "decidim.votings.census.admin.census") %></p>
 </div>

data/app/views/decidim/votings/census/admin/census/_generate_codes.html.erb

@@ -3,23 +3,33 @@
                       scope: "decidim.votings.census.admin.census",
                       data_count: current_census.data.size,
                       raw_count: current_census.csv_row_raw_count,
-                      file: current_census.file) %>
+                      file: current_census.filename) %>
   <% callout_class = "warning" %>
 <% else %>
   <% info_message = t("generate_access_codes.info_message_all",
                       scope: "decidim.votings.census.admin.census",
                       data_count: current_census.data.size,
                       raw_count: current_census.csv_row_raw_count,
-                      file: current_census.file) %>
+                      file: current_census.filename) %>
   <% callout_class = "success" %>
 <% end %>
 
 <div class="card-section">
   <%= cell("decidim/announcement", info_message, callout_class: callout_class ) %>
 
-  <%= cell("decidim/announcement", t("generate_access_codes.callout", scope: "decidim.votings.census.admin.census"), callout_class: "warning" ) %>
-  <%= link_to t("generate_access_codes.button", scope: "decidim.votings.census.admin.census"),
+  <% if current_census.data.size.zero? %>
+    <%= cell("decidim/announcement", t("generate_access_codes.start_over", scope: "decidim.votings.census.admin.census"), callout_class: "warning" ) %>
+      <%= link_to t("delete.button", scope: "decidim.votings.census.admin.census"),
+                admin_voting_census_path,
+                class: "button alert destroy",
+                method: :delete,
+                data: { confirm: t("delete.confirm", scope: "decidim.votings.census.admin.census") } %>
+
+  <% else %>
+    <%= cell("decidim/announcement", t("generate_access_codes.callout", scope: "decidim.votings.census.admin.census"), callout_class: "warning" ) %>
+    <%= link_to t("generate_access_codes.button", scope: "decidim.votings.census.admin.census"),
                     generate_access_codes_path,
                     class: "button",
                     data: { confirm: t("generate_access_codes.confirm", scope: "decidim.votings.census.admin.census") } %>
+  <% end %>
 </div>

data/app/views/decidim/votings/census/admin/census/show.html.erb

@@ -18,6 +18,6 @@
   </div>
 </div>
 
-<% if current_census.creating_data? || current_census.generating_codes? %>
+<% if waiting_status? %>
   <%= javascript_pack_tag "decidim_votings_admin_update_census_dataset_status" %>
 <% end %>

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

@@ -18,6 +18,8 @@
   <% end %>
 </div>
 
+<%= render "decidim/elections/shared/broken_promises_modal" %>
+
 <% content_for :js_content do %>
   <%= javascript_pack_tag "decidim_votings_in_person_vote" %>
 <% end %>

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

@@ -22,6 +22,8 @@
   <%= 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" %>
+
 <% content_for :js_content do %>
   <%= javascript_pack_tag "decidim_votings_in_person_vote" %>
 <% end %>

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/am-ET.yml

@@ -1,2 +1 @@
----
 am: