decidim-participatory_processes 0.19.1 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26796587924ddffda370cd31f84fe2356197e4a772670d73621b4d49eb3b48ec
-  data.tar.gz: a580378c67f87b97d994f45afbe1633fc7dc75df0e2deb0489d74f8470be41aa
+  metadata.gz: faabe7f59e3cc5a0625d6a45979797b88f4cc246636eb815c0a88128679a750d
+  data.tar.gz: ef172c49e6002b52e0c56e457c76c68243fffbbef389b65493dc2b6c59b8f84e
 SHA512:
-  metadata.gz: 69e91a8fd76b7fe47d34fab56a3607713654efebbabedd88a21624ec23763c5f6524a418a3313372adac0417834174e9541ff798cadf26704dfa3766164462a7
-  data.tar.gz: e864877ec2478044dafda6763b939e197dc426541ed0d7a6889c5b0c2e52e7c1ea5f0a91978d0aa38d0190eb01ff4a346c3fded112e2df73685cea6fb1293237
+  metadata.gz: 3897d23fe32bec47ff1e0fc9e7901b22b7c2ff9fda14261ede73b8b599f6f48e193fa5293108b7bee55137c9c7720a57808379586c5d1e37b6c06f5aaa7c56b9
+  data.tar.gz: 27e519bfd6047e7bd91c71a5b7e2c0ec077becaa0e38a8c607844126077c01d5c50334e996c973db0c66074368e03400581d4d29eee36c23d629b5dd612ba6b7

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,
@@ -106,15 +108,12 @@ module Decidim
           end
         end
 
-        def create_participatory_process_users(process)
-          return unless form.private_process
+        def related_processes
+          @related_processes ||= Decidim::ParticipatoryProcess.where(id: form.related_process_ids)
+        end
 
-          form.users.each do |user|
-            ParticipatoryProcessUser.create!(
-              participatory_process: process,
-              user: user
-            )
-          end
+        def link_related_processes
+          process.link_participatory_space_resources(related_processes, "related_processes")
         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/import_participatory_process.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # A command with all the business logic when copying a new participatory
+      # process in the system.
+      class ImportParticipatoryProcess < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # form - A form object with the params.
+        # participatory_process - A participatory_process we want to duplicate
+        def initialize(form)
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          transaction do
+            import_participatory_process
+            add_admins_as_followers(@imported_process)
+          end
+
+          broadcast(:ok, @imported_process)
+        end
+
+        private
+
+        attr_reader :form
+
+        def import_participatory_process
+          importer = Decidim::ParticipatoryProcesses::ParticipatoryProcessImporter.new(form.current_organization, form.current_user)
+          participatory_processes.each do |original_process|
+            @imported_process = importer.import(original_process, form.current_user, title: form.title, slug: form.slug)
+            importer.import_participatory_process_steps(original_process["participatory_process_steps"]) if form.import_steps?
+            importer.import_categories(original_process["participatory_process_categories"]) if form.import_categories?
+            importer.import_folders_and_attachments(original_process["attachments"]) if form.import_attachments?
+            importer.import_components(original_process["components"]) if form.import_components?
+          end
+        end
+
+        def participatory_processes
+          document_parsed(form.document_text)
+        end
+
+        def document_parsed(document_text)
+          JSON.parse(document_text)
+        end
+
+        def add_admins_as_followers(process)
+          process.organization.admins.each do |admin|
+            form = Decidim::FollowForm
+                   .from_params(followable_gid: process.to_signed_global_id.to_s)
+                   .with_context(
+                     current_organization: process.organization,
+                     current_user: admin
+                   )
+
+            Decidim::CreateFollow.new(form, admin).call
+          end
+        end
+      end
+    end
+  end
+end