spina-admin-conferences 1.3.6 → 2.0.0.alpha

data/app/controllers/spina/admin/conferences/presentations_controller.rb

@@ -45,7 +45,7 @@ module Spina
                 add_breadcrumb t('.new')
                 render :new
               end
-              format.js { render partial: 'errors', locals: { errors: @presentation.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @presentation.errors } }
             end
           end
         end
@@ -61,7 +61,7 @@ module Spina
                 add_breadcrumb @presentation.title
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @presentation.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @presentation.errors } }
             end
           end
         end
@@ -77,7 +77,7 @@ module Spina
                 add_breadcrumb @presentation.title
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @presentation.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @presentation.errors } }
             end
           end
         end
@@ -98,7 +98,7 @@ module Spina
         end
 
         def set_conferences
-          @conferences = Conference.all.to_json methods: %i[name localized_dates],
+          @conferences = Conference.all.to_json methods: %i[name],
                                                 include:
                                                   { presentation_types:
                                                       { methods: [:name], include: { sessions: { methods: [:name] } } } }
@@ -113,10 +113,9 @@ module Spina
         end
 
         def presentation_params
-          params.require(:admin_conferences_presentation).permit(:title, :abstract, :session_id, :date, :start_time,
-                                                                 presenter_ids: [],
-                                                                 attachments_attributes:
-                                                                   %i[id attachment_id attachment_type_id _destroy])
+          params.require(:presentation).permit(:title, :abstract, :session_id, :start_datetime,
+                                               presenter_ids: [],
+                                               attachments_attributes: %i[id attachment_id attachment_type_id _destroy])
         end
       end
     end

data/app/controllers/spina/admin/conferences/rooms_controller.rb

@@ -46,7 +46,7 @@ module Spina
                 add_breadcrumb t('.new')
                 render :new
               end
-              format.js { render partial: 'errors', locals: { errors: @room.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @room.errors } }
             end
           end
         end
@@ -62,7 +62,7 @@ module Spina
                 add_breadcrumb @room.name
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @room.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @room.errors } }
             end
           end
         end
@@ -78,7 +78,7 @@ module Spina
                 add_breadcrumb @room.name
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @room.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @room.errors } }
             end
           end
         end
@@ -101,7 +101,7 @@ module Spina
         end
 
         def room_params
-          params.require(:admin_conferences_room).permit(:building, :number, :institution_id)
+          params.require(:room).permit(:building, :number, :institution_id)
         end
       end
     end

data/app/controllers/spina/admin/conferences/sessions_controller.rb

@@ -47,7 +47,7 @@ module Spina
                 add_breadcrumb t('.new')
                 render :new
               end
-              format.js { render partial: 'errors', locals: { errors: @session.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @session.errors } }
             end
           end
         end
@@ -63,7 +63,7 @@ module Spina
                 add_breadcrumb @session.name
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @session.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @session.errors } }
             end
           end
         end
@@ -79,7 +79,7 @@ module Spina
                 add_breadcrumb @session.name
                 render :edit
               end
-              format.js { render partial: 'errors', locals: { errors: @session.errors } }
+              format.turbo_stream { render partial: 'errors', locals: { errors: @session.errors } }
             end
           end
         end
@@ -110,7 +110,7 @@ module Spina
         end
 
         def session_params
-          params.require(:admin_conferences_session).permit(:name, :presentation_type_id, :room_id)
+          params.require(:session).permit(:name, :presentation_type_id, :room_id)
         end
       end
     end

data/app/jobs/spina/admin/conferences/presentation_import_job.rb

@@ -13,8 +13,7 @@ module Spina
         #   == Columns
         #   The CSV should has the following columns. Make sure to include the column names in the header row.
         #   +session_id+:: The id of the associated session.
