decidim-proposals 0.20.1 → 0.21.0

data/app/controllers/decidim/proposals/admin/valuation_assignments_controller.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class ValuationAssignmentsController < Admin::ApplicationController
+        def create
+          enforce_permission_to :assign_to_valuator, :proposals
+
+          @form = form(Admin::ValuationAssignmentForm).from_params(params)
+
+          Admin::AssignProposalsToValuator.call(@form) do
+            on(:ok) do |_proposal|
+              flash[:notice] = I18n.t("valuation_assignments.create.success", scope: "decidim.proposals.admin")
+              redirect_to EngineRouter.admin_proxy(current_component).root_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("valuation_assignments.create.invalid", scope: "decidim.proposals.admin")
+              redirect_to EngineRouter.admin_proxy(current_component).root_path
+            end
+          end
+        end
+
+        def destroy
+          @form = form(Admin::ValuationAssignmentForm).from_params(destroy_params)
+
+          enforce_permission_to :unassign_from_valuator, :proposals, valuator: @form.valuator_user
+
+          Admin::UnassignProposalsFromValuator.call(@form) do
+            on(:ok) do |_proposal|
+              flash.keep[:notice] = I18n.t("valuation_assignments.delete.success", scope: "decidim.proposals.admin")
+              redirect_back fallback_location: EngineRouter.admin_proxy(current_component).root_path
+            end
+
+            on(:invalid) do
+              flash.keep[:alert] = I18n.t("valuation_assignments.delete.invalid", scope: "decidim.proposals.admin")
+              redirect_back fallback_location: EngineRouter.admin_proxy(current_component).root_path
+            end
+          end
+        end
+
+        private
+
+        def destroy_params
+          {
+            id: params.dig(:valuator_role, :id) || params[:id],
+            proposal_ids: params[:proposal_ids] || [params[:proposal_id]]
+          }
+        end
+
+        def skip_manage_component_permission
+          true
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/proposals/collaborative_drafts_controller.rb

@@ -171,12 +171,28 @@ module Decidim
       def default_filter_params
         {
           search_text: "",
-          category_id: "",
-          state: "open",
-          scope_id: nil,
+          category_id: default_filter_category_params,
+          state: %w(open),
+          scope_id: default_filter_scope_params,
           related_to: ""
         }
       end
+
+      def default_filter_category_params
+        return unless current_component.participatory_space.categories.any?
+
+        ["without"] + current_component.participatory_space.categories.map { |category| category.id.to_s }
+      end
+
+      def default_filter_scope_params
+        return unless current_component.participatory_space.scopes.any?
+
+        if current_component.participatory_space.scope
+          [current_component.participatory_space.scope.id] + current_component.participatory_space.scope.children.map { |scope| scope.id.to_s }
+        else
+          ["global"] + current_component.participatory_space.scopes.map { |scope| scope.id.to_s }
+        end
+      end
     end
   end
 end

data/app/controllers/decidim/proposals/proposals_controller.rb

@@ -13,7 +13,7 @@ module Decidim
       include Decidim::Proposals::Orderable
       include Paginable
 
-      helper_method :form_presenter
+      helper_method :proposal_presenter, :form_presenter
 
       before_action :authenticate_user!, only: [:new, :create, :complete]
       before_action :ensure_is_draft, only: [:compare, :complete, :preview, :publish, :edit_draft, :update_draft, :destroy_draft]
@@ -65,14 +65,14 @@ module Decidim
         if proposal_draft.present?
           redirect_to edit_draft_proposal_path(proposal_draft, component_id: proposal_draft.component.id, question_slug: proposal_draft.component.participatory_space.slug)
         else
-          @form = form(ProposalWizardCreateStepForm).from_params({})
+          @form = form(ProposalWizardCreateStepForm).from_params(body: translated_proposal_body_template)
         end
       end
 
       def create
         enforce_permission_to :create, :proposal
         @step = :step_1
-        @form = form(ProposalWizardCreateStepForm).from_params(params)
+        @form = form(ProposalWizardCreateStepForm).from_params(proposal_creation_params)
 
         CreateProposal.call(@form, current_user) do
           on(:ok) do |proposal|
@@ -212,16 +212,39 @@ module Decidim
       def default_filter_params
         {
           search_text: "",
-          origin: "all",
+          origin: default_filter_origin_params,
           activity: "all",
-          category_id: "",
-          state: "except_rejected",
-          scope_id: nil,
+          category_id: default_filter_category_params,
+          state: %w(accepted evaluating not_answered),
+          scope_id: default_filter_scope_params,
           related_to: "",
           type: "all"
         }
       end
 
+      def default_filter_origin_params
+        filter_origin_params = %w(citizens meeting)
+        filter_origin_params << "official" if component_settings.official_proposals_enabled
+        filter_origin_params << "user_group" if current_organization.user_groups_enabled?
+        filter_origin_params
+      end
+
+      def default_filter_category_params
+        return "all" unless current_component.participatory_space.categories.any?
+
+        ["all"] + current_component.participatory_space.categories.map { |category| category.id.to_s }
+      end
+
+      def default_filter_scope_params
+        return "all" unless current_component.participatory_space.scopes.any?
+
+        if current_component.participatory_space.scope
+          ["all", current_component.participatory_space.scope.id] + current_component.participatory_space.scope.children.map { |scope| scope.id.to_s }
+        else
+          %w(all global) + current_component.participatory_space.scopes.map { |scope| scope.id.to_s }
+        end
+      end
+
       def proposal_draft
         Proposal.from_all_author_identities(current_user).not_hidden.only_amendables
                 .where(component: current_component).find_by(published_at: nil)
@@ -245,6 +268,10 @@ module Decidim
         Proposal.only_visible_emendations_for(current_user, current_component).published.include?(@proposal)
       end
 
+      def proposal_presenter
+        @proposal_presenter ||= present(@proposal)
+      end
+
       def form_proposal_params
         form(ProposalForm).from_params(params)
       end
@@ -271,6 +298,14 @@ module Decidim
       def set_participatory_text
         @participatory_text = Decidim::Proposals::ParticipatoryText.find_by(component: current_component)
       end
+
+      def translated_proposal_body_template
+        translated_attribute component_settings.new_proposal_body_template
+      end
+
+      def proposal_creation_params
+        params[:proposal].merge(body_template: translated_proposal_body_template)
+      end
     end
   end
 end

data/app/controllers/decidim/proposals/versions_controller.rb

@@ -6,13 +6,16 @@ module Decidim
     # has been updated through time.
     class VersionsController < Decidim::Proposals::ApplicationController
       helper Decidim::TraceabilityHelper
+
+      include Decidim::ApplicationHelper
+
       helper_method :current_version, :item
 
       private
 
       def item
         @item ||= if params[:proposal_id]
-                    Proposal.where(component: current_component).find(params[:proposal_id])
+                    present(Proposal.where(component: current_component).find(params[:proposal_id]))
                   else
                     CollaborativeDraft.where(component: current_component).find(params[:collaborative_draft_id])
                   end

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/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/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_wizard_create_step_form.rb

@@ -8,12 +8,14 @@ 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 }
 
       validate :proposal_length
+      validate :body_is_not_bare_template
 
       alias component current_component
 
@@ -32,6 +34,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)
+          options = case filter
+                    when :state_eq
+                      content_tag(:li, filter_link_value(:state_null, true))
+                    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

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

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # This class contains helpers needed to get rankings for a given proposal
+      # ordered by some given criteria.
+      #
+      module ProposalRankingsHelper
+        # Public: Gets the ranking for a given proposal, ordered by some given
+        # criteria. Proposal is sorted amongst its own siblings.
+        #
+        # Returns a Hash with two keys:
+        #   :ranking - an Integer representing the ranking for the given proposal.
+        #     Ranking starts with 1.
+        #   :total - an Integer representing the total number of ranked proposals.
+        #
+        # Examples:
+        #   ranking_for(proposal, proposal_votes_count: :desc)
+        #   ranking_for(proposal, proposal_endorsements_count: :desc)
+        def ranking_for(proposal, order = {})
+          siblings = Decidim::Proposals::Proposal.where(component: proposal.component)
+          ranked = siblings.order([order, id: :asc])
+          ranked_ids = ranked.pluck(:id)
+
+          { ranking: ranked_ids.index(proposal.id) + 1, total: ranked_ids.count }
+        end
+
+        # Public: Gets the ranking for a given proposal, ordered by endorsements.
+        def endorsements_ranking_for(proposal)
+          ranking_for(proposal, proposal_endorsements_count: :desc)
+        end
+
+        # Public: Gets the ranking for a given proposal, ordered by votes.
+        def votes_ranking_for(proposal)
+          ranking_for(proposal, proposal_votes_count: :desc)
+        end
+
+        def i18n_endorsements_ranking_for(proposal)
+          rankings = endorsements_ranking_for(proposal)
+
+          I18n.t(
+            "ranking",
+            scope: "decidim.proposals.admin.proposals.show",
+            ranking: rankings[:ranking],
+            total: rankings[:total]
+          )
+        end
+
+        def i18n_votes_ranking_for(proposal)
+          rankings = votes_ranking_for(proposal)
+
+          I18n.t(
+            "ranking",
+            scope: "decidim.proposals.admin.proposals.show",
+            ranking: rankings[:ranking],
+            total: rankings[:total]
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -14,6 +14,128 @@ module Decidim
 
           @meetings_as_authors_selected ||= @proposal.authors.pluck(:id)
         end
+
+        def coauthor_presenters_for(proposal)
+          proposal.authors.map do |identity|
+            if identity.is_a?(Decidim::Organization)
+              Decidim::Proposals::OfficialAuthorPresenter.new
+            else
+              present(identity)
+            end
+          end
+        end
+
+        def endorsers_presenters_for(proposal)
+          proposal.endorsements.for_listing.map { |identity| present(identity.normalized_author) }
+        end
+
+        def proposal_complete_state(proposal)
+          state = humanize_proposal_state(proposal.state)
+          state += " (#{humanize_proposal_state(proposal.internal_state)})" if proposal.answered? && !proposal.published_state?
+          state.html_safe
+        end
+
+        def proposals_admin_filter_tree
+          {
+            t("proposals.filters.type", scope: "decidim.proposals") => {
+              link_to(t("proposals", scope: "decidim.proposals.application_helper.filter_type_values"), q: ransak_params_for_query(is_emendation_true: "0"),
+                                                                                                        per_page: per_page) => nil,
+              link_to(t("amendments", scope: "decidim.proposals.application_helper.filter_type_values"), q: ransak_params_for_query(is_emendation_true: "1"),
+                                                                                                         per_page: per_page) => nil
+            },
+            t("models.proposal.fields.state", scope: "decidim.proposals") =>
+              Decidim::Proposals::Proposal::POSSIBLE_STATES.each_with_object({}) do |state, hash|
+                if state == "not_answered"
+                  hash[link_to((humanize_proposal_state state), q: ransak_params_for_query(state_null: 1), per_page: per_page)] = nil
+                else
+                  hash[link_to((humanize_proposal_state state), q: ransak_params_for_query(state_eq: state), per_page: per_page)] = nil
+                end
+              end,
+            t("models.proposal.fields.category", scope: "decidim.proposals") => admin_filter_categories_tree(categories.first_class),
+            t("proposals.filters.scope", scope: "decidim.proposals") => admin_filter_scopes_tree(current_component.organization.id)
+          }
+        end
+
+        def proposals_admin_search_hidden_params
+          return unless params[:q]
+
+          tags = ""
+          tags += hidden_field_tag "per_page", params[:per_page] if params[:per_page]
+          tags += hidden_field_tag "q[is_emendation_true]", params[:q][:is_emendation_true] if params[:q][:is_emendation_true]
+          tags += hidden_field_tag "q[state_eq]", params[:q][:state_eq] if params[:q][:state_eq]
+          tags += hidden_field_tag "q[category_id_eq]", params[:q][:category_id_eq] if params[:q][:category_id_eq]
+          tags += hidden_field_tag "q[scope_id_eq]", params[:q][:scope_id_eq] if params[:q][:scope_id_eq]
+          tags.html_safe
+        end
+
+        def proposals_admin_filter_applied_filters
+          html = []
+          if params[:q][:is_emendation_true].present?
+            html << content_tag(:span, class: "label secondary") do
+              tag = "#{t("filters.type", scope: "decidim.proposals.proposals")}: "
+              tag += if params[:q][:is_emendation_true].to_s == "1"
+                       t("amendments", scope: "decidim.proposals.application_helper.filter_type_values")
+                     else
+                       t("proposals", scope: "decidim.proposals.application_helper.filter_type_values")
+                     end
+              tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:is_emendation_true), per_page: per_page), t("decidim.admin.actions.cancel"),
+                                  class: "action-icon--remove")
+              tag.html_safe
+            end
+          end
+          if params[:q][:state_null]
+            html << content_tag(:span, class: "label secondary") do
+              tag = "#{t("models.proposal.fields.state", scope: "decidim.proposals")}: "
+              tag += humanize_proposal_state "not_answered"
+              tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:state_null), per_page: per_page), t("decidim.admin.actions.cancel"),
+                                  class: "action-icon--remove")
+              tag.html_safe
+            end
+          end
+          if params[:q][:state_eq]
+            html << content_tag(:span, class: "label secondary") do
+              tag = "#{t("models.proposal.fields.state", scope: "decidim.proposals")}: "
+              tag += humanize_proposal_state params[:q][:state_eq]
+              tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:state_eq), per_page: per_page), t("decidim.admin.actions.cancel"),
+                                  class: "action-icon--remove")
+              tag.html_safe
+            end
+          end
+          if params[:q][:category_id_eq]
+            html << content_tag(:span, class: "label secondary") do
+              tag = "#{t("models.proposal.fields.category", scope: "decidim.proposals")}: "
+              tag += translated_attribute categories.find(params[:q][:category_id_eq]).name
+              tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:category_id_eq), per_page: per_page), t("decidim.admin.actions.cancel"),
+                                  class: "action-icon--remove")
+              tag.html_safe
+            end
+          end
+          if params[:q][:scope_id_eq]
+            html << content_tag(:span, class: "label secondary") do
+              tag = "#{t("models.proposal.fields.scope", scope: "decidim.proposals")}: "
+              tag += translated_attribute Decidim::Scope.where(decidim_organization_id: current_component.organization.id).find(params[:q][:scope_id_eq]).name
+              tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:scope_id_eq), per_page: per_page), t("decidim.admin.actions.cancel"),
+                                  class: "action-icon--remove")
+              tag.html_safe
+            end
+          end
+          html.join(" ").html_safe
+        end
+
+        def icon_with_link_to_proposal(proposal)
+          icon, tooltip = if allowed_to?(:create, :proposal_answer, proposal: proposal) && !proposal.emendation?
+                            [
+                              "comment-square",
+                              t(:answer_proposal, scope: "decidim.proposals.actions")
+                            ]
+                          else
+                            [
+                              "info",
+                              t(:show, scope: "decidim.proposals.actions")
+                            ]
+                          end
+          icon_link_to(icon, proposal_path(proposal), tooltip, class: "icon--small action-icon--show-proposal")
+        end
       end
     end
   end