decidim-elections 0.26.2 → 0.27.0.rc2

data/app/views/decidim/elections/admin/steps/index.html.erb

@@ -43,3 +43,5 @@
     <%= render partial: current_step.to_s %>
   </div>
 <% end %>
+
+<%= render "decidim/elections/shared/broken_promises_modal" %>

data/app/views/decidim/elections/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/shared/_broken_promises_modal.html.erb

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

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

@@ -18,5 +18,9 @@
     <%= render("#{current_step}_steps") %>
   </div>
 
-  <%= javascript_pack_tag "decidim_elections_trustee_#{current_step}" %>
+  <%= render "decidim/elections/shared/broken_promises_modal" %>
+
+  <% 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/_show_casting.html.erb

@@ -22,4 +22,8 @@
   <%= 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" %>
+<%= render "decidim/elections/shared/broken_promises_modal" %>
+
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_elections_voter_casting_vote" %>
+<% end %>

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

@@ -59,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 "decidim/elections/shared/broken_promises_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

@@ -44,6 +44,15 @@
       </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, label: t(".census_contact_information") %>

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

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

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

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

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

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

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

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

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

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

data/app/views/decidim/votings/polling_officer_zone/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,8 @@
   <% end %>
 </div>
 
-<%= javascript_pack_tag "decidim_votings_in_person_vote" %>
+<%= render "decidim/elections/shared/broken_promises_modal" %>
+
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_in_person_vote" %>
+<% end %>

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

@@ -22,4 +22,8 @@
   <%= 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" %>
+<%= render "decidim/elections/shared/broken_promises_modal" %>
+
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_votings_in_person_vote" %>
+<% end %>

data/app/views/decidim/votings/votings/_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/_promoted_voting.html.erb

@@ -13,7 +13,7 @@
     </div>
     <div class="columns mediumlarge-8 large-6 card--process__column">
       <div class="card--full__image"
-           style="background-image:url(<%= promoted_voting.attached_uploader(:banner_image).path %>)">
+           style="background-image:url('<%= promoted_voting.attached_uploader(:banner_image).path %>')">
         <div class="card__content row collapse">
           <div class="large-6 large-offset-6 columns">
             <%= link_to voting_path(promoted_voting), class: "button expanded button--sc" do %>

data/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/ar.yml

@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -5,13 +6,11 @@ ar:
         description: الوصف
       election:
         description: الوصف
-      question:
-        description: الوصف
   decidim:
     elections:
       admin:
         steps:
-          tally:
+          tally_started:
             invalid: كانت هناك مشكلة في الإبلاغ عن الأمين المفقود
             mark_as_missing: وضع علامة مفقود
             mark_as_missing_description: يجب أن يشارك جميع الأمناء في هذه العملية، ولكن إذا لم يتمكن الأمين من المشاركة في العملية، يمكنك وضع علامة على أنها مفقودة.

data/config/locales/bg.yml

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