decidim-elections 0.24.3 → 0.25.0.rc4

data/lib/decidim/elections/test/factories.rb

@@ -17,6 +17,8 @@ FactoryBot.define do
   factory :election, class: "Decidim::Elections::Election" do
     transient do
       organization { build(:organization) }
+      number_of_votes { Faker::Number.number(digits: 2) }
+      base_id { 10_000 }
     end
 
     upcoming
@@ -28,10 +30,11 @@ FactoryBot.define do
     bb_status { nil }
     questionnaire
     component { create(:elections_component, organization: organization) }
+    salt { SecureRandom.hex(32) }
 
     trait :bb_test do
       bb_status { "key_ceremony" }
-      id { (10_000 + Decidim::Elections::Election.bb_statuses.keys.index(bb_status)) }
+      id { (base_id + Decidim::Elections::Election.bb_statuses.keys.index(bb_status)) }
     end
 
     trait :upcoming do
@@ -116,12 +119,8 @@ FactoryBot.define do
       finished
       bb_status { "vote_ended" }
 
-      after(:build) do |election|
-        election.questions.each do |question|
-          question.answers.each do |answer|
-            answer.votes_count = Faker::Number.number(digits: 1)
-          end
-        end
+      after(:create) do |election, evaluator|
+        create_list(:vote, evaluator.number_of_votes, :accepted, election: election)
       end
     end
 
@@ -133,6 +132,12 @@ FactoryBot.define do
     trait :tally_ended do
       tally
       bb_status { "tally_ended" }
+      verifiable_results_file_hash { SecureRandom.hex(32) }
+      verifiable_results_file_url { Faker::Internet.url }
+
+      after(:create) do |election|
+        create(:bb_closure, :with_results, election: election)
+      end
     end
 
     trait :results_published do
@@ -219,10 +224,11 @@ FactoryBot.define do
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     weight { Faker::Number.number(digits: 1) }
     selected { false }
-    votes_count { 0 }
 
     trait :with_votes do
-      votes_count { Faker::Number.number(digits: 1) }
+      after(:build) do |answer|
+        create(:election_result, election: answer.question.election, question: answer.question, answer: answer)
+      end
     end
 
     trait :with_photos do
@@ -242,6 +248,60 @@ FactoryBot.define do
     end
   end
 
+  factory :bb_closure, class: "Decidim::Elections::BulletinBoardClosure" do
+    initialize_with do
+      Decidim::Elections::BulletinBoardClosure.find_or_create_by(
+        decidim_elections_election_id: election.id
+      )
+    end
+
+    election { create(:election, :complete) }
+
+    trait :with_results do
+      after :create do |closure|
+        total_votes = closure.election.votes.count
+        closure.election.questions.each do |question|
+          max = total_votes
+          question.answers.each do |answer|
+            value = Faker::Number.between(from: 0, to: max)
+            closure.results << create(:election_result, election: closure.election, question: question, answer: answer, value: value)
+            max -= value
+          end
+          closure.results << create(:election_result, :blank_ballots, election: closure.election, question: question, value: max)
+        end
+        closure.results << create(:election_result, :total_ballots, election: closure.election, value: total_votes)
+      end
+    end
+  end
+
+  factory :election_result, class: "Decidim::Elections::Result" do
+    transient do
+      election { create(:election, :tally_ended) }
+    end
+
+    closurable { create :bb_closure, election: election }
+    question { create :question, election: election }
+    answer { create :election_answer, question: question }
+    value { Faker::Number.number(digits: 1) }
+    result_type { "valid_answers" }
+
+    trait :null_ballots do
+      result_type { "null_ballots" }
+      answer { nil }
+    end
+
+    trait :blank_ballots do
+      result_type { "blank_ballots" }
+      answer { nil }
+    end
+
+    trait :total_ballots do
+      result_type { "total_ballots" }
+      answer { nil }
+      question { nil }
+    end
+  end
+
   factory :action, class: "Decidim::Elections::Action" do
     election
     message_id { "a.message+id" }
@@ -252,11 +312,11 @@ FactoryBot.define do
   factory :trustee, class: "Decidim::Elections::Trustee" do
     transient do
       election { nil }
-      organization { election&.component&.participatory_space&.organization || create(:organization) }
     end
 
     public_key { nil }
     user { build(:user, organization: organization) }
+    organization { create(:organization) }
 
     trait :considered do
       after(:build) do |trustee, evaluator|
@@ -272,7 +332,7 @@ FactoryBot.define do
 
     trait :with_public_key do
       considered
-      name { Faker::Name.name }
+      name { Faker::Name.unique.name }
       public_key { generate(:private_key).export.to_json }
     end
   end
@@ -298,5 +358,10 @@ FactoryBot.define do
     status { "pending" }
     message_id { "decidim-test-authority.2.vote.cast+v.5826de088371d1b15b38f00c8203871caec07041ed0c8fb0c6fb875f0df763b6" }
     user { build(:user) }
+    email { "an_email@example.org" }
+
+    trait :accepted do
+      status { "accepted" }
+    end
   end
 end

data/lib/decidim/elections/trustee_zone_engine.rb

@@ -24,10 +24,11 @@ module Decidim
 
       initializer "decidim_elections.trustee_zone.menu" do
         Decidim.menu :user_menu do |menu|
-          menu.item I18n.t("menu.trustee_zone", scope: "decidim.elections.trustee_zone"),
-                    decidim.decidim_elections_trustee_zone_path,
-                    active: :inclusive,
-                    if: Decidim::Elections::Trustee.trustee?(current_user)
+          menu.add_item :decidim_elections_trustee_zone,
+                        I18n.t("menu.trustee_zone", scope: "decidim.elections.trustee_zone"),
+                        decidim.decidim_elections_trustee_zone_path,
+                        active: :inclusive,
+                        if: Decidim::Elections::Trustee.trustee?(current_user)
         end
       end
     end

data/lib/decidim/elections/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Elections
     def self.version
-      "0.24.3"
+      "0.25.0.rc4"
     end
   end
 end

data/lib/decidim/elections.rb

@@ -10,6 +10,10 @@ require "decidim/elections/component"
 require "decidim/bulletin_board"
 require "decidim/votings"
 
+# Note: these gems will be moved to the application in the next release
+require "voting_schemes/electionguard"
+require "voting_schemes/dummy"
+
 module Decidim
   # This namespace holds the logic of the `Elections` component. This component
   # allows users to create elections in a participatory space.
@@ -31,5 +35,9 @@ module Decidim
     config_accessor :start_vote_maximum_hours_before_start do
       6
     end
+
+    config_accessor :voter_token_expiration_minutes do
+      120
+    end
   end
 end

data/lib/decidim/votings/admin_engine.rb

@@ -25,8 +25,23 @@ module Decidim
           resources :polling_stations
           resources :polling_officers, only: [:new, :create, :destroy, :index]
           resources :monitoring_committee_members, only: [:new, :create, :destroy, :index]
+          resources :monitoring_committee_polling_station_closures, only: [:index, :edit, :show] do
+            post :validate, on: :member
+          end
+          resources :monitoring_committee_verify_elections, only: [:index]
+          resources :monitoring_committee_election_results, only: [:index, :show, :update]
           resources :attachments, controller: "voting_attachments"
           resources :attachment_collections, controller: "voting_attachment_collections"
+          resources :ballot_styles
+
+          resource :census, only: [:show, :destroy, :create], controller: "/decidim/votings/census/admin/census" do
+            member do
+              get :status
+              get :generate_access_codes
+              get :export_access_codes
+              get :download_access_codes_file
+            end
+          end
         end
 
         scope "/votings/:voting_slug" do
@@ -54,17 +69,128 @@ module Decidim
 
       initializer "decidim_votings.admin_menu" do
         Decidim.menu :admin_menu do |menu|
-          menu.item I18n.t("menu.votings", scope: "decidim.votings.admin"),
-                    decidim_admin_votings.votings_path,
-                    icon_name: "comment-square",
-                    position: 2.6,
-                    active: :inclusive,
-                    if: allowed_to?(:enter, :space_area, space_name: :votings)
+          menu.add_item :votings,
+                        I18n.t("menu.votings", scope: "decidim.votings.admin"),
+                        decidim_admin_votings.votings_path,
+                        icon_name: "comment-square",
+                        position: 2.6,
+                        active: :inclusive,
+                        if: allowed_to?(:enter, :space_area, space_name: :votings)
+        end
+      end
+
+      initializer "decidim_votings.admin_votings_components_menu" do
+        Decidim.menu :admin_votings_components_menu do |menu|
+          current_participatory_space.components.each do |component|
+            caption = translated_attribute(component.name)
+            if component.primary_stat.present?
+              caption += content_tag(:span, component.primary_stat, class: component.primary_stat.zero? ? "component-counter component-counter--off" : "component-counter")
+            end
+
+            menu.add_item [component.manifest_name, component.id].join("_"),
+                          caption.html_safe,
+                          manage_component_path(component),
+                          active: is_active_link?(manage_component_path(component)),
+                          if: component.manifest.admin_engine # && user_role_config.component_is_accessible?(component.manifest_name)
+          end
+        end
+      end
+
+      initializer "decidim_votings.decidim_votings_attachments_menu" do
+        Decidim.menu :decidim_votings_attachments_menu do |menu|
+          menu.add_item :voting_attachment_collections,
+                        I18n.t("attachment_collections", scope: "decidim.votings.admin.menu.votings_submenu"),
+                        decidim_admin_votings.voting_attachment_collections_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_votings.voting_attachment_collections_path(current_participatory_space)),
+                        if: allowed_to?(:read, :attachment_collection)
+
+          menu.add_item :voting_attachments,
+                        I18n.t("attachment_files", scope: "decidim.votings.admin.menu.votings_submenu"),
+                        decidim_admin_votings.voting_attachments_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_votings.voting_attachments_path(current_participatory_space)),
+                        if: allowed_to?(:read, :attachment)
         end
       end
 
-      initializer "decidim_votings.admin_assets" do |app|
-        app.config.assets.precompile += %w(admin/decidim_votings_manifest.js admin/decidim_votings_manifest.css)
+      initializer "decidim_votings.decidim_votings_monitoring_committee_menu" do
+        Decidim.menu :decidim_votings_monitoring_committee_menu do |menu|
+          menu.add_item :voting_monitoring_committee_members,
+                        I18n.t("monitoring_committee_members", scope: "decidim.votings.admin.menu.votings_submenu"),
+                        decidim_admin_votings.voting_monitoring_committee_members_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_votings.voting_monitoring_committee_members_path(current_participatory_space)),
+                        if: allowed_to?(:read, :monitoring_committee_members)
+          menu.add_item :monitoring_committee_polling_station_closures,
+                        I18n.t("monitoring_committee_polling_station_closures", scope: "decidim.votings.admin.menu.votings_submenu"),
+                        decidim_admin_votings.voting_monitoring_committee_polling_station_closures_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_votings.voting_monitoring_committee_polling_station_closures_path(current_participatory_space)),
+                        if: allowed_to?(:read, :monitoring_committee_polling_station_closures, voting: current_participatory_space)
+          menu.add_item :monitoring_committee_verify_elections,
+                        I18n.t("monitoring_committee_verify_elections", scope: "decidim.votings.admin.menu.votings_submenu"),
+                        decidim_admin_votings.voting_monitoring_committee_verify_elections_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_votings.voting_monitoring_committee_verify_elections_path(current_participatory_space)),
+                        if: allowed_to?(:read, :monitoring_committee_verify_elections, voting: current_participatory_space)
+          menu.add_item :monitoring_committee_election_results,
+                        I18n.t("monitoring_committee_election_results", scope: "decidim.votings.admin.menu.votings_submenu"),
+                        decidim_admin_votings.voting_monitoring_committee_election_results_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_votings.voting_monitoring_committee_election_results_path(current_participatory_space)),
+                        if: allowed_to?(:read, :monitoring_committee_election_results, voting: current_participatory_space)
+        end
+      end
+
+      initializer "decidim_votings.decidim_voting_menu" do
+        Decidim.menu :admin_voting_menu do |menu|
+          menu.add_item :edit_voting,
+                        I18n.t("info", scope: "decidim.votings.admin.menu.votings_submenu"),
+                        decidim_admin_votings.edit_voting_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_votings.edit_voting_path(current_participatory_space)),
+                        if: allowed_to?(:edit, :voting, voting: current_participatory_space)
+
+          menu.add_item :edit_voting_landing_page,
+                        I18n.t("landing_page", scope: "decidim.votings.admin.menu.votings_submenu"),
+                        decidim_admin_votings.edit_voting_landing_page_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_votings.voting_landing_page_path(current_participatory_space)),
+                        if: allowed_to?(:update, :landing_page)
+
+          menu.add_item :components,
+                        I18n.t("components", scope: "decidim.votings.admin.menu.votings_submenu"),
+                        decidim_admin_votings.components_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_votings.components_path(current_participatory_space)),
+                        if: allowed_to?(:read, :components, voting: current_participatory_space),
+                        submenu: { target_menu: :admin_votings_components_menu, options: { container_options: { id: "components-list" } } }
+
+          menu.add_item :attachments,
+                        I18n.t("attachments", scope: "decidim.votings.admin.menu.votings_submenu"),
+                        "#",
+                        active: is_active_link?(decidim_admin_votings.voting_attachment_collections_path(current_participatory_space)) ||
+                                is_active_link?(decidim_admin_votings.voting_attachments_path(current_participatory_space)),
+                        if: allowed_to?(:read, :attachment_collection) || allowed_to?(:read, :attachment),
+                        submenu: { target_menu: :decidim_votings_attachments_menu }
+
+          menu.add_item :voting_polling_stations,
+                        I18n.t("polling_stations", scope: "decidim.votings.admin.menu.votings_submenu"),
+                        decidim_admin_votings.voting_polling_stations_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_votings.voting_polling_stations_path(current_participatory_space)),
+                        if: !current_participatory_space.online_voting? && allowed_to?(:read, :polling_stations)
+
+          menu.add_item :voting_polling_officers,
+                        I18n.t("polling_officers", scope: "decidim.votings.admin.menu.votings_submenu"),
+                        decidim_admin_votings.voting_polling_officers_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_votings.voting_polling_officers_path(current_participatory_space)),
+                        if: !current_participatory_space.online_voting? && allowed_to?(:read, :polling_officers)
+
+          menu.add_item :voting_monitoring_committee,
+                        I18n.t("monitoring_committee", scope: "decidim.votings.admin.menu.votings_submenu"),
+                        "#",
+                        active: is_active_link?(decidim_admin_votings.voting_monitoring_committee_members_path(current_participatory_space)),
+                        if: !current_participatory_space.online_voting? && allowed_to?(:read, :monitoring_committee_menu, voting: current_participatory_space),
+                        submenu: { target_menu: :decidim_votings_monitoring_committee_menu }
+
+          menu.add_item :voting_ballot_styles,
+                        I18n.t("ballot_styles", scope: "decidim.votings.admin.menu.votings_submenu"),
+                        decidim_admin_votings.voting_ballot_styles_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_votings.voting_ballot_styles_path(current_participatory_space)),
+                        if: allowed_to?(:read, :ballot_styles)
+        end
       end
     end
   end

data/lib/decidim/votings/api.rb

@@ -3,5 +3,7 @@
 module Decidim
   module Votings
     autoload :VotingType, "decidim/api/voting_type"
+    autoload :PollingStationType, "decidim/api/polling_station_type"
+    autoload :PollingStationClosureType, "decidim/api/polling_station_closure_type"
   end
 end

data/lib/decidim/votings/census.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    # This module contains all the domain logic associated to Decidim's Votings
+    # Census.
+    module Census
+      include ActiveSupport::Configurable
+
+      # How long the census access codes export file will are available in the server
+      config_accessor :census_access_codes_export_expiry_time do
+        2.days
+      end
+    end
+  end
+end

data/lib/decidim/votings/census_admin.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    module Census
+      # This module contains all the domain logic associated to Decidim's Votings
+      # Census admin panel.
+      module Admin
+      end
+    end
+  end
+end

data/lib/decidim/votings/census_admin_engine.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    class CensusEngine < ::Rails::Engine
+      isolate_namespace Decidim::Votings::Census::Admin
+
+      paths["db/migrate"] = nil
+      paths["lib/tasks"] = nil
+
+      initializer "decidim_votings.decidim_voting_menu" do
+        Decidim.menu :admin_voting_menu do |menu|
+          menu.add_item :voting_census,
+                        I18n.t("census", scope: "decidim.votings.admin.menu.votings_submenu"),
+                        decidim_admin_votings.voting_census_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_votings.voting_census_path(current_participatory_space)),
+                        if: allowed_to?(:manage, :census)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/votings/census_engine.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    class CensusEngine < ::Rails::Engine
+      isolate_namespace Decidim::Votings::Census
+
+      paths["db/migrate"] = nil
+      paths["lib/tasks"] = nil
+
+      # routes do
+      # end
+
+      def load_seed
+        nil
+      end
+    end
+  end
+end

data/lib/decidim/votings/engine.rb

@@ -12,7 +12,13 @@ module Decidim
       paths["lib/tasks"] = nil
 
       routes do
-        resources :votings, param: :slug, only: [:index, :show, :update]
+        resources :votings, param: :slug, only: [:index, :show, :update] do
+          get :check_census, action: :show_check_census
+          post :check_census, action: :check_census
+          match :login, via: [:get, :post]
+          post :send_access_code
+          get :elections_log
+        end
 
         get "votings/:voting_id", to: redirect { |params, _request|
           voting = Decidim::Votings::Voting.find(params[:voting_id])
@@ -35,13 +41,6 @@ module Decidim
         end
       end
 
-      initializer "decidim_votings.assets" do |app|
-        app.config.assets.precompile += %w(
-          decidim_votings_manifest.js
-          decidim_votings_manifest.css
-        )
-      end
-
       initializer "decidim.stats" do
         Decidim.stats.register :votings_count, priority: StatsRegistry::HIGH_PRIORITY do |organization, _start_at, _end_at|
           Decidim::Votings::Voting.where(organization: organization).published.count
@@ -55,11 +54,12 @@ module Decidim
 
       initializer "decidim_votings.menu" do
         Decidim.menu :menu do |menu|
-          menu.item I18n.t("menu.votings", scope: "decidim"),
-                    decidim_votings.votings_path,
-                    position: 2.6,
-                    if: Decidim::Votings::Voting.where(organization: current_organization).published.any?,
-                    active: :inclusive
+          menu.add_item :votings,
+                        I18n.t("menu.votings", scope: "decidim"),
+                        decidim_votings.votings_path,
+                        position: 2.6,
+                        if: Decidim::Votings::Voting.where(organization: current_organization).published.any?,
+                        active: :inclusive
         end
       end
 
@@ -76,8 +76,13 @@ module Decidim
 
         Decidim.content_blocks.register(:voting_landing_page, :header) do |content_block|
           content_block.cell = "decidim/votings/content_blocks/landing_page/header"
+          content_block.settings_form_cell = "decidim/votings/content_blocks/landing_page/header_settings_form"
           content_block.public_name_key = "decidim.votings.admin.content_blocks.landing_page.header.name"
-          content_block.default!
+
+          content_block.settings do |settings|
+            settings.attribute :button_text, type: :text, translated: true
+            settings.attribute :button_url, type: :text, translated: true
+          end
         end
 
         Decidim.content_blocks.register(:voting_landing_page, :description) do |content_block|
@@ -105,7 +110,7 @@ module Decidim
         end
 
         Decidim.content_blocks.register(:voting_landing_page, :stats) do |content_block|
-          content_block.cell = "decidim/votings/content_blocks/landing_page/stats"
+          content_block.cell = "decidim/votings/content_blocks/landing_page/statistics"
           content_block.public_name_key = "decidim.votings.admin.content_blocks.landing_page.stats.name"
           content_block.default!
         end
@@ -119,7 +124,11 @@ module Decidim
         Decidim.content_blocks.register(:voting_landing_page, :timeline) do |content_block|
           content_block.cell = "decidim/votings/content_blocks/landing_page/timeline"
           content_block.public_name_key = "decidim.votings.admin.content_blocks.landing_page.timeline.name"
-          content_block.default!
+          content_block.settings_form_cell = "decidim/content_blocks/html_settings_form"
+
+          content_block.settings do |settings|
+            settings.attribute :html_content, type: :text, translated: true
+          end
         end
 
         1.upto(3) do |i|
@@ -138,10 +147,6 @@ module Decidim
       initializer "decidim_votings.query_extensions" do
         Decidim::Api::QueryType.include Decidim::Votings::QueryExtensions
       end
-
-      def load_seed
-        nil
-      end
     end
   end
 end