decidim-meetings 0.27.5 → 0.27.7

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:
@@ -401,7 +445,6 @@ pt-BR:
         new_meeting_at_html: "<span>Nova reunião em %{link}</span>"
       layouts:
         live_event:
-          administrate: Administrar
           close: fechar
           questions: Perguntas
       mailer:
@@ -481,6 +524,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 +552,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 +591,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/pt.yml

@@ -379,7 +379,6 @@ pt:
         new_meeting_at_html: "<span>Nova reunião em %{link}</span>"
       layouts:
         live_event:
-          administrate: Administradores
           close: Fechar
           questions: Pergunta
       mailer:

data/config/locales/ro-RO.yml

@@ -437,7 +437,6 @@ ro:
         new_meeting_at_html: "<span>O nouă ședință la %{link}</span>"
       layouts:
         live_event:
-          administrate: Administrează
           close: închide
           questions: Întrebări
       mailer:

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:
@@ -418,7 +419,6 @@ sv:
         new_meeting_at_html: "<span>Nytt möte på %{link}</span>"
       layouts:
         live_event:
-          administrate: Administrera
           close: stäng
           questions: Frågor
       mailer:

data/config/locales/tr-TR.yml

@@ -315,6 +315,9 @@ tr:
       application_helper:
         filter_scope_values:
           all: Tümü
+      calendar:
+        meeting_to_event:
+          read_more: Bu toplantı hakkında daha fazlasını okuyun
       calendar_modal:
         calendar_url: Takvim URL'si
         close_window: Pencereyi kapat

data/config/locales/zh-TW.yml

@@ -431,7 +431,6 @@ zh-TW:
         new_meeting_at_html: "<span>在 %{link} 新增會議</span>"
       layouts:
         live_event:
-          administrate: 管理員
           close: 關閉
           questions: 問題
       mailer:

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.7"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.27.5
+  version: 0.27.7
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
 - !ruby/object:Gem::Dependency
   name: icalendar
   requirement: !ruby/object:Gem::Requirement
@@ -60,56 +60,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
 description: A meetings component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -287,7 +287,6 @@ files:
 - app/presenters/decidim/meetings/admin_log/questionnaire_presenter.rb
 - app/presenters/decidim/meetings/admin_log/value_types/meeting_title_description_presenter.rb
 - app/presenters/decidim/meetings/invite_presenter.rb
-- app/presenters/decidim/meetings/log/resource_presenter.rb
 - app/presenters/decidim/meetings/meeting_edition_presenter.rb
 - app/presenters/decidim/meetings/meeting_presenter.rb
 - app/presenters/decidim/meetings/official_author_presenter.rb
@@ -381,7 +380,6 @@ files:
 - app/views/devise/mailer/join_meeting.html.erb
 - app/views/devise/mailer/join_meeting.text.erb
 - config/assets.rb
-- config/environment.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -414,6 +412,7 @@ files:
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
 - config/locales/gn-PY.yml
+- config/locales/he-IL.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -517,6 +516,7 @@ files:
 - db/migrate/20210922140454_transform_show_embedded_iframe_column.rb
 - db/migrate/20210928095036_rename_upcoming_events_content_block_to_upcoming_meetings.rb
 - db/migrate/20211105115625_remove_not_null_on_customize_registration_email.rb
+- decidim-meetings.gemspec
 - lib/decidim/api/agenda_item_type.rb
 - lib/decidim/api/agenda_type.rb
 - lib/decidim/api/linked_resources_interface.rb
@@ -557,16 +557,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: Decidim meetings module

data/app/presenters/decidim/meetings/log/resource_presenter.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Meetings
-    module Log
-      class ResourcePresenter < Decidim::Log::ResourcePresenter
-        private
-
-        # Private: Presents resource name.
-        #
-        # Returns an HTML-safe String.
-        def present_resource_name
-          Decidim::Meetings::MeetingPresenter.new(resource).title
-        end
-      end
-    end
-  end
-end

data/config/environment.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-# Empty line for playing nice with tpope/vim-rails