decidim-elections 0.27.9 → 0.28.0.rc4

data/app/controllers/decidim/votings/admin/voting_publications_controller.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    module Admin
+      # Controller that allows managing voting publications.
+      #
+      # i18n-tasks-use t('decidim.admin.voting_publications.create.error')
+      # i18n-tasks-use t('decidim.admin.voting_publications.create.success')
+      # i18n-tasks-use t('decidim.admin.voting_publications.destroy.error')
+      # i18n-tasks-use t('decidim.admin.voting_publications.destroy.success')
+      class VotingPublicationsController < Decidim::Admin::SpacePublicationsController
+        include VotingAdmin
+
+        private
+
+        def enforce_permission_to_publish = enforce_permission_to(:publish, :voting, voting: current_voting)
+
+        def i18n_scope = "decidim.admin.voting_publications"
+
+        def fallback_location = votings_path
+      end
+    end
+  end
+end

data/app/controllers/decidim/votings/admin/votings_controller.rb

@@ -6,11 +6,13 @@ module Decidim
       # This controller allows to create or update a voting.
       class VotingsController < Admin::ApplicationController
         include Decidim::Votings::Admin::Filterable
+        include Decidim::Admin::ParticipatorySpaceAdminBreadcrumb
         helper_method :votings, :current_voting, :current_participatory_space
 
         def index
           enforce_permission_to :read, :votings
           @votings = filtered_collection
+          render layout: "decidim/admin/votings"
         end
 
         def new
@@ -58,28 +60,6 @@ module Decidim
           end
         end
 
-        def publish
-          enforce_permission_to :publish, :voting, voting: current_voting
-
-          PublishVoting.call(current_voting, current_user) do
-            on(:ok) do
-              flash[:notice] = I18n.t("votings.publish.success", scope: "decidim.votings.admin")
-              redirect_to edit_voting_path(voting)
-            end
-          end
-        end
-
-        def unpublish
-          enforce_permission_to :unpublish, :voting, voting: current_voting
-
-          UnpublishVoting.call(current_voting, current_user) do
-            on(:ok) do
-              flash[:notice] = I18n.t("votings.unpublish.success", scope: "decidim.votings.admin")
-              redirect_to edit_voting_path(voting)
-            end
-          end
-        end
-
         def available_polling_officers
           respond_to do |format|
             format.json do
@@ -100,10 +80,6 @@ module Decidim
           end
         end
 
-        def polling_officers_picker
-          render :polling_officers_picker, layout: false
-        end
-
         private
 
         def votings

data/app/controllers/decidim/votings/admin/votings_landing_page_content_blocks_controller.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # Controller that allows to edit the content of the landing page content blocks
       class VotingsLandingPageContentBlocksController < Decidim::Votings::Admin::ApplicationController
-        include Decidim::Admin::LandingPageContentBlocks
+        include Decidim::Admin::ContentBlocks::LandingPageContentBlocks
 
         layout "decidim/admin/voting"
 
@@ -33,10 +33,6 @@ module Decidim
           voting_landing_page_content_block_path(scoped_resource, params[:id])
         end
 
-        def submit_button_text
-          t("landing_page.content_blocks.edit.update", scope: "decidim.votings.admin")
-        end
-
         alias current_participatory_space scoped_resource
       end
     end

data/app/controllers/decidim/votings/admin/votings_landing_page_controller.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # Controller that allows to (de)activate the content blocks from a voting landing page
       class VotingsLandingPageController < Decidim::Votings::Admin::ApplicationController
-        include Decidim::Admin::LandingPage
+        include Decidim::Admin::ContentBlocks::LandingPage
 
         layout "decidim/admin/voting"
 
@@ -27,12 +27,9 @@ module Decidim
           voting_landing_page_path(scoped_resource)
         end
 
-        def active_content_blocks_title
-          t("landing_page.edit.active_content_blocks", scope: "decidim.votings.admin")
-        end
-
-        def inactive_content_blocks_title
-          t("landing_page.edit.inactive_content_blocks", scope: "decidim.votings.admin")
+        def resource_create_url(manifest_name)
+          voting_landing_page_content_blocks_path(participatory_process_group_id: params[:participatory_process_group_id],
+                                                  manifest_name:)
         end
 
         def resource_content_block_cell

data/app/controllers/decidim/votings/census/admin/census_controller.rb

@@ -22,7 +22,7 @@ module Decidim
             enforce_permission_to :manage, :census, voting: current_participatory_space
 
             @form = form(DatasetForm).from_params(params).with_context(
-              current_participatory_space: current_participatory_space
+              current_participatory_space:
             )
 
             CreateDataset.call(@form, current_user) do
@@ -163,7 +163,7 @@ module Decidim
 
           def ballot_style_callout_text
             if current_participatory_space.has_ballot_styles?
-              t("has_ballot_styles_message", scope: "decidim.votings.census.admin.census.new", ballot_style_code_header: ballot_style_code_header)
+              t("has_ballot_styles_message", scope: "decidim.votings.census.admin.census.new", ballot_style_code_header:)
             else
               t("missing_ballot_styles_message", scope: "decidim.votings.census.admin.census.new", ballot_styles_admin_path: admin_voting_ballot_styles_path)
             end

data/app/controllers/decidim/votings/polling_officer_zone/closures_controller.rb

@@ -8,17 +8,17 @@ module Decidim
         helper_method :election, :polling_officer, :polling_station, :closure
 
         def show
-          enforce_permission_to :manage, :polling_station_results, polling_officer: polling_officer
+          enforce_permission_to(:manage, :polling_station_results, polling_officer:)
 
           @form = if closure.certificate_phase?
-                    form(ClosureCertifyForm).instance.with_context(closure: closure)
+                    form(ClosureCertifyForm).instance.with_context(closure:)
                   elsif closure.signature_phase?
                     form(ClosureSignForm).instance
                   end
         end
 
         def new
-          enforce_permission_to :manage, :polling_station_results, polling_officer: polling_officer
+          enforce_permission_to(:manage, :polling_station_results, polling_officer:)
 
           @form = EnvelopesResultForm.new(
             polling_station_id: polling_station.id,
@@ -28,8 +28,8 @@ module Decidim
         end
 
         def create
-          enforce_permission_to :manage, :polling_station_results, polling_officer: polling_officer
-          @form = form(EnvelopesResultForm).from_params(params).with_context(polling_officer: polling_officer)
+          enforce_permission_to(:manage, :polling_station_results, polling_officer:)
+          @form = form(EnvelopesResultForm).from_params(params).with_context(polling_officer:)
 
           CreatePollingStationClosure.call(@form) do
             on(:ok) do
@@ -46,13 +46,13 @@ module Decidim
         end
 
         def edit
-          enforce_permission_to :manage, :polling_station_results, polling_officer: polling_officer
+          enforce_permission_to(:manage, :polling_station_results, polling_officer:)
 
           @form = form(ClosureResultForm).from_model(closure)
         end
 
         def update
-          enforce_permission_to :manage, :polling_station_results, polling_officer: polling_officer
+          enforce_permission_to(:manage, :polling_station_results, polling_officer:)
           @form = form(ClosureResultForm).from_params(params)
 
           CreatePollingStationResults.call(@form, closure) do
@@ -69,9 +69,9 @@ module Decidim
         end
 
         def certify
-          enforce_permission_to :manage, :polling_station_results, polling_officer: polling_officer
+          enforce_permission_to(:manage, :polling_station_results, polling_officer:)
 
-          @form = form(ClosureCertifyForm).from_params(params).with_context(closure: closure)
+          @form = form(ClosureCertifyForm).from_params(params).with_context(closure:)
 
           CertifyPollingStationClosure.call(@form, closure) do
             on(:ok) do
@@ -87,7 +87,7 @@ module Decidim
         end
 
         def sign
-          enforce_permission_to :manage, :polling_station_results, polling_officer: polling_officer
+          enforce_permission_to(:manage, :polling_station_results, polling_officer:)
 
           @form = form(ClosureSignForm).from_params(params)
 
@@ -122,11 +122,11 @@ module Decidim
         end
 
         def closure
-          @closure ||= polling_station.closures.find_by(election: election)
+          @closure ||= polling_station.closures.find_by(election:)
         end
 
         def polling_station_election_votes_count
-          @polling_station_election_votes_count ||= polling_station.in_person_votes.where(election: election).count
+          @polling_station_election_votes_count ||= polling_station.in_person_votes.where(election:).count
         end
       end
     end

data/app/controllers/decidim/votings/polling_officer_zone/in_person_votes_controller.rb

@@ -7,6 +7,7 @@ module Decidim
       class InPersonVotesController < Decidim::Votings::PollingOfficerZone::ApplicationController
         include FormFactory
         include Decidim::Elections::HasVoteFlow
+        before_action :append_csp_directives
 
         helper_method :polling_officer, :election, :in_person_form, :has_voter?,
                       :vote_check, :cant_vote_reason, :questions, :in_person_vote_form, :voted_online?,
@@ -15,13 +16,13 @@ module Decidim
         helper Decidim::Admin::IconLinkHelper
 
         def new
-          enforce_permission_to :manage, :in_person_vote, polling_officer: polling_officer
+          enforce_permission_to(:manage, :in_person_vote, polling_officer:)
 
           has_pending_in_person_vote?
         end
 
         def create
-          enforce_permission_to :manage, :in_person_vote, polling_officer: polling_officer
+          enforce_permission_to(:manage, :in_person_vote, polling_officer:)
 
           return if has_pending_in_person_vote?
 
@@ -33,11 +34,11 @@ module Decidim
         end
 
         def show
-          enforce_permission_to :manage, :in_person_vote, polling_officer: polling_officer
+          enforce_permission_to :manage, :in_person_vote, polling_officer:
         end
 
         def update
-          enforce_permission_to :manage, :in_person_vote, polling_officer: polling_officer
+          enforce_permission_to(:manage, :in_person_vote, polling_officer:)
 
           Decidim::Votings::Voter::UpdateInPersonVoteStatus.call(in_person_vote) do
             on(:ok) do
@@ -59,6 +60,12 @@ module Decidim
         delegate :has_voter?, to: :vote_flow
         delegate :polling_station, to: :polling_officer
 
+        def append_csp_directives
+          return if bulletin_board_server.blank?
+
+          content_security_policy.append_csp_directive("connect-src", bulletin_board_server)
+        end
+
         def bulletin_board_client
           @bulletin_board_client ||= Decidim::Elections.bulletin_board
         end
@@ -106,13 +113,13 @@ module Decidim
         def in_person_vote_form
           @in_person_vote_form ||= form(Decidim::Votings::Voter::InPersonVoteForm).from_params(
             {
-              voter_token: voter_token,
-              voter_id: voter_id,
+              voter_token:,
+              voter_id:,
               voted: params.dig(:in_person_vote, :voted)
             },
-            election: election,
-            polling_station: polling_station,
-            polling_officer: polling_officer
+            election:,
+            polling_station:,
+            polling_officer:
           )
         end
 
@@ -140,7 +147,7 @@ module Decidim
         end
 
         def pending_in_person_vote
-          @pending_in_person_vote ||= Decidim::Votings::Votes::PendingInPersonVotes.for.find_by(polling_officer: polling_officer, election: election)
+          @pending_in_person_vote ||= Decidim::Votings::Votes::PendingInPersonVotes.for.find_by(polling_officer:, election:)
         end
 
         def exit_path

data/app/controllers/decidim/votings/polling_officer_zone/polling_officers_controller.rb

@@ -11,7 +11,7 @@ module Decidim
         helper_method :polling_stations, :polling_officers_elections
 
         def index
-          enforce_permission_to :view, :polling_officers, polling_officers: polling_officers
+          enforce_permission_to :view, :polling_officers, polling_officers:
         end
 
         private

data/app/controllers/decidim/votings/votings_controller.rb

@@ -5,8 +5,6 @@ module Decidim
     # A controller that holds the logic to show votings in a
     # public layout.
     class VotingsController < Decidim::Votings::ApplicationController
-      layout "layouts/decidim/voting_landing", only: :show
-
       include FormFactory
       include ParticipatorySpaceContext
       include NeedsVoting
@@ -15,6 +13,8 @@ module Decidim
       include Decidim::Votings::Orderable
       include Decidim::Elections::HasVoteFlow
 
+      participatory_space_layout only: [:show]
+
       helper_method :published_votings, :paginated_votings, :filter, :promoted_votings, :only_finished_votings?, :landing_content_blocks, :census_contact_information
 
       helper Decidim::FiltersHelper
@@ -22,7 +22,6 @@ module Decidim
       helper Decidim::SanitizeHelper
       helper Decidim::PaginateHelper
       helper Decidim::IconHelper
-      helper Decidim::WidgetUrlsHelper
       helper Decidim::ResourceHelper
       helper Decidim::Admin::IconLinkHelper
 
@@ -42,10 +41,9 @@ module Decidim
       helper_method :election, :exit_path, :election_log_path, :elections
 
       def login
-        @form = form(Census::LoginForm).from_params(params, election: election)
+        @form = form(Census::LoginForm).from_params(params, election:)
 
-        render :login,
-               layout: "decidim/election_votes"
+        render :login
       end
 
       def show_check_census
@@ -59,7 +57,7 @@ module Decidim
         raise ActionController::RoutingError, "Not Found" unless current_participatory_space.check_census_enabled?
 
         @form = form(Census::CheckForm).from_params(params).with_context(
-          current_participatory_space: current_participatory_space
+          current_participatory_space:
         )
 
         success = not_found = false
@@ -77,7 +75,7 @@ module Decidim
           end
         end
 
-        render action: :check_census, locals: { success: success, not_found: not_found, datum: datum }
+        render action: :check_census, locals: { success:, not_found:, datum: }
       end
 
       def send_access_code
@@ -89,7 +87,7 @@ module Decidim
             flash[:alert] = t("send_access_code.invalid", scope: "decidim.votings.votings")
           end
         end
-        render action: :check_census, locals: { success: true, not_found: false, datum: datum }
+        render action: :check_census, locals: { success: true, not_found: false, datum: }
       end
 
       def elections_log

data/app/events/decidim/elections/election_published_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Elections

data/app/events/decidim/elections/trustees/notify_new_trustee_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Elections

data/app/events/decidim/elections/trustees/notify_trustee_new_election_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Elections

data/app/events/decidim/elections/votes/vote_accepted_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Elections

data/app/events/decidim/votings/polling_officers/polling_station_assigned_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Votings

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

@@ -40,7 +40,7 @@ module Decidim
 
         private
 
-        # This method will add an error to the `attachment` field only if there's
+        # This method will add an error to the `attachment` field only if there is
         # any error in any other field. This is needed because when the form has
         # an error, the attachment is lost, so we need a way to inform the user of
         # this problem.

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

@@ -24,7 +24,7 @@ module Decidim
 
         private
 
-        # This method will add an error to the `photos` field only if there's
+        # This method will add an error to the `photos` field only if there is
         # any error in any other field. This is needed because when the form has
         # an error, the attachment is lost, so we need a way to inform the user of
         # this problem.

data/app/forms/decidim/votings/admin/publish_results_form.rb

@@ -11,8 +11,8 @@ module Decidim
         private
 
         def closurables
-          @closurables ||= Decidim::Votings::PollingStationClosure.where(election: election) +
-                           Decidim::Elections::BulletinBoardClosure.where(election: election)
+          @closurables ||= Decidim::Votings::PollingStationClosure.where(election:) +
+                           Decidim::Elections::BulletinBoardClosure.where(election:)
         end
 
         def groups_for(question)
@@ -23,13 +23,13 @@ module Decidim
           end
 
           {
-            question: question,
+            question:,
             results: groups.values
           }
         end
 
         def aggregate_results_for(question)
-          Decidim::Elections::Result.where(closurable: closurables, question: question)
+          Decidim::Elections::Result.where(closurable: closurables, question:)
                                     .group(:closurable_type, :result_type, :decidim_elections_answer_id)
                                     .sum(:value)
         end
@@ -37,7 +37,7 @@ module Decidim
         def update_group(groups, group_id, key, total)
           closurable_type, result_type, answer_id = key
           groups[group_id] ||= {
-            result_type: result_type,
+            result_type:,
             answer: all_answers[answer_id],
             value: 0,
             polling_station: 0,

data/app/forms/decidim/votings/admin/voting_form.rb

@@ -61,7 +61,7 @@ module Decidim
 
         def slug_uniqueness
           return unless organization_votings
-                        .where(slug: slug)
+                        .where(slug:)
                         .where.not(id: context[:voting_id])
                         .any?
 

data/app/forms/decidim/votings/admin/{polling_officer_form.rb → voting_user_role_form.rb}

@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     module Admin
-      class PollingOfficerForm < Decidim::Form
+      class VotingUserRoleForm < Decidim::Form
         attribute :name, String
         attribute :email, String
         attribute :user_id, Integer

data/app/forms/decidim/votings/census/frontend_fields.rb

@@ -34,7 +34,7 @@ module Decidim
         def birthdate
           return unless [year, month, day].all? { |part| part.is_a? Numeric }
 
-          format("%04d%02d%02d", year, month, day) # rubocop:disable Style/FormatStringToken
+          format("%04d%02d%02d", year, month, day)
         end
       end
     end

data/app/forms/decidim/votings/census/in_person_fields.rb

@@ -10,8 +10,6 @@ module Decidim
         extend ActiveSupport::Concern
 
         included do
-          DOCUMENT_TYPES = %w(DNI NIE PASSPORT).freeze
-
           attribute :document_number, String
           attribute :document_type, String
           attribute :birthdate, String
@@ -21,7 +19,7 @@ module Decidim
                     :birthdate,
                     presence: true
 
-          validates :document_type, inclusion: { in: DOCUMENT_TYPES }
+          validates :document_type, inclusion: { in: :document_types }
         end
 
         # hash of birth, document type and number
@@ -35,13 +33,19 @@ module Decidim
         end
 
         def options_for_document_type_select
-          DOCUMENT_TYPES.map do |document_type|
+          document_types.map do |document_type|
             [
               I18n.t(document_type.downcase, scope: "decidim.votings.census.document_types"),
               document_type
             ]
           end
         end
+
+        private
+
+        def document_types
+          Decidim::Elections.document_types
+        end
       end
     end
   end

data/app/forms/decidim/votings/closure_result_form.rb

@@ -23,12 +23,12 @@ module Decidim
         self.ballot_results = BallotResultForm.from_model(model)
 
         self.question_results = model.election.questions.flat_map do |question|
-          QuestionResultForm.from_model(question: question, closure: model)
+          QuestionResultForm.from_model(question:, closure: model)
         end
 
         self.answer_results = model.election.questions.flat_map do |question|
           question.answers.map do |answer|
-            AnswerResultForm.from_model(answer: answer, closure: model)
+            AnswerResultForm.from_model(answer:, closure: model)
           end
         end
       end

data/app/helpers/decidim/elections/admin/trustees_participatory_spaces_helper.rb

@@ -6,15 +6,17 @@ module Decidim
       # Custom helpers for trustees admin.
       #
       module TrusteesParticipatorySpacesHelper
+        include Decidim::PaginateHelper
+
         def trustee_current_participatory_space(trustee)
           trustee.trustees_participatory_spaces.find_by(participatory_space: current_participatory_space)
         end
 
         def considered_icon_action_for(trustee)
           if trustee_current_participatory_space(trustee).considered
-            "x"
+            "close-line"
           else
-            "check"
+            "check-line"
           end
         end
 

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

@@ -17,6 +17,14 @@ module Decidim
           ]
         )
       end
+
+      def filter_sections
+        @filter_sections ||= [{ method: :with_any_date, collection: date_filter_values, label_scope: "decidim.elections.elections.filters", id: "date" }]
+      end
+
+      def component_name
+        (defined?(current_component) && translated_attribute(current_component&.name).presence) || t("decidim.components.elections.name")
+      end
     end
   end
 end

data/app/helpers/decidim/votings/map_helper.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    # This helper include some methods for rendering votings dynamic maps.
+    module MapHelper
+      include Decidim::SanitizeHelper
+      include Decidim::LayoutHelper
+
+      def polling_station_data_for_map(polling_stations)
+        polling_stations_geocoded = polling_stations.select(&:geocoded_and_valid?)
+        polling_stations_geocoded.map do |polling_station|
+          polling_station.slice(:latitude, :longitude, :address)
+                         .merge(
+                           title: translated_attribute(polling_station.title),
+                           items: [{ icon: icon("map-line").html_safe, text: polling_station.address }].to_json
+                         )
+        end
+      end
+    end
+  end
+end

data/app/helpers/decidim/votings/votings_helper.rb

@@ -15,6 +15,39 @@ module Decidim
           ]
         )
       end
+
+      def filter_sections
+        @filter_sections ||= [{ method: :with_any_date, collection: date_filter_values, label_scope: "decidim.votings.votings.filters", id: "date" }]
+      end
+
+      def voting_nav_items(participatory_space)
+        components = participatory_space.components.published.or(Decidim::Component.where(id: try(:current_component)))
+
+        (
+          [
+            if participatory_space.check_census_enabled?
+              {
+                name: t("layouts.decidim.voting_navigation.check_census"),
+                url: decidim_votings.voting_check_census_path(participatory_space),
+                active: is_active_link?(decidim_votings.voting_check_census_path(participatory_space), :exclusive)
+              }
+            end
+          ] + components.map do |component|
+            {
+              name: translated_attribute(component.name),
+              url: main_component_path(component),
+              active: is_active_link?(main_component_path(component), :inclusive) && !is_active_link?("election_log", /election_log$/)
+            }
+          end +
+          [
+            {
+              name: t("layouts.decidim.voting_navigation.election_log"),
+              url: decidim_votings.voting_elections_log_path(participatory_space),
+              active: is_active_link?(decidim_votings.voting_elections_log_path(participatory_space), :exclusive) || is_active_link?("election_log", /election_log$/)
+            }
+          ]
+        ).compact
+      end
     end
   end
 end