decidim-participatory_processes 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8c445e5c40610e2abaa330924ed46b5b5ebeb46a
-  data.tar.gz: 51ae4c255237951f19d1a0456361a594d5e5cb2c
+SHA256:
+  metadata.gz: 1df8a831dee4cc738d27694e65664a53a8b8c04619b6f60e3dba73f1262faf69
+  data.tar.gz: 34743fee16f5a1f78d4d31a7ec0e81001d905ce1a05858c7eb158a7f4f6a6bbb
 SHA512:
-  metadata.gz: 3d0e2181a9bc060dc94889101958b00c82d904ba29404972e4b54e5039387a9c6a605168ce7cd2f784be63f951191043a64ef6eb90c9bfcfa37fc3d9e7ca4a5c
-  data.tar.gz: 36632affaef3539c1a99d1d135ca0a0eebec4336447ed9aa4009f88fbcf322088f4cc571bc9f2bc3fa1029a6ed8f48acf1c5e4782935e7171587bbd15e12dec4
+  metadata.gz: 2bcb9ec0d0ca2141124311aa31ec2bdbcf20982cfa694c4337f1802d52f6a2213d65120c443dee103081367e3559ed14ff9c22bc971e248da8f5a972f1554b24
+  data.tar.gz: 5a343e65a82f8212d5a15d108a38ee0c2c78baef42d4aa3185bf3b9fda8ce91e380cd1d1dcceb76f355a722fe4629b40b0de87864e5928bdb3d64b1ec9e265a9

data/README.md

@@ -10,7 +10,7 @@ categories, and are fully manageable via an administration UI.
 
 ## Usage
 
-This plugin provides:
+This module provides:
 
 * A CRUD engine to manage participatory processes.
 

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

@@ -1,12 +1,14 @@
 $(() => {
-  const $participatoryProcessScopeEnabled = $('#participatory_process_scopes_enabled');
-  const $participatoryProcessScopeId = $("#participatory_process_scope_id");
+  ((exports) => {
+    const $participatoryProcessScopeEnabled = $('#participatory_process_scopes_enabled');
+    const $participatoryProcessScopeId = $("#participatory_process_scope_id");
 
-  if ($('.edit_participatory_process, .new_participatory_process').length > 0) {
-    $participatoryProcessScopeEnabled.on('change', (event) => {
-      const checked = event.target.checked;
-      $participatoryProcessScopeId.attr("disabled", !checked);
-    })
-    $participatoryProcessScopeId.attr("disabled", !$participatoryProcessScopeEnabled.prop('checked'));
-  }
+    if ($('.edit_participatory_process, .new_participatory_process').length > 0) {
+      $participatoryProcessScopeEnabled.on('change', (event) => {
+        const checked = event.target.checked;
+        exports.theDataPicker.enabled($participatoryProcessScopeId, checked);
+      })
+      exports.theDataPicker.enabled($participatoryProcessScopeId, $participatoryProcessScopeEnabled.prop('checked'));
+    }
+  })(window);
 });

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

@@ -25,7 +25,9 @@ module Decidim
           Decidim::ParticipatoryProcessStep.transaction do
             deactivate_active_steps
             activate_step
+            notify_followers
           end
+
           broadcast(:ok)
         end
 
@@ -42,6 +44,15 @@ module Decidim
         def activate_step
           step.update_attributes!(active: true)
         end
+
+        def notify_followers
+          Decidim::EventsManager.publish(
+            event: "decidim.events.participatory_process.step_activated",
+            event_class: Decidim::ParticipatoryProcessStepActivatedEvent,
+            resource: step,
+            recipient_ids: step.participatory_process.followers.pluck(:id)
+          )
+        end
       end
     end
   end

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

@@ -61,9 +61,7 @@ module Decidim
             organization: participatory_process.organization
           ).first
 
-          if @existing_user && !@existing_user.invitation_accepted?
-            InviteUserAgain.call(@existing_user, invitation_instructions)
-          end
+          InviteUserAgain.call(@existing_user, invitation_instructions) if @existing_user && !@existing_user.invitation_accepted?
 
           @existing_user
         end

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

@@ -11,7 +11,7 @@ module Decidim
 
         helper ProcessGroupsForSelectHelper
 
-        helper_method :current_participatory_process
+        helper_method :current_participatory_process, :current_participatory_space
 
         layout "decidim/admin/participatory_processes"
 
@@ -83,16 +83,14 @@ module Decidim
 
         private
 
-        def current_participatory_space
-          current_participatory_process
-        end
-
         def current_participatory_process
           @current_participatory_process ||= collection.where(slug: params[:slug]).or(
             collection.where(id: params[:slug])
           ).first
         end
 
