decidim-elections 0.26.0 → 0.27.0.rc1

data/app/services/decidim/votings/census_vote_flow.rb

@@ -97,9 +97,7 @@ module Decidim
       end
 
       def valid_token_flow_data?
-        @valid_token_flow_data ||= begin
-          has_voter? && received_voter_token_data[:flow].as_json == voter_data.as_json
-        end
+        @valid_token_flow_data ||= has_voter? && received_voter_token_data[:flow].as_json == voter_data.as_json
       end
     end
   end

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

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

data/app/views/decidim/elections/admin/steps/{_tally.html.erb → _tally_started.html.erb}

@@ -61,7 +61,7 @@
 </div>
 
 <div class="button--double form-general-submit">
-  <%= link_to t("steps.tally.continue", scope: "decidim.elections.admin"), election_steps_path(election), class: "button disabled js-continue-link" %>
+  <%= link_to t("steps.tally_started.continue", scope: "decidim.elections.admin"), election_steps_path(election), class: "button disabled js-continue-link" %>
 </div>
 
 <%= javascript_pack_tag "decidim_elections_admin_trustees_process" %>

data/app/views/decidim/elections/elections/_filters.html.erb

@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text,
+        <%= form.search_field :search_text_cont,
                               label: false,
                               class: "input-group-field",
                               placeholder: t(".search"),
@@ -20,6 +20,6 @@
     </div>
   </div>
 
-  <%= form.check_boxes_tree :state, state_filter_values, legend_title: t(".state") %>
+  <%= form.check_boxes_tree :with_any_date, date_filter_values, legend_title: t(".date") %>
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
 <% end %>

data/app/views/decidim/elections/elections/election_log.html.erb

@@ -179,4 +179,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_elections_election_log" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_elections_election_log" %>
+<% end %>

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

@@ -18,5 +18,7 @@
     <%= render("#{current_step}_steps") %>
   </div>
 
-  <%= javascript_pack_tag "decidim_elections_trustee_#{current_step}" %>
+  <% content_for :js_content do %>
+    <%= javascript_pack_tag "decidim_elections_trustee_#{current_step}" %>
+  <% end %>
 <% end %>

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

@@ -99,4 +99,6 @@
   <% end %>
 </div>
 
-<%= javascript_pack_tag "decidim_elections_trustee_trustee_zone" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_elections_trustee_trustee_zone" %>
+<% end %>

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

@@ -20,4 +20,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_elections_onboarding" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_elections_onboarding" %>
+<% end %>

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

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

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

@@ -22,4 +22,6 @@
   <%= form_tag election_vote_path(election, id: vote.encrypted_vote_hash), method: :patch, class: "update_vote_status" %>
 </div>
 
-<%= javascript_pack_tag "decidim_elections_voter_casting_vote" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_elections_voter_casting_vote" %>
+<% end %>

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? %>"
@@ -57,9 +59,15 @@
   </div>
 </div>
 
-<% if preview_mode? %>
-  <%= javascript_pack_tag "decidim_elections_voter_setup_preview" %>
-<% else %>
-  <%= javascript_pack_tag "decidim_elections_voter_setup_vote" %>
+<%= render "server_error_modal" %>
+
+<% content_for :js_content do %>
+
+  <% if preview_mode? %>
+    <%= javascript_pack_tag "decidim_elections_voter_setup_preview" %>
+  <% else %>
+    <%= javascript_pack_tag "decidim_elections_voter_setup_vote" %>
+  <% end %>
+
+  <%= javascript_pack_tag "decidim_elections_voter_new_vote" %>
 <% end %>
-<%= javascript_pack_tag "decidim_elections_voter_new_vote" %>

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

@@ -54,6 +54,7 @@
 
             <input type="text" class="vote-identifier" name="vote-identifier" value="<%= params[:vote_id].gsub("_","") %>">
           </label>
