decidim-elections 0.31.0.rc2 → 0.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1350982617f9cf2b5417179740fe67d319fd01e74c85fbcc823f092d78b23923
-  data.tar.gz: 29788cfe9ee20c68fbbd6739baee65968c98c1ed3daf344e11634ba3f458687e
+  metadata.gz: 3314659cca0234480f9fbca9edd5ebd51d55f465d8e66608aadf327c04101d73
+  data.tar.gz: 3bbb9c90945c6c7e14e37e993d1095ce69e78ef7508f9790186a38449b5f36d5
 SHA512:
-  metadata.gz: 3535497567d41f0d365331a63ffb3aa2f751bcef39460de3f9c3ab377f64e0be9011f85748b819f4910141bdcfbd5ff506b96d11ba3d52d71175571381b80f91
-  data.tar.gz: 07cfca093845a3378687f949072ac9a16fcace3ce766e1bbe6be70922db0dc04b8380c3c44fa67d867802766ef5cf1800dd164d9937889ec8c375be1140e3526
+  metadata.gz: e0012585bd4d6b44592a964be98666b30c20ff3abf68ebc892ba922ab8465dfba059afa347000b08ad8e2057bc66f3aa3caaaa457045ce70df85ab07ba5b9992
+  data.tar.gz: f17982cf8116fbfdce4c5a0258f07f5beac98a436e627fac163035da027812cd44e64e0ecc42d83dd02423e25a5df9035d0c1229f6c7a2f02e417111f4c2e1b5

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

@@ -17,14 +17,14 @@ module Decidim
         alias election resource
 
         def attributes
-          election.published? ? published_election_attributes : unpublished_election_attributes
+          election.started? ? started_election_attributes : not_started_election_attributes
         end
 
-        def published_election_attributes
+        def started_election_attributes
           { description: parsed_description }
         end
 
-        def unpublished_election_attributes
+        def not_started_election_attributes
           {
             title: parsed_title,
             description: parsed_description,

data/app/controllers/concerns/decidim/elections/uses_votes_booth.rb

@@ -47,10 +47,16 @@ module Decidim
 
       # Shows the receipt page
       def receipt
+        if params[:exit].present?
+          votes_buffer.clear
+          session_attributes.clear
+          return redirect_to(exit_path)
+        end
+
         enforce_permission_to(:create, :vote, election:)
 
-        votes_buffer.clear
-        session_attributes.clear
+        votes_buffer.clear unless election.per_question?
+
         return redirect_to(exit_path) unless election.votes.exists?(voter_uid: session[:voter_uid])
 
         render "decidim/elections/votes/receipt"

data/app/controllers/decidim/elections/per_question_votes_controller.rb

@@ -16,12 +16,20 @@ module Decidim
       end
 
       before_action only: [:show, :update] do
-        redirect_to(**next_vote_step_action) unless question.voting_enabled?
+        redirect_to(**next_vote_step_action) unless question.voting_enabled? || request.format.json?
       end
 
       # Show the voting form for the given question
+      # Responds to HTML (render the form) and JSON (check question status for polling)
       def show
         enforce_permission_to(:create, :vote, election:)
+
+        respond_to do |format|
+          format.html
+          format.json do
+            render json: question_status_response
+          end
+        end
       end
 
       # Saves the vote for the current question and redirect to the next question
@@ -29,6 +37,7 @@ module Decidim
         enforce_permission_to(:create, :vote, election:)
 
         response_ids = params.dig(:response, question.id.to_s)
+        requeue_following_questions
         votes_buffer[question.id.to_s] = response_ids
         CastVotes.call(election, { question.id.to_s => response_ids }, voter_uid) do
           on(:ok) do
@@ -84,6 +93,24 @@ module Decidim
 
         { action: :show, id: next_question }
       end
+
+      # Returns JSON response with question voting status for client-side polling.
+      # Used to redirect users when a question's voting is closed while they are on the voting page.
+      def question_status_response
+        if question.voting_enabled?
+          { voting_enabled: true, redirect_url: nil }
+        else
+          redirect_action = next_vote_step_action
+          { voting_enabled: false, redirect_url: url_for(**redirect_action) }
+        end
+      end
+
+      def requeue_following_questions
+        election.questions
+                .where("position > ?", question.position)
+                .pluck(:id)
+                .each { |id| votes_buffer.delete(id.to_s) }
+      end
     end
   end
 end

data/app/forms/decidim/elections/admin/election_form.rb

@@ -25,9 +25,11 @@ module Decidim
         validates :title, translatable_presence: true
         validates :results_availability, inclusion: { in: Decidim::Elections::Election::RESULTS_AVAILABILITY_OPTIONS }
         validates :start_at, date: { before: :end_at }, unless: :manual_start?
+        validates :start_at, date: { after: proc { Time.current } }, if: :scheduled_election?
         validates :manual_start, acceptance: true, if: :per_question_not_started?
         validates :end_at, presence: true
         validates :end_at, date: { after: :start_at }, if: ->(f) { f.start_at.present? && f.end_at.present? }
+        validates :end_at, date: { after: proc { Time.current } }, if: :scheduled_election?
 
         def map_model(election)
           self.manual_start = election.start_at.blank?
@@ -42,6 +44,14 @@ module Decidim
         def per_question_not_started?
           results_availability == "per_question" && start_at.blank?
         end
+
+        def election
+          @election ||= context[:election]
+        end
+
+        def scheduled_election?
+          election&.scheduled?
+        end
       end
     end
   end

data/app/forms/decidim/elections/censuses/internal_users_form.rb

@@ -8,6 +8,9 @@ module Decidim
         validate :user_authenticated
 
         delegate :election, :current_user, to: :context
+        delegate :organization, to: :current_user
+
+        attr_reader :authorization_status
 
         def voter_uid
           @voter_uid ||= election.census.users(election).find_by(id: current_user&.id)&.to_global_id&.to_s
@@ -18,7 +21,7 @@ module Decidim
         end
 
         def authorization_handlers
-          election.census_settings["authorization_handlers"] || {}
+          @authorization_handlers ||= election.census_settings&.fetch("authorization_handlers", {})&.slice(*organization.available_authorizations)
         end
 
         def authorizations
@@ -26,7 +29,7 @@ module Decidim
             [
               adapter,
               Decidim::Verifications::Authorizations.new(
-                organization: current_user.organization,
+                organization: organization,
                 user: current_user,
                 name: adapter.name
               ).first
@@ -43,20 +46,11 @@ module Decidim
         def user_authenticated
           return errors.add(:base, I18n.t("decidim.elections.censuses.internal_users_form.invalid")) unless in_census?
 
-          invalid = authorizations.filter_map do |adapter, authorization|
-            if !authorization || !authorization.granted?
-              ["not_granted", adapter]
-            elsif adapter.authorize(authorization, authorization_handlers.dig(adapter.name, "options"), election.component, election)&.first != :ok
-              ["not_authorized", adapter]
-            end
-          end
+          @authorization_status = Decidim::ActionAuthorizer::AuthorizationStatusCollection.new(authorization_handlers, current_user, election.component, election)
 
-          return if invalid.empty?
+          return if @authorization_status.ok?
 
           errors.add(:base, I18n.t("decidim.elections.censuses.internal_users_form.invalid"))
-          invalid.each do |error, adapter|
-            errors.add(:base, I18n.t("decidim.elections.censuses.internal_users_form.#{error}", adapter: adapter.fullname))
-          end
         end
       end
     end

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

@@ -43,6 +43,18 @@ module Decidim
         end
       end
 
+      def render_question_description(question)
+        description = translated_attribute(question.description)
+        return if description.blank?
+
+        sanitized = decidim_sanitize_admin(description)
+        if rich_text_editor_in_public_views?
+          Decidim::ContentProcessor.render_without_format(sanitized).html_safe
+        else
+          Decidim::ContentProcessor.render(sanitized, "div")
+        end
+      end
+
       def selected_response_option_id(question)
         session.dig(:votes_buffer, question.id.to_s, "response_option_id")&.to_i
       end

data/app/models/decidim/elections/election.rb

@@ -72,6 +72,10 @@ module Decidim
         published? && !ongoing? && !finished? && !published_results?
       end
 
+      def editable?
+        published? ? !started? : !votes.exists?
+      end
+
       def started?
         start_at.present? && start_at <= Time.current
       end
@@ -131,14 +135,6 @@ module Decidim
         questions
       end
 
-      # Create i18n ransackers for :title and :description.
-      # Create the :search_text ransacker alias for searching from both of these.
-      ransacker_i18n_multi :search_text, [:title, :description]
-
-      def self.ransackable_scopes(_auth_object = nil)
-        [:with_any_state]
-      end
-
       def status
         return @status if defined?(@status)
 

data/app/packs/entrypoints/decidim_elections.js

@@ -1,5 +1,6 @@
 import "src/decidim/elections/waiting_room.js"
 import "src/decidim/elections/live_results_update.js";
+import "src/decidim/elections/question_status_checker.js";
 
 // Images
 require.context("../images", true)

data/app/packs/src/decidim/elections/live_results_update.js

@@ -12,6 +12,7 @@ document.addEventListener("DOMContentLoaded", () => {
   const optionVoteCountTexts = () => document.querySelectorAll("[data-option-votes-count-text]");
   const optionVotePercentTexts = () => document.querySelectorAll("[data-option-votes-percent-text]");
   const optionVoteWidths = () => document.querySelectorAll("[data-option-votes-width]");
+  const questionTotalVotesTexts = () => document.querySelectorAll("[data-question-total-votes-text]");
   
   const animateText = (element, value) => {
     if (element.textContent === value) {
@@ -24,6 +25,15 @@ document.addEventListener("DOMContentLoaded", () => {
     }, 1000);
   };
   
+  const digQuestionValue = (questionId, data, key) => {
+    const questions = data.questions || [];
+    const question = questions.find((item) => item.id === parseInt(questionId, 10));
+    if (!question || !(key in question)) {
+      return null;
+    }
+    return question[key];
+  };
+
   const digOptionValue = (questionId, optionId, data, key) => {
     data.questions = data.questions || [];
     const question = data.questions.find((item) => item.id === parseInt(questionId, 10));
@@ -55,6 +65,11 @@ document.addEventListener("DOMContentLoaded", () => {
       questionElement.id = `question-${question.id}`;
       questionElement.classList.remove("hidden");
       questionElement.querySelector("[data-question-body]").textContent = question.body;
+      const totalVotesElement = questionElement.querySelector("[data-question-total-votes-text]");
+      if (totalVotesElement) {
+        totalVotesElement.dataset.questionTotalVotesText = question.id;
+        totalVotesElement.textContent = question.total_votes_text || "";
+      }
       const optionsContainer = questionElement.querySelector("[data-options-container]");
       question.response_options.forEach((option) => {
         const optionElement = optionTemplate.cloneNode(true);
@@ -106,6 +121,13 @@ document.addEventListener("DOMContentLoaded", () => {
           el.style.width = `${val}%`;
         }
       });
+      questionTotalVotesTexts().forEach((el) => {
+        const questionId = el.dataset.questionTotalVotesText;
+        const val = digQuestionValue(questionId, data, "total_votes_text");
+        if (val) {
+          animateText(el, val);
+        }
+      });
       // repeat for ongoing elections only
       if (data.ongoing) {
         setTimeout(fetchResults, 4000);

data/app/packs/src/decidim/elections/question_status_checker.js

@@ -0,0 +1,42 @@
+/**
+ * Polls the server to check if the current question is still available for voting.
+ * When voting is closed, redirects user to the waiting room or next question.
+ */
+document.addEventListener("DOMContentLoaded", () => {
+  const votingBooth = document.querySelector("[data-question-status-url]");
+  if (!votingBooth) {
+    return;
+  }
+
+  const statusUrl = votingBooth.dataset.questionStatusUrl;
+  if (!statusUrl) {
+    return;
+  }
+
+  const checkStatus = async () => {
+    try {
+      const response = await fetch(statusUrl, {
+        method: "GET",
+        headers: {
+          "Accept": "application/json",
+          "Content-Type": "application/json",
+          "X-Requested-With": "XMLHttpRequest"
+        }
+      });
+
+      if (response.ok) {
+        const result = await response.json();
+        if (!result.voting_enabled && result.redirect_url) {
+          window.location.href = result.redirect_url;
+          return;
+        }
+      }
+    } catch (error) {
+      console.error("[QuestionStatusChecker] Error:", error);
+    }
+
+    setTimeout(checkStatus, 1000);
+  };
+
+  setTimeout(checkStatus, 1000);
+});

data/app/packs/stylesheets/decidim/elections/elections.scss

@@ -89,3 +89,7 @@
     }
   }
 }
+
+.vote_booth-question_title {
+  @apply h3 mb-4;
+}

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

@@ -43,7 +43,7 @@ module Decidim
 
           case permission_action.action
           when :update, :reorder
-            toggle_allow(election.present? && !election.published?)
+            toggle_allow(election.present? && election.editable?)
           when :update_status
             toggle_allow(election.present? && election.published? && election.questions.exists?)
           end
@@ -53,10 +53,8 @@ module Decidim
           return unless permission_action.subject == :census
 
           case permission_action.action
-          when :edit
-            allow!
-          when :update
-            toggle_allow(election.present? && !election.published?)
+          when :edit, :update
+            toggle_allow(election.present? && election.editable?)
           end
         end
       end

data/app/presenters/decidim/elections/election_presenter.rb

@@ -5,7 +5,6 @@ module Decidim
     class ElectionPresenter < Decidim::ResourcePresenter
       include Decidim::ResourceHelper
       include ActionView::Helpers::UrlHelper
-      include Decidim::SanitizeHelper
 
       def election
         __getobj__
@@ -41,7 +40,13 @@ module Decidim
               body: translated_attribute(question.body),
               position: question.position,
               voting_enabled: question.voting_enabled?,
-              published_results: question.published_results?,
+              published_results: question.published_results?
+            }.tap do |hash|
+              next unless admin || result_published_questions.include?(question)
+
+              hash[:total_votes] = question.total_votes
+              hash[:total_votes_text] = I18n.t("total_votes", scope: "decidim.elections.elections.vote_results", count: question.total_votes)
+            end.merge(
               response_options: question.response_options.map do |option|
                 {
                   id: option.id,
@@ -55,7 +60,7 @@ module Decidim
                   hash[:votes_percent] = option.votes_percent
                 end
               end
-            }
+            )
           end
         }
       end

data/app/views/decidim/elections/admin/census/edit.html.erb

@@ -2,33 +2,35 @@
 
 <div class="item_show__header form-defaults border-none">
   <h1 class="item_show__header-title">
-    <%= t(".title") %>
+    <%= t("decidim.elections.actions.edit") %>
   </h1>
+</div>
+
+<%= render "decidim/elections/admin/elections/tabs_menu" %>
+
+<div class="form-defaults my-8 flex justify-end">
   <%= select_tag "census_manifest",
                  options_for_select(census_manifests.to_h { |manifest| [manifest.label, manifest.name] }, selected: election.census&.name),
                  include_blank: t(".choose_census"),
                  id: "census-manifest-selector" %>
-
 </div>
 
-<%= render "decidim/elections/admin/elections/tabs_menu" %>
-
-  <% if election.census_ready? %>
-   <%
-    census_ready = t("decidim.elections.censuses.census_ready_html", election_title: decidim_sanitize_translated(election.title))
-    census_count = t("decidim.elections.censuses.census_size_html", count: census_count(election))
-   %>
+<% if election.census_ready? %>
+    <%
+      census_ready = t("decidim.elections.censuses.census_ready_html", election_title: decidim_sanitize_translated(election.title))
+      census_count = t("decidim.elections.censuses.census_size_html", count: census_count(election))
+    %>
     <%= cell "decidim/announcement", "#{census_ready}<br>#{census_count}", callout_class: "success" %>
-   <% end %>
+<% end %>
+
 <div class="card-section census-form form-defaults 2xl:mr-80">
   <% if @form && election.census&.admin_form_partial %>
     <%= decidim_form_for(@form, url: election_census_path(election, manifest: election.census&.name), method: :patch, multipart: true, html: { id: "census-election-form" }) do |f| %>
       <%= render partial: election.census.admin_form_partial, locals: { form: f } %>
     <% end %>
   <% end %>
-  <div class="border-t border-gray-3 my-4">
-    <%= render partial: "decidim/elections/admin/census/preview", locals: { election: } if preview_users(election).present? %>
-  </div>
+
+  <%= render partial: "decidim/elections/admin/census/preview", locals: { election: } if preview_users(election).present? %>
 </div>
 
 <div class="item__edit-sticky">

data/app/views/decidim/elections/admin/dashboard/_questions.html.erb

@@ -19,6 +19,7 @@
                 <%= translated_attribute(question.body) %>
                 <small class="font-normal ml-4"><%= t("decidim.forms.question_types.#{question.question_type}") %></small>
               </h3>
+              <div><%= decidim_sanitize_admin translated_attribute(question.description) %></div>
               <h3 class="h6 mt-4 mb-2"><%= t("decidim.elections.admin.dashboard.questions.labels.answers") %>:</h3>
               <ul>
                 <% question.response_options.each_with_index do |option, opt_index| %>

data/app/views/decidim/elections/admin/dashboard/_questions_with_results.html.erb

@@ -15,6 +15,7 @@
             </div>
           <% end %>
         </h3>
+        <div><%= decidim_sanitize_admin translated_attribute(question.description) %></div>
       </div>
       <div class="row column">
         <div class="table-scroll mb-4">
@@ -34,6 +35,11 @@
                 <td data-option-votes-percent-text="<%= question.id %>,<%= option.id %>"><%= number_to_percentage(option.votes_percent, precision: 1) %></td>
               </tr>
             <% end %>
+            <tr>
+              <td class="w-2/3 border-none"><%= t("decidim.elections.admin.dashboard.questions_table.total") %></td>
+              <td class="border-none"></td>
+              <td class="border-none" data-question-total-votes-text="<%= question.id %>"><%= t("votes_count", scope: "decidim.elections.admin.dashboard.questions_table", count: question.total_votes) %></td>
+            </tr>
             </tbody>
           </table>
         </div>

data/app/views/decidim/elections/admin/elections/_election-tr.html.erb

@@ -1,7 +1,7 @@
 <tr data-id="<%= election.id %>">
   <td data-label="<%= t("models.election.fields.title", scope: "decidim.elections") %>">
     <% if allowed_to? :update, :election, election: election %>
-      <%= link_to present(election).title(html_escape: true), election.published? ? dashboard_election_path(election) : edit_election_path(election) %>
+      <%= link_to present(election).title(html_escape: true), election.started? ? dashboard_election_path(election) : edit_election_path(election) %>
     <% else %>
       <%= present(election).title(html_escape: true) %>
     <% end %>

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

@@ -1,4 +1,4 @@
-<% disable_fields = @election&.published? %>
+<% disable_fields = @election.present? && !@election.editable? %>
 <div class="form__wrapper">
   <div class="card-section election-fields">
     <div class="card form-basic" data-controller="accordion" id="accordion-basic">
@@ -55,11 +55,11 @@
         <div class="row column election-fields--time">
           <div class="md:flex w-100">
             <div class="row column election_start_time">
-              <%= form.datetime_field :start_at, label: t("decidim.elections.admin.elections.form.start_at") %>
+              <%= form.datetime_field :start_at, label: t("decidim.elections.admin.elections.form.start_at"), disabled: disable_fields %>
               <%= form.hidden_field :start_at, value: election.start_at if disable_fields %>
             </div>
             <div class="row column">
-              <%= form.datetime_field :end_at, label: t("decidim.elections.admin.elections.form.end_at") %>
+              <%= form.datetime_field :end_at, label: t("decidim.elections.admin.elections.form.end_at"), disabled: disable_fields %>
               <%= form.hidden_field :end_at, value: election.end_at if disable_fields %>
             </div>
           </div>

data/app/views/decidim/elections/admin/elections/dashboard.html.erb

@@ -5,15 +5,15 @@
 
 <div class="item_show__header" style="border-bottom: none;">
   <h1 class="item_show__header-title">
-    <%= t(".title") %>
+    <%= t("decidim.elections.actions.edit") %>
   </h1>
 
   <div>
-    <%= link_to resource_locator(election).path, class: "button button__xs button__transparent-secondary", target: :blank, data: { "external-link": false } do %>
-      <%= icon "eye-line" %>
+    <%= link_to resource_locator(election).path, class: "button button__xs button__transparent-secondary flex flex-row items-center gap-2", target: :blank, data: { "external-link": false } do %>
+      <%= icon "eye-line", class: "inline-block" %>
       <%# i18n-tasks-use t("decidim.elections.actions.view") %>
       <%# i18n-tasks-use t("decidim.elections.actions.preview") %>
-      <%= t(election.published? ? "view" : "preview", scope: "decidim.elections.actions") %>
+      <span class="whitespace-nowrap"><%= t(election.published? ? "view" : "preview", scope: "decidim.elections.actions") %></span>
     <% end %>
   </div>
 </div>

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

@@ -3,7 +3,7 @@
 <% append_javascript_pack_tag "decidim_elections_admin" %>
 <% append_stylesheet_pack_tag "decidim_elections_admin" %>
 
-<div class="item_show__header">
+<div class="item_show__header border-none">
   <h1 class="item_show__header-title">
     <%= t(".title") %>
   </h1>

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

@@ -16,7 +16,7 @@
     <%= render "decidim/elections/admin/questions/response_option_template", form: question_form, editable: true, template_id: "response-option-template-dummy" %>
   <% end %>
 
-  <div class="questionnaire-questions-list flex flex-col py-6 gap-6 last:pb-0" data-draggable-table data-sort-url="#" id="questionnaire-questions-list">
+  <div class="questionnaire-questions-list flex flex-col py-6 gap-6 last:pb-0" data-draggable-table data-sort-url="#" data-draggable-handle=".card-divider" id="questionnaire-questions-list">
     <% @form.questions.each_with_index do |question, index| %>
       <%= fields_for "questions[]", question do |question_form| %>
         <%= render "decidim/elections/admin/questions/question",
@@ -35,34 +35,5 @@
 <script>
   document.addEventListener("turbo:load", function () {
     window.Decidim.createEditableForm();
-
-    // Function to initialize the sortable functionality
-    function initializeSortable() {
-      const container = document.querySelector("#questionnaire-questions-list");
-      const questionCards = container?.querySelectorAll(".card.questionnaire-question");
-
-      if (!container || !questionCards?.length) return;
-
-      questionCards.forEach(card => {
-        card.setAttribute("draggable", "true");
-        card.setAttribute("role", "option");
-        card.setAttribute("aria-grabbed", "false");
-      });
-
-      window.Decidim?.createSortableList?.("#questionnaire-questions-list");
-    }
-
-    // Initialize on load and when new options such as questions etc are added
-    initializeSortable();
-
-    const observer = new MutationObserver(() => {
-      clearTimeout(observer.timer);
-      observer.timer = setTimeout(initializeSortable, 500);
-    });
-
-    const container = document.querySelector("#questionnaire-questions-list");
-    if (container) {
-      observer.observe(container, { childList: true, subtree: true });
-    }
   });
 </script>

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

@@ -3,8 +3,7 @@
 <div class="questionnaire-questions">
   <div class="item_show__header" style="border-bottom: none;">
     <h1 class="item_show__header-title">
-      <%= t(".title") %>
-      <button class="button button__sm button__transparent-secondary add-question"><%= t("add_question", scope: "decidim.forms.admin.questionnaires.form") %></button>
+        <%= t("decidim.elections.actions.edit") %>
     </h1>
   </div>
 
@@ -26,5 +25,6 @@
         </div>
       </div>
     </div>
+    <button class="button button__sm button__transparent-secondary add-question mt-1"><%= t("add_question", scope: "decidim.forms.admin.questionnaires.form") %></button>
   </div>
 </div>

data/app/views/decidim/elections/censuses/_internal_users_form.html.erb

@@ -1,6 +1,21 @@
 <% if current_user %>
   <% if @form.in_census? && @form.invalid? %>
     <%= cell "decidim/announcement", title: t(".invalid"), body: t(".authorization_options_invalid"), callout_class: "alert" %>
+    <% cell("decidim/authorization_modal", @form.authorization_status).verifications.each do |verification| %>
+      <div class="authorization-modal__verification">
+          <% verification[:messages].each do |msg| %>
+            <p><%= msg %></p>
+          <% end %>
+
+          <% if verification[:fields].present? %>
+            <ul>
+              <% verification[:fields].each do |field| %>
+                <li><%= field %></li>
+              <% end %>
+            </ul>
+          <% end %>
+        </div>
+    <% end %>
     <%= link_to t(".exit_button"), exit_path, class: "button button__secondary button__lg w-full mt-12" %>
     <%= render "decidim/elections/censuses/submit_button", form: form, disabled: true %>
   <% else %>

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

@@ -1,7 +1,8 @@
 <section class="layout-aside__section">
   <div class="election__aside-vote layout-aside__ctas-buttons" data-controller="sticky-buttons">
     <% if election.ongoing? %>
-      <%= link_to t("vote_button", scope: "decidim.elections.elections.show"), new_election_vote_path(election), class: "button button__secondary button__lg" %>
+      <% button_key = voted_by_current_user?(election) ? "edit_vote_button" : "vote_button" %>
+      <%= link_to t(button_key, scope: "decidim.elections.elections.show"), new_election_vote_path(election), class: "button button__secondary button__lg" %>
       <% if voted_by_current_user?(election) %>
         <div class="election__aside-voted mt-6 hidden lg:block">
           <span><%= icon "check-line", class: "fill-success inline mr-2" %></span>

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

@@ -9,5 +9,9 @@
     <% question.response_options.each_with_index do |option, index| %>
       <%= render "decidim/elections/elections/vote_results_option", option: %>
     <% end %>
+    <div class="py-4 flex justify-between items-center">
+      <span><%= t("decidim.elections.elections.vote_results.total") %></span>
+      <span data-question-total-votes-text="<%= question.id %>"><%= t("total_votes", scope: "decidim.elections.elections.vote_results", count: question.total_votes) %></span>
+    </div>
   </div>
 </div>