decidim-reporting_proposals 0.2.0 → 0.5.0

data/app/commands/decidim/templates/admin/create_proposal_answer_template.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Templates
+    module Admin
+      class CreateProposalAnswerTemplate < Decidim::Command
+        # Initializes the command.
+        #
+        # form - The source for this ProposalAnswerTemplate.
+        def initialize(form)
+          @form = form
+        end
+
+        def call
+          return broadcast(:invalid) unless @form.valid?
+
+          @template = Decidim.traceability.create!(
+            Template,
+            @form.current_user,
+            name: @form.name,
+            description: @form.description,
+            organization: @form.current_organization,
+            field_values: { internal_state: @form.internal_state },
+            target: :proposal_answer
+          )
+
+          resource = identify_templateable_resource
+          @template.update!(templatable: resource)
+
+          broadcast(:ok, @template)
+        end
+
+        private
+
+        def identify_templateable_resource
+          resource = @form.scope_for_availability.split("-")
+          case resource.first
+          when "organizations"
+            @form.current_organization
+          when "components"
+            component = Decidim::Component.find_by(id: resource.last)
+            component&.participatory_space&.decidim_organization_id == @form.current_organization.id ? component : nil
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/templates/admin/update_proposal_answer_template.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Templates
+    module Admin
+      class UpdateProposalAnswerTemplate < Decidim::Command
+        # Initializes the command.
+        #
+        # template - The Template to update.
+        # form        - The form object containing the data to update.
+        # user        - The user that updates the template.
+        def initialize(template, form, user)
+          @template = template
+          @form = form
+          @user = user
+        end
+
+        def call
+          return broadcast(:invalid) unless @form.valid?
+          return broadcast(:invalid) unless @user.organization == @template.organization
+
+          @template = Decidim.traceability.update!(
+            @template,
+            @user,
+            name: @form.name,
+            description: @form.description,
+            field_values: { internal_state: @form.internal_state },
+            target: :proposal_answer
+          )
+
+          resource = identify_templateable_resource
+          @template.update!(templatable: resource)
+
+          broadcast(:ok, @template)
+        end
+
+        private
+
+        def identify_templateable_resource
+          resource = @form.scope_for_availability.split("-")
+          case resource.first
+          when "organizations"
+            @form.current_organization
+          when "components"
+            component = Decidim::Component.find_by(id: resource.last)
+            component&.participatory_space&.decidim_organization_id == @form.current_organization.id ? component : nil
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/proposals/admin/valuation_assignments_controller_override.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      module ValuationAssignmentsControllerOverride
+        extend ActiveSupport::Concern
+
+        included do
+          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 after_add_evaluator_url
+              end
+
+              on(:invalid) do
+                flash.now[:alert] = I18n.t("valuation_assignments.create.invalid", scope: "decidim.proposals.admin")
+                redirect_to after_add_evaluator_url
+              end
+            end
+          end
+
+          def after_add_evaluator_url
+            return request.referer if request.referer.present? && request.referer =~ %r{manage/proposals/[0-9]+}
+
+            EngineRouter.admin_proxy(current_component).root_path
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/reporting_proposals/admin/needs_header_snippets.rb

@@ -36,13 +36,11 @@ module Decidim
         end
 
         def current_component
-          @current_component ||= begin
-            if defined?(query_scope) && query_scope.respond_to?(:find)
-              query_scope.find_by(id: params[:id])
-            elsif params.has_key?(:component_id)
-              Decidim::Component.find_by(id: params[:component_id])
-            end
-          end
+          @current_component ||= if defined?(query_scope) && query_scope.respond_to?(:find)
+                                   query_scope.find_by(id: params[:id])
+                                 elsif params.has_key?(:component_id)
+                                   Decidim::Component.find_by(id: params[:component_id])
+                                 end
         end
       end
     end

data/app/controllers/concerns/decidim/reporting_proposals/needs_proposal_extra_validations_snippets.rb

@@ -16,7 +16,7 @@ module Decidim
         unless @snippets.any?(:reporting_proposals_js_validations)
           @snippets.add(:reporting_proposals_js_validations, ActionController::Base.helpers.javascript_pack_tag("decidim_reporting_proposals_js_validations"))
           @snippets.add(:reporting_proposals_js_validations, rules_tag)
-          @snippets.add(:head, @snippets.for(:reporting_proposals_js_validations))
+          @snippets.add(:foot, @snippets.for(:reporting_proposals_js_validations))
         end
         @snippets
       end

data/app/controllers/concerns/decidim/reporting_proposals/proposals_controller_override.rb

@@ -12,7 +12,7 @@ module Decidim
 
         def new
           enforce_permission_to :create, :proposal
-          @step = :step_1
+          @step = Proposals::ProposalsController::STEP1
           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
@@ -22,7 +22,7 @@ module Decidim
 
         def create
           enforce_permission_to :create, :proposal
-          @step = :step_1
+          @step = Proposals::ProposalsController::STEP1
           @form = form(new_proposal_form).from_params(proposal_creation_params)
 
           create_proposal_command.call(@form, current_user) do
@@ -42,7 +42,7 @@ module Decidim
         # change comparison class if geocoding comparison is enabled
         def compare
           enforce_permission_to :edit, :proposal, proposal: @proposal
-          @step = :step_2
+          @step = Proposals::ProposalsController::STEP2
           klass = if geocoding_comparison?
                     Decidim::ReportingProposals::NearbyProposals
                   else
@@ -61,7 +61,7 @@ module Decidim
         # disable this step for reporting proposals
         def complete
           enforce_permission_to :edit, :proposal, proposal: @proposal
-          @step = :step_3
+          @step = Proposals::ProposalsController::STEP3
 
           @form = form_proposal_model
 
@@ -71,7 +71,7 @@ module Decidim
         end
 
         def edit_draft
-          @step = reporting_proposal? ? :step_1 : :step_3
+          @step = reporting_proposal? ? Proposals::ProposalsController::STEP1 : Proposals::ProposalsController::STEP3
           enforce_permission_to :edit, :proposal, proposal: @proposal
         end
 

data/app/controllers/concerns/decidim/templates/admin/application_controller_override.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Templates
+    module Admin
+      module ApplicationControllerOverride
+        extend ActiveSupport::Concern
+
+        included do
+          def template_types
+            @template_types ||= {
+              I18n.t("template_types.questionnaires", scope: "decidim.templates") => decidim_admin_templates.questionnaire_templates_path,
+              I18n.t("template_types.proposal_answer_templates", scope: "decidim.templates") => decidim_admin_templates.proposal_answer_templates_path
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/reporting_proposals/admin/proposal_notes_controller.rb

@@ -6,11 +6,6 @@ module Decidim
       class ProposalNotesController < Admin::ApplicationController
         helper_method :note
 
-        def edit
-          enforce_permission_to :edit_note, :proposal_note, proposal_note: note
-          @notes_form = form(Decidim::Proposals::Admin::ProposalNoteForm).from_model(note)
-        end
-
         def update
           enforce_permission_to :edit_note, :proposal_note, proposal_note: note
           @notes_form = form(Decidim::Proposals::Admin::ProposalNoteForm).from_params(params)
@@ -27,6 +22,10 @@ module Decidim
           end
         end
 
+        def current_component
+          note&.proposal&.component
+        end
+
         private
 
         def note

data/app/controllers/decidim/templates/admin/proposal_answer_templates_controller.rb

@@ -0,0 +1,179 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Templates
+    module Admin
+      class ProposalAnswerTemplatesController < Decidim::Templates::Admin::ApplicationController
+        include Decidim::TranslatableAttributes
+        include Decidim::Paginable
+
+        helper_method :availability_option_as_text, :availability_options_for_select
+
+        rescue_from ActiveRecord::RecordNotFound do |exception|
+          if request.xhr?
+            render json: { msg: I18n.t("templates.fetch.error", scope: "decidim.admin"), error: exception.message }, status: :unprocessable_entity
+          else
+            throw exception
+          end
+        end
+
+        def new
+          enforce_permission_to :create, :template
+          @form = form(ProposalAnswerTemplateForm).instance
+        end
+
+        def edit
+          enforce_permission_to :update, :template, template: template
+          @form = form(ProposalAnswerTemplateForm).from_model(template)
+        end
+
+        def create
+          enforce_permission_to :create, :template
+
+          @form = form(ProposalAnswerTemplateForm).from_params(params)
+
+          CreateProposalAnswerTemplate.call(@form) do
+            on(:ok) do |_template|
+              flash[:notice] = I18n.t("templates.create.success", scope: "decidim.admin")
+              redirect_to proposal_answer_templates_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("templates.create.error", scope: "decidim.admin")
+              render :new
+            end
+          end
+        end
+
+        def destroy
+          enforce_permission_to :destroy, :template, template: template
+
+          DestroyTemplate.call(template, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("templates.destroy.success", scope: "decidim.admin")
+              redirect_to action: :index
+            end
+          end
+        end
+
+        def fetch
+          enforce_permission_to :read, :template, template: template
+
+          response_object = {
+            state: template.field_values["internal_state"],
+            template: populate_template_interpolations(proposal)
+          }
+
+          respond_to do |format|
+            format.json do
+              render json: response_object.to_json
+            end
+          end
+        end
+
+        def update
+          enforce_permission_to :update, :template, template: template
+          @form = form(ProposalAnswerTemplateForm).from_params(params)
+          UpdateProposalAnswerTemplate.call(template, @form, current_user) do
+            on(:ok) do |_questionnaire_template|
+              flash[:notice] = I18n.t("templates.update.success", scope: "decidim.admin")
+              redirect_to proposal_answer_templates_path
+            end
+
+            on(:invalid) do |template|
+              @template = template
+              flash.now[:error] = I18n.t("templates.update.error", scope: "decidim.admin")
+              render action: :edit
+            end
+          end
+        end
+
+        def copy
+          enforce_permission_to :copy, :template
+
+          CopyProposalAnswerTemplate.call(template) do
+            on(:ok) do
+              flash[:notice] = I18n.t("templates.copy.success", scope: "decidim.admin")
+              redirect_to action: :index
+            end
+
+            on(:invalid) do
+              flash[:alert] = I18n.t("templates.copy.error", scope: "decidim.admin")
+              redirect_to action: :index
+            end
+          end
+        end
+
+        def index
+          enforce_permission_to :index, :templates
+          @templates = collection
+
+          respond_to do |format|
+            format.html { render :index }
+            format.json do
+              term = params[:term]
+
+              @templates = search(term)
+
+              render json: @templates.map { |t| { value: t.id, label: translated_attribute(t.name) } }
+            end
+          end
+        end
+
+        private
+
+        def populate_template_interpolations(proposal)
+          template.description do |language, value|
+            value.gsub!("%{organization}", proposal.organization.name)
+            value.gsub!("%{name}", proposal.creator_author.name)
+            value.gsub!("%{admin}", current_user.name)
+
+            [language, value]
+          end
+        end
+
+        def proposal
+          @proposal ||= Decidim::Proposals::Proposal.find(params[:proposal_id])
+        end
+
+        def availability_option_as_text(template)
+          return unless template.templatable_type
+
+          key = "#{template.templatable_type.demodulize.tableize}-#{template.templatable_id}"
+          avaliablity_options[key].presence || t("templates.missing_resource", scope: "decidim.admin")
+        end
+
+        def availability_options_for_select
+          avaliablity_options.collect { |key, value| [value, key] }.to_a
+        end
+
+        def avaliablity_options
+          @avaliablity_options = {}
+          Decidim::Component.includes(:participatory_space).where(manifest_name: accepted_components)
+                            .select { |a| a.participatory_space&.decidim_organization_id == current_organization.id }.each do |component|
+            @avaliablity_options["components-#{component.id}"] = formated_name(component)
+          end
+          global_scope = { "organizations-#{current_organization.id}" => t("global_scope", scope: "decidim.templates.admin.proposal_answer_templates.index") }
+          @avaliablity_options = global_scope.merge(@avaliablity_options.sort_by { |_, val| val }.to_h)
+        end
+
+        def formated_name(component)
+          space_type = t(component.participatory_space.class.name.underscore, scope: "activerecord.models", count: 1)
+          "#{space_type}: #{translated_attribute(component.participatory_space.title)} > #{translated_attribute(component.name)}"
+        end
+
+        def accepted_components
+          [:proposals]
+        end
+
+        def template
+          @template ||= Template.find(params[:id])
+        end
+
+        def collection
+          @collection ||= paginate(current_organization.templates.where(target: :proposal_answer).order(:id))
+        end
+      end
+    end
+  end
+end

data/app/events/concerns/decidim/proposals/publish_proposal_event_override.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module PublishProposalEventOverride
+      extend ActiveSupport::Concern
+
+      included do
+        def i18n_options
+          return super if author.blank?
+
+          author_path = link_to("@#{author.nickname}", profile_path(author.nickname))
+          author_string = "#{author.name} #{author_path}"
+          super.merge({ author: author_string })
+          resource_admin_url ||= Decidim::ResourceLocatorPresenter.new(resource).admin_url
+          resource_admin_path = link_to(I18n.t(".admin_panel", scope: i18n_scope), resource_admin_url)
+
+          super.merge({ author: author_string, admin_url: resource_admin_path })
+        end
+
+        private
+
+        def i18n_scope
+          return super unless participatory_space_event?
+
+          @i18n_scope ||= if extra[:type].to_s == "admin"
+                            "decidim.events.proposals.proposal_published_for_admin"
+                          else
+                            "decidim.events.proposals.proposal_published_for_space"
+                          end
+        end
+      end
+    end
+  end
+end

data/app/forms/concerns/decidim/reporting_proposals/close_meeting_form_override.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    module CloseMeetingFormOverride
+      extend ActiveSupport::Concern
+
+      included do
+        alias_method :map_model_original, :map_model
+
+        def map_model(model)
+          map_model_original(model)
+          self.proposal_ids += model.linked_resources(:reporting_proposals, "proposals_from_meeting").pluck(:id)
+        end
+
+        def proposals
+          @proposals ||= begin
+            proposals_query = Decidim.find_resource_manifest(:proposals).try(:resource_scope, current_component)
+            reporting_proposals_query = Decidim.find_resource_manifest(:reporting_proposals).try(:resource_scope, current_component)
+            (reporting_proposals_query ? proposals_query.or(reporting_proposals_query) : proposals_query)
+              &.where(id: proposal_ids)
+              &.order(title: :asc)
+          end
+        end
+      end
+    end
+  end
+end

data/app/forms/concerns/decidim/reporting_proposals/form_builder_override.rb

@@ -10,21 +10,22 @@ module Decidim
       delegate :asset_pack_path, to: :@template
 
       included do
-        def file_field(object_name, method, options = {})
-          return super(object_name, method, options) unless use_camera_button?(object_name)
+        def file_field(object_name, options = {})
+          return super(object_name, options) unless use_camera_button?(object_name)
 
-          unless @template.snippets.any?(:reporting_proposals_camera_addons)
-            @template.snippets.add(:reporting_proposals_camera_addons, @template.javascript_pack_tag("decidim_reporting_proposals_camera"))
-            @template.snippets.add(:reporting_proposals_camera_addons, @template.stylesheet_pack_tag("decidim_reporting_proposals_camera"))
+          unless @template.snippets.any?(:reporting_proposals_camera_scripts) || @template.snippets.any?(:reporting_proposals_camera_styles)
+            @template.snippets.add(:reporting_proposals_camera_scripts, @template.javascript_pack_tag("decidim_reporting_proposals_camera"))
+            @template.snippets.add(:reporting_proposals_camera_styles, @template.stylesheet_pack_tag("decidim_reporting_proposals_camera"))
 
             # This will display the snippets in the <head> part of the page.
-            @template.snippets.add(:head, @template.snippets.for(:reporting_proposals_camera_addons))
+            @template.snippets.add(:head, @template.snippets.for(:reporting_proposals_camera_styles))
+            @template.snippets.add(:foot, @template.snippets.for(:reporting_proposals_camera_scripts))
           end
 
           content_tag(:div, class: "input-group") do
-            super(object_name, method, options) +
+            super(object_name, options) +
               content_tag(:div, class: "input-group-button") do
-                content_tag(:button, class: "button secondary user-device-camera", type: "button", data: { input: "#{object_name}_#{method}" }) do
+                content_tag(:button, class: "button secondary user-device-camera", type: "button", data: { input: object_name }) do
                   icon("camera-slr", role: "img", "aria-hidden": true) + " #{I18n.t("use_my_camera", scope: "decidim.reporting_proposals.forms")}"
                 end
               end
@@ -38,9 +39,7 @@ module Decidim
 
           return unless Decidim::ReportingProposals.use_camera_button.include?(@template.current_component.manifest_name.to_sym)
 
-          return object_name == :add_photos unless Decidim::ReportingProposals.camera_button_on_attachments
-
-          true
+          object_name == :add_photos
         end
       end
     end

data/app/forms/concerns/decidim/reporting_proposals/map_builder_override.rb

@@ -15,12 +15,14 @@ module Decidim
         def geocoding_field(object_name, method, options = {})
           return original_geocoding_field(object_name, method, options) unless show_my_location_button?
 
-          unless template.snippets.any?(:reporting_proposals_geocoding_addons)
-            template.snippets.add(:reporting_proposals_geocoding_addons, template.javascript_pack_tag("decidim_reporting_proposals_geocoding"))
-            template.snippets.add(:reporting_proposals_geocoding_addons, template.stylesheet_pack_tag("decidim_reporting_proposals_geocoding"))
+          unless template.snippets.any?(:reporting_proposals_geocoding_scripts) || template.snippets.any?(:reporting_proposals_geocoding_styles)
+            template.snippets.add(:reporting_proposals_geocoding_scripts, template.javascript_pack_tag("decidim_reporting_proposals_geocoding"))
+            template.snippets.add(:reporting_proposals_geocoding_styles, template.stylesheet_pack_tag("decidim_reporting_proposals_geocoding"))
 
             # This will display the snippets in the <head> part of the page.
-            template.snippets.add(:head, template.snippets.for(:reporting_proposals_geocoding_addons))
+            template.snippets.add(:head, template.snippets.for(:reporting_proposals_geocoding_styles))
+            # This will display the snippets in the bottom part of the page.
+            template.snippets.add(:foot, template.snippets.for(:reporting_proposals_geocoding_scripts))
           end
 
           options[:autocomplete] ||= "off"

data/app/forms/concerns/decidim/reporting_proposals/map_included_proposals_for_form_override.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    module MapIncludedProposalsForFormOverride
+      extend ActiveSupport::Concern
+
+      included do
+        alias_method :map_model_original, :map_model
+
+        def map_model(model)
+          map_model_original(model)
+          self.proposal_ids += model.linked_resources(:reporting_proposals, "included_proposals").pluck(:id)
+        end
+
+        def proposals
+          @proposals ||= begin
+            proposals_query = Decidim.find_resource_manifest(:proposals).try(:resource_scope, current_component)
+            reporting_proposals_query = Decidim.find_resource_manifest(:reporting_proposals).try(:resource_scope, current_component)
+            (reporting_proposals_query ? proposals_query.or(reporting_proposals_query) : proposals_query)
+              &.where(id: proposal_ids)
+              &.order(title: :asc)
+          end
+        end
+      end
+    end
+  end
+end

data/app/forms/concerns/decidim/reporting_proposals/map_related_proposals_for_form_override.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    module MapRelatedProposalsForFormOverride
+      extend ActiveSupport::Concern
+
+      included do
+        alias_method :map_model_original, :map_model
+
+        def map_model(model)
+          map_model_original(model)
+          self.proposal_ids += model.linked_resources(:reporting_proposals, "related_proposals").pluck(:id)
+        end
+
+        def proposals
+          @proposals ||= begin
+            proposals_query = Decidim.find_resource_manifest(:proposals).try(:resource_scope, current_component)
+            reporting_proposals_query = Decidim.find_resource_manifest(:reporting_proposals).try(:resource_scope, current_component)
+            (reporting_proposals_query ? proposals_query.or(reporting_proposals_query) : proposals_query)
+              &.where(id: proposal_ids)
+              &.order(title: :asc)
+          end
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/templates/admin/proposal_answer_template_form.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Templates
+    module Admin
+      class ProposalAnswerTemplateForm < TemplateForm
+        attribute :internal_state, String
+        attribute :scope_for_availability, String
+
+        validates :internal_state, presence: true
+
+        def map_model(model)
+          self.scope_for_availability = "#{model.templatable_type.try(:demodulize).try(:tableize)}-#{model.templatable_id.to_i}"
+          (model.field_values || []).to_h.map do |k, v|
+            self[k.to_sym] = v
+          end
+        end
+      end
+    end
+  end
+end

data/app/helpers/concerns/decidim/reporting_proposals/proposal_wizard_helper_override.rb

@@ -9,11 +9,11 @@ module Decidim
       included do
         def proposal_wizard_stepper(current_step)
           steps = %(
-            #{proposal_wizard_stepper_step(:step_1, current_step)}
-            #{proposal_wizard_stepper_step(:step_2, current_step)}
+            #{proposal_wizard_stepper_step(Proposals::ProposalsController::STEP1, current_step)}
+            #{proposal_wizard_stepper_step(Proposals::ProposalsController::STEP2, current_step)}
           )
-          steps = %(#{steps} #{proposal_wizard_stepper_step(:step_3, current_step)}) unless reporting_proposals_component?
-          steps = %(#{steps} #{proposal_wizard_stepper_step(:step_4, current_step)})
+          steps = %(#{steps} #{proposal_wizard_stepper_step(Proposals::ProposalsController::STEP3, current_step)}) unless reporting_proposals_component?
+          steps = %(#{steps} #{proposal_wizard_stepper_step(Proposals::ProposalsController::STEP4, current_step)})
 
           content_tag :ol, class: "wizard__steps" do
             steps.html_safe