spina-admin-conferences 1.3.8 → 2.0.1

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/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')

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

@@ -1,35 +1,29 @@
 .structure-form-pane{ class: ('active' if (local_assigns[:active] == true) || (f.index == 0)), id: "structure_form_pane_#{f.index}",
                       data: { 'spina--admin--conferences--conference_events_form': { target: 'formPane' } } }
   .structure-form-part
-    .horizontal-form-label= Spina::Admin::Conferences::Event.human_attribute_name :name
-    .horizontal-form-content= f.text_field :name, placeholder: Spina::Admin::Conferences::Event.human_attribute_name(:name), required: true
+    .page-form-label= Spina::Admin::Conferences::Event.human_attribute_name :name
+    .page-form-control= f.text_field :name, placeholder: Spina::Admin::Conferences::Event.human_attribute_name(:name), required: true
 
   .structure-form-part
-    .horizontal-form-label= Spina::Admin::Conferences::Event.human_attribute_name :date
-    .horizontal-form-content= f.date_field :date, value: f.object.conference.start_date&.strftime("%Y-%m-%d"),
-                                                  placeholder: Spina::Admin::Conferences::Event.human_attribute_name(:date),
-                                                  required: true
+    .page-form-label= Spina::Admin::Conferences::Event.human_attribute_name :start_datetime
+    .page-form-control= f.datetime_field :start_datetime,
+                              placeholder: Spina::Admin::Conferences::Event.human_attribute_name(:start_datetime), required: true
 
   .structure-form-part
-    .horizontal-form-label= Spina::Admin::Conferences::Event.human_attribute_name :start_time
-    .horizontal-form-content= f.time_field :start_time,
-                              value: (f.object.start_time.to_formatted_s(:time) unless f.object.start_time.blank?),
-                              placeholder: Spina::Admin::Conferences::Event.human_attribute_name(:start_time), required: true
+    .page-form-label= Spina::Admin::Conferences::Event.human_attribute_name :finish_datetime
+    .page-form-control= f.datetime_field :finish_datetime,
+                              placeholder: Spina::Admin::Conferences::Event.human_attribute_name(:finish_datetime), required: true
 
   .structure-form-part
-    .horizontal-form-label= Spina::Admin::Conferences::Event.human_attribute_name :finish_time
-    .horizontal-form-content= f.time_field :finish_time,
-                              value: (f.object.finish_time.to_formatted_s(:time) unless f.object.finish_time.blank?),
-                              placeholder: Spina::Admin::Conferences::Event.human_attribute_name(:finish_time), required: true
+    .page-form-label= Spina::Admin::Conferences::Event.human_attribute_name :location
+    .page-form-control= f.text_field :location, placeholder: Spina::Admin::Conferences::Event.human_attribute_name(:location),
+                        required: true
 
   .structure-form-part
-    .horizontal-form-label= Spina::Admin::Conferences::Event.human_attribute_name :location
-    .horizontal-form-content= f.text_field :location, placeholder: Spina::Admin::Conferences::Event.human_attribute_name(:location),
-                                                      required: true
-
-  .structure-form-part
-    .horizontal-form-label= Spina::Admin::Conferences::Event.human_attribute_name :description
-    .horizontal-form-content= render 'spina/admin/shared/rich_text_field', f: f, field: :description
+    .page-form-label= Spina::Admin::Conferences::Event.human_attribute_name :description
+    .page-form-content
+      .page-form-rich-text
+        = render 'spina/admin/shared/rich_text_field', f: f, field: :description
 
   = f.hidden_field :id
 

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

@@ -2,7 +2,7 @@
   - content_for :notifications do
     = render 'errors', errors: @conference.errors
 
-= form_for @conference, html: { autocomplete: 'off' } do |f|
+= form_for [:admin_conferences, @conference], html: { autocomplete: 'off' } do |f|
   %header#header
     = render partial: 'spina/admin/shared/breadcrumbs'
 
@@ -19,5 +19,9 @@
           %li{ class: ('active' if i == 0) }
             = link_to t(".#{tab}"), "##{tab}"
 
