decidim-proposals 0.19.0 → 0.22.0

data/app/events/decidim/proposals/admin/update_proposal_scope_event.rb

@@ -0,0 +1,11 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class UpdateProposalScopeEvent < Decidim::Events::SimpleEvent
+        include Decidim::Events::AuthorEvent
+      end
+    end
+  end
+end

data/app/forms/decidim/proposals/admin/participatory_text_proposal_form.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A form object to be used when admin users want to create a proposal
+      # through the participatory texts.
+      class ParticipatoryTextProposalForm < Admin::ProposalBaseForm
+        validates :title, length: { maximum: 150 }
+      end
+    end
+  end
+end

data/app/forms/decidim/proposals/admin/preview_participatory_text_form.rb

@@ -6,11 +6,11 @@ module Decidim
       # A form object to be used when admin users want to review a collection of proposals
       # from a participatory text.
       class PreviewParticipatoryTextForm < Decidim::Form
-        attribute :proposals, Array[Decidim::Proposals::Admin::ProposalForm]
+        attribute :proposals, Array[Decidim::Proposals::Admin::ParticipatoryTextProposalForm]
 
         def from_models(proposals)
           self.proposals = proposals.collect do |proposal|
-            ProposalForm.from_model(proposal)
+            Admin::ParticipatoryTextProposalForm.from_model(proposal)
           end
         end
 

data/app/forms/decidim/proposals/admin/proposal_answer_form.rb

@@ -9,10 +9,35 @@ module Decidim
         mimic :proposal_answer
 
         translatable_attribute :answer, String
-        attribute :state, String
+        translatable_attribute :cost_report, String
+        translatable_attribute :execution_period, String
+        attribute :cost, Float
+        attribute :internal_state, String
 
-        validates :state, presence: true, inclusion: { in: %w(accepted rejected evaluating) }
+        validates :internal_state, presence: true, inclusion: { in: %w(accepted rejected evaluating) }
         validates :answer, translatable_presence: true, if: ->(form) { form.state == "rejected" }
+
+        with_options if: :costs_required? do
+          validates :cost, numericality: true, presence: true
+          validates :cost_report, translatable_presence: true
+          validates :execution_period, translatable_presence: true
+        end
+
+        alias state internal_state
+
+        def costs_required?
+          costs_enabled? && state == "accepted"
+        end
+
+        def publish_answer?
+          current_component.current_settings.publish_answers_immediately?
+        end
+
+        private
+
+        def costs_enabled?
+          current_component.current_settings.answers_with_costs?
+        end
       end
     end
   end

data/app/forms/decidim/proposals/admin/proposal_base_form.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A form object to be used when admin users want to create a proposal.
+      class ProposalBaseForm < Decidim::Form
+        include Decidim::ApplicationHelper
+        mimic :proposal
+
+        attribute :title, String
+        attribute :body, String
+        attribute :address, String
+        attribute :latitude, Float
+        attribute :longitude, Float
+        attribute :category_id, Integer
+        attribute :scope_id, Integer
+        attribute :attachment, AttachmentForm
+        attribute :position, Integer
+        attribute :created_in_meeting, Boolean
+        attribute :meeting_id, Integer
+        attribute :suggested_hashtags, Array[String]
+        attribute :photos, Array[String]
+        attribute :add_photos, Array
+
+        validates :title, :body, presence: true
+        validates :address, geocoding: true, if: -> { current_component.settings.geocoding_enabled? }
+        validates :category, presence: true, if: ->(form) { form.category_id.present? }
+        validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
+        validates :meeting_as_author, presence: true, if: ->(form) { form.created_in_meeting? }
+
+        validate :scope_belongs_to_participatory_space_scope
+
+        validate :notify_missing_attachment_if_errored
+
+        delegate :categories, to: :current_component
+
+        def map_model(model)
+          return unless model.categorization
+
+          self.category_id = model.categorization.decidim_category_id
+          self.scope_id = model.decidim_scope_id
+
+          @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(model.body).extra_hashtags.map(&:name).map(&:downcase)
+        end
+
+        alias component current_component
+
+        # Finds the Category from the category_id.
+        #
+        # Returns a Decidim::Category
+        def category
+          @category ||= categories.find_by(id: category_id)
+        end
+
+        # Finds the Scope from the given decidim_scope_id, uses participatory space scope if missing.
+        #
+        # Returns a Decidim::Scope
+        def scope
+          @scope ||= @scope_id ? current_participatory_space.scopes.find_by(id: @scope_id) : current_participatory_space.scope
+        end
+
+        # Scope identifier
+        #
+        # Returns the scope identifier related to the proposal
+        def scope_id
+          @scope_id || scope&.id
+        end
+
+        # Finds the Meetings of the current participatory space
+        def meetings
+          @meetings ||= Decidim.find_resource_manifest(:meetings).try(:resource_scope, current_component)
+                               &.order(title: :asc)
+        end
+
+        # Return the meeting as author
+        def meeting_as_author
+          @meeting_as_author ||= meetings.find_by(id: meeting_id)
+        end
+
+        def author
+          return current_organization unless created_in_meeting?
+
+          meeting_as_author
+        end
+
+        def extra_hashtags
+          @extra_hashtags ||= (component_automatic_hashtags + suggested_hashtags).uniq
+        end
+
+        def suggested_hashtags
+          downcased_suggested_hashtags = Array(@suggested_hashtags&.map(&:downcase)).to_set
+          component_suggested_hashtags.select { |hashtag| downcased_suggested_hashtags.member?(hashtag.downcase) }
+        end
+
+        def suggested_hashtag_checked?(hashtag)
+          suggested_hashtags.member?(hashtag)
+        end
+
+        def component_automatic_hashtags
+          @component_automatic_hashtags ||= ordered_hashtag_list(current_component.current_settings.automatic_hashtags)
+        end
+
+        def component_suggested_hashtags
+          @component_suggested_hashtags ||= ordered_hashtag_list(current_component.current_settings.suggested_hashtags)
+        end
+
+        private
+
+        def scope_belongs_to_participatory_space_scope
+          errors.add(:scope_id, :invalid) if current_participatory_space.out_of_scope?(scope)
+        end
+
+        # This method will add an error to the `attachment` field only if there's
+        # any error in any other field. This is needed because when the form has
+        # an error, the attachment is lost, so we need a way to inform the user of
+        # this problem.
+        def notify_missing_attachment_if_errored
+          errors.add(:attachment, :needs_to_be_reattached) if errors.any? && attachment.present?
+          errors.add(:add_photos, :needs_to_be_reattached) if errors.any? && add_photos.present?
+        end
+
+        def ordered_hashtag_list(string)
+          string.to_s.split.reject(&:blank?).uniq.sort_by(&:parameterize)
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/proposals/admin/proposal_form.rb

@@ -4,126 +4,8 @@ module Decidim
   module Proposals
     module Admin
       # A form object to be used when admin users want to create a proposal.
-      class ProposalForm < Decidim::Form
-        include Decidim::ApplicationHelper
-        mimic :proposal
-
-        attribute :title, String
-        attribute :body, String
-        attribute :address, String
-        attribute :latitude, Float
-        attribute :longitude, Float
-        attribute :category_id, Integer
-        attribute :scope_id, Integer
-        attribute :attachment, AttachmentForm
-        attribute :position, Integer
-        attribute :created_in_meeting, Boolean
-        attribute :meeting_id, Integer
-        attribute :suggested_hashtags, Array[String]
-        attribute :photos, Array[String]
-        attribute :add_photos, Array
-
-        validates :title, :body, presence: true
-        validates :title, length: { maximum: 150 }
-        validates :address, geocoding: true, if: -> { current_component.settings.geocoding_enabled? }
-        validates :category, presence: true, if: ->(form) { form.category_id.present? }
-        validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
-        validates :meeting_as_author, presence: true, if: ->(form) { form.created_in_meeting? }
-
-        validate :scope_belongs_to_participatory_space_scope
-
-        validate :notify_missing_attachment_if_errored
-
-        delegate :categories, to: :current_component
-
-        def map_model(model)
-          return unless model.categorization
-
-          self.category_id = model.categorization.decidim_category_id
-          self.scope_id = model.decidim_scope_id
-
-          @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(model.body).extra_hashtags.map(&:name).map(&:downcase)
-        end
-
-        alias component current_component
-
-        # Finds the Category from the category_id.
-        #
-        # Returns a Decidim::Category
-        def category
-          @category ||= categories.find_by(id: category_id)
-        end
-
-        # Finds the Scope from the given decidim_scope_id, uses participatory space scope if missing.
-        #
-        # Returns a Decidim::Scope
-        def scope
-          @scope ||= @scope_id ? current_participatory_space.scopes.find_by(id: @scope_id) : current_participatory_space.scope
-        end
-
-        # Scope identifier
-        #
-        # Returns the scope identifier related to the proposal
-        def scope_id
-          @scope_id || scope&.id
-        end
-
-        # Finds the Meetings of the current participatory space
-        def meetings
-          @meetings ||= Decidim.find_resource_manifest(:meetings).try(:resource_scope, current_component)
-                               &.order(title: :asc)
-        end
-
-        # Return the meeting as author
-        def meeting_as_author
-          @meeting_as_author ||= meetings.find_by(id: meeting_id)
-        end
-
-        def author
-          return current_organization unless created_in_meeting?
-
-          meeting_as_author
-        end
-
-        def extra_hashtags
-          @extra_hashtags ||= (component_automatic_hashtags + suggested_hashtags).uniq
-        end
-
-        def suggested_hashtags
-          downcased_suggested_hashtags = Array(@suggested_hashtags&.map(&:downcase)).to_set
-          component_suggested_hashtags.select { |hashtag| downcased_suggested_hashtags.member?(hashtag.downcase) }
-        end
-
-        def suggested_hashtag_checked?(hashtag)
-          suggested_hashtags.member?(hashtag)
-        end
-
-        def component_automatic_hashtags
-          @component_automatic_hashtags ||= ordered_hashtag_list(current_component.current_settings.automatic_hashtags)
-        end
-
-        def component_suggested_hashtags
-          @component_suggested_hashtags ||= ordered_hashtag_list(current_component.current_settings.suggested_hashtags)
-        end
-
-        private
-
-        def scope_belongs_to_participatory_space_scope
-          errors.add(:scope_id, :invalid) if current_participatory_space.out_of_scope?(scope)
-        end
-
-        # This method will add an error to the `attachment` field only if there's
-        # any error in any other field. This is needed because when the form has
-        # an error, the attachment is lost, so we need a way to inform the user of
-        # this problem.
-        def notify_missing_attachment_if_errored
-          errors.add(:attachment, :needs_to_be_reattached) if errors.any? && attachment.present?
-          errors.add(:add_photos, :needs_to_be_reattached) if errors.any? && add_photos.present?
-        end
-
-        def ordered_hashtag_list(string)
-          string.to_s.split.reject(&:blank?).uniq.sort_by(&:parameterize)
-        end
+      class ProposalForm < Admin::ProposalBaseForm
+        validates :title, length: { in: 15..150 }
       end
     end
   end

data/app/forms/decidim/proposals/admin/valuation_assignment_form.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class ValuationAssignmentForm < Decidim::Form
+        mimic :valuator_role
+
+        attribute :id, Integer
+        attribute :proposal_ids, Array
+
+        validates :valuator_role, :proposals, :current_component, presence: true
+        validate :same_participatory_space
+
+        def proposals
+          @proposals ||= Decidim::Proposals::Proposal.where(component: current_component, id: proposal_ids).uniq
+        end
+
+        def valuator_role
+          @valuator_role ||= current_component.participatory_space.user_roles(:valuator).find_by(id: id)
+        end
+
+        def valuator_user
+          return unless valuator_role
+
+          @valuator_user ||= valuator_role.user
+        end
+
+        def same_participatory_space
+          return if !valuator_role || !current_component
+
+          errors.add(:id, :invalid) if current_component.participatory_space != valuator_role.participatory_space
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/proposals/proposal_form.rb

@@ -30,6 +30,10 @@ module Decidim
         super
 
         @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(model.body).extra_hashtags.map(&:name).map(&:downcase)
+
+        # The scope attribute is with different key (decidim_scope_id), so it
+        # has to be manually mapped.
+        self.scope_id = model.scope.id if model.scope
       end
 
       # Finds the Category from the category_id.

data/app/forms/decidim/proposals/proposal_wizard_create_step_form.rb

@@ -8,12 +8,18 @@ module Decidim
 
       attribute :title, String
       attribute :body, String
+      attribute :body_template, String
       attribute :user_group_id, Integer
 
       validates :title, :body, presence: true, etiquette: true
-      validates :title, length: { maximum: 150 }
+      validates :title, length: { in: 15..150 }
+      validates :body, proposal_length: {
+        minimum: 15,
+        maximum: ->(record) { record.component.settings.proposal_length }
+      }
 
       validate :proposal_length
+      validate :body_is_not_bare_template
 
       alias component current_component
 
@@ -32,6 +38,12 @@ module Decidim
         length = current_component.settings.proposal_length
         errors.add(:body, :too_long, count: length) if body.length > length
       end
+
+      def body_is_not_bare_template
+        return if body_template.blank?
+
+        errors.add(:body, :cant_be_equal_to_template) if body.presence == body_template.presence
+      end
     end
   end
 end

data/app/helpers/decidim/proposals/admin/filterable_helper.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      module FilterableHelper
+        def extra_dropdown_submenu_options_items(filter, i18n_scope)
+          options = case filter
+                    when :state_eq
+                      content_tag(:li, filter_link_value(:state_null, true, i18n_scope))
+                    end
+          [options].compact
+        end
+      end
+    end
+  end
+end

data/app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      module ProposalBulkActionsHelper
+        # Public: Generates a select field with the valuators of the given participatory space.
+        #
+        # participatory_space - A participatory space instance.
+        # prompt - An i18n string to show as prompt
+        #
+        # Returns a String.
+        def bulk_valuators_select(participatory_space, prompt)
+          options_for_select = find_valuators_for_select(participatory_space)
+          select(:valuator_role, :id, options_for_select, prompt: prompt)
+        end
+
+        # Internal: A method to cache to queries to find the valuators for the
+        # current space.
+        def find_valuators_for_select(participatory_space)
+          return @valuators_for_select if @valuators_for_select
+
+          valuator_roles = participatory_space.user_roles(:valuator)
+          valuators = Decidim::User.where(id: valuator_roles.pluck(:decidim_user_id)).to_a
+
+          @valuators_for_select = valuator_roles.map do |role|
+            valuator = valuators.find { |user| user.id == role.decidim_user_id }
+
+            [valuator.name, role.id]
+          end
+        end
+      end
+    end
+  end
+end