decidim-meetings 0.24.1 → 0.25.0.rc2

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

@@ -8,6 +8,9 @@ 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
@@ -18,7 +21,6 @@ module Decidim
         validates :closing_report, translatable_presence: true
         validates :attendees_count, presence: true, numericality: { greater_than_or_equal_to: 0 }
         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.
         #

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

@@ -22,11 +22,14 @@ module Decidim
         attribute :registration_type, String
         attribute :registration_url, String
         attribute :available_slots, Integer, default: 0
+        attribute :customize_registration_email, Boolean
+        attribute :show_embedded_iframe, Boolean, default: false
 
         translatable_attribute :title, String
         translatable_attribute :description, String
         translatable_attribute :location, String
         translatable_attribute :location_hints, String
+        translatable_attribute :registration_email_custom_content, String
 
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
@@ -38,7 +41,7 @@ module Decidim
 
         validates :address, presence: true, if: ->(form) { form.needs_address? }
         validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? && form.needs_address? }
-        validates :online_meeting_url, presence: true, url: true, if: ->(form) { form.online_meeting? || form.hybrid_meeting? }
+        validates :online_meeting_url, url: true, if: ->(form) { form.online_meeting? || form.hybrid_meeting? }
         validates :start_time, presence: true, date: { before: :end_time }
         validates :end_time, presence: true, date: { after: :start_time }
 
@@ -47,6 +50,7 @@ module Decidim
         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
+        validate :embeddable_meeting_url
 
         delegate :categories, to: :current_component
 
@@ -150,6 +154,13 @@ module Decidim
             ]
           end
         end
+
+        def embeddable_meeting_url
+          if online_meeting_url.present? && show_embedded_iframe
+            embedder_service = Decidim::Meetings::MeetingIframeEmbedder.new(online_meeting_url)
+            errors.add(:show_embedded_iframe, :not_embeddable) unless embedder_service.embeddable?
+          end
+        end
       end
     end
   end

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,65 @@
+# 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
+      attribute :answer, Decidim::Meetings::Answer
+
+      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/close_meeting_form.rb

@@ -8,8 +8,12 @@ module Decidim
       attribute :proposal_ids, Array[Integer]
       attribute :proposals
       attribute :closed_at, Decidim::Attributes::TimeWithZone, default: ->(_form, _attribute) { 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, only_integer: true }
 
       # Private: Gets the proposals from the meeting and injects them to the form.
       #

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

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

@@ -24,6 +24,7 @@ module Decidim
       attribute :registration_url, String
       attribute :available_slots, Integer, default: 0
       attribute :registration_terms, String
+      attribute :show_embedded_iframe, Boolean, default: false
 
       validates :title, presence: true
       validates :description, presence: true
@@ -44,6 +45,7 @@ module Decidim
       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
+      validate :embeddable_meeting_url
 
       delegate :categories, to: :current_component
 
@@ -141,6 +143,13 @@ module Decidim
       def registrations_enabled
         on_this_platform?
       end
+
+      def embeddable_meeting_url
+        if online_meeting_url.present? && show_embedded_iframe
+          embedder_service = Decidim::Meetings::MeetingIframeEmbedder.new(online_meeting_url)
+          errors.add(:show_embedded_iframe, :not_embeddable) unless embedder_service.embeddable?
+        end
+      end
     end
   end
 end

data/app/helpers/decidim/meetings/admin/filterable_helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      module FilterableHelper
+        def extra_dropdown_submenu_options_items(_filter, _i18n_scope)
+          []
+        end
+      end
+    end
+  end
+end

data/app/helpers/decidim/meetings/application_helper.rb

@@ -17,8 +17,9 @@ module Decidim
         origin_values = []
         origin_values << TreePoint.new("official", t("decidim.meetings.meetings.filters.origin_values.official"))
         origin_values << TreePoint.new("citizens", t("decidim.meetings.meetings.filters.origin_values.citizens")) # todo
-        # if component_settings enabled enabled
-        origin_values << TreePoint.new("user_group", t("decidim.meetings.meetings.filters.origin_values.user_groups")) # todo
+        if current_organization.user_groups_enabled?
+          origin_values << TreePoint.new("user_group", t("decidim.meetings.meetings.filters.origin_values.user_groups")) # todo
+        end
         # if current_organization.user_groups_enabled? and component_settings enabled enabled
 
         TreeNode.new(

data/app/helpers/decidim/meetings/map_helper.rb

@@ -9,7 +9,7 @@ module Decidim
       #
       # meetings - A collection of meetings
       def meetings_data_for_map(meetings)
-        geocoded_meetings = meetings.select(&:geocoded?)
+        geocoded_meetings = meetings.select(&:geocoded_and_valid?)
         geocoded_meetings.map do |meeting|
           meeting.slice(:latitude, :longitude, :address).merge(title: translated_attribute(meeting.title),
                                                                description: html_truncate(translated_attribute(meeting.description), length: 200),

data/app/helpers/decidim/meetings/meetings_helper.rb

@@ -119,6 +119,27 @@ module Decidim
       def current_user_groups?
         current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any?
       end
+
+      # Public: URL to create an event in Google Calendars based on meeting
+      # data.
+      #
+      # meeting - a Decidim::Meeting instance.
+      #
+      # Returns a String.
+      def google_calendar_event_url(meeting)
+        meeting_url = resource_locator(meeting).url
+        meeting = present(meeting)
+        params = {
+          text: meeting.title,
+          dates: meeting.dates_param,
+          details: I18n.t(
+            "decidim.meetings.meetings.calendar_modal.full_details_html",
+            link: link_to(meeting_url, meeting_url)
+          )
+        }
+        base_url = "https://calendar.google.com/calendar/u/0/r/eventedit"
+        "#{base_url}?#{params.to_param}"
+      end
     end
   end
 end

data/app/models/decidim/meetings/answer.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # The data store for an Answer in the Decidim::Meetings
+    class Answer < Meetings::ApplicationRecord
+      include Decidim::DataPortability
+
+      belongs_to :user, class_name: "Decidim::User", foreign_key: "decidim_user_id", optional: true
+      belongs_to :questionnaire, class_name: "Decidim::Meetings::Questionnaire", foreign_key: "decidim_questionnaire_id"
+      belongs_to :question, class_name: "Question", foreign_key: "decidim_question_id"
+
+      has_many :choices,
+               class_name: "AnswerChoice",
+               foreign_key: "decidim_answer_id",
+               dependent: :destroy,
+               inverse_of: :answer
+
+      validate :user_questionnaire_same_organization
+      validate :question_belongs_to_questionnaire
+
+      def self.user_collection(user)
+        where(decidim_user_id: user.id)
+      end
+
+      def self.export_serializer
+        Decidim::Meetings::DataPortabilityUserAnswersSerializer
+      end
+
+      def organization
+        user.organization if user.present?
+        questionnaire&.questionnaire_for.try(:organization)
+      end
+
+      private
+
+      def user_questionnaire_same_organization
+        return if user.nil? || user&.organization == questionnaire.questionnaire_for&.organization
+
+        errors.add(:user, :invalid)
+      end
+
+      def question_belongs_to_questionnaire
+        errors.add(:questionnaire, :invalid) if question&.questionnaire != questionnaire
+      end
+    end
+  end
+end

data/app/models/decidim/meetings/answer_choice.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class AnswerChoice < Meetings::ApplicationRecord
+      belongs_to :answer,
+                 class_name: "Decidim::Meetings::Answer",
+                 foreign_key: "decidim_answer_id"
+
+      belongs_to :answer_option,
+                 class_name: "Decidim::Meetings::AnswerOption",
+                 foreign_key: "decidim_answer_option_id"
+    end
+  end
+end

data/app/models/decidim/meetings/answer_option.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class AnswerOption < Meetings::ApplicationRecord
+      include Decidim::TranslatableResource
+
+      default_scope { order(arel_table[:id].asc) }
+
+      translatable_fields :body
+
+      belongs_to :question, class_name: "Decidim::Meetings::Question", foreign_key: "decidim_question_id"
+      has_many :choices,
+               class_name: "AnswerChoice",
+               foreign_key: "decidim_answer_option_id",
+               dependent: :destroy,
+               inverse_of: :answer_option
+
+      def translated_body
+        Decidim::Forms::AnswerOptionPresenter.new(self).translated_body
+      end
+    end
+  end
+end

data/app/models/decidim/meetings/meeting.rb

@@ -13,7 +13,7 @@ module Decidim
       include Decidim::ScopableResource
       include Decidim::HasCategory
       include Decidim::Followable
-      include Decidim::Comments::Commentable
+      include Decidim::Comments::CommentableWithComponent
       include Decidim::Searchable
       include Decidim::Traceable
       include Decidim::Loggable
@@ -23,6 +23,7 @@ module Decidim
       include Decidim::Reportable
       include Decidim::Authorable
       include Decidim::TranslatableResource
+      include Decidim::Publicable
 
       TYPE_OF_MEETING = %w(in_person online hybrid).freeze
       REGISTRATION_TYPE = %w(registration_disabled on_this_platform on_different_platform).freeze
@@ -32,8 +33,16 @@ module Decidim
       has_many :registrations, class_name: "Decidim::Meetings::Registration", foreign_key: "decidim_meeting_id", dependent: :destroy
       has_many :invites, class_name: "Decidim::Meetings::Invite", foreign_key: "decidim_meeting_id", dependent: :destroy
       has_many :services, class_name: "Decidim::Meetings::Service", foreign_key: "decidim_meeting_id", dependent: :destroy
-      has_one :minutes, class_name: "Decidim::Meetings::Minutes", foreign_key: "decidim_meeting_id", dependent: :destroy
       has_one :agenda, class_name: "Decidim::Meetings::Agenda", foreign_key: "decidim_meeting_id", dependent: :destroy
+      has_one :poll, class_name: "Decidim::Meetings::Poll", foreign_key: "decidim_meeting_id", dependent: :destroy
+      has_many(
+        :public_participants,
+        -> { merge(Registration.public_participant) },
+        through: :registrations,
+        class_name: "Decidim::User",
+        foreign_key: :decidim_user_id,
+        source: :user
+      )
 
       component_manifest_name "meetings"
 
@@ -41,42 +50,54 @@ module Decidim
 
       geocoded_by :address
 
+      scope :published, -> { where.not(published_at: nil) }
       scope :past, -> { where(arel_table[:end_time].lteq(Time.current)) }
       scope :upcoming, -> { where(arel_table[:end_time].gteq(Time.current)) }
 
       scope :visible_meeting_for, lambda { |user|
-        (all.distinct if user&.admin?) ||
+        (all.published.distinct if user&.admin?) ||
           if user.present?
-            spaces = %w(assembly participatory_process)
-            spaces << "conference" if defined?(Decidim::Conference)
-            user_role_queries = spaces.map do |participatory_space_name|
+            spaces = Decidim.participatory_space_registry.manifests.map do |manifest|
+              {
+                name: manifest.model_class_name.constantize.table_name.singularize,
+                class_name: manifest.model_class_name
+              }
+            end
+            user_role_queries = spaces.map do |space|
+              roles_table = "#{space[:name]}_user_roles"
+              next unless connection.table_exists?(roles_table)
+
               "SELECT decidim_components.id FROM decidim_components
               WHERE CONCAT(decidim_components.participatory_space_id, '-', decidim_components.participatory_space_type)
               IN
-              (SELECT CONCAT(decidim_#{participatory_space_name}_user_roles.decidim_#{participatory_space_name}_id, '-Decidim::#{participatory_space_name.classify}')
-              FROM decidim_#{participatory_space_name}_user_roles WHERE decidim_#{participatory_space_name}_user_roles.decidim_user_id = ?)
+              (SELECT CONCAT(#{roles_table}.#{space[:name]}_id, '-#{space[:class_name]}')
+              FROM #{roles_table} WHERE #{roles_table}.decidim_user_id = ?)
               "
             end
 
-            where("decidim_meetings_meetings.private_meeting = ?
-            OR decidim_meetings_meetings.transparent = ?
-            OR decidim_meetings_meetings.id IN
-              (SELECT decidim_meetings_registrations.decidim_meeting_id FROM decidim_meetings_registrations WHERE decidim_meetings_registrations.decidim_user_id = ?)
-            OR decidim_meetings_meetings.decidim_component_id IN
-              (SELECT decidim_components.id FROM decidim_components
+            query = "
+              decidim_meetings_meetings.private_meeting = ?
+              OR decidim_meetings_meetings.transparent = ?
+              OR decidim_meetings_meetings.id IN (
+                SELECT decidim_meetings_registrations.decidim_meeting_id FROM decidim_meetings_registrations WHERE decidim_meetings_registrations.decidim_user_id = ?
+              )
+              OR decidim_meetings_meetings.decidim_component_id IN (
+                SELECT decidim_components.id FROM decidim_components
                 WHERE CONCAT(decidim_components.participatory_space_id, '-', decidim_components.participatory_space_type)
                 IN
                   (SELECT CONCAT(decidim_participatory_space_private_users.privatable_to_id, '-', decidim_participatory_space_private_users.privatable_to_type)
                   FROM decidim_participatory_space_private_users WHERE decidim_participatory_space_private_users.decidim_user_id = ?)
               )
-            OR decidim_meetings_meetings.decidim_component_id IN
-              (
-                #{user_role_queries.compact.join(" UNION ")}
-              )
-            ", false, true, user.id, user.id, *user_role_queries.compact.map { user.id })
-              .distinct
+            "
+            if user_role_queries.any?
+              query = "#{query} OR decidim_meetings_meetings.decidim_component_id IN
+                (#{user_role_queries.compact.join(" UNION ")})
+              "
+            end
+
+            where(query, false, true, user.id, user.id, *user_role_queries.compact.map { user.id }).published.distinct
           else
-            visible
+            published.visible
           end
       }
 
@@ -84,6 +105,7 @@ module Decidim
 
       TYPE_OF_MEETING.each do |type|
         scope type.to_sym, -> { where(type_of_meeting: type.to_sym) }
+        scope "not_#{type}".to_sym, -> { where.not(type_of_meeting: type.to_sym) }
       end
 
       searchable_fields({
@@ -93,8 +115,8 @@ module Decidim
                           D: [:description, :address],
                           datetime: :start_time
                         },
-                        index_on_create: ->(meeting) { meeting.visible? },
-                        index_on_update: ->(meeting) { meeting.visible? })
+                        index_on_create: ->(meeting) { meeting.visible? && meeting.published? },
+                        index_on_update: ->(meeting) { meeting.visible? && meeting.published? })
 
       # we create a salt for the meeting only on new meetings to prevent changing old IDs for existing (Ether)PADs
       before_create :set_default_salt
@@ -145,14 +167,8 @@ module Decidim
         registrations.where(user: user).any?
       end
 
-      # Public: Overrides the `commentable?` Commentable concern method.
-      def commentable?
-        component.settings.comments_enabled?
-      end
-
-      # Public: Overrides the `accepts_new_comments?` Commentable concern method.
-      def accepts_new_comments?
-        commentable? && !component.current_settings.comments_blocked
+      def maps_enabled?
+        component.settings.maps_enabled?
       end
 
       # Public: Overrides the `allow_resource_permissions?` Resourceable concern method.
@@ -175,11 +191,6 @@ module Decidim
         followers
       end
 
-      # Public: Whether the object can have new comments or not.
-      def user_allowed_to_comment?(user)
-        can_participate?(user)
-      end
-
       def can_participate?(user)
         can_participate_in_space?(user) && can_participate_in_meeting?(user)
       end
@@ -216,6 +227,8 @@ module Decidim
       end
 
       def authored_proposals
+        return [] unless Decidim::Meetings.enable_proposal_linking
+
         Decidim::Proposals::Proposal
           .joins(:coauthorships)
           .where(
@@ -241,12 +254,10 @@ module Decidim
         [normalized_author.name]
       end
 
-      def hybrid_meeting?
-        type_of_meeting == "hybrid"
-      end
-
-      def online_meeting?
-        type_of_meeting == "online"
+      TYPE_OF_MEETING.each do |type|
+        define_method("#{type}_meeting?") do
+          type_of_meeting == type
+        end
       end
 
       def registration_disabled?
@@ -269,6 +280,41 @@ module Decidim
         !!attendees_count && attendees_count.positive?
       end
 
+      def self.sort_by_translated_title_asc
+        field = Arel::Nodes::InfixOperation.new("->>", arel_table[:title], Arel::Nodes.build_quoted(I18n.locale))
+        order(Arel::Nodes::InfixOperation.new("", field, Arel.sql("ASC")))
+      end
+
+      def self.sort_by_translated_title_desc
+        field = Arel::Nodes::InfixOperation.new("->>", arel_table[:title], Arel::Nodes.build_quoted(I18n.locale))
+        order(Arel::Nodes::InfixOperation.new("", field, Arel.sql("DESC")))
+      end
+
+      ransacker :type do
+        Arel.sql(%("decidim_meetings_meetings"."type_of_meeting"))
+      end
+
+      ransacker :title do
+        Arel.sql(%{cast("decidim_meetings_meetings"."title" as text)})
+      end
+
+      ransacker :id_string do
+        Arel.sql(%{cast("decidim_meetings_meetings"."id" as text)})
+      end
+
+      ransacker :is_upcoming do
+        Arel.sql("(start_time > NOW())")
+      end
+
+      ransacker :origin do
+        Arel.sql("CASE
+            WHEN decidim_author_type = 'Decidim::Organization' THEN 'official'
+            WHEN decidim_author_type = 'Decidim::UserBaseEntity' AND decidim_user_group_id IS NOT NULL THEN 'user_group'
+            WHEN decidim_author_type = 'Decidim::UserBaseEntity' AND decidim_user_group_id IS NULL THEN 'citizen'
+            ELSE 'unknown' END
+        ")
+      end
+
       private
 
       def can_participate_in_meeting?(user)