-        #   +date+:: The date of the presentation, in ISO 8601 format.
-        #   +start_time+:: The start time of the presentation, in HH:MM format.
+        #   +start_datetime+:: The start time of the presentation, in ISO 8601 format.
         #   +title+:: The title of the presentation for the default locale.
         #   +abstract+:: The presentation's abstract.
         #   +presenter_ids+:: The ids of the presenters.
@@ -30,7 +29,7 @@ module Spina
 
         def presentation_params(params)
           params = ActionController::Parameters.new(params)
-          params.permit :title, :date, :start_time, :abstract, :session_id, presenter_ids: []
+          params.permit :title, :start_datetime, :abstract, :session_id, presenter_ids: []
         end
       end
     end

data/app/models/spina/admin/conferences/conference.rb

@@ -13,7 +13,10 @@ module Spina
       # = Translations
       # - {#name}
       class Conference < ApplicationRecord
-        include Partable
+        include AttrJson::Record
+        include AttrJson::NestedAttributes
+        include Spina::Partable
+        include Spina::TranslatedContent
 
         default_scope { includes(:translations) }
 
@@ -37,11 +40,6 @@ module Spina
         #   @note Destroying a conference destroys dependent events.
         #   @see Event
         has_many :events, -> { includes(:translations) }, inverse_of: :conference, dependent: :destroy
-        # @!attribute [rw] events
-        #   @return [ActiveRecord::Relation] directly associated events
-        #   @note Destroying a conference destroys dependent events.
-        #   @see Event
-        has_many :parts, as: :pageable, dependent: :destroy
         # @!attribute [rw] sessions
         #   @return [ActiveRecord::Relation] Sessions associated with {#presentation_types}
         #   @see Session
@@ -68,7 +66,6 @@ module Spina
         has_and_belongs_to_many :delegates, foreign_key: :spina_conferences_conference_id, # rubocop:disable Rails/HasAndBelongsToMany
                                             association_foreign_key: :spina_conferences_delegate_id
         accepts_nested_attributes_for :events, allow_destroy: true
-        accepts_nested_attributes_for :parts, allow_destroy: true
 
         validates :name, :start_date, :finish_date, :year, presence: true
         validates :finish_date, 'spina/admin/conferences/finish_date': true, unless: proc { |conference| conference.start_date.blank? }

data/app/models/spina/admin/conferences/event.rb

@@ -6,8 +6,8 @@ module Spina
       # Events during conferences.
       #
       # = Validators
-      # Presence:: {#name}, {#start_time}, {#finish_time}.
-      # Conference date (using {ConferenceDateValidator}):: {#start_time}, {#finish_time}.
+      # Presence:: {#name}, {#:start_datetime}, {#:finish_datetime}, {#:location}.
+      # Conference date (using {ConferenceDateValidator}):: {#start_datetime}, {#finish_datetime}.
       # @see ConferenceDateValidator
       #
       # = Translations
@@ -18,23 +18,36 @@ module Spina
         default_scope { includes(:translations) }
 
         # @!attribute [rw] name
-        #   @return [String, nil] the translated name of the conference
+        #   @return [String, nil] the translated name of the event
         # @!attribute [rw] description
-        #   @return [String, nil] the translated description of the conference
+        #   @return [String, nil] the translated description of the event
+        # @!attribute [rw] start_datetime
+        #   @return [ActiveSupport::TimeWithZone, nil] the start time of the event
+        # @!attribute [rw] finish_datetime
+        #   @return [ActiveSupport::TimeWithZone, nil] the finish time of the event
         # @!attribute [rw] location
-        #   @return [String, nil] the translated location of the conference
+        #   @return [String, nil] the translated location of the event
         translates :name, :description, :location, fallbacks: true
 
         # @return [ActiveRecord::Relation] all events, ordered by name
         scope :sorted, -> { i18n.order :name }
 
+        # @!attribute [rw] start_time
+        #   @return [ActiveSupport::TimeWithZone, nil] the start time (alias)
+        #   @see #start_datetime
+        alias_attribute :start_time, :start_datetime
+        # @!attribute [rw] :finish_time
+        #   @return [ActiveSupport::TimeWithZone, nil] the finish time (alias)
+        #   @see #finish_datetime
+        alias_attribute :finish_time, :finish_datetime
+
         # @!attribute [rw] conference
         #   @return [Conference, nil] directly associated conferences
         belongs_to :conference, -> { includes(:translations) }, inverse_of: :events, touch: true
 
-        validates :name, :date, :start_time, :start_datetime, :finish_time, :finish_datetime, :location, presence: true
-        validates :date, 'spina/admin/conferences/conference_date': true
-        validates :finish_time, 'spina/admin/conferences/finish_time': true
+        validates :name, :start_datetime, :finish_datetime, :location, presence: true
+        validates :start_datetime, :finish_datetime, 'spina/admin/conferences/conference_date': true
+        validates :finish_datetime, 'spina/admin/conferences/finish_time': true
 
         # @return [Date, nil] the start date of the event. Nil if the event has no start date and time
         def date
@@ -43,56 +56,6 @@ module Spina
           start_datetime.to_date
         end
 
-        # Sets the date of the presentation.
-        # @param date [Date] the new date
-        # @return [void]
-        def date=(date)
-          if date.blank? || date.to_date.blank?
-            self.start_datetime = nil
-            return
-          end
-
-          self.start_datetime = date.to_date + (start_datetime.try(:seconds_since_midnight) || 0).seconds
-        end
-
-        # @return [ActiveSupport::TimeWithZone, nil] the start time of the event. Nil if the event has no start date and time
-        def start_time
-          return if start_datetime.blank?
-
-          start_datetime
-        end
-
-        # Sets the start time of the event.
-        # @param start_time [ActiveSupport::TimeWithZone] the new start time
-        # @return [void]
-        def start_time=(start_time)
-          if start_time.blank?
-            self.start_datetime = nil
-            return
-          end
-
-          self.start_datetime = Time.parse(start_time, date).to_datetime.in_time_zone
-        end
-
-        # @return [ActiveSupport::TimeWithZone, nil] the finish time of the event. Nil if the event has no finish date and time
-        def finish_time
-          return if finish_datetime.blank?
-
-          finish_datetime
-        end
-
-        # Sets the finish time of the event.
-        # @param finish_time [ActiveSupport::TimeWithZone] the new finish time
-        # @return [void]
-        def finish_time=(finish_time)
-          if finish_time.blank?
-            self.finish_datetime = nil
-            return
-          end
-
-          self.finish_datetime = Time.parse(finish_time, date).to_datetime.in_time_zone
-        end
-
         # @return [Icalendar::Event] the event as an iCal event
         def to_event # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
           event = Icalendar::Event.new

data/app/models/spina/admin/conferences/presentation.rb

@@ -15,6 +15,14 @@ module Spina
       # - {#title}
       # - {#abstract}
       class Presentation < ApplicationRecord
+        include AttrJson::Record
+        include AttrJson::NestedAttributes
+        include Spina::Partable
+        include Spina::TranslatedContent
+
+        # @!attribute [rw] start_datetime
+        #   @return [ActiveSupport::TimeWithZone, nil] the presentation start time
+
         default_scope { includes(:translations) }
 
         # @!attribute [rw] title
@@ -65,11 +73,16 @@ module Spina
                                              association_foreign_key: :spina_conferences_delegate_id
         accepts_nested_attributes_for :attachments, allow_destroy: true
 
-        validates :title, :date, :start_time, :start_datetime, :abstract, :presenters, presence: true
-        validates :date, 'spina/admin/conferences/conference_date': true
+        validates :title, :start_datetime, :abstract, :presenters, presence: true
+        validates :start_datetime, 'spina/admin/conferences/conference_date': true
         validates_associated :presenters
         validates_associated :attachments
 
+        # @!attribute [rw] start_time
+        #   @return [ActiveSupport::TimeWithZone, nil] the start time (alias)
+        #   @see #start_datetime
+        alias_attribute :start_time, :start_datetime
+
         # Imports a presentation from CSV.
         # @param file [String] the CSV file to be read
         # @return [void]
@@ -85,37 +98,6 @@ module Spina
           start_datetime.to_date
         end
 
-        # Sets the date of the presentation.
-        # @param date [Date] the new date
-        # @return [void]
-        def date=(date)
-          if date.blank? || date.to_date.blank?
-            self.start_datetime = nil
-            return
-          end
-
-          self.start_datetime = date.to_date + (start_datetime.try(:seconds_since_midnight) || 0).seconds
-        end
-
-        # @return [ActiveSupport::TimeWithZone, nil] the start time of the presentation. Nil if the presentation has no start date and time
-        def start_time
-          return if start_datetime.blank?
-
-          start_datetime
-        end
-
-        # Sets the start time of the presentation.
-        # @param start_time [ActiveSupport::TimeWithZone] the new start time
-        # @return [void]
-        def start_time=(start_time)
-          if start_time.blank?
-            self.start_datetime = nil
-            return
-          end
-
-          self.start_datetime = Time.parse(start_time, date).to_datetime.in_time_zone
-        end
-
         # @return [Icalendar::Event] the presentation as an iCal event
         def to_event # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
           event = Icalendar::Event.new

data/app/models/spina/parts/admin/conferences/date.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Spina
+  module Parts
+    module Admin
+      module Conferences
+        # Date parts, without associated times.
+        class Date < Spina::Parts::Base
+          attr_json :content, :date
+        end
+      end
+    end
+  end
+end

data/app/models/spina/parts/admin/conferences/email_address.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Spina
+  module Parts
+    module Admin
+      module Conferences
+        # Email address parts. The format is validated.
+        #
+        # = Validators
+        # Email address (using {EmailAddressValidator}):: {#content}.
+        # @see EmailAddressValidator
+        class EmailAddress < Spina::Parts::Base
+          attr_json :content, :string
+
+          validates :content, 'spina/admin/conferences/email_address': true, allow_blank: true
+        end
+      end
+    end
+  end
+end

data/app/models/spina/parts/admin/conferences/time.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Spina
+  module Parts
+    module Admin
+      module Conferences
+        # Time parts.
+        class Time < Spina::Parts::Base
+          attr_json :content, :time
+        end
+      end
+    end
+  end
+end

data/app/models/spina/parts/admin/conferences/url.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Spina
+  module Parts
+    module Admin
+      module Conferences
+        # URL parts. The format is validated.
+        #
+        # = Validators
+        # HTTP(S) URL (using {HttpUrlValidator}):: {#content}.
+        # @see HttpUrlValidator
+        class Url < Spina::Parts::Base
+          attr_json :content, :string
+
+          validates :content, 'spina/admin/conferences/http_url': true, allow_blank: true
+        end
+      end
+    end
+  end
+end

data/app/views/layouts/spina/admin/conferences/application.html.haml

@@ -0,0 +1,6 @@
+- content_for :application do
+  %div{ data: { turbolinks: 'false' } }
+    = yield(:admin_header)
+    = yield
+
+= render template: 'layouts/spina/admin/admin'

data/app/views/layouts/spina/admin/conferences/conferences.html.haml

@@ -1,4 +1,4 @@
-- content_for :application do
+- content_for :admin_header do
   %header#header
     #header_actions
       = yield(:header_actions)
@@ -14,6 +14,4 @@
         %li{class: ('active' if controller_name == 'sessions')}
           = link_to Spina::Admin::Conferences::Session.model_name.human(count: 0), admin_conferences_sessions_path
 
-  = yield
-
-= render template: 'layouts/spina/admin/admin'
+= render template: 'layouts/spina/admin/conferences/application'