decidim-participatory_processes 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: f9cf6eeb0e6515254d2e94e94ee6bc7b6327bca21d5cc64245ef966d79c61b3a
-  data.tar.gz: 30196a2b1379d683d6ee26fd20260ed318db81b5d876eaa9433f0017d63ad21a
+SHA1:
+  metadata.gz: 604dd9b9c2182acdacd43052cbd3fbf9302db06c
+  data.tar.gz: 9bf215dab5af0c36845f5ed40dc38234d003e17d
 SHA512:
-  metadata.gz: a2624b7164c548e27672d3127c11f3235a48dc23fb32f5864d2350cc84ef826ed3b2a4f4b8ca95cff8087f4507a445c72437f2d96321504589669f1c109ee12f
-  data.tar.gz: 1e43a867feb16780c1db2495e782e43207fdffd2a57269cca746ff01f4dd6037f3385f999cfa56c6cebf2be0d5c3d71f1475a2eae444c182c31eccd8afbf2ef2
+  metadata.gz: 42745619d7da5242c45e7186aed4f1fe5f815c54c7cc24c5a3334d7d58f33382c2cbe572b71263b6cb18894ab567cb9bc5cf1af27701bab66370b7abe0dc7f88
+  data.tar.gz: f26e15f8e7759598da963beb804268cb16e93a9c525dfed99cf35ba584095e90565d8734d2fb405e4c344ba854e17d1caeab24278f5a2574fada846a7a557920

data/README.md

@@ -18,6 +18,7 @@ This plugin provides:
   menu.
 
 ## Installation
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -25,12 +26,15 @@ gem 'decidim-participatory_processes'
 ```
 
 And then execute:
+
 ```bash
-$ bundle
+bundle
 ```
 
 ## Contributing
+
 See [Decidim](https://github.com/decidim/decidim).
 
 ## License
+
 See [Decidim](https://github.com/decidim/decidim).

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

@@ -3,6 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     class ParticipatoryProcessGroupsController < Decidim::ApplicationController
+      helper Decidim::SanitizeHelper
       helper_method :participatory_processes, :group, :collection
 
       before_action :set_group

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

@@ -3,6 +3,8 @@
 module Decidim
   module ParticipatoryProcesses
     class ParticipatoryProcessWidgetsController < Decidim::WidgetsController
+      helper Decidim::SanitizeHelper
+
       private
 
       def model

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

@@ -12,6 +12,7 @@ module Decidim
       helper Decidim::AttachmentsHelper
       helper Decidim::IconHelper
       helper Decidim::WidgetUrlsHelper
+      helper Decidim::SanitizeHelper
 
       helper ParticipatoryProcessHelper
 

data/app/models/decidim/participatory_process.rb

@@ -38,7 +38,7 @@ module Decidim
              dependent: :destroy,
              as: :participatory_space
 
-    has_many :features, as: :participatory_space
+    has_many :features, as: :participatory_space, dependent: :destroy
 
     attr_readonly :active_step
 
@@ -48,6 +48,10 @@ module Decidim
     mount_uploader :hero_image, Decidim::HeroImageUploader
     mount_uploader :banner_image, Decidim::BannerImageUploader
 
+    scope :past, -> { where(arel_table[:end_date].lteq(Time.current)) }
+    scope :upcoming, -> { where(arel_table[:start_date].gt(Time.current)) }
+    scope :active, -> { where(arel_table[:start_date].lteq(Time.current).and(arel_table[:end_date].gt(Time.current).or(arel_table[:end_date].eq(nil)))) }
+
     # Scope to return only the promoted processes.
     #
     # Returns an ActiveRecord::Relation.

data/app/models/decidim/participatory_process_group.rb

@@ -5,7 +5,9 @@ module Decidim
     has_many :participatory_processes,
              foreign_key: "decidim_participatory_process_group_id",
              class_name: "Decidim::ParticipatoryProcess",
-             inverse_of: :participatory_process_group
+             inverse_of: :participatory_process_group,
+             dependent: :nullify
+
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
                class_name: "Decidim::Organization"

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

@@ -13,12 +13,14 @@ module Decidim
         processes = Decidim::ParticipatoryProcess.all
 
         case @filter
+        when "all"
+          processes
         when "past"
-          processes.where("decidim_participatory_processes.end_date <= ?", Time.current)
+          processes.past
         when "upcoming"
-          processes.where("decidim_participatory_processes.start_date > ?", Time.current)
+          processes.upcoming
         else
-          processes
+          processes.active
         end
       end
     end

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

@@ -3,7 +3,7 @@
     <%= t("participatory_processes.order_by_processes.processes", scope: "layouts.decidim", count: collection.count) %>
     <% if include_filter %>
       <span class="order-by__tabs">
-        <% %w(past active upcoming).each do |filter_name| %>
+        <% %w(past active upcoming all).each do |filter_name| %>
           <%= link_to t(".#{filter_name}"), { filter: filter_name }, remote: true, class: "order-by__tab #{'is-active' if filter == filter_name }" %>
         <% end %>
       </span>

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

@@ -8,7 +8,7 @@
       <%= link_to participatory_process_path(participatory_process), class: "card__link" do %>
         <h4 class="card__title"><%= translated_attribute participatory_process.title %></h4>
       <% end %>
-      <p class="card__desc"><%= sanitize html_truncate(translated_attribute(participatory_process.short_description), length: 630, separator: '...') %></p>
+      <p class="card__desc"><%= decidim_sanitize html_truncate(translated_attribute(participatory_process.short_description), length: 630, separator: '...') %></p>
     </div>
     <div class="card__footer">
       <div class="card__support">

data/app/views/decidim/participatory_processes/pages/home/_highlighted_processes.html.erb

@@ -0,0 +1,35 @@
+<div class="row" id="highlighted-processes">
+  <h3 class="section-heading"><%= t(".active_processes") %></h3>
+  <div class="row collapse">
+    <div class="row small-up-1 smallmedium-up-2 mediumlarge-up-3
+      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 %>
+            <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 %>
+              <% if process.active_step %>
+                <span class="card--process__small">
+                  <%= t(".active_step") %>
+                  <strong><%= translated_attribute process.active_step.title %></strong>
+                </span>
+              <% end %>
+            </div>
+          </article>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>
+<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"), decidim_participatory_processes.participatory_processes_path, class: "button expanded hollow button--sc home-section__cta" %>
+  </div>
+</div>

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

@@ -1,4 +1,4 @@
-<% provide :meta_title, t("participatory_process_groups.show.title", scope: "decidim") %>
+<% add_decidim_meta_tags(title: t("participatory_process_groups.show.title", scope: "decidim")) %>
 
 <main class="wrapper">
   <section id="processes-grid" class="section row collapse">

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

@@ -1,6 +1,6 @@
 <% content_for(:header, "false") %>
 <% content_for(:title, translated_attribute(model.title)) %>
-<p class="card__desc"><%= sanitize html_truncate(translated_attribute(model.short_description), length: 630, separator: '...') %></p>
+<p class="card__desc"><%= decidim_sanitize html_truncate(translated_attribute(model.short_description), length: 630, separator: '...') %></p>
 <% content_for(:footer) do %>
   <div class="card__support">
     <% if model.active_step %>

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

@@ -5,7 +5,7 @@
         <%= link_to participatory_process_path(promoted_process), class: "card__link" do %>
           <h2 class="card__title"><%= translated_attribute promoted_process.title %></h2>
         <% end %>
-        <%= sanitize html_truncate(translated_attribute(promoted_process.short_description), length: 630, separator: '...') %>
+        <%= 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 %>
           <%= t("participatory_processes.promoted_process.more_info", scope: "layouts.decidim") %>
         <% end %>

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

@@ -1,4 +1,4 @@
-<% provide :meta_title, t("participatory_processes.index.title", scope: "decidim") %>
+<% add_decidim_meta_tags(title: t("participatory_processes.index.title", scope: "decidim")) %>
 
 <main class="wrapper">
   <% if promoted_participatory_processes.any? %>

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

@@ -15,67 +15,67 @@
     <div class="columns medium-7 mediumlarge-8">
       <div class="section">
         <div class="lead">
-          <%= sanitize translated_attribute(current_participatory_process.short_description) %>
+          <%= decidim_sanitize translated_attribute(current_participatory_process.short_description) %>
         </div>
-        <%= sanitize translated_attribute(current_participatory_process.description) %>
+        <%= decidim_sanitize translated_attribute(current_participatory_process.description) %>
       </div>
       <%= attachments_for current_participatory_process %>
     </div>
     <div class="section columns medium-5 mediumlarge-4 large-3">
       <div class="card extra definition-data">
-        <% if translated_attribute(current_participatory_process.meta_scope).present? %>
-          <div class="definition-data__item scope">
-            <span class="definition-data__title"><%= t("participatory_processes.show.scope", scope: "decidim") %></span>
-              <%= translated_attribute(current_participatory_process.meta_scope) %>
+        <% if translated_attribute(current_participatory_process.participatory_scope).present? %>
+          <div class="definition-data__item participatory_scope">
+            <span class="definition-data__title"><%= t("participatory_processes.show.participatory_scope", scope: "decidim") %></span>
+            <%= translated_attribute(current_participatory_process.participatory_scope) %>
           </div>
         <% end %>
 
-        <% if current_participatory_process.start_date.present? %>
-          <div class="definition-data__item start-date">
-            <span class="definition-data__title"><%= t("participatory_processes.show.start_date", scope: "decidim") %></span>
-              <%== l(current_participatory_process.start_date, format: :long) %>
+        <% if translated_attribute(current_participatory_process.target).present? %>
+          <div class="definition-data__item target">
+            <span class="definition-data__title"><%= t("participatory_processes.show.target", scope: "decidim") %></span>
+            <%= translated_attribute(current_participatory_process.target) %>
           </div>
         <% end %>
 
-        <% if current_participatory_process.end_date.present? %>
-          <div class="definition-data__item end-date">
-            <span class="definition-data__title"><%= t("participatory_processes.show.end_date", scope: "decidim") %></span>
-              <%== l(current_participatory_process.end_date, format: :long) %>
+        <% if translated_attribute(current_participatory_process.participatory_structure).present? %>
+          <div class="definition-data__item participatory_structure">
+            <span class="definition-data__title"><%= t("participatory_processes.show.participatory_structure", scope: "decidim") %></span>
+            <%= translated_attribute(current_participatory_process.participatory_structure) %>
           </div>
         <% end %>
 
-        <% if translated_attribute(current_participatory_process.developer_group).present? %>
-          <div class="definition-data__item developer-group">
-            <span class="definition-data__title"><%= t("participatory_processes.show.developer_group", scope: "decidim") %></span>
-              <%= translated_attribute(current_participatory_process.developer_group) %>
+        <% if translated_attribute(current_participatory_process.meta_scope).present? %>
+          <div class="definition-data__item scope">
+            <span class="definition-data__title"><%= t("participatory_processes.show.scope", scope: "decidim") %></span>
+              <%= translated_attribute(current_participatory_process.meta_scope) %>
           </div>
         <% end %>
 
         <% if translated_attribute(current_participatory_process.local_area).present? %>
           <div class="definition-data__item local_area">
             <span class="definition-data__title"><%= t("participatory_processes.show.local_area", scope: "decidim") %></span>
-              <%= translated_attribute(current_participatory_process.local_area) %>
+            <%= translated_attribute(current_participatory_process.local_area) %>
           </div>
         <% end %>
 
-         <% if translated_attribute(current_participatory_process.target).present? %>
-          <div class="definition-data__item target">
-            <span class="definition-data__title"><%= t("participatory_processes.show.target", scope: "decidim") %></span>
-              <%= translated_attribute(current_participatory_process.target) %>
+        <% if translated_attribute(current_participatory_process.developer_group).present? %>
+          <div class="definition-data__item developer-group">
+            <span class="definition-data__title"><%= t("participatory_processes.show.developer_group", scope: "decidim") %></span>
+            <%= translated_attribute(current_participatory_process.developer_group) %>
           </div>
         <% end %>
 
-         <% if translated_attribute(current_participatory_process.participatory_scope).present? %>
-          <div class="definition-data__item participatory_scope">
-            <span class="definition-data__title"><%= t("participatory_processes.show.participatory_scope", scope: "decidim") %></span>
-              <%= translated_attribute(current_participatory_process.participatory_scope) %>
+        <% if current_participatory_process.start_date.present? %>
+          <div class="definition-data__item start-date">
+            <span class="definition-data__title"><%= t("participatory_processes.show.start_date", scope: "decidim") %></span>
+              <%== l(current_participatory_process.start_date, format: :long) %>
           </div>
         <% end %>
 
-        <% if translated_attribute(current_participatory_process.participatory_structure).present? %>
-          <div class="definition-data__item participatory_structure">
-            <span class="definition-data__title"><%= t("participatory_processes.show.participatory_structure", scope: "decidim") %></span>
-              <%= translated_attribute(current_participatory_process.participatory_structure) %>
+        <% if current_participatory_process.end_date.present? %>
+          <div class="definition-data__item end-date">
+            <span class="definition-data__title"><%= t("participatory_processes.show.end_date", scope: "decidim") %></span>
+              <%== l(current_participatory_process.end_date, format: :long) %>
           </div>
         <% end %>
       </div>

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

@@ -17,7 +17,7 @@
           <ul>
             <% current_participatory_process.features.each do |feature| %>
               <% if feature.manifest.admin_engine %>
-                <li <% if is_active_link?(manage_feature_path(feature)) %> class="is-active" <% end %>>
+                <li <% if is_active_link?(manage_feature_path(feature)) || is_active_link?(decidim_admin_participatory_processes.edit_feature_path(current_participatory_process, feature)) || is_active_link?(decidim_admin_participatory_processes.edit_feature_permissions_path(current_participatory_process, feature)) %> class="is-active" <% end %>>
                   <%= link_to manage_feature_path(feature) do %>
                     <%= translated_attribute feature.name %>
                     <% if feature.primary_stat.present? %>

data/config/locales/ca.yml

@@ -26,7 +26,7 @@ ca:
         start_date: Data d'inici
         subtitle: Subtítol
         target: A qui va dirigit
-        title: Grup de processos participatius
+        title: Títol
       participatory_process_group:
         description: Descripció
         hero_image: Imatge
@@ -37,7 +37,7 @@ ca:
         end_date: Data de finalització
         short_description: Descripció breu
         start_date: Data d'inici
-        title: Grup de processos participatius
+        title: Títol
       participatory_process_user_role:
         email: Correu electrònic
         name: Nom
@@ -73,7 +73,7 @@ ca:
             created_at: Data de creació
             promoted: Destacat
             published: Publicat
-            title: Grup de processos participatius
+            title: Títol
           name: Procés participatiu
         participatory_process_group:
           fields:
@@ -83,7 +83,7 @@ ca:
           fields:
             end_date: Data de finalització
             start_date: Data d'inici
-            title: Grup de processos participatius
+            title: Títol
           name: Name
         participatory_process_user_role:
           fields:
@@ -206,7 +206,7 @@ ca:
     participatory_process_groups:
       show:
         group_participatory_processes: Processos per a %{group}
-        title: Grup de processos participatius
+        title: Grups de processos participatius
     participatory_process_steps:
       index:
         process_steps: Fases del procés
@@ -223,8 +223,15 @@ ca:
         title: Processos participatius
       order_by_processes:
         active: Actius
+        all: Tots
         past: Passats
         upcoming: Propers
+      pages:
+        home:
+          highlighted_processes:
+            active_processes: Processos actius
+            active_step: Pas actiu
+            see_all_processes: Veure tots els processos
       participatory_process_groups:
         none: Cap
       participatory_processes:
@@ -233,12 +240,12 @@ ca:
       show:
         developer_group: Grup promotor
         end_date: Data de finalització
-        local_area: Àrea municipal
-        participatory_scope: Àmbit participatiu
-        participatory_structure: Estructura participativa
+        local_area: Àrea d'organització
+        participatory_scope: Què es decideix
+        participatory_structure: Com es decideix
         scope: Àmbit
         start_date: Data d'inici
-        target: A qui va dirigit
+        target: Qui participa
       statistics:
         answers_count: Respostes
         comments_count: Comentaris

data/config/locales/en.yml

@@ -206,7 +206,7 @@ en:
     participatory_process_groups:
       show:
         group_participatory_processes: Processes for %{group}
-        title: Title
+        title: Participatory process groups
     participatory_process_steps:
       index:
         process_steps: Process steps
@@ -223,8 +223,15 @@ en:
         title: Participatory processes
       order_by_processes:
         active: Active
+        all: All
         past: Past
         upcoming: Upcoming
+      pages:
+        home:
+          highlighted_processes:
+            active_processes: Active processes
+            active_step: Active step
+            see_all_processes: See all processes
       participatory_process_groups:
         none: None
       participatory_processes:
@@ -233,12 +240,12 @@ en:
       show:
         developer_group: Developer group
         end_date: End date
-        local_area: Local area
-        participatory_scope: Participatory scope
-        participatory_structure: Participatory structure
+        local_area: Organization Area
+        participatory_scope: What is decided
+        participatory_structure: How is it decided
         scope: Scope
         start_date: Start date
-        target: Target
+        target: Who participates
       statistics:
         answers_count: Answers
         comments_count: Comments

data/config/locales/es.yml

@@ -26,7 +26,7 @@ es:
         start_date: Fecha de inicio
         subtitle: Subtítulo
         target: "¿A quién va dirigida?"
-        title: Grupo de procesos participativos
+        title: Título
       participatory_process_group:
         description: Descripción
         hero_image: Imagen
@@ -37,7 +37,7 @@ es:
         end_date: Fecha de finalización
         short_description: Descripción breve
         start_date: Fecha de inicio
-        title: Grupo de procesos participativos
+        title: Título
       participatory_process_user_role:
         email: Correo electrónico
         name: Nombre
@@ -73,7 +73,7 @@ es:
             created_at: Fecha de creación
             promoted: Destacado
             published: Publicada
-            title: Grupo de procesos participativos
+            title: Título
           name: Proceso participativo
         participatory_process_group:
           fields:
@@ -83,7 +83,7 @@ es:
           fields:
             end_date: Fecha de finalización
             start_date: Fecha de inicio
-            title: Grupo de procesos participativos
+            title: Título
           name: Fase de proceso participativo
         participatory_process_user_role:
           fields:
@@ -206,7 +206,7 @@ es:
     participatory_process_groups:
       show:
         group_participatory_processes: Procesos para %{group}
-        title: Grupo de procesos participativos
+        title: Grupos de procesos participativos
     participatory_process_steps:
       index:
         process_steps: Las fases de proceso
@@ -223,8 +223,15 @@ es:
         title: Procesos participativos
       order_by_processes:
         active: Activa
+        all: Todos
         past: Pasadas
         upcoming: Próximas
+      pages:
+        home:
+          highlighted_processes:
+            active_processes: Procesos activos
+            active_step: Paso activo
+            see_all_processes: Ver todos los procesos
       participatory_process_groups:
         none: Ninguna
       participatory_processes:
@@ -233,12 +240,12 @@ es:
       show:
         developer_group: Grupo promotor
         end_date: Fecha de finalización
-        local_area: Áreas municipales
-        participatory_scope: Ámbito participativo
-        participatory_structure: Estructura participativa
+        local_area: Área de organización
+        participatory_scope: Qué se decide
+        participatory_structure: Cómo se decide
         scope: Ámbito
         start_date: Fecha de inicio
-        target: "¿A quién va dirigida?"
+        target: Quién participa
       statistics:
         answers_count: "¿A quién va dirigida?"
         comments_count: Comentarios
@@ -252,7 +259,7 @@ es:
         results_count: Resultados
         surveys_count: Encuestas
         users_count: Participantes
-        votes_count: Soportes
+        votes_count: Apoyos
     scopes:
       global: Ámbito global
   layouts: