decidim-meetings 0.27.5 → 0.27.6

data/config/locales/pl.yml

@@ -14,11 +14,14 @@ pl:
       meeting:
         address: Adres
         available_slots: Dostępne miejsca na to spotkanie
+        customize_registration_email: Dostosuj maila rejestracji
         decidim_category_id: Kategoria
         decidim_scope_id: Zakres
         decidim_user_group_id: Grupa użytkowników
         description: Opis
+        end_time: Czas zakończenia
         id: Numer ID
+        iframe_embed_type: Typ osadzenia Iframe
         location: Miejsce
         location_hints: Wskazówki co do miejsca
         online_meeting_url: Adres URL spotkania online
@@ -296,6 +299,8 @@ pl:
             registration_url_help: 'Link: zezwól użytkownikom na korzystanie z usługi zewnętrznej, której używasz do rejestracji'
             select_a_meeting_type: Wybierz typ spotkania
             select_a_registration_type: Wybierz typ rejestracji
+            select_an_iframe_access_level: Wybierz poziom dostępu do iframe
+            show_embedded_iframe_help: 'Tylko kilka usług pozwala na osadzanie się w spotkaniu lub wydarzeniu na żywo z następujących domen: %{domains}'
           index:
             title: Spotkania
           new:
@@ -368,21 +373,38 @@ pl:
           value_types:
             organizer_presenter:
               not_found: 'Nie znaleziono organizatora w bazie danych (ID: %{id})'
+        questionnaire:
+          update: "%{user_name} zaktualizował(a) kwestionariusz spotkania %{meeting_name}"
       application_helper:
+        filter_category_values:
+          all: Wszystkie
+        filter_meeting_space_values:
+          all: Wszystkie
         filter_scope_values:
           all: Wszystkie
+      calendar:
+        meeting_to_event:
+          read_more: Przeczytaj więcej o tym spotkaniu
       calendar_modal:
         calendar_url: Adres URL kalendarza
         close_window: Zamknij okno
+        copy_calendar_url: Kopiuj
+        copy_calendar_url_clarification: Skopiuj adres URL kalendarza do schowka
+        copy_calendar_url_copied: Skopiowano!
         copy_calendar_url_description: Możesz zobaczyć wszystkie opublikowane spotkania w swojej aplikacji kalendarza. Skopiuj i wklej ten adres URL w swoim kalendarzu, używając opcji "Dodaj nowy kalendarz z URL".
         copy_calendar_url_explanation: Pamiętaj, że eksportujesz wybrane spotkania, ponieważ filtry są włączone. Jeśli chcesz je wyeksportować, najpierw zresetuj wszystkie filtry.
+        copy_calendar_url_message: Link został pomyślnie skopiowany do schowka.
         export_calendar: Eksportuj kalendarz
       close_meeting_reminder_mailer:
         close_meeting_reminder:
+          body: Spotkanie <a href="%{meeting_path}">"%{meeting_title}"</a> oczekuje na zamknięcie. Dodaj raport z spotkania za pomocą przycisku "Zamknij spotkanie".
+          greetings: Pozdrawiamy,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+          hello: Witaj %{username},
           subject: Teraz możesz zamknąć spotkanie z opublikowaniem raportu na platformie %{organization_name}
       conference_venues: Sale konferencyjne
       content_blocks:
         upcoming_meetings:
+          name: Nadchodzące spotkania
           upcoming_meetings: Nadchodzące spotkania
           view_all_meetings: Pokaż wszystkie
       directory:
@@ -390,9 +412,23 @@ pl:
           index:
             meetings: Spotkania
             space_type: Przestrzeń partycypacyjna
+      iframe_access_level:
+        all: Wszyscy odwiedzający
+        registered: Zarejestrowani uczestnicy tego spotkania
+        signed_in: Tylko zalogowani uczestnicy
+      iframe_embed_type:
+        embed_in_meeting_page: Osadź na stronie spotkania
+        none: Żaden
+        open_in_live_event_page: Otwórz stronę wydarzenia na żywo (z opcjonalnymi ankietami)
+        open_in_new_tab: Otwórz odnośnik w nowej zakładce
       last_activity:
         meeting_updated_at_html: "<span>Spotkanie zaktualizowane o %{link}</span>"
         new_meeting_at_html: "<span>Nowe spotkanie %{link}</span>"
+      layouts:
+        live_event:
+          administrate: Administruj
+          close: zamknij
+          questions: Pytania
       mailer:
         invite_join_meeting_mailer:
           invite:
@@ -412,6 +448,7 @@ pl:
           add_to_calendar: Dodaj do kalendarza
           apple: Dodaj do kalendarza Apple
           close_window: Zamknij okno
+          full_details_html: Aby uzyskać pełne szczegóły, przejdź do %{link}
           google: Dodaj do kalendarza Google
           outlook: Dodaj do kalendarza Outlook
         count:
@@ -441,11 +478,14 @@ pl:
           origin_values:
             all: Wszystkie
             official: Oficjalny
+            participants: Uczestnicy
+            user_groups: Grupy
           scope: Zakres
           search: Szukaj
           type: Typ
           type_values:
             all: Wszystko
+            hybrid: Hybrydowe
             in_person: Osobiście
             online: Online
         filters_small_view:
@@ -465,8 +505,14 @@ pl:
           select_a_category: Wybierz kategorię
           select_a_meeting_type: Wybierz typ spotkania
           select_a_registration_type: Wybierz typ rejestracji
+          select_an_iframe_access_level: Wybierz poziom dostępu iframe
+          show_embedded_iframe_help: 'Tylko kilka usług pozwala na osadzanie się w spotkaniu lub wydarzeniu na żywo z następujących domen: %{domains}'
         index:
+          click_here: Zobacz wszystkie spotkania
           new_meeting: Nowe spotkanie
+          see_all: Zobacz wszystkie spotkania
+          see_all_withdrawn: Zobacz wszystkie wycofane spotkania
+          text_banner: Oglądasz listę spotkań wycofanych przez ich autorów. %{go_back_link}.
         meeting_minutes:
           related_information: Powiązana informacja
         meetings:

data/config/locales/pt-BR.yml

@@ -19,6 +19,8 @@ pt-BR:
         decidim_scope_id: Âmbito
         decidim_user_group_id: Grupo de usuários
         description: Descrição
+        end_time: Data Final
+        id: ID
         iframe_embed_type: Tipo de incorporação iframe
         location: Localização
         location_hints: Dicas de localização
@@ -29,11 +31,26 @@ pt-BR:
         registration_email_custom_content: Registro de conteúdo personalizado do e-mail
         registration_form_enabled: Formulário de inscrição ativado
         registration_terms: Termos de registro
+        registration_type: Tipo de Registro
         registration_url: URL de Registro
         registrations_enabled: Registos habilitados
+        reserved_slots: Slots reservados para esta reunião
+        start_time: Data Inicial
         title: Título
         transparent: Transparente
         type_of_meeting: Tipo
+      meeting_agenda:
+        title: Título
+        visible: Visível
+      meeting_agenda_items:
+        description: Descrição
+        duration: Duração
+        title: Título
+      meeting_registration_invite:
+        email: E-mail
+        name: Nome
+      validate_registration_code:
+        code: Código
     errors:
       models:
         meeting:
@@ -73,9 +90,31 @@ pt-BR:
     admin:
       filters:
         meetings:
+          category_id_eq:
+            label: Categoria
+          closed_at_present:
+            label: Estado
+            values:
+              'false': Aberto
+              'true': Fechado
+          is_upcoming_true:
+            label: Encontro
+            values:
+              'false': Passado
+              'true': Próximos
+          scope_id_eq:
+            label: Escopo
+          with_any_origin:
+            label: Origem
+            values:
+              official: Oficial
+              participants: Participante
+              user_group: Grupo de Usuários
           with_any_type:
+            label: Tipo de reunião
             values:
               hybrid: Híbrido
+              in_person: Presencialmente
               online: Virtual
       meeting_copies:
         create:
@@ -88,6 +127,7 @@ pt-BR:
     components:
       meetings:
         actions:
+          comment: Comentário
           join: Junte-se
         name: Reuniões
         settings:
@@ -242,7 +282,9 @@ pt-BR:
             select_user: Selecionar usuário
           index:
             filter:
+              accepted: Aceitou
               all: Tudo
+              rejected: Rejeitado
               sent: Enviado
             filter_by: Filtrar por
             invite_attendee: Convidar participante
@@ -355,6 +397,8 @@ pt-BR:
       application_helper:
         filter_category_values:
           all: Todos
+        filter_meeting_space_values:
+          all: Todos
         filter_scope_values:
           all: Tudo
       calendar:
@@ -481,6 +525,7 @@ pt-BR:
           select_an_iframe_access_level: Por favor, selecione um nível de acesso iframe
           show_embedded_iframe_help: 'Apenas alguns serviços permitem incorporar na reunião ou evento ao vivo dos seguintes domínios: %{domains}'
         index:
+          click_here: Ver todas reuniões
           new_meeting: Nova reunião
           see_all: Veja todas as reuniões
           see_all_withdrawn: Veja todas as reuniões retiradas
@@ -508,7 +553,11 @@ pt-BR:
           join: Participe da reunião
           leave: Cancelar registro
           leave_confirmation: Tem certeza de que deseja cancelar seu cadastro para esta reunião?
+          link_available_soon: Link disponível em breve
+          link_closed: O link para participar da reunião estará disponível alguns minutos antes de iniciar
+          live_event: Esta reunião está acontecendo agora
           meeting_minutes: Atas de Reunião
+          micro_camera_permissions_warning: Quando você clicar no botão abaixo, serão solicitadas permissões de microfone e/ou câmera e participará na videoconferência
           no_slots_available: Não há slots disponíveis
           organizations: Organizações participantes
           registration_code_help_text: Seu código de registro
@@ -543,6 +592,7 @@ pt-BR:
           fields:
             closed: Fechadas
             end_time: Data final
+            id: ID
             map: Mapa
             official_meeting: Reunião oficial
             start_time: Data de início

data/config/locales/sv.yml

@@ -40,6 +40,7 @@ sv:
         title: Titel
         visible: Synlig
       meeting_agenda_items:
+        description: Beskrivning
         duration: Varaktighet
         title: Titel
       meeting_registration_invite:

data/decidim-meetings.gemspec

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+
+# Maintain your gem's version:
+require "decidim/meetings/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.version = Decidim::Meetings.version
+  s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
+  s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
+  s.license = "AGPL-3.0"
+  s.homepage = "https://github.com/decidim/decidim"
+  s.required_ruby_version = "~> 3.0.0"
+
+  s.name = "decidim-meetings"
+  s.summary = "Decidim meetings module"
+  s.description = "A meetings component for decidim's participatory spaces."
+
+  s.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").select do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w(app/ config/ db/ lib/ Rakefile README.md))
+    end
+  end
+
+  s.add_dependency "decidim-core", Decidim::Meetings.version
+  s.add_dependency "decidim-forms", Decidim::Meetings.version
+  s.add_dependency "icalendar", "~> 2.5"
+
+  s.add_development_dependency "decidim-admin", Decidim::Meetings.version
+  s.add_development_dependency "decidim-assemblies", Decidim::Meetings.version
+  s.add_development_dependency "decidim-dev", Decidim::Meetings.version
+  s.add_development_dependency "decidim-participatory_processes", Decidim::Meetings.version
+end

data/lib/decidim/meetings/engine.rb

@@ -57,7 +57,7 @@ module Decidim
         # meeting for the given participatory space.
         Decidim.view_hooks.register(:upcoming_meeting_for_card, priority: Decidim::ViewHooks::LOW_PRIORITY) do |view_context|
           published_components = Decidim::Component.where(participatory_space: view_context.current_participatory_space).published
-          upcoming_meeting = Decidim::Meetings::Meeting.where(component: published_components).published.upcoming.order(:start_time, :end_time).first
+          upcoming_meeting = Decidim::Meetings::Meeting.where(component: published_components).not_hidden.except_withdrawn.published.upcoming.order(:start_time, :end_time).first
 
           next unless upcoming_meeting
 

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

@@ -6,9 +6,12 @@ require "decidim/participatory_processes/test/factories"
 
 FactoryBot.define do
   factory :meeting_component, parent: :component do
-    name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :meetings).i18n_name }
+    transient do
+      skip_injection { false }
+    end
+    name { generate_component_name(participatory_space.organization.available_locales, :meetings, skip_injection: skip_injection) }
     manifest_name { :meetings }
-    participatory_space { create(:participatory_process, :with_steps, organization: organization) }
+    participatory_space { create(:participatory_process, :with_steps, organization: organization, skip_injection: skip_injection) }
 
     trait :with_creation_enabled do
       settings do
@@ -20,10 +23,14 @@ FactoryBot.define do
   end
 
   factory :meeting, class: "Decidim::Meetings::Meeting" do
-    title { generate_localized_title }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    location { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    location_hints { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    transient do
+      skip_injection { false }
+    end
+
+    title { generate_localized_title(:meeting_title, skip_injection: skip_injection) }
+    description { generate_localized_description(:meeting_description, skip_injection: skip_injection) }
+    location { generate_localized_description(:meeting_location, skip_injection: skip_injection) }
+    location_hints { generate_localized_description(:meeting_location_hints, skip_injection: skip_injection) }
     address { Faker::Lorem.sentence(word_count: 3) }
     latitude { Faker::Address.latitude }
     longitude { Faker::Address.longitude }
@@ -33,10 +40,10 @@ FactoryBot.define do
     transparent { true }
     questionnaire { build(:questionnaire) }
     registration_form_enabled { true }
-    registration_terms { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    registration_terms { generate_localized_description(:meeting_registration_terms, skip_injection: skip_injection) }
     registration_type { :on_this_platform }
     type_of_meeting { :in_person }
-    component { build(:component, manifest_name: "meetings") }
+    component { build(:meeting_component) }
     iframe_access_level { :all }
     iframe_embed_type { :none }
 
@@ -71,7 +78,7 @@ FactoryBot.define do
     end
 
     trait :not_official do
-      author { create(:user, organization: component.organization) if component }
+      author { create(:user, organization: component.organization, skip_injection: skip_injection) if component }
     end
 
     trait :with_services do
@@ -82,7 +89,7 @@ FactoryBot.define do
       end
 
       after(:build) do |meeting, evaluator|
-        meeting.services = evaluator.services || build_list(:service, 2, meeting: meeting)
+        meeting.services = evaluator.services || build_list(:service, 2, meeting: meeting, skip_injection: evaluator.skip_injection)
       end
     end
 
@@ -90,15 +97,15 @@ FactoryBot.define do
 
     trait :user_group_author do
       author do
-        create(:user, organization: component.organization) if component
+        create(:user, organization: component.organization, skip_injection: skip_injection) if component
       end
       user_group do
-        create(:user_group, :verified, organization: component.organization, users: [author]) if component
+        create(:user_group, :verified, organization: component.organization, users: [author], skip_injection: skip_injection) if component
       end
     end
 
     trait :closed do
-      closing_report { generate_localized_title }
+      closing_report { generate_localized_title(:meeting_closing_report, skip_injection: skip_injection) }
       attendees_count { rand(50) }
       contributions_count { rand(50) }
       attending_organizations { Array.new(3) { Faker::TvShows::GameOfThrones.house }.join(", ") }
@@ -117,7 +124,7 @@ FactoryBot.define do
       registrations_enabled { true }
       available_slots { 10 }
       reserved_slots { 4 }
-      registration_terms { generate_localized_title }
+      registration_terms { generate_localized_title(:meeting_registration_terms, skip_injection: skip_injection) }
     end
 
     trait :past do
@@ -170,41 +177,53 @@ FactoryBot.define do
   end
 
   factory :registration, class: "Decidim::Meetings::Registration" do
+    transient do
+      skip_injection { false }
+    end
     meeting
     user
   end
 
   factory :agenda, class: "Decidim::Meetings::Agenda" do
+    transient do
+      skip_injection { false }
+    end
     meeting
-    title { generate_localized_title }
+    title { generate_localized_title(:meeting_agenda_title, skip_injection: skip_injection) }
     visible { true }
 
     trait :with_agenda_items do
-      after(:create) do |agenda, _evaluator|
-        create_list(:agenda_item, 2, :with_children, agenda: agenda)
+      after(:create) do |agenda, evaluator|
+        create_list(:agenda_item, 2, :with_children, agenda: agenda, skip_injection: evaluator.skip_injection)
       end
     end
   end
 
   factory :agenda_item, class: "Decidim::Meetings::AgendaItem" do
+    transient do
+      skip_injection { false }
+    end
     agenda
-    title { generate_localized_title }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    title { generate_localized_title(:meeting_agenda_item_title, skip_injection: skip_injection) }
+    description { generate_localized_description(:meeting_agenda_item_description, skip_injection: skip_injection) }
     duration { 15 }
     position { 0 }
 
     trait :with_parent do
-      parent { create(:agenda_item, agenda: agenda) }
+      parent { create(:agenda_item, agenda: agenda, skip_injection: skip_injection) }
     end
 
     trait :with_children do
       after(:create) do |agenda_item, evaluator|
-        create_list(:agenda_item, 2, parent: agenda_item, agenda: evaluator.agenda)
+        create_list(:agenda_item, 2, parent: agenda_item, agenda: evaluator.agenda, skip_injection: evaluator.skip_injection)
       end
     end
   end
 
   factory :invite, class: "Decidim::Meetings::Invite" do
+    transient do
+      skip_injection { false }
+    end
     meeting
     user
     sent_at { 1.day.ago }
@@ -221,31 +240,41 @@ FactoryBot.define do
   end
 
   factory :service, class: "Decidim::Meetings::Service" do
+    transient do
+      skip_injection { false }
+    end
     meeting
-    title { generate_localized_title }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    title { generate_localized_title(:meeting_service_title, skip_injection: skip_injection) }
+    description { generate_localized_description(:meeting_service_description, skip_injection: skip_injection) }
   end
 
   factory :poll, class: "Decidim::Meetings::Poll" do
+    transient do
+      skip_injection { false }
+    end
     meeting
   end
 
   factory :meetings_poll_questionnaire, class: "Decidim::Meetings::Questionnaire" do
-    questionnaire_for { build(:poll) }
+    transient do
+      skip_injection { false }
+    end
+    questionnaire_for { build(:poll, skip_injection: skip_injection) }
   end
 
   factory :meetings_poll_question, class: "Decidim::Meetings::Question" do
     transient do
+      skip_injection { false }
       options { [] }
     end
 
-    body { generate_localized_title }
+    body { generate_localized_title(:meeting_poll_question_body, skip_injection: skip_injection) }
     position { 0 }
     status { 0 }
     question_type { Decidim::Meetings::Question::QUESTION_TYPES.first }
     questionnaire factory: :meetings_poll_questionnaire
     answer_options do
-      Array.new(3).collect { build(:meetings_poll_answer_option, question: nil) }
+      Array.new(3).collect { build(:meetings_poll_answer_option, question: nil, skip_injection: skip_injection) }
     end
 
     trait :unpublished do
@@ -262,18 +291,27 @@ FactoryBot.define do
   end
 
   factory :meetings_poll_answer, class: "Decidim::Meetings::Answer" do
+    transient do
+      skip_injection { false }
+    end
     questionnaire factory: :meetings_poll_questionnaire
-    question { create(:meetings_poll_question, questionnaire: questionnaire) }
-    user { create(:user, organization: questionnaire.questionnaire_for.organization) }
+    question { create(:meetings_poll_question, questionnaire: questionnaire, skip_injection: skip_injection) }
+    user { create(:user, organization: questionnaire.questionnaire_for.organization, skip_injection: skip_injection) }
   end
 
   factory :meetings_poll_answer_option, class: "Decidim::Meetings::AnswerOption" do
-    question { create(:meetings_poll_question) }
+    transient do
+      skip_injection { false }
+    end
+    question { create(:meetings_poll_question, skip_injection: skip_injection) }
     body { generate_localized_title }
   end
 
   factory :meetings_poll_answer_choice, class: "Decidim::Meetings::AnswerChoice" do
+    transient do
+      skip_injection { false }
+    end
     answer factory: :meetings_poll_answer
-    answer_option { create(:meetings_poll_answer_option, question: answer.question) }
+    answer_option { create(:meetings_poll_answer_option, question: answer.question, skip_injection: skip_injection) }
   end
 end

data/lib/decidim/meetings/version.rb

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