decidim-elections 0.26.0.rc2 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22d89ae8a13eb3d6aa7a40f61854b07d9c57cb5b61d5d13be795593def2b3a12
-  data.tar.gz: a2bba9a72faee89fed7da254e1c954682dda7dfe1df8d7b2a6dfbd613742680b
+  metadata.gz: f8219848da3b47bb1de74d7c35c5d9f2f1b98ee394a1d9e07201cfc3760e8650
+  data.tar.gz: 8c2a725b532393fc5ddbdcbc2db2e320ce288e3b067e22524277097409f1ffa5
 SHA512:
-  metadata.gz: b430ef25f646251a0fca584338b2d9299f314f798fb969dac69507f88f854174ee0858bca6da4030f68c3fac7695a54f4d72775fdb58ef8467cef6fc75b25a43
-  data.tar.gz: 022b399f39e60b10ae13064d08af1fa7bc2e067eecb07e75cf003a694329903ab89e6574afddc1ed0eb3ceeb53b02f46649abb48356c742e1c62be678569a2df
+  metadata.gz: 668655440f14e989272e753a90332751b8d10ed8b8b63a7b0cbd14ef1fde3f4e79edaf9d6f499f00318ba1862ef1be157a7407806d30ed60dd2d274299f70968
+  data.tar.gz: 82341a653e8ee97716326601b815ce8d6f90811b94b92e057f1ae4983614d835253e5b3d6d59671c7ccd76d8d18db28bb3505aac69b750bedbba96bb688442e0

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/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/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

@@ -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,10 +26,6 @@ module Decidim
 
         attr_reader :form, :question
 
-        def invalid?
-          form.election.started? || form.invalid?
-        end
-
         def create_question!
           attributes = {
             election: form.election,

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/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/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/elections/show.html.erb

@@ -24,9 +24,9 @@ edit_link(
       <% end %>
     <% end %>
 
-    <h1 class="heading3">
+    <h2 class="heading3">
       <%== present(election).title %>
-    </h1>
+    </h2>
     <div class="card__callout">
       <%= cell "decidim/elections/remaining_time_callout", election %>
     </div>

data/app/views/decidim/elections/trustee_mailer/notification.html.erb

@@ -0,0 +1,5 @@
+<%== t("body", scope: "decidim.elections.admin.mailers.trustee_mailer", resource_name: @participatory_space_title, user_name: @user.name) %>
+
+<p class="email-button email-button__cta">
+  <%= link_to t("trustee_zone", scope: "decidim.elections.admin.mailers.trustee_mailer"), decidim.decidim_elections_trustee_zone_url(host: @organization.host) %>
+</p>

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

@@ -1,11 +1,13 @@
 <div class="vote-wrapper"
-  data-election-id="<%= election.id %>"
-  data-api-endpoint-url="<%= bulletin_board_server %>"
+  data-election-id="<%== election.id %>"
+  data-api-endpoint-url="<%== bulletin_board_server %>"
   data-authority-public-key="<%= authority_public_key %>"
-  data-election-unique-id="<%= election_unique_id %>"
-  data-voter-id="<%= voter_id %>"
-  <%= ballot_style_id.present? ? "data-ballot-style-id=\"#{ballot_style_id}\"" : nil %>
-  data-scheme-name="<%= scheme_name %>">
+  data-election-unique-id="<%== election_unique_id %>"
+  data-voter-id="<%== voter_id %>"
+  data-scheme-name="<%== scheme_name %>"
+  <% if ballot_style_id.present? %>
+  data-ballot-style-id="<%== ballot_style_id %>"
+  <% end %>>
 
   <% questions.each_with_index do |step_question, step_index| %>
     <div id="step-<%= step_index %>" class="focus__step <%= "hide" if step_index.positive? %>"

data/app/views/decidim/votings/admin/votings/_form.html.erb

@@ -27,7 +27,7 @@
     <div class="row column">
       <%= form.select :voting_type,
                   @form.options_for_voting_type_select,
-                  { include_blank: t(".select_a_voting_type") },
+                  { include_blank: t(".select_a_voting_type"), label: t(".voting_type_label") },
                   { multiple: false } %>
     </div>
 
@@ -37,7 +37,7 @@
 
     <div class="row">
       <div class="columns xlarge-6 slug">
-        <%= form.text_field :slug %>
+        <%= form.text_field :slug, label: t(".slug") %>
         <p class="help-text">
           <%== t(".slug_help", url: decidim_form_slug_url(:votings, form.object.slug)) %>
         </p>
@@ -46,7 +46,7 @@
 
     <div class="row">
       <div class="columns xlarge-6 census_contact_information">
-        <%= form.text_field :census_contact_information %>
+        <%= form.text_field :census_contact_information, label: t(".census_contact_information") %>
         <p class="help-text">
           <%== t(".census_contact_information_help") %>
         </p>
@@ -54,16 +54,16 @@
     </div>
 
     <div class="row column">
-      <%= form.check_box :promoted %>
+      <%= form.check_box :promoted, label: t(".promoted") %>
     </div>
 
     <div class="row">
       <div class="columns xlarge-4">
-        <%= form.upload :banner_image %>
+        <%= form.upload :banner_image, label: t(".banner_image") %>
       </div>
 
       <div class="columns xlarge-4">
-        <%= form.upload :introductory_image %>
+        <%= form.upload :introductory_image, label: t(".introductory_image") %>
       </div>
     </div>
   </div>

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

@@ -1,10 +1,8 @@
 <div>
-  <%= f.label :document_type do %>
-    <%= f.select :document_type,
-    form.options_for_document_type_select,
-    { include_blank: t(".select") },
-    { multiple: false } %>
-  <% end %>
+  <%= f.select :document_type,
+  form.options_for_document_type_select,
+  { include_blank: t(".select"), label: t(".document_type") },
+  { multiple: false } %>
 </div>
 <div>
   <%= f.text_field :document_number, label: t(".document_number"), placeholder: t(".document_number_placeholder") %>
@@ -15,17 +13,17 @@
 <fieldset>
   <legend><%= t(".date_of_birth") %></legend>
   <div class="row">
-    <%= f.label :day, t(".day"), class: "columns small-4" do %>
-      <%= f.text_field :day, placeholder: t(".day_placeholder"), "data-autojump" => true, "data-max-length" => 2,
+    <div class="columns small-4">
+      <%= f.text_field :day, placeholder: t(".day_placeholder"), label: t(".day"), "data-autojump" => true, "data-max-length" => 2,
                         "data-jump-next" => "#login_month" %>
-    <% end %>
-    <%= f.label :month, t(".month"), class: "columns small-4" do %>
-      <%= f.text_field :month, placeholder: t(".month_placeholder"), "data-autojump" => true, "data-max-length" => 2,
+    </div>
+    <div class="columns small-4">
+      <%= f.text_field :month, placeholder: t(".month_placeholder"), label: t(".month"), "data-autojump" => true, "data-max-length" => 2,
                         "data-jump-prev" => "#login_day", "data-jump-next" => "#login_year" %>
-    <% end %>
-    <%= f.label :year, t(".year"), class: "columns small-4" do %>
-      <%= f.text_field :year, placeholder: t(".year_placeholder"), "data-autojump" => true, "data-max-length" => 4,
+    </div>
+    <div class="columns small-4">
+      <%= f.text_field :year, placeholder: t(".year_placeholder"), label: t(".year"), "data-autojump" => true, "data-max-length" => 4,
                         "data-jump-prev" => "#login_month" %>
-    <% end %>
+    </div>
   </div>
 </fieldset>

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

@@ -22,12 +22,16 @@ edit_link(
           <p>
             <%= t("decidim.votings.votings.check_census.success.info") %>
             <button type="button" class="link" data-open="access-code-modal">
+              <% if Decidim.sms_gateway_service.to_s.safe_constantize %>
+              <%= t("decidim.votings.votings.check_census.success.access_link_with_sms") %>
+              <% else %>
               <%= t("decidim.votings.votings.check_census.success.access_link") %>
+              <% end %>
             </button>
           </p>
         </div>
         <% if datum.email.present? || datum.mobile_phone_number.present? %>
-          <%= render partial: "access_code_modal", locals: { datum: datum, email: datum.email ? datum.email.gsub!(/.{4}(?=@)/,"****") : "", sms: datum.mobile_phone_number ? datum.mobile_phone_number.gsub!(/.{3}\d$/,"***") : "" } %>
+          <%= render partial: "access_code_modal", locals: { datum: datum, email: datum.email ? datum.email.gsub!(/^.+@/,"****@") : "", sms: datum.mobile_phone_number ? datum.mobile_phone_number.gsub!(/.{3}\d$/,"***") : "" } %>
         <% end %>
       <% elsif not_found %>
         <div class="verify-census-error callout alert mt-s">

data/config/locales/ar.yml

@@ -1,13 +1,42 @@
 ar:
+  activemodel:
+    attributes:
+      answer:
+        description: الوصف
+      election:
+        description: الوصف
+      question:
+        description: الوصف
   decidim:
     elections:
+      admin:
+        steps:
+          tally:
+            invalid: كانت هناك مشكلة في الإبلاغ عن الأمين المفقود
+            mark_as_missing: وضع علامة مفقود
+            mark_as_missing_description: يجب أن يشارك جميع الأمناء في هذه العملية، ولكن إذا لم يتمكن الأمين من المشاركة في العملية، يمكنك وضع علامة على أنها مفقودة.
+            success: وقد تم بنجاح إرسال تقرير الأمين المفقود إلى لوحة الإعلانات
+            tally_completion: وستكتمل هذه العملية عندما يكون جميع الأمناء مُفعلين أو موسومين باعتبارهم مفقودين. مطلوب بحد أدنى %{quorum} من الأمناء لإكمال العملية.
+            undo_mark_as_missing: وسيتمكن الأمين الذي وُضع عليه علامة مفقودة عن طريق الخطأ من المشاركة قبل إتمام العملية. ويمكنهم المضي قدما كالمعتاد وسيتم تجاهل العلامة المفقودة.
+      elections:
+        election_log:
+          results_title: النتائج
+        results:
+          percentage: "%{count}%"
       trustee_zone:
         trustees:
           show:
             identification_keys:
               cancel: إلغاء
     votings:
+      admin:
+        monitoring_committee_election_results:
+          actions:
+            title: الإجراءات
       polling_officer_zone:
         closures:
+          edit:
+            modal_ballots_results_count_error:
+              close_modal: غلق
           sign:
             cancel: إلغاء