decidim-elections 0.26.1 → 0.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afdf9a7aa52a455c7f5f0ea11e46884df0829f4aa8bd63b815947574f63eeb56
-  data.tar.gz: 392b8291c4d4eeaddafce24832da3144ad444cf974597f21a9fef71a2aed34e1
+  metadata.gz: 79cbe0a072815eeb089fe22866c15107b9dd0f68e6a3a3cc3c45471f7186777c
+  data.tar.gz: d67f9a69166f20546353b2b40d7a19ce08a59f4837fde321d2c369c7c9a9ab3f
 SHA512:
-  metadata.gz: dcbbfc891f43a3a46e8866504211df489be49dbbf80e6438e4dc72c1f35284ebc258ce973c8b663a027a6ae9c62c370fe03e0ecc8ad0a667bf5337006181ac30
-  data.tar.gz: 7b490ae2ec90c5df75855bf4f8296a8a4c8b16acbfda0e922aa16b00bb4d7c9d356d5c71b4b445623438fda9c70234ab395b3b906025711186996158956f5d4e
+  metadata.gz: b2ef4df36d4b64aa1f6d26d01716d39ce15511c1c4c70be51c86830f29c43d4d854ab2b1a5d3f2fd38ee0f8f9c31d0c9542497b86cc261030cdb8278b739aa34
+  data.tar.gz: 6da057cd74be00affe5622b0b6de4be710838768b0ec778596bf8588b166d5a4c6ca8357563b396f62169a49c8a4449bfb7a9e653eceeecd21fdbfe65157210a

data/app/cells/decidim/elections/election_vote_cta_cell.rb

@@ -5,15 +5,20 @@ module Decidim
     # This cell renders the results
     # for a given instance of an Election
     class ElectionVoteCtaCell < Decidim::ViewModel
+      include Decidim::Elections::HasVoteFlow
+
       delegate :current_user,
                :current_participatory_space,
-               :preview_mode?,
-               :can_preview?,
-               :vote_flow,
+               :allowed_to?,
                to: :controller
 
       private
 
+      # This is needed by HasVoteFlow
+      def election
+        model
+      end
+
       def last_vote
         @last_vote ||= Decidim::Elections::Votes::LastVoteForVoter.for(model, vote_flow.voter_id) if vote_flow.has_voter?
       end

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,25 +1,14 @@
-<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">
         <img src="<%= introductory_image.path %>" alt="">
       </div>
     <% end %>
-    <div class="columns medium-8 mediumlarge-7 content">
+    <div class="columns medium-8 mediumlarge-7">
       <h2 class="show-for-sr"><%= t("decidim.votings.content_blocks.landing_page.description.title") %></h2>
       <div><%= description_text %></div>
     </div>
-    <div class="content-height-toggler show-more">
-      <button class="button button--muted tiny">
-        <span class="button-text show-more-content">
-          <%= button_show_more_text %>
-        </span>
-
-        <span class="button-text show-less-content hide">
-          <%= button_show_less_text %>
-        </span>
-      </button>
-    </div>
   </div>
 </div>
 

data/app/cells/decidim/votings/content_blocks/landing_page/description_cell.rb

@@ -18,14 +18,6 @@ module Decidim
           def description_text
             decidim_sanitize_editor(translated_attribute(current_participatory_space.description))
           end
-
-          def button_show_more_text
-            t(:show_more, scope: "decidim.votings.content_blocks.landing_page.description")
-          end
-
-          def button_show_less_text
-            t(:show_less, scope: "decidim.votings.content_blocks.landing_page.description")
-          end
         end
       end
     end

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/add_user_as_trustee.rb

@@ -11,6 +11,8 @@ module Decidim
         # form - A form object with the params.
         def initialize(form, current_user)
           @form = form
+          @user = form.user
+          @participatory_space = form.current_participatory_space
           @current_user = current_user
         end
 
@@ -27,29 +29,31 @@ module Decidim
             notify_user_about_trustee_role if new_trustee?
           end
 
+          send_email
+
           broadcast(:ok)
         end
 
         private
 
-        attr_reader :form, :current_user, :trustee
+        attr_reader :form, :current_user, :trustee, :participatory_space, :user
 
         def add_user_as_trustee!
           @trustee = Decidim.traceability.create!(
             Trustee,
-            form.current_user,
-            user: form.user,
-            organization: form.user.organization
+            current_user,
+            user: user,
+            organization: user.organization
           )
         end
 
         # If a trustee exists for this participatory space, it won't get created again
         def existing_trustee_participatory_spaces?
-          trustees_space = TrusteesParticipatorySpace.where(participatory_space: form.current_participatory_space).includes(:trustee)
+          trustees_space = TrusteesParticipatorySpace.where(participatory_space: participatory_space).includes(:trustee)
           @existing_trustee_participatory_spaces ||= Decidim::Elections::Trustee.joins(:trustees_participatory_spaces)
                                                                                 .includes([:user])
                                                                                 .where(trustees_participatory_spaces: trustees_space)
-                                                                                .where(decidim_user_id: form.user.id).any?
+                                                                                .where(decidim_user_id: user.id).any?
         end
 
         # if there's no user - trustee relation, the trustee gets created and the notification
@@ -57,13 +61,13 @@ module Decidim
         def new_trustee?
           return @new_trustee if defined?(@new_trustee)
 
-          @new_trustee = Decidim::Elections::Trustee.where(decidim_user_id: form.user.id).empty?
+          @new_trustee = Decidim::Elections::Trustee.where(decidim_user_id: user.id).empty?
         end
 
         def add_participatory_space
-          trustee = Decidim::Elections::Trustee.find_by(decidim_user_id: form.user.id)
+          trustee = Decidim::Elections::Trustee.find_by(decidim_user_id: user.id)
           trustee.trustees_participatory_spaces.create!(
-            participatory_space: form.current_participatory_space
+            participatory_space: participatory_space
           )
         end
 
@@ -71,11 +75,17 @@ module Decidim
           data = {
             event: "decidim.events.elections.trustees.new_trustee",
             event_class: Decidim::Elections::Trustees::NotifyNewTrusteeEvent,
-            resource: form.current_participatory_space,
-            affected_users: [form.user]
+            resource: participatory_space,
+            affected_users: [user]
           }
           Decidim::EventsManager.publish(**data)
         end
+
+        def send_email
+          Decidim::Elections::TrusteeMailer.notification(
+            user, participatory_space, I18n.locale.to_s
+          ).deliver_later
+        end
       end
     end
   end

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

@@ -14,7 +14,8 @@ module Decidim
         #
         # Broadcasts :ok if successful, :invalid otherwise.
         def call
-          return broadcast(:invalid) if invalid?
+          return broadcast(:election_started) if form.election.started?
+          return broadcast(:invalid) if form.invalid?
 
           create_question!
 
@@ -25,15 +26,10 @@ module Decidim
 
         attr_reader :form, :question
 
-        def invalid?
-          form.election.started? || form.invalid?
-        end
-
         def create_question!
           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/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/commands/decidim/votings/admin/destroy_ballot_style.rb

@@ -30,7 +30,7 @@ module Decidim
             :delete,
             ballot_style,
             current_user,
-            visibility: "all"
+            { visibility: "all", code: ballot_style.code }
           ) do
             ballot_style.destroy!
           end

data/app/controllers/decidim/elections/admin/questions_controller.rb

@@ -26,6 +26,11 @@ module Decidim
               flash.now[:alert] = I18n.t("questions.create.invalid", scope: "decidim.elections.admin")
               render action: "new"
             end
+
+            on(:election_started) do
+              flash.now[:alert] = I18n.t("questions.create.election_started", scope: "decidim.elections.admin")
+              render action: "new"
+            end
           end
         end
 

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

@@ -98,7 +98,7 @@ module Decidim
             if current_census.access_codes_file.attached?
               redirect_to Rails.application.routes.url_helpers.rails_blob_url(current_census.access_codes_file.blob, only_path: true)
             else
-              flash[:error] = t("export_access_codes.file_not_exists", scope: "decidim.votings.census.admin.census")
+              flash[:error] = t("export_access_codes.file_not_exist", scope: "decidim.votings.census.admin.census")
               redirect_to admin_voting_census_path
             end
           end

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

@@ -103,6 +103,8 @@ module Decidim
       end
 
       def elections
+        raise ActionController::RoutingError, "Not Found" unless current_participatory_space
+
         Decidim::Elections::Election.where(component: current_participatory_space.components).where.not(bb_status: nil)
       end
 

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/forms/decidim/votings/census/admin/datum_form.rb

@@ -17,9 +17,13 @@ module Decidim
           attribute :email, String
           attribute :ballot_style_code, String
 
+          validates :birthdate, format: { with: /\A\d{8}\z/ }
+
           validates :full_name,
                     :full_address,
+                    :birthdate,
                     presence: true
+
           def ballot_style_code
             @ballot_style_code&.upcase
           end

data/app/helpers/decidim/elections/votes_helper.rb

@@ -14,7 +14,9 @@ module Decidim
       end
 
       def more_information?(answer)
-        answer.description || answer.proposals.any? || answer.photos.any?
+        translated_attribute(answer.description).present? ||
+          answer.proposals.any? ||
+          answer.photos.any?
       end
     end
   end

data/app/mailers/decidim/elections/trustee_mailer.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Elections
+    # This mailer sends a notification email to a recently added trustee
+    class TrusteeMailer < Decidim::ApplicationMailer
+      include TranslatableAttributes
+
+      # Public: Sends an email to a trustee that just got added to a participatory space.
+      #
+      # user - The user to be notified
+      # participatory_space - The participatory space where the trustee was added.
+      # locale - The locale that will be used for the email content (optional).
+      #
+      # Returns nothing.
+      def notification(user, participatory_space, locale = nil)
+        @user = user
+        @participatory_space = participatory_space
+        @organization = user.organization
+
+        I18n.with_locale(locale || @organization.default_locale) do
+          @participatory_space_title = translated_attribute(participatory_space.title)
+          mail(to: user.email, subject: I18n.t("subject", scope: "decidim.elections.admin.mailers.trustee_mailer", resource_name: @participatory_space_title))
+        end
+      end
+    end
+  end
+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/packs/src/decidim/votings/voting-description-cell.js

@@ -1,6 +1,4 @@
 $(() => {
-  const isShowMoreButton = ($button) => $button.hasClass("show-more-content");
-
   const remToPx = (count) => {
     const unit = $("html").css("font-size");
 
@@ -25,17 +23,12 @@ $(() => {
     $content.css("max-height", contentMaxHeight);
   }
 
-  $button.on("click", (event) => {
-    const $buttonTextMore = $button.find(".button-text.show-more-content");
+  $button.on("click", () => {
     const $buttonTextLess = $button.find(".button-text.show-less-content");
 
     let newHeight = contentMaxHeight;
-    if (isShowMoreButton($(event.target))) {
-      newHeight = contentHeight;
-    }
 
     $content.css("max-height", newHeight);
     $buttonTextLess.toggleClass("hide");
-    $buttonTextMore.toggleClass("hide");
   });
 });

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

@@ -8,6 +8,9 @@ module Decidim
           return permission_action unless user
           return user_allowed_to_read_admin_dashboard? if read_admin_dashboard_action?
           return permission_action unless permission_action.scope == :admin
+
+          user_can_enter_space_area?
+
           return permission_action if voting && !voting.is_a?(Decidim::Votings::Voting)
 
           unless user_can_read_votings_admin_dashboard?
@@ -15,7 +18,6 @@ module Decidim
             return permission_action
           end
 
-          user_can_enter_space_area?
           allowed_read_participatory_space?
           allowed_voting_action?
 

data/app/presenters/decidim/votings/admin_log/ballot_style_presenter.rb

@@ -17,10 +17,14 @@ module Decidim
 
         def i18n_params
           super.merge(
-            ballot_style_code: action_log.resource.code
+            ballot_style_code: ballot_style_code.to_s
           )
         end
 
+        def ballot_style_code
+          action_log&.resource&.code || action_log.extra["code"]
+        end
+
         def action_string
           case action
           when "create", "delete", "update"

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" %>