decidim-meetings 0.23.3 → 0.24.1

data/app/commands/decidim/meetings/create_meeting.rb

@@ -45,7 +45,13 @@ module Decidim
           location_hints: { I18n.locale => form.location_hints },
           author: form.current_user,
           decidim_user_group_id: form.user_group_id,
-          registration_terms: form.current_component.settings.default_registration_terms,
+          online_meeting_url: form.online_meeting_url,
+          registration_type: form.registration_type,
+          registration_url: form.registration_url,
+          available_slots: form.available_slots,
+          registration_terms: { I18n.locale => form.registration_terms },
+          registrations_enabled: form.registrations_enabled,
+          type_of_meeting: form.clean_type_of_meeting,
           component: form.current_component
         }
 

data/app/commands/decidim/meetings/leave_meeting.rb

@@ -40,11 +40,11 @@ module Decidim
 
       def questionnaire_answers
         questionnaire = Decidim::Forms::Questionnaire.find_by(questionnaire_for_id: @meeting)
-        questionnaire.answers.where(user: @user)
+        questionnaire.answers.where(user: @user) if questionnaire.present?
       end
 
       def destroy_questionnaire_answers
-        questionnaire_answers.destroy_all
+        questionnaire_answers.try(:destroy_all)
       end
 
       def decrement_score

data/app/commands/decidim/meetings/update_meeting.rb

@@ -55,7 +55,14 @@ module Decidim
             location: { I18n.locale => form.location },
             location_hints: { I18n.locale => form.location_hints },
             author: form.current_user,
-            decidim_user_group_id: form.user_group_id
+            decidim_user_group_id: form.user_group_id,
+            registration_type: form.registration_type,
+            registration_url: form.registration_url,
+            available_slots: form.available_slots,
+            registration_terms: { I18n.locale => form.registration_terms },
+            registrations_enabled: form.registrations_enabled,
+            type_of_meeting: form.clean_type_of_meeting,
+            online_meeting_url: form.online_meeting_url
           },
           visibility: "public-only"
         )

data/app/controllers/decidim/meetings/admin/application_controller.rb

@@ -13,7 +13,7 @@ module Decidim
         helper_method :meetings, :meeting
 
         def meetings
-          @meetings ||= Meeting.where(component: current_component).order("created_at DESC").page(params[:page]).per(15)
+          @meetings ||= Meeting.where(component: current_component).order(start_time: :desc).page(params[:page]).per(15)
         end
 
         def meeting

data/app/controllers/decidim/meetings/admin/meeting_closes_controller.rb

@@ -12,13 +12,13 @@ module Decidim
         def edit
           enforce_permission_to :close, :meeting, meeting: meeting
 
-          @form = form(CloseMeetingForm).from_model(meeting)
+          @form = form(Admin::CloseMeetingForm).from_model(meeting)
         end
 
         def update
           enforce_permission_to :close, :meeting, meeting: meeting
 
-          @form = form(CloseMeetingForm).from_params(params.merge(proposals: meeting.sibling_scope(:proposals)))
+          @form = form(Admin::CloseMeetingForm).from_params(params.merge(proposals: meeting.sibling_scope(:proposals)))
 
           CloseMeeting.call(@form, meeting) do
             on(:ok) do

data/app/controllers/decidim/meetings/directory/meetings_controller.rb

@@ -25,7 +25,7 @@ module Decidim
           @meeting_spaces = @meeting_spaces.sort_by do |_param, name|
             name
           end
-          @meeting_spaces = @meeting_spaces.prepend(["all", t(".all")])
+          @meeting_spaces.prepend(["all", t(".all")])
         end
 
         def calendar
@@ -53,7 +53,7 @@ module Decidim
 
         def default_search_params
           {
-            scope: Meeting.visible_meeting_for(current_user)
+            scope: Meeting.not_hidden.visible_meeting_for(current_user)
           }
         end
 

data/app/controllers/decidim/meetings/meeting_closes_controller.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This controller allows a participant to update the closing_report and the linked proposals of a closed meeting
+    class MeetingClosesController < Decidim::Meetings::ApplicationController
+      include Decidim::Proposals::Admin::Picker
+      include FormFactory
+
+      helper_method :meeting
+
+      def edit
+        enforce_permission_to :close, :meeting, meeting: meeting
+
+        @form = form(CloseMeetingForm).from_model(meeting)
+      end
+
+      def update
+        enforce_permission_to :close, :meeting, meeting: meeting
+
+        @form = form(CloseMeetingForm).from_params(params.merge(proposals: meeting.sibling_scope(:proposals)))
+
+        CloseMeeting.call(@form, meeting) do
+          on(:ok) do
+            flash[:notice] = I18n.t("meetings.close.success", scope: "decidim.meetings.admin")
+            redirect_to meeting_path(meeting)
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("meetings.close.invalid", scope: "decidim.meetings.admin")
+            render action: "edit"
+          end
+        end
+      end
+
+      private
+
+      def meeting
+        @meeting ||= Meeting.where(component: current_component).find(params[:id])
+      end
+    end
+  end
+end

data/app/controllers/decidim/meetings/meetings_controller.rb

@@ -53,8 +53,6 @@ module Decidim
       def show
         raise ActionController::RoutingError, "Not Found" unless meeting
 
-        @report_form = form(Decidim::ReportForm).from_params(reason: "spam")
-
         return if meeting.current_user_can_visit_meeting?(current_user)
 
         flash[:alert] = I18n.t("meeting.not_allowed", scope: "decidim.meetings")
@@ -92,7 +90,7 @@ module Decidim
       end
 
       def meetings
-        @meetings ||= paginate(search.results.not_hidden)
+        @meetings ||= paginate(search.results.order(start_time: :desc))
       end
 
       def registration
@@ -111,9 +109,11 @@ module Decidim
         {
           search_text: "",
           date: %w(upcoming),
+          activity: "all",
           scope_id: default_filter_scope_params,
           category_id: default_filter_category_params,
-          origin: default_filter_origin_params
+          origin: default_filter_origin_params,
+          type: default_filter_type_params
         }
       end
 
@@ -124,9 +124,13 @@ module Decidim
         filter_origin_params
       end
 
+      def default_filter_type_params
+        %w(all) + Decidim::Meetings::Meeting::TYPE_OF_MEETING
+      end
+
       def default_search_params
         {
-          scope: Meeting.visible_meeting_for(current_user)
+          scope: Meeting.not_hidden.visible_meeting_for(current_user)
         }
       end
     end

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

@@ -28,10 +28,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_form.rb

@@ -17,6 +17,11 @@ module Decidim
         attribute :decidim_category_id, Integer
         attribute :private_meeting, Boolean
         attribute :transparent, Boolean
+        attribute :online_meeting_url, String
+        attribute :type_of_meeting, String
+        attribute :registration_type, String
+        attribute :registration_url, String
+        attribute :available_slots, Integer, default: 0
 
         translatable_attribute :title, String
         translatable_attribute :description, String
@@ -25,10 +30,15 @@ module Decidim
 
         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 :registration_type, presence: true
+        validates :available_slots, numericality: { greater_than_or_equal_to: 0 }, presence: true, if: ->(form) { form.on_this_platform? }
+        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 :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 :start_time, presence: true, date: { before: :end_time }
         validates :end_time, presence: true, date: { after: :start_time }
 
@@ -36,6 +46,7 @@ module Decidim
         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
 
         delegate :categories, to: :current_component
 
@@ -49,6 +60,7 @@ module Decidim
 
           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
@@ -89,9 +101,55 @@ module Decidim
           geocoding_enabled? && address.present?
         end
 
+        def needs_address?
+          in_person_meeting? || hybrid_meeting?
+        end
+
         def geocoded?
           latitude.present? && longitude.present?
         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
+
+        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 on_this_platform?
+          registration_type == "on_this_platform"
+        end
+
+        def on_different_platform?
+          registration_type == "on_different_platform"
+        end
+
+        def registration_type_select
+          Decidim::Meetings::Meeting::REGISTRATION_TYPE.map do |type|
+            [
+              I18n.t("registration_type.#{type}", scope: "decidim.meetings"),
+              type
+            ]
+          end
+        end
       end
     end
   end

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

@@ -16,12 +16,22 @@ module Decidim
         translatable_attribute :registration_terms, 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/close_meeting_form.rb

@@ -0,0 +1,31 @@
+# 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: ->(_form, _attribute) { Time.current }
+
+      validates :closing_report, presence: 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 = MeetingPresenter.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/meeting_form.rb

@@ -17,12 +17,25 @@ module Decidim
       attribute :decidim_scope_id, Integer
       attribute :decidim_category_id, Integer
       attribute :user_group_id, Integer
+      attribute :online_meeting_url, String
+      attribute :type_of_meeting, String
+      attribute :registration_type, String
+      attribute :registrations_enabled, Boolean, default: false
+      attribute :registration_url, String
+      attribute :available_slots, Integer, default: 0
+      attribute :registration_terms, String
 
       validates :title, presence: true
       validates :description, presence: true
-      validates :location, presence: true
-      validates :address, presence: true
-      validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
+      validates :type_of_meeting, presence: true
+      validates :location, presence: true, if: ->(form) { form.in_person_meeting? || form.hybrid_meeting? }
+      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 :registration_type, presence: true
+      validates :available_slots, numericality: { greater_than_or_equal_to: 0 }, presence: true, if: ->(form) { form.on_this_platform? }
+      validates :registration_terms, presence: true, if: ->(form) { form.on_this_platform? }
+      validates :registration_url, presence: true, url: true, if: ->(form) { form.on_different_platform? }
       validates :start_time, presence: true, date: { before: :end_time }
       validates :end_time, presence: true, date: { after: :start_time }
 
@@ -30,6 +43,7 @@ module Decidim
       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
 
       delegate :categories, to: :current_component
 
@@ -38,6 +52,10 @@ module Decidim
         presenter = MeetingPresenter.new(model)
         self.title = presenter.title(all_locales: false)
         self.description = presenter.description(all_locales: false)
+        self.location = presenter.location(all_locales: false)
+        self.location_hints = presenter.location_hints(all_locales: false)
+        self.registration_terms = presenter.registration_terms(all_locales: false)
+        self.type_of_meeting = model.type_of_meeting
       end
 
       alias component current_component
@@ -70,9 +88,59 @@ module Decidim
         geocoding_enabled? && address.present?
       end
 
+      def needs_address?
+        in_person_meeting? || hybrid_meeting?
+      end
+
       def geocoded?
         latitude.present? && longitude.present?
       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
+
+      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 on_this_platform?
+        registration_type == "on_this_platform"
+      end
+
+      def on_different_platform?
+        registration_type == "on_different_platform"
+      end
+
+      def registration_type_select
+        Decidim::Meetings::Meeting::REGISTRATION_TYPE.map do |type|
+          [
+            I18n.t("registration_type.#{type}", scope: "decidim.meetings"),
+            type
+          ]
+        end
+      end
+
+      def registrations_enabled
+        on_this_platform?
+      end
     end
   end
 end