-  - @tabs.each do |tab|
-    = render "form_#{tab}", f: f
+  #conference_details.tab-content.active= render 'form_conference_details', f: f
+  #parts.tab-content= render 'form_parts', f: f
+  #rooms.tab-content= render partial: 'rooms', object: @conference.rooms
+  #presentation_types.tab-content= render partial: 'presentation_types', object: @conference.presentation_types
+  #delegates.tab-content= render partial: 'delegates', object: @conference.delegates
+  #presentations.tab-content= render partial: 'presentations', object: @conference.presentations

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

@@ -1,29 +1,27 @@
-#conference_details.tab-content.active
-  .well
-    .horizontal-form{ data: { controller: 'spina--admin--conferences--select-options', 'spina--admin--conferences--select_options': { config_value: '{ "admin_conferences_conference_institution_id": { "value": "id", "text": "name" }, "admin_conferences_conference_room_ids": { "trigger": "admin_conferences_conference_institution_id", "key": "rooms", "value": "id", "text": "name" } }', record_value: @institutions } } }
-      .horizontal-form-group
-        .horizontal-form-label= Spina::Admin::Conferences::Conference.human_attribute_name :name
-        .horizontal-form-content= f.text_field :name, placeholder: Spina::Admin::Conferences::Conference.human_attribute_name(:name), required: true
+.page-form{ data: { controller: 'spina--admin--conferences--select-options', 'spina--admin--conferences--select_options': { config_value: '{ "admin_conferences_conference_institution_id": { "value": "id", "text": "name" }, "admin_conferences_conference_room_ids": { "trigger": "admin_conferences_conference_institution_id", "key": "rooms", "value": "id", "text": "name" } }', record_value: @institutions } } }
+  .page-form-group
+    .page-form-label= Spina::Admin::Conferences::Conference.human_attribute_name :name
+    .page-form-control= f.text_field :name, placeholder: Spina::Admin::Conferences::Conference.human_attribute_name(:name), required: true, class: 'input-large'
 
-      .horizontal-form-group
-        .horizontal-form-label= Spina::Admin::Conferences::Conference.human_attribute_name :start_date
-        .horizontal-form-content= f.date_field :start_date, value: (@conference.start_date.strftime("%Y-%m-%d") if @conference.start_date.present?), placeholder: Spina::Admin::Conferences::Conference.human_attribute_name(:start_date), required: true
+  .page-form-group
+    .page-form-label= Spina::Admin::Conferences::Conference.human_attribute_name :start_date
+    .page-form-control= f.date_field :start_date, value: (@conference.start_date.strftime("%Y-%m-%d") if @conference.start_date.present?), placeholder: Spina::Admin::Conferences::Conference.human_attribute_name(:start_date), required: true
 
-      .horizontal-form-group
-        .horizontal-form-label= Spina::Admin::Conferences::Conference.human_attribute_name :finish_date
-        .horizontal-form-content= f.date_field :finish_date, value: (@conference.finish_date.strftime("%Y-%m-%d") if @conference.finish_date.present?), placeholder: Spina::Admin::Conferences::Conference.human_attribute_name(:finish_date), required: true
+  .page-form-group
+    .page-form-label= Spina::Admin::Conferences::Conference.human_attribute_name :finish_date
+    .page-form-control= f.date_field :finish_date, value: (@conference.finish_date.strftime("%Y-%m-%d") if @conference.finish_date.present?), placeholder: Spina::Admin::Conferences::Conference.human_attribute_name(:finish_date), required: true
 
-      .horizontal-form-group{ class: dom_class(@conference.events) }
-        .horizontal-form-content
-          .structure-form{ data: { controller: 'spina--admin--conferences--conference-events-form', 'spina--admin--conferences--conference_events_form': { active_class: 'active' } } }
-            .structure-form-menu
-              %label= Spina::Admin::Conferences::Conference.human_attribute_name :events
-              %ul= render partial: 'event_row', collection: f.object.events, as: :event
-              = link_to icon('plus'), @conference.new_record? ? new_admin_conferences_event_path : new_admin_conferences_conference_event_path(@conference, index: @conference.events.size), remote: true, class: %w[button button-link icon], data: { 'spina--admin--conferences--conference_events_form_target': 'addFormLink', disable_with: '' }
+  .page-form-group{ class: dom_class(@conference.events) }
+    .page-form-label= Spina::Admin::Conferences::Conference.human_attribute_name :events
+    .page-form-control
+      .structure-form{ data: { controller: 'spina--admin--conferences--conference-events-form', 'spina--admin--conferences--conference_events_form': { active_class: 'active' } } }
+        .structure-form-menu
+          %ul= render partial: 'event_row', collection: f.object.events, as: :event
+          = link_to icon('plus'), @conference.new_record? ? new_admin_conferences_event_path : new_admin_conferences_conference_event_path(@conference, index: @conference.events.size), remote: true, class: %w[button button-link icon], data: { 'spina--admin--conferences--conference_events_form_target': 'addFormLink', disable_with: '' }
 
-            .structure-form-content{ data: { action: 'conferenceEventFieldsAdded->spina--admin--conferences--conference-events-form#updateURL' } }
-              = f.fields_for :events do |event_fields|
-                = render 'event_fields', f: event_fields
+        .structure-form-content{ data: { action: 'conferenceEventFieldsAdded->spina--admin--conferences--conference-events-form#updateURL' } }
+          = f.fields_for :events do |event_fields|
+            = render 'event_fields', f: event_fields
 
-  - unless @conference.new_record?
-    .pull-right= link_to t('spina.permanently_delete'), admin_conferences_conference_path(@conference), method: :delete, data: { confirm: t('.delete_confirmation', name: @conference.name) }, class: %w[button button-link button-danger]
+- unless @conference.new_record?
+  .pull-right= link_to t('spina.permanently_delete'), admin_conferences_conference_path(@conference), method: :delete, data: { confirm: t('.delete_confirmation', name: @conference.name) }, class: %w[button button-link button-danger]

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

@@ -1,15 +1,8 @@
-#parts.tab-content
-  .well
-    .horizontal-form
-      = f.fields_for :parts do |ff|
-        = ff.hidden_field :id
-        = ff.hidden_field :title
-        = ff.hidden_field :partable_type
-        = ff.hidden_field :name
+.page-form
+  = f.fields_for :"#{@locale}_content", @parts do |ff|
+    = ff.hidden_field :type, value: ff.object.class.name
+    = ff.hidden_field :title
+    = ff.hidden_field :name
 
-        .horizontal-form-group.page-part{ data: { name: ff.object.name } }
-          - case ff.object.partable_type
-          - when 'Spina::Structure'
-            = render 'form_structure', f: ff
-          - else
-            = render "spina/admin/partables/#{partable_type_partial_namespace(ff.object.partable_type)}/form", f: ff
+    .page-form-group.page-part{ data: { name: ff.object.name } }
+      = render "spina/admin/parts/#{parts_partial_namespace(ff.object.class.name)}/form", f: ff

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

@@ -3,16 +3,5 @@
     = icon 'plus'
     = t '.new'
 
-.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 :start_date
-          %th= Spina::Admin::Conferences::Conference.human_attribute_name :finish_date
-          %th
-
-      %tbody
-        = render @conferences.any? ? @conferences : 'empty_list', message: t('.no_conferences')
+= render partial: 'conferences', object: @conferences
+= link_to_next_page @conferences, 'Next'

data/app/views/spina/admin/conferences/delegates/_form.html.haml

@@ -2,7 +2,7 @@
   - content_for :notifications do
     = render 'errors', errors: @delegate.errors
 
-= form_for @delegate, html: { autocomplete: 'off' } do |f|
+= form_for [:admin_conferences, @delegate], html: { autocomplete: 'off' } do |f|
   %header#header
     = render partial: 'spina/admin/shared/breadcrumbs'
 
@@ -19,5 +19,6 @@
           %li{ class: ('active' if i == 0) }
             = link_to t(".#{tab}"), "##{tab}"
 
-  - @tabs.each do |tab|
-    = render "form_#{tab}", f: f
+  #delegate_details.tab-content.active= render 'form_delegate_details', f: f
+  #conferences.tab-content= render partial: 'conferences', object: @delegate.conferences
+  #presentations.tab-content= render partial: 'presentations', object: @delegate.presentations