decidim-meetings 0.10.1 → 0.11.0.pre1

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

@@ -42,6 +42,7 @@ module Decidim
             category: form.category,
             title: form.title,
             description: form.description,
+            services: form.services_to_persist.map { |service| { "title" => service.title, "description" => service.description } },
             end_time: form.end_time,
             start_time: form.start_time,
             address: form.address,

data/app/commands/decidim/meetings/admin/update_registrations.rb

@@ -36,6 +36,7 @@ module Decidim
 
           if form.registrations_enabled
             meeting.available_slots = form.available_slots
+            meeting.reserved_slots = form.reserved_slots
             meeting.registration_terms = form.registration_terms
           end
 

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

@@ -44,7 +44,7 @@ module Decidim
       end
 
       def participatory_space_admins
-        @meeting.feature.participatory_space.admins
+        @meeting.component.participatory_space.admins
       end
 
       def send_notification

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

@@ -28,7 +28,7 @@ module Decidim
       private
 
       def registration
-        @registration ||= Decidim::Meetings::Registration.where(meeting: @meeting, user: @user).first
+        @registration ||= Decidim::Meetings::Registration.find_by(meeting: @meeting, user: @user)
       end
 
       def destroy_registration

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

@@ -6,13 +6,13 @@ module Decidim
       # This controller is the abstract class from which all other controllers of
       # this engine inherit.
       #
-      # Note that it inherits from `Decidim::Features::BaseController`, which
+      # Note that it inherits from `Decidim::Components::BaseController`, which
       # override its layout and provide all kinds of useful methods.
-      class ApplicationController < Decidim::Admin::Features::BaseController
+      class ApplicationController < Decidim::Admin::Components::BaseController
         helper_method :meetings, :meeting
 
         def meetings
-          @meetings ||= Meeting.where(feature: current_feature).page(params[:page]).per(15)
+          @meetings ||= Meeting.where(component: current_component).page(params[:page]).per(15)
         end
 
         def meeting

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

@@ -9,7 +9,7 @@ module Decidim
         include Decidim::Admin::Concerns::HasAttachmentCollections
 
         def after_destroy_path
-          meeting_attachment_collections_path(meeting, meeting.feature, current_participatory_space)
+          meeting_attachment_collections_path(meeting, meeting.component, current_participatory_space)
         end
 
         def collection_for
@@ -21,7 +21,7 @@ module Decidim
         end
 
         def authorization_object
-          meeting.feature
+          meeting.component
         end
       end
     end

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

@@ -22,7 +22,7 @@ module Decidim
         end
 
         def authorization_object
-          meeting.feature
+          meeting.component
         end
       end
     end

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

@@ -31,7 +31,7 @@ module Decidim
         private
 
         def meeting
-          @meeting ||= Meeting.where(feature: current_feature).find(params[:meeting_id])
+          @meeting ||= Meeting.where(component: current_component).find(params[:meeting_id])
         end
       end
     end

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

@@ -30,7 +30,7 @@ module Decidim
         private
 
         def meeting
-          @meeting ||= Meeting.where(feature: current_feature).find(params[:id])
+          @meeting ||= Meeting.where(component: current_component).find(params[:id])
         end
       end
     end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # Controller that allows managing meetings.
+      #
+      class MeetingCopiesController < Admin::ApplicationController
+        helper_method :meeting, :blank_service
+
+        def new
+          @form = form(MeetingCopyForm).from_model(meeting)
+        end
+
+        def create
+          @form = form(MeetingCopyForm).from_params(params, current_component: current_component)
+
+          CopyMeeting.call(@form, meeting) do
+            on(:ok) do
+              flash[:notice] = I18n.t("meeting_copies.create.success", scope: "decidim.admin")
+              redirect_to meetings_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("meeting_copies.create.error", scope: "decidim.admin")
+              render :new
+            end
+          end
+        end
+
+        private
+
+        def blank_service
+          @blank_service ||= Admin::MeetingServiceForm.new
+        end
+
+        def meeting
+          @meeting ||= Meeting.where(component: current_component).find(params[:meeting_id])
+        end
+      end
+    end
+  end
+end

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

@@ -5,12 +5,14 @@ module Decidim
     module Admin
       # This controller allows an admin to manage meetings from a Participatory Process
       class MeetingsController < Admin::ApplicationController
+        helper_method :blank_service
+
         def new
           @form = form(MeetingForm).instance
         end
 
         def create
-          @form = form(MeetingForm).from_params(params, current_feature: current_feature)
+          @form = form(MeetingForm).from_params(params, current_component: current_component)
 
           CreateMeeting.call(@form) do
             on(:ok) do
@@ -30,7 +32,7 @@ module Decidim
         end
 
         def update
-          @form = form(MeetingForm).from_params(params, current_feature: current_feature)
+          @form = form(MeetingForm).from_params(params, current_component: current_component)
 
           UpdateMeeting.call(@form, meeting) do
             on(:ok) do
@@ -54,6 +56,12 @@ module Decidim
             end
           end
         end
+
+        private
+
+        def blank_service
+          @blank_service ||= Admin::MeetingServiceForm.new
+        end
       end
     end
   end

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

@@ -26,16 +26,17 @@ module Decidim
         end
 
         def export
-          format = params[:format]
-          export_data = Decidim::Exporters.find_exporter(format).new(meeting.registrations, Decidim::Meetings::RegistrationSerializer).export
-
-          send_data export_data.read, type: "text/#{export_data.extension}", filename: export_data.filename("registrations")
+          ExportMeetingRegistrations.call(meeting, params[:format], current_user) do
+            on(:ok) do |export_data|
+              send_data export_data.read, type: "text/#{export_data.extension}", filename: export_data.filename("registrations")
+            end
+          end
         end
 
         private
 
         def meeting
-          @meeting ||= Meeting.where(feature: current_feature).find(params[:meeting_id])
+          @meeting ||= Meeting.where(component: current_component).find(params[:meeting_id])
         end
       end
     end

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

@@ -5,9 +5,9 @@ module Decidim
     # This controller is the abstract class from which all other controllers of
     # this engine inherit.
     #
-    # Note that it inherits from `Decidim::Features::BaseController`, which
+    # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
-    class ApplicationController < Decidim::Features::BaseController
+    class ApplicationController < Decidim::Components::BaseController
       helper Decidim::Meetings::ApplicationHelper
     end
   end

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

@@ -9,7 +9,7 @@ module Decidim
       private
 
       def model
-        @model ||= Meeting.where(feature: params[:feature_id]).find(params[:meeting_id])
+        @model ||= Meeting.where(component: params[:component_id]).find(params[:meeting_id])
       end
 
       def iframe_url

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

@@ -25,7 +25,7 @@ module Decidim
       private
 
       def meeting
-        @meeting ||= Meeting.where(feature: current_feature).find(params[:id])
+        @meeting ||= Meeting.where(component: current_component).find(params[:id])
       end
 
       def meetings
@@ -50,7 +50,7 @@ module Decidim
       end
 
       def context_params
-        { feature: current_feature, organization: current_organization }
+        { component: current_component, organization: current_organization }
       end
     end
   end

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

@@ -39,7 +39,7 @@ module Decidim
       private
 
       def meeting
-        @meeting ||= Meeting.where(feature: current_feature).find(params[:meeting_id])
+        @meeting ||= Meeting.where(component: current_component).find(params[:meeting_id])
       end
     end
   end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # A form object used to copy a meeting from the admin
+      # dashboard.
+      #
+      class MeetingCopyForm < Form
+        include TranslatableAttributes
+
+        translatable_attribute :title, String
+        translatable_attribute :description, String
+        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 :services, Array[MeetingServiceForm]
+
+        mimic :meeting
+
+        validates :current_component, presence: true
+
+        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.geocoder.present? }
+        validates :start_time, presence: true, date: { before: :end_time }
+        validates :end_time, presence: true, date: { after: :start_time }
+
+        def map_model(model)
+          self.services = model.services.map do |service|
+            MeetingServiceForm.new(service)
+          end
+        end
+
+        def services_to_persist
+          services.reject(&:deleted)
+        end
+
+        def number_of_services
+          services.size
+        end
+
+        alias component current_component
+      end
+    end
+  end
+end

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

@@ -17,6 +17,7 @@ module Decidim
         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
 
@@ -28,21 +29,31 @@ module Decidim
         validates :start_time, presence: true, date: { before: :end_time }
         validates :end_time, presence: true, date: { after: :start_time }
 
-        validates :current_feature, presence: true
+        validates :current_component, presence: true
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
 
         validate :scope_belongs_to_participatory_space_scope
 
-        delegate :categories, to: :current_feature
+        delegate :categories, to: :current_component
 
         def map_model(model)
-          return unless model.categorization
+          self.services = model.services.map do |service|
+            MeetingServiceForm.new(service)
+          end
 
-          self.decidim_category_id = model.categorization.decidim_category_id
+          self.decidim_category_id = model.categorization.decidim_category_id if model.categorization
         end
 
-        alias feature current_feature
+        def services_to_persist
+          services.reject(&:deleted)
+        end
+
+        def number_of_services
+          services.size
+        end
+
+        alias component current_component
 
         # Finds the Scope from the given decidim_scope_id, uses participatory space scope if missing.
         #
@@ -59,7 +70,7 @@ module Decidim
         end
 
         def category
-          return unless current_feature
+          return unless current_component
           @category ||= categories.find_by(id: decidim_category_id)
         end
 

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

@@ -11,12 +11,16 @@ module Decidim
 
         attribute :registrations_enabled, Boolean
         attribute :available_slots, Integer
+        attribute :reserved_slots, Integer
         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? }
-        validate :available_slots_greater_than_or_equal_to_registrations_count, if: ->(form) { form.registrations_enabled? && form.available_slots.positive? }
+        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? }
 
+        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
@@ -37,6 +41,11 @@ module Decidim
           errors.add(:available_slots, :invalid) if available_slots < meeting.registrations.count
         end
 
+        def reserved_slots_lower_than_or_equal_to_rest_available_slots_and_registrations_count
+          total_slots = available_slots - meeting.registrations.count
+          errors.add(:reserved_slots, I18n.t("decidim.meetings.admin.registrations.form.reserved_slots_less_than", count: total_slots)) if reserved_slots > total_slots
+        end
+
         def meeting
           @meeting ||= context[:meeting]
         end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # This class holds a Form to update meeting services
+      class MeetingServiceForm < Decidim::Form
+        include TranslatableAttributes
+
+        attribute :deleted, Boolean, default: false
+
+        translatable_attribute :title, String
+        translatable_attribute :description, String
+
+        validates :title, translatable_presence: true, unless: :deleted
+
+        def to_param
+          id || "meeting-service-id"
+        end
+      end
+    end
+  end
+end

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

@@ -7,6 +7,10 @@ module Decidim
       #
       module ApplicationHelper
         include Decidim::MapHelper
+
+        def tabs_id_for_service(service)
+          "meeting_service_#{service.to_param}"
+        end
       end
     end
   end

data/app/mailers/decidim/meetings/admin/invite_join_meeting_mailer.rb

@@ -35,7 +35,7 @@ module Decidim
         private
 
         def routes
-          @routes ||= Decidim::EngineRouter.main_proxy(@meeting.feature)
+          @routes ||= Decidim::EngineRouter.main_proxy(@meeting.component)
         end
       end
     end