Merge branch 'main' into fix-nested-emt-attribute-label-humanize

Author: whomingbird

Gemfile.lock

@@ -233,7 +233,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.4.1)
+    date (3.5.1)
     debug_inspector (1.2.0)
     delayed_job (4.1.13)
       activesupport (>= 3.0, < 9.0)
@@ -513,7 +513,7 @@ GEM
     net-http-digest_auth (1.4.1)
     net-http-persistent (4.0.6)
       connection_pool (~> 2.2, >= 2.2.4)
-    net-imap (0.5.7)
+    net-imap (0.5.14)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -971,7 +971,7 @@ GEM
     tilt (2.6.1)
     time (0.4.1)
       date
-    timeout (0.4.3)
+    timeout (0.6.1)
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)

app/controllers/events_controller.rb

@@ -53,7 +53,8 @@ def handle_update_or_create(is_new)
   private
 
   def event_params
-    params.require(:event).permit(:title, :description, :start_date, :end_date, :url, :address, :city, :country, :time_zone,
+    params.require(:event).permit(:title, :description, :start_date, :end_date, :url,
+                                  :location_type, :event_type_id, :address, :city, :country, :time_zone,
                                   { project_ids: [] }, { publication_ids: [] }, { presentation_ids: [] },
                                   { special_auth_codes_attributes: [:code, :expiration_date, :id, :_destroy] },
                                   { data_file_ids: [] },{document_ids: []}, { publication_ids: [] }, { extended_metadata_attributes: determine_extended_metadata_keys } )

app/models/event.rb

@@ -4,6 +4,10 @@ class Event < ApplicationRecord
   has_and_belongs_to_many :presentations, -> { distinct }
   has_and_belongs_to_many :documents, -> { distinct }
 
+  # no presence validation so value can be nil (Not specified)
+  enum :location_type, { in_person: 0, hybrid: 1, online: 2 }
+  belongs_to :event_type, optional: true
+
   before_destroy {documents.clear}
 
   before_save :set_timezone
@@ -41,6 +45,7 @@ class Event < ApplicationRecord
   validates :country, country:true, allow_blank: true
 
   has_filter :country
+  has_filter :event_type
   has_filter start_date: Seek::Filtering::DateFilter.new(field: :start_date)
 
   validate :validate_data_files

app/models/event_type.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+# EventType model
+#
+# Represents a category/type of events. Associates many `Event` records; when an
+# EventType is removed the association on events is nullified. Validates presence
+# and uniqueness of the `title` attribute.
+class EventType < ApplicationRecord
+  has_many :events, dependent: :nullify
+
+  validates :title, presence: true, uniqueness: true
+end

app/serializers/event_serializer.rb

@@ -1,5 +1,6 @@
 class EventSerializer < BaseSerializer
   attributes :title, :description, :url,
+             :location_type,
              :address, :city, :country,
              :start_date, :end_date
 
@@ -9,6 +10,10 @@ class EventSerializer < BaseSerializer
   has_many :publications
   has_many :presentations
 
+  attribute :event_type do
+    object.event_type&.title
+  end
+
   def country
     if object.country
       if object.country.length == 2 #a code

app/views/events/_form.html.erb

@@ -18,6 +18,29 @@
         <%= f.text_area :description, :rows => 5, :class=>"form-control rich-text-edit" %>
       </div>
 
+      <div class="form-group">
+        <div class="row">
+          <div class="col-md-6 col-xs-12">
+            <%= f.label :event_type_id, "#{t('event')} type" %>
+            <% event_type_options = EventType.order(:title).map do |et|
+              tooltip_attributes = et.description.present? ? { title: et.description } : {}
+              [et.title, et.id, tooltip_attributes]
+            end %>
+            <%= f.select :event_type_id,
+                         options_for_select(event_type_options, f.object.event_type_id),
+                         { include_blank: 'Not specified' },
+                         class: 'form-control' %>
+          </div>
+          <div class="col-md-6 col-xs-12">
+            <%= f.label :location_type, "Location type" %>
+            <%= f.select :location_type,
+                         Event.location_types.keys.map { |k| [k.humanize, k] },
+                         { include_blank: 'Not specified' },
+                         { class: 'form-control' } %>
+          </div>
+        </div>
+      </div>
+
       <div id="event-dates">
         <div class="form-group">
           <div class="row">

app/views/events/_resource_list_item.html.erb

@@ -4,10 +4,11 @@
   <div class="col-sm-6">
     <%= list_item_attribute "Start Date", date_as_string(resource.start_date, false, false, resource.time_zone) %>
     <%= list_item_attribute "End Date", resource.end_date.nil? ? text_or_not_specified(nil) : date_as_string(resource.end_date, false, false, resource.time_zone) %>
-    <%= list_item_optional_attribute "#{t('event')} Website", h(resource.url), h(resource.url) %>
+    <%= list_item_optional_attribute "#{t('event')} type", resource.event_type&.title %>
   </div>
 
   <div class="col-sm-6">
+    <%= list_item_optional_attribute "#{t('event')} Website", h(resource.url), h(resource.url) %>
     <%= list_item_attribute "Country", (country_text_or_not_specified resource.country) %>
     <%= list_item_optional_attribute "City", h(resource.city) %>
   </div>

app/views/events/show.html.erb

@@ -4,6 +4,7 @@
 
 <div class="tab-content">
   <%= tab_pane('overview') do %>
+
     <%= item_description @event.description -%>
 
     <div class="row">
@@ -12,12 +13,23 @@
 
         <%= render :partial => 'projects/show_project_relationship', :locals => {:resource => @event} %>
 
-        <% unless @event.contributor.nil? then %>
+        <% if @event.contributor.present? %>
           <p>
             <label>Created by:</label>
             <%= link_to @event.contributor.name, @event.contributor -%>
           </p>
         <% end %>
+
+        <p class="event_type">
+          <label><%= t('event') %> type:</label>
+          <%= text_or_not_specified @event.event_type&.title %>
+        </p>
+
+        <p class='location_type'>
+          <label>Location type:</label>
+          <%= text_or_not_specified @event.location_type&.humanize %>
+        </p>
+
         <p>
           <label>Start Time:</label>
           <% if @event.start_date.nil? %>

config/default_data/event_types.yml

@@ -0,0 +1,35 @@
+conference:
+  title: 'Conference'
+  description: 'Large formal meeting or series of meetings'
+workshop:
+  title: 'Workshop'
+  description: 'Hands-on session or training'
+seminar:
+  title: 'Seminar'
+  description: 'Educational presentation or lecture'
+webinar:
+  title: 'Webinar'
+  description: 'Online seminar'
+meetup:
+  title: 'Meetup'
+  description: 'Informal gathering'
+hackathon:
+  title: 'Hackathon'
+  description: 'Collaborative programming event'
+meeting:
+  title: 'Meeting'
+  description: 'A general project meeting'
+deliverable:
+  title: 'Deliverable'
+  description: 'A project deliverable submission'
+milestone:
+  title: 'Milestone'
+  description: 'A project milestone'
+experiment:
+  title: 'Experiment'
+  description: 'A scientific experiment'
+experiment_phase:
+  title: 'Experiment Phase'
+  description: 'A phase within a scientific experiment'
+
+

db/migrate/20251210163215_add_location_type_to_events.rb

@@ -0,0 +1,5 @@
+class AddLocationTypeToEvents < ActiveRecord::Migration[7.2]
+  def change
+    add_column :events, :location_type, :integer
+  end
+end