decidim-elections 0.26.2 → 0.27.0.rc2

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

@@ -14,10 +14,11 @@ module Decidim
       include Traceable
       include Loggable
       include Decidim::Forms::HasQuestionnaire
+      include Decidim::FilterableResource
 
       translatable_fields :title, :description
 
-      enum bb_status: [:created, :key_ceremony, :key_ceremony_ended, :vote, :vote_ended, :tally, :tally_ended, :results_published].index_with(&:to_s), _prefix: :bb
+      enum bb_status: [:created, :key_ceremony, :key_ceremony_ended, :vote, :vote_ended, :tally_started, :tally_ended, :results_published].index_with(&:to_s), _prefix: :bb
 
       component_manifest_name "elections"
 
@@ -43,6 +44,8 @@ module Decidim
           .where("end_time < ?", Time.current)
       }
 
+      scope_search_multi :with_any_date, [:active, :upcoming, :finished]
+
       def self.log_presenter_class_for(_log)
         Decidim::Elections::AdminLog::ElectionPresenter
       end
@@ -86,7 +89,7 @@ module Decidim
       #
       # Returns a boolean.
       def minimum_answers?
-        questions.all? { |question| question.answers.size > 1 }
+        questions.any? && questions.all? { |question| question.answers.size > 1 }
       end
 
       # Public: Checks if the election results are published and election finished
@@ -107,7 +110,7 @@ module Decidim
       #
       # Returns a boolean.
       def valid_questions?
-        questions.all?(&:valid_max_selection?)
+        questions.any? && questions.all?(&:valid_max_selection?)
       end
 
       # Public: Gets the voting period status of the election
@@ -124,7 +127,7 @@ module Decidim
       end
 
       def trustee_action_required?
-        bb_key_ceremony? || bb_tally?
+        bb_key_ceremony? || bb_tally_started?
       end
 
       # Public: Checks if the election has a blocked_at value
@@ -138,6 +141,14 @@ module Decidim
       def allow_resource_permissions?
         true
       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_date]
+      end
     end
   end
 end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     # The data store for a Question in the Decidim::Elections component. It stores a
-    # title, description and a maximum number of selection that voters can choose.
+    # title and a maximum number of selection that voters can choose.
     class Question < ApplicationRecord
       include Decidim::Resourceable
       include Traceable
@@ -41,12 +41,7 @@ module Decidim
       # A result percentage relative to the question
       # Returns a Float.
       def blank_votes_percentage
-        @blank_votes_percentage ||= begin
-          return 0 unless results_total.positive?
-
-          result = blank_votes.to_f / results_total * 100.0
-          result.round
-        end
+        @blank_votes_percentage ||= results_total.positive? ? (blank_votes.to_f / results_total * 100.0).round : 0
       end
 
       def slug

data/app/models/decidim/votings/census/dataset.rb

@@ -21,7 +21,7 @@ module Decidim
 
         enum status: [:init_data, :creating_data, :data_created, :generating_codes, :codes_generated, :exporting_codes, :freeze]
 
-        validates :file, presence: true
+        validates :filename, presence: true
 
         alias participatory_space voting
 

data/app/models/decidim/votings/polling_station.rb

@@ -7,6 +7,7 @@ module Decidim
       include Traceable
       include Loggable
       include Decidim::TranslatableResource
+      include Decidim::FilterableResource
 
       translatable_fields :title, :location, :location_hints
 
@@ -37,9 +38,7 @@ module Decidim
       alias participatory_space voting
 
       # Allow ransacker to search for a key in a hstore column (`title`.`en`)
-      ransacker :title do |parent|
-        Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
-      end
+      ransacker_i18n :title
 
       [:manager, :president].each do |role|
         [:name, :email, :nickname].each do |field|

data/app/models/decidim/votings/voting.rb

@@ -16,6 +16,7 @@ module Decidim
       include Decidim::HasUploadValidations
       include Decidim::HasAttachments
       include Decidim::HasAttachmentCollections
+      include Decidim::FilterableResource
 
       enum voting_type: [:in_person, :online, :hybrid].index_with(&:to_s), _suffix: :voting
 
@@ -62,6 +63,8 @@ module Decidim
       scope :order_by_most_recent, -> { order(created_at: :desc) }
       scope :promoted, -> { published.where(promoted: true) }
 
+      scope_search_multi :with_any_date, [:active, :upcoming, :finished]
+
       def upcoming?
         start_time > Time.now.utc
       end
@@ -135,6 +138,10 @@ module Decidim
         ballot_styles.exists?
       end
 
+      def check_census_enabled?
+        dataset.present? && show_check_census?
+      end
+
       def elections
         Decidim::Elections::Election.where(component: components)
       end
@@ -156,6 +163,14 @@ module Decidim
       def vote_flow_for(election)
         Decidim::Votings::CensusVoteFlow.new(election)
       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_date]
+      end
     end
   end
 end

data/app/packs/src/decidim/elections/admin/pending_action.js

@@ -1,3 +1,5 @@
+// show a message to the user if comunication is lost
+import "src/decidim/elections/broken_promises_handler";
 import { Client } from "@decidim/decidim-bulletin_board";
 
 $(() => {

data/app/packs/src/decidim/elections/admin/trustees_process.js

@@ -1,3 +1,5 @@
+// show a message to the user if comunication is lost
+import "src/decidim/elections/broken_promises_handler";
 import {
   Client,
   Election,

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

@@ -0,0 +1,11 @@
+/* Fallback for non-handled failed promises */
+window.addEventListener("unhandledrejection", (event) => {
+  console.log("broken", event)
+  $("#server-failure .tech-info").html(event.reason);
+  if (event.reason.toString().indexOf("fetch") === -1) {
+    $("#server-failure .communication_error").addClass("hide");
+    $("#server-failure .generic_error").removeClass("hide");
+  }
+  $("#server-failure").foundation("open");
+});
+

data/app/packs/src/decidim/elections/trustee/key_ceremony.js

@@ -1,3 +1,6 @@
+// show a message to the user if comunication is lost
+import "src/decidim/elections/broken_promises_handler";
+
 import {
   KeyCeremonyComponent,
   MessageIdentifier,

data/app/packs/src/decidim/elections/trustee/tally.js

@@ -1,3 +1,6 @@
+// show a message to the user if comunication is lost
+import "src/decidim/elections/broken_promises_handler";
+
 import {
   TallyComponent,
   IdentificationKeys,
@@ -112,7 +115,7 @@ $(() => {
           url: $tally.data("updateElectionStatusUrl"),
           contentType: "application/json",
           data: JSON.stringify({
-            status: "tally"
+            status: "tally_started"
           }),
           headers: {
             "X-CSRF-Token": $("meta[name=csrf-token]").attr("content")

data/app/packs/src/decidim/elections/voter/casting-vote.js

@@ -1,3 +1,6 @@
+// show a message to the user if comunication is lost
+import "src/decidim/elections/broken_promises_handler";
+
 import { Client } from "@decidim/decidim-bulletin_board";
 
 $(async () => {

data/app/packs/src/decidim/elections/voter/setup-vote.js

@@ -1,5 +1,7 @@
 /* eslint-disable require-jsdoc */
 
+// show a message to the user if comunication is lost
+import "src/decidim/elections/broken_promises_handler";
 import { VoteComponent } from "@decidim/decidim-bulletin_board";
 
 import * as VotingSchemesDummy from "@decidim/voting_schemes-dummy";
@@ -48,3 +50,4 @@ export default function setupVoteComponent($voteWrapper) {
 
 window.Decidim = window.Decidim || {};
 window.Decidim.setupVoteComponent = setupVoteComponent;
+

data/app/packs/src/decidim/votings/admin/update_census_dataset_status.js

@@ -8,6 +8,6 @@ $(() => {
     }
   }
 
-  // 1 minute
-  setInterval(updateCensusDatasetStatus, 60000);
+  // 10 seconds
+  setInterval(updateCensusDatasetStatus, 10000);
 });

data/app/packs/src/decidim/votings/in-person-vote.js

@@ -1,3 +1,6 @@
+// show a message to the user if comunication is lost
+import "src/decidim/elections/broken_promises_handler";
+
 import { Client } from "@decidim/decidim-bulletin_board";
 
 $(async () => {

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

@@ -78,7 +78,7 @@ module Decidim
             end
           when :landing_page
             toggle_allow(user.admin?) if permission_action.action == :update
-          when :components
+          when :ballot_styles, :components, :polling_stations, :polling_officers, :monitoring_committee_members
             toggle_allow(user.admin?) if permission_action.action == :read
           when :polling_station
             case permission_action.action
@@ -87,8 +87,6 @@ module Decidim
             when :update, :delete
               toggle_allow(user.admin? && polling_station.present?)
             end
-          when :polling_stations
-            toggle_allow(user.admin?) if permission_action.action == :read
           when :polling_officer
             case permission_action.action
             when :create
@@ -96,8 +94,6 @@ module Decidim
             when :delete
               toggle_allow(user.admin? && polling_officer.present?)
             end
-          when :polling_officers
-            toggle_allow(user.admin?) if permission_action.action == :read
           when :monitoring_committee_member
             case permission_action.action
             when :create
@@ -107,18 +103,12 @@ module Decidim
             end
           when :monitoring_committee_menu
             toggle_allow(user_can_read_voting?) if permission_action.action == :read
-          when :monitoring_committee_members
-            toggle_allow(user.admin?) if permission_action.action == :read
           when :monitoring_committee_polling_station_closure
             toggle_allow(user_monitoring_committee_for_voting? && closure.present?) if [:read, :validate].member?(permission_action.action)
-          when :monitoring_committee_polling_station_closures
-            toggle_allow(user_monitoring_committee_for_voting?) if permission_action.action == :read
-          when :monitoring_committee_verify_elections
+          when :monitoring_committee_polling_station_closures, :monitoring_committee_verify_elections, :monitoring_committee_election_results
             toggle_allow(user_monitoring_committee_for_voting?) if permission_action.action == :read
           when :monitoring_committee_election_result
             toggle_allow(user_monitoring_committee_for_voting? && election.present?) if [:read, :validate].member?(permission_action.action)
-          when :monitoring_committee_election_results
-            toggle_allow(user_monitoring_committee_for_voting?) if permission_action.action == :read
           when :census
             toggle_allow(user.admin?) if permission_action.action == :manage
           when :ballot_style
@@ -128,8 +118,6 @@ module Decidim
             when :update, :delete
               toggle_allow(user.admin? && (voting.dataset.blank? || voting.dataset.init_data?) && ballot_style.present?)
             end
-          when :ballot_styles
-            toggle_allow(user.admin?) if permission_action.action == :read
           end
         end
 

data/app/permissions/decidim/votings/permissions.rb

@@ -27,12 +27,10 @@ module Decidim
         return unless permission_action.scope == :public
 
         case permission_action.subject
-        when :votings
+        when :votings, :participatory_space
           allow!
         when :voting
           toggle_allow(voting.published? || user&.admin?)
-        when :participatory_space
-          allow!
         end
       end
 

data/app/presenters/decidim/votings/voting_stats_presenter.rb

@@ -4,9 +4,12 @@ module Decidim
   module Votings
     # A presenter to render statistics in the homepage.
     class VotingStatsPresenter < Decidim::StatsPresenter
-      attribute :voting, Decidim::Votings::Voting
       include Decidim::IconHelper
 
+      def voting
+        __getobj__.fetch(:voting)
+      end
+
       # Public: returns a collection of stats (Hash) for the Voting Landing.
       def collection
         highlighted_stats = voting_participants_stats

data/app/queries/decidim/elections/admin/pending_actions.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # A class used to find actions with a pending status
-      class PendingActions < Rectify::Query
+      class PendingActions < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         def self.for
           new.query

data/app/queries/decidim/elections/admin/votes_for_statistics.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # A class used to find election votes for statistics
-      class VotesForStatistics < Rectify::Query
+      class VotesForStatistics < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried object.
         def self.for(election)
           new(election).query

data/app/queries/decidim/elections/elections_finished_to_end.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     # A class used to find elections finished to close their voting period
-    class ElectionsFinishedToEnd < Rectify::Query
+    class ElectionsFinishedToEnd < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       def self.for
         new.query

data/app/queries/decidim/elections/elections_ready_to_start.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     # A class used to find elections ready and near to start the voting period
-    class ElectionsReadyToStart < Rectify::Query
+    class ElectionsReadyToStart < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       def self.for
         new.query

data/app/queries/decidim/elections/filtered_elections.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     # A class used to find elections filtered by its state
-    class FilteredElections < Rectify::Query
+    class FilteredElections < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # components - An array of Decidim::Component

data/app/queries/decidim/elections/trustees/by_participatory_space.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Trustees
       # A class used to find trustees by participatory space.
-      class ByParticipatorySpace < Rectify::Query
+      class ByParticipatorySpace < Decidim::Query
         # Initializes the class.
         #
         def initialize(participatory_space)

data/app/queries/decidim/elections/trustees/by_participatory_space_trustee_ids.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Trustees
       # A class used to find trustees by participatory space trustee ids.
-      class ByParticipatorySpaceTrusteeIds < Rectify::Query
+      class ByParticipatorySpaceTrusteeIds < Decidim::Query
         # Initializes the class.
         #
         def initialize(trustee_ids)

data/app/queries/decidim/elections/votes/last_vote_for_voter.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Votes
       # A class used to find the last vote casted by a voter in an election
-      class LastVoteForVoter < Rectify::Query
+      class LastVoteForVoter < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # election - the election where the vote was casted

data/app/queries/decidim/elections/votes/pending_votes.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Votes
       # A class used to find votes with a pending status
-      class PendingVotes < Rectify::Query
+      class PendingVotes < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         def self.for
           new.query

data/app/queries/decidim/votings/admin/admin_users.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A class used to find the admins for a voting or an organization votings.
-      class AdminUsers < Rectify::Query
+      class AdminUsers < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # voting - a voting that needs to find its voting admins

data/app/queries/decidim/votings/admin/ballot_style_by_voting_code.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A class used to find trustees by participatory space.
-      class BallotStyleByVotingCode < Rectify::Query
+      class BallotStyleByVotingCode < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # voting - the voting of the Ballot Style

data/app/queries/decidim/votings/admin/polling_officers_join_polling_stations.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A class join the polling officers with their respective polling stations.
-      class PollingOfficersJoinPollingStations < Rectify::Query
+      class PollingOfficersJoinPollingStations < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # polling_officers - the collection of polling officers

data/app/queries/decidim/votings/admin/polling_officers_join_polling_stations_and_user.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A class join the polling officers with their respective polling stations and users.
-      class PollingOfficersJoinPollingStationsAndUser < Rectify::Query
+      class PollingOfficersJoinPollingStationsAndUser < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # polling_officers - the collection of polling officers
@@ -23,7 +23,7 @@ module Decidim
         #
         # Returns an ActiveRecord::Relation.
         def query
-          Rectify::Query.merge(
+          Decidim::Query.merge(
             PollingOfficersJoinPollingStations.new(@polling_officers),
             PollingOfficersJoinUser.new(@polling_officers)
           ).query

data/app/queries/decidim/votings/admin/polling_officers_join_user.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A class join the polling officers with their respective decidim user.
-      class PollingOfficersJoinUser < Rectify::Query
+      class PollingOfficersJoinUser < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # polling_officers - the collection of polling officers

data/app/queries/decidim/votings/organization_prioritized_votings.rb

@@ -4,14 +4,14 @@ module Decidim
   module Votings
     # This query class filters public votings given an organization in a
     # meaningful prioritized order.
-    class OrganizationPrioritizedVotings < Rectify::Query
+    class OrganizationPrioritizedVotings < Decidim::Query
       def initialize(organization, user = nil)
         @organization = organization
         @user = user
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           OrganizationPublishedVotings.new(@organization),
           PrioritizedVotings.new
         ).query

data/app/queries/decidim/votings/organization_promoted_votings.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # This query selects the promoted votings
-    class OrganizationPromotedVotings < Rectify::Query
+    class OrganizationPromotedVotings < Decidim::Query
       def initialize(organization)
         @organization = organization
       end

data/app/queries/decidim/votings/organization_published_votings.rb

@@ -3,13 +3,13 @@
 module Decidim
   module Votings
     # This query class filters published votings given an organization.
-    class OrganizationPublishedVotings < Rectify::Query
+    class OrganizationPublishedVotings < Decidim::Query
       def initialize(organization)
         @organization = organization
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           OrganizationVotings.new(@organization),
           PublishedVotings.new
         ).query

data/app/queries/decidim/votings/organization_votings.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # This query class filters all votings given an organization.
-    class OrganizationVotings < Rectify::Query
+    class OrganizationVotings < Decidim::Query
       def initialize(organization)
         @organization = organization
       end

data/app/queries/decidim/votings/prioritized_votings.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     # This query orders votings by importance, prioritizing promoted
     # votings.
-    class PrioritizedVotings < Rectify::Query
+    class PrioritizedVotings < Decidim::Query
       def query
         Decidim::Votings::Voting.order(promoted: :desc)
       end

data/app/queries/decidim/votings/published_votings.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Votings
     # This query filters published votings only.
-    class PublishedVotings < Rectify::Query
+    class PublishedVotings < Decidim::Query
       def query
         Decidim::Votings::Voting.published
       end

data/app/queries/decidim/votings/votes/in_person_vote_for_voter.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Votes
       # A class used to find a non-rejected in person vote registered for a voter in an election
-      class InPersonVoteForVoter < Rectify::Query
+      class InPersonVoteForVoter < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # election - the election where the vote was casted

data/app/queries/decidim/votings/votes/pending_in_person_votes.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Votes
       # A class used to find in person votes with a pending status
-      class PendingInPersonVotes < Rectify::Query
+      class PendingInPersonVotes < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         def self.for
           new.query

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

@@ -14,10 +14,23 @@
       <% end %>
     </ul>
 
+    <% if form.needs_census? %>
+      <h4><%= t(".census") %></h4>
+      <ul class="no-bullet-indented">
+        <% form.census_messages.each do |key, value| %>
+          <% if form.errors.include?(key) %>
+            <li><%= icon "x", class: "text-alert", role: "img", "aria-hidden": true %>&nbsp;<%= form.errors.messages[key][0].html_safe %></li>
+          <% else %>
+            <li><%= icon "check", class: "text-success", role: "img", "aria-hidden": true %>&nbsp;<%= value.html_safe %></li>
+          <% end %>
+        <% end %>
+      </ul>
+    <% end %>
+
     <h4><%= t(".trustees") %></h4>
     <ul class="no-bullet-indented">
       <% if form.participatory_space_trustees.none? %>
-        <li><%= t(".no_trustees") %></li>
+        <li><%= icon "x", class: "text-alert", role: "img", "aria-hidden": true %>&nbsp;<%= t(".no_trustees") %></li>
       <% end %>
 
       <% form.participatory_space_trustees.map {|trustee| [trustee, form.trustees.none? || form.trustees.include?(trustee)] }

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" %>