decidim-reporting_proposals 0.6.1 → 0.7.1

data/config/locales/en.yml

@@ -50,6 +50,14 @@ en:
             unanswered_proposals_overdue_help: This adds a visual alert to the list
               of proposals. Leave it to zero to disable this feature.
       reporting_proposals:
+        actions:
+          amend: Amend
+          comment: Comment
+          create: Create
+          endorse: Endorse
+          vote: Support
+          vote_comment: Vote comment
+          withdraw: Withdraw
         name: Reporting proposals
         settings:
           global:
@@ -72,7 +80,7 @@ en:
             amendments_wizard_help_text: Amendments Wizard help text
             announcement: Announcement
             attachments_allowed: Allow attachments
-            can_accumulate_supports_beyond_threshold: Can accumulate supports beyond
+            can_accumulate_votes_beyond_threshold: Can accumulate supports beyond
               threshold
             collaborative_drafts_enabled: Collaborative drafts enabled
             comments_enabled: Comments enabled
@@ -230,6 +238,12 @@ en:
             send_mail: Send an email to user
           show:
             report: Report
+      proposals:
+        compare:
+          continue: Continue
+          title: Compare proposals
+        wizard_steps:
+          step_compare: Compare
     reported_mailer:
       report:
         admin_resource: Admin this resource
@@ -483,6 +497,7 @@ en:
               same situation, you can choose to support it instead of creating a new
               one.
             title: Nearby proposals
+          no_similars_found: No similar proposals found
         edit:
           delete_image: Delete image
         form:

data/config/locales/es.yml

@@ -7,10 +7,11 @@ es:
       proposal:
         has_no_address: No tiene dirección
         has_no_image: No tiene imagen
-      template:
-        scope_for_availability: Restringir disponibilidad al componente
   decidim:
     admin:
+      actions:
+        manage: Gestionar
+        new: Nuevo
       hidden_resource_mailer:
         notify_mail:
           body_1: Un administrador eliminó su propuesta porque ha sido denunciada.
@@ -18,10 +19,6 @@ es:
           hello: Hola,
           reason: 'Motivo: %{reason}'
           subject: Tu propuesta ha sido ocultada
-      templates:
-        fetch:
-          error: No se pudo encontrar esta plantilla, ¿tal vez se ha eliminado?
-        missing_resource: "(recurso ausente)"
     application:
       geocoding:
         unconfigured: '¡La geocodificación no está configurada!'
@@ -40,6 +37,14 @@ es:
             unanswered_proposals_overdue: Después de cuántos días se considera una propuesta sin respuesta atrasada
             unanswered_proposals_overdue_help: Esto añade una alerta visual a la lista de propuestas. Déjala a cero para desactivar esta característica.
       reporting_proposals:
+        actions:
+          amend: Enmendar
+          comment: Comentar
+          create: Crear
+          endorse: Adherirse
+          vote: Apoyar
+          vote_comment: Votar comentario
+          withdraw: Retirar
         name: Propuestas directas
         settings:
           global:
@@ -168,14 +173,8 @@ es:
             geolocated_at: Geolocalizada en
           send_email_button:
             send_mail: Enviar un correo electrónico al usuario
-        proposals_valuator_mailer:
-          notify_proposals_valuator:
-            admin_panel: panel de administración
-            email_body: Has sido asignado como evaluador para las propuestas que se listan a continuación. Esto significa que en los próximos días deberías comentar y/o una respuesta adecuada.
-            gratitude: '¡Gracias por tu ayuda!'
-            greeting: Hola %{name},
-            public_side: parte pública
-            subject: Nuevas propuestas asignadas para su evaluación
+          show:
+            report: Denunciar
     reported_mailer:
       report:
         admin_resource: Administrar este recurso
@@ -341,6 +340,7 @@ es:
           photo_form:
             action: Añadir imagen
             add_images: Añadir imágenes
+            edit_images: Añadir imágenes
             gallery_legend: Añadir imágenes
             title: Fotos
             upload_msg: No hay archivos seleccionados
@@ -354,6 +354,14 @@ es:
             remove_assignment: eliminar asignación
             remove_assignment_confirmation: Seguro que quieres eliminar esta asignación?
             valuators: Evaluadoras
+        proposals_valuator_mailer:
+          notify_proposals_valuator:
+            admin_panel: panel de administración
+            email_body: Has sido asignado como evaluador para las propuestas que se listan a continuación. Esto significa que en los próximos días deberías comentar y/o una respuesta adecuada.
+            gratitude: '¡Gracias por tu ayuda!'
+            greeting: Hola %{name},
+            public_side: parte pública
+            subject: Nuevas propuestas asignadas para su evaluación
         resolution_time: Tiempo de resolución
         time_elapsed:
           datetime:
@@ -418,25 +426,3 @@ es:
           delete_image: Eliminar imagen
         form:
           image: Imágen/foto
-    templates:
-      admin:
-        proposal_answer_templates:
-          form:
-            answer_template: Plantilla de Respuesta
-            hint: "<strong>Sugerencia:</strong> Puede utilizar estas variables en cualquier lugar de la plantilla de respuesta que se reemplazarán cuando utilice la plantilla"
-            hint1: "<strong>%{organization}</strong> será reemplazado por el nombre de la organización"
-            hint2: "<strong>%{name}</strong> será reemplazado por el nombre del autor"
-            hint3: "<strong>%{admin}</strong> será sustituido por el nombre del administrador (el que responde a la propuesta)"
-            save: Guardar
-            scope_for_availability_help: Tenga en cuenta que sólo los espacios participativos que tengan componentes del tipo "propuestas" serán listados.
-            template_title: Información de la plantilla
-          index:
-            confirm_delete: '¿Está seguro de querer eliminar esta plantilla?'
-            global_scope: Global (disponible en todas partes)
-            internal_state: Estado interno
-            scope_for_availability: Ámbito
-            title: Respuestas a propuestas
-          template_chooser:
-            select_template: Selecciona una plantilla de respuesta
-      template_types:
-        proposal_answer_templates: Respuestas a propuestas

data/decidim-reporting_proposals.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.description = "A module for Decidim that facilitates the creation of proposals related to geolocated issues in a city"
   spec.license = "AGPL-3.0"
   spec.homepage = "https://github.com/openpoke/decidim-module-reporting_proposals"
-  spec.required_ruby_version = ">= 3.1"
+  spec.required_ruby_version = ">= 3.2"
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -32,7 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "decidim-accountability", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
   spec.add_development_dependency "decidim-budgets", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
   spec.add_development_dependency "decidim-dev", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
-  spec.add_development_dependency "decidim-elections", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
   spec.add_development_dependency "decidim-meetings", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
   spec.add_development_dependency "decidim-templates", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
   spec.metadata["rubygems_mfa_required"] = "true"

data/lib/decidim/reporting_proposals/component.rb

@@ -36,7 +36,7 @@ Decidim.register_component(:reporting_proposals) do |component|
     settings.attribute :proposal_edit_time, type: :enum, default: "limited", choices: -> { %w(limited infinite) }
     settings.attribute :proposal_edit_before_minutes, type: :integer, default: 5
     settings.attribute :threshold_per_proposal, type: :integer, default: 0
-    settings.attribute :can_accumulate_supports_beyond_threshold, type: :boolean, default: false
+    settings.attribute :can_accumulate_votes_beyond_threshold, type: :boolean, default: false
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
     settings.attribute :default_sort_order, type: :select, default: "default", choices: -> { REP_POSSIBLE_SORT_ORDERS }
     settings.attribute :official_proposals_enabled, type: :boolean, default: true
@@ -103,14 +103,14 @@ Decidim.register_component(:reporting_proposals) do |component|
   end
 
   component.register_stat :proposals_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|
-    Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).published.except_withdrawn.not_hidden.count
+    Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).published.not_withdrawn.not_hidden.count
   end
 
   component.register_stat :proposals_accepted, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|
     Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).accepted.not_hidden.count
   end
 
-  component.register_stat :supports_count, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|
+  component.register_stat :votes_count, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|
     proposals = Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).published.not_hidden
     Decidim::Proposals::ProposalVote.where(proposal: proposals).count
   end
@@ -238,18 +238,11 @@ Decidim.register_component(:reporting_proposals) do |component|
       global = nil
     end
 
+    Decidim::Proposals.create_default_states!(component, admin_user)
+
     5.times do |n|
-      state, answer, state_published_at = if n > 3
-                                            ["accepted", Decidim::Faker::Localized.sentence(word_count: 10), Time.current]
-                                          elsif n > 2
-                                            ["rejected", nil, Time.current]
-                                          elsif n > 1
-                                            ["evaluating", nil, Time.current]
-                                          elsif n.positive?
-                                            ["accepted", Decidim::Faker::Localized.sentence(word_count: 10), nil]
-                                          else
-                                            ["not_answered", nil, nil]
-                                          end
+      proposal_state, answer, state_published_at = random_state_answer
+      proposal_state = Decidim::Proposals::ProposalState.where(component:, token: proposal_state).first
 
       params = {
         component:,
@@ -257,9 +250,9 @@ Decidim.register_component(:reporting_proposals) do |component|
         scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
         title: { en: Faker::Lorem.sentence(word_count: 2) },
         body: { en: Faker::Lorem.paragraphs(number: 2).join("\n") },
-        state:,
+        proposal_state:,
         answer:,
-        answered_at: state.present? ? Time.current : nil,
+        answered_at: proposal_state.present? ? Time.current : nil,
         state_published_at:,
         published_at: Time.current
       }
@@ -323,7 +316,7 @@ Decidim.register_component(:reporting_proposals) do |component|
           scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
           title: { en: "#{proposal.title["en"]} #{Faker::Lorem.sentence(word_count: 1)}" },
           body: { en: "#{proposal.body["en"]} #{Faker::Lorem.sentence(word_count: 3)}" },
-          state: "evaluating",
+          proposal_state: Decidim::Proposals::ProposalState.where(component: proposal.component, token: :evaluating).first,
           answer: nil,
           answered_at: Time.current,
           published_at: Time.current
@@ -478,4 +471,20 @@ Decidim.register_component(:reporting_proposals) do |component|
       body: Faker::Lorem.paragraphs(number: 2).join("\n")
     )
   end
+
+  def random_state_answer
+    n = rand(5)
+
+    if n > 3
+      [:accepted, Decidim::Faker::Localized.sentence(word_count: 10), Time.current]
+    elsif n > 2
+      [:rejected, nil, Time.current]
+    elsif n > 1
+      [:evaluating, nil, Time.current]
+    elsif n.positive?
+      [:accepted, Decidim::Faker::Localized.sentence(word_count: 10), nil]
+    else
+      [:not_answered, nil, nil]
+    end
+  end
 end

data/lib/decidim/reporting_proposals/engine.rb

@@ -20,16 +20,14 @@ module Decidim
         Decidim::ResourceHelper.include(Decidim::ReportingProposals::ResourceHelperOverride)
         Decidim::Map::Autocomplete::Builder.include(Decidim::ReportingProposals::MapBuilderOverride)
         Decidim::CreateReport.include(Decidim::ReportingProposals::CreateReportOverride)
-        Decidim::GalleryMethods.include(Decidim::ReportingProposals::GalleryMethodsOverride)
         Decidim::LinkedResourcesForCell.include(Decidim::ReportingProposals::LinkedResourcesForCellOverride)
         Decidim::Proposals::ProposalSerializer.include(Decidim::ReportingProposals::ProposalSerializerOverride)
         Decidim::Proposals::ProposalsPickerCell.include(Decidim::ReportingProposals::ProposalsPickerCellOverride)
         Decidim::Proposals::PublishProposal.include(Decidim::ReportingProposals::PublishProposalOverride)
-        Decidim::Proposals::Admin::AnswerProposal.include(Decidim::ReportingProposals::Admin::AnswerProposalOverride)
         Decidim::Accountability::Admin::ResultForm.include(Decidim::ReportingProposals::MapIncludedProposalsForFormOverride)
-        Decidim::Accountability::Admin::CreateResult.include(Decidim::ReportingProposals::Admin::CreateResultOverride)
+        Decidim::Accountability::Admin::HasResultCommand.include(Decidim::ReportingProposals::Admin::HasResultCommandOverride)
         Decidim::Accountability::Admin::UpdateResult.include(Decidim::ReportingProposals::Admin::UpdateResultOverride)
-        Decidim::Accountability::Admin::UpdateImportedResult.include(Decidim::ReportingProposals::Admin::UpdateResultOverride)
+        Decidim::Accountability::Admin::UpdateImportedResult.include(Decidim::ReportingProposals::Admin::UpdateImportedResultOverride)
         Decidim::Meetings::CloseMeetingForm.include(Decidim::ReportingProposals::CloseMeetingFormOverride)
         Decidim::Meetings::Admin::CloseMeetingForm.include(Decidim::ReportingProposals::CloseMeetingFormOverride)
         Decidim::Meetings::Admin::CloseMeeting.include(Decidim::ReportingProposals::CloseMeetingOverride)
@@ -38,16 +36,12 @@ module Decidim
         Decidim::Budgets::Admin::CreateProject.include(Decidim::ReportingProposals::CreateProjectOverride)
         Decidim::Budgets::Admin::UpdateProject.include(Decidim::ReportingProposals::CreateProjectOverride)
         Decidim::Templates::Admin::UpdateProposalAnswerTemplate.include(Decidim::ReportingProposals::Admin::UpdateProposalAnswerTemplateOverride) if defined?(Decidim::Templates)
-        if defined?(Decidim::Elections::Admin::AnswerForm)
-          Decidim::Elections::Admin::AnswerForm.include(Decidim::ReportingProposals::MapRelatedProposalsForFormOverride)
-          Decidim::Elections::Admin::CreateAnswer.include(Decidim::ReportingProposals::Admin::CreateAnswerOverride)
-          Decidim::Elections::Admin::UpdateAnswer.include(Decidim::ReportingProposals::Admin::CreateAnswerOverride)
-        end
         Decidim::Admin::CategoryForm.include(Decidim::ReportingProposals::Admin::CategoryFormOverride)
         Decidim::Admin::CreateCategory.include(Decidim::ReportingProposals::Admin::CreateCategoryOverride)
         Decidim::Admin::UpdateCategory.include(Decidim::ReportingProposals::Admin::UpdateCategoryOverride)
         Decidim::Proposals::Admin::Permissions.include(Decidim::ReportingProposals::Admin::PermissionsOverride)
         Decidim::ParticipatorySpaceRoleConfig::Valuator.include(Decidim::ReportingProposals::ParticipatorySpaceRoleConfig::ValuatorOverride)
+        Decidim::Templates::Admin::CreateProposalAnswerTemplate.include(Decidim::ReportingProposals::Admin::CreateProposalAnswerTemplateOverride) if defined?(Decidim::Templates)
 
         # port of https://github.com/openpoke/decidim/pull/31,23,29,24,43
         Decidim::ReportedMailer.include(Decidim::ReportingProposals::ReportedMailerOverride)
@@ -92,6 +86,16 @@ module Decidim
         end
       end
 
+      initializer "decidim_reporting_proposals.append_compare_route", after: :append_routes do
+        Decidim::Proposals::Engine.routes.append do
+          resources :proposals, only: [] do
+            member do
+              get :compare
+            end
+          end
+        end
+      end
+
       # controllers and helpers overrides
       initializer "decidim_reporting_proposals.overrides", after: "decidim.action_controller" do
         config.to_prepare do
@@ -103,6 +107,7 @@ module Decidim
           Decidim::Proposals::Admin::ProposalsController.include(Decidim::ReportingProposals::Admin::ProposalsControllerOverride)
           Decidim::Proposals::Admin::ProposalAnswersController.include(Decidim::ReportingProposals::Admin::ProposalAnswersControllerOverride)
           Decidim::Proposals::Admin::ProposalsHelper.include(Decidim::ReportingProposals::Admin::ProposalsHelperOverride)
+          Decidim::Proposals::Admin::ProposalBulkActionsHelper.include(Decidim::ReportingProposals::Admin::ProposalBulkActionsHelperOverride)
 
           # port of https://github.com/openpoke/decidim/pull/24
           Decidim::Proposals::Admin::ValuationAssignmentsController.include(Decidim::ReportingProposals::Admin::ValuationAssignmentsControllerOverride)
@@ -136,14 +141,14 @@ module Decidim
 
       initializer "decidim_reporting_proposals.on_publish_proposals" do
         config.to_prepare do
-          Decidim::EventsManager.subscribe(/decidim.events\.proposals\.(proposal_published|proposal_update_category)/) do |_event_name, data|
+          ActiveSupport::Notifications.subscribe(/decidim.events\.proposals\.(proposal_published|proposal_update_category)/) do |_event_name, data|
             Decidim::ReportingProposals::AssignProposalValuatorsJob.perform_later(data)
           end
         end
       end
 
       initializer "decidim_reporting_proposals.on_hiding_resource" do
-        Decidim::EventsManager.subscribe("decidim.events.reports.resource_hidden") do |_event_name, data|
+        ActiveSupport::Notifications.subscribe("decidim.events.reports.resource_hidden") do |_event_name, data|
           Decidim::ReportingProposals::Admin::HiddenResourceMailer.notify_mail(
             data[:resource], data[:affected_users], data[:extra][:report_reasons]
           ).deliver_later

data/lib/decidim/reporting_proposals/version.rb

@@ -2,8 +2,8 @@
 
 module Decidim
   module ReportingProposals
-    VERSION = "0.6.1"
-    DECIDIM_VERSION = "0.28.1"
-    COMPAT_DECIDIM_VERSION = [">= 0.28.1", "< 0.29"].freeze
+    VERSION = "0.7.1"
+    DECIDIM_VERSION = "0.29.3"
+    COMPAT_DECIDIM_VERSION = [">= 0.29.3", "< 0.30"].freeze
   end
 end