decidim-initiatives 0.13.1 → 0.14.1

data/config/locales/nl.yml

@@ -6,8 +6,8 @@ nl:
         description: Beschrijving
         offline_votes: Face-to-face ondersteuning
         scope_id: Bereik
-        signature_end_time: Einde van de periode om handtekeningen te verzamelen
-        signature_start_time: Begin van de periode om handtekeningen te verzamelen
+        signature_end_date: Einde van de periode om handtekeningen te verzamelen
+        signature_start_date: Begin van de periode om handtekeningen te verzamelen
         signature_type: Handtekening verzamelingstype
         signature_type_values:
           any: Gemengd
@@ -82,6 +82,16 @@ nl:
           email_outro: Je hebt deze melding ontvangen omdat je %{resource_title}volgt. Je kunt stoppen met het ontvangen van meldingen na de vorige link.
           email_subject: Nieuwe mijlpaal voltooid!
           notification_title: Het <a href="%{resource_path}">%{resource_title}</a> initiatief heeft de %{percentage}% handtekeningen behaald.
+    gamification:
+      badges:
+        initiatives:
+          description_another: Deze gebruiker heeft %{score} initiatieven gepubliceerd.
+          description_own: Je hebt %{score} initiatieven gepubliceerd.
+          explanation: Gebruikers krijgen deze badge door hun initiatieven gepubliceerd te krijgen.
+          name: Gepubliceerde initiatieven
+          next_level_in: Ontvang nog %{score} initiatieven die zijn gepubliceerd om het volgende niveau te bereiken!
+          unearned_another: Deze gebruiker heeft nog geen initiatieven gepubliceerd.
+          unearned_own: Je hebt nog geen initiatieven gepubliceerd.
     initiatives:
       admin:
         committee_requests:
@@ -181,6 +191,9 @@ nl:
           help_text: U staat op het punt lid te worden van de promotieraad van dit initiatief
         spawn:
           success: Je verzoek is verzonden aan de auteur van het initiatief.
+      content_blocks:
+        highlighted_initiatives:
+          name: Gemarkeerde initiatieven
       create_initiative:
         fill_data:
           back: Terug

data/config/locales/pl.yml

@@ -6,8 +6,8 @@ pl:
         description: Opis
         offline_votes: Wsparcie twarzą w twarz
         scope_id: Zakres
-        signature_end_time: Koniec okresu zbierania podpisu
-        signature_start_time: Początek okresu zbierania podpisu
+        signature_end_date: Koniec okresu zbierania podpisu
+        signature_start_date: Początek okresu zbierania podpisu
         signature_type: Typ kolekcji podpisu
         signature_type_values:
           any: Mieszany
@@ -88,6 +88,16 @@ pl:
           email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{resource_title}. Możesz przestać otrzymywać powiadomienia po poprzednim linku.
           email_subject: Nowy kamień milowy zakończony!
           notification_title: Inicjatywa <a href="%{resource_path}">%{resource_title}</a> osiągnęła %{percentage}% podpisów.
+    gamification:
+      badges:
+        initiatives:
+          description_another: Ten użytkownik otrzymał %{score} opublikowanych inicjatyw.
+          description_own: Masz opublikowanych %{score} inicjatyw.
+          explanation: Użytkownicy otrzymują tę odznakę, publikując swoje inicjatywy.
+          name: Opublikowane inicjatywy
+          next_level_in: Uzyskaj %{score} dodatkowych inicjatyw opublikowanych, aby przejść do następnego poziomu!
+          unearned_another: Ten użytkownik nie otrzymał jeszcze żadnych inicjatyw.
+          unearned_own: Nie opublikowano jeszcze żadnych inicjatyw.
     initiatives:
       admin:
         committee_requests:
@@ -187,6 +197,9 @@ pl:
           help_text: Zamierzasz poprosić o członkostwo w komitecie promującym tę inicjatywę
         spawn:
           success: Twoja prośba została wysłana do autora inicjatywy.
+      content_blocks:
+        highlighted_initiatives:
+          name: Wyróżnione inicjatywy
       create_initiative:
         fill_data:
           back: Plecy

data/config/locales/pt-BR.yml

@@ -6,8 +6,8 @@ pt-BR:
         description: Descrição
         offline_votes: Suporte face a face
         scope_id: Escopo
-        signature_end_time: Fim do período de coleta de assinaturas
-        signature_start_time: Início do período de coleta de assinaturas
+        signature_end_date: Fim do período de coleta de assinaturas
+        signature_start_date: Início do período de coleta de assinaturas
         signature_type: Tipo de coleta de assinatura
         signature_type_values:
           any: Misturado
@@ -82,6 +82,16 @@ pt-BR:
           email_outro: Você recebeu esta notificação porque está seguindo %{resource_title}. Você pode parar de receber notificações após o link anterior.
           email_subject: Novo marco concluído!
           notification_title: A <a href="%{resource_path}">%{resource_title}</a> iniciativa obteve %{percentage}% de assinaturas.
+    gamification:
+      badges:
+        initiatives:
+          description_another: Este usuário obteve %{score} iniciativas publicadas.
+          description_own: Você tem %{score} iniciativas publicadas.
+          explanation: Os usuários recebem esse selo ao publicar suas iniciativas.
+          name: Iniciativas publicadas
+          next_level_in: Obtenha mais %{score} iniciativas publicadas para alcançar o próximo nível!
+          unearned_another: Este usuário ainda não publicou nenhuma iniciativa.
+          unearned_own: Você não tem iniciativas publicadas ainda.
     initiatives:
       admin:
         committee_requests:
@@ -126,22 +136,22 @@ pt-BR:
         initiatives_type_scopes:
           create:
             error: ocorreu um erro
-            success: Um novo escopo para o tipo de iniciativa determinado foi criado
+            success: Um novo âmbito para o tipo de iniciativa determinado foi criado
           destroy:
-            success: O escopo foi removido com sucesso
+            success: O âmbito foi removido com sucesso
           edit:
             back: Costas
             confirm_destroy: Você tem certeza?
             destroy: Excluir
-            title: Editar o escopo do tipo de iniciativa
+            title: Editar o âmbito do tipo de iniciativa
             update: Atualizar
           new:
             back: Costas
             create: Criar
-            title: Criar escopo de tipo de iniciativa
+            title: Criar âmbito de tipo de iniciativa
           update:
             error: ocorreu um erro
-            success: O escopo foi atualizado com sucesso
+            success: O âmbito foi atualizado com sucesso
         initiatives_types:
           create:
             error: ocorreu um erro
@@ -181,6 +191,9 @@ pt-BR:
           help_text: Você está prestes a pedir para se tornar membro do comitê de promotores desta iniciativa
         spawn:
           success: Sua solicitação foi enviada ao autor da iniciativa.
+      content_blocks:
+        highlighted_initiatives:
+          name: Iniciativas destacadas
       create_initiative:
         fill_data:
           back: Costas
@@ -188,7 +201,7 @@ pt-BR:
           fill_data_help: "<ul> <li>Revise o conteúdo da sua iniciativa. Seu título é fácil de entender? O objetivo da sua iniciativa é claro?</li> <li>Você tem que escolher o tipo de assinatura. Pessoalmente, online ou uma combinação de ambos</li> <li>Qual é o âmbito geográfico da iniciativa? Distrito da cidade?</li> </ul>"
           initiative_type: Tipo de iniciativa
           more_information: "(Mais Informações)"
-          select_scope: Selecione um escopo
+          select_scope: Selecione um âmbito
         finish:
           back: Costas
           back_to_initiatives: De volta às iniciativas

data/config/locales/pt.yml

@@ -6,8 +6,8 @@ pt:
         description: Descrição
         offline_votes: Suporte face a face
         scope_id: Escopo
-        signature_end_time: Fim do período de coleta de assinaturas
-        signature_start_time: Início do período de coleta de assinaturas
+        signature_end_date: Fim do período de coleta de assinaturas
+        signature_start_date: Início do período de coleta de assinaturas
         signature_type: Tipo de coleta de assinatura
         signature_type_values:
           any: Misturado
@@ -82,6 +82,16 @@ pt:
           email_outro: Você recebeu esta notificação porque está seguindo %{resource_title}. Você pode parar de receber notificações após o link anterior.
           email_subject: Novo marco concluído!
           notification_title: A iniciativa <a href="%{resource_path}">%{resource_title}</a> alcançou os %{percentage}% de assinaturas.
+    gamification:
+      badges:
+        initiatives:
+          description_another: Este usuário obteve %{score} iniciativas publicadas.
+          description_own: Você tem %{score} iniciativas publicadas.
+          explanation: Os usuários recebem esse selo ao publicar suas iniciativas.
+          name: Iniciativas publicadas
+          next_level_in: Obtenha mais %{score} iniciativas publicadas para alcançar o próximo nível!
+          unearned_another: Este usuário ainda não publicou nenhuma iniciativa.
+          unearned_own: Você não tem iniciativas publicadas ainda.
     initiatives:
       admin:
         committee_requests:
@@ -181,6 +191,9 @@ pt:
           help_text: Você está prestes a pedir para se tornar membro do comitê de promotores desta iniciativa
         spawn:
           success: Sua solicitação foi enviada ao autor da iniciativa.
+      content_blocks:
+        highlighted_initiatives:
+          name: Iniciativas destacadas
       create_initiative:
         fill_data:
           back: Costas

data/config/locales/ru.yml

@@ -6,8 +6,8 @@ ru:
         description: Описание
         offline_votes: Выражения поддержки на личных встречах
         scope_id: Охват
-        signature_end_time: Конец периода сбора подписей
-        signature_start_time: Начало периода сбора подписей
+        signature_end_date: Конец периода сбора подписей
+        signature_start_date: Начало периода сбора подписей
         signature_type: Вид сбора подписей
         signature_type_values:
           any: Смешанный
@@ -117,7 +117,7 @@ ru:
               all: Все
               created: Созданные
               discarded: Отброшенные
-              published: Обнародованные
+              published: Обнародовано
               rejected: Отклоненные
               validating: Техническая проверка
             filter_by: 'Отобрать по признаку:'
@@ -178,7 +178,7 @@ ru:
         accepted: Принятые
         created: Созданные
         discarded: Отброшенные
-        published: Обнародованные
+        published: Обнародовано
         rejected: Отклоненные
         validating: Техническая проверка
       committee_requests:
@@ -187,6 +187,9 @@ ru:
           help_text: Вы собираетесь подать запрос на членство в рабочей группе по продвижению этого почина
         spawn:
           success: Ваш запрос отправлен автору почина.
+      content_blocks:
+        highlighted_initiatives:
+          name: Рекомендуемые почины
       create_initiative:
         fill_data:
           back: Вернуться

data/config/locales/sv.yml

@@ -6,8 +6,8 @@ sv:
         description: Beskrivning
         offline_votes: Ansikte mot ansikte stöd
         scope_id: Omfattning
-        signature_end_time: Slutet på signaturuppsamlingsperioden
-        signature_start_time: Början av signaturuppsamlingsperioden
+        signature_end_date: Slutet på signaturuppsamlingsperioden
+        signature_start_date: Början av signaturuppsamlingsperioden
         signature_type: Signaturuppsamlingstyp
         signature_type_values:
           any: Blandad
@@ -82,6 +82,16 @@ sv:
           email_outro: Du har fått den här meddelandet eftersom du följer %{resource_title}. Du kan sluta ta emot meddelanden efter föregående länk.
           email_subject: Ny milstolpe färdigställd!
           notification_title: <a href="%{resource_path}">%{resource_title}</a> initiativet har uppnått %{percentage}% av underskrifterna.
+    gamification:
+      badges:
+        initiatives:
+          description_another: Den här användaren har fått %{score} initiativ publicerade.
+          description_own: Du har %{score} initiativ publicerade.
+          explanation: Användare får detta märke genom att få sina initiativ publicerade.
+          name: Publicerade initiativ
+          next_level_in: Få %{score} fler initiativ publicerade för att nå nästa nivå!
+          unearned_another: Den här användaren har inte fått några initiativ publicerade än.
+          unearned_own: Du har ännu inte publicerat några initiativ.
     initiatives:
       admin:
         committee_requests:
@@ -181,6 +191,9 @@ sv:
           help_text: Du är på väg att begära att bli medlem av promotorutskottet för detta initiativ
         spawn:
           success: Din förfrågan har skickats till initiativtagaren.
+      content_blocks:
+        highlighted_initiatives:
+          name: Markerade initiativ
       create_initiative:
         fill_data:
           back: Tillbaka

data/config/locales/uk.yml

@@ -6,8 +6,8 @@ uk:
         description: Опис
         offline_votes: Підтримка на особистих зустрічах
         scope_id: Обсяг
-        signature_end_time: Конець проміжку збору підписів
-        signature_start_time: Початок проміжку збору підписів
+        signature_end_date: Кінець періоду збору підписів
+        signature_start_date: Початок періоду збору підписів
         signature_type: Різновид збору підписів
         signature_type_values:
           any: Поєднаний
@@ -117,7 +117,7 @@ uk:
               all: Усі
               created: Створені
               discarded: Відкинуті
-              published: Оприлюднені
+              published: Оприлюднено
               rejected: Відхилені
               validating: Технічна перевірка
             filter_by: 'Відібрати за ознакою:'
@@ -178,7 +178,7 @@ uk:
         accepted: Прийняті
         created: Створені
         discarded: Відкинуті
-        published: Оприлюднені
+        published: Оприлюднено
         rejected: Відхилені
         validating: Технічна перевірка
       committee_requests:
@@ -187,6 +187,9 @@ uk:
           help_text: Ви збираєтесь подати заявку на участь у робочому гурті з просування цього почину
         spawn:
           success: Ваш запит було надіслано автору почину.
+      content_blocks:
+        highlighted_initiatives:
+          name: Висвітлені почини
       create_initiative:
         fill_data:
           back: Повернутись

data/db/migrate/20180726071704_rename_signature_time_fields_to_signature_date.rb

@@ -0,0 +1,9 @@
+# This migration comes from decidim_initiatives (originally 20171214161410)
+# frozen_string_literal: true
+
+class RenameSignatureTimeFieldsToSignatureDate < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :decidim_initiatives, :signature_start_time, :signature_start_date
+    rename_column :decidim_initiatives, :signature_end_time, :signature_end_date
+  end
+end

data/lib/decidim/initiatives/admin_engine.rb

@@ -11,6 +11,7 @@ module Decidim
       isolate_namespace Decidim::Initiatives::Admin
 
       paths["db/migrate"] = nil
+      paths["lib/tasks"] = nil
 
       routes do
         resources :initiatives_types, except: :show do

data/lib/decidim/initiatives/engine.rb

@@ -61,18 +61,10 @@ module Decidim
         )
       end
 
-      initializer "decidim_initiatives.view_hooks" do
-        Decidim.view_hooks.register(:highlighted_elements, priority: Decidim::ViewHooks::MEDIUM_PRIORITY) do |view_context|
-          highlighted_initiatives = OrganizationPrioritizedInitiatives.new(view_context.current_organization)
-
-          next unless highlighted_initiatives.any?
-
-          view_context.render(
-            partial: "decidim/initiatives/pages/home/highlighted_initiatives",
-            locals: {
-              highlighted_initiatives: highlighted_initiatives
-            }
-          )
+      initializer "decidim_initiatives.content_blocks" do
+        Decidim.content_blocks.register(:homepage, :highlighted_initiatives) do |content_block|
+          content_block.cell = "decidim/initiatives/content_blocks/highlighted_initiatives"
+          content_block.public_name_key = "decidim.initiatives.content_blocks.highlighted_initiatives.name"
         end
       end
 
@@ -89,6 +81,18 @@ module Decidim
                     active: :inclusive
         end
       end
+
+      initializer "decidim_initiatives.badges" do
+        Decidim::Gamification.register_badge(:initiatives) do |badge|
+          badge.levels = [1, 5, 15, 30, 50]
+
+          badge.reset = lambda { |user|
+            Decidim::Initiative.where(
+              author: user
+            ).published.count
+          }
+        end
+      end
     end
   end
 end

data/lib/decidim/initiatives/initiatives_filter_form_builder.rb

@@ -13,18 +13,18 @@ module Decidim
       # - prompt   - An optional String with the text to display as prompt.
       #
       # Returns a String.
-      def initiative_types_select(name, options = {})
+      def initiative_types_select(name, collection, options = {})
         selected = object.send(name)
 
         if selected.present?
           if selected == "all"
-            types = Decidim::InitiativesType.all.map do |type|
+            types = collection.all.map do |type|
               [type.title[I18n.locale.to_s], type.id]
             end
           else
             selected = selected.values if selected.is_a?(Hash)
             selected = [selected] unless selected.is_a?(Array)
-            types = Decidim::InitiativesType.where(id: selected.map(&:to_i)).map do |type|
+            types = collection.where(id: selected.map(&:to_i)).map do |type|
               [type.title[I18n.locale.to_s], type.id]
             end
           end

data/lib/decidim/initiatives/participatory_space.rb

@@ -29,6 +29,14 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
     seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")
     organization = Decidim::Organization.first
 
+    Decidim::ContentBlock.create(
+      organization: organization,
+      weight: 33,
+      scope: :homepage,
+      manifest_name: :highlighted_initiatives,
+      published_at: Time.current
+    )
+
     3.times do |n|
       type = Decidim::InitiativesType.create!(
         title: Decidim::Faker::Localized.sentence(5),
@@ -56,9 +64,9 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
         scoped_type: Decidim::InitiativesTypeScope.reorder(Arel.sql("RANDOM()")).first,
         state: state,
         signature_type: "online",
-        signature_start_time: DateTime.current - 7.days,
-        signature_end_time:  DateTime.current + 7.days,
-        published_at: DateTime.current - 7.days,
+        signature_start_date: Date.current - 7.days,
+        signature_end_date:  Date.current + 7.days,
+        published_at: Time.current - 7.days,
         author: Decidim::User.reorder(Arel.sql("RANDOM()")).first,
         organization: organization
       )

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

@@ -14,7 +14,7 @@ FactoryBot.define do
   factory :initiatives_type_scope, class: Decidim::InitiativesTypeScope do
     type { create(:initiatives_type) }
     scope { create(:scope, organization: type.organization) }
-    supports_required 1000
+    supports_required { 1000 }
   end
 
   factory :initiative, class: Decidim::Initiative do
@@ -23,10 +23,10 @@ FactoryBot.define do
     organization
     author { create(:user, :confirmed, organization: organization) }
     published_at { Time.current }
-    state "published"
-    signature_type "online"
-    signature_start_time { Time.now.utc - 1.hour }
-    signature_end_time { Time.now.utc + 120.days }
+    state { "published" }
+    signature_type { "online" }
+    signature_start_date { Date.current - 1.day }
+    signature_end_date { Date.current + 120.days }
 
     scoped_type do
       create(:initiatives_type_scope,
@@ -39,47 +39,47 @@ FactoryBot.define do
     end
 
     trait :created do
-      state "created"
-      published_at nil
-      signature_start_time nil
-      signature_end_time nil
+      state { "created" }
+      published_at { nil }
+      signature_start_date { nil }
+      signature_end_date { nil }
     end
 
     trait :validating do
-      state "validating"
-      published_at nil
-      signature_start_time nil
-      signature_end_time nil
+      state { "validating" }
+      published_at { nil }
+      signature_start_date { nil }
+      signature_end_date { nil }
     end
 
     trait :published do
-      state "published"
+      state { "published" }
     end
 
     trait :accepted do
-      state "accepted"
+      state { "accepted" }
     end
 
     trait :discarded do
-      state "discarded"
+      state { "discarded" }
     end
 
     trait :rejected do
-      state "rejected"
+      state { "rejected" }
     end
 
     trait :online do
-      signature_type "online"
+      signature_type { "online" }
     end
 
     trait :offline do
-      signature_type "offline"
+      signature_type { "offline" }
     end
 
     trait :acceptable do
-      signature_start_time { Time.now.utc - 3.months }
-      signature_end_time { Time.now.utc - 2.months }
-      signature_type "online"
+      signature_start_date { Date.current - 3.months }
+      signature_end_date { Date.current - 2.months }
+      signature_type { "online" }
 
       after(:build) do |initiative|
         initiative.initiative_votes_count = initiative.scoped_type.supports_required + 1
@@ -87,9 +87,9 @@ FactoryBot.define do
     end
 
     trait :rejectable do
-      signature_start_time { Time.now.utc - 3.months }
-      signature_end_time { Time.now.utc - 2.months }
-      signature_type "online"
+      signature_start_date { Date.current - 3.months }
+      signature_end_date { Date.current - 2.months }
+      signature_type { "online" }
 
       after(:build) do |initiative|
         initiative.initiative_votes_count = initiative.scoped_type.supports_required - 1
@@ -114,18 +114,18 @@ FactoryBot.define do
   factory :initiatives_committee_member, class: Decidim::InitiativesCommitteeMember do
     initiative { create(:initiative) }
     user { create(:user, :confirmed, organization: initiative.organization) }
-    state "accepted"
+    state { "accepted" }
 
     trait :accepted do
-      state "accepted"
+      state { "accepted" }
     end
 
     trait :requested do
-      state "requested"
+      state { "requested" }
     end
 
     trait :rejected do
-      state "rejected"
+      state { "rejected" }
     end
   end
 end