decidim-elections 0.24.3 → 0.25.0.rc1

data/config/locales/zh-CN.yml

@@ -205,15 +205,10 @@ zh-CN:
           experience: 您的体验如何？
           feedback: 给我们一些反馈
           header: 已确认投票
-          lead: 您的投票已被投出！
           text: '您可以检查您的投票是否已成功地添加到选票箱，其标识符如下： <strong class="evote__poll-id">%{e_vote_poll_id}</strong>'
-        encrypting:
-          header: 编码投票...
-          text: 您的投票正在加密，以确保您可以匿名投射。
         header:
           confirm: 确认您的投票
           confirmed: 已确认投票
-          encrypting: 确认投票
         messages:
           not_allowed: 此时您无权投票于此次选举。
         modal:
@@ -239,20 +234,6 @@ zh-CN:
           email_outro: 您收到此通知是因为您正在关注 %{participatory_space_title}。您可以停止收到跟随上一个链接的通知。
           email_subject: '%{resource_title} 的选举现在对 %{participatory_space_title} 生效。'
           notification_title: <a href="%{resource_path}">%{resource_title}</a> 选区现已启用 %{participatory_space_title}。
-    pages:
-      home:
-        statistics:
-          elections_count: 选举
-    participatory_processes:
-      statistics:
-        elections_count: 选举
-    votings:
-      polling_officer_zone:
-        polling_officers:
-          show:
-            polling_stations:
-              list:
-                actions: 行动
   layouts:
     decidim:
       election_votes_header:

data/db/migrate/20210308104024_add_decidim_votings_census_datasets.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddDecidimVotingsCensusDatasets < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_votings_census_datasets do |t|
+      t.string :file
+      t.integer :status, null: false
+      t.integer :data_count
+      t.integer :csv_row_raw_count, null: false
+      t.integer :csv_row_processed_count, default: 0
+
+      t.belongs_to :decidim_votings_voting, null: false, index: { name: "decidim_votings_voting_census_dataset" }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210308104154_add_decidim_votings_census_data.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class AddDecidimVotingsCensusData < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_votings_census_data do |t|
+      t.string :hashed_in_person_data, index: true
+      t.string :hashed_online_data, index: true
+      t.string :hashed_check_data, index: true
+
+      t.string :full_name
+      t.string :full_address
+      t.string :postal_code
+      t.string :mobile_phone_number, null: true
+      t.string :email, null: true
+
+      t.string :access_code, null: true
+
+      t.belongs_to :decidim_votings_census_dataset, null: false, index: { name: "decidim_votings_census_dataset_census_datum" }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210326090435_create_elections_results.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class CreateElectionsResults < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_elections_results do |t|
+      t.integer :votes_count, default: 0, null: false
+
+      t.belongs_to :decidim_elections_answer, index: true
+      t.belongs_to :decidim_votings_polling_station,
+                   null: true,
+                   index: { name: "index_decidim_elections_results_on_polling_station_id" }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210330102348_remove_votes_count_from_answer.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveVotesCountFromAnswer < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :decidim_elections_answers, :votes_count, :integer
+  end
+end

data/db/migrate/20210330123606_add_voting_ballot_style.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddVotingBallotStyle < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_votings_ballot_styles do |t|
+      t.string :code
+      t.references :decidim_votings_voting, null: false, index: false
+
+      t.timestamps
+
+      t.index [:decidim_votings_voting_id, :code], name: "decidim_votings_ballot_styles_on_voting_and_code", unique: true
+    end
+
+    create_join_table :decidim_votings_ballot_styles, :decidim_elections_questions, table_name: "decidim_votings_ballot_style_questions" do |t|
+      t.index :decidim_votings_ballot_style_id, name: "decidim_votings_ballot_styles_questions_ballot_style_id"
+      t.index :decidim_elections_question_id, name: "decidim_votings_ballot_styles_questions_question_id"
+    end
+  end
+end

data/db/migrate/20210330183204_add_email_to_votes.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddEmailToVotes < ActiveRecord::Migration[5.2]
+  def change
+    change_table :decidim_elections_votes, bulk: true do |t|
+      t.string :email
+      t.change :decidim_user_id, :bigint, null: true, index: true
+    end
+  end
+end

data/db/migrate/20210331152729_add_census_contact_information_to_votings.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddCensusContactInformationToVotings < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_votings_votings, :census_contact_information, :string
+  end
+end

data/db/migrate/20210401095507_add_organization_to_decidim_elections_trustee.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddOrganizationToDecidimElectionsTrustee < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :decidim_elections_trustees, :decidim_organization, index: true, foreign_key: true
+    add_index :decidim_elections_trustees,
+              [:name, :decidim_organization_id],
+              unique: true,
+              name: "index_decidim_organization_id_and_name"
+  end
+end

data/db/migrate/20210402102215_add_ballot_style_to_decidim_votings_census_data.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddBallotStyleToDecidimVotingsCensusData < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :decidim_votings_census_data, :decidim_votings_ballot_style, foreign_key: true, index: { name: "decidim_votings_census_data_on_ballot_style_id" }, null: true
+  end
+end

data/db/migrate/20210402140402_add_salt_to_elections.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AddSaltToElections < ActiveRecord::Migration[5.2]
+  class Election < ApplicationRecord
+    self.table_name = :decidim_elections_elections
+  end
+
+  def up
+    add_column :decidim_elections_elections, :salt, :string, null: false, default: ""
+
+    Election.find_each do |election|
+      election.salt = Decidim::Tokenizer.random_salt
+      election.save!
+    end
+
+    change_column_default(:decidim_elections_elections, :salt, nil)
+  end
+
+  def down
+    remove_column :decidim_elections_elections, :salt
+  end
+end

data/db/migrate/20210412144721_change_elections_results.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class ChangeElectionsResults < ActiveRecord::Migration[5.2]
+  def change
+    change_table :decidim_elections_results do |t|
+      t.rename :votes_count, :value
+      t.remove_belongs_to :decidim_elections_answer
+      t.remove_belongs_to :decidim_votings_polling_station
+
+      t.integer :result_type, index: true
+
+      t.belongs_to :closurable,
+                   null: false,
+                   polymorphic: true,
+                   index: false
+      t.belongs_to :decidim_elections_answer,
+                   null: true,
+                   index: false
+      t.belongs_to :decidim_elections_question,
+                   null: true,
+                   index: false
+    end
+  end
+end

data/db/migrate/20210412144740_create_elections_bulletin_board_closures.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreateElectionsBulletinBoardClosures < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_elections_bulletin_board_closures do |t|
+      t.belongs_to :decidim_elections_election,
+                   null: false,
+                   index: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210412144741_create_votings_polling_station_closures.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class CreateVotingsPollingStationClosures < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_votings_polling_station_closures do |t|
+      t.integer :phase, index: true
+      t.string :polling_officer_notes, null: true
+
+      t.belongs_to :decidim_elections_election,
+                   null: false,
+                   index: false
+      t.belongs_to :decidim_votings_polling_station,
+                   null: true,
+                   index: false
+      t.belongs_to :decidim_votings_polling_officer,
+                   null: true,
+                   index: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210420112721_create_decidim_votings_in_person_votes.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class CreateDecidimVotingsInPersonVotes < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_votings_in_person_votes do |t|
+      t.belongs_to :decidim_elections_election, null: false, index: false
+      t.belongs_to :decidim_votings_polling_station, null: true, index: false
+      t.belongs_to :decidim_votings_polling_officer, null: true, index: false
+      t.string :message_id, null: false
+      t.string :voter_id, null: false
+      t.integer :status, null: false
+
+      t.timestamps
+
+      t.index [:decidim_elections_election_id, :decidim_votings_polling_station_id],
+              name: "decidim_votings_in_person_votes_polling_station_id"
+      t.index [:decidim_elections_election_id, :voter_id],
+              name: "decidim_votings_in_person_votes_voter_id"
+    end
+  end
+end

data/db/migrate/20210422124826_add_verifiable_results_to_decidim_elections_election.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddVerifiableResultsToDecidimElectionsElection < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_elections_elections, :verifiable_results_file_url, :string
+    add_column :decidim_elections_elections, :verifiable_results_file_hash, :string
+  end
+end

data/db/migrate/20210426072845_add_signed_at_to_polling_station_closure.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddSignedAtToPollingStationClosure < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_votings_polling_station_closures, :signed_at, :date
+  end
+end

data/db/migrate/20210427131742_add_validated_at_to_votings_polling_station_closures.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddValidatedAtToVotingsPollingStationClosures < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_votings_polling_station_closures, :validated_at, :date
+    add_column :decidim_votings_polling_station_closures, :monitoring_committee_notes, :string
+  end
+end

data/lib/decidim/api/bulletin_board_closure_type.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Elections
+    # This type represents a bulletin board closure for an election.
+    class BulletinBoardClosureType < Decidim::Api::Types::BaseObject
+      description "A bulletin board election closure"
+
+      field :id, GraphQL::Types::ID, "The internal ID of this result", null: false
+      field :created_at, Decidim::Core::DateTimeType, "When this result was created", null: true
+      field :updated_at, Decidim::Core::DateTimeType, "When this result was updated", null: true
+      field :election, Decidim::Elections::ElectionType, "The election for this closure", null: false
+      field :results, [Decidim::Elections::ElectionResultType, { null: true }], "The results for this closure", null: false
+    end
+  end
+end

data/lib/decidim/api/election_answer_type.rb

@@ -14,10 +14,11 @@ module Decidim
       field :title, Decidim::Core::TranslatedFieldType, "The title for this answer", null: false
       field :description, Decidim::Core::TranslatedFieldType, "The description for this answer", null: true
       field :weight, GraphQL::Types::Int, "The ordering weight for this answer", null: true
-      field :votes_count, GraphQL::Types::Int, "The votes for this answer", null: true, camelize: false
+      field :results_total, GraphQL::Types::Int, "The total sum of votes for this answer", null: true, camelize: false
       field :selected, GraphQL::Types::Boolean, "Is this answer selected?", null: true
 
-      field :proposals, [Decidim::Proposals::ProposalType, { null: true }], "The proposals related to this answer", null: true
+      field :proposals, [Decidim::Proposals::ProposalType, { null: true }], "The proposals related to this answer", null: true if defined?(Decidim::Proposals::ProposalType)
+      field :results, [Decidim::Elections::ElectionResultType, { null: true }], "The voting results related to this answer", null: true
     end
   end
 end

data/lib/decidim/api/election_result_type.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Elections
+    # This type represents a result of an answer to an election question.
+    class ElectionResultType < Decidim::Api::Types::BaseObject
+      description "A voting result for an answer"
+
+      field :id, GraphQL::Types::ID, "The internal ID of this result", null: false
+      field :created_at, Decidim::Core::DateTimeType, "When this result was created", null: true
+      field :updated_at, Decidim::Core::DateTimeType, "When this result was updated", null: true
+      field :value, GraphQL::Types::Int, "The value of the recount", null: false
+      field :result_type, GraphQL::Types::String, "The result type for this result in the closure", null: true, camelize: false
+      field :answer, Decidim::Elections::ElectionAnswerType, "The answer for this result", null: false
+      field :question, Decidim::Elections::ElectionQuestionType, "The question for this result", null: false
+      # field :closurable, [Decidim::Elections::BulletinBoardClosureType, Decidim::Votings::PollingStationClosureType], "The closure for this result", null: false
+    end
+  end
+end

data/lib/decidim/api/polling_station_closure_type.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    # This type represents a Polling Station closure for an election.
+    class PollingStationClosureType < Decidim::Api::Types::BaseObject
+      description "A polling station election closure"
+
+      field :id, GraphQL::Types::ID, "The internal ID of this result", null: false
+      field :created_at, Decidim::Core::DateTimeType, "When this result was created", null: true
+      field :updated_at, Decidim::Core::DateTimeType, "When this result was updated", null: true
+      field :election, Decidim::Elections::ElectionType, "The election for this closure", null: false
+      field :polling_officer_notes, GraphQL::Types::String, "The polling officer notes for this closure", null: false
+      field :results, [Decidim::Elections::ElectionResultType, { null: true }], "The results for this closure", null: false
+      field :polling_station, Decidim::Votings::PollingStationType, "The polling station for this closure", null: true
+      field :signed, GraphQL::Types::Boolean, "Whether this closure is signed or not", method: :signed?, null: true
+    end
+  end
+end

data/lib/decidim/api/polling_station_type.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    # This type represents a polling station.
+    class PollingStationType < Decidim::Api::Types::BaseObject
+      description "A polling station for a voting"
+
+      field :id, GraphQL::Types::ID, "The internal ID of this polling station", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this polling station", null: true
+      field :address, GraphQL::Types::String, "The physical address of this polling station (used for geolocation)", null: true
+      field :coordinates, Decidim::Core::CoordinatesType, "Physical coordinates for this polling station", null: true
+      field :location, Decidim::Core::TranslatedFieldType, "The location of this polling station (free format)", null: true
+      field :location_hints, Decidim::Core::TranslatedFieldType, "The location of this polling station (free format)", null: true
+      field :created_at, Decidim::Core::DateTimeType, "When this polling station was created", null: true
+      field :updated_at, Decidim::Core::DateTimeType, "When this polling station was updated", null: true
+      field :voting, Decidim::Votings::VotingType, null: false
+
+      def coordinates
+        [object.latitude, object.longitude]
+      end
+    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/elections/admin_engine.rb

@@ -50,25 +50,24 @@ module Decidim
         [:trustees]
       end
 
-      initializer "decidim_admin_elections.view_hooks" do
-        Decidim::Admin.view_hooks.register(:admin_secondary_nav, priority: Decidim::ViewHooks::MEDIUM_PRIORITY) do |view_context|
-          component = view_context.current_participatory_space.components.find_by(manifest_name: :elections)
-          if component
-            view_context.render(
-              partial: "decidim/elections/admin/shared/trustees_secondary_nav",
-              locals: {
-                current_component: component,
-                engine_router: Decidim::EngineRouter.admin_proxy(component)
-              }
-            )
+      initializer "decidim_admin_elections.menu_entry" do
+        Decidim.participatory_space_registry.manifests.each do |participatory_space|
+          menu_id = :"admin_#{participatory_space.name.to_s.singularize}_menu"
+          Decidim.menu menu_id do |menu|
+            component = current_participatory_space.try(:components)&.find_by(manifest_name: :elections)
+            next unless component
+
+            link = Decidim::EngineRouter.admin_proxy(component).trustees_path(locale: I18n.locale)
+            menu.add_item :trustees,
+                          I18n.t("trustees", scope: "decidim.elections.admin.menu"),
+                          link,
+                          position: 100,
+                          if: allowed_to?(:manage, :trustees),
+                          active: is_active_link?(link)
           end
         end
       end
 
-      initializer "decidim_elections.assets" do |app|
-        app.config.assets.precompile += %w(decidim_elections_manifest.js decidim_elections_manifest.css)
-      end
-
       def load_seed
         nil
       end