decidim-participatory_processes 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e51dd87a6714362621127c05f6e897001e7d80e22f20c7275a8698664159e6e
-  data.tar.gz: 620305f1c0192fa325840d638a85bfea843c475d1752d720e76309cd7a712e70
+  metadata.gz: 2d739759631aca0408a7ae0aba4ff332eae1e0f2f0da9687baa753fdecfb1882
+  data.tar.gz: 5db3ca8acfbc423b83176a45dd67bc6b24083824264b367ccdc7b603b1b8bb68
 SHA512:
-  metadata.gz: 5206e778fc1a08899d6585eda85c66fedff736ef8cb37a1b869486bad53c8afcfe72d6a93127c56a8bac49d7d7e212c5ba11b6ae47bc9bd46a6889b4d8528adf
-  data.tar.gz: ee14a93572445a8560bc7055fded2f46c3a001ffaf382bed0fc1260051c8152dadcd25c644b335ecfa3e157b6b16a9c4eca9e9bc13d0ab67a33fce87b387b3a2
+  metadata.gz: 71fd380d50a0bf51fac1e84ee82de34dae3c8412ddac11e7f102d91809f928af6c6d62e58c2809649067aeabcdbf8fb4992831a37876567f372901d177809b06
+  data.tar.gz: c33eca9c58ce8cb093178232584a70916ccc314920de56443475abf129363d94e0f8cd86840ad1ae29536cbadbb8252b490ddaa93ce88002e613fd6432d00e97

data/app/assets/javascripts/decidim/participatory_processes/admin/participatory_processes.js.es6

@@ -2,11 +2,17 @@ $(() => {
   ((exports) => {
     const $participatoryProcessScopeEnabled = $("#participatory_process_scopes_enabled");
     const $participatoryProcessScopeId = $("#participatory_process_scope_id");
+    const $participatoryProcessScopeTypeId = $("#participatory_process_scope_type_max_depth_id");
 
     if ($(".edit_participatory_process, .new_participatory_process").length > 0) {
       $participatoryProcessScopeEnabled.on("change", (event) => {
         const checked = event.target.checked;
         exports.theDataPicker.enabled($participatoryProcessScopeId, checked);
+        if (checked === true) {
+          $participatoryProcessScopeTypeId.removeAttr("disabled");
+        } else {
+          $participatoryProcessScopeTypeId.attr("disabled", true)
+        }
       })
       exports.theDataPicker.enabled($participatoryProcessScopeId, $participatoryProcessScopeEnabled.prop("checked"));
     }

data/app/cells/decidim/participatory_processes/statistic/show.erb

@@ -0,0 +1,9 @@
+<div class="process-stats__data">
+  <span class="process-stats__number">
+    <%= stat_number %>
+  </span>
+
+  <h4 class="process-stats__title">
+    <%= stat_title %>
+  </h4>
+</div>

data/app/cells/decidim/participatory_processes/statistic_cell.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # This cell renders a Statistic of a ParticipatoryProcesses
+    class StatisticCell < Decidim::ViewModel
+      include ActionView::Helpers::NumberHelper
+
+      private
+
+      def stat_number
+        number_with_delimiter(model[:stat_number])
+      end
+
+      def stat_title
+        t(model[:stat_title], scope: "decidim.participatory_processes.statistics")
+      end
+    end
+  end
+end

data/app/cells/decidim/participatory_processes/statistics/show.erb

@@ -0,0 +1,17 @@
+<section class="row statistics" id="participatory_process-statistics">
+  <div class="columns large-8">
+    <div class="row column">
+      <h4 class="section-heading">
+        <%= stats_heading %>
+      </h4>
+
+      <div class="process-stats">
+        <% if model.present? %>
+          <%= cell("decidim/participatory_processes/statistic", collection: model) %>
+        <% else %>
+          <span class="muted"><%= no_stats %></span>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</section>

data/app/cells/decidim/participatory_processes/statistics_cell.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # This cell renders the Statistics of a ParticipatoryProcesses
+    class StatisticsCell < Decidim::ViewModel
+      private
+
+      def stats_heading
+        t("statistics.headline", scope: "decidim.participatory_processes")
+      end
+
+      def no_stats
+        t("statistics.no_stats", scope: "decidim.participatory_processes")
+      end
+    end
+  end
+end

data/app/commands/decidim/participatory_processes/admin/create_participatory_process.rb

@@ -22,10 +22,11 @@ module Decidim
         def call
           return broadcast(:invalid) if form.invalid?
 
-          process = create_participatory_process
+          create_participatory_process
 
           if process.persisted?
             add_admins_as_followers(process)
+            link_related_processes
             broadcast(:ok, process)
           else
             form.errors.add(:hero_image, process.errors[:hero_image]) if process.errors.include? :hero_image
@@ -36,10 +37,10 @@ module Decidim
 
         private
 
-        attr_reader :form
+        attr_reader :form, :process
 
         def create_participatory_process
-          process = ParticipatoryProcess.new(
+          @process = ParticipatoryProcess.new(
             organization: form.current_organization,
             title: form.title,
             subtitle: form.subtitle,
@@ -52,6 +53,7 @@ module Decidim
             promoted: form.promoted,
             scopes_enabled: form.scopes_enabled,
             scope: form.scope,
+            scope_type_max_depth: form.scope_type_max_depth,
             private_space: form.private_space,
             developer_group: form.developer_group,
             local_area: form.local_area,
@@ -105,6 +107,14 @@ module Decidim
             Decidim::CreateFollow.new(form, admin).call
           end
         end
+
+        def related_processes
+          @related_processes ||= Decidim::ParticipatoryProcess.where(id: form.related_process_ids)
+        end
+
+        def link_related_processes
+          process.link_participatory_space_resources(related_processes, "related_processes")
+        end
       end
     end
   end

data/app/commands/decidim/participatory_processes/admin/update_participatory_process.rb

@@ -41,13 +41,14 @@ module Decidim
 
         def update_participatory_process
           @participatory_process.assign_attributes(attributes)
-          if @participatory_process.valid?
-            @participatory_process.save!
+          return unless @participatory_process.valid?
+
+          @participatory_process.save!
 
-            Decidim.traceability.perform_action!(:update, @participatory_process, form.current_user) do
-              @participatory_process
-            end
+          Decidim.traceability.perform_action!(:update, @participatory_process, form.current_user) do
+            @participatory_process
           end
+          link_related_processes
         end
 
         def attributes
@@ -65,6 +66,7 @@ module Decidim
             short_description: form.short_description,
             scopes_enabled: form.scopes_enabled,
             scope: form.scope,
+            scope_type_max_depth: form.scope_type_max_depth,
             private_space: form.private_space,
             developer_group: form.developer_group,
             local_area: form.local_area,
@@ -76,10 +78,19 @@ module Decidim
             start_date: form.start_date,
             end_date: form.end_date,
             participatory_process_group: form.participatory_process_group,
+            show_metrics: form.show_metrics,
             show_statistics: form.show_statistics,
             announcement: form.announcement
           }
         end
+
+        def related_processes
+          @related_processes ||= Decidim::ParticipatoryProcess.where(id: form.related_process_ids)
+        end
+
+        def link_related_processes
+          @participatory_process.link_participatory_space_resources(related_processes, "related_processes")
+        end
       end
     end
   end

data/app/controllers/concerns/decidim/participatory_processes/admin/filterable.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          private
+
+          def base_query
+            collection
+          end
+
+          def extra_filters
+            [:decidim_participatory_process_group_id_eq]
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/participatory_processes/admin/participatory_processes_controller.rb

@@ -7,18 +7,19 @@ module Decidim
       #
       class ParticipatoryProcessesController < Decidim::ParticipatoryProcesses::Admin::ApplicationController
         include Decidim::Admin::ParticipatorySpaceAdminContext
+        include Decidim::ParticipatoryProcesses::Admin::Filterable
         participatory_space_admin_layout only: [:edit]
-        include Decidim::Paginable
 
         helper ProcessGroupsForSelectHelper
+        helper Decidim::ParticipatoryProcesses::Admin::ParticipatoryProcessHelper
 
-        helper_method :current_participatory_process, :current_participatory_space, :query
+        helper_method :current_participatory_process, :current_participatory_space, :process_group
 
         layout "decidim/admin/participatory_processes"
 
         def index
           enforce_permission_to :read, :process_list
-          @participatory_processes = collection
+          @participatory_processes = filtered_collection
         end
 
         def new
@@ -76,22 +77,11 @@ module Decidim
         private
 
         def process_group
-          @process_group ||= ParticipatoryProcessGroup.find_by(id: params[:group_id])
-        end
-
-        def participatory_processes
-          @participatory_processes ||= Rectify::Query.merge(
-            ParticipatoryProcessesWithUserRole.for(current_user),
-            ParticipatoryProcessesByGroup.for(process_group)
-          )
-        end
-
-        def query
-          @query ||= participatory_processes.ransack(params[:q])
+          @process_group ||= ParticipatoryProcessGroup.find_by(id: ransack_params[:decidim_participatory_process_group_id_eq])
         end
 
         def collection
-          @collection ||= paginate(query.result)
+          @collection ||= ParticipatoryProcessesWithUserRole.for(current_user)
         end
 
         def current_participatory_process

data/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb

@@ -6,10 +6,16 @@ module Decidim
     # public layout.
     class ParticipatoryProcessesController < Decidim::ParticipatoryProcesses::ApplicationController
       include ParticipatorySpaceContext
-      participatory_space_layout only: [:show, :statistics]
+      participatory_space_layout only: [:show, :all_metrics]
       include FilterResource
 
-      helper_method :collection, :promoted_participatory_processes, :participatory_processes, :stats, :metrics, :default_date_filter
+      helper_method :collection,
+                    :promoted_participatory_processes,
+                    :participatory_processes,
+                    :stats,
+                    :metrics,
+                    :default_date_filter,
+                    :related_processes
 
       def index
         raise ActionController::RoutingError, "Not Found" if published_processes.none?
@@ -22,7 +28,7 @@ module Decidim
         enforce_permission_to :read, :process, process: current_participatory_space
       end
 
-      def statistics
+      def all_metrics
         enforce_permission_to :read, :process, process: current_participatory_space
       end
 
@@ -92,6 +98,14 @@ module Decidim
 
         "all"
       end
+
+      def related_processes
+        @related_processes ||=
+          current_participatory_space
+          .linked_participatory_space_resources(:participatory_processes, "related_processes")
+          .published
+          .all
+      end
     end
   end
 end

data/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb

@@ -29,10 +29,13 @@ module Decidim
         attribute :area_id, Integer
         attribute :participatory_process_group_id, Integer
         attribute :scope_id, Integer
+        attribute :related_process_ids, Array[Integer]
+        attribute :scope_type_max_depth_id, Integer
 
         attribute :private_space, Boolean
         attribute :promoted, Boolean
         attribute :scopes_enabled, Boolean
+        attribute :show_metrics, Boolean
         attribute :show_statistics, Boolean
 
         attribute :end_date, Decidim::Attributes::LocalizedDate
@@ -61,12 +64,18 @@ module Decidim
         def map_model(model)
           self.scope_id = model.decidim_scope_id
           self.participatory_process_group_id = model.decidim_participatory_process_group_id
+          self.related_process_ids = model.linked_participatory_space_resources(:participatory_process, "related_processes").pluck(:id)
+          @processes = Decidim::ParticipatoryProcess.where(organization: model.organization).where.not(id: model.id)
         end
 
         def scope
           @scope ||= current_organization.scopes.find_by(id: scope_id)
         end
 
+        def scope_type_max_depth
+          @scope_type_max_depth ||= current_organization.scope_types.find_by(id: scope_type_max_depth_id)
+        end
+
         def area
           @area ||= current_organization.areas.find_by(id: area_id)
         end
@@ -75,6 +84,10 @@ module Decidim
           Decidim::ParticipatoryProcessGroup.find_by(id: participatory_process_group_id)
         end
 
+        def processes
+          @processes ||= Decidim::ParticipatoryProcess.where(organization: current_organization)
+        end
+
         private
 
         def organization_participatory_processes

data/app/functions/decidim/participatory_processes/participatory_process_finder.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # Adds slug finder for participatory_processes
+    class ParticipatoryProcessFinder < Decidim::Core::ParticipatorySpaceFinder
+      argument :slug, types.String, "The slug of the participatory process"
+    end
+  end
+end

data/app/functions/decidim/participatory_processes/participatory_process_list.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # Adds some filter values for participatory_processes
+    class ParticipatoryProcessList < Decidim::Core::ParticipatorySpaceListBase
+      argument :filter, ParticipatoryProcessInputFilter, "This argument let's you filter the results"
+      argument :order, ParticipatoryProcessInputSort, "This argument let's you order the results"
+    end
+  end
+end

data/app/helpers/decidim/participatory_processes/admin/participatory_process_helper.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # Helpers related to the Admin of Participatory Process layout.
+      module ParticipatoryProcessHelper
+        def scope_type_depth_select_options
+          {
+            include_blank: true,
+            selected: current_participatory_process.try(:decidim_scope_type_id)
+          }
+        end
+
+        def scope_type_depth_select_html_options
+          html_options = {}
+          html_options[:disabled] = "disabled" unless current_participatory_process.try(:scopes_enabled)
+          html_options
+        end
+      end
+    end
+  end
+end

data/app/models/decidim/participatory_process.rb

@@ -49,6 +49,10 @@ module Decidim
              foreign_type: "decidim_participatory_space_type",
              dependent: :destroy,
              as: :participatory_space
+    belongs_to :scope_type_max_depth,
+               foreign_key: "decidim_scope_type_id",
+               class_name: "Decidim::ScopeType",
+               optional: true
 
     has_many :components, as: :participatory_space, dependent: :destroy
 
@@ -149,9 +153,16 @@ module Decidim
       "#{admin_module_name}::Moderators".constantize.for(self)
     end
 
+    def user_roles(role_name = nil)
+      roles = Decidim::ParticipatoryProcessUserRole.where(participatory_process: self)
+      return roles if role_name.blank?
+
+      roles.where(role: role_name)
+    end
+
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
     ransacker :title do |parent|
-      Arel::Nodes::InfixOperation.new("->", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
+      Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
     end
   end
 end

data/app/models/decidim/participatory_process_user_role.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Defines a relation between a user and a participatory process, and what
+  # kind of relation does the user has.
+  class ParticipatoryProcessUserRole < ApplicationRecord
+    include Traceable
+    include Loggable
+
+    belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User", optional: true
+    belongs_to :participatory_process, foreign_key: "decidim_participatory_process_id", class_name: "Decidim::ParticipatoryProcess", optional: true
+
+    alias participatory_space participatory_process
+
+    ROLES = %w(admin collaborator moderator valuator).freeze
+    validates :role, inclusion: { in: ROLES }, uniqueness: { scope: [:user, :participatory_process] }
+    validate :user_and_participatory_process_same_organization
+
+    def self.log_presenter_class_for(_log)
+      Decidim::ParticipatoryProcesses::AdminLog::ParticipatoryProcessUserRolePresenter
+    end
+
+    private
+
+    # Private: check if the process and the user have the same organization
+    def user_and_participatory_process_same_organization
+      return if !participatory_process || !user
+
+      errors.add(:participatory_process, :invalid) unless user.organization == participatory_process.organization
+    end
+  end
+end