spina-admin-conferences 1.3.10 → 2.0.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36fb99cebe29eb7c87ade649d55edb3de239e7f9c6394ffb9f566a3c72102f81
-  data.tar.gz: 869aa43467a8accd77e2746e7c1f9747bf3cc5fb2915da3388c3f126420d4a7e
+  metadata.gz: f2cf050f26e9a9367a69e05ba199802f16edbd573cdc56edf1c2b120e2baf0e6
+  data.tar.gz: 6b0288820aef5a159e4f9662dbc1a89e8b9ad627e9788898da8cac4353b193ce
 SHA512:
-  metadata.gz: 28095530192cf6a10caf09f4d0e98f7c47354f3d2fe8fc0aae26b65bc8d488bebb76b0b89a0bde1b1867a63180da553e990e8043faa123c78d7e3da5c34258c5
-  data.tar.gz: 6f5848cde2cbc5023166384ddb6e24fc0ecccf22bdf5d81eba74fb7a516c5b658d6ac8865a400ca8226120723bfdf6b65f6887492e24cc980835207a384608ea
+  metadata.gz: 760273d0393107bd95e41dbd2c4dddb94cd971d826afb69bb09aced1775814ebbd354d79254ada1d567a325ab62d50e6b3becfb17e81480b97247407e7231c79
+  data.tar.gz: 24cf127eacd47cff18bfd50170b4954c5250a5b2cd89f78af9a46aad69062496a342571beb9b2dd77ab2959d6c81c0c0b72d4e40ad048c4a21b2cb984e6bca3b

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
@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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