decidim-elections 0.26.0 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48839ff2ece46c0bd66bc1360423d2bb996f91c0581547f8ef61ca837aaf4b71
-  data.tar.gz: a63a7431d25acbfe3d0967f84ed234359e4781537376bb139d2c4fc6f859bba8
+  metadata.gz: 11ba350fe95a17c5fdacb0d334da600c9661fefd43617ee0324655acc3a18bc8
+  data.tar.gz: 39b15243a85e5e7bc6d04bea37945c23e849a26e36ad421a855779ca2f681c8d
 SHA512:
-  metadata.gz: 811ed896ec1b34ee134ad36cbe910e440f20cd538bfe2b74e288fd1e9505b4e1e02bd9b2e8156a9bc8da4716f45686fc06c6810ce5ed9d1f240cecb5a5300ef3
-  data.tar.gz: 2ab58f77f16b978ae5bd9c74f09b6faa3d11f1f8fb434aa0468c8a7a6d4ee24711c5c7d355cab744be1d6360eda41d2946205a6419d916b9298288685cbcda09
+  metadata.gz: fac8953cc1dca3a079f3970efe597a3cf19c63cf60dde0443c0511060881bd4b424a434cab13f544a8a4d31a8d571ae2593c1f65c1ee465af81b87c599dac1f2
+  data.tar.gz: 180c6299a0f8a5e8a5451396865d82824e01e858431e570e2279240d4bd7026e1abdd97f887e05739db83aab32bcb204cfdd7b9a1e9b7e14b4feb00d7f52ba03

data/README.md

@@ -8,7 +8,7 @@ The Elections module adds elections to any participatory space.
 
 Elections will be available as a Component for a Participatory Space.
 
-In order to celebrate [End-to-end auditable votings](https://en.wikipedia.org/wiki/End-to-end_auditable_voting_systems) using the Elections module, you will need to connect your Decidim instance with an instance of the [Decidim Bulletin Board application](https://github.com/decidim/decidim-bulletin-board/). To create this connection, please check the [instructions](https://github.com/decidim/decidim/blob/develop/docs/services/elections_bulletin_board.md).
+In order to celebrate [End-to-end auditable votings](https://en.wikipedia.org/wiki/End-to-end_auditable_voting_systems) using the Elections module, you will need to connect your Decidim instance with an instance of the [Decidim Bulletin Board application](https://github.com/decidim/decidim-bulletin-board/). To create this connection, please check the [instructions](https://docs.decidim.org/en/services/elections_bulletin_board/).
 
 ## Installation
 

data/app/cells/decidim/elections/election_preview/show.erb

@@ -1,6 +1,6 @@
 <div class="row">
   <div class="columns large-8">
-    <h2 class="section-heading"><%= t("decidim.elections.elections.preview.title") %></h2>
+    <h3 class="section-heading"><%= t("decidim.elections.elections.preview.title") %></h3>
 
     <p><%= t("decidim.elections.elections.preview.description") %></p>
 

data/app/cells/decidim/elections/election_results/show.erb

@@ -1,6 +1,6 @@
 <div class="row">
   <div class="columns large-8">
-    <h2 class="section-heading"><%= t("decidim.elections.elections.results.title") %></h2>
+    <h3 class="section-heading"><%= t("decidim.elections.elections.results.title") %></h3>
 
     <p><%= t("decidim.elections.elections.results.description") %></p>
 

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

@@ -1,4 +1,4 @@
-<section class="wrapper-home home-section">
+<section id="highlighted_votings" class="wrapper-home home-section">
   <div class="row" id="highlighted-votings">
     <h3 class="section-heading"><%= t("active_votings", scope: i18n_scope) %></h3>
     <div class="row collapse">

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

@@ -6,10 +6,6 @@ module Decidim
       class HighlightedVotingsCell < Decidim::ViewModel
         delegate :current_user, to: :controller
 
-        cache :show, expires_in: 10.minutes, if: :perform_caching? do
-          cache_hash
-        end
-
         def show
           render if highlighted_votings.any?
         end
@@ -39,6 +35,10 @@ module Decidim
           hash.push(I18n.locale)
           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

@@ -5,20 +5,10 @@
         <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

@@ -6,9 +6,9 @@
           <%= translated_attribute(current_participatory_space.title) %>
         </h1>
 
-        <h3 class="text-highlight">
+        <p class="text-highlight heading3">
           <%= voting_dates %>
-        </h3>
+        </p>
       </div>
     </div>
 

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

@@ -74,7 +74,7 @@ module Decidim
                   url: decidim_votings.voting_path(current_participatory_space),
                   active: is_active_link?(decidim_votings.voting_path(current_participatory_space), :exclusive)
                 },
-                if current_participatory_space.dataset.present?
+                if current_participatory_space.check_census_enabled?
                   {
                     name: t("layouts.decidim.voting_navigation.check_census"),
                     url: decidim_votings.voting_check_census_path(current_participatory_space),

data/app/cells/decidim/votings/content_blocks/landing_page/polling_stations/address.erb

@@ -1,5 +1,5 @@
 <div class="polling_station-address">
-  <h5 class="mb-none"><%= translated_attribute polling_station.title %></h5>
+  <h4 class="mb-none heading5"><%= translated_attribute polling_station.title %></h4>
 
   <div>
     <strong><%= translated_attribute polling_station.location %></strong>

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

@@ -5,12 +5,14 @@ module Decidim
     module Admin
       # This command is executed when the admin user creates a trustee
       # from the admin panel.
-      class AddUserAsTrustee < Rectify::Command
+      class AddUserAsTrustee < Decidim::Command
         # Public: Initializes the command.
         #
         # 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_answer.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates an Answer
       # from the admin panel.
-      class CreateAnswer < Rectify::Command
+      class CreateAnswer < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates an Election
       # from the admin panel.
-      class CreateElection < Rectify::Command
+      class CreateElection < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Question
       # from the admin panel.
-      class CreateQuestion < Rectify::Command
+      class CreateQuestion < Decidim::Command
         def initialize(form)
           @form = form
         end
@@ -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/destroy_answer.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user destroys an Answer
       # from the admin panel.
-      class DestroyAnswer < Rectify::Command
+      class DestroyAnswer < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user destroys an Election
       # from the admin panel.
-      class DestroyElection < Rectify::Command
+      class DestroyElection < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user destroys a Question
       # from the admin panel.
-      class DestroyQuestion < Rectify::Command
+      class DestroyQuestion < Decidim::Command
         def initialize(question, current_user)
           @question = question
           @current_user = current_user

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

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to end the voting period in the Bulletin Board.
-      class EndVote < Rectify::Command
+      class EndVote < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A VotePeriodForm object with the information needed to start or end the vote period

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command is executed when an admin imports proposals from
       # one component to answers of elections component.
-      class ImportProposalsToElections < Rectify::Command
+      class ImportProposalsToElections < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

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

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called when a election is published from the admin panel.
-      class PublishElection < Rectify::Command
+      class PublishElection < Decidim::Command
         # Public: Initializes the command.
         #
         # election - The election to publish.

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

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to publish the election results in the Bulletin Board.
-      class PublishResults < Rectify::Command
+      class PublishResults < Decidim::Command
         # Public: Initializes the command.
         #
         # form - An ActionForm object with the information needed to publish the results

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the admin user removes a trustee
       # from a participatory space from the admin panel.
-      class RemoveTrusteeFromParticipatorySpace < Rectify::Command
+      class RemoveTrusteeFromParticipatorySpace < Decidim::Command
         # Public: Initializes the command.
         #
         # trustee_participatory_space - A trustee_participatory_space

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

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to report a missing trustee during the tally process.
-      class ReportMissingTrustee < Rectify::Command
+      class ReportMissingTrustee < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A ReportMissingTrusteeForm object with the information needed to report the missing trustee.

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

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called when a election is setup from the admin panel.
-      class SetupElection < Rectify::Command
+      class SetupElection < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A SetupForm object with the information needed to setup the election
@@ -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/start_key_ceremony.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to start the key ceremony in the Bulletin Board.
-      class StartKeyCeremony < Rectify::Command
+      class StartKeyCeremony < Decidim::Command
         # Public: Initializes the command.
         #
         # form - An ActionForm object with the information needed to perform an action

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

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to start the tally in the Bulletin Board.
-      class StartTally < Rectify::Command
+      class StartTally < Decidim::Command
         # Public: Initializes the command.
         #
         # form - An ActionForm object with the information needed to perform an action

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

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to start the voting period in the Bulletin Board.
-      class StartVote < Rectify::Command
+      class StartVote < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A VotePeriodForm object with the information needed to start or end the vote period

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

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called when a election is unpublished from the admin panel.
-      class UnpublishElection < Rectify::Command
+      class UnpublishElection < Decidim::Command
         # Public: Initializes the command.
         #
         # election - The election to unpublish.

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

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command updates the status of the action and the election if it got changed
-      class UpdateActionStatus < Rectify::Command
+      class UpdateActionStatus < Decidim::Command
         # Public: Initializes the command.
         #
         # action - The pending action to be updated

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user updates an Answer
       # from the admin panel.
-      class UpdateAnswer < Rectify::Command
+      class UpdateAnswer < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when an admin marks an answer
       # as selected.
-      class UpdateAnswerSelection < Rectify::Command
+      class UpdateAnswerSelection < Decidim::Command
         def initialize(answer, selected)
           @answer = answer
           @selected = selected

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user updates an Election
       # from the admin panel.
-      class UpdateElection < Rectify::Command
+      class UpdateElection < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user updates a Question
       # from the admin panel.
-      class UpdateQuestion < Rectify::Command
+      class UpdateQuestion < Decidim::Command
         def initialize(form, question)
           @form = form
           @question = question
@@ -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/elections/admin/update_trustee_participatory_space.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user updates a trustee
       # status from the admin panel.
-      class UpdateTrusteeParticipatorySpace < Rectify::Command
+      class UpdateTrusteeParticipatorySpace < Decidim::Command
         # Public: Initializes the command.
         #
         # trustee_participatory_space - A trustee_participatory_space

data/app/commands/decidim/elections/trustee_zone/update_election_bulletin_board_status.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module TrusteeZone
       # This command updates the election status if it got changed
-      class UpdateElectionBulletinBoardStatus < Rectify::Command
+      class UpdateElectionBulletinBoardStatus < Decidim::Command
         # Public: Initializes the command.
         #
         # status - The actual election status

data/app/commands/decidim/elections/trustee_zone/update_trustee.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module TrusteeZone
       # This command allows the user to update their trustee information
-      class UpdateTrustee < Rectify::Command
+      class UpdateTrustee < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form with the new trustee information

data/app/commands/decidim/elections/voter/cast_vote.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Voter
       # This command allows the user to store and cast their vote.
-      class CastVote < Rectify::Command
+      class CastVote < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form with necessary info to cast a vote.

data/app/commands/decidim/elections/voter/update_vote_status.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Voter
       # This command updates the vote status and sends a notification.
-      class UpdateVoteStatus < Rectify::Command
+      class UpdateVoteStatus < Decidim::Command
         # Public: Initializes the command.
         #
         # vote        - the vote that has been updated
@@ -74,7 +74,7 @@ module Decidim
             }
           }
 
-          Decidim::EventsManager.publish(data)
+          Decidim::EventsManager.publish(**data)
         end
 
         def send_vote_email

data/app/commands/decidim/votings/admin/create_ballot_style.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to create the ballot style
-      class CreateBallotStyle < Rectify::Command
+      class CreateBallotStyle < Decidim::Command
         def initialize(form)
           @form = form
         end

data/app/commands/decidim/votings/admin/create_monitoring_committee_member.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to create a new monitoring committee member
-      class CreateMonitoringCommitteeMember < Rectify::Command
+      class CreateMonitoringCommitteeMember < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params

data/app/commands/decidim/votings/admin/create_polling_officer.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to create a new polling officer
-      class CreatePollingOfficer < Rectify::Command
+      class CreatePollingOfficer < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params

data/app/commands/decidim/votings/admin/create_voting.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with all the business logic when creating a new voting space
-      class CreateVoting < Rectify::Command
+      class CreateVoting < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -51,7 +51,8 @@ module Decidim
             banner_image: form.banner_image,
             introductory_image: form.introductory_image,
             voting_type: form.voting_type,
-            census_contact_information: form.census_contact_information
+            census_contact_information: form.census_contact_information,
+            show_check_census: form.show_check_census
           )
         end
       end