decidim-consultations 0.14.4 → 0.15.0

data/config/locales/fr.yml

@@ -174,6 +174,10 @@ fr:
         questions: Questions
         responses: Réponses
     consultations:
+      admin:
+        content_blocks:
+          highlighted_consultations:
+            max_results: Quantité maximale d'éléments à afficher
       consultation:
         start_voting_date: Le vote commence le
         view_results: Voir les résultats
@@ -184,6 +188,9 @@ fr:
           label: 'Trier les votations par :'
           random: Aléatoire
           recent: Les plus récentes
+      content_blocks:
+        highlighted_consultations:
+          name: Consultations surlignées
       count:
         title:
           one: "%{count} votation"
@@ -204,6 +211,18 @@ fr:
         title: Questions de %{scope_name}
       index:
         title: Votations
+      last_activity:
+        new_consultation: Nouvelle consultation
+        new_question_at_html: "<span>Nouvelle question à %{link}</span>"
+      pages:
+        home:
+          highlighted_consultations:
+            active_consultations: Consultations actives
+            see_all_consultations: Voir toutes les consultations
+            voting_ends_in:
+              one: Le vote se termine <strong>demain</strong>
+              other: Le vote prend fin à <strong>%{count} jour</strong>
+            voting_ends_today: Fin du vote <strong>aujourd'hui</strong>
       question:
         take_part: Participer
         view_results: Voir les résultats

data/config/locales/gl.yml

@@ -174,6 +174,10 @@ gl:
         questions: Preguntas
         responses: Respostas
     consultations:
+      admin:
+        content_blocks:
+          highlighted_consultations:
+            max_results: Cantidade máxima de elementos para mostrar
       consultation:
         start_voting_date: Comeza a votación
         view_results: Ver resultados
@@ -184,6 +188,9 @@ gl:
           label: 'Ordenar consultas por:'
           random: Aleatorio
           recent: Máis recente
+      content_blocks:
+        highlighted_consultations:
+          name: Consultas destacadas
       count:
         title:
           one: "Consulta %{count}"
@@ -204,6 +211,18 @@ gl:
         title: Preguntas de %{scope_name}
       index:
         title: Consultas
+      last_activity:
+        new_consultation: Nova consulta
+        new_question_at_html: "<span>Nova pregunta en %{link}</span>"
+      pages:
+        home:
+          highlighted_consultations:
+            active_consultations: Consultas activas
+            see_all_consultations: Ver todas as consultas
+            voting_ends_in:
+              one: A votación remata o <strong>mañá</strong>
+              other: A votación remata en <strong>%{count} días</strong>
+            voting_ends_today: A votación remata en <strong>hoxe</strong>
       question:
         take_part: Tomar parte en
         view_results: Ver resultados

data/config/locales/hu.yml

@@ -174,6 +174,10 @@ hu:
         questions: Kérdések
         responses: Válaszok
     consultations:
+      admin:
+        content_blocks:
+          highlighted_consultations:
+            max_results: A megjelenítendő elemek maximális száma
       consultation:
         start_voting_date: Szavazás kezdése
         view_results: Eredmények megtekintése
@@ -184,6 +188,9 @@ hu:
           label: 'Konzultációk rendezése:'
           random: Véletlenszerű
           recent: Legutóbbi
+      content_blocks:
+        highlighted_consultations:
+          name: Kiemelt konzultációk
       count:
         title:
           one: "%{count} konzultáció"
@@ -204,6 +211,18 @@ hu:
         title: '%{scope_name} kérdések'
       index:
         title: Konzultációk
+      last_activity:
+        new_consultation: Új konzultáció
+        new_question_at_html: "<span>Új kérdés: %{link}</span>"
+      pages:
+        home:
+          highlighted_consultations:
+            active_consultations: Aktív konzultációk
+            see_all_consultations: Lásd az összes konzultációt
+            voting_ends_in:
+              one: Szavazás <strong>vége <strong> holnap</strong>
+              other: A szavazás végződik <strong>%{count} nap</strong>
+            voting_ends_today: A szavazás végeredménye <strong>ma</strong>
       question:
         take_part: Vegyél részt
         view_results: Eredmények megtekintése

