decidim-elections 0.24.3 → 0.25.0.rc1

data/app/services/decidim/votings/census/access_codes_exporter.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "seven_zip_ruby"
+require "zip"
+
+module Decidim
+  module Votings
+    module Census
+      # Public: Generates a 7z(seven zip) file with data files ready to be persisted
+      # somewhere so users can download their data.
+      #
+      # The 7z file wraps a ZIP file which finally contains the data files.
+      class AccessCodesExporter
+        include TranslatableAttributes
+
+        FILE_NAME_PATTERN = "%{voting_name}-voting-access-codes.csv"
+
+        attr_reader :dataset, :path, :password
+
+        # Public: Initializes the class.
+        #
+        # dataset       - The Voting::Census::Dataset to export the access codes for.
+        # path          - The String path where to write the zip file.
+        # password      - The password to protect the zip file.
+        def initialize(dataset, path, password)
+          @dataset = dataset
+          @path = File.expand_path path
+          @password = password
+        end
+
+        def export
+          dirname = File.dirname(@path)
+          FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+          File.open(@path, "wb") do |file|
+            SevenZipRuby::Writer.open(file, password: password) do |szw|
+              szw.header_encryption = true
+              szw.add_data(csv_data.read, format(FILE_NAME_PATTERN, voting_name: translated_attribute(dataset.voting.title).parameterize))
+            end
+          end
+        end
+
+        private
+
+        def csv_data
+          Decidim::Exporters::CSV.new(dataset.data, Decidim::Votings::Census::DatumSerializer).export
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    # Service that encapsulates the vote flow used for Votings, using a census instead of users.
+    class CensusVoteFlow < Decidim::Elections::VoteFlow
+      def voter_login(params)
+        @login_params = params
+      end
+
+      def voter_in_person(params)
+        @in_person_params = params
+      end
+
+      def has_voter?
+        datum.present?
+      end
+
+      def voter_name
+        datum&.full_name
+      end
+
+      delegate :email, to: :datum, allow_nil: true
+
+      def user
+        nil
+      end
+
+      def voter_data
+        return nil unless datum
+
+        {
+          id: datum.id,
+          created: datum.created_at.to_i,
+          name: datum.full_name
+        }
+      end
+
+      def vote_check(online_vote_path: nil)
+        VoteCheckResult.new(
+          allowed: has_voter? && !voted_in_person?,
+          error_message: I18n.t("vote_flow.#{voted_in_person? ? "already_voted_in_person" : "datum_not_found"}", scope: "decidim.votings.census"),
+          exit_path: login_path(online_vote_path)
+        )
+      end
+
+      def questions_for(election)
+        if ballot_style.present?
+          ballot_style.questions.where(election: election)
+        else
+          election.questions
+        end
+      end
+
+      def ballot_style_id
+        ballot_style&.slug
+      end
+
+      def voted_in_person?
+        Decidim::Votings::Votes::InPersonVoteForVoter.for(election, voter_id)
+      end
+
+      def login_path(online_vote_path)
+        EngineRouter.main_proxy(election.component.participatory_space).voting_login_path(election_id: election.id, vote_path: online_vote_path) if online_vote_path
+      end
+
+      private
+
+      attr_accessor :login_params, :in_person_params
+
+      def ballot_style
+        return @ballot_style if defined?(@ballot_style)
+
+        @ballot_style = datum&.ballot_style
+      end
+
+      def datum
+        return @datum if defined?(@datum)
+
+        @datum = if received_voter_token
+                   Decidim::Votings::Census::Datum.find_by(id: received_voter_token_datum_id) if received_voter_token_datum_id
+                 elsif login_params || in_person_params
+                   Decidim::Votings::Census::Datum.find_by(dataset: election.participatory_space.dataset, **datum_query)
+                 end
+      end
+
+      def received_voter_token_datum_id
+        @received_voter_token_datum_id ||= received_voter_token_data.dig(:flow, :id)&.to_i
+      end
+
+      def datum_query
+        if login_params
+          { hashed_online_data: Decidim::Votings::Census::LoginForm.from_params(login_params, election: election).hashed_online_data }
+        elsif in_person_params
+          { hashed_in_person_data: Decidim::Votings::Census::InPersonForm.from_params(in_person_params, election: election).hashed_in_person_data }
+        end
+      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
+      end
+    end
+  end
+end

data/app/uploaders/decidim/cw/votings/census/voting_census_uploader.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim::Cw
+  module Votings
+    module Census
+      # This class deals with saving voting cenusus access codes export Zip Files to App
+      class VotingCensusUploader < Decidim::Cw::ApplicationUploader
+        # Override the directory where uploaded files will be stored.
+        def store_dir
+          default_path = "uploads/voting-census/"
+
+          return File.join(Decidim.base_uploads_path, default_path) if Decidim.base_uploads_path.present?
+
+          default_path
+        end
+      end
+    end
+  end
+end

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

@@ -17,6 +17,10 @@
           <tr>
             <th><%= t("models.answer.fields.title", scope: "decidim.elections") %></th>
             <th><%= t("models.answer.fields.proposals", scope: "decidim.elections") %></th>
+            <% if election.results? %>
+              <th><%= t("models.answer.fields.votes", scope: "decidim.elections") %></th>
+              <th><%= t("models.answer.fields.selected", scope: "decidim.elections") %></th>
+            <% end %>
             <th class="actions"><%= t("actions.title", scope: "decidim.elections") %></th>
           </tr>
         </thead>
@@ -29,25 +33,40 @@
               <td>
                 <%= answer.linked_resources(:proposals, "related_proposals").count %>
               </td>
+              <% if election.results? %>
+                <td>
+                  <%= answer.results_total %>
+                </td>
+                <% if answer.selected %>
+                  <td class="success">
+                    <%= t("answers.selected", scope: "decidim.elections.admin") %>
+                  </td>
+                <% else %>
+                  <td>
+                    <%= t("answers.not_selected", scope: "decidim.elections.admin") %>
+                  </td>
+                 <% end %>
+                </td>
+              <% end %>
               <td class="table-list__actions">
                 <% if election.results? %>
                   <% if answer.selected %>
-                    <%= icon_link_to "circle-check", unselect_election_question_answer_path(election, question, answer), t("answers.select.disable", scope: "decidim.elections.admin"), class: "action-icon--success", method: :put %>
+                    <%= icon_link_to "x", unselect_election_question_answer_path(election, question, answer), t("answers.select.disable", scope: "decidim.elections.admin"), class: "action-icon", method: :put %>
                   <% else %>
-                    <%= icon_link_to "circle-x", select_election_question_answer_path(election, question, answer), t("answers.select.enable", scope: "decidim.elections.admin"), class: "action-icon", method: :put %>
+                    <%= icon_link_to "check", select_election_question_answer_path(election, question, answer), t("answers.select.enable", scope: "decidim.elections.admin"), class: "action-icon", method: :put %>
                   <% end %>
                 <% end %>
 
                 <% if allowed_to? :update, :answer, election: election, question: question, answer: answer %>
                   <%= icon_link_to "pencil", edit_election_question_answer_path(election, question, answer), t("actions.edit", scope: "decidim.elections"), class: "action-icon--edit" %>
                 <% else %>
-                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img" %>
+                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.edit", scope: "decidim.elections") %>
                 <% end %>
 
                 <% if allowed_to? :delete, :answer, election: election, question: question, answer: answer %>
                   <%= icon_link_to "circle-x", election_question_answer_path(election, question, answer), t("actions.destroy", scope: "decidim.elections"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.elections") } %>
                 <% else %>
-                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
+                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.elections") %>
                 <% end %>
               </td>
             </tr>

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

@@ -48,26 +48,26 @@
                 <% if allowed_to? :update, :election, election: election %>
                   <%= icon_link_to "pencil", edit_election_path(election), t("actions.edit", scope: "decidim.elections"), class: "action-icon--edit" %>
                 <% else %>
-                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img" %>
+                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.edit", scope: "decidim.elections") %>
                 <% end %>
 
                 <% if allowed_to? :update, :questionnaire, questionnaire: election.questionnaire %>
                   <%= icon_link_to "people", edit_feedback_form_path(election), t("actions.feedback", scope: "decidim.elections"), class: "action-icon--survey" %>
                 <% else %>
-                  <%= icon "people", class: "action-icon action-icon--disabled", role: "img" %>
+                  <%= icon "people", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.feedback", scope: "decidim.elections") %>
                 <% end %>
 
                 <% if election.published? %>
                   <% if allowed_to?(:unpublish, :election, election: election) %>
                     <%= icon_link_to "x", url_for(action: :unpublish, id: election, controller: "elections"), t("actions.unpublish", scope: "decidim.elections"), class: "action-icon--unpublish", method: :put %>
                   <% else %>
-                    <%= icon "x", class: "action-icon action-icon--disabled", role: "img" %>
+                    <%= icon "x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.unpublish", scope: "decidim.elections") %>
                   <% end %>
                 <% else %>
                   <% if allowed_to?(:publish, :election, election: election) %>
                     <%= icon_link_to "check", url_for(action: :publish, id: election, controller: "elections"), t("actions.publish", scope: "decidim.elections"), class: "action-icon--publish", method: :put %>
                   <% else %>
-                    <%= icon "check", class: "action-icon action-icon--disabled", role: "img" %>
+                    <%= icon "check", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.publish", scope: "decidim.elections") %>
                   <% end %>
                 <% end %>
 
@@ -76,7 +76,7 @@
                 <% if allowed_to? :delete, :election, election: election %>
                   <%= icon_link_to "circle-x", election_path(election), t("actions.destroy", scope: "decidim.elections"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.elections") } %>
                 <% else %>
-                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
+                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.elections") %>
                 <% end %>
               </td>
             </tr>

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

@@ -41,13 +41,13 @@
                 <% if allowed_to? :update, :question, election: election, question: question %>
                   <%= icon_link_to "pencil", edit_election_question_path(election, question), t("actions.edit", scope: "decidim.elections"), class: "action-icon--edit" %>
                 <% else %>
-                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img" %>
+                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.edit", scope: "decidim.elections") %>
                 <% end %>
 
                 <% if allowed_to? :delete, :question, election: election, question: question %>
                   <%= icon_link_to "circle-x", election_question_path(election, question), t("actions.destroy", scope: "decidim.elections"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.elections") } %>
                 <% else %>
-                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
+                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.elections") %>
                 <% end %>
               </td>
             </tr>

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

@@ -0,0 +1,62 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
+    </h2>
+  </div>
+  <div class="table-scroll">
+    <ul class="accordion mb-m evote__preview"
+        data-accordion
+        data-multi-expand="true"
+        data-allow-all-closed="true">
+        <% election.questions.each_with_index do |question, i| %>
+          <li class="accordion-item evote__preview-question <%= " is-active" if i == 0 %>" data-accordion-item>
+            <a href="#" class="accordion-title flex--sbc"><%= t(".question") %>: <%= translated_attribute(question.title) %></a>
+            <div class="accordion-content" data-tab-content>
+              <div>
+                <table>
+                  <thead>
+                    <tr>
+                      <th><%= t(".answer") %></th>
+                      <th><%= t(".result") %></th>
+                      <th><%= t(".selected") %></th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <% question.answers.each do |answer| %>
+                      <tr>
+                        <td><%= translated_attribute(answer.title) %></td>
+                        <% if answer.results_total > 0 %>
+                          <td class="text-success"><%= answer.results_total %></td>
+                        <% else %>
+                          <td><%= answer.results_total %></td>
+                        <% end %>
+                        <% if answer.selected %>
+                          <td class="text-success"><%= t(".selected") %></td>
+                        <% else %>
+                          <td><%= t(".not_selected") %></td>
+                        <% end %>
+                      </tr>
+                    <% end %>
+
+                    <% if question.nota_option? %>
+                      <tr>
+                        <td><%= t("decidim.elections.votes.new.nota_option") %></td>
+                        <td><%= question.blank_votes %></td>
+                        <td></td>
+                      </tr>
+                    <% end %>
+                    <tr>
+                      <td></td>
+                      <td class="text-muted"><%= question.results_total %></td>
+                      <td></td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </div>
+          </li>
+        <% end %>
+      </ul>
+  </div>
+</div>

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

@@ -1,9 +1,55 @@
 <div class="card">
   <div class="card-divider">
-    <h2 class="card-title"><%= t(".title") %></h2>
+    <h2 class="card-title">
+      <%= t(".title") %>
+    </h2>
   </div>
+  <div class="table-scroll">
+    <ul class="accordion mb-m evote__preview"
+        data-accordion
+        data-multi-expand="true"
+        data-allow-all-closed="true">
+        <% election.questions.each_with_index do |question, i| %>
+          <li class="accordion-item evote__preview-question <%= " is-active" if i == 0 %>" data-accordion-item>
+            <a href="#" class="accordion-title flex--sbc"><%= t(".question") %>: <%= translated_attribute(question.title) %></a>
+            <div class="accordion-content" data-tab-content>
+              <div>
+                <table>
+                  <thead>
+                    <tr>
+                      <th><%= t(".answer") %></th>
+                      <th><%= t(".result") %></th>
+                      <th><%= t(".selected") %></th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <% question.answers.each do |answer| %>
+                      <tr>
+                        <td><%= translated_attribute(answer.title) %></td>
+                        <% if answer.results_total > 0 %>
+                          <td class="text-success"><%= answer.results_total %></td>
+                        <% else %>
+                          <td><%= answer.results_total %></td>
+                        <% end %>
+                        <% if answer.selected %>
+                          <td class="text-success"><%= t(".selected") %></td>
+                        <% else %>
+                          <td><%= t(".not_selected") %></td>
+                        <% end %>
+                      </tr>
+                    <% end %>
 
-  <div class="card-section">
-    Tally ended
+                    <tr>
+                      <td></td>
+                      <td class="text-muted"><%= question.results_total %></td>
+                      <td></td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </div>
+          </li>
+        <% end %>
+      </ul>
   </div>
 </div>

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

@@ -18,4 +18,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag("decidim/elections/admin/vote_statistics") %>
+<%= javascript_pack_tag("decidim_elections_admin_vote_statistics") %>

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

@@ -4,6 +4,8 @@
   </div>
 
   <div class="card-section">
+    <p><%= t(".text") %></p>
+
     <% form.messages.each do |key, value| %>
       <% if form.errors.include?(key) %>
         <p><%= form.errors.messages[key][0].html_safe %></p>
@@ -13,3 +15,5 @@
     <% end %>
   </div>
 </div>
+
+<%= render(partial: "vote_stats") %>

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

@@ -30,10 +30,10 @@
 
     <% if @form.pending_action %>
       <div id="pending_action"
-           data-api-endpoint-url="<%= Rails.application.secrets.bulletin_board[:server] %>"
+           data-api-endpoint-url="<%= bulletin_board_server %>"
            data-message-id="<%= @form.pending_action.message_id %>"></div>
 
-      <%= javascript_include_tag "decidim/elections/admin/pending_action" %>
+      <%= javascript_pack_tag "decidim_elections_admin_pending_action" %>
     <% end %>
   <% end %>
 <% else %>