spina-admin-conferences 1.3.10 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36fb99cebe29eb7c87ade649d55edb3de239e7f9c6394ffb9f566a3c72102f81
-  data.tar.gz: 869aa43467a8accd77e2746e7c1f9747bf3cc5fb2915da3388c3f126420d4a7e
+  metadata.gz: c64616247b31ffd1405c24a6e8c56c8065c7aa1fae0743def8af0333b3b4da15
+  data.tar.gz: d6b43e8bdd7380ef7dd3792ecfbc84365be458a2c628a47f1cd6faffb78bd22b
 SHA512:
-  metadata.gz: 28095530192cf6a10caf09f4d0e98f7c47354f3d2fe8fc0aae26b65bc8d488bebb76b0b89a0bde1b1867a63180da553e990e8043faa123c78d7e3da5c34258c5
-  data.tar.gz: 6f5848cde2cbc5023166384ddb6e24fc0ecccf22bdf5d81eba74fb7a516c5b658d6ac8865a400ca8226120723bfdf6b65f6887492e24cc980835207a384608ea
+  metadata.gz: ed37f8900387246afe83d3f81106b744853191def0dcb67d1dfb687cb484cc375bca8f76205658072d5d8d2f627fbde5887d25a9dfe53a2527f57e8234ae2865
+  data.tar.gz: db26443e184c8fb5e7f05c8b66b97c0bc8a0497f4f33462b560642b8217db72b498c897120973c923096ed8d9473b761a509978057729cca65513a6e76350457

data/app/assets/stylesheets/spina/admin/conferences/application.sass

@@ -1,18 +1,3 @@
-input::-webkit-calendar-picker-indicator
-  display: none
-input[type="date"]::-webkit-outer-spin-button, input[type="date"]::-webkit-inner-spin-button, input[type="time"]::-webkit-inner-spin-button, input[type="time"]::-webkit-inner-spin-button
-  display: none
-input[type="date"]
-  padding-right: 30px
-
-.multiple.select-dropdown
-  z-index: 0
-  &:before
-    content: none
-  select
-    padding: 11px 10px
-    width: 100%
-
 .turbo-progress-bar
   @import spina/configuration
   background-color: $primary-color

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

@@ -5,14 +5,17 @@ module Spina
     module Conferences
       # @abstract Subclass to implement a custom controller.
       class ApplicationController < ::Spina::Admin::AdminController
+        helper ::Spina::Engine.routes.url_helpers
+
         add_flash_types :success
 
-        layout :admin_layout, only: %i[new edit]
+        layout 'spina/admin/conferences/application', only: %i[new edit]
+        before_action :set_locale
 
         private
 
-        def admin_layout
-          'spina/admin/conferences/application'
+        def set_locale
+          @locale = params[:locale] || I18n.default_locale
         end
       end
     end

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

@@ -6,16 +6,21 @@ module Spina
       # Controller for {Conference} objects.
       # @see Conference
       class ConferencesController < ApplicationController
-        PARTS = [
-          { name: 'text', title: 'Text', partable_type: 'Spina::Text' },
-          { name: 'submission_url', title: 'Submission URL', partable_type: 'Spina::Admin::Conferences::UrlPart' },
-          { name: 'submission_email_address', title: 'Submission email address',
-            partable_type: 'Spina::Admin::Conferences::EmailAddressPart' },
-          { name: 'submission_date', title: 'Submission date', partable_type: 'Spina::Admin::Conferences::DatePart' },
-          { name: 'submission_text', title: 'Submission text', partable_type: 'Spina::Line' },
-          { name: 'gallery', title: 'Gallery', partable_type: 'Spina::ImageCollection' },
-          { name: 'sponsors', title: 'Sponsors', partable_type: 'Spina::Structure' }
+        PARTS_PARAMS = [
+          :name, :title, :type, :content, :filename, :signed_blob_id, :alt, :attachment_id, :image_id,
+          images_attributes: %i[filename signed_blob_id image_id alt],
+          content_attributes: [
+            :name, :title,
+            parts_attributes: [
+              :name, :title, :type, :content, :filename, :signed_blob_id, :alt, :attachment_id, :image_id,
+              images_attributes: %i[filename signed_blob_id image_id alt]
+            ]
+          ]
         ].freeze
+        CONTENT_PARAMS = Spina.config.locales.inject({}) { |params, locale| params.merge("#{locale}_content_attributes": [*PARTS_PARAMS]) }
+        PARAMS = [:start_date, :finish_date, :name, **CONTENT_PARAMS,
+          events_attributes: %i[id name start_datetime finish_datetime description location] ].freeze
+        PARTS = %w[text submission_url submission_email_address submission_date submission_text gallery sponsors].freeze
 
         before_action :set_conference, only: %i[edit update destroy]
         before_action :set_conferences_breadcrumb
@@ -28,7 +33,7 @@ module Spina
         # Renders a list of conferences.
         # @return [void]
         def index
-          @conferences = Conference.sorted
+          @conferences = Conference.sorted.page(params[:page])
         end
 
         # Renders a form for a new conference.
@@ -116,31 +121,17 @@ module Spina
         end
 
         def set_parts_attributes
-          @parts_attributes = PARTS
+          @parts_attributes = current_theme.parts.select { |part| PARTS.include? part[:name] }
         end
 
         def build_parts
           return unless @parts_attributes.is_a? Array
 
-          @conference.parts = @parts_attributes.collect do |part_attributes|
-            @conference.parts.where(name: part_attributes[:name]).first_or_initialize(**part_attributes)
-                       .tap { |part| part.partable ||= part.partable_type.constantize.new }
-          end
+          @parts = @parts_attributes.collect { |part_attributes| @conference.part(part_attributes) }
         end
 
-        def conference_params # rubocop:disable Metrics/MethodLength
-          params.require(:admin_conferences_conference).permit(:start_date, :finish_date, :name,
-                                                               events_attributes:
-                                                                 %i[id name date start_time finish_time description location],
-                                                               parts_attributes:
-                                                                 [:id, :title, :name, :partable_type, :partable_id,
-                                                                  { partable_attributes:
-                                                                      [:id, :content, :image_tokens, :image_positions, :date, :time,
-                                                                       { structure_items_attributes:
-                                                                           [:id, :position, :_destroy,
-                                                                            { structure_parts_attributes:
-                                                                                [:id, :title, :structure_partable_type, :name, :partable_id,
-                                                                                 { partable_attributes: {} }] }] }] }])
+        def conference_params
+          params.require(:conference).permit(PARAMS)
         end
       end
     end

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

@@ -15,7 +15,7 @@ module Spina
         # Renders a list of delegates.
         # @return [void]
         def index
-          @delegates = Delegate.sorted
+          @delegates = Delegate.sorted.page(params[:page])
         end
 
         # Renders a form for a new delegate.
@@ -105,10 +105,8 @@ module Spina
         end
 
         def delegate_params
-          params.require(:admin_conferences_delegate).permit(:first_name, :last_name, :email_address, :url,
-                                                             :institution_id,
-                                                             conference_ids: [],
-                                                             dietary_requirement_ids: [])
+          params.require(:delegate).permit(:first_name, :last_name, :email_address, :url, :institution_id,
+                                           conference_ids: [], dietary_requirement_ids: [])
         end
       end
     end

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

@@ -15,7 +15,7 @@ module Spina
         # Renders a list of dietary requirements.
         # @return [void]
         def index
-          @dietary_requirements = DietaryRequirement.sorted
+          @dietary_requirements = DietaryRequirement.sorted.page(params[:page])
         end
 
         # Renders a form for a new dietary requirement.
@@ -98,7 +98,7 @@ module Spina
         end
 
         def dietary_requirement_params
-          params.require(:admin_conferences_dietary_requirement).permit(:name)
+          params.require(:dietary_requirement).permit(:name)
         end
       end
     end

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

@@ -15,7 +15,7 @@ module Spina
         # Renders a list of institutions.
         # @return [void]
         def index
-          @institutions = Institution.sorted
+          @institutions = Institution.sorted.page(params[:page])
         end
 
         # Renders a form for a new institution.
@@ -98,7 +98,7 @@ module Spina
         end
 
         def conference_params
-          params.require(:admin_conferences_institution).permit(:name, :city, :logo_id)
+          params.require(:institution).permit(:name, :city, :logo_id)
         end
       end
     end

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

@@ -14,7 +14,7 @@ module Spina
         # Renders a list of presentation attachment types.
         # @return [void]
         def index
-          @presentation_attachment_types = PresentationAttachmentType.sorted
+          @presentation_attachment_types = PresentationAttachmentType.sorted.page(params[:page])
         end
 
         # Renders a form for a new presentation attachment type.
@@ -96,7 +96,7 @@ module Spina
 
         # noinspection RubyInstanceMethodNamingConvention
         def presentation_attachment_type_params
-          params.require(:admin_conferences_presentation_attachment_type).permit(:name)
+          params.require(:presentation_attachment_type).permit(:name)
         end
       end
     end

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

@@ -17,7 +17,7 @@ module Spina
         # Renders a list of presentation types.
         # @return [void]
         def index
-          @presentation_types = PresentationType.sorted
+          @presentation_types = PresentationType.sorted.page(params[:page])
         end
 
         # Renders a form for a new presentation type.
@@ -101,7 +101,7 @@ module Spina
         end
 
         def presentation_type_params
-          params.require(:admin_conferences_presentation_type).permit(:name, :conference_id, :minutes)
+          params.require(:presentation_type).permit(:name, :conference_id, :minutes)
         end
       end
     end

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

@@ -16,7 +16,7 @@ module Spina
         # Renders a list of presentations.
         # @return [void]
         def index
-          @presentations = Presentation.sorted
+          @presentations = Presentation.sorted.page(params[:page])
         end
 
         # Renders a form for a new presentation.
@@ -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

@@ -17,7 +17,7 @@ module Spina
         # Renders a list of rooms.
         # @return [void]
         def index
-          @rooms = Room.sorted
+          @rooms = Room.sorted.page(params[:page])
         end
 
         # Renders a form for a new room.
@@ -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

@@ -18,7 +18,7 @@ module Spina
         # Renders a list of sessions.
         # @return [void]
         def index
-          @sessions = Session.all
+          @sessions = Session.all.page(params[:page])
         end
 
         # Renders a form for a new session.
@@ -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

@@ -12,8 +12,11 @@ module Spina
       #
       # = Translations
       # - {#name}
-      class Conference < ApplicationRecord
-        include Partable
+      class Conference < ApplicationRecord # rubocop:disable Metrics/ClassLength
+        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,11 +66,71 @@ 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? }
 
+        class << self
+          # @return [Array<TZInfo::TimezonePeriod>] the time zone periods for the conferences
+          def time_zone_periods
+            pluck(:dates).compact.collect(&:begin).collect(&:at_beginning_of_day).collect(&:period)
+          end
+
+          # @return [String] a set of conferences as an iCalendar
+          def to_ics
+            Rails.cache.fetch [all, 'calendar'] do
+              calendar = Icalendar::Calendar.new
+              calendar.x_wr_calname = (Current.account || Spina::Account.first).name
+              calendar.add_timezone(ical_timezone)
+              conference_events.each { |event| calendar.add_event(event) }
+              calendar.publish
+              calendar.to_ical
+            end
+          end
+
+          private
+
+          def conference_events
+            Rails.cache.fetch [all, 'events'] do
+              all.in_batches.each_record.collect do |conference|
+                Rails.cache.fetch([conference, 'event']) { conference.to_event }
+              end
+            end
+          end
+
+          def ical_timezone
+            Rails.cache.fetch [self, 'time_zone'] do
+              Icalendar::Timezone.new do |timezone|
+                timezone.tzid = Time.zone.name
+                daylight_periods.each { |daylight_period| timezone.add_daylight(daylight_period) }
+                standard_periods.each { |standard_period| timezone.add_daylight(standard_period) }
+              end
+            end
+          end
+
+          def daylight_periods
+            time_zone_periods.select(&:dst?).each do |period|
+              Icalendar::Timezone::Daylight.new do |ical_period|
+                ical_period.tzoffsetfrom = period.offset.ical_offset
+                ical_period.tzoffsetto = period.offset.ical_offset
+                ical_period.tzname = period.abbreviation
+                ical_period.dtstart = period.starts_at.to_datetime
+              end
+            end
+          end
+
+          def standard_periods
+            time_zone_periods.reject(&:dst?).each do |period|
+              Icalendar::Timezone::Standard.new do |ical_period|
+                ical_period.tzoffsetfrom = period.offset.ical_offset
+                ical_period.tzoffsetto = period.offset.ical_offset
+                ical_period.tzname = period.abbreviation
+                ical_period.dtstart = period.starts_at.to_datetime
+              end
+            end
+          end
+        end
+
         # @return [Date, nil] the start date of the conference. Nil if the conference has no dates
         def start_date
           return if dates.blank?
@@ -130,10 +188,8 @@ module Spina
           event = Icalendar::Event.new
           return event if invalid?
 
-          event.dtstart = start_date
-          event.dtstart.ical_param(:value, 'DATE')
-          event.dtend = finish_date
-          event.dtend.ical_param(:value, 'DATE')
+          event.dtstart = Icalendar::Values::Date.new(dates.begin)
+          event.dtend = Icalendar::Values::Date.new(dates.exclude_end? ? dates.end : dates.end + 1.day)
           event.location = location
           event.contact = Spina::Account.first.email
           event.categories = Conference.model_name.human(count: 0)
@@ -141,10 +197,71 @@ module Spina
           event
         end
 
-        # @param (see #to_event)
-        # @deprecated Use {#to_event} instead
+        # @return [TZInfo::TimezonePeriod, nil] the time zone period for the conference event
+        def time_zone_period
+          return if start_date.blank?
+
+          start_date.at_beginning_of_day.period
+        end
+
+        # @return [String, nil] the conference as an iCalendar
         def to_ics
-          to_event
+          Rails.cache.fetch [self, presentations, 'calendar'] do
+            calendar = Icalendar::Calendar.new
+            return if invalid?
+
+            calendar.x_wr_calname = name
+            calendar.add_timezone(ical_timezone)
+            eventables_events.each { |event| calendar.add_event(event) }
+            calendar.publish
+            calendar.to_ical
+          end
+        end
+
+        private
+
+        def eventables
+          [self, *events, *presentations]
+        end
+
+        def eventables_events
+          Rails.cache.fetch [self, *presentations, 'events'] do
+            eventables.collect do |eventable|
+              Rails.cache.fetch([eventable, 'event']) { eventable.to_event }
+            end
+          end
+        end
+
+        def ical_timezone
+          Rails.cache.fetch [self, presentations, 'time_zone'] do
+            Icalendar::Timezone.new do |timezone|
+              timezone.tzid = Time.zone.name
+              daylight_periods.each { |daylight_period| timezone.add_daylight(daylight_period) }
+              standard_periods.each { |standard_period| timezone.add_daylight(standard_period) }
+            end
+          end
+        end
+
+        def daylight_periods
+          time_zone_periods.select(&:dst?).each do |period|
+            Icalendar::Timezone::Daylight.new do |ical_period|
+              ical_period.tzoffsetfrom = period.offset.ical_offset
+              ical_period.tzoffsetto = period.offset.ical_offset
+              ical_period.tzname = period.abbreviation
+              ical_period.dtstart = period.starts_at.to_datetime
+            end
+          end
+        end
+
+        def standard_periods
+          time_zone_periods.reject(&:dst?).each do |period|
+            Icalendar::Timezone::Standard.new do |ical_period|
+              ical_period.tzoffsetfrom = period.offset.ical_offset
+              ical_period.tzoffsetto = period.offset.ical_offset
+              ical_period.tzname = period.abbreviation
+              ical_period.dtstart = period.starts_at.to_datetime
+            end
+          end
         end
       end
     end