Add cancelled/abandoned event status

Author: matt17r

app/controllers/courses_controller.rb

@@ -20,6 +20,7 @@ def show
     @location = Location.find_by!(slug: params[:slug])
     @locations = Location.all.order(:name)
     @next_event = Event.not_finalised.where("date >= ?", Date.today).order(:date).first
+    @abandoned_event = Event.where(status: "abandoned", location: @location).where("date >= ?", Date.today).order(:date).first
     @latest_event = @location.latest_event
     @current_year_events = @location.events.where("strftime('%Y', date) = ?", Date.today.year.to_s).order(:date)
   end

app/controllers/events_controller.rb

@@ -4,13 +4,13 @@ class EventsController < ApplicationController
   skip_before_action :require_admin!, only: [ :index, :show, :show_latest ]
   allow_unauthenticated_access(only: [ :index, :show, :show_latest ])
 
-  before_action :set_event, only: [ :show, :edit, :update, :destroy, :edit_results, :activate, :deactivate ]
+  before_action :set_event, only: [ :show, :edit, :update, :destroy, :edit_results, :activate, :deactivate, :abandon, :archive ]
 
   def index
     if Current.user&.admin?
       @events = Event.order(number: :desc).includes(:results)
     else
-      @events = Event.where(status: "finalised").order(number: :desc).includes(:results)
+      @events = Event.where(status: [ "finalised", "abandoned", "cancelled" ]).order(number: :desc).includes(:results)
     end
   end
 
@@ -77,13 +77,23 @@ def deactivate
     redirect_to dashboard_path, notice: "Event #{@event} deactivated! Finish position claiming is now disabled."
   end
 
+  def abandon
+    @event.abandon!
+    redirect_to dashboard_path, notice: "Event #{@event} has been cancelled."
+  end
+
+  def archive
+    @event.archive_as_cancelled!
+    redirect_to dashboard_path, notice: "Event #{@event} has been archived."
+  end
+
   private
 
   def set_event
     @event = Event.find_by number: params[:number]
   end
 
   def event_params
-    params.expect(event: [ :number, :date, :location_id, :description, :status, :facebook_url, :strava_url ])
+    params.expect(event: [ :number, :date, :location_id, :description, :status, :facebook_url, :strava_url, :cancellation_reason ])
   end
 end

app/controllers/static_pages_controller.rb

@@ -12,7 +12,7 @@ def admin_dashboard
   end
 
   def home
-    @upcoming_events = Event.not_finalised.includes(:location).where("date >= ?", Date.today).order(:date).limit(3)
+    @upcoming_events = Event.upcoming_for_home.includes(:location).where("date >= ?", Date.today).order(:date).limit(3)
     @statistics = Event.home_statistics
 
     if authenticated? && (active_event = @upcoming_events.find(&:active?))

app/models/event.rb

@@ -1,7 +1,7 @@
 class Event < ApplicationRecord
   include HomeStatistics
 
-  enum :status, { draft: "draft", in_progress: "in_progress", finalised: "finalised" }
+  enum :status, { draft: "draft", in_progress: "in_progress", finalised: "finalised", abandoned: "abandoned", cancelled: "cancelled" }
 
   after_update :send_results_emails_if_finalised
   after_update :invalidate_statistics_cache_if_finalised
@@ -15,7 +15,9 @@ class Event < ApplicationRecord
   has_many :check_ins
   has_many :checked_in_users, through: :check_ins, source: :user
 
-  scope :not_finalised, -> { where.not(status: "finalised") }
+  scope :not_finalised, -> { where.not(status: [ "finalised", "abandoned", "cancelled" ]) }
+  scope :upcoming_for_home, -> { where.not(status: [ "finalised", "cancelled" ]) }
+  scope :public_visible, -> { where(status: [ "in_progress", "finalised", "abandoned", "cancelled" ]) }
 
   validates :date, presence: true
   validates :number, numericality: { only_integer: true, greater_than: 0 }
@@ -51,6 +53,7 @@ def active?
   end
 
   def activate!
+    raise "Cannot activate an abandoned or cancelled event" if abandoned? || cancelled?
     Event.transaction do
       Event.where(status: "in_progress").where.not(id: id).update_all(status: "draft")
       update!(status: "in_progress")
@@ -61,6 +64,16 @@ def deactivate!
     update!(status: "draft")
   end
 
+  def abandon!
+    raise "Cannot abandon a finalised event" if finalised?
+    update!(status: "abandoned")
+  end
+
+  def archive_as_cancelled!
+    raise "Can only archive abandoned events" unless abandoned?
+    update!(status: "cancelled")
+  end
+
   private
 
   def send_results_emails_if_finalised

app/views/courses/show.html.erb

@@ -45,15 +45,27 @@
                   </div>
                 </div>
                 <div class="mt-1 text-3xl font-semibold tracking-tight text-primary"><%= event.date.strftime("%-d %B") %></div>
+              <% elsif event.abandoned? || event.cancelled? %>
+                <div class="mt-1 text-3xl font-semibold tracking-tight text-red-500 line-through"><%= event.date.strftime("%-d %B") %></div>
+                <div class="text-sm text-red-600 mt-1">Cancelled</div>
+              <% elsif event.finalised? %>
+                <div class="mt-1 text-3xl font-semibold tracking-tight text-gray-500 line-through"><%= event.date.strftime("%-d %B") %></div>
               <% else %>
-                <div class="mt-1 text-3xl font-semibold tracking-tight <%= event.finalised? ? 'text-gray-500 line-through' : 'text-gray-900' %>"><%= event.date.strftime("%-d %B") %></div>
+                <div class="mt-1 text-3xl font-semibold tracking-tight text-gray-900"><%= event.date.strftime("%-d %B") %></div>
               <% end %>
             </div>
           <% end %>
         </div>
       </div>
 
-      <% if active_event = Event.find_by(status: "in_progress", location: @location) %>
+      <% if @abandoned_event %>
+        <div class="mt-8 p-6 bg-red-50 border-2 border-red-500 rounded-lg text-center">
+          <h2 class="text-3xl font-bold text-red-600 mb-2">Event Cancelled</h2>
+          <p class="text-xl text-red-800">
+            The <%= @abandoned_event.date.strftime("%-d %B") %> event has been cancelled<%= ": #{@abandoned_event.cancellation_reason}" if @abandoned_event.cancellation_reason.present? %>.
+          </p>
+        </div>
+      <% elsif active_event = Event.find_by(status: "in_progress", location: @location) %>
         <div class="mt-8 text-center">
           <% if authenticated? && active_event.check_ins.exists?(user: Current.session.user) %>
             <%= link_to "Check Others In", check_in_path(CheckIn.token_for_event(active_event.number)), class: "inline-flex items-center justify-center px-6 py-3 rounded-full border border-primary whitespace-nowrap text-base font-medium text-primary hover:bg-primary-bg" %>

app/views/events/_form.html.erb

@@ -56,9 +56,22 @@
         <%= form.radio_button :status, 'finalised', class: "h-4 w-4 border-gray-400 focus:outline-blue-600" %>
         <%= form.label :status_finalised, "Finalised (Results ready)", class: "ml-2" %>
       </div>
+      <div class="flex items-center gap-2">
+        <%= form.radio_button :status, 'abandoned', class: "h-4 w-4 border-gray-400 focus:outline-blue-600" %>
+        <%= form.label :status_abandoned, "Abandoned (Cancelled, still shown on home page)", class: "ml-2" %>
+      </div>
+      <div class="flex items-center gap-2">
+        <%= form.radio_button :status, 'cancelled', class: "h-4 w-4 border-gray-400 focus:outline-blue-600" %>
+        <%= form.label :status_cancelled, "Cancelled (Archived, removed from home page)", class: "ml-2" %>
+      </div>
     </div>
   </div>
 
+  <div class="my-5">
+    <%= form.label :cancellation_reason, "Cancellation Reason (for abandoned/cancelled events)" %>
+    <%= form.text_area :cancellation_reason, rows: 3, class: ["block shadow-sm rounded-md border px-3 py-2 mt-2 w-full", {"border-gray-400 focus:outline-blue-600": event.errors[:cancellation_reason].none?, "border-red-400 focus:outline-red-600": event.errors[:cancellation_reason].any?}], placeholder: "e.g., Due to heavy rain" %>
+  </div>
+
   <div class="inline">
     <%= form.submit class: "w-full sm:w-auto rounded-md px-3.5 py-2.5 bg-blue-600 hover:bg-blue-500 text-white inline-block font-medium cursor-pointer" %>
   </div>

app/views/events/index.html.erb

@@ -39,10 +39,32 @@
                 <tbody class="divide-y divide-gray-200 bg-white">
                   <% @events.each do |event| %>
                     <tr class="hover:bg-brand-green/50">
-                      <td class="whitespace-nowrap pl-4 pr-3 py-5 text-2xl text-gray-700"><%= link_to "##{event.number} – #{event.location}", event %></td>
+                      <td class="pl-4 pr-3 py-5 text-2xl text-gray-700">
+                        <%= link_to event do %>
+                          <div class="flex items-center gap-2">
+                            <span>#<%= event.number %> – <%= event.location %></span>
+                            <% if event.abandoned? %>
+                              <span class="inline-flex items-center rounded-md bg-red-50 px-2 py-1 text-xs font-medium text-red-700 ring-1 ring-inset ring-red-600/20">CANCELLED</span>
+                            <% elsif event.cancelled? %>
+                              <span class="inline-flex items-center rounded-md bg-gray-50 px-2 py-1 text-xs font-medium text-gray-600 ring-1 ring-inset ring-gray-500/20">CANCELLED</span>
+                            <% end %>
+                          </div>
+                          <% if (event.abandoned? || event.cancelled?) && event.cancellation_reason.present? %>
+                            <div class="text-sm text-gray-600 mt-1"><%= event.cancellation_reason %></div>
+                          <% end %>
+                        <% end %>
+                      </td>
                       <td class="whitespace-nowrap px-3 py-5 text-2xl text-gray-700"><%= link_to l(event.date), event %></td>
-                      <td class="whitespace-nowrap px-3 py-5 text-2xl text-gray-700"><%= link_to (event.results.count + event.volunteers.count), event %></td>
-                      <td class="whitespace-nowrap pl-3 pr-4 py-5 text-2xl text-gray-700"><%= link_to event.results.order(Result.arel_table[:time].asc.nulls_last).first&.time_string || "N/A", event %></td>
+                      <td class="whitespace-nowrap px-3 py-5 text-2xl text-gray-700">
+                        <%= link_to event do %>
+                          <%= (event.abandoned? || event.cancelled?) ? "N/A" : (event.results.count + event.volunteers.count) %>
+                        <% end %>
+                      </td>
+                      <td class="whitespace-nowrap pl-3 pr-4 py-5 text-2xl text-gray-700">
+                        <%= link_to event do %>
+                          <%= (event.abandoned? || event.cancelled?) ? "N/A" : (event.results.order(Result.arel_table[:time].asc.nulls_last).first&.time_string || "N/A") %>
+                        <% end %>
+                      </td>
                     </tr>
                   <% end %>
                 </tbody>

app/views/events/show.html.erb

@@ -28,6 +28,14 @@
           </li>
         </ol>
       </nav>
+      <% if @event.abandoned? || @event.cancelled? %>
+        <div class="mb-6 p-4 bg-red-50 border border-red-200 rounded-lg text-center">
+          <p class="text-xl font-semibold text-red-700">This event was cancelled</p>
+          <% if @event.cancellation_reason.present? %>
+            <p class="mt-2 text-gray-700"><%= @event.cancellation_reason %></p>
+          <% end %>
+        </div>
+      <% end %>
       <div class="text-center mb-8">
         <h1 class="text-4xl font-bold text-gray-900">
           <%= "Event ##{@event.number} – #{l @event.date} – #{@event.location}" %>

app/views/static_pages/admin_dashboard.html.erb

@@ -218,7 +218,32 @@
           <% end %>
         </div>
       </div>
-    <% else %>
+    <% end %>
+
+    <% abandoned_events = Event.where(status: "abandoned").order(date: :asc) %>
+    <% if abandoned_events.any? %>
+      <div class="mt-8 mb-8">
+        <h2 class="text-pretty text-3xl font-medium tracking-tight text-gray-950 mb-4">Cancelled Events Pending Archival</h2>
+        <div class="bg-red-50 border border-red-200 rounded-lg p-4">
+          <% abandoned_events.each do |event| %>
+            <div class="flex items-center justify-between mb-3 last:mb-0">
+              <div>
+                <span class="text-lg font-medium text-gray-900"><%= link_to "#{event.location} - #{event.date}", event_path(event.number), class: "text-gray-900 hover:text-primary" %></span>
+                <% if event.cancellation_reason.present? %>
+                  <p class="text-sm text-gray-600 mt-1"><%= event.cancellation_reason %></p>
+                <% end %>
+              </div>
+              <div class="flex gap-2">
+                <%= link_to "Edit", edit_admin_event_path(event.number), class: "justify-center rounded-md border border-transparent bg-blue-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-blue-500 cursor-pointer" %>
+                <%= button_to "Archive", archive_admin_event_path(event.number), method: :post, form: { data: { turbo_confirm: "Archive this event? It will be removed from the home page." }, class: "inline-block" }, class: "justify-center rounded-md border border-transparent bg-gray-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-gray-700 cursor-pointer" %>
+              </div>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+
+    <% unless @event %>
       <p class="text-gray-600 mt-8">No in-progress events. All events have been finalized!</p>
     <% end %>
   </div>

app/views/static_pages/home.html.erb

@@ -13,9 +13,15 @@
         <div class="relative -m-2 grid grid-cols-1 rounded-4xl max-lg:mx-auto max-lg:w-full max-lg:max-w-md overflow-hidden">
         <% if index == 0 %>
           <%= link_to course_path(event.location), class: "absolute top-0 right-0 w-16 h-16" do %>
-            <div class="bg-primary absolute transform rotate-45 text-center text-white font-semibold py-1 right-[-40px] top-[32px] w-[170px]">
-              Next Event
-            </div>
+            <% if event.abandoned? %>
+              <div class="bg-red-600 absolute transform rotate-45 text-center text-white font-semibold py-1 right-[-40px] top-[32px] w-[170px]">
+                CANCELLED
+              </div>
+            <% else %>
+              <div class="bg-primary absolute transform rotate-45 text-center text-white font-semibold py-1 right-[-40px] top-[32px] w-[170px]">
+                Next Event
+              </div>
+            <% end %>
           <% end %>
         <% end %>
           <div class="rounded-4xl bg-white p-10 pb-9 shadow-2xl ring-1 ring-black/25 ring-inset">
@@ -28,6 +34,9 @@
             <%= link_to course_path(event.location) do %>
               <div class="mt-8 text-5xl font-medium <%= index == 0 ? "text-primary" : "text-gray-950" %>"><%= event.date.strftime("%-d %b") %></div>
             <% end %>
+            <% if event.abandoned? && event.cancellation_reason.present? %>
+              <p class="mt-2 text-sm text-red-600"><%= event.cancellation_reason %></p>
+            <% end %>
             <div class="mt-8 flex gap-2 flex-wrap">
               <% if index == 0 && !event.active? %>
                 <%= link_to "Course Info", course_path(event.location), class: "inline-flex items-center justify-center px-4 py-[calc(theme(spacing.2)-1px)] rounded-full border border-transparent bg-primary shadow-md whitespace-nowrap text-base font-medium text-white hover:bg-primary-hover" %>