+          <p class="help-text"><%= t("decidim.elections.votes.verify.form.vote_identifier_help") %></p>
           <div>
             <%= link_to(
               "#",
@@ -72,4 +73,6 @@
 
 </div>
 
-<%= javascript_pack_tag "decidim_elections_voter_verify_vote" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_elections_voter_verify_vote" %>
+<% end %>

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,16 +37,25 @@
 
     <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>
       </div>
     </div>
 
+    <div class="row">
+      <div class="columns xlarge-6 show_check_census">
+        <%= form.check_box :show_check_census %>
+        <p class="help-text">
+          <%== t(".show_check_census_help") %>
+        </p>
+      </div>
+    </div>
+
     <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 +63,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/polling_officer_zone/closures/_certify_form.html.erb

@@ -6,7 +6,9 @@
     <fieldset>
       <legend><%= t("form_legend", scope: "decidim.votings.polling_officer_zone.closures.certify") %></legend>
       <div class="row column">
-        <%= form.file_field :add_photos, multiple: true, label: t("add_images", scope: "decidim.votings.polling_officer_zone.closures.certify") %>
+        <%= form.attachment :photos,
+          multiple: true,
+          label: t("add_images", scope: "decidim.votings.polling_officer_zone.closures.certify") %>
       </div>
     </fieldset>
   </div>

data/app/views/decidim/votings/polling_officer_zone/closures/_sign_form.html.erb

@@ -53,4 +53,6 @@
   </div>
 <% end %>
 
-<%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_sign_closure" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_sign_closure" %>
+<% end %>

data/app/views/decidim/votings/polling_officer_zone/closures/edit.html.erb

@@ -45,4 +45,6 @@
 
 <%= render "modal_ballots_results_count_error" %>
 
-<%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_edit_closure" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_edit_closure" %>
+<% end %>

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

@@ -59,4 +59,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_new_closure" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_new_closure" %>
+<% end %>

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

@@ -2,7 +2,11 @@
   <div class="columns">
     <% if vote_check.allowed? %>
       <div class="callout success mt-s">
-        <h5><%= t(".census_verified") %></h5>
+        <% if voted_online? %>
+          <h5><%= t(".census_verified_with_online_vote") %></h5>
+        <% else %>
+          <h5><%= t(".census_verified") %></h5>
+        <% end %>
       </div>
       <div class="row mt-sm">
         <div class="columns large-7">
@@ -56,4 +60,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_in_person_vote" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_voting_polling_officer_zone_in_person_vote" %>
+<% end %>

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

@@ -18,4 +18,6 @@
   <% end %>
 </div>
 
-<%= javascript_pack_tag "decidim_votings_in_person_vote" %>
+<% 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,4 +22,6 @@
   <%= form_tag polling_officer_election_in_person_vote_path(polling_officer, election, in_person_vote), method: :patch, class: "update_vote_status" %>
 </div>
 
-<%= javascript_pack_tag "decidim_votings_in_person_vote" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_in_person_vote" %>
+<% end %>

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

@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text,
+        <%= form.search_field :search_text_cont,
                               label: false,
                               class: "input-group-field",
                               placeholder: t(".search"),
@@ -20,7 +20,6 @@
     </div>
   </div>
 
-  <%= form.check_boxes_tree :state, filter_states_values, legend_title: t(".state") %>
-
+  <%= form.check_boxes_tree :with_any_date, date_filter_values, legend_title: t(".date") %>
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
 <% end %>

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/app/views/layouts/decidim/election_votes.html.erb

@@ -18,8 +18,10 @@
   <body>
     <main class="focus">
       <%= render partial: "layouts/decidim/election_votes_header" %>
+
       <%= yield %>
-      <%= render partial: "layouts/decidim/js_configuration" %>
     </main>
+
+    <%= render partial: "layouts/decidim/decidim_javascript" %>
   </body>
 </html>

data/config/assets.rb

@@ -11,7 +11,7 @@ Decidim::Webpacker.register_entrypoints(
   decidim_elections_admin_trustees_process: "#{base_path}/app/packs/entrypoints/decidim_elections_admin_trustees_process.js",
   decidim_elections_admin_vote_statistics: "#{base_path}/app/packs/entrypoints/decidim_elections_admin_vote_statistics.js",
   decidim_elections_trustee_key_ceremony: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_key_ceremony.js",
-  decidim_elections_trustee_tally: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_tally.js",
+  decidim_elections_trustee_tally_started: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_tally_started.js",
   decidim_elections_trustee_zone: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_zone.js",
   decidim_elections_trustee_trustee_zone: "#{base_path}/app/packs/entrypoints/decidim_elections_trustee_trustee_zone.js",
   decidim_elections_voter_casting_vote: "#{base_path}/app/packs/entrypoints/decidim_elections_voter_casting-vote.js",

data/config/locales/am-ET.yml

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

data/config/locales/ar.yml

@@ -1,13 +1,41 @@
+---
 ar:
+  activemodel:
+    attributes:
+      answer:
+        description: الوصف
+      election:
+        description: الوصف
   decidim:
     elections:
+      admin:
+        steps:
+          tally_started:
+            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: إلغاء

data/config/locales/bg.yml

@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes: