decidim-participatory_processes 0.23.3 → 0.24.1

data/app/models/decidim/participatory_process.rb

@@ -74,7 +74,7 @@ module Decidim
 
     scope :past, -> { where(arel_table[:end_date].lt(Date.current)) }
     scope :upcoming, -> { where(arel_table[:start_date].gt(Date.current)) }
-    scope :active, -> { where(arel_table[:start_date].lteq(Date.current).and(arel_table[:end_date].gt(Date.current).or(arel_table[:end_date].eq(nil)))) }
+    scope :active, -> { where(arel_table[:start_date].lteq(Date.current).and(arel_table[:end_date].gteq(Date.current).or(arel_table[:end_date].eq(nil)))) }
 
     searchable_fields({
                         scope_id: :decidim_scope_id,
@@ -124,7 +124,7 @@ module Decidim
     def active?
       return false if start_date.blank?
 
-      start_date < Date.current && (end_date.blank? || end_date > Date.current)
+      start_date <= Date.current && (end_date.blank? || end_date >= Date.current)
     end
 
     def past?

data/app/models/decidim/participatory_process_group.rb

@@ -7,7 +7,8 @@ module Decidim
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
 
-    translatable_fields :name, :description
+    translatable_fields :title, :description, :developer_group, :local_area, :meta_scope, :participatory_scope,
+                        :participatory_structure, :target
 
     has_many :participatory_processes,
              foreign_key: "decidim_participatory_process_group_id",
@@ -22,6 +23,13 @@ module Decidim
     validates_upload :hero_image
     mount_uploader :hero_image, Decidim::HeroImageUploader
 
+    # Scope to return only the promoted groups.
+    #
+    # Returns an ActiveRecord::Relation.
+    def self.promoted
+      where(promoted: true)
+    end
+
     def self.log_presenter_class_for(_log)
       Decidim::ParticipatoryProcesses::AdminLog::ParticipatoryProcessGroupPresenter
     end

data/app/presenters/decidim/participatory_processes/admin_log/participatory_process_group_presenter.rb

@@ -17,8 +17,16 @@ module Decidim
 
         def diff_fields_mapping
           {
-            name: :i18n,
-            description: :i18n
+            description: :i18n,
+            developer_group: :i18n,
+            hashtag: :string,
+            group_url: :string,
+            local_area: :i18n,
+            meta_scope: :i18n,
+            title: :i18n,
+            participatory_scope: :i18n,
+            participatory_structure: :i18n,
+            target: :i18n
           }
         end
 

data/app/presenters/decidim/participatory_processes/participatory_process_group_stats_presenter.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # A presenter to render statistics in the homepage.
+    class ParticipatoryProcessGroupStatsPresenter < Rectify::Presenter
+      attribute :participatory_process_group, Decidim::ParticipatoryProcessGroup
+      include Decidim::IconHelper
+
+      # Public: returns a collection of stats (Hash) for the participatory
+      # process group landing page.
+      def collection
+        highlighted_stats = process_participants_stats
+        highlighted_stats.concat(process_followers_stats(priority: StatsRegistry::HIGH_PRIORITY))
+        highlighted_stats.concat(component_stats(priority: StatsRegistry::HIGH_PRIORITY))
+        highlighted_stats.concat(component_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
+        highlighted_stats = highlighted_stats.reject(&:empty?)
+        highlighted_stats = highlighted_stats.reject { |_stat_manifest, _stat_title, stat_number| stat_number.zero? }
+        grouped_highlighted_stats = highlighted_stats.group_by(&:first)
+
+        statistics = []
+        grouped_highlighted_stats.each do |_manifest_name, stats|
+          stats.each_with_index.each do |stat, _index|
+            stat.each_with_index.map do |_item, subindex|
+              next unless (subindex % 3).zero?
+              next if stat[subindex + 2].zero?
+
+              statistics << { stat_title: stat[subindex + 1], stat_number: stat[subindex + 2] }
+            end
+          end
+        end
+        statistics
+      end
+
+      private
+
+      def process_participants_stats
+        Decidim.stats.only([:participants_count]).with_context(participatory_process_group)
+               .map { |stat_title, stat_number| [:participatory_process_group, stat_title, stat_number] }
+      end
+
+      def component_stats(conditions)
+        Decidim.component_manifests.map do |component_manifest|
+          component_manifest.stats.except([:proposals_accepted])
+                            .filter(conditions)
+                            .with_context(published_components)
+                            .map { |stat_title, stat_number| [component_manifest.name, stat_title, stat_number] }.flatten
+        end
+      end
+
+      def process_followers_stats(conditions)
+        Decidim.stats.only([:followers_count])
+               .filter(conditions)
+               .with_context(participatory_process_group)
+               .map { |stat_title, stat_number| [:participatory_process_group, stat_title, stat_number] }
+      end
+
+      def participatory_processes
+        @participatory_processes ||= participatory_process_group.participatory_processes
+      end
+
+      def published_components
+        @published_components ||= Component.where(participatory_space: participatory_processes).published
+      end
+    end
+  end
+end

data/app/presenters/decidim/participatory_processes/participatory_process_presenter.rb

@@ -6,14 +6,15 @@ module Decidim
       include Rails.application.routes.mounted_helpers
       include ActionView::Helpers::UrlHelper
 
-      delegate :url, to: :hero_image, prefix: true
-      delegate :url, to: :banner_image, prefix: true
-
       def hero_image_url
+        return unless process.hero_image_url
+
         URI.join(decidim.root_url(host: process.organization.host), process.hero_image_url).to_s
       end
 
       def banner_image_url
+        return unless process.banner_image_url
+
         URI.join(decidim.root_url(host: process.organization.host), process.banner_image_url).to_s
       end
 

data/app/presenters/decidim/participatory_processes/participatory_process_stats_presenter.rb

@@ -10,9 +10,9 @@ module Decidim
       # Public: returns a collection of stats (Hash) for the Process Home.
       def collection
         highlighted_stats = process_participants_stats
-        highlighted_stats = highlighted_stats.concat(process_followers_stats(priority: StatsRegistry::HIGH_PRIORITY))
-        highlighted_stats = highlighted_stats.concat(component_stats(priority: StatsRegistry::HIGH_PRIORITY))
-        highlighted_stats = highlighted_stats.concat(component_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
+        highlighted_stats.concat(process_followers_stats(priority: StatsRegistry::HIGH_PRIORITY))
+        highlighted_stats.concat(component_stats(priority: StatsRegistry::HIGH_PRIORITY))
+        highlighted_stats.concat(component_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
         highlighted_stats = highlighted_stats.reject(&:empty?)
         highlighted_stats = highlighted_stats.reject { |_stat_manifest, _stat_title, stat_number| stat_number.zero? }
         grouped_highlighted_stats = highlighted_stats.group_by(&:first)

data/app/queries/decidim/participatory_processes/group_participatory_processes.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # This query class filters all processes of a participatory process group
+    class GroupParticipatoryProcesses < Rectify::Query
+      def initialize(group)
+        @group = group
+      end
+
+      def query
+        Decidim::ParticipatoryProcess.where(participatory_process_group: @group)
+      end
+    end
+  end
+end

data/app/queries/decidim/participatory_processes/group_published_participatory_processes.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # This query class filters published processes of a participatory process group
+    class GroupPublishedParticipatoryProcesses < Rectify::Query
+      def initialize(group, user = nil)
+        @group = group
+        @user = user
+      end
+
+      def query
+        Rectify::Query.merge(
+          GroupParticipatoryProcesses.new(@group),
+          VisibleParticipatoryProcesses.new(@user),
+          PublishedParticipatoryProcesses.new
+        ).query
+      end
+    end
+  end
+end

data/app/queries/decidim/participatory_processes/organization_participatory_processes.rb

@@ -9,7 +9,7 @@ module Decidim
       end
 
       def query
-        Decidim::ParticipatoryProcess.where(organization: @organization)
+        Decidim::ParticipatoryProcess.where(organization: @organization).order(weight: :asc)
       end
     end
   end

data/app/queries/decidim/participatory_processes/organization_published_participatory_processes.rb

@@ -14,7 +14,7 @@ module Decidim
           OrganizationParticipatoryProcesses.new(@organization),
           VisibleParticipatoryProcesses.new(@user),
           PublishedParticipatoryProcesses.new
-        ).query
+        ).query.order(weight: :asc)
       end
     end
   end

data/app/queries/decidim/participatory_processes/promoted_participatory_process_groups.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # This query filters participatory process groups so only promoted ones are returned.
+    class PromotedParticipatoryProcessGroups < Rectify::Query
+      def query
+        Decidim::ParticipatoryProcessGroup.promoted
+      end
+    end
+  end
+end

data/app/queries/decidim/participatory_processes/stats_followers_count.rb

@@ -2,10 +2,12 @@
 
 module Decidim
   module ParticipatoryProcesses
-    # This class counts all Followers of a participatory processes
+    # This class counts all Followers of a participatory process or
+    # participatory processes belonging to a participatory process group
     class StatsFollowersCount < Rectify::Query
       def self.for(participatory_space)
-        return 0 unless participatory_space.is_a? Decidim::ParticipatoryProcess
+        return 0 unless participatory_space.is_a?(Decidim::ParticipatoryProcess) ||
+                        participatory_space.is_a?(Decidim::ParticipatoryProcessGroup) && participatory_space.participatory_processes.exists?
 
         new(participatory_space).query
       end
@@ -26,7 +28,7 @@ module Decidim
         Decidim.component_manifests.sum do |component|
           component.stats
                    .filter(tag: :followers)
-                   .with_context(participatory_space.components.published)
+                   .with_context(space_components)
                    .map { |_name, value| value }
                    .sum
         end
@@ -36,11 +38,23 @@ module Decidim
         Decidim.participatory_space_manifests.sum do |space|
           space.stats
                .filter(tag: :followers)
-               .with_context(participatory_space)
+               .with_context(participatory_space_items)
                .map { |_name, value| value }
                .sum
         end
       end
+
+      def participatory_space_items
+        @participatory_space_items ||= if participatory_space.is_a?(Decidim::ParticipatoryProcess)
+                                         participatory_space
+                                       else
+                                         participatory_space.participatory_processes
+                                       end
+      end
+
+      def space_components
+        @space_components ||= Decidim::Component.where(participatory_space: participatory_space_items).published
+      end
     end
   end
 end

data/app/queries/decidim/participatory_processes/stats_participants_count.rb

@@ -2,10 +2,12 @@
 
 module Decidim
   module ParticipatoryProcesses
-    # This class counts unique Participants on a participatory processes
+    # This class counts unique Participants on a participatory process or
+    # participatory processes belonging to a participatory process group
     class StatsParticipantsCount < Rectify::Query
       def self.for(participatory_space)
-        return 0 unless participatory_space.is_a? Decidim::ParticipatoryProcess
+        return 0 unless participatory_space.is_a?(Decidim::ParticipatoryProcess) ||
+                        participatory_space.is_a?(Decidim::ParticipatoryProcessGroup) && participatory_space.participatory_processes.exists?
 
         new(participatory_space).query
       end
@@ -30,9 +32,17 @@ module Decidim
 
       attr_reader :participatory_space
 
+      def participatory_space_ids
+        @participatory_space_ids ||= if participatory_space.is_a?(Decidim::ParticipatoryProcess)
+                                       participatory_space.id
+                                     else
+                                       participatory_space.participatory_processes.pluck(:id)
+                                     end
+      end
+
       def comments_query
         Decidim::Comments::Comment
-          .where(decidim_root_commentable_id: participatory_space.id)
+          .where(decidim_root_commentable_id: participatory_space_ids)
           .pluck(:decidim_author_id)
           .uniq
       end
@@ -89,7 +99,11 @@ module Decidim
       end
 
       def space_components
-        @space_components ||= participatory_space.components
+        @space_components ||= if participatory_space.is_a?(Decidim::ParticipatoryProcess)
+                                participatory_space.components
+                              else
+                                Decidim::Component.where(participatory_space: participatory_space.participatory_processes)
+                              end
       end
 
       def proposals_components

data/app/queries/decidim/participatory_processes/visible_participatory_process_groups.rb

@@ -12,14 +12,18 @@ module Decidim
         processes = Decidim::ParticipatoryProcess.all
 
         if @current_user
-          return processes if @current_user.admin
+          return groups if @current_user.admin?
 
           processes = processes.visible_for(@current_user.id)
         else
           processes = processes.public_spaces
         end
 
-        Decidim::ParticipatoryProcessGroup.where(id: processes.pluck(:decidim_participatory_process_group_id))
+        groups.where(id: processes.pluck(:decidim_participatory_process_group_id))
+      end
+
+      def groups
+        @groups ||= Decidim::ParticipatoryProcessGroup.all
       end
     end
   end

data/app/serializers/decidim/participatory_processes/participatory_process_importer.rb

@@ -54,7 +54,7 @@ module Decidim
       def import_process_group(attributes)
         Decidim.traceability.perform_action!("create", ParticipatoryProcessGroup, @user) do
           group = ParticipatoryProcessGroup.find_or_initialize_by(
-            name: attributes["name"],
+            title: attributes["title"],
             description: attributes["description"],
             organization: @organization
           )

data/app/serializers/decidim/participatory_processes/participatory_process_serializer.rb

@@ -41,7 +41,7 @@ module Decidim
           },
           participatory_process_group: {
             id: participatory_process.participatory_process_group.try(:id),
-            name: participatory_process.participatory_process_group.try(:name) || empty_translatable,
+            title: participatory_process.participatory_process_group.try(:title) || empty_translatable,
             description: participatory_process.participatory_process_group.try(:description) || empty_translatable,
             remote_hero_image_url: Decidim::ParticipatoryProcesses::ParticipatoryProcessGroupPresenter.new(participatory_process.participatory_process_group).hero_image_url
           },

data/app/services/decidim/participatory_processes/participatory_process_search.rb

@@ -5,7 +5,8 @@ module Decidim
     # Service that encapsulates all logic related to filtering participatory processes.
     class ParticipatoryProcessSearch < ParticipatorySpaceSearch
       def initialize(options = {})
-        super(ParticipatoryProcess.all, options)
+        base_relation = options.has_key?(:base_relation) ? options.delete(:base_relation) : ParticipatoryProcess.all
+        super(base_relation, options)
       end
 
       def search_date

data/app/views/decidim/participatory_processes/admin/participatory_process_copies/new.html.erb

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t("participatory_process_copies.new.select", scope: "decidim.admin")) %>
+
 <%= decidim_form_for(@form, url: participatory_process_copies_path(current_participatory_process), method: :post, html: { class: "form copy_participatory_process" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t("participatory_process_copies.new.title", scope: "decidim.admin"), select: t("participatory_process_copies.new.select", scope: "decidim.admin") } %>
 

data/app/views/decidim/participatory_processes/admin/participatory_process_groups/_form.html.erb

@@ -1,17 +1,72 @@
-<div class="row column">
-  <%= form.translated :text_field, :name, autofocus: true %>
-</div>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %></h2>
+  </div>
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :text_field, :title, autofocus: true %>
+    </div>
 
-<div class="row column">
-  <%= form.translated :editor, :description, toolbar: :full, lines: 25 %>
-</div>
+    <div class="row column">
+      <%= form.translated :editor, :description, toolbar: :full, lines: 25 %>
+    </div>
 
-<div class="row column">
-  <% if processes_for_select %>
-    <%= form.select :participatory_process_ids, processes_for_select, {}, { multiple: true, class: "chosen-select" } %>
-  <% end %>
-</div>
+    <div class="row column">
+      <% if processes_for_select %>
+        <%= form.select :participatory_process_ids, processes_for_select, {}, { multiple: true, class: "chosen-select" } %>
+      <% end %>
+    </div>
+
+    <div class="row column">
+      <%= form.upload :hero_image %>
+    </div>
+  </div>
+
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".metadata") %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%= form.text_field :hashtag %>
+    </div>
+
+    <div class="row column">
+      <%= form.text_field :group_url %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :text_field, :developer_group %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :text_field, :local_area %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :text_field, :meta_scope %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :text_field, :target %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :text_field, :participatory_scope %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :text_field, :participatory_structure %>
+    </div>
+  </div>
+
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".visibility") %></h2>
+  </div>
 
-<div class="row column">
-  <%= form.upload :hero_image %>
+  <div class="card-section">
+    <div class="row column">
+      <%= form.check_box :promoted %>
+    </div>
+  </div>
 </div>