decidim-participatory_processes 0.24.0.rc2 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18f5275b5483e1c35c9113df9a0a56e6e475b9f7499b2386363f76b37033544c
-  data.tar.gz: f6e6dd9f24bf73396cd30f6fadc97b0a9c2d99b5314e1a66293ef5d25ed86c41
+  metadata.gz: f4f3c5be019f2186794d0c03bae4e1ae273431571f85bcec52ba02dd399a0fe3
+  data.tar.gz: a4089191dff56d586744d2a3c500cdfc563122cbb8f7e9c5cfc49078d33a1829
 SHA512:
-  metadata.gz: ce695b71154c946cea904677bbf525667973543581dfd612b762a6b8b1a374cb8ec6fbbed9be6d9ddca375bcec35b9c6dc32de5a377ac199cc92282edbb5770f
-  data.tar.gz: 502d9a78085f87408d14ac2b47d399b66bd9493391798ce21580ba384c8aeae685558fdbb465b59a63d2ae29f11a5318e312baa46c318bb32b12a62aa08b5583
+  metadata.gz: 39177dcce20960ab4200223ab550b3128349b26e2f278d377136051bba7051ca2dc29eeb43a77470d93ea9c1e7b6093cd474f1c1e14c605aed18183166995bf1
+  data.tar.gz: b460198d40452496509af6e6b538ba70a8231275cc65350acdb56ca3d863fe38cbd777d3ad5423961e73e301147c07c8076ec89ecdf9112659891a53a0c3b0ea

data/app/models/decidim/participatory_process.rb

@@ -74,7 +74,7 @@ module Decidim
 
     scope :past, -> { where(arel_table[:end_date].lt(Date.current)) }
     scope :upcoming, -> { where(arel_table[:start_date].gt(Date.current)) }
-    scope :active, -> { where(arel_table[:start_date].lteq(Date.current).and(arel_table[:end_date].gt(Date.current).or(arel_table[:end_date].eq(nil)))) }
+    scope :active, -> { where(arel_table[:start_date].lteq(Date.current).and(arel_table[:end_date].gteq(Date.current).or(arel_table[:end_date].eq(nil)))) }
 
     searchable_fields({
                         scope_id: :decidim_scope_id,
@@ -124,7 +124,7 @@ module Decidim
     def active?
       return false if start_date.blank?
 
-      start_date < Date.current && (end_date.blank? || end_date > Date.current)
+      start_date <= Date.current && (end_date.blank? || end_date >= Date.current)
     end
 
     def past?

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

@@ -6,14 +6,15 @@ module Decidim
       include Rails.application.routes.mounted_helpers
       include ActionView::Helpers::UrlHelper
 
-      delegate :url, to: :hero_image, prefix: true
-      delegate :url, to: :banner_image, prefix: true
-
       def hero_image_url
+        return unless process.hero_image_url
+
         URI.join(decidim.root_url(host: process.organization.host), process.hero_image_url).to_s
       end
 
       def banner_image_url
+        return unless process.banner_image_url
+
         URI.join(decidim.root_url(host: process.organization.host), process.banner_image_url).to_s
       end
 

data/config/locales/gl.yml

@@ -26,16 +26,24 @@ gl:
         scope_id: Alcance
         scopes_enabled: Ámbitos habilitados
         short_description: Descrición curta
+        show_metrics: Amosar métricas
         show_statistics: Amosar estatísticas
         slug: URL slug
         start_date: Data de inicio
         subtitle: Subtítulo
         target: Quen participa
         title: Título
+        weight: Peso
       participatory_process_group:
         description: Descrición
+        group_url: Sitio web
+        hashtag: Cancelo
         hero_image: Imaxe
         participatory_process_ids: Procesos relacionados
+        participatory_scope: Que se decide
+        participatory_structure: Como é decidido
+        target: Quen participa
+        title: Título
       participatory_process_step:
         cta_path: Camiño de chamada a Acción
         cta_text: Texto de chamada a acción
@@ -48,6 +56,12 @@ gl:
         email: Correo electrónico
         name: Nome
         role: Rol
+    errors:
+      models:
+        participatory_process:
+          attributes:
+            document:
+              invalid_document_type: 'Tipo de documento non válido. Formatos aceptados: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Paso activado
       decidim/participatory_process_step_changed_event: O paso cambiou
@@ -74,6 +88,7 @@ gl:
         filter:
           all_processes: Mostrar todos os procesos
           process_groups: Procesar grupos
+        import_process: Importar
         new_process: Novo proceso
         new_process_group: Novo grupo de procesos
         new_process_step: Novo paso
@@ -84,6 +99,9 @@ gl:
         unpublish: Non publicar
       menu:
         participatory_process_groups: Grupos de procesos
+        participatory_process_groups_submenu:
+          info: Información
+          landing_page: Páxina de inicio
         participatory_processes: Procesos
         participatory_processes_submenu:
           attachment_collections: Carpetas
@@ -106,6 +124,8 @@ gl:
             title: Título
           name: Proceso participativo
         participatory_process_group:
+          fields:
+            title: Título
           name: Grupo de procesos
         participatory_process_step:
           fields:
@@ -132,6 +152,13 @@ gl:
           copy: Copiar
           select: Seleccione os datos que desexa duplicar
           title: Duplicar o proceso participativo
+      participatory_process_group_landing_page:
+        edit:
+          active_content_blocks: Bloques de contido activos
+          inactive_content_blocks: Bloques de contido inactivos
+      participatory_process_group_landing_page_content_blocks:
+        edit:
+          update: Actualizar
       participatory_process_groups:
         destroy:
           success: Grupo de proceso participativo eliminado con éxito.
@@ -144,6 +171,9 @@ gl:
         update:
           error: Produciuse un erro ao actualizar este grupo de procesos participativo.
           success: Grupo de proceso participativo actualizado con éxito.
+      participatory_process_imports:
+        new:
+          import: Importar
       participatory_process_publications:
         create:
           error: Produciuse un erro ao publicar este proceso participativo.
@@ -265,10 +295,33 @@ gl:
         description: Número de procesos participativos nesta organización
         object: procesos participativos
         title: Procesos participativos
+    participatory_process:
+      show:
+        related_assemblies: Xuntanzas relacionadas
     participatory_process_groups:
       content_blocks:
+        html_1:
+          name: Primeiro bloque HTML
+        html_2:
+          name: Segundo bloque HTML
+        html_3:
+          name: Terceiro bloque HTML
+        metadata:
+          developer_group: Promovido por
+          name: Metadatos
+          participatory_scope: Que se decide
+          participatory_structure: Como é decidido
+          target: Quen participa
+        participatory_processes:
+          name: Procesos participativos
         stats:
           name: Actividade
+        title:
+          meta_scope: Ámbito
+          name: Título, descrición e cancelos
+          participatory_processes:
+            one: 1 proceso
+            other: "%{count} procesos"
       show:
         title: Grupos de procesos participativos
     participatory_process_steps:
@@ -280,9 +333,20 @@ gl:
         content_blocks:
           highlighted_processes:
             max_results: Cantidade máxima de elementos para mostrar
+        new_import:
+          accepted_types:
+            json: JSON
         participatory_process_copies:
           form:
             slug_help: 'As babosas de URL úsanse para xerar os URL que apuntan a este proceso. Só acepta letras, números e guións, e debe comezar cunha letra. Exemplo: %{url}'
+        participatory_process_groups:
+          form:
+            metadata: Metadatos
+            title: Información xeral
+            visibility: Visibilidade
+        participatory_process_imports:
+          form:
+            document_legend: Engadir un documento
         participatory_process_steps:
           form:
             cta_path_help: 'Use aquí rutas parciais, non URL completo. Acepta letras, números, guións e barras, e debe comezar cunha letra. Se non está establecido, non se mostrará o botón. Exemplo: %{url}'
@@ -345,6 +409,7 @@ gl:
           loading: Cargando resultados ...
       show:
         area: Área
+        dates: Datas
         developer_group: Grupo promotor
         end_date: Data de finalización
         local_area: Área de organización
@@ -361,8 +426,10 @@ gl:
         comments_count: Comentarios
         debates_count: Debates
         endorsements_count: Aprobacións
+        followers_count: Seguidores
         headline: Actividade
         meetings_count: Reunións
+        no_stats: Aínda non hai estatísticas.
         orders_count: Votos
         pages_count: Páxinas
         participants_count: Participantes
@@ -394,6 +461,8 @@ gl:
           active_step: 'Paso actual:'
           more_info: Máis información
           take_part: Tomar parte en
+        promoted_process_group:
+          more_info: Máis información
       process_header_steps:
         step: Paso %{current} de %{total}
         view_steps: Ver pasos

data/config/locales/ro-RO.yml

@@ -3,20 +3,20 @@ ro:
     attributes:
       participatory_process:
         announcement: Anunţ
-        area_id: Suprafață
+        area_id: Zonă
         banner_image: Imagine banner
         copy_categories: Copiază categoriile
         copy_components: Copiază componentele
         copy_steps: Copiază pașii
-        decidim_area_id: Suprafață
+        decidim_area_id: Zonă
         description: Descriere
         developer_group: Grup promotor
         domain: Domeniu
         end_date: Data de încheiere
         hashtag: Hashtag
-        hero_image: Imagine acasă
+        hero_image: Imagine pagina principală
         local_area: Zonă organizație
-        meta_scope: Sferă metadate
+        meta_scope: Metadate privind domeniul de interes
         participatory_process_group_id: Grup procese
         participatory_scope: Ce se decide
         participatory_structure: Cum se decide
@@ -36,8 +36,17 @@ ro:
         title: Titlu
       participatory_process_group:
         description: Descriere
+        developer_group: Grup promotor
+        group_url: Pagină Web
+        hashtag: Hashtag
         hero_image: Imagine
+        local_area: Zona organizației
+        meta_scope: Metadate privind domeniul de interes
         participatory_process_ids: Procese conexe
+        participatory_scope: Ce se decide
+        participatory_structure: Cum se decide
+        target: Cine participă
+        title: Titlu
       participatory_process_step:
         cta_path: Apel la calea de acțiune
         cta_text: Apel la textul Acțiune
@@ -62,7 +71,7 @@ ro:
   activerecord:
     models:
       decidim/participatory_process:
-        one: Procesul participativ
+        one: Proces participativ
         few: Procese participative
         other: Procese participative
       decidim/participatory_process_group:
@@ -80,7 +89,7 @@ ro:
         configure: Configurare
         confirm_destroy: Confirmă ștergerea
         destroy: Ștergere
-        duplicate: Duplicate
+        duplicate: Duplicare
         edit: Editare
         filter:
           all_processes: Arată toate procesele
@@ -89,22 +98,25 @@ ro:
         new_process: Proces nou
         new_process_group: Proces nou de grup
         new_process_step: Faza nouă
-        new_process_user_role: Proces nou admin
+        new_process_user_role: Administrator nou al procesului
         preview: Previzualizare
         publish: Publică
         resend_invitation: Retrimite invitația
         unpublish: De-publicare
       menu:
         participatory_process_groups: Grupuri de proces
-        participatory_processes: Procese
+        participatory_process_groups_submenu:
+          info: Informații
+          landing_page: Pagina principală
+        participatory_processes: Procese participative
         participatory_processes_submenu:
           attachment_collections: Dosare
           attachment_files: Fișiere
           attachments: Atașamente
           categories: Categorii
           components: Componente
-          info: Info
-          moderations: Moderatii
+          info: Informații
+          moderations: Moderări
           private_users: Participanți privați
           process_admins: Procesează administratori
           steps: Faze
@@ -113,11 +125,13 @@ ro:
           fields:
             created_at: Creat la
             private: Privat
-            promoted: Evident
+            promoted: Evidenţiat
             published: Publicat
             title: Titlu
-          name: Procesul participativ
+          name: Proces participativ
         participatory_process_group:
+          fields:
+            title: Titlu
           name: Procesează grup
         participatory_process_step:
           fields:
@@ -145,9 +159,16 @@ ro:
           copy: Copiază
           select: Selectați datele pe care doriți să le duplicați
           title: Duplicarea procesului participativ
+      participatory_process_group_landing_page:
+        edit:
+          active_content_blocks: Blocuri de conținut activ
+          inactive_content_blocks: Blocuri de conținut inactiv
+      participatory_process_group_landing_page_content_blocks:
+        edit:
+          update: Actualizare
       participatory_process_groups:
         destroy:
-          error: A apărut o eroare la distrugerea grupului de proces participativ.
+          error: A apărut o eroare la eliminarea grupului de proces participativ.
           success: Grupul procesului participativ a fost şters.
         edit:
           title: Editare grup proces
@@ -171,7 +192,7 @@ ro:
           error: A apărut o problemă la publicarea acestui proces participativ.
           success: Procesul participativ a fost publicat.
         destroy:
-          error: A apărut o problemă la publicarea acestui proces participativ.
+          error: S-a întâmpinat o problemă la retragerea de la publicare a acestui proces participativ.
           success: Procesul participativ a fost de-publicat.
       participatory_process_step_activations:
         create:
@@ -302,8 +323,29 @@ ro:
         related_assemblies: Asambluri asemănătoare
     participatory_process_groups:
       content_blocks:
+        html_1:
+          name: Primul bloc HTML
+        html_2:
+          name: Al doilea bloc HTML
+        html_3:
+          name: Al treilea bloc HTML
+        metadata:
+          developer_group: Promovat de
+          name: Metadate
+          participatory_scope: Ce se decide
+          participatory_structure: Cum se decide
+          target: Cine participă
+        participatory_processes:
+          name: Procese participative
         stats:
           name: Statistici
+        title:
+          meta_scope: Domeniu de interes
+          name: Titlu, descriere și hashtag
+          participatory_processes:
+            one: 1 proces
+            few: "%{count} procese"
+            other: "%{count} procese"
       show:
         title: Grupuri participante
     participatory_process_steps:
@@ -315,9 +357,17 @@ ro:
         content_blocks:
           highlighted_processes:
             max_results: Cantitatea maximă de elemente de afișat
+        new_import:
+          accepted_types:
+            json: JSON
         participatory_process_copies:
           form:
             slug_help: 'URL slugs sunt utilizate pentru a genera URL-urile care indică acest proces. Acceptă doar litere, numere și cratime și trebuie să înceapă cu o literă. Exemplu: %{url}'
+        participatory_process_groups:
+          form:
+            metadata: Metadate
+            title: Informaţii generale
+            visibility: Vizibilitate
         participatory_process_imports:
           form:
             document_legend: Adaugă un document
@@ -393,6 +443,7 @@ ro:
           loading: Se încarcă rezultatele...
       show:
         area: Suprafață
+        belongs_to_group: Acest proces aparține lui
         dates: Date
         developer_group: Grup promotor
         end_date: Data de încheiere
@@ -417,7 +468,7 @@ ro:
         orders_count: Suportă
         pages_count: Pagini
         participants_count: Participanți
-        processes_count: Procese
+        processes_count: Procese participative
         projects_count: Proiecte
         proposals_count: Propuneri
         results_count: Rezultate
@@ -450,6 +501,8 @@ ro:
           more_info_about: Mai multe informații despre procesul %{resource_name}
           take_part: Participă
           take_part_in: Ia parte la procesul %{resource_name}
+        promoted_process_group:
+          more_info: Mai multe informații
       process_header_steps:
         step: Faza %{current} din %{total}
         view_steps: Vezi fazele

data/db/migrate/20210310120750_add_followable_counter_cache_to_participatory_processes.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddFollowableCounterCacheToParticipatoryProcesses < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_participatory_processes, :follows_count, :integer, null: false, default: 0, index: true
+
+    reversible do |dir|
+      dir.up do
+        Decidim::ParticipatoryProcess.reset_column_information
+        Decidim::ParticipatoryProcess.find_each do |record|
+          record.class.reset_counters(record.id, :follows)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/participatory_processes/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-participatory_processes version.
   module ParticipatoryProcesses
     def self.version
-      "0.24.0.rc2"
+      "0.24.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-participatory_processes
 version: !ruby/object:Gem::Version
-  version: 0.24.0.rc2
+  version: 0.24.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc2
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc2
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc2
+        version: 0.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc2
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc2
+        version: 0.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0.rc2
+        version: 0.24.0
 description: Participatory processes component for decidim.
 email:
 - josepjaume@gmail.com
@@ -384,6 +384,7 @@ files:
 - db/migrate/20201013105520_rename_name_column_to_title_in_decidim_participatory_process_groups.rb
 - db/migrate/20201030133444_add_promoted_flag_to_decidim_participatory_process_groups.rb
 - db/migrate/20210204154593_add_weight_field_to_participatory_processes.rb
+- db/migrate/20210310120750_add_followable_counter_cache_to_participatory_processes.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -417,9 +418,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: