effective_events 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e37bb52cbe39fa76dbb40c45b4364abbab706a4a872125e11de75a1432c7b62
-  data.tar.gz: 484e50eafc049ea811ba446638a600ca8d49e17004da1e7a88d4635afe73f30e
+  metadata.gz: 5d7fc9c9bc862742ce23d16f1da5346ec09dfc20898bc773d4062300e2908b9b
+  data.tar.gz: e1ffc22eaf468204bb6d1a1311b9be7b7630b05b83a63ac4a36467bb406bde34
 SHA512:
-  metadata.gz: 84b97ecbbad1998e51a2ccbe93a2d5bd015e9a6dfa9f5e267db7a9f2aaf8a1668aaa1822c4ba6482f8cc539ae76846a4b2a0128e7654d0923040b662bc1590a6
-  data.tar.gz: f8ca6e7b250819032b81a8b8459cf7179e9ff0b8ba782902755fae7d3f1c1a9c247edb0bc12b4ea0f45d883828b8b82bc05cc4fb0160a27271966f1fe179480d
+  metadata.gz: 2908eab393778019edb4a84ca383b5c829811a031349a5bc9b48e6d791a5136492d8d09b652adb33a1aa2dc2aa11b34f802191b6cd70e3db34707e7caf039e78
+  data.tar.gz: 80b4a3ad3aab17de75edc472c735f67982e4d9ea74028156b7f7d9d69de0ddc98a49ce83dd770f6c39259257f5a4a0dbfc0596197afc764beffa90b22fe15edc

data/app/datatables/admin/effective_events_datatable.rb

@@ -30,12 +30,19 @@ module Admin
       col :published_start_at, label: "Published start", as: :datetime, visible: false
       col :published_end_at, label: "Published end", as: :datetime, visible: false
 
-      # TODO
-      # col :total_capacity, label: 'Capacity' do |event|
-      #   if event.event_tickets_with_capacity.present?
-      #     "#{event.total_capacity_taken}/#{event.total_capacity}"
-      #   end
-      # end
+      col :total_registered do |event|
+        registered = if event.event_tickets_with_capacity.present?
+          "#{event.total_registered_non_waitlisted_count}/#{event.total_capacity}"
+        elsif event.event_tickets.present?
+          "#{event.total_registered}"
+        end
+
+        waitlisted = if event.event_tickets_with_waitlist.present?
+          "#{event.total_registered_waitlisted_count} waitlisted"
+        end
+
+        [registered, waitlisted].compact.join(" +")
+      end
 
       col :excerpt, visible: false
 

data/app/models/effective/event.rb

@@ -283,22 +283,33 @@ module Effective
       start_at
     end
 
+    # For Events#index column
     def event_tickets_with_capacity
-      event_tickets.reject(&:archived?).select { |et| et.capacity.present? }
+      event_tickets.select { |et| et.capacity.present? }
     end
 
-    def total_capacity_available
-      event_tickets_with_capacity.sum { |et| et.capacity_available }
+    def event_tickets_with_waitlist
+      event_tickets_with_capacity.select { |et| et.waitlist? }
     end
 
-    def total_capacity_taken
-      event_tickets_with_capacity.sum { |et| et.capacity_taken }
+    # Total Registered and not waitlisted count
+    def total_registered_non_waitlisted_count
+      event_tickets_with_capacity.sum { |et| et.registered_non_waitlisted_count }
+    end
+
+    # Total Registered and waitlisted count
+    def total_registered_waitlisted_count
+      event_tickets_with_capacity.sum { |et| et.registered_waitlisted_count }
     end
 
     def total_capacity
       event_tickets_with_capacity.sum { |et| et.capacity }
     end
 
+    def total_registered
+      event_tickets.sum { |et| et.registered_count }
+    end
+
     # The amount of tickets that can be purchased except ones from an event registration
     def capacity_selectable(event_ticket:, event_registration: nil)
       return 0 if event_ticket.archived?

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '3.1.0'.freeze
+  VERSION = '3.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-07 00:00:00.000000000 Z
+date: 2025-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails