decidim-reporting_proposals 0.2.0 → 0.4.2

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 < Rectify::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/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,181 @@
+# 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.map do |row|
+            language = row.first
+            value = row.last
+            value.gsub!("%{organization}", proposal.organization.name)
+            value.gsub!("%{name}", proposal.creator_author.name)
+            value.gsub!("%{admin}", current_user.name)
+
+            [language, value]
+          end.to_h
+        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(Hash[@avaliablity_options.sort_by { |_, val| val }])
+        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

@@ -38,9 +38,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_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/resource_helper_override.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    module ResourceHelperOverride
+      extend ActiveSupport::Concern
+
+      included do
+        def linked_resources_for(resource, type, link_name)
+          linked_resources = resource.linked_resources(type, link_name).group_by { |linked_resource| linked_resource.class.name }
+          linked_resources.merge!(resource.linked_resources(:reporting_proposals, link_name).group_by { |linked_resource| linked_resource.class.name }) if type == :proposals
+
+          safe_join(linked_resources.map do |klass, resources|
+            resource_manifest = klass.constantize.resource_manifest
+            content_tag(:div, class: "section") do
+              i18n_name = "#{resource.class.name.demodulize.underscore}_#{resource_manifest.name}"
+              content_tag(:h3, I18n.t(i18n_name, scope: "decidim.resource_links.#{link_name}"), class: "section-heading") +
+                render(partial: resource_manifest.template, locals: { resources: resources })
+            end
+          end)
+        end
+      end
+    end
+  end
+end

data/app/mailers/concerns/decidim/admin/hidden_resource_mailer.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A custom mailer to mail Decidim users
+    # that they have been hidden
+    class HiddenResourceMailer < Decidim::ApplicationMailer
+      include Decidim::TranslationsHelper
+      include Decidim::SanitizeHelper
+      include Decidim::ApplicationHelper
+      include Decidim::TranslatableAttributes
+
+      helper Decidim::ResourceHelper
+      helper Decidim::TranslationsHelper
+      helper Decidim::ApplicationHelper
+
+      def notify_mail(resource, resource_authors, reason)
+        @resource_authors = resource_authors
+        @organization = resource.organization
+        @resource = resource
+        @reason = reason
+
+        mail(to: resource_authors.pluck(:email).uniq,
+             subject: I18n.t("decidim.admin.hidden_resource_mailer.notify_mail.subject"))
+      end
+    end
+  end
+end

data/app/mailers/concerns/decidim/proposals/admin/notification_answer_proposal_mailer.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class NotificationAnswerProposalMailer < Decidim::ApplicationMailer
+        include Decidim::TranslationsHelper
+        include Decidim::SanitizeHelper
+
+        helper Decidim::ResourceHelper
+        helper Decidim::TranslationsHelper
+
+        def notify_proposal_author(proposal, recipient)
+          @proposal = proposal
+          @organization = proposal.organization
+          @recipient = recipient
+
+          with_user(recipient) do
+            mail(to: recipient.email, subject: t("subject", scope: "decidim.reporting_proposals.admin.notification_answer_proposal_mailer.notify_proposal_author"))
+          end
+        end
+      end
+    end
+  end
+end

data/app/mailers/concerns/decidim/proposals/admin/proposals_valuator_mailer.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class ProposalsValuatorMailer < Decidim::ApplicationMailer
+        include Decidim::TranslationsHelper
+        include Decidim::SanitizeHelper
+        include Decidim::ApplicationHelper
+        include Decidim::TranslatableAttributes
+
+        helper Decidim::ResourceHelper
+        helper Decidim::TranslationsHelper
+        helper Decidim::ApplicationHelper
+
+        def notify_proposals_valuator(user, admin, proposals)
+          @valuator_user = user
+          @admin = admin
+          @proposals = proposals
+          @organization = user.organization
+
+          with_user(user) do
+            mail to: "#{user.name} <#{user.email}>",
+                 subject: t("subject", scope: "decidim.proposals.admin.proposals_valuator_mailer.notify_proposals_valuator")
+          end
+        end
+      end
+    end
+  end
+end

data/app/mailers/concerns/decidim/proposals/notification_publish_proposal_mailer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class NotificationPublishProposalMailer < Decidim::ApplicationMailer
+      include Decidim::TranslationsHelper
+      include Decidim::SanitizeHelper
+
+      helper Decidim::ResourceHelper
+      helper Decidim::TranslationsHelper
+
+      def notify_proposal_author(proposal, recipient)
+        @proposal = proposal
+        @organization = proposal.organization
+        @recipient = recipient
+
+        with_user(recipient) do
+          mail(to: recipient.email, subject: t("subject", scope: "decidim.reporting_proposals.notification_publish_proposal_mailer.notify_proposal_author"))
+        end
+      end
+    end
+  end
+end

data/app/mailers/concerns/decidim/reported_mailer_override.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportedMailerOverride
+    extend ActiveSupport::Concern
+
+    included do
+      helper Decidim::ComponentPathHelper
+      helper_method :resource_admin_url
+
+      def resource_admin_url
+        @resource_admin_url ||= Decidim::ResourceLocatorPresenter.new(@reportable).admin_url
+      end
+    end
+  end
+end

data/app/models/concerns/decidim/reporting_proposals/participatory_space_role_config/valuator_override.rb

@@ -7,8 +7,11 @@ module Decidim
         extend ActiveSupport::Concern
 
         included do
+          # it is important to ensure that the aliased method name is unique in case of other modules are doing the same
+          alias_method :decidim_reporting_proposals_original_accepted_components, :accepted_components
+
           def accepted_components
-            [:proposals, :reporting_proposals]
+            decidim_reporting_proposals_original_accepted_components + [:reporting_proposals]
           end
         end
       end

data/app/overrides/decidim/proposals/admin/proposal_answers/_form/add_template_chooser.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_top ".card-section" -->
+
+<% if defined?(Decidim::Templates) %>
+  <%= render "decidim/templates/admin/proposal_answer_templates/template_chooser", form: f %>
+<% end %>

data/app/overrides/decidim/proposals/admin/proposals/show/add_address.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_after ".row.column[3]" -->
+
+<%= render partial: "decidim/proposals/admin/proposals/address", locals: { component_settings: component_settings, proposal: proposal } %>

data/app/overrides/decidim/proposals/admin/proposals/show/add_valuators_form.html.erb.deface

@@ -0,0 +1,19 @@
+<!-- insert_after "#valuators" -->
+
+<% if allowed_to? :assign_to_valuator, :proposals %>
+  <div id="js-assign-proposal-to-valuator-actions" class="js-bulk-action-form form-single-proposal"
+       style="max-width:400px">
+    <%= form_tag(valuation_assignment_path, method: :post, id: "js-form-assign-proposal-to-valuator",
+                 class: "flex--lc flex-gap--1") do %>
+      <div class="checkboxes hide">
+        <%= check_box_tag "proposal_ids[]", proposal.id, true,
+                          class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
+      </div>
+
+      <%= bulk_valuators_select(current_participatory_space, t("decidim.proposals.admin.proposals.index.assign_to_valuator")) %>
+      <%= submit_tag(t("decidim.proposals.admin.proposals.index.assign_to_valuator_button"),
+                     id: "js-submit-assign-proposal-to-valuator",
+                     class: "button small button--simple float-left") %>
+    <% end %>
+	</div>
+<% end %>