decidim-participatory_processes 0.20.1 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e51dd87a6714362621127c05f6e897001e7d80e22f20c7275a8698664159e6e
-  data.tar.gz: 620305f1c0192fa325840d638a85bfea843c475d1752d720e76309cd7a712e70
+  metadata.gz: 9f9aa34c9ab49f537f782aab1b1356aecb97dcdd24f6d64b8294cd39fc2026e1
+  data.tar.gz: a5a21938dc11bf4653eda31fed0e2bc4e9368426eac58ad2e2ea1edbc15ea500
 SHA512:
-  metadata.gz: 5206e778fc1a08899d6585eda85c66fedff736ef8cb37a1b869486bad53c8afcfe72d6a93127c56a8bac49d7d7e212c5ba11b6ae47bc9bd46a6889b4d8528adf
-  data.tar.gz: ee14a93572445a8560bc7055fded2f46c3a001ffaf382bed0fc1260051c8152dadcd25c644b335ecfa3e157b6b16a9c4eca9e9bc13d0ab67a33fce87b387b3a2
+  metadata.gz: 6004a1300bf0b1eeffa24d1784e46995b779ab8ed13d9baf9f10a5c3bed360496081ffe7bea38abdb53a9b2e72b7fd96bc03ce1bd8e5f5d8552aa9d768b12bf5
+  data.tar.gz: 634120e6c78846eb7904503f56c846fb40cd135cc260ad2c92255f6483275bf406875dc423b98e4edd22ec94efba7b8a24e37d74e52a23f71631826be2eb7393

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/content_blocks/highlighted_processes/_all_processes.erb

@@ -1,6 +1,9 @@
 <div class="row" id="see-all-processes">
   <div class="columns small-centered small-12
     smallmedium-8 medium-6 large-4">
-    <%= link_to t("see_all_processes", scope: i18n_scope), decidim_participatory_processes.participatory_processes_path, class: "button expanded hollow button--sc home-section__cta" %>
+    <%= link_to t("see_all_processes", scope: i18n_scope),
+                decidim_participatory_processes.participatory_processes_path,
+                class: "button expanded hollow button--sc home-section__cta",
+                title: t("processes_button_title", scope: i18n_scope) %>
   </div>
 </div>

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/show.erb

@@ -6,15 +6,11 @@
         large-up-4 card-grid">
         <% highlighted_processes.each do |process| %>
           <div class="column">
-            <article class="card card--process card--mini">
-              <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card__link" do %>
-                <div class="card__image-top"
-                  style="background-image:url(<%= process.hero_image.url %>)"></div>
-              <% end %>
+            <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card card--process card--mini" do %>
+              <div aria-hidden="true" class="card__image-top"
+                style="background-image:url(<%= process.hero_image.url %>)"></div>
               <div class="card__content">
-                <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card__link" do %>
-                  <h4 class="card__title"><%= translated_attribute process.title %></h4>
-                <% end %>
+                <span class="card__title card__link"><%= translated_attribute process.title %></span>
                 <% if process.active_step %>
                   <span class="card--process__small">
                     <%= t("active_step", scope: i18n_scope) %>
@@ -22,7 +18,7 @@
                   </span>
                 <% end %>
               </div>
-            </article>
+            <% end %>
           </div>
         <% end %>
       </div>

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/single_process.erb

@@ -1,17 +1,21 @@
 <% process = highlighted_processes.first %>
+<% title_id = "process_title" %>
 <section class="wrapper-home home-section">
   <div class="row" id="highlighted-processes">
     <h3 class="section-heading"><%= t("active_processes", scope: i18n_scope) %></h3>
     <div class="row collapse">
-      <article class="card card--full card--process">
+      <div class="card card--full card--process">
         <div class="row collapse card--process__row">
           <div class="column large-6 card--process__column">
             <div class="card__content">
               <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card__link" do %>
-                <h2 class="card__title"><%= translated_attribute process.title %></h2>
+                <h2 class="card__title" id="<%= title_id %>"><%= decidim_html_escape(translated_attribute(process.title)) %></h2>
               <% end %>
               <%= decidim_sanitize translated_attribute(process.short_description) %>
-              <%= link_to t("more_information", scope: i18n_scope), decidim_participatory_processes.participatory_process_path(process), class: "button secondary small hollow" %>
+              <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "button small hollow" do %>
+                <span class="show-for-sr"><%= decidim_html_escape(translated_attribute(process.title)) %></span>
+                <%= t("more_information", scope: i18n_scope) %>
+              <% end %>
             </div>
           </div>
           <div class="column large-6 card--process__column">
@@ -19,7 +23,8 @@
               <div class="card__content row collapse">
                 <div class="large-6 large-offset-6 columns">
                   <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "button expanded button--sc" do %>
-                    <%= t("participate", scope: i18n_scope) %>
+                    <span class="show-for-sr"><%= t("participate_in", resource_name: translated_attribute(process.title), scope: i18n_scope) %></span>
+                    <span aria-hidden="true"><%= t("participate", scope: i18n_scope) %></span>
                     <% if process.active_step %>
                       <span class="button__info">
                         <%= t("active_step", scope: i18n_scope) %>
@@ -32,7 +37,7 @@
             </div>
           </div>
         </div>
-      </article>
+      </div>
     </div>
   </div>
   <%= render "_all_processes" %>

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes_cell.rb

@@ -29,7 +29,7 @@ module Decidim
             OrganizationPublishedParticipatoryProcesses.new(current_organization, current_user) |
             HighlightedParticipatoryProcesses.new |
             FilteredParticipatoryProcesses.new("active")
-          ).query.limit(max_results)
+          ).query.includes([:organization]).limit(max_results)
         end
 
         def i18n_scope

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

@@ -1,8 +1,8 @@
 <div class="row collapse order-by">
-  <h2 class="order-by__text section-heading">
+  <h3 class="order-by__text section-heading">
     <%= title %>
     <%= render :filter_tabs %>
-  </h2>
+  </h3>
 </div>
 <% if process_count_by_filter["active"] == 0 && process_count_by_filter["upcoming"] == 0 %>
 <div class="row column">

data/app/cells/decidim/participatory_processes/process_group_m/footer.erb

@@ -1,9 +1,8 @@
 <div class="card__footer card__footer--spaces">
   <div class="card__support">
-    <%= link_to(
-      t("layouts.decidim.participatory_process_groups.participatory_process_group.browse"),
-      resource_path,
-      class: "card__button button button--sc secondary light small"
-    ) %>
+    <%= link_to(resource_path, class: "card__button button button--sc small") do %>
+      <span class="show-for-sr"><%= t("browse_resource", resource_name: title, scope: "layouts.decidim.participatory_process_groups.participatory_process_group") %></span>
+      <%= t("layouts.decidim.participatory_process_groups.participatory_process_group.browse") %>
+    <% end %>
   </div>
 </div>

data/app/cells/decidim/participatory_processes/process_m/data.erb

@@ -1,7 +1,7 @@
 <div class="card__icondata">
   <ul class="card-data">
     <li class="card-data__item">
-      <%= icon "datetime", class: "icon--big" %>
+      <%= icon "datetime", class: "icon--big", role: "img", aria_label: t("decidim.participatory_processes.show.dates") %>
     </li>
     <li class="card-data__item">
       <div class="card-data__item--centerblock">

data/app/cells/decidim/participatory_processes/process_m/footer.erb

@@ -2,14 +2,13 @@
   <div class="card__support">
     <% if has_step? %>
       <div class="card__support__data--left">
-        <div class="text-uppercase"><%= t("layouts.decidim.participatory_processes.participatory_process.active_step") %></div>
+        <div><%= t("layouts.decidim.participatory_processes.participatory_process.active_step") %></div>
         <div class="text-ellipsis"><strong><%= step_title %></strong></div>
       </div>
     <% end %>
-    <%= link_to(
-      t(model.cta_button_text_key, scope: "layouts.decidim.participatory_processes.participatory_process"),
-      resource_path,
-      class: "card__button button button--sc secondary light small"
-    ) %>
+    <%= link_to(step_cta_path, class: "card__button button button--sc small") do %>
+      <span class="show-for-sr"><%= step_cta_text %></span>
+      <%= step_cta_text %>
+    <% end %>
   </div>
 </div>

data/app/cells/decidim/participatory_processes/process_m/tags.erb

@@ -1,7 +1,7 @@
 <% if model.hashtag.present? %>
   <%= link_to(
-    "##{model.hashtag}",
-    "https://twitter.com/hashtag/#{model.hashtag}",
+    "##{decidim_html_escape(model.hashtag)}",
+    "https://twitter.com/hashtag/#{decidim_html_escape(model.hashtag)}",
     class: "card__text--category",
     target: "_blank"
    ) %>

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

@@ -5,6 +5,9 @@ module Decidim
     # This cell renders the Medium (:m) process card
     # for an given instance of a Process
     class ProcessMCell < Decidim::CardMCell
+      include Decidim::SanitizeHelper
+      include Decidim::TranslationsHelper
+
       private
 
       def has_image?
@@ -37,6 +40,24 @@ module Decidim
         model.hero_image.url
       end
 
+      def step_cta_text
+        if translated_in_current_locale?(model.active_step&.cta_text)
+          translated_attribute(model.active_step.cta_text)
+        else
+          t(model.cta_button_text_key_accessible, resource_name: title, scope: "layouts.decidim.participatory_processes.participatory_process")
+        end
+      end
+
+      def step_cta_path
+        if model.active_step&.cta_path.present?
+          path, params = resource_path.split("?")
+
+          "#{path}/#{model.active_step.cta_path}" + (params.present? ? "?#{params}" : "")
+        else
+          resource_path
+        end
+      end
+
       def step_title
         translated_attribute model.active_step.title
       end

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">
+      <h3 class="section-heading">
+        <%= stats_heading %>
+      </h3>
+
+      <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/create_participatory_process_admin.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new participatory
       # process admin in the system.
-      class CreateParticipatoryProcessAdmin < Rectify::Command
+      class CreateParticipatoryProcessAdmin < NotifyRoleAssignedToParticipatoryProcess
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -61,6 +61,7 @@ module Decidim
             role_params,
             extra_info
           )
+          send_notification user
         end
 
         def existing_role

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

@@ -45,11 +45,11 @@ module Decidim
               form.current_user
             ) do
               ParticipatoryProcessGroup.create(
+                organization: form.current_organization,
                 name: form.name,
                 description: form.description,
-                hero_image: form.hero_image,
-                participatory_processes: participatory_processes,
-                organization: form.current_organization
+                hero_image: form.hero_image, # Keep after organization
+                participatory_processes: participatory_processes
               )
             end
           end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # A command to notify users when a role is assigned for a participatory process
+      class NotifyRoleAssignedToParticipatoryProcess < Rectify::Command
+        def send_notification(user)
+          Decidim::EventsManager.publish(
+            event: "decidim.events.participatory_process.role_assigned",
+            event_class: Decidim::ParticipatoryProcessRoleAssignedEvent,
+            resource: form.current_participatory_space,
+            affected_users: [user],
+            extra: {
+              role: form.role
+            }
+          )
+        end
+      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
@@ -56,15 +57,12 @@ module Decidim
             subtitle: form.subtitle,
             slug: form.slug,
             hashtag: form.hashtag,
-            hero_image: form.hero_image,
-            remove_hero_image: form.remove_hero_image,
-            banner_image: form.banner_image,
-            remove_banner_image: form.remove_banner_image,
             promoted: form.promoted,
             description: form.description,
             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,9 +74,27 @@ 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
-          }
+          }.merge(uploader_attributes)
+        end
+
+        def uploader_attributes
+          {
+            hero_image: form.hero_image,
+            remove_hero_image: form.remove_hero_image,
+            banner_image: form.banner_image,
+            remove_banner_image: form.remove_banner_image
+          }.delete_if { |_k, val| val.is_a?(Decidim::ApplicationUploader) }
+        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