data/config/locales/it.yml

@@ -174,6 +174,10 @@ it:
         questions: Domande
         responses: risposte
     consultations:
+      admin:
+        content_blocks:
+          highlighted_consultations:
+            max_results: Quantità massima di elementi da mostrare
       consultation:
         start_voting_date: Inizia la votazione
         view_results: Vedi i risultati
@@ -184,6 +188,9 @@ it:
           label: 'Ordina le consultazioni per:'
           random: Casuale
           recent: Piu recente
+      content_blocks:
+        highlighted_consultations:
+          name: Consultazioni evidenziate
       count:
         title:
           one: "%{count} consultazione"
@@ -204,6 +211,18 @@ it:
         title: Domande da %{scope_name}
       index:
         title: consultazioni
+      last_activity:
+        new_consultation: Nuova consultazione
+        new_question_at_html: "<span>Nuova domanda al %{link}</span>"
+      pages:
+        home:
+          highlighted_consultations:
+            active_consultations: Consultazioni attive
+            see_all_consultations: Vedi tutte le consultazioni
+            voting_ends_in:
+              one: La votazione termina <strong>domani</strong>
+              other: La votazione termina tra <strong>%{count} giorni</strong>
+            voting_ends_today: La votazione termina <strong>oggi</strong>
       question:
         take_part: Prendere parte
         view_results: Vedi i risultati

data/config/locales/nl.yml

@@ -174,6 +174,10 @@ nl:
         questions: vragen
         responses: Antwoorden
     consultations:
+      admin:
+        content_blocks:
+          highlighted_consultations:
+            max_results: Maximum aantal elementen dat kan worden weergegeven
       consultation:
         start_voting_date: Stemmen begint
         view_results: Bekijk resultaten
@@ -184,6 +188,9 @@ nl:
           label: 'Sorteer door:'
           random: Willekeurig
           recent: Meest recent
+      content_blocks:
+        highlighted_consultations:
+          name: Gemarkeerd consulten
       count:
         title:
           one: "%{count} overleg"
@@ -204,6 +211,18 @@ nl:
         title: Vragen vanaf %{scope_name}
       index:
         title: Burgerinspraak
+      last_activity:
+        new_consultation: Nieuw overleg
+        new_question_at_html: "<span>Nieuwe vraag op %{link}</span>"
+      pages:
+        home:
+          highlighted_consultations:
+            active_consultations: Huidige burgerinspraak
+            see_all_consultations: Zie alle raadplegingen
+            voting_ends_in:
+              one: Stemmen eindigt morgen <strong></strong>
+              other: Stemmen eindigt over <strong>%{count} dagen</strong>
+            voting_ends_today: Stemmen eindigt <strong>vandaag</strong>
       question:
         take_part: Neem deel
         view_results: Bekijk resultaten

data/config/locales/pl.yml

@@ -188,6 +188,10 @@ pl:
         questions: pytania
         responses: Odpowiedzi
     consultations:
+      admin:
+        content_blocks:
+          highlighted_consultations:
+            max_results: Maksymalna ilość elementów do pokazania
       consultation:
         start_voting_date: Rozpocznie się głosowanie
         view_results: Pokaż wyniki
@@ -198,6 +202,9 @@ pl:
           label: 'Sortuj konsultacje według:'
           random: Losowy
           recent: Najnowszy
+      content_blocks:
+        highlighted_consultations:
+          name: Wyróżnione konsultacje
       count:
         title:
           one: "%{count} konsultacja"
@@ -220,6 +227,20 @@ pl:
         title: Pytania od %{scope_name}
       index:
         title: Konsultacje
+      last_activity:
+        new_consultation: Nowa konsultacja
+        new_question_at_html: "<span>Nowe pytanie o %{link}</span>"
+      pages:
+        home:
+          highlighted_consultations:
+            active_consultations: Aktywne konsultacje
+            see_all_consultations: Zobacz wszystkie konsultacje
+            voting_ends_in:
+              one: Głosowanie kończy się na <strong>jutro</strong>
+              few: Głosowanie kończy się w ciągu <strong>%{count} dni</strong>
+              many: Głosowanie kończy się w ciągu <strong>%{count} dni</strong>
+              other: Głosowanie kończy się w ciągu <strong>%{count} dni</strong>
+            voting_ends_today: Głosowanie kończy się dzisiaj <strong></strong>
       question:
         take_part: Wziąć udział
         view_results: Pokaż wyniki

data/config/locales/pt-BR.yml

@@ -174,6 +174,10 @@ pt-BR:
         questions: Questões
         responses: Respostas
     consultations:
+      admin:
+        content_blocks:
+          highlighted_consultations:
+            max_results: Quantidade máxima de elementos para mostrar
       consultation:
         start_voting_date: A votação começa
         view_results: Ver resultados
@@ -184,6 +188,9 @@ pt-BR:
           label: 'Ordenar consultas por:'
           random: Aleatório
           recent: Mais recente
+      content_blocks:
+        highlighted_consultations:
+          name: Consultas destacadas
       count:
         title:
           one: "%{count} consulta"
@@ -204,6 +211,18 @@ pt-BR:
         title: Perguntas de %{scope_name}
       index:
         title: Consultas
+      last_activity:
+        new_consultation: Nova consulta
+        new_question_at_html: "<span>Nova pergunta em %{link}</span>"
+      pages:
+        home:
+          highlighted_consultations:
+            active_consultations: Consultas ativas
+            see_all_consultations: Veja todas as consultas
+            voting_ends_in:
+              one: A votação termina <strong>amanhã</strong>
+              other: A votação termina em <strong>%{count} dia</strong>
+            voting_ends_today: A votação termina <strong>hoje</strong>
       question:
         take_part: Participar
         view_results: Ver resultados

data/config/locales/pt.yml

@@ -174,6 +174,10 @@ pt:
         questions: Questões
         responses: Respostas
     consultations:
+      admin:
+        content_blocks:
+          highlighted_consultations:
+            max_results: Quantidade máxima de elementos para mostrar
       consultation:
         start_voting_date: A votação começa
         view_results: Ver resultados
@@ -184,6 +188,9 @@ pt:
           label: 'Ordenar consultas por:'
           random: Aleatória
           recent: Mais recente
+      content_blocks:
+        highlighted_consultations:
+          name: Consultas destacadas
       count:
         title:
           one: "%{count} consulta"
@@ -204,6 +211,18 @@ pt:
         title: Perguntas de %{scope_name}
       index:
         title: Consultas
+      last_activity:
+        new_consultation: Nova consulta
+        new_question_at_html: "<span>Nova pergunta em %{link}</span>"
+      pages:
+        home:
+          highlighted_consultations:
+            active_consultations: Consultas ativas
+            see_all_consultations: Veja todas as consultas
+            voting_ends_in:
+              one: A votação termina <strong>amanhã</strong>
+              other: A votação termina em <strong>%{count} dia</strong>
+            voting_ends_today: A votação termina <strong>hoje</strong>
       question:
         take_part: Participar
         view_results: Ver resultados

data/config/locales/ru.yml

@@ -220,6 +220,10 @@ ru:
         title: Вопросы из %{scope_name}
       index:
         title: Консультации
+      pages:
+        home:
+          highlighted_consultations:
+            active_consultations: Действующие консультации
       question:
         take_part: Принять участие
         view_results: Посмотреть итоги

data/config/locales/sv.yml

@@ -174,6 +174,10 @@ sv:
         questions: frågor
         responses: Svar
     consultations:
+      admin:
+        content_blocks:
+          highlighted_consultations:
+            max_results: Maximal mängd element att visa
       consultation:
         start_voting_date: Röstningen börjar
         view_results: Se Resultat
@@ -184,6 +188,9 @@ sv:
           label: 'Sortera samråd med:'
           random: Slumpmässig
           recent: Senaste
+      content_blocks:
+        highlighted_consultations:
+          name: Markerade samråd
       count:
         title:
           one: "%{count} konsultation"
@@ -204,6 +211,18 @@ sv:
         title: Frågor från %{scope_name}
       index:
         title: samråd
+      last_activity:
+        new_consultation: Nytt samråd
+        new_question_at_html: "<span>Ny fråga till %{link}</span>"
+      pages:
+        home:
+          highlighted_consultations:
+            active_consultations: Aktiva samråd
+            see_all_consultations: Se alla samråd
+            voting_ends_in:
+              one: Röstningen slutar <strong>morgon</strong>
+              other: Röstningen slutar i <strong>%{count} dagar</strong>
+            voting_ends_today: Omröstning slutar <strong>idag</strong>
       question:
         take_part: Ta del
         view_results: Se Resultat

data/config/locales/uk.yml

@@ -220,6 +220,10 @@ uk:
         title: Питання з %{scope_name}
       index:
         title: Консультації
+      pages:
+        home:
+          highlighted_consultations:
+            active_consultations: Діючі консультації
       question:
         take_part: Взяти участь
         view_results: Переглянути підсумки

data/db/migrate/20181003082318_fix_user_groups_ids_on_consultations.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class FixUserGroupsIdsOnConsultations < ActiveRecord::Migration[5.2]
+  # rubocop:disable Rails/SkipsModelValidations
+  def change
+    Decidim::UserGroup.find_each do |group|
+      old_id = group.extended_data["old_user_group_id"]
+      next unless old_id
+
+      Decidim::Consultations::Vote
+        .where(decidim_user_group_id: old_id)
+        .update_all(decidim_user_group_id: group.id)
+    end
+  end
+  # rubocop:enable Rails/SkipsModelValidations
+end

data/lib/decidim/consultations/engine.rb

@@ -73,6 +73,18 @@ module Decidim
                     active: :inclusive
         end
       end
+
+      initializer "decidim_consultations.content_blocks" do
+        Decidim.content_blocks.register(:homepage, :highlighted_consultations) do |content_block|
+          content_block.cell = "decidim/consultations/content_blocks/highlighted_consultations"
+          content_block.public_name_key = "decidim.consultations.content_blocks.highlighted_consultations.name"
+          content_block.settings_form_cell = "decidim/consultations/content_blocks/highlighted_consultations_settings_form"
+
+          content_block.settings do |settings|
+            settings.attribute :max_results, type: :integer, default: 4
+          end
+        end
+      end
     end
   end
 end

data/lib/decidim/consultations/participatory_space.rb

@@ -2,12 +2,12 @@
 
 Decidim.register_participatory_space(:consultations) do |participatory_space|
   participatory_space.icon = "decidim/consultations/icon.svg"
-  participatory_space.model_class_name = "Decidim::Consultations::Question"
+  participatory_space.model_class_name = "Decidim::Consultation"
   participatory_space.permissions_class_name = "Decidim::Consultations::Permissions"
   participatory_space.stylesheet = "decidim/consultations/consultations"
 
   participatory_space.participatory_spaces do |organization|
-    Decidim::Consultations::Question.where(organization: organization)
+    Decidim::Consultation.where(organization: organization)
   end
 
   participatory_space.context(:public) do |context|
@@ -31,7 +31,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
     organization = Decidim::Organization.first
 
     # Active consultation
-    active_consultation = Decidim::Consultation.create!(
+    active_consultation_params = {
       slug: Faker::Internet.unique.slug(nil, "-"),
       title: Decidim::Faker::Localized.sentence(3),
       subtitle: Decidim::Faker::Localized.sentence(3),
@@ -45,9 +45,18 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       introductory_video_url: "https://www.youtube.com/embed/zhMMW0TENNA",
       decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id,
       organization: organization
-    )
+    }
 
-    finished_consultation = Decidim::Consultation.create!(
+    active_consultation = Decidim.traceability.perform_action!(
+      "publish",
+      Decidim::Consultation,
+      organization.users.first,
+      visibility: "all"
+    ) do
+      Decidim::Consultation.create!(active_consultation_params)
+    end
+
+    finished_consultation_params = {
       slug: Faker::Internet.unique.slug(nil, "-"),
       title: Decidim::Faker::Localized.sentence(3),
       subtitle: Decidim::Faker::Localized.sentence(3),
@@ -62,9 +71,18 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       introductory_video_url: "https://www.youtube.com/embed/zhMMW0TENNA",
       decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id,
       organization: organization
-    )
+    }
 
-    upcoming_consultation = Decidim::Consultation.create!(
+    finished_consultation = Decidim.traceability.perform_action!(
+      "publish",
+      Decidim::Consultation,
+      organization.users.first,
+      visibility: "all"
+    ) do
+      Decidim::Consultation.create!(finished_consultation_params)
+    end
+
+    upcoming_consultation_params = {
       slug: Faker::Internet.unique.slug(nil, "-"),
       title: Decidim::Faker::Localized.sentence(3),
       subtitle: Decidim::Faker::Localized.sentence(3),
@@ -78,11 +96,20 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       introductory_video_url: "https://www.youtube.com/embed/zhMMW0TENNA",
       decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id,
       organization: organization
-    )
+    }
+
+    upcoming_consultation = Decidim.traceability.perform_action!(
+      "publish",
+      Decidim::Consultation,
+      organization.users.first,
+      visibility: "all"
+    ) do
+      Decidim::Consultation.create!(upcoming_consultation_params)
+    end
 
     [finished_consultation, active_consultation, upcoming_consultation].each do |consultation|
       4.times do
-        question = Decidim::Consultations::Question.create!(
+        params = {
           consultation: consultation,
           slug: Faker::Internet.unique.slug(nil, "-"),
           decidim_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id,
@@ -100,7 +127,16 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
           participatory_scope: Decidim::Faker::Localized.sentence(3),
           published_at: Time.now.utc,
           organization: organization
-        )
+        }
+
+        question = Decidim.traceability.perform_action!(
+          "publish",
+          Decidim::Consultations::Question,
+          organization.users.first,
+          visibility: "all"
+        ) do
+          Decidim::Consultations::Question.create!(params)
+        end
 
         2.times do
           Decidim::Consultations::Response.create(

data/lib/decidim/consultations/test/factories.rb

@@ -15,9 +15,9 @@ FactoryBot.define do
   factory :consultation, class: "Decidim::Consultation" do
     organization
     slug { generate(:consultation_slug) }
-    title { Decidim::Faker::Localized.sentence(3) }
-    subtitle { Decidim::Faker::Localized.sentence(1) }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
+    title { generate_localized_title }
+    subtitle { generate_localized_title }
+    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
     published_at { Time.current }
     start_voting_date { Time.zone.today }
@@ -63,12 +63,12 @@ FactoryBot.define do
     organization { consultation.organization }
     scope { create(:scope, organization: consultation.organization) }
     slug { generate(:question_slug) }
-    title { Decidim::Faker::Localized.sentence(3) }
-    subtitle { Decidim::Faker::Localized.sentence(3) }
-    promoter_group { Decidim::Faker::Localized.sentence(3) }
-    participatory_scope { Decidim::Faker::Localized.sentence(3) }
-    question_context { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
-    what_is_decided { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
+    title { generate_localized_title }
+    subtitle { generate_localized_title }
+    promoter_group { generate_localized_title }
+    participatory_scope { generate_localized_title }
+    question_context { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    what_is_decided { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     published_at { Time.current }
     hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
@@ -93,7 +93,7 @@ FactoryBot.define do
 
   factory :response, class: "Decidim::Consultations::Response" do
     question
-    title { Decidim::Faker::Localized.sentence(3) }
+    title { generate_localized_title }
   end
 
   factory :vote, class: "Decidim::Consultations::Vote" do

data/lib/decidim/consultations/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     def self.version
-      "0.14.4"
+      "0.15.0"
     end
   end
 end