effective_events 3.0.9 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eb941a4d2f674462d040e0b05bf52347917044b3fd770e97401f7fbde823db5
-  data.tar.gz: 6824262cb6e8dca0fcddfb19615da17a2ac15b394d5bfaf74dd466d3c4615b15
+  metadata.gz: 5d7fc9c9bc862742ce23d16f1da5346ec09dfc20898bc773d4062300e2908b9b
+  data.tar.gz: e1ffc22eaf468204bb6d1a1311b9be7b7630b05b83a63ac4a36467bb406bde34
 SHA512:
-  metadata.gz: 68af9844bec221bbadb86095975c930cd408108294c4491c38ed9943da0f867ddfa4c60ad62f02a158251647322ff22cc817c6064454bf14c612b3ec84b3274d
-  data.tar.gz: 15d8a426770fe83299ffb414ca6a39bf69a50bff002dc04373afad3744e38ebac8c3841e97051b3bf10126b09137b762cc967ac46c5457781fdb635e2d4ffc8b
+  metadata.gz: 2908eab393778019edb4a84ca383b5c829811a031349a5bc9b48e6d791a5136492d8d09b652adb33a1aa2dc2aa11b34f802191b6cd70e3db34707e7caf039e78
+  data.tar.gz: 80b4a3ad3aab17de75edc472c735f67982e4d9ea74028156b7f7d9d69de0ddc98a49ce83dd770f6c39259257f5a4a0dbfc0596197afc764beffa90b22fe15edc

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -80,6 +80,10 @@ module Admin
       col :question2, visible: false
       col :question3, visible: false
 
+      col :question1_required, visible: false
+      col :question2_required, visible: false
+      col :question3_required, visible: false
+
       actions_col
     end
 

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/app/models/effective/event_registrant.rb

@@ -135,11 +135,16 @@ module Effective
     validates :last_name, presence: true, if: -> { registrant_validations_enabled? }
     validates :email, presence: true, if: -> { registrant_validations_enabled? }
 
-    # User, company and organization conditionall required
+    # User, company and organization conditionally required
     validates :user, presence: true, if: -> { registrant_validations_enabled? && EffectiveEvents.create_users }
     validates :company, presence: true, if: -> { registrant_validations_enabled? && EffectiveEvents.company_or_organization_required }
     validates :organization, presence: true, if: -> { registrant_validations_enabled? && EffectiveEvents.company_or_organization_required && EffectiveEvents.organization_enabled? }
 
+    # Responses may or may not be required depending on the event ticket
+    validates :response1, presence: true, if: -> { registrant_validations_enabled? && event_ticket&.question1_required? }
+    validates :response2, presence: true, if: -> { registrant_validations_enabled? && event_ticket&.question2_required? }
+    validates :response3, presence: true, if: -> { registrant_validations_enabled? && event_ticket&.question3_required? }
+
     # Copy any user errors from build_user_and_organization() into the registrant
     after_validation(if: -> { user && user.new_record? && user.errors.present? }) do
       errors.add(:first_name, user.errors[:first_name].join(', ')) if user.errors[:first_name].present?

data/app/models/effective/event_ticket.rb

@@ -35,6 +35,10 @@ module Effective
       question2                   :text
       question3                   :text
 
+      question1_required          :boolean
+      question2_required          :boolean
+      question3_required          :boolean
+
       # Pricing
       early_bird_price            :integer
 
@@ -164,5 +168,17 @@ module Effective
       category == 'Members'
     end
 
+    def question1_required?
+      question1.present? && question1_required
+    end
+
+    def question2_required?
+      question2.present? && question2_required
+    end
+
+    def question3_required?
+      question3.present? && question3_required
+    end
+
   end
 end

data/app/views/admin/event_tickets/_form.html.haml

@@ -49,7 +49,12 @@
       %small.text-muted Please add up to 3 questions to ask during registration. Each ticket will have their own unique answers. Leave a question blank to skip.
 
     = f.text_field :question1, label: 'Question 1'
+    = f.check_box :question1_required, label: 'Question 1 Required'
+
     = f.text_field :question2, label: 'Question 2'
+    = f.check_box :question2_required, label: 'Question 2 Required'
+
     = f.text_field :question3, label: 'Question 3'
+    = f.check_box :question3_required, label: 'Question 3 Required'
 
   = effective_submit(f)

data/app/views/effective/event_registrants/_fields.html.haml

@@ -41,11 +41,11 @@
 
   - if event_ticket.present?
     - if event_ticket.question1.present?
-      = f.text_field :response1, label: event_ticket.question1
+      = f.text_field :response1, label: event_ticket.question1, required: event_ticket.question1_required?
 
     - if event_ticket.question2.present?
-      = f.text_field :response2, label: event_ticket.question2
+      = f.text_field :response2, label: event_ticket.question2, required: event_ticket.question2_required?
 
     - if event_ticket.question3.present?
-      = f.text_field :response3, label: event_ticket.question3
+      = f.text_field :response3, label: event_ticket.question3, required: event_ticket.question3_required?
 

data/db/migrate/101_create_effective_events.rb

@@ -58,6 +58,10 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.text :question2
       t.text :question3
 
+      t.boolean :question1_required, default: false
+      t.boolean :question2_required, default: false
+      t.boolean :question3_required, default: false
+
       t.string :qb_item_name
       t.boolean :tax_exempt, default: false
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '3.0.9'.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.0.9
+  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