+        alias current_participatory_space current_participatory_process
+
         def collection
           @collection ||= Decidim::ParticipatoryProcessesWithUserRole.for(current_user)
         end

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

@@ -8,8 +8,7 @@ module Decidim
       include ParticipatorySpaceContext
       participatory_space_layout only: :index
 
-      def index
-      end
+      def index; end
 
       private
 

data/app/models/decidim/participatory_process.rb

@@ -11,6 +11,7 @@ module Decidim
     include Decidim::Participable
     include Decidim::Publicable
     include Decidim::Scopable
+    include Decidim::Followable
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",

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

@@ -80,7 +80,7 @@
     </div>
 
     <div class="row column">
-      <%= form.scopes_select :scope_id, prompt: t("decidim.scopes.global"), remote_path: decidim.scopes_search_path %>
+      <%= scopes_picker_field form, :scope_id, root: nil %>
     </div>
 
     <div class="row column">
@@ -103,6 +103,7 @@
 
     <div class="row column">
       <%= form.translated :editor, :announcement %>
+      <p class="help-text"><%== t(".announcement_help") %></p>
     </div>
   </div>
 </div>

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

@@ -1,6 +1,8 @@
-const $grid = $('#processes-grid');
-const $loading = $grid.find('.loading');
+$(() => {
+  const $grid = $('#processes-grid');
+  const $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/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/order_by_processes", locals: { include_filter: true })).strip.html_safe %>');
+  $loading.hide();
+});

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

@@ -22,6 +22,11 @@
       <%= attachments_for current_participatory_space %>
     </div>
     <div class="section columns medium-5 mediumlarge-4 large-3">
+      <div class="card extra">
+        <div class="card__content">
+          <%= render partial: "decidim/shared/follow_button", locals: { followable: current_participatory_space } %>
+        </div>
+      </div>
       <div class="card extra definition-data">
         <% if translated_attribute(current_participatory_space.participatory_scope).present? %>
           <div class="definition-data__item participatory_scope">

data/config/locales/ca.yml

@@ -1,8 +1,8 @@
----
 ca:
   activemodel:
     attributes:
       participatory_process:
+        announcement: Anunci
         banner_image: Imatge de bàner
         copy_categories: Copiar categories
         copy_features: Copiar funcionalitats
@@ -22,6 +22,7 @@ ca:
         scope_id: Àmbit
         scopes_enabled: Àmbit habilitat
         short_description: Descripció breu
+        show_statistics: Mostra estadístiques
         slug: Nom curt d'URL
         start_date: Data d'inici
         subtitle: Subtítol
@@ -152,7 +153,7 @@ ca:
           success: La fase de procés participatiu s'ha actualitzat correctament.
       participatory_process_user_roles:
         create:
-          error: Hi ha hagut un error en afegir un usuari a aquest procés participatiu.
+          error: S'ha produït un error en afegir un usuari a aquest procés participatiu.
           success: Usuari creat amb èxit per a aquest procés participatiu.
         destroy:
           success: Usuari eliminat amb èxit per a aquest procés participatiu.
@@ -165,7 +166,7 @@ ca:
           create: Crear
           title: Nou usuari de procés participatiu.
         update:
-          error: Hi ha hagut un error actualitzant l'usuari d'aquest procés participatiu.
+          error: S'ha produït un error en l'actualització d'un usuari per a aquest procés participatiu.
           success: Usuari actualitzat satisfactòriament per a aquest procés participatiu.
       participatory_processes:
         create:
@@ -218,6 +219,7 @@ ca:
             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_processes:
           form:
+            announcement_help: El text que introdueixis aquí es mostrarà a l'usuari just a sota de la informació del procés.
             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}'
       index:
         title: Processos participatius
@@ -260,8 +262,6 @@ ca:
         surveys_count: Enquestes
         users_count: Participants
         votes_count: Suports
-    scopes:
-      global: Àmbit global
   layouts:
     decidim:
       participatory_process_groups:

data/config/locales/en.yml

@@ -3,6 +3,7 @@ en:
   activemodel:
     attributes:
       participatory_process:
+        announcement: Announcement
         banner_image: Banner image
         copy_categories: Copy categories
         copy_features: Copy features
@@ -22,6 +23,7 @@ en:
         scope_id: Scope
         scopes_enabled: Scopes enabled
         short_description: Short description
+        show_statistics: Show statistics
         slug: URL slug
         start_date: Start date
         subtitle: Subtitle
@@ -152,7 +154,7 @@ en:
           success: Participatory process step updated successfully.
       participatory_process_user_roles:
         create:
-          error: There was an error adding an user for this participatory process.
+          error: There was an error adding a user for this participatory process.
           success: User created successfully for this participatory process.
         destroy:
           success: User destroyed successfully for this participatory process.
@@ -165,7 +167,7 @@ en:
           create: Create
           title: New participatory process user.
         update:
-          error: There was an error updated an user for this participatory process.
+          error: There was an error updated a user for this participatory process.
           success: User updated successfully for this participatory process.
       participatory_processes:
         create:
@@ -218,6 +220,7 @@ en:
             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_processes:
           form:
+            announcement_help: The text you enter here will be shown to the user right below the process information.
             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}'
       index:
         title: Participatory processes
@@ -260,8 +263,6 @@ en:
         surveys_count: Surveys
         users_count: Participants
         votes_count: Votes
-    scopes:
-      global: Global scope
   layouts:
     decidim:
       participatory_process_groups:

data/config/locales/es.yml

@@ -1,8 +1,8 @@
----
 es:
   activemodel:
     attributes:
       participatory_process:
+        announcement: Anuncio
         banner_image: Imagen de banner
         copy_categories: Copiar categorías
         copy_features: Copiar funcionalidades
@@ -22,10 +22,11 @@ es:
         scope_id: Ámbito
         scopes_enabled: Ámbitos habilitados
         short_description: Descripción breve
+        show_statistics: Mostrar estadísticas
         slug: Texto corto de URL
         start_date: Fecha de inicio
         subtitle: Subtítulo
-        target: "¿A quién va dirigida?"
+        target: '¿A quién va dirigida?'
         title: Título
       participatory_process_group:
         description: Descripción
@@ -47,7 +48,7 @@ es:
       actions:
         activate: Activar
         configure: Configurar
-        confirm_destroy: "¿Estás seguro?"
+        confirm_destroy: '¿Estás seguro?'
         destroy: Eliminar
         duplicate: Duplicar
         edit: Editar
@@ -152,7 +153,7 @@ es:
           success: La fase de proceso participativo se ha actualizado correctamente.
       participatory_process_user_roles:
         create:
-          error: Se ha producido un error al crear el usuario para este proceso participativo.
+          error: Ha habido un error al agregar un usuario a este proceso participativo.
           success: Usuario creado con éxito para este proceso participativo.
         destroy:
           success: Usuario eliminado con éxito para este proceso participativo.
@@ -165,7 +166,7 @@ es:
           create: Crear
           title: Nuevo usuario del proceso
         update:
-          error: Se ha producido un error al crear el usuario para este proceso participativo.
+          error: Ha habido un error al actualizar un usuario para este proceso participativo.
           success: Usuario actualizado correctamente para este proceso participativo.
       participatory_processes:
         create:
@@ -218,6 +219,7 @@ es:
             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_processes:
           form:
+            announcement_help: El texto que ingreses aquí se mostrará al usuario justo debajo de la información del proceso.
             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}'
       index:
         title: Procesos participativos
@@ -247,7 +249,7 @@ es:
         start_date: Fecha de inicio
         target: Quién participa
       statistics:
-        answers_count: "¿A quién va dirigida?"
+        answers_count: '¿A quién va dirigida?'
         comments_count: Comentarios
         headline: Actividad
         meetings_count: Encuentros
@@ -260,8 +262,6 @@ es:
         surveys_count: Encuestas
         users_count: Participantes
         votes_count: Apoyos
-    scopes:
-      global: Ámbito global
   layouts:
     decidim:
       participatory_process_groups:

data/config/locales/eu.yml

@@ -2,6 +2,7 @@ eu:
   activemodel:
     attributes:
       participatory_process:
+        announcement: Anuntzio
         banner_image: Bannerra
         copy_categories: Kopiatu kategoriak
         copy_features: Kopiatu funtzionalitateak
@@ -21,6 +22,7 @@ eu:
         scope_id: Esparrua
         scopes_enabled: Esparru gaituak
         short_description: Deskribapen laburra
+        show_statistics: Erakutsi estatistikak
         slug: URL laburra
         start_date: Hasiera-data
         subtitle: Azpititulua
@@ -151,7 +153,7 @@ eu:
           success: Prozesu partizipatiboaren fasea zuzen eguneratu da.
       participatory_process_user_roles:
         create:
-          error: Errorea gertatu da prozesu partizipatibo honetarako erabiltzailea sortzean.
+          error: Errore bat gertatu da partaidetza prozesu honetan erabiltzailea gehitzea.
           success: Ongi sortu da erabiltzailea prozesu partizipatibo honetarako.
         destroy:
           success: Ongi deuseztatu da erabiltzailea prozesu partizipatibo honetarako.
@@ -164,7 +166,7 @@ eu:
           create: Sortu
           title: Prozesuaren erabiltzaile berria.
         update:
-          error: Errorea gertatu da prozesu partizipatibo honetarako erabiltzailea sortzean.
+          error: Errore bat gertatu da parte hartzaile prozesu honetarako erabiltzaile bat.
           success: Ongi eguneratu da erabiltzailea prozesu partizipatibo honetarako.
       participatory_processes:
         create:
@@ -217,6 +219,7 @@ eu:
             slug_help: 'URL slugs erabiltzen dira prozesu hau adierazten duten URLak sortzeko. Letrak, zenbakiak eta marratxoak soilik onartzen ditu eta letra batekin hasi behar duzu. Adibidea: %{url}'
         participatory_processes:
           form:
+            announcement_help: Hemen sartzen duzun testua erabiltzaileari erakutsiko zaio prozesuaren informazioaren azpitik.
             slug_help: 'URL slugs erabiltzen dira prozesu hau adierazten duten URLak sortzeko. Letrak, zenbakiak eta marratxoak soilik onartzen ditu eta letra batekin hasi behar duzu. Adibidea: %{url}'
       index:
         title: Prozesu partizipatiboak
@@ -259,8 +262,6 @@ eu:
         surveys_count: Inkestak
         users_count: Parte-hartzaileak
         votes_count: Euskarriak
-    scopes:
-      global: Esparrua orokorra
   layouts:
     decidim:
       participatory_process_groups:

data/config/locales/fi.yml

@@ -2,9 +2,10 @@ fi:
   activemodel:
     attributes:
       participatory_process:
+        announcement: Ilmoitus
         banner_image: Bannerikuva
         copy_categories: Kopioi aihepiirit
-        copy_features: Kopioi toiminnot
+        copy_features: Kopioi ominaisuudet
         copy_steps: Kopioi vaiheet
         description: Kuvaus
         developer_group: Kehitysryhmä
@@ -21,6 +22,7 @@ fi:
         scope_id: Konteksti
         scopes_enabled: Kontekstit käytössä
         short_description: Lyhyt kuvaus
+        show_statistics: Näytä tilastot
         slug: URL-tunniste
         start_date: Aloitusaika
         subtitle: Alaotsikko
@@ -151,7 +153,7 @@ fi:
           success: Osallistumisprosessin vaihe päivitetty onnistuneesti.
       participatory_process_user_roles:
         create:
-          error: Käyttäjän lisäyksessä osallistumisprosessiin tapahtui virhe.
+          error: Tapahtui virhe lisätessä käyttäjää osallistumisprosessiin.
           success: Käyttäjä luotu onnistuneesti tähän osallistumisprosessiin.
         destroy:
           success: Käyttäjä poistettu onnistuneesti tästä osallistumisprosessista.
@@ -164,7 +166,7 @@ fi:
           create: Luo
           title: Uusi osallistumisprosessin käyttäjä.
         update:
-          error: Tämän osallistumisprosessin käyttäjän päivityksessä tapahtui virhe.
+          error: Tapahtui virhe päivitettäessä käyttäjää tälle osallistumisprosessille.
           success: Tämän osallistumisprosessin käyttäjä päivitetty onnistuneesti.
       participatory_processes:
         create:
@@ -205,7 +207,7 @@ fi:
     participatory_process_groups:
       show:
         group_participatory_processes: Prosessit ryhmälle %{group}
-        title: Osallistuvat prosessiryhmät
+        title: Osallistumisprosessiryhmät
     participatory_process_steps:
       index:
         process_steps: Prosessin vaiheet
@@ -217,6 +219,7 @@ fi:
             slug_help: 'URL-tunnisteita käytetään tuottamaan URL-tunnisteet, jotka viittaavat tähän prosessiin. Hyväksyy vain kirjaimia, numeroita ja viivoja. Arvon on alettava kirjaimella. Esimerkki: %{url}'
         participatory_processes:
           form:
+            announcement_help: Tähän kirjoitettu teksti näkyy käyttäjälle heti prosessitietojen alapuolella.
             slug_help: 'URL-tunnisteita käytetään tuottamaan URL-tunnisteet, jotka viittaavat tähän prosessiin. Hyväksyy vain kirjaimia, numeroita ja viivoja. Arvon on alettava kirjaimella. Esimerkki: %{url}'
       index:
         title: Osallistumisprosessit
@@ -230,7 +233,7 @@ fi:
           highlighted_processes:
             active_processes: Aktiiviset prosessit
             active_step: Aktiivinen vaihe
-            see_all_processes: Katso kaikki prosessit
+            see_all_processes: Näytä kaikki prosessit
       participatory_process_groups:
         none: Ei ryhmää
       participatory_processes:
@@ -259,8 +262,6 @@ fi:
         surveys_count: Kyselyt
         users_count: Osallistujat
         votes_count: Äänet
-    scopes:
-      global: Yleinen konteksti
   layouts:
     decidim:
       participatory_process_groups: