decidim-meetings 0.23.0 → 0.27.0

data/app/events/decidim/meetings/meeting_event.rb

@@ -0,0 +1,37 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Meetings
+    # This module is used to be included in events triggered by comments.
+    #
+    module MeetingEvent
+      extend ActiveSupport::Concern
+      include Decidim::Events::MachineTranslatedEvent
+
+      included do
+        def resource_text
+          translated_attribute(resource.description)
+        end
+
+        def translatable_resource
+          resource
+        end
+
+        def translatable_text
+          resource.description
+        end
+
+        def safe_resource_text
+          locale = resource.respond_to?(:content_original_language) ? resource.content_original_language : I18n.locale
+          I18n.with_locale(locale) { translated_attribute(resource.description).to_s.html_safe }
+        end
+
+        def safe_resource_translated_text
+          return safe_resource_text unless perform_translation?
+
+          I18n.with_locale(I18n.locale) { translated_attribute(resource.description, nil, true).to_s.html_safe }
+        end
+      end
+    end
+  end
+end

data/app/events/decidim/meetings/meeting_registration_notification_event.rb

@@ -6,7 +6,7 @@ module Decidim
       include Decidim::Events::NotificationEvent
 
       def notification_title
-        I18n.t("notification_title", i18n_options).html_safe
+        I18n.t("notification_title", **i18n_options).html_safe
       end
 
       def i18n_options

data/app/events/decidim/meetings/meeting_registrations_enabled_event.rb

@@ -3,9 +3,7 @@
 module Decidim
   module Meetings
     class MeetingRegistrationsEnabledEvent < Decidim::Events::SimpleEvent
-      def resource_text
-        translated_attribute(resource.description)
-      end
+      include Decidim::Meetings::MeetingEvent
     end
   end
 end

data/app/events/decidim/meetings/meeting_registrations_over_percentage_event.rb

@@ -3,11 +3,9 @@
 module Decidim
   module Meetings
     class MeetingRegistrationsOverPercentageEvent < Decidim::Events::SimpleEvent
-      i18n_attributes :percentage
+      include Decidim::Meetings::MeetingEvent
 
-      def resource_text
-        translated_attribute(resource.description)
-      end
+      i18n_attributes :percentage
 
       def percentage
         extra["percentage"] * 100

data/app/events/decidim/meetings/registration_code_validated_event.rb

@@ -3,11 +3,9 @@
 module Decidim
   module Meetings
     class RegistrationCodeValidatedEvent < Decidim::Events::SimpleEvent
-      i18n_attributes :registration_code
+      include Decidim::Meetings::MeetingEvent
 
-      def resource_text
-        translated_attribute(resource.description)
-      end
+      i18n_attributes :registration_code
 
       private
 

data/app/events/decidim/meetings/upcoming_meeting_event.rb

@@ -3,9 +3,7 @@
 module Decidim
   module Meetings
     class UpcomingMeetingEvent < Decidim::Events::SimpleEvent
-      def resource_text
-        translated_attribute(resource.description)
-      end
+      include Decidim::Meetings::MeetingEvent
     end
   end
 end

data/app/events/decidim/meetings/update_meeting_event.rb

@@ -3,9 +3,7 @@
 module Decidim
   module Meetings
     class UpdateMeetingEvent < Decidim::Events::SimpleEvent
-      def resource_text
-        translated_attribute(resource.description)
-      end
+      include Decidim::Meetings::MeetingEvent
     end
   end
 end

data/app/forms/decidim/meetings/admin/answer_option_form.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # This class holds a Form to update answer options
+      class AnswerOptionForm < Decidim::Form
+        include TranslatableAttributes
+
+        attribute :deleted, Boolean, default: false
+
+        translatable_attribute :body, String
+
+        validates :body, translatable_presence: true, unless: :deleted
+
+        def to_param
+          return id if id.present?
+
+          "questionnaire-question-answer-option-id"
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/meetings/admin/close_meeting_form.rb

@@ -8,17 +8,19 @@ module Decidim
         include TranslatableAttributes
 
         translatable_attribute :closing_report, String
+        attribute :video_url, String
+        attribute :audio_url, String
+        attribute :closing_visible, Boolean, default: true
         attribute :attendees_count, Integer, default: 0
         attribute :contributions_count, Integer, default: 0
         attribute :attending_organizations, String
         attribute :proposal_ids, Array[Integer]
         attribute :proposals
-        attribute :closed_at, Decidim::Attributes::TimeWithZone, default: ->(_form, _attribute) { Time.current }
+        attribute :closed_at, Decidim::Attributes::TimeWithZone, default: -> { Time.current }
 
         validates :closing_report, translatable_presence: true
-        validates :attendees_count, presence: true, numericality: { greater_than_or_equal_to: 0 }
+        validates :attendees_count, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 999, only_integer: true }
         validates :contributions_count, numericality: true, allow_blank: true
-        validates :attending_organizations, presence: true
 
         # Private: Gets the proposals from the meeting and injects them to the form.
         #
@@ -28,10 +30,10 @@ module Decidim
         end
 
         def proposals
-          @proposals ||= Decidim.find_resource_manifest(:proposals)
-                                .try(:resource_scope, current_component)
-                                &.where(id: proposal_ids)
-                                &.order(title: :asc)
+          @proposals = Decidim.find_resource_manifest(:proposals)
+                              .try(:resource_scope, current_component)
+                              &.where(id: proposal_ids)
+                              &.order(title: :asc)
         end
       end
     end

data/app/forms/decidim/meetings/admin/meeting_copy_form.rb

@@ -6,7 +6,7 @@ module Decidim
       # A form object used to copy a meeting from the admin
       # dashboard.
       #
-      class MeetingCopyForm < Form
+      class MeetingCopyForm < ::Decidim::Meetings::BaseMeetingForm
         include TranslatableAttributes
 
         translatable_attribute :title, String
@@ -14,26 +14,17 @@ module Decidim
         translatable_attribute :location, String
         translatable_attribute :location_hints, String
 
-        attribute :address, String
-        attribute :latitude, Float
-        attribute :longitude, Float
-        attribute :start_time, Decidim::Attributes::TimeWithZone
-        attribute :end_time, Decidim::Attributes::TimeWithZone
+        attribute :show_embedded_iframe, Boolean, default: false
         attribute :private_meeting, Boolean
         attribute :transparent, Boolean
         attribute :services, Array[MeetingServiceForm]
 
         mimic :meeting
 
-        validates :current_component, presence: true
-
+        validates :online_meeting_url, url: true, if: ->(form) { form.online_meeting? || form.hybrid_meeting? }
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
-        validates :location, translatable_presence: true
-        validates :address, presence: true
-        validates :address, geocoding: true, if: -> { Decidim::Map.available?(:geocoding) }
-        validates :start_time, presence: true, date: { before: :end_time }
-        validates :end_time, presence: true, date: { after: :start_time }
+        validates :location, translatable_presence: true, if: ->(form) { form.in_person_meeting? || form.hybrid_meeting? }
 
         def map_model(model)
           self.services = model.services.map do |service|

data/app/forms/decidim/meetings/admin/meeting_form.rb

@@ -4,38 +4,48 @@ module Decidim
   module Meetings
     module Admin
       # This class holds a Form to create/update translatable meetings from Decidim's admin panel.
-      class MeetingForm < Decidim::Form
+      class MeetingForm < ::Decidim::Meetings::BaseMeetingForm
         include TranslatableAttributes
 
-        attribute :address, String
-        attribute :latitude, Float
-        attribute :longitude, Float
-        attribute :start_time, Decidim::Attributes::TimeWithZone
-        attribute :end_time, Decidim::Attributes::TimeWithZone
         attribute :services, Array[MeetingServiceForm]
         attribute :decidim_scope_id, Integer
         attribute :decidim_category_id, Integer
         attribute :private_meeting, Boolean
         attribute :transparent, Boolean
+        attribute :registration_type, String
+        attribute :registration_url, String
+        attribute :customize_registration_email, Boolean
+        attribute :iframe_embed_type, String, default: "none"
+        attribute :comments_enabled, Boolean, default: true
+        attribute :comments_start_time, Decidim::Attributes::TimeWithZone
+        attribute :comments_end_time, Decidim::Attributes::TimeWithZone
+        attribute :iframe_access_level, String
 
         translatable_attribute :title, String
         translatable_attribute :description, String
         translatable_attribute :location, String
         translatable_attribute :location_hints, String
 
+        validates :iframe_embed_type, inclusion: { in: Decidim::Meetings::Meeting.iframe_embed_types }
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
-        validates :location, translatable_presence: true
-
-        validates :address, presence: true
-        validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
-        validates :start_time, presence: true, date: { before: :end_time }
-        validates :end_time, presence: true, date: { after: :start_time }
-
-        validates :current_component, presence: true
+        validates :registration_type, presence: true
+        validates :registration_url, presence: true, url: true, if: ->(form) { form.on_different_platform? }
+        validates :type_of_meeting, presence: true
+        validates :location, translatable_presence: true, if: ->(form) { form.in_person_meeting? || form.hybrid_meeting? }
+        validates :online_meeting_url, url: true, if: ->(form) { form.online_meeting? || form.hybrid_meeting? }
+        validates :comments_start_time, date: { before: :comments_end_time, allow_blank: true, if: proc { |obj| obj.comments_end_time.present? } }
+        validates :comments_end_time, date: { after: :comments_start_time, allow_blank: true, if: proc { |obj| obj.comments_start_time.present? } }
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
         validates :decidim_scope_id, scope_belongs_to_component: true, if: ->(form) { form.decidim_scope_id.present? }
+        validates :clean_type_of_meeting, presence: true
+        validates(
+          :iframe_access_level,
+          inclusion: { in: Decidim::Meetings::Meeting.iframe_access_levels },
+          if: ->(form) { %w(embed_in_meeting_page open_in_live_event_page open_in_new_tab).include?(form.iframe_embed_type) }
+        )
+        validate :embeddable_meeting_url
 
         delegate :categories, to: :current_component
 
@@ -45,10 +55,7 @@ module Decidim
           end
 
           self.decidim_category_id = model.categorization.decidim_category_id if model.categorization
-          presenter = MeetingPresenter.new(model)
-
-          self.title = presenter.title(all_locales: title.is_a?(Hash))
-          self.description = presenter.description(all_locales: description.is_a?(Hash))
+          self.type_of_meeting = model.type_of_meeting
         end
 
         def services_to_persist
@@ -65,14 +72,14 @@ module Decidim
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
+          @scope ||= @attributes["decidim_scope_id"].value ? current_component.scopes.find_by(id: @attributes["decidim_scope_id"].value) : current_component.scope
         end
 
         # Scope identifier
         #
         # Returns the scope identifier related to the meeting
         def decidim_scope_id
-          @decidim_scope_id || scope&.id
+          super || scope&.id
         end
 
         def category
@@ -81,16 +88,59 @@ module Decidim
           @category ||= categories.find_by(id: decidim_category_id)
         end
 
-        def geocoding_enabled?
-          Decidim::Map.available?(:geocoding)
+        def clean_type_of_meeting
+          type_of_meeting.presence
+        end
+
+        def type_of_meeting_select
+          Decidim::Meetings::Meeting::TYPE_OF_MEETING.map do |type|
+            [
+              I18n.t("type_of_meeting.#{type}", scope: "decidim.meetings"),
+              type
+            ]
+          end
+        end
+
+        def iframe_access_level_select
+          Decidim::Meetings::Meeting.iframe_access_levels.map do |level, _value|
+            [
+              I18n.t("iframe_access_level.#{level}", scope: "decidim.meetings"),
+              level
+            ]
+          end
+        end
+
+        def iframe_embed_type_select
+          Decidim::Meetings::Meeting.iframe_embed_types.map do |type, _value|
+            [
+              I18n.t("iframe_embed_type.#{type}", scope: "decidim.meetings"),
+              type
+            ]
+          end
+        end
+
+        def on_this_platform?
+          registration_type == "on_this_platform"
         end
 
-        def has_address?
-          geocoding_enabled? && address.present?
+        def on_different_platform?
+          registration_type == "on_different_platform"
         end
 
-        def geocoded?
-          latitude.present? && longitude.present?
+        def registration_type_select
+          Decidim::Meetings::Meeting::REGISTRATION_TYPE.map do |type|
+            [
+              I18n.t("registration_type.#{type}", scope: "decidim.meetings"),
+              type
+            ]
+          end
+        end
+
+        def embeddable_meeting_url
+          if online_meeting_url.present? && %w(embed_in_meeting_page open_in_live_event_page).include?(iframe_embed_type)
+            embedder_service = Decidim::Meetings::MeetingIframeEmbedder.new(online_meeting_url)
+            errors.add(:iframe_embed_type, :not_embeddable) unless embedder_service.embeddable?
+          end
         end
       end
     end

data/app/forms/decidim/meetings/admin/meeting_registration_invite_form.rb

@@ -12,7 +12,7 @@ module Decidim
         attribute :existing_user, Boolean, default: false
 
         validates :name, presence: true, unless: proc { |object| object.existing_user }
-        validates :email, presence: true, 'valid_email_2/email': { disposable: true }, unless: proc { |object| object.existing_user }
+        validates :email, presence: true, "valid_email_2/email": { disposable: true }, unless: proc { |object| object.existing_user }
         validates :user, presence: true, if: proc { |object| object.existing_user }
 
         def user

data/app/forms/decidim/meetings/admin/meeting_registrations_form.rb

@@ -11,17 +11,30 @@ module Decidim
 
         attribute :registrations_enabled, Boolean
         attribute :registration_form_enabled, Boolean
+        attribute :customize_registration_email, Boolean
         attribute :available_slots, Integer
         attribute :reserved_slots, Integer
+
         translatable_attribute :registration_terms, String
+        translatable_attribute :registration_email_custom_content, String
 
         validates :registration_terms, translatable_presence: true, if: ->(form) { form.registrations_enabled? }
-        validates :available_slots, numericality: { greater_than_or_equal_to: 0 }, if: ->(form) { form.registrations_enabled? }
+        validates :available_slots, :reserved_slots, presence: true, if: ->(form) { form.registrations_enabled? }
+        validates :available_slots, numericality: { greater_than_or_equal_to: 0 }, if: ->(form) { form.registrations_enabled? && form.available_slots.present? }
         validates :reserved_slots, numericality: { greater_than_or_equal_to: 0 }, if: ->(form) { form.registrations_enabled? }
-        validates :reserved_slots, numericality: { less_than_or_equal_to: :available_slots }, if: ->(form) { form.registrations_enabled? }
+        validates :reserved_slots, numericality: { less_than_or_equal_to: :available_slots }, if: lambda { |form|
+                                                                                                    form.registrations_enabled? &&
+                                                                                                      form.reserved_slots.present? &&
+                                                                                                      form.available_slots.present?
+                                                                                                  }
+
+        validate :available_slots_greater_than_or_equal_to_registrations_count, if: ->(form) { form.registrations_enabled? && form.available_slots.try(:positive?) }
+        validate :reserved_slots_lower_than_or_equal_to_rest_available_slots_and_registrations_count, if: lambda { |form|
+                                                                                                            form.registrations_enabled? &&
+                                                                                                              form.reserved_slots.try(:positive?) &&
+                                                                                                              form.available_slots.present?
+                                                                                                          }
 
-        validate :available_slots_greater_than_or_equal_to_registrations_count, if: ->(form) { form.registrations_enabled? && form.available_slots.positive? }
-        validate :reserved_slots_lower_than_or_equal_to_rest_available_slots_and_registrations_count, if: ->(form) { form.registrations_enabled? && form.reserved_slots.positive? }
         # We need this method to ensure the form object will always have an ID,
         # and thus its `to_param` method will always return a significant value.
         # If we remove this method, get an error onn the `update` action and try

data/app/forms/decidim/meetings/admin/question_form.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # This class holds a Form to update questionnaire questions from Decidim's admin panel.
+      class QuestionForm < Decidim::Form
+        include TranslatableAttributes
+
+        attribute :position, Integer
+        attribute :mandatory, Boolean, default: false
+        attribute :question_type, String
+        attribute :answer_options, Array[AnswerOptionForm]
+        attribute :max_choices, Integer
+        attribute :deleted, Boolean, default: false
+
+        translatable_attribute :body, String
+        translatable_attribute :description, String
+
+        validates :position, numericality: { greater_than_or_equal_to: 0 }
+        validates :question_type, inclusion: { in: Decidim::Meetings::Question::QUESTION_TYPES }
+        validates :max_choices, numericality: { only_integer: true, greater_than: 1, less_than_or_equal_to: ->(form) { form.number_of_options } }, allow_blank: true
+        validates :body, translatable_presence: true, if: :requires_body?
+        validates :answer_options, presence: true
+
+        def to_param
+          return id if id.present?
+
+          "questionnaire-question-id"
+        end
+
+        def number_of_options
+          answer_options.size
+        end
+
+        private
+
+        def requires_body?
+          !deleted
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/meetings/admin/questionnaire_form.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # This class holds a Form to update questionnaires from Decidim's admin panel.
+      class QuestionnaireForm < Decidim::Form
+        attribute :published_at, Decidim::Attributes::TimeWithZone
+        attribute :questions, Array[Decidim::Meetings::Admin::QuestionForm]
+
+        def map_model(model)
+          self.questions = model.questions.map do |question|
+            Decidim::Meetings::Admin::QuestionForm.from_model(question)
+          end
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/meetings/answer_choice_form.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This class holds a Form to save the chosen option for an answer
+    class AnswerChoiceForm < Decidim::Form
+      attribute :body, String
+      attribute :position, Integer
+      attribute :answer_option_id, Integer
+
+      validates :answer_option_id, presence: true
+    end
+  end
+end

data/app/forms/decidim/meetings/answer_form.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This class holds a Form to save the questionnaire answers from Decidim's public page
+    class AnswerForm < Decidim::Form
+      include Decidim::TranslationsHelper
+
+      attribute :question_id, String
+      attribute :body, String
+      attribute :choices, Array[AnswerChoiceForm]
+      attribute :current_user, Decidim::User
+
+      validates :selected_choices, presence: true
+      validate :max_choices, if: -> { question.max_choices }
+
+      attr_writer :question
+
+      def question
+        @question ||= Decidim::Meetings::Question.find(question_id)
+      end
+
+      def answer
+        @answer ||= Decidim::Meetings::Answer.find_by(decidim_user_id: current_user.id, decidim_question_id: question_id) if current_user
+      end
+
+      def label(idx)
+        base = "#{idx + 1}. #{translated_attribute(question.body)}"
+        base += " (#{max_choices_label})" if question.max_choices
+        base
+      end
+
+      # Public: Map the correct fields.
+      #
+      # Returns nothing.
+      def map_model(model)
+        self.question_id = model.decidim_question_id
+        self.question = model.question
+
+        self.choices = model.choices.map do |choice|
+          AnswerChoiceForm.from_model(choice)
+        end
+      end
+
+      def selected_choices
+        choices.select(&:body)
+      end
+
+      private
+
+      def max_choices
+        errors.add(:choices, :too_many) if selected_choices.size > question.max_choices
+      end
+
+      def mandatory_label
+        "*"
+      end
+
+      def max_choices_label
+        I18n.t("questionnaires.question.max_choices", scope: "decidim.forms", n: question.max_choices)
+      end
+    end
+  end
+end

data/app/forms/decidim/meetings/base_meeting_form.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class BaseMeetingForm < Decidim::Form
+      attribute :address, String
+      attribute :latitude, Float
+      attribute :longitude, Float
+      attribute :online_meeting_url, String
+      attribute :type_of_meeting, String
+      attribute :start_time, Decidim::Attributes::TimeWithZone
+      attribute :end_time, Decidim::Attributes::TimeWithZone
+
+      validates :current_component, presence: true
+
+      validates :address, presence: true, if: ->(form) { form.needs_address? }
+      validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? && form.needs_address? }
+      validates :start_time, presence: true, date: { before: :end_time }
+      validates :end_time, presence: true, date: { after: :start_time }
+
+      def type_of_meeting_select
+        Decidim::Meetings::Meeting::TYPE_OF_MEETING.map do |type|
+          [
+            I18n.t("type_of_meeting.#{type}", scope: "decidim.meetings"),
+            type
+          ]
+        end
+      end
+
+      def geocoding_enabled?
+        Decidim::Map.available?(:geocoding)
+      end
+
+      def geocoded?
+        latitude.present? && longitude.present?
+      end
+
+      def has_address?
+        geocoding_enabled? && address.present?
+      end
+
+      def needs_address?
+        in_person_meeting? || hybrid_meeting?
+      end
+
+      def online_meeting?
+        type_of_meeting == "online"
+      end
+
+      def in_person_meeting?
+        type_of_meeting == "in_person"
+      end
+
+      def hybrid_meeting?
+        type_of_meeting == "hybrid"
+      end
+    end
+  end
+end

data/app/forms/decidim/meetings/close_meeting_form.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This class holds a Form to close a meeting from Decidim's public views.
+    class CloseMeetingForm < Decidim::Form
+      attribute :closing_report, String
+      attribute :proposal_ids, Array[Integer]
+      attribute :proposals
+      attribute :closed_at, Decidim::Attributes::TimeWithZone, default: -> { Time.current }
+      attribute :attendees_count, Integer, default: 0
+
+      validates :closing_report, presence: true
+      validates :attendees_count,
+                presence: true,
+                numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 999, only_integer: true }
+
+      # Private: Gets the proposals from the meeting and injects them to the form.
+      #
+      # Returns nothing.
+      def map_model(model)
+        self.proposal_ids = model.linked_resources(:proposals, "proposals_from_meeting").pluck(:id)
+        presenter = MeetingEditionPresenter.new(model)
+        self.closing_report = presenter.closing_report(all_locales: false)
+      end
+
+      def proposals
+        @proposals = Decidim.find_resource_manifest(:proposals)
+                            .try(:resource_scope, current_component)
+                            &.where(id: proposal_ids)
+                            &.order(title: :asc)
+      end
+    end
+  end
+end

data/app/forms/decidim/meetings/join_meeting_form.rb

@@ -4,6 +4,7 @@ module Decidim
   module Meetings
     class JoinMeetingForm < Decidim::Form
       attribute :user_group_id, Integer
+      attribute :public_participation, Boolean, default: false
     end
   end
 end