decidim-meetings 0.28.1 → 0.29.0.rc1

data/config/locales/pt-BR.yml

@@ -91,6 +91,11 @@ pt-BR:
   decidim:
     admin:
       filters:
+        accepted_at_not_null:
+          label: Aceitou
+          values:
+            'false': Não aceito
+            'true': Aceitou
         meetings:
           category_id_eq:
             label: Categoria
@@ -118,6 +123,18 @@ pt-BR:
               hybrid: Híbrido
               in_person: Presencialmente
               online: Virtual
+        rejected_at_not_null:
+          label: Rejeitado
+          values:
+            'false': Não rejeitado
+            'true': Rejeitado
+        search_placeholder:
+          user_name_or_user_email_cont: Buscar por nome ou email
+        sent_at_not_null:
+          label: Enviado
+          values:
+            'false': Não enviado
+            'true': Enviado
       meeting_copies:
         create:
           error: Ocorreu um erro ao duplicar esta reunião.
@@ -282,15 +299,9 @@ pt-BR:
             non_user: Usuário inexistente
             select_user: Selecionar usuário
           index:
-            filter:
-              accepted: Aceitou
-              all: Tudo
-              rejected: Rejeitado
-              sent: Enviado
             invite_attendee: Convidar participante
             invites: Convites
             registrations_disabled: Você não pode convidar um participante porque os registros estão desativados.
-            search: Pesquisa
         meeting_closes:
           edit:
             close: Fechar
@@ -413,7 +424,6 @@ pt-BR:
           body: A reunião <a href="%{meeting_path}">"%{meeting_title}"</a> está pendente para ser fechada. Adicione um relatório da reunião usando o botão "Fechar reunião".
           greetings: Saudações,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
           hello: Olá %{username},
-          subject: Agora você pode encerrar sua reunião com um relatório na plataforma %{organization_name}
       conference_venues: Locais de conferência
       content_blocks:
         upcoming_meetings:
@@ -430,16 +440,13 @@ pt-BR:
       iframe_embed_type:
         embed_in_meeting_page: Incorporar na página da reunião
         none: Nenhum
-        open_in_live_event_page: Abrir na página de eventos ao vivo (com enquetes opcionais)
         open_in_new_tab: Abrir URL em uma nova aba
       last_activity:
         meeting_updated: 'Reunião atualizada:'
         new_meeting: 'Nova reunião:'
       layouts:
         live_event:
-          administrate: Administrar
           close: fechar
-          questions: Perguntas
       mailer:
         invite_join_meeting_mailer:
           invite:
@@ -579,12 +586,9 @@ pt-BR:
             title: Título
       polls:
         questions:
-          closed_question:
-            question_results: Resultados das perguntas
           index:
             empty_questions: Durante esta reunião, algumas perguntas serão enviadas e você poderá respondê-las. Elas serão exibidas aqui.
           index_admin:
-            admin_dashboard: Painel de administração
             edit: Editar no painel de administração
             question: Pergunta
             received_answer: resposta recebida

data/config/locales/pt.yml

@@ -229,12 +229,8 @@ pt:
             non_user: Participante inexistente
             select_user: Selecione o participante
           index:
-            filter:
-              all: Todos
-              sent: Enviado
             invite_attendee: Convidar participante
             invites: Convites
-            search: Pesquisar
         meeting_closes:
           edit:
             close: Fechar
@@ -320,9 +316,7 @@ pt:
             space_type: Espaço participativo
       layouts:
         live_event:
-          administrate: Administradores
           close: Fechar
-          questions: Pergunta
       mailer:
         invite_join_meeting_mailer:
           invite:
@@ -440,12 +434,9 @@ pt:
             title: Título
       polls:
         questions:
-          closed_question:
-            question_results: Resultados das questões
           index:
             empty_questions: Durante esta reunião irão ser-lhe enviadas algumas questões e poderá responder-lhes. Serão exibidas aqui.
           index_admin:
-            admin_dashboard: Painel de controlo de administrador
             question: Questão
             received_answer: resposta recebida
             received_answers: respostas recebidas

data/config/locales/ro-RO.yml

@@ -265,12 +265,8 @@ ro:
             non_user: Participant neexistent
             select_user: Selecteză un participant
           index:
-            filter:
-              all: Toate
-              sent: Trimis
             invite_attendee: Invită participantul
             invites: Invitații
-            search: Caută
         meeting_closes:
           edit:
             close: Închide
@@ -368,7 +364,6 @@ ro:
       close_meeting_reminder_mailer:
         close_meeting_reminder:
           hello: Salut %{username},
-          subject: Acum poți închide întâlnirea cu un raport pe platforma %{organization_name}
       conference_venues: Locuri ale conferinței
       content_blocks:
         upcoming_meetings:
@@ -384,16 +379,13 @@ ro:
       iframe_embed_type:
         embed_in_meeting_page: Incorporează în pagina de şedinţe
         none: Niciunul
-        open_in_live_event_page: Deschide în pagina de evenimente live (cu sondaje opționale)
         open_in_new_tab: Deschideți în filă nouă
       last_activity:
         meeting_updated: 'Ședință actualizată:'
         new_meeting: 'Ședință nouă:'
       layouts:
         live_event:
-          administrate: Administrează
           close: închide
-          questions: Întrebări
       mailer:
         invite_join_meeting_mailer:
           invite:
@@ -522,12 +514,9 @@ ro:
             title: Titlu
       polls:
         questions:
-          closed_question:
-            question_results: Rezultatele întrebării
           index:
             empty_questions: Pe parcursul acestei întâlniri, vor fi trimise câteva întrebări și vei putea răspunde la acestea. Acestea vor fi afișate aici.
           index_admin:
-            admin_dashboard: Panou de administrare
             edit: Editează în panoul de administrare
             question: Întrebare
             received_answer: răspuns primit

data/config/locales/ru.yml

@@ -182,11 +182,8 @@ ru:
             non_user: Не существующий участник
             select_user: Выберите участника
           index:
-            filter:
-              sent: Отправлено
             invite_attendee: Пригласить участника
             invites: Приглашения
-            search: Поиск
         meeting_closes:
           edit:
             close: Закрыть

data/config/locales/sk.yml

@@ -184,11 +184,8 @@ sk:
             non_user: Neexistujúca užívateľ
             select_user: Vyberte používateľa
           index:
-            filter:
-              sent: Odoslaná
             invite_attendee: Pozvať účastníka
             invites: Pozvánky
-            search: Vyhľadávanie
         meeting_closes:
           edit:
             close: Zavrieť

data/config/locales/sv.yml

@@ -248,12 +248,8 @@ sv:
             non_user: Icke befintlig deltagare
             select_user: Välj deltagare
           index:
-            filter:
-              all: Alla
-              sent: Skickat
             invite_attendee: Bjud in deltagare
             invites: Inbjudningar
-            search: Sök
         meeting_closes:
           edit:
             close: Stäng
@@ -355,15 +351,12 @@ sv:
       iframe_embed_type:
         embed_in_meeting_page: Bädda in på mötessidan
         none: Ingen
-        open_in_live_event_page: Öppna i live event sida (med valfria omröstningar)
         open_in_new_tab: Öppna länk i ny flik
       last_activity:
         new_meeting: 'Nytt möte:'
       layouts:
         live_event:
-          administrate: Administrera
           close: stäng
-          questions: Frågor
       mailer:
         invite_join_meeting_mailer:
           invite:
@@ -495,12 +488,9 @@ sv:
             title: Titel
       polls:
         questions:
-          closed_question:
-            question_results: Resultat
           index:
             empty_questions: Under hela mötet kommer några frågor att skickas och du kommer kunna svara på dem. De kommer att visas här.
           index_admin:
-            admin_dashboard: Adminpanel
             question: Fråga
             received_answer: mottaget svar
             received_answers: mottagna svar

data/config/locales/tr-TR.yml

@@ -199,12 +199,8 @@ tr:
             non_user: Mevcut olmayan katılımcı
             select_user: Katılımcı seç
           index:
-            filter:
-              all: Tümü
-              sent: Gönderilen
             invite_attendee: Katılımcı davet et
             invites: Davetler
-            search: Arama
         meeting_closes:
           edit:
             close: Kapat
@@ -273,6 +269,9 @@ tr:
           value_types:
             organizer_presenter:
               not_found: 'Organizatör veritabanında bulunamadı (ID: %{id})'
+      calendar:
+        meeting_to_event:
+          read_more: Bu toplantı hakkında daha fazlasını okuyun
       calendar_modal:
         calendar_url: Takvim URL'si
         export_calendar: Takvimi dışa aktar

data/config/locales/uk.yml

@@ -164,11 +164,8 @@ uk:
             non_user: Не чинний учасник
             select_user: Оберіть учасника
           index:
-            filter:
-              sent: Надіслано
             invite_attendee: Запросити учасника
             invites: Запрошення
-            search: Шукати
         meeting_closes:
           edit:
             close: Закрити

data/config/locales/zh-CN.yml

@@ -186,12 +186,8 @@ zh-CN:
             non_user: 非现有参与者
             select_user: 选择参与者
           index:
-            filter:
-              all: 所有的
-              sent: 已发送
             invite_attendee: 邀请参与者
             invites: 邀请
-            search: 搜索
         meeting_closes:
           edit:
             close: 关闭

data/config/locales/zh-TW.yml

@@ -273,13 +273,9 @@ zh-TW:
             non_user: 不存在的參與者。
             select_user: 選擇參與者
           index:
-            filter:
-              all: 全部
-              sent: 傳送
             invite_attendee: 邀請的與會者
             invites: 邀請
             registrations_disabled: 你無法邀請參加者，因為註冊已被禁用。
-            search: 搜尋
         meeting_closes:
           edit:
             close: 關閉
@@ -396,7 +392,6 @@ zh-TW:
           body: 會議<a href="%{meeting_path}">"%{meeting_title}"</a>等待關閉，請使用“關閉會議”按鈕添加會議報告。
           greetings: 問候,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
           hello: 哈囉，%{username}！
-          subject: 您現在可以在 %{organization_name} 平台上透過報告結束您的會議。
       conference_venues: 會議場地
       content_blocks:
         upcoming_meetings:
@@ -413,16 +408,13 @@ zh-TW:
       iframe_embed_type:
         embed_in_meeting_page: 嵌入會議頁面
         none: 沒有
-        open_in_live_event_page: 在直播活動頁面開啟(附加投票選項)
         open_in_new_tab: 在新頁籤中開啟 URL
       last_activity:
         meeting_updated: '會議已更新:'
         new_meeting: '新會議:'
       layouts:
         live_event:
-          administrate: 管理員
           close: 關閉
-          questions: 問題
       mailer:
         invite_join_meeting_mailer:
           invite:
@@ -553,12 +545,9 @@ zh-TW:
             title: 標題
       polls:
         questions:
-          closed_question:
-            question_results: 問題結果
           index:
             empty_questions: 在本次會議期間，您將收到一些問題並且您可以回答這些問題。這些問題將會在此顯示。
           index_admin:
-            admin_dashboard: 管理員儀表板
             edit: 在管理面板中編輯
             question: 問題
             received_answer: 收到回答

data/db/migrate/20240130135858_add_withdrawn_fields_on_meetings.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class AddWithdrawnFieldsOnMeetings < ActiveRecord::Migration[6.1]
+  class CustomMeeting < Decidim::Meetings::ApplicationRecord
+    self.table_name = "decidim_meetings_meetings"
+  end
+
+  def up
+    add_column :decidim_meetings_meetings, :withdrawn_at, :datetime
+
+    CustomMeeting.where(state: "withdrawn").find_each do |meeting|
+      meeting.withdrawn_at = meeting.updated_at
+      meeting.save!
+    end
+  end
+
+  def down
+    # rubocop:disable Rails/SkipsModelValidations
+    CustomMeeting.where.not(withdrawn_at: null).update_all(state: :withdrawn)
+    # rubocop:enable Rails/SkipsModelValidations
+    remove_column :decidim_meetings_meetings, :withdrawn_at
+  end
+end

data/decidim-meetings.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.1.0"
+  s.required_ruby_version = "~> 3.2.0"
 
   s.name = "decidim-meetings"
   s.summary = "Decidim meetings module"

data/lib/decidim/api/meeting_type.rb

@@ -45,6 +45,9 @@ module Decidim
         object.audio_url if object.closing_visible?
       end
 
+      field :withdrawn_at, Decidim::Core::DateTimeType, description: "The date and time this meeting was withdrawn", null: true
+      field :withdrawn, GraphQL::Types::Boolean, "Whether this meeting has been withdrawn or not", method: :withdrawn?, null: true
+
       field :created_at, Decidim::Core::DateTimeType, description: "The date and time this minutes was created", null: true
       field :updated_at, Decidim::Core::DateTimeType, description: "The date and time this minutes was updated", null: true
 

data/lib/decidim/meetings/component.rb

@@ -19,12 +19,12 @@ Decidim.register_component(:meetings) do |component|
     resource.template = "decidim/meetings/meetings/linked_meetings"
     resource.card = "decidim/meetings/meeting"
     resource.reported_content_cell = "decidim/meetings/reported_content"
-    resource.actions = %w(join comment)
+    resource.actions = %w(join comment reply_poll)
     resource.searchable = true
   end
 
   component.register_stat :meetings_count, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
-    meetings = Decidim::Meetings::FilteredMeetings.for(components, start_at, end_at).except_withdrawn
+    meetings = Decidim::Meetings::FilteredMeetings.for(components, start_at, end_at).not_withdrawn
     meetings.count
   end
 

data/lib/decidim/meetings/engine.rb

@@ -32,7 +32,11 @@ module Decidim
           resource :live_event, only: :show
           namespace :polls do
             resources :questions, only: [:index, :update]
-            resources :answers, only: [:index, :create]
+            resources :answers, only: [:index, :create] do
+              collection do
+                get :admin
+              end
+            end
           end
         end
         scope "/meetings" do

data/lib/decidim/meetings/meeting_serializer.rb

@@ -46,7 +46,9 @@ module Decidim
           url:,
           related_proposals:,
           related_results:,
-          published: meeting.published_at.present?
+          published: meeting.published_at.present?,
+          withdrawn: meeting.withdrawn?,
+          withdrawn_at: meeting.withdrawn_at
         }
       end
 

data/lib/decidim/meetings/seeds.rb

@@ -59,6 +59,7 @@ module Decidim
       def meeting_params(component:, type:, author_type:)
         start_time = ::Faker::Date.between(from: 20.weeks.ago, to: 20.weeks.from_now)
         end_time = start_time + [rand(1..4).hours, rand(1..20).days].sample
+        registration_type = Decidim::Meetings::Meeting::REGISTRATION_TYPES.keys.sample
 
         params = {
           component:,
@@ -78,6 +79,7 @@ module Decidim
           registrations_enabled: [true, false].sample,
           available_slots: (10..50).step(10).to_a.sample,
           author: participatory_space.organization,
+          registration_type:,
           registration_terms: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
             Decidim::Faker::Localized.paragraph(sentence_count: 3)
           end,
@@ -87,7 +89,6 @@ module Decidim
         params = case type
                  when :hybrid
                    params.merge(
-                     end_time: Time.zone.now + [rand(1..4).hours, rand(1..20).days].sample,
                      type_of_meeting: :hybrid,
                      online_meeting_url: "https://www.youtube.com/watch?v=f6JMgJAQ2tc",
                      iframe_access_level: :all,
@@ -95,7 +96,6 @@ module Decidim
                    )
                  when :online
                    params.merge(
-                     end_time: Time.zone.now + [rand(1..4).hours, rand(1..20).days].sample,
                      location: nil,
                      location_hints: nil,
                      latitude: nil,
@@ -107,7 +107,6 @@ module Decidim
                    )
                  when :online_live_event
                    params.merge(
-                     end_time: Time.zone.now + [rand(1..4).hours, rand(1..20).days].sample,
                      location: nil,
                      location_hints: nil,
                      latitude: nil,
@@ -121,6 +120,15 @@ module Decidim
                    params # :in_person
                  end
 
+        params = case registration_type
+                 when :on_different_platform
+                   params.merge(registration_url: Faker::Internet.url)
+                 when :on_this_platform
+                   params.merge(registrations_enabled: true)
+                 else
+                   params # registration_disabled
+                 end
+
         case author_type
         when :user
           params.merge(
@@ -135,7 +143,7 @@ module Decidim
             user_group:
           )
         else
-          params # oficial
+          params # official
         end
       end
 
@@ -149,12 +157,23 @@ module Decidim
       def create_meeting!(component:, type: :in_person, author_type: :official)
         params = meeting_params(component:, type:, author_type:)
 
-        Decidim.traceability.create!(
+        resource = Decidim.traceability.create!(
           Decidim::Meetings::Meeting,
           admin_user,
           params,
           visibility: "all"
         )
+
+        Decidim::EventsManager.publish(
+          event: "decidim.events.meetings.meeting_created",
+          event_class: Decidim::Meetings::CreateMeetingEvent,
+          resource:,
+          followers: resource.participatory_space.followers
+        )
+
+        Decidim::Comments::Seed.comments_for(resource)
+
+        resource
       end
 
       def create_service!(meeting:)
@@ -181,19 +200,7 @@ module Decidim
       def create_meeting_registration!(meeting:)
         r = SecureRandom.hex(4)
         email = "meeting-registered-user-#{meeting.id}-#{r}@example.org"
-        name = "#{::Faker::Name.name} #{meeting.id} #{r}"
-        user = Decidim::User.find_or_initialize_by(email:)
-
-        user.update!(
-          password: "decidim123456789",
-          name:,
-          nickname: ::Faker::Twitter.unique.screen_name,
-          organization:,
-          tos_agreement: "1",
-          confirmed_at: Time.current,
-          personal_url: ::Faker::Internet.url,
-          about: ::Faker::Lorem.paragraph(sentence_count: 2)
-        )
+        user = find_or_initialize_user_by(email:)
 
         Decidim::Meetings::Registration.create!(
           meeting:,

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

@@ -57,7 +57,7 @@ FactoryBot.define do
     end
 
     trait :withdrawn do
-      state { "withdrawn" }
+      withdrawn_at { Time.current }
     end
 
     trait :in_person do

data/lib/decidim/meetings/test/notifications_handling.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples_for "emits an upcoming notificaton" do
+shared_examples_for "emits an upcoming notification" do
   context "when it is a future meeting" do
     let(:future_start_date) { 3.days.from_now }
 

data/lib/decidim/meetings/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Meetings
     def self.version
-      "0.28.1"
+      "0.29.0.rc1"
     end
   end
 end

data/lib/tasks/decidim_meetings.rake

@@ -3,7 +3,7 @@
 namespace :decidim_meetings do
   # For privacy reasons we recommend that you delete this registration form when you no longer need it.
   # By default this is 3 months after the meeting has passed
-  desc "Remove registration forms belonging to meetings that have ended more than X months ago"
+  desc "Removes registration forms belonging to meetings that have ended more than X months ago"
   task :clean_registration_forms, [:months] => :environment do |_t, args|
     args.with_defaults(months: 3)