spina-admin-conferences 1.3.10 → 2.2.0

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,37 @@ 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 [ActionText::RichText, 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
-        translates :name, :description, :location, fallbacks: true
+        #   @return [String, nil] the translated location of the event
+        translates :name, :location, fallbacks: true
+        translates :description, backend: :action_text, 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,54 +57,11 @@ 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 [TZInfo::TimezonePeriod, nil] the time zone period for the event
+        def time_zone_period
           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
+          start_datetime.period
         end
 
         # @return [Icalendar::Event] the event as an iCal event
@@ -98,22 +69,16 @@ module Spina
           event = Icalendar::Event.new
           return event if invalid?
 
-          event.dtstart = start_datetime
-          event.dtend = finish_datetime
+          event.dtstart = Icalendar::Values::DateTime.new(start_datetime, tzid: start_datetime.time_zone.tzinfo.name)
+          event.dtend = Icalendar::Values::DateTime.new(finish_datetime, tzid: start_datetime.time_zone.tzinfo.name)
           event.location = location
           event.contact = Spina::Account.first.email
           event.categories = Event.model_name.human(count: 0)
           event.summary = name
-          event.append_custom_property('alt_description', description.try(:html_safe))
-          event.description = description.try(:gsub, %r{</?[^>]*>}, '')
+          event.append_custom_property('alt_description', description.to_s)
+          event.description = description.try(:to_plain_text)
           event
         end
-
-        # @param (see #to_event)
-        # @deprecated Use {#to_event} instead
-        def to_ics
-          to_event
-        end
       end
     end
   end

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

@@ -15,13 +15,22 @@ 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
         #   @return [String, nil] the presentation title
         # @!attribute [rw] abstract
-        #   @return [String, nil] the presentation abstract
-        translates :title, :abstract, fallbacks: true
+        #   @return [ActionText::RichText, nil] the presentation abstract
+        translates :title, fallbacks: true
+        translates :abstract, backend: :action_text, fallbacks: true
 
         # @return [ActiveRecord::Relation] all conferences, ordered by date
         scope :sorted, -> { order start_datetime: :desc }
@@ -65,11 +74,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,35 +99,18 @@ 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 [ActiveSupport::TimeWithZone, nil] the presentation end time. Nil if the presentation has no start date and time
+        def finish_datetime
           return if start_datetime.blank?
 
-          start_datetime
+          start_datetime + presentation_type.duration
         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
+        # @return [TZInfo::TimezonePeriod, nil] the time zone period for the presentation
+        def time_zone_period
+          return if start_datetime.blank?
 
-          self.start_datetime = Time.parse(start_time, date).to_datetime.in_time_zone
+          start_datetime.period
         end
 
         # @return [Icalendar::Event] the presentation as an iCal event
@@ -121,22 +118,16 @@ module Spina
           event = Icalendar::Event.new
           return event if invalid?
 
-          event.dtstart = start_datetime
-          event.dtend = start_datetime + presentation_type.duration
+          event.dtstart = Icalendar::Values::DateTime.new(start_datetime, tzid: start_datetime.time_zone.tzinfo.name)
+          event.dtend = Icalendar::Values::DateTime.new(finish_datetime, tzid: finish_datetime.time_zone.tzinfo.name)
           event.location = session.room_name
           presenters.each { |presenter| event.contact = presenter.full_name_and_institution }
           event.categories = Presentation.model_name.human(count: 0)
           event.summary = title
-          event.append_custom_property('alt_description', abstract.try(:html_safe))
-          event.description = abstract.try(:gsub, %r{</?[^>]*>}, '')
+          event.append_custom_property('alt_description', abstract.to_s)
+          event.description = abstract.try(:to_plain_text)
           event
         end
-
-        # @param (see #to_event)
-        # @deprecated Use {#to_event} instead
-        def to_ics
-          to_event
-        end
       end
     end
   end

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/spina/admin/conferences/{delegates/_form_conferences.html.haml → application/_conferences.html.haml}

@@ -1,14 +1,12 @@
-#conferences.tab-content.well
+.well
   .table-container
     %table.table
       %thead
         %tr
           %th= Spina::Admin::Conferences::Conference.human_attribute_name :name
           %th= Spina::Admin::Conferences::Conference.human_attribute_name :year
-          %th= Spina::Admin::Conferences::Conference.human_attribute_name :institution
           %th= Spina::Admin::Conferences::Conference.human_attribute_name :start_date
           %th= Spina::Admin::Conferences::Conference.human_attribute_name :finish_date
           %th
 
-      %tbody
-        = render @delegate.conferences.any? ? @delegate.conferences : 'empty_list', message: t('spina.admin.conferences.conferences.index.no_conferences')
+      %tbody= render conferences.presence || 'empty_list', message: t('.no_conferences')

data/app/views/spina/admin/conferences/{conferences/_form_delegates.html.haml → application/_delegates.html.haml}

@@ -1,4 +1,4 @@
-#delegates.tab-content.well
+.well
   .table-container
     %table.table
       %thead
@@ -8,5 +8,4 @@
           %th= Spina::Admin::Conferences::Delegate.human_attribute_name :institution
           %th
 
-      %tbody
-        = render @conference.delegates.any? ? @conference.delegates : 'empty_list', message: t('spina.admin.conferences.delegates.index.no_delegates')
+      %tbody= render delegates.presence || 'empty_list', message: t('.no_delegates')

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

@@ -0,0 +1,9 @@
+.well
+  .table-container
+    %table.table
+      %thead
+        %tr
+          %th= Spina::Admin::Conferences::DietaryRequirement.human_attribute_name :name
+          %th
+
+      %tbody= render dietary_requirements.presence || 'empty_list', message: t('.no_dietary_requirements')

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

@@ -0,0 +1,10 @@
+.well
+  .table-container
+    %table.table
+      %thead
+        %tr
+          %th= Spina::Admin::Conferences::Institution.human_attribute_name :name
+          %th= Spina::Admin::Conferences::Institution.human_attribute_name :city
+          %th
+
+      %tbody= render institutions.presence || 'empty_list', message: t('.no_institutions')

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

@@ -0,0 +1,10 @@
+.well
+  .table-container
+    %table.table
+      %thead
+        %tr
+          %th= Spina::Admin::Conferences::DietaryRequirement.human_attribute_name :name
+          %th
+
+      %tbody
+        = render presentation_attachment_types.presence || 'empty_list', message: t('.no_presentation_attachment_types')

data/app/views/spina/admin/conferences/{conferences/_form_presentation_types.html.haml → application/_presentation_types.html.haml}

@@ -1,4 +1,4 @@
-#presentation_types.tab-content.well
+.well
   .table-container
     %table.table
       %thead
@@ -8,5 +8,4 @@
           %th= Spina::Admin::Conferences::PresentationType.human_attribute_name :duration
           %th
 
-      %tbody
-        = render @conference.presentation_types.any? ? @conference.presentation_types : 'empty_list', message: t('spina.admin.conferences.presentation_types.index.no_presentation_types')
+      %tbody= render presentation_types.presence || 'empty_list', message: t('.no_presentation_types')

data/app/views/spina/admin/conferences/{rooms/_form_presentations.html.haml → application/_presentations.html.haml}

@@ -1,4 +1,4 @@
-#presentations.tab-content.well
+.well
   .table-container
     %table.table
       %thead
@@ -8,5 +8,4 @@
           %th= Spina::Admin::Conferences::Presentation.human_attribute_name :presenters
           %th
 
-      %tbody
-        = render @room.presentations.any? ? @room.presentations : 'empty_list', message: t('spina.admin.conferences.presentations.index.no_presentations')
+      %tbody= render presentations.presence || 'empty_list', message: t('.no_presentations')

data/app/views/spina/admin/conferences/{conferences/_form_rooms.html.haml → application/_rooms.html.haml}

@@ -1,4 +1,4 @@
-#rooms.tab-content.well
+.well
   .table-container
     %table.table
       %thead
@@ -8,5 +8,4 @@
           %th= Spina::Admin::Conferences::Room.human_attribute_name :number
           %th
 
-      %tbody
-        = render @conference.rooms.any? ? @conference.rooms : 'empty_list', message: t('spina.admin.conferences.rooms.index.no_rooms')
+      %tbody= render rooms.presence || 'empty_list', message: t('.no_rooms')

data/app/views/spina/admin/conferences/{presentation_types/_form_sessions.html.haml → application/_sessions.html.haml}

@@ -1,4 +1,4 @@
-#sessions.tab-content.well
+.well
   .table-container
     %table.table
       %thead
@@ -8,5 +8,4 @@
           %th= Spina::Admin::Conferences::Session.human_attribute_name :room
           %th
 
-      %tbody
-        = render @presentation_type.sessions.any? ? @presentation_type.sessions : 'empty_list', message: t('spina.admin.conferences.sessions.index.no_sessions')
+      %tbody= render sessions.presence || 'empty_list', message: t('.no_sessions')