decidim-participatory_processes 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d739759631aca0408a7ae0aba4ff332eae1e0f2f0da9687baa753fdecfb1882
-  data.tar.gz: 5db3ca8acfbc423b83176a45dd67bc6b24083824264b367ccdc7b603b1b8bb68
+  metadata.gz: 4c87d3748ed5ddda107431eccbde08c257a669a9b0b6b87010cfc6dd1f6f5450
+  data.tar.gz: 5a984b08e37fb702a0f8cc425189782e7acc298fe0f933d02b68c2f171ec9106
 SHA512:
-  metadata.gz: 71fd380d50a0bf51fac1e84ee82de34dae3c8412ddac11e7f102d91809f928af6c6d62e58c2809649067aeabcdbf8fb4992831a37876567f372901d177809b06
-  data.tar.gz: c33eca9c58ce8cb093178232584a70916ccc314920de56443475abf129363d94e0f8cd86840ad1ae29536cbadbb8252b490ddaa93ce88002e613fd6432d00e97
+  metadata.gz: 04cb2351dd62f27e32155fe620953c7524216925686bef5be09d6fe30bfdebcdc12d45a79e577f414438c06cee0bc0a7f8396976386058bc2f40a21e5e21baa5
+  data.tar.gz: 30dbc6a09f4f3f5c5f417b0a1c9be50c4bca044b415aea17364dd9623bd86f4c188635528e87f74a9d4ed97a0cb8a0f8142eed1706415f3264118d9237585eb7

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(resource_path, class: "card__button button button--sc small") do %>
+      <span class="show-for-sr"><%= t(model.cta_button_text_key_accessible, resource_name: title, scope: "layouts.decidim.participatory_processes.participatory_process") %></span>
+      <%= t(model.cta_button_text_key, scope: "layouts.decidim.participatory_processes.participatory_process") %>
+    <% 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,8 @@ module Decidim
     # This cell renders the Medium (:m) process card
     # for an given instance of a Process
     class ProcessMCell < Decidim::CardMCell
+      include Decidim::SanitizeHelper
+
       private
 
       def has_image?

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

@@ -1,9 +1,9 @@
 <section class="row statistics" id="participatory_process-statistics">
   <div class="columns large-8">
     <div class="row column">
-      <h4 class="section-heading">
+      <h3 class="section-heading">
         <%= stats_heading %>
-      </h4>
+      </h3>
 
       <div class="process-stats">
         <% if model.present? %>

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/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_admin.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updated a participatory
       # process admin in the system.
-      class UpdateParticipatoryProcessAdmin < Rectify::Command
+      class UpdateParticipatoryProcessAdmin < NotifyRoleAssignedToParticipatoryProcess
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -47,6 +47,8 @@ module Decidim
             { role: form.role },
             extra_info
           )
+
+          send_notification user_role.user
         end
       end
     end

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

@@ -15,7 +15,8 @@ module Decidim
                     :stats,
                     :metrics,
                     :default_date_filter,
-                    :related_processes
+                    :related_processes,
+                    :linked_assemblies
 
       def index
         raise ActionController::RoutingError, "Not Found" if published_processes.none?
@@ -29,7 +30,11 @@ module Decidim
       end
 
       def all_metrics
-        enforce_permission_to :read, :process, process: current_participatory_space
+        if current_participatory_space.show_statistics
+          enforce_permission_to :read, :process, process: current_participatory_space
+        else
+          render status: :not_found
+        end
       end
 
       private
@@ -106,6 +111,10 @@ module Decidim
           .published
           .all
       end
+
+      def linked_assemblies
+        @linked_assemblies ||= current_participatory_space.linked_participatory_space_resources(:assembly, "included_participatory_processes").public_spaces
+      end
     end
   end
 end

data/app/events/decidim/participatory_process_role_assigned_event.rb

@@ -0,0 +1,28 @@
+# frozen-string_literal: true
+
+module Decidim
+  class ParticipatoryProcessRoleAssignedEvent < Decidim::Events::SimpleEvent
+    include Decidim::Events::NotificationEvent
+    include Decidim::Events::AuthorEvent
+
+    def notification_title
+      I18n.t("notification_title", i18n_options).html_safe
+    end
+
+    def i18n_role
+      I18n.t(extra["role"], "decidim.admin.models.participatory_process_user_role.roles", default: extra["role"])
+    end
+
+    def i18n_options
+      {
+        resource_path: resource_path,
+        resource_title: resource_title,
+        resource_url: resource_url,
+        scope: event_name,
+        participatory_space_title: participatory_space_title,
+        participatory_space_url: participatory_space_url,
+        role: i18n_role
+      }
+    end
+  end
+end

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

@@ -8,8 +8,8 @@ module Decidim
 
       def params
         capture do
-          concat(content_tag(:input, nil, type: :hidden, id: :"metrics-space_type", value: participatory_process.class))
-          concat(content_tag(:input, nil, type: :hidden, id: :"metrics-space_id", value: participatory_process.id))
+          concat(hidden_field_tag(:metrics_space_type, value: participatory_process.class, id: :"metrics-space_type"))
+          concat(hidden_field_tag(:metrics_space_id, value: participatory_process.id, id: :"metrics-space_id"))
         end
       end
 

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

@@ -49,8 +49,8 @@ module Decidim
       end
 
       def endorsements_query
-        Decidim::Proposals::ProposalEndorsement
-          .where(proposal: proposals_components)
+        Decidim::Endorsement
+          .where(resource: space_components)
           .pluck(:decidim_author_id)
           .uniq
       end

data/app/views/decidim/participatory_process_steps/_participatory_process_step.html.erb

@@ -7,7 +7,7 @@
       <span class="timeline__date text-small">
         <%= participatory_space_helpers.step_dates(participatory_process_step) %>
       </span>
-      <h6 class="timeline__title heading6"><%= translated_attribute(participatory_process_step.title) %></h6>
+      <h4 class="timeline__title heading4"><%= translated_attribute(participatory_process_step.title) %></h4>
     </div>
     <div class="timeline__content">
       <%= translated_attribute(participatory_process_step.description).html_safe %>

data/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb

@@ -1,6 +1,7 @@
+<% add_decidim_page_title(translated_attribute(group.name)) %>
 <% add_decidim_meta_tags(title: t("participatory_process_groups.show.title", scope: "decidim")) %>
 
-<main class="wrapper">
+<div class="wrapper">
   <section id="processes-grid" class="section row collapse">
     <h1 class="section-heading"><%= t("participatory_process_groups.show.group_participatory_processes", scope: "decidim", count: participatory_processes.count, group: translated_attribute(group.name)) %></h1>
     <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
@@ -8,4 +9,4 @@
     </div>
   </section>
   <%= render_participatory_processes_hook(:process_group_highlighted_elements) %>
-</main>
+</div>

data/app/views/decidim/participatory_processes/participatory_process_steps/index.html.erb

@@ -1,14 +1,19 @@
 <% add_decidim_page_title(t("participatory_process_steps.index.title", scope: "decidim")) %>
 
-<main class="steps">
+<div class="steps">
   <div class="row column">
     <div class="row">
       <div class="columns mediumlarge-9 large-7">
         <div class="section">
-          <h4 class="section-heading"><%= t("participatory_process_steps.index.process_steps", scope: "decidim") %></h4>
+          <%= link_to participatory_process_path(current_participatory_space), class: "small hollow" do %>
+            <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+            <%= t(".back_to_process") %>
+          <% end %>
+
+          <h3 class="section-heading"><%= t("participatory_process_steps.index.process_steps", scope: "decidim") %></h3>
           <%= render partial: "timeline" %>
         </div>
       </div>
     </div>
   </div>
-</main>
+</div>

data/app/views/decidim/participatory_processes/participatory_processes/_metrics.html.erb

@@ -1,5 +1,5 @@
 <div class="section" id="metrics">
-  <h4 class="section-heading"><%= t("decidim.pages.participatory_space.metrics.headline", name: translated_attribute(current_participatory_space.title)) %></h4>
+  <h3 class="section-heading"><%= t("decidim.pages.participatory_space.metrics.headline", name: translated_attribute(current_participatory_space.title)) %></h3>
   <%= metrics.params %>
   <div class="row mb-sm">
     <%= metrics.highlighted %>

data/app/views/decidim/participatory_processes/participatory_processes/_promoted_process.html.erb

@@ -1,12 +1,13 @@
-<article class="card card--full card--process">
+<div class="card card--full card--process">
   <div class="row collapse card--process__row">
     <div class="columns mediumlarge-8 large-6 card--process__column">
       <div class="card__content">
         <%= link_to participatory_process_path(promoted_process), class: "card__link" do %>
-          <h2 class="card__title"><%= translated_attribute promoted_process.title %></h2>
+          <h2 class="card__title"><%= decidim_html_escape(translated_attribute(promoted_process.title)) %></h2>
         <% end %>
         <%= decidim_sanitize html_truncate(translated_attribute(promoted_process.short_description), length: 630, separator: "...") %>
-        <%= link_to participatory_process_path(promoted_process), class: "button secondary small hollow card__button" do %>
+        <%= link_to participatory_process_path(promoted_process), class: "button small hollow card__button" do %>
+          <span class="show-for-sr"><%= decidim_html_escape(translated_attribute(promoted_process.title)) %></span>
           <%= t("participatory_processes.promoted_process.more_info", scope: "layouts.decidim") %>
         <% end %>
       </div>
@@ -17,7 +18,8 @@
         <div class="card__content row collapse">
           <div class="large-6 large-offset-6 columns">
             <%= link_to participatory_process_path(promoted_process), class: "button expanded button--sc" do %>
-              <%= t(promoted_process.cta_button_text_key, scope: "layouts.decidim.participatory_processes.promoted_process") %>
+              <span class="show-for-sr"><%= t(promoted_process.cta_button_text_key_accessible, resource_name: translated_attribute(promoted_process.title), scope: "layouts.decidim.participatory_processes.promoted_process") %></span>
+              <span aria-hidden="true"><%= t(promoted_process.cta_button_text_key, scope: "layouts.decidim.participatory_processes.promoted_process") %></span>
               <% if promoted_process.active_step %>
                 <span class="button__info">
                   <%= t("participatory_processes.promoted_process.active_step", scope: "layouts.decidim") %> <%= translated_attribute promoted_process.active_step.title %>
@@ -29,4 +31,4 @@
       </div>
     </div>
   </div>
-</article>
+</div>

data/app/views/decidim/participatory_processes/participatory_processes/show.html.erb

@@ -1,17 +1,17 @@
 <% add_decidim_meta_tags({
-  image_url: current_participatory_space.hero_image.url,
-  description: translated_attribute(current_participatory_space.short_description),
-  url: participatory_process_url(current_participatory_space),
-  twitter_handler: current_organization.twitter_handler
-}) %>
+                           image_url: current_participatory_space.hero_image.url,
+                           description: translated_attribute(current_participatory_space.short_description),
+                           url: participatory_process_url(current_participatory_space),
+                           twitter_handler: current_organization.twitter_handler
+                         }) %>
 
 <%
-edit_link(
-  resource_locator(current_participatory_space).edit,
-  :update,
-  :process,
-  process: current_participatory_space
-)
+  edit_link(
+    resource_locator(current_participatory_space).edit,
+    :update,
+    :process,
+    process: current_participatory_space
+  )
 %>
 
 <%= participatory_space_floating_help %>
@@ -48,6 +48,18 @@ edit_link(
           </div>
         </div>
       <% end %>
+
+      <% if linked_assemblies.any? %>
+        <div class="section">
+          <h4 class="section-heading"><%= t("participatory_process.show.related_assemblies", scope: "decidim") %></h4>
+          <div class="row small-up-1 medium-up-2 card-grid">
+            <% linked_assemblies.each do |linked_assembly| %>
+              <%= card_for(linked_assembly) %>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+
     </div>
     <div class="section columns medium-5 mediumlarge-4 large-3">
       <div class="card extra">