decidim-participatory_processes 0.14.4 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c080d184240a12b00b2c68d9d739a530db4b7d58882f11b224f61bffdcff95ce
-  data.tar.gz: a75d115ba8907ec7b9f8a2c0615812997bf7ad2a4892f854aa6f890b3d4d0d18
+  metadata.gz: 22c6a7d1d0ff6b9f04b5ae67b13933ad9f5a14906df2d6cd6a497f70944c77d0
+  data.tar.gz: bf8c2845f9fb7c18aa27067defcf7ec2250ab20062c306afa9e8474f132256cd
 SHA512:
-  metadata.gz: d2f640db09723a405806276d6bce5b926f0b51c3fc2f1805740dcdb442f1a107c000c084e596761b79731af289b88ad97aa59ab21b75d570811122db8be3adb7
-  data.tar.gz: 1f201e57e119d1d49d1e20f6a9285ed4cdf7785cdb7bf84a64757da6d3eeedd21fa850939af523a35954a98fe8452080a3279279c22c2c4158385fc83072020b
+  metadata.gz: 25066cacb2a64421e674c74d29058bf915823785d88ddcbb4994b81257ff88b70e26ab713484708ce6df73d5471d1c57c22ba96016f1e34de50377bd20c26896
+  data.tar.gz: 8e15e23241935eeea49821dc8f710cd5e8996bf55a0b6430aa627656e2ff62873cc9b9391dba2a19136d7ba7bb74159e1f5bdc910da569f04ba38d4fcfe4db93

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

@@ -7,8 +7,14 @@ $(() => {
     $loading.hide();
 
     $processesGrid.on("click", filterLinksSelector, (event) => {
-      const $target = $(event.target);
       const $processesGridCards = $processesGrid.find(".card-grid .column");
+      let $target = $(event.target);
+
+      // IE11 matches the <strong> element inside the filtering anchor element
+      // as the `event.target` breaking the functionality below.
+      if (!$target.is("a")) {
+        $target = $target.parents("a");
+      }
 
       $(filterLinksSelector).removeClass("is-active");
       $target.addClass("is-active");

data/app/cells/decidim/participatory_process_activity_cell.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A cell to display when a Participatory Process has been published.
+  class ParticipatoryProcessActivityCell < ActivityCell
+    def title
+      I18n.t "decidim.participatory_processes.last_activity.new_participatory_process"
+    end
+  end
+end

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

@@ -21,10 +21,16 @@ module Decidim
           highlighted_processes.to_a.length == 1
         end
 
+        def max_results
+          model.settings.max_results
+        end
+
         def highlighted_processes
-          OrganizationPublishedParticipatoryProcesses.new(current_organization, current_user) |
+          @highlighted_processes ||= (
+            OrganizationPublishedParticipatoryProcesses.new(current_organization, current_user) |
             HighlightedParticipatoryProcesses.new |
             FilteredParticipatoryProcesses.new("active")
+          ).query.limit(max_results)
         end
 
         def i18n_scope

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

@@ -0,0 +1,3 @@
+<% form.fields_for :settings, form.object.settings do |settings_fields| %>
+  <%= settings_fields.select :max_results, [4, 8, 12], prompt: "", label: label %>
+<% end %>

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module ContentBlocks
+      class HighlightedProcessesSettingsFormCell < Decidim::ViewModel
+        alias form model
+
+        def content_block
+          options[:content_block]
+        end
+
+        def label
+          I18n.t("decidim.participatory_processes.admin.content_blocks.highlighted_processes.max_results")
+        end
+      end
+    end
+  end
+end

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

@@ -24,7 +24,7 @@ module Decidim
           return broadcast(:invalid) if process.nil? || process.published?
 
           transaction do
-            Decidim.traceability.perform_action!("publish", process, current_user) do
+            Decidim.traceability.perform_action!("publish", process, current_user, visibility: "all") do
               process.publish!
             end
           end

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

@@ -44,6 +44,8 @@ module Decidim
 
         def attributes
           {
+            cta_path: form.cta_path,
+            cta_text: form.cta_text,
             title: form.title,
             start_date: form.start_date,
             end_date: form.end_date,

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

@@ -23,8 +23,8 @@ module Decidim
 
         mimic :participatory_process
 
-        attribute :start_date, Date
-        attribute :end_date, Date
+        attribute :start_date, Decidim::Attributes::LocalizedDate
+        attribute :end_date, Decidim::Attributes::LocalizedDate
         attribute :slug, String
         attribute :hashtag, String
         attribute :promoted, Boolean

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

@@ -11,13 +11,16 @@ module Decidim
 
         translatable_attribute :title, String
         translatable_attribute :description, String
+        translatable_attribute :cta_text, String
 
         mimic :participatory_process_step
 
-        attribute :start_date, Date
-        attribute :end_date, Date
+        attribute :start_date, Decidim::Attributes::LocalizedDate
+        attribute :end_date, Decidim::Attributes::LocalizedDate
+        attribute :cta_path, String
 
         validates :title, translatable_presence: true
+        validates :cta_path, format: { with: %r{\A[a-zA-Z]+[a-zA-Z0-9\-\_/]+\z} }, allow_blank: true
 
         validates :start_date, date: { before: :end_date, allow_blank: true, if: proc { |obj| obj.end_date.present? } }
         validates :end_date, date: { after: :start_date, allow_blank: true, if: proc { |obj| obj.start_date.present? } }

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

@@ -17,6 +17,8 @@ module Decidim
 
         def diff_fields_mapping
           {
+            cta_path: :string,
+            cta_text: :i18n,
             description: :i18n,
             title: :i18n
           }

data/app/queries/decidim/participatory_processes/metrics/participatory_processes_metric_manage.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Metrics
+      class ParticipatoryProcessesMetricManage < Decidim::MetricManage
+        def metric_name
+          "participatory_processes"
+        end
+
+        private
+
+        def query
+          return @query if @query
+
+          @query = Decidim::ParticipatoryProcess.where(organization: @organization)
+          @query = @query.where("decidim_participatory_processes.published_at <= ?", end_time)
+          @query
+        end
+
+        def quantity
+          @quantity ||= query.where("decidim_participatory_processes.published_at >= ?", start_time).count
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+<%= javascript_include_tag "decidim/slug_form" %>
+
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title"><%= title %></h2>
@@ -21,5 +23,17 @@
         <%= form.date_field :end_date %>
       </div>
     </div>
+
+    <div class="row">
+      <div class="columns xlarge-6 slug">
+        <%= form.text_field :cta_path %>
+        <p class="help-text"><%== t(".cta_path_help", url: decidim_form_slug_url("processes/" + current_participatory_process.slug, form.object.cta_path)) %></p>
+      </div>
+
+      <div class="columns xlarge-6">
+        <%= form.translated :text_field, :cta_text %>
+        <p class="help-text"><%= t(".cta_text_help") %></p>
+      </div>
+    </div>
   </div>
 </div>

data/app/views/decidim/participatory_processes/participatory_processes/index.js.erb

@@ -1,8 +1,6 @@
-$(() => {
-  const $grid = $('#processes-grid');
-  const $loading = $grid.find('.loading');
+var $grid = $('#processes-grid');
+var $loading = $grid.find('.loading');
 
-  $grid.find('.card-grid').html('<%= j(render(collection)).strip.html_safe %>');
-  $grid.find('.processes-grid-order-by').html('<%= j(render(partial: "decidim/participatory_processes/participatory_processes/order_by_processes", locals: { include_filter: true })).strip.html_safe %>');
-  $loading.hide();
-});
+$grid.find('.card-grid').html('<%= j(render(collection)).strip.html_safe %>');
+$grid.find('.processes-grid-order-by').html('<%= j(render(partial: "decidim/participatory_processes/participatory_processes/order_by_processes", locals: { include_filter: true })).strip.html_safe %>');
+$loading.hide();

data/app/views/layouts/decidim/_process_header_steps.html.erb

@@ -1,7 +1,7 @@
 <% if participatory_process.steps.any? %>
   <div class="columns mediumlarge-3">
-    <div class="process-header__phase">
-      <div class="process-header__progress show-for-medium">
+    <div class="process-phase">
+      <div class="process-header__progress">
         <ol>
           <% past_step = true %>
           <% participatory_process.steps.each_with_index do |step, index| %>
@@ -15,13 +15,27 @@
         </ol>
         <span class="phase-current"><%= t(".step", current: (participatory_process.active_step.position + 1), total: current_participatory_space.steps.count) %></span>
       </div>
-      <div>
-        <span class="phase-title"><%= translated_attribute participatory_process.active_step.title %></span>
-        <span class="phase-date">
-          <%= participatory_space_helpers.step_dates participatory_process.active_step %>
-        </span>
+      <div class="process-header__body">
+        <div>
+          <span class="phase-title"><%= translated_attribute participatory_process.active_step.title %></span>
+          <span class="phase-date">
+            <%= participatory_space_helpers.step_dates participatory_process.active_step %>
+          </span>
+        </div>
+        <% cta_text = translated_attribute(participatory_process.active_step.cta_text) %>
+        <% if participatory_process.active_step.cta_path.present? && cta_text.present? %>
+          <div class="process-header__button">
+            <%= link_to(
+              cta_text,
+              participatory_process.active_step.cta_path,
+              class: "button button-sc"
+            ) %>
+          </div>
+        <% end %>
+        <div class="process-header__link">
+          <%= link_to t(".view_steps"), decidim_participatory_processes.participatory_process_participatory_process_steps_path(current_participatory_space) %>
+        </div>
       </div>
-      <%= link_to t(".view_steps"), decidim_participatory_processes.participatory_process_participatory_process_steps_path(current_participatory_space), class: "button tiny hollow" %>
     </div>
   </div>
 <% end %>

data/app/views/layouts/decidim/admin/participatory_process.html.erb

@@ -1,6 +1,7 @@
 <% content_for :secondary_nav do %>
   <div class="secondary-nav secondary-nav--subnav">
     <ul>
+      <%= public_page_link decidim_participatory_processes.participatory_process_path(current_participatory_space) %>
       <% if allowed_to? :update, :process, process: current_participatory_space %>
         <li <% if is_active_link?(decidim_admin_participatory_processes.edit_participatory_process_path(current_participatory_space)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.edit_participatory_process_path(current_participatory_space) %>

data/config/locales/ca.yml

@@ -35,6 +35,8 @@ ca:
         name: Nom
         participatory_process_ids: Processos relacionats
       participatory_process_step:
+        cta_path: Ruta del botó d'acció
+        cta_text: Text del botó d'acció
         description: Descripció
         end_date: Data de finalització
         short_description: Descripció breu
@@ -255,6 +257,10 @@ ca:
           notification_title: Les dates de la fase <a href="%{resource_path}">%{resource_title}</a> a <a href="%{participatory_space_url}">%{participatory_space_title}</a> s'han actualitzat.
     menu:
       processes: Processos
+    metrics:
+      participatory_processes:
+        object: processos participatius
+        title: Processos participatius
     participatory_process_groups:
       show:
         group_participatory_processes:
@@ -267,9 +273,16 @@ ca:
         title: Fases del procés participatiu
     participatory_processes:
       admin:
+        content_blocks:
+          highlighted_processes:
+            max_results: Quantitat màxima d'elements que es mostraran
         participatory_process_copies:
           form:
             slug_help: 'Els noms curts d''URL s''utilitzen per generar els URL que apunten a aquest procés. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
+        participatory_process_steps:
+          form:
+            cta_path_help: 'Utilitza rutes parcials, no URL complerts aquí. Accepta lletres, números, guions i barres, i ha de començar amb una lletra. Si no s''estableix cap ruta, el botó no es mostrarà. Exemple: %{url}'
+            cta_text_help: Si no s'estableix cap ruta el botó no es mostrarà.
         participatory_processes:
           form:
             announcement_help: El text que introdueixis aquí es mostrarà a l'usuari just a sota de la informació del procés.
@@ -279,6 +292,8 @@ ca:
           name: Processos destacats
       index:
         title: Processos participatius
+      last_activity:
+        new_participatory_process: Nou procés participatiu
       pages:
         home:
           highlighted_processes:

data/config/locales/de.yml

@@ -35,6 +35,8 @@ de:
         name: Name
         participatory_process_ids: Ähnliche Prozesse
       participatory_process_step:
+        cta_path: Aufruf zum Aktionspfad
+        cta_text: Call to Action-Text
         description: Beschreibung
         end_date: Endtermin
         short_description: Kurze Beschreibung
@@ -255,6 +257,10 @@ de:
           notification_title: Die Daten für den <a href="%{resource_path}">%{resource_title}</a> Schritt bei <a href="%{participatory_space_url}">%{participatory_space_title}</a> wurden aktualisiert.
     menu:
       processes: Prozesse
+    metrics:
+      participatory_processes:
+        object: partizipative Prozesse
+        title: Partizipative Prozesse
     participatory_process_groups:
       show:
         group_participatory_processes:
@@ -267,9 +273,16 @@ de:
         title: Partizipative Prozessschritte
     participatory_processes:
       admin:
+        content_blocks:
+          highlighted_processes:
+            max_results: Maximale Anzahl der Elemente, die angezeigt werden sollen
         participatory_process_copies:
           form:
             slug_help: 'URL-Slugs werden zum Generieren der URLs verwendet, die auf diesen Prozess verweisen. Akzeptiert nur Buchstaben, Zahlen und Bindestriche und muss mit einem Buchstaben beginnen. Beispiel: %{url}'
+        participatory_process_steps:
+          form:
+            cta_path_help: 'Verwenden Sie hier Teilpfade, nicht vollständige URLs. Akzeptiert Buchstaben, Zahlen, Bindestriche und Schrägstriche und muss mit einem Buchstaben beginnen. Wenn nicht eingestellt, wird die Schaltfläche nicht angezeigt. Beispiel: %{url}'
+            cta_text_help: Wenn nicht eingestellt, wird die Schaltfläche nicht angezeigt.
         participatory_processes:
           form:
             announcement_help: Der Text, den Sie hier eingeben, wird dem Benutzer direkt unter den Prozessinformationen angezeigt.
@@ -279,6 +292,8 @@ de:
           name: Markierte Prozesse
       index:
         title: Partizipative Prozesse
+      last_activity:
+        new_participatory_process: Neuer partizipativer Prozess
       pages:
         home:
           highlighted_processes:

data/config/locales/en.yml

@@ -36,6 +36,8 @@ en:
         name: Name
         participatory_process_ids: Related processes
       participatory_process_step:
+        cta_path: Call to Action path
+        cta_text: Call to Action text
         description: Description
         end_date: End date
         short_description: Short description
@@ -256,6 +258,10 @@ en:
           notification_title: The dates for the <a href="%{resource_path}">%{resource_title}</a> step at <a href="%{participatory_space_url}">%{participatory_space_title}</a> have been updated.
     menu:
       processes: Processes
+    metrics:
+      participatory_processes:
+        object: participatory processes
+        title: Participatory processes
     participatory_process_groups:
       show:
         group_participatory_processes:
@@ -268,9 +274,16 @@ en:
         title: Participatory process steps
     participatory_processes:
       admin:
+        content_blocks:
+          highlighted_processes:
+            max_results: Maximum amount of elements to show
         participatory_process_copies:
           form:
             slug_help: 'URL slugs are used to generate the URLs that point to this process. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
+        participatory_process_steps:
+          form:
+            cta_path_help: 'Use partial paths, not full URLs here. Accepts letters, numbers, dashes and slashes, and must start with a letter. If not set, the button will not be shown. Example: %{url}'
+            cta_text_help: If not set, the button will not be shown.
         participatory_processes:
           form:
             announcement_help: The text you enter here will be shown to the user right below the process information.
@@ -280,6 +293,8 @@ en:
           name: Highlighted processes
       index:
         title: Participatory processes
+      last_activity:
+        new_participatory_process: New participatory process
       pages:
         home:
           highlighted_processes:

data/config/locales/es-PY.yml

@@ -35,6 +35,8 @@ es-PY:
         name: Nombre
         participatory_process_ids: Procesos relacionados
       participatory_process_step:
+        cta_path: Ruta de llamada a la acción
+        cta_text: Texto de llamada a la acción
         description: Descripción
         end_date: Fecha de finalización
         short_description: Descripción breve
@@ -255,6 +257,10 @@ es-PY:
           notification_title: Se han actualizado las fechas de la fase <a href="%{resource_path}">%{resource_title}</a> en <a href="%{participatory_space_url}">%{participatory_space_title}</a>.
     menu:
       processes: Procesos
+    metrics:
+      participatory_processes:
+        object: procesos participativos
+        title: Procesos participativos
     participatory_process_groups:
       show:
         group_participatory_processes:
@@ -267,9 +273,16 @@ es-PY:
         title: Fases del proceso participativo
     participatory_processes:
       admin:
+        content_blocks:
+          highlighted_processes:
+            max_results: Cantidad máxima de elementos para mostrar
         participatory_process_copies:
           form:
             slug_help: 'Los textos cortos de URL se utilizan para generar las URL que apuntan a este proceso. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
+        participatory_process_steps:
+          form:
+            cta_path_help: 'Use rutas parciales, no URL completas aquí. Acepta letras, números, guiones y barras, y debe comenzar con una letra. Si no está configurado, el botón no se mostrará. Ejemplo: %{url}'
+            cta_text_help: Si no está configurado, el botón no se mostrará.
         participatory_processes:
           form:
             announcement_help: El texto que ingreses aquí se mostrará al usuario justo debajo de la información del proceso.
@@ -279,6 +292,8 @@ es-PY:
           name: Procesos destacados
       index:
         title: Procesos participativos
+      last_activity:
+        new_participatory_process: Nuevo proceso participativo
       pages:
         home:
           highlighted_processes: