voteCount (Int)
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 0d0eaa798..e5ae8e13e 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -154,6 +154,44 @@ ca:
postal_code: Codi postal
time_and_date: Data i hora
timestamp: Segell
+ filters:
+ proposals:
+ evaluated_by_user:
+ label: Avaluació
+ values:
+ "false": No avaluat
+ "true": Avaluat
+ internal_evaluation:
+ admin:
+ internal_evaluations:
+ create:
+ error: "Hi ha hagut un problema en crear l'avaluació interna: %{message}"
+ success: Avaluació interna creada correctament.
+ form:
+ save: Desar
+ status: Estat
+ title: Avaluació per a %{title}
+ index:
+ actions: Accions
+ counter: "%{count} de %{total} avaluacions"
+ edit_evaluation: Edita l'avaluació
+ evaluation: Avaluació
+ status: Estat
+ title: Avaluacions internes
+ updated: Actualitzat
+ update:
+ error: "Hi ha hagut un problema en actualitzar l'avaluació interna: %{message}"
+ success: Avaluació interna actualitzada correctament.
+ valuation_assignments_evaluations:
+ edit_evaluation: Edita l'avaluació
+ proposals:
+ admin:
+ exports:
+ internal_evaluations: Avaluacions internes
+ models:
+ proposal:
+ fields:
+ valuators: Estat de l'avaluació
authorization_handlers:
census16_authorization_handler:
explanation: Verifica't amb el padró
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9754fc782..eee379b22 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -154,6 +154,44 @@ es:
postal_code: Código postal
time_and_date: Fecha y hora
timestamp: Sello
+ filters:
+ proposals:
+ evaluated_by_user:
+ label: Evaluación
+ values:
+ "false": No evaluado
+ "true": Evaluado
+ internal_evaluation:
+ admin:
+ internal_evaluations:
+ create:
+ error: "Hubo un problema al crear la evaluación interna: %{message}"
+ success: Evaluación interna creada correctamente.
+ form:
+ save: Guardar
+ status: Estado
+ title: Evaluación para %{title}
+ index:
+ actions: Acciones
+ counter: "%{count} de %{total} evaluaciones"
+ edit_evaluation: Editar evaluación
+ evaluation: Evaluación
+ status: Estado
+ title: Evaluaciones internas
+ updated: Actualizado
+ update:
+ error: "Hubo un problema al actualizar la evaluación interna: %{message}"
+ success: Evaluación interna actualizada correctamente.
+ valuation_assignments_evaluations:
+ edit_evaluation: Editar evaluación
+ proposals:
+ admin:
+ exports:
+ internal_evaluations: Evaluaciones internas
+ models:
+ proposal:
+ fields:
+ valuators: Estado de la evaluación
authorization_handlers:
census16_authorization_handler:
explanation: Verifícate con el padrón
diff --git a/db/migrate/20241014151251_add_withdrawn_at_field_to_proposals.decidim_proposals.rb b/db/migrate/20241014151251_add_withdrawn_at_field_to_proposals.decidim_proposals.rb
new file mode 100644
index 000000000..53d023700
--- /dev/null
+++ b/db/migrate/20241014151251_add_withdrawn_at_field_to_proposals.decidim_proposals.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+# This migration comes from decidim_proposals (originally 20240110203500)
+
+class AddWithdrawnAtFieldToProposals < ActiveRecord::Migration[6.1]
+ class CustomProposal < Decidim::Proposals::ApplicationRecord
+ self.table_name = "decidim_proposals_proposals"
+ STATES = { not_answered: 0, evaluating: 10, accepted: 20, rejected: -10, withdrawn: -20 }.freeze
+ enum state: STATES, _default: "not_answered"
+ end
+
+ def up
+ add_column :decidim_proposals_proposals, :withdrawn_at, :datetime
+
+ CustomProposal.withdrawn.find_each do |proposal|
+ proposal.withdrawn_at = proposal.updated_at
+ proposal.save!
+ end
+ end
+
+ def down
+ CustomProposal.where.not(withdrawn_at: null).find_each do |proposal|
+ proposal.state = :withdrawn
+ proposal.save!
+ end
+
+ remove_column :decidim_proposals_proposals, :withdrawn_at
+ end
+end
diff --git a/db/migrate/20241014151252_create_decidim_proposals_proposal_state.decidim_proposals.rb b/db/migrate/20241014151252_create_decidim_proposals_proposal_state.decidim_proposals.rb
new file mode 100644
index 000000000..8721f6935
--- /dev/null
+++ b/db/migrate/20241014151252_create_decidim_proposals_proposal_state.decidim_proposals.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+# This migration comes from decidim_proposals (originally 20240110203501)
+
+class CreateDecidimProposalsProposalState < ActiveRecord::Migration[6.1]
+ def change
+ create_table :decidim_proposals_proposal_states do |t|
+ t.jsonb :title
+ t.jsonb :announcement_title
+ t.string :token, null: false
+ t.references :decidim_component, index: true, null: false
+ t.integer :proposals_count, default: 0, null: false
+ t.string :bg_color, default: "#F6F8FA", null: false
+ t.string :text_color, default: "#4B5058", null: false
+ end
+ end
+end
diff --git a/db/migrate/20241014151253_add_state_id_to_decidim_proposals_proposals.decidim_proposals.rb b/db/migrate/20241014151253_add_state_id_to_decidim_proposals_proposals.decidim_proposals.rb
new file mode 100644
index 000000000..c1bc21c6a
--- /dev/null
+++ b/db/migrate/20241014151253_add_state_id_to_decidim_proposals_proposals.decidim_proposals.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+# This migration comes from decidim_proposals (originally 20240110203502)
+
+class AddStateIdToDecidimProposalsProposals < ActiveRecord::Migration[6.1]
+ def up
+ add_column :decidim_proposals_proposals, :decidim_proposals_proposal_state_id, :integer, index: true
+ add_foreign_key :decidim_proposals_proposals, :decidim_proposals_proposal_states, column: :decidim_proposals_proposal_state_id
+ end
+
+ def down
+ remove_foreign_key :decidim_proposals_proposals, column: :decidim_proposals_proposal_state_id
+ remove_column :decidim_proposals_proposals, :decidim_proposals_proposal_state_id
+ end
+end
diff --git a/db/migrate/20241014151254_remove_state_from_decidim_proposals_proposals.decidim_proposals.rb b/db/migrate/20241014151254_remove_state_from_decidim_proposals_proposals.decidim_proposals.rb
new file mode 100644
index 000000000..0503308e3
--- /dev/null
+++ b/db/migrate/20241014151254_remove_state_from_decidim_proposals_proposals.decidim_proposals.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+# This migration comes from decidim_proposals (originally 20240110203503)
+
+class RemoveStateFromDecidimProposalsProposals < ActiveRecord::Migration[6.1]
+ def up
+ rename_column :decidim_proposals_proposals, :state, :old_state
+ end
+
+ def down
+ rename_column :decidim_proposals_proposals, :old_state, :state
+ end
+end
diff --git a/db/migrate/20241014151255_create_default_proposal_states.decidim_proposals.rb b/db/migrate/20241014151255_create_default_proposal_states.decidim_proposals.rb
new file mode 100644
index 000000000..f7b802dd9
--- /dev/null
+++ b/db/migrate/20241014151255_create_default_proposal_states.decidim_proposals.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+# This migration comes from decidim_proposals (originally 20240110203504)
+
+class CreateDefaultProposalStates < ActiveRecord::Migration[6.1]
+ class CustomProposal < ApplicationRecord
+ belongs_to :proposal_state,
+ class_name: "Decidim::Proposals::ProposalState",
+ foreign_key: "decidim_proposals_proposal_state_id",
+ inverse_of: :proposals,
+ optional: true
+
+ self.table_name = :decidim_proposals_proposals
+ STATES = { not_answered: 0, evaluating: 10, accepted: 20, rejected: -10 }.freeze
+ enum old_state: STATES, _default: "not_answered"
+ end
+
+ def up
+ CustomProposal.reset_column_information
+ Decidim::Proposals::ProposalState.reset_column_information
+ Decidim::Component.where(manifest_name: "proposals").find_each do |component|
+ admin_user = component.organization.admins.first
+ Decidim::Proposals.create_default_states!(component, admin_user)
+
+ CustomProposal.where(decidim_component_id: component.id).find_each do |proposal|
+ next if proposal.old_state == "not_answered"
+ next if proposal.old_state.nil?
+
+ token = I18n.t("decidim.proposals.answers.#{proposal.old_state}").downcase.tr(" ", "_").tr("ó", "o")
+ proposal.update!(proposal_state: Decidim::Proposals::ProposalState.where(component:, token:).first!)
+ end
+ end
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/migrate/20241014151256_change_color_fields_on_proposals_states.decidim_proposals.rb b/db/migrate/20241014151256_change_color_fields_on_proposals_states.decidim_proposals.rb
new file mode 100644
index 000000000..b35233688
--- /dev/null
+++ b/db/migrate/20241014151256_change_color_fields_on_proposals_states.decidim_proposals.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+# This migration comes from decidim_proposals (originally 20240209092404)
+
+class ChangeColorFieldsOnProposalsStates < ActiveRecord::Migration[6.1]
+ class ProposalState < ApplicationRecord
+ self.table_name = :decidim_proposals_proposal_states
+
+ def self.colors
+ {
+ gray: {
+ background: "#F6F8FA",
+ foreground: "#4B5058"
+ },
+ green: {
+ background: "#E3FCE9",
+ foreground: "#15602C"
+ },
+ orange: {
+ background: "#FFF1E5",
+ foreground: "#BC4C00"
+ },
+ red: {
+ background: "#FFEBE9",
+ foreground: "#D1242F"
+ }
+ }
+ end
+ end
+
+ def up
+ colors = ProposalState.colors
+
+ # rubocop:disable Rails/SkipsModelValidations
+ ProposalState.where(token: :accepted).update_all(
+ bg_color: colors[:green][:background], text_color: colors[:green][:foreground]
+ )
+ ProposalState.where(token: :evaluating).update_all(
+ bg_color: colors[:orange][:background], text_color: colors[:orange][:foreground]
+ )
+ ProposalState.where(token: :rejected).update_all(
+ bg_color: colors[:red][:background], text_color: colors[:red][:foreground]
+ )
+ # rubocop:enable Rails/SkipsModelValidations
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/migrate/20241015093724_create_decidim_internal_evaluation_internal_evaluations.decidim_internal_evaluation.rb b/db/migrate/20241015093724_create_decidim_internal_evaluation_internal_evaluations.decidim_internal_evaluation.rb
new file mode 100644
index 000000000..f4f05ef2e
--- /dev/null
+++ b/db/migrate/20241015093724_create_decidim_internal_evaluation_internal_evaluations.decidim_internal_evaluation.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+# This migration comes from decidim_internal_evaluation (originally 20240625151452)
+
+class CreateDecidimInternalEvaluationInternalEvaluations < ActiveRecord::Migration[6.1]
+ def change
+ create_table :decidim_internal_evaluation_internal_evaluations do |t|
+ t.references :decidim_proposal, null: false, index: { name: "index_decidim_internal_evaluations_on_proposal" }
+ t.references :decidim_proposal_state, index: { name: "index_decidim_internal_evaluations_on_proposal_state" }
+ t.references :decidim_author, null: false, index: { name: "index_decidim_internal_evaluations_on_author" }
+ t.jsonb :body
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20241015093725_change_internal_evaluations_body_to_text.decidim_internal_evaluation.rb b/db/migrate/20241015093725_change_internal_evaluations_body_to_text.decidim_internal_evaluation.rb
new file mode 100644
index 000000000..ae4e35795
--- /dev/null
+++ b/db/migrate/20241015093725_change_internal_evaluations_body_to_text.decidim_internal_evaluation.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+# This migration comes from decidim_internal_evaluation (originally 20240715150021)
+
+class ChangeInternalEvaluationsBodyToText < ActiveRecord::Migration[6.1]
+ def up
+ change_column :decidim_internal_evaluation_internal_evaluations, :body, :text
+ end
+
+ def down
+ change_column :decidim_internal_evaluation_internal_evaluations, :body, :jsonb
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 463b5dce8..86d8e8a7e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2024_08_13_060359) do
+ActiveRecord::Schema.define(version: 2024_10_15_093725) do
# These are extensions that must be enabled in order to support this database
enable_extension "ltree"
@@ -848,6 +848,18 @@
t.index ["hash_id"], name: "index_decidim_initiatives_votes_on_hash_id"
end
+ create_table "decidim_internal_evaluation_internal_evaluations", force: :cascade do |t|
+ t.bigint "decidim_proposal_id", null: false
+ t.bigint "decidim_proposal_state_id"
+ t.bigint "decidim_author_id", null: false
+ t.text "body"
+ t.datetime "created_at", precision: 6, null: false
+ t.datetime "updated_at", precision: 6, null: false
+ t.index ["decidim_author_id"], name: "index_decidim_internal_evaluations_on_author"
+ t.index ["decidim_proposal_id"], name: "index_decidim_internal_evaluations_on_proposal"
+ t.index ["decidim_proposal_state_id"], name: "index_decidim_internal_evaluations_on_proposal_state"
+ end
+
create_table "decidim_kids_impersonation_minor_logs", force: :cascade do |t|
t.bigint "decidim_tutor_id"
t.bigint "decidim_minor_id"
@@ -1446,6 +1458,17 @@
t.index ["decidim_proposal_id"], name: "decidim_proposals_proposal_note_proposal"
end
+ create_table "decidim_proposals_proposal_states", force: :cascade do |t|
+ t.jsonb "title"
+ t.jsonb "announcement_title"
+ t.string "token", null: false
+ t.bigint "decidim_component_id", null: false
+ t.integer "proposals_count", default: 0, null: false
+ t.string "bg_color", default: "#F6F8FA", null: false
+ t.string "text_color", default: "#4B5058", null: false
+ t.index ["decidim_component_id"], name: "index_decidim_proposals_proposal_states_on_decidim_component_id"
+ end
+
create_table "decidim_proposals_proposal_votes", id: :serial, force: :cascade do |t|
t.integer "decidim_proposal_id", null: false
t.integer "decidim_author_id", null: false
@@ -1485,8 +1508,10 @@
t.jsonb "title"
t.jsonb "body"
t.integer "follows_count", default: 0, null: false
- t.integer "state", default: 0, null: false
+ t.integer "old_state", default: 0, null: false
t.integer "valuation_assignments_count", default: 0
+ t.datetime "withdrawn_at"
+ t.integer "decidim_proposals_proposal_state_id"
t.index "md5((body)::text)", name: "decidim_proposals_proposal_body_search"
t.index "md5((title)::text)", name: "decidim_proposals_proposal_title_search"
t.index ["created_at"], name: "index_decidim_proposals_proposals_on_created_at"
@@ -1986,6 +2011,7 @@
add_foreign_key "decidim_participatory_processes", "decidim_organizations"
add_foreign_key "decidim_participatory_processes", "decidim_participatory_process_types"
add_foreign_key "decidim_participatory_processes", "decidim_scope_types"
+ add_foreign_key "decidim_proposals_proposals", "decidim_proposals_proposal_states"
add_foreign_key "decidim_reminder_deliveries", "decidim_reminders"
add_foreign_key "decidim_reminder_records", "decidim_reminders"
add_foreign_key "decidim_reminders", "decidim_components"
diff --git a/decidim-ephemeral_participation/lib/tasks/purge_unused_verifications.rake b/decidim-ephemeral_participation/lib/tasks/purge_unused_verifications.rake
index 8c0c3385a..348de453f 100644
--- a/decidim-ephemeral_participation/lib/tasks/purge_unused_verifications.rake
+++ b/decidim-ephemeral_participation/lib/tasks/purge_unused_verifications.rake
@@ -19,7 +19,7 @@ namespace :decidim do
end
def lost_ephemeral_users
- Decidim::User.ephemeral_participant.where("updated_at < ?", 12.hours.ago).where("id NOT IN (SELECT decidim_user_id FROM decidim_budgets_orders)")
+ Decidim::User.ephemeral_participant.where(updated_at: ...12.hours.ago).where("id NOT IN (SELECT decidim_user_id FROM decidim_budgets_orders)")
end
def conflicts_for(user)