effective_events 0.17.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6adf869c67bd082b19c66a82b5e3ac530a80b97c19e0047f13bdca69f7f1a98e
-  data.tar.gz: a1d8cd3df41996b18c2afcf4f2370a69e9d2b353e3bf3ca356808f3802ade723
+  metadata.gz: e59fad0b6c38bbbdd06763e8f6d2d4d19cc025b82434db4a27b3c6fd0f88b75e
+  data.tar.gz: 02151c1c1ad10e49b6c38b8e9e603246732b1c686f19399bf08c9f7110e0190e
 SHA512:
-  metadata.gz: b5cb43f659f86669874ea2edca7aa0159aad83c25a85065d2c69ee10d4aaf8392ea8aa1ebc3a171ab95b40f93e8ec3dd2e59aeb9161c8957a94aab60d5247e26
-  data.tar.gz: aba17ab942159ea4b5b0cf9c62511f876dbd54b56a864ce584115c07ce2bcd01c02310ceebadafb3548a983b9eeebddd1ccd55dfccde669c231152a35c67c9a8
+  metadata.gz: b07d432950696e4e44280f8af2341ee965b515893774c1f29b6d5ce2efc41afc68b573603486adb7033f2a4bfbfc96e93a28098afd0cb6008a663881aa1e220e
+  data.tar.gz: e0c6e234e64f873e8083345dba273e3a5bbff7667f03dd3b403bca56dd4bc108522a0e35f23ac2201e068fc5f319332f3878ab7636e018c270e9c91dfac4b044

data/app/controllers/effective/events_controller.rb

@@ -8,7 +8,12 @@ module Effective
     }
 
     def index
-      @page_title ||= 'Events'
+      if event_category.present?
+        @page_title = event_category
+        @event_category = event_category
+      else
+        @page_title ||= view_context.events_name_label
+      end
       EffectiveResources.authorize!(self, :index, Effective::Event)
 
       # Sometimes we just display a Datatable for the events
@@ -34,9 +39,8 @@ module Effective
       if EffectiveResources.authorized?(self, :admin, :effective_events)
         flash.now[:warning] = [
           'Hi Admin!',
-          ('You are viewing a hidden event.' if @event.draft?),
-          'Click here to',
-          ("<a href='#{effective_events.edit_admin_event_path(@event)}' class='alert-link'>edit event settings</a>.")
+          ('You are viewing a hidden event. ' if @event.draft?),
+          ("<a href='#{effective_events.edit_admin_event_path(@event)}' class='alert-link'>Edit this event</a>.")
         ].compact.join(' ')
       end
 

data/app/datatables/admin/effective_events_datatable.rb

@@ -22,8 +22,8 @@ module Admin
 
       col :draft?, as: :boolean, visible: false
       col :published?, as: :boolean
-      col :published_start_at
-      col :published_end_at
+      col :published_start_at, as: "Published start"
+      col :published_end_at, as: "Published end"
 
       col :start_at, label: 'Start', visible: false
       col :end_at, label: 'End', visible: false
@@ -47,8 +47,7 @@ module Admin
       # col :event_registrants, search: :string
       # col :event_addons, search: :string
 
-      col :allow_blank_registrants
-
+      col :allow_blank_registrants, visible: false
       col :roles, visible: false
       col :authenticate_user, visible: false
 

data/app/datatables/effective_event_registrants_datatable.rb

@@ -6,7 +6,8 @@ class EffectiveEventRegistrantsDatatable < Effective::Datatable
 
     col :name do |er|
       if er.first_name.present?
-        "#{er.first_name} #{er.last_name}<br><small>#{mail_to(er.email)}</small>"
+        email = (er.user.present? ? masked_email(er.user) : er.email)
+        "#{er.first_name} #{er.last_name}<br><small>#{email}</small>"
       elsif er.owner.present?
         er.owner.to_s + ' - GUEST'
       else

data/app/helpers/effective_events_helper.rb

@@ -1,9 +1,25 @@
 module EffectiveEventsHelper
+
+  # Events
+  def events_name_label
+    et('effective_events.name')
+  end
+
+  # Event
+  def event_label
+    et(Effective::Event)
+  end
+
+  # Events
+  def events_label
+    ets(Effective::Event)
+  end
+
   def effective_events_event_schedule(event)
     if event.start_at.beginning_of_day == event.end_at.beginning_of_day
-      "#{event.start_at.strftime("%b %d, %Y %I:%M%P")} - #{event.end_at.strftime("%I:%M%P")}"
+      "#{event.start_at.strftime("%A, %B %d, %Y · %l:%M%P")} - #{event.end_at.strftime("%l:%M%P")}"
     else
-      "#{event.start_at.strftime("%b %d, %Y")} - #{event.end_at.strftime("%b %d, %Y")}"
+      "#{event.start_at.strftime("%A, %B %d, %Y")} - #{event.end_at.strftime("%A, %B %d, %Y")}"
     end
   end
 

data/app/models/effective/event.rb

@@ -175,7 +175,7 @@ module Effective
     end
 
     def to_s
-      title.presence || 'New Event'
+      title.presence || model_name.human
     end
 
     def body

data/app/models/effective/event_search.rb

@@ -68,7 +68,7 @@ module Effective
       # Apply Sorting
       events = case order.to_s
       when 'Sort by Published Date'
-        events.reorder(published_at: :asc)
+        events.reorder(published_start_at: :asc)
       when 'Sort by Event Date'
         events.reorder(start_at: :asc)
       else

data/app/models/effective/event_ticket.rb

@@ -24,6 +24,7 @@ module Effective
       title                       :string
 
       capacity                    :integer
+      display_capacity            :boolean
       waitlist                    :boolean 
 
       category                    :string

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

@@ -24,12 +24,13 @@
             Anyone will be able to purchase this ticket. They can select a member from the dropdown list of all members to receive the member pricing or they can enter a first name and last name to receive the regular pricing.
 
       .col
-        = f.number_field :capacity, hint: "The number of registrations will be limited to capacity.<br>Leave blank for unlimited capacity."
+        = f.number_field :capacity, hint: "The number of registrations will be limited to capacity. Leave blank for unlimited capacity."
+        = f.check_box :display_capacity, label: "Yes, display the remaining ticket capacity to users during registration", hint: "Leave blank to hide the capacity."
 
         - if f.object.event&.delayed?
           = f.check_box :waitlist, 
             label: "Yes, add to waitlist once capacity is reached",
-            hint: "requires a delayed payment event. Once capacity is reached, new registrations will be added to the waitlist. Payment information is collected but not charged for waitlisted registrants."
+            hint: "requires a delayed payment event. Once capacity is reached, new registrations will be added to the waitlist. Payment information is collected but not charged for waitlisted registrants. To waitlist everyone and promote later, set the capacity to zero."
     .row
       .col-md-6
         - if f.object.event&.early_bird_end_at.present?

data/app/views/admin/events/_form_content.html.haml

@@ -1,5 +1,5 @@
 = effective_form_with(model: [:admin, event], engine: true) do |f|
-  = f.file_field :file, label: 'Image attachment', hint: EffectiveEvents.events_hint_text
+  = f.file_field :file, label: 'Image preview', hint: EffectiveEvents.events_hint_text
 
   - if defined?(EffectiveArticleEditor)
     = f.article_editor :rich_text_excerpt, label: 'Excerpt', hint: 'Will be used for the events excerpt on index pages.'

data/app/views/admin/events/_form_event.html.haml

@@ -5,9 +5,9 @@
   = f.hide_if(:save_as_draft, true) do
     .row
       .col-md-6
-        = f.datetime_field :published_start_at, hint: 'The event will be available starting on this date and time. Leave blank to use the current date and time.'
+        = f.datetime_field :published_start_at, hint: 'The event will be available starting on this date and time. Leave blank to publish immediately.'
       .col-md-6
-        = f.datetime_field :published_end_at, hint: 'The event will no longer be available after this date and time. Leave blank for no end date.', date_linked: false
+        = f.datetime_field :published_end_at, label: 'Published start', hint: 'The event will not appear on the website after this date and time. Leave blank for no end date.', date_linked: false
 
   = f.check_box :save_as_draft, label: "Save as a draft. It will not appear on the website and can only be accessed by admin users."
 
@@ -19,14 +19,14 @@
     .col
       - categories = EffectiveEvents.categories
       - if categories.present?
-        = f.select :category, categories, hint: 'optional category'
+        = f.select :category, categories
     .col
       - if event.class.respond_to?(:acts_as_tagged?)
         = render 'effective/tags/fields', f: f
 
   .row
-    .col-md-6= f.datetime_field :start_at, label: "Event Start"
-    .col-md-6= f.datetime_field :end_at, label: "Event End"
+    .col-md-6= f.datetime_field :start_at, label: "Event start"
+    .col-md-6= f.datetime_field :end_at, label: "Event end"
 
   %hr
 
@@ -34,10 +34,10 @@
     .col-md-6
       %h2 Registration
       %p The online registration and purchase for this event will be available between:
-      = f.datetime_field :registration_start_at, label: "Registration Start"
-      = f.datetime_field :registration_end_at, label: "Registration End"
-      = f.datetime_field :early_bird_end_at, label: "Early Bird End",
-        hint: 'Event tickets can be purchased for early bird pricing before this date. Afterwards regular pricing applies.'
+      = f.datetime_field :registration_start_at, label: "Registration start"
+      = f.datetime_field :registration_end_at, label: "Registration end"
+      = f.datetime_field :early_bird_end_at, label: "Early bird end",
+        hint: 'Event tickets are purchased at early bird pricing before this date. After this date, regular pricing applies.'
 
       = f.check_box :allow_blank_registrants, label: "Yes, allow blank ticket registrations", hint: "Allow event tickets to be purchased without adding a name. The purchaser may return to add names later."
 

data/app/views/effective/event_registrations/_event_tickets.html.haml

@@ -7,7 +7,7 @@
 
     %p This event has the following tickets available for purchase:
 
-    %table.table
+    %table.table.table-sm.table-striped
       %thead
         %tr
           %th Ticket
@@ -20,7 +20,7 @@
           %tr
             %td
               = ticket.to_s
-              - if ticket.capacity.present?
+              - if ticket.capacity.present? && ticket.display_capacity?
                 %br
                 %small
                   #{ticket.capacity_available} remaining

data/app/views/effective/event_registrations/_layout.html.haml

@@ -1,3 +1,3 @@
 .row
   .col-lg-3.mb-3= render_wizard_sidebar(resource)
-  .col-lg-9= yield
+  .col-lg-9.mb-3= yield

data/app/views/effective/event_registrations/tickets.html.haml

@@ -16,4 +16,5 @@
       .alert.alert-info If the price of your registration changes, your order will be automatically updated.
 
     %hr
-    = f.save 'Save and Continue'
+    .mb-4
+      = f.save 'Save and Continue'

data/app/views/effective/events/_event.html.haml

@@ -1,9 +1,13 @@
-.card.mb-4{class: "effective-events-#{event.category.to_s.parameterize}"}
-  .card-body
-    - if event.category.present?
-      = link_to(event.category, effective_events.events_path + '/' + event.category.parameterize, class: "badge badge-event mb-2 effective-events-#{event.category.parameterize}")
+.row.mb-5.effective-events{class: "effective-events-#{event.category.to_s.parameterize}"}
+  - if event.file.present?
+    .col-lg-4
+      = link_to effective_events.event_path(event) do
+        = image_tag url_for(event.file), class: "effective-events-image d-none d-lg-flex align-self-start", alt: event.title, width: "350", height: "220"
 
-    %h2.mt-1= link_to event.title, effective_events.event_path(event)
-    .effective-events-schedule= effective_events_event_schedule(event)
+  .col
+    - if event.category.present? && EffectiveEvents.categories.length > 1
+      = link_to(event.category, effective_events.events_path + '/' + event.category.parameterize, class: "badge badge-primary badge-event mb-2 effective-events-#{event.category.parameterize}")
+
+    %h2.effective-events-title= link_to event.title, effective_events.event_path(event)
+    .effective-events-meta= effective_events_event_schedule(event)
     .effective-events-excerpt= event.excerpt.to_s
-    = link_to "View Event",  effective_events.event_path(event), class: 'btn btn-primary'

data/app/views/effective/events/_form.html.haml

@@ -2,10 +2,10 @@
   - if f.object.term.present?
     = f.search_field :term, label: 'Term'
 
-  /= f.radios :category, EffectiveEvents.categories, buttons: true
+  = f.radios :category, EffectiveEvents.categories
 
   - f.object.order ||= Effective::EventSearch::ORDERS.first
-  = f.radios :order, Effective::EventSearch::ORDERS, buttons: true
+  = f.radios :order, Effective::EventSearch::ORDERS
 
-  = f.save('Search', class: 'btn btn-primary btn-search mr-3', name: nil)
+  = f.save('Apply Filters', class: 'btn btn-primary btn-search mr-3', name: nil)
   = link_to 'Reset filters', request.path

data/app/views/effective/events/_layout.html.haml

@@ -1,2 +1,2 @@
-.effective-events
+.effective-events.mb-3
   = yield

data/app/views/effective/events/_sidebar.html.haml

@@ -0,0 +1,6 @@
+.effective-event-sidebar
+  %ul.nav.flex-column{role: 'navigation'}
+    = nav_link_to('All Events', effective_events.events_path, class: "effective-event-all")
+
+    - EffectiveEvents.categories.each do |category|
+      = nav_link_to(category, effective_events.events_path + '/' + category.parameterize, class: "effective-event-#{category.parameterize}")

data/app/views/effective/events/index.html.haml

@@ -1,25 +1,19 @@
 = render 'layout' do
+  .row
+    - if EffectiveEvents.categories.length > 1
+      .d-none.d-lg-block.col-lg-3
+        -#= render('effective/events/form', event_search: @event_search)
+        = render('effective/events/sidebar')
 
-  -# render_datatable(@datatable)
-
-  .mb-4= render('effective/events/categories')
-  .mb-4= render('effective/events/form', event_search: @event_search)
-
-  - results = @event_search.results(page: params[:page])
-
-  - if @event_search.present? && results.length == 0
-    .alert.alert-info.mb-3 There are no results for your search. Please try again.
+    .col
+      %h1.effective-title.mb-4= @page_title
 
-  .row
-    .col-md-3
-      = month_calendar(events: @events) do |date, events|
-        - if events.any? { |event| event.start_at.to_date == date }
-          = date.day
-        - else
-           
-    .col-md-9
-      -# This renders effective/events/event
-      = render(results)
+      - results = @event_search.results(page: params[:page])
+      - if (@event_search.present? && results.length == 0) || @events.blank?
+        .alert.alert-warning.mb-3
+          There are no active #{events_label.downcase} for this category.
+      - else
+        = render(results) # This renders effective/events/event
 
-  %nav.d-flex.justify-content-center
-    = bootstrap_paginate(results, per_page: @event_search.per_page)
+      %nav.d-flex.justify-content-center
+        = bootstrap_paginate(results, per_page: @event_search.per_page)

data/app/views/effective/events/show.html.haml

@@ -1,74 +1,66 @@
 = render 'layout' do
   .effective-event
     .row
+      - if EffectiveEvents.categories.length > 1
+        .col-lg-3
+          = render('effective/events/sidebar')
+
       .col
-        %h1.mb-4= @page_title
+        %h1.effective-event-title.mb-4= @page_title
+
+        - if @event.sold_out?
+          .alert.alert-warning.mb-3 This event is sold out.
+
+        - if @event.closed?
+          .alert.alert-warning.mb-3 This event is no longer available.
 
-    .row
-      .col-md-3
         - if @event.registerable?
           .register.mb-4
             - url = @event.external_registration_url.presence || effective_events.new_event_event_registration_path(@event)
-            = link_to 'Register', url, class: 'btn btn-primary btn-block'
-
-        %ul.list-unstyled
-          -# Not shown
-          -# %li.mb-3
-          -#   %label Published
-          -#   %br
-          -#   = @event.published_at.strftime("%B %e at %l:%M%P")
-          %li.mb-3
-            %label Event Date
-            %br
-            = effective_events_event_schedule(@event)
+            = link_to 'Register', url, class: 'btn btn-lg btn-primary'
 
-          - if @event.registration_start_at.present?
-            %li.mb-3
-              %label Registration Opens
-              %br
-              = @event.registration_start_at.strftime("%b %d, %Y %I:%M%P")
-
-          - if @event.early_bird_end_at.present?
-            %li.mb-3
-              %label Early Bird Rate Ends
-              %br
-              = @event.early_bird_end_at.strftime("%b %d, %Y %I:%M%P")
-
-          - if @event.registration_end_at.present?
-            %li.mb-3
-              %label Registration Closes
-              %br
-              = @event.registration_end_at.strftime("%b %d, %Y %I:%M%P")
-
-        - if @event.event_tickets.present?
-          %ul.list-unstyled
-            - if @event.event_tickets.present?
-              %li
-                %label Tickets
+        .row
+          .col
+            %ul.list-unstyled
+              %li.mb-3
+                %label Date and Time
                 %br
-                %ul
-                  - @event.event_tickets.each do |ticket|
-                    %li= "#{ticket} (#{effective_events_ticket_price(@event, ticket)})"
+                = effective_events_event_schedule(@event)
 
-        %hr
+              - if @event.registration_start_at.present?
+                %li.mb-3
+                  %label Registration Opens
+                  %br
+                  = @event.registration_start_at.strftime("%A, %B %d, %Y · %l:%M%P")
 
-        %label.mb-2 Upcoming Events
-        %ul.list-unstyled
-          %li.mb-3
-            - @upcoming_events.each do |event|
-              %h5= link_to event.title, effective_events.event_path(event), class: 'text-decoration-none'
+              - if @event.early_bird_end_at.present?
+                %li.mb-3
+                  %label Early Bird Rate Ends
+                  %br
+                  = @event.early_bird_end_at.strftime("%A, %B %d, %Y · %l:%M%P")
 
-      .col-md-8
-        - if @event.sold_out?
-          .alert.alert-warning.mb-3 This event is sold out.
+              - if @event.registration_end_at.present?
+                %li.mb-3
+                  %label Registration Closes
+                  %br
+                  = @event.registration_end_at.strftime("%A, %B %d, %Y · %l:%M%P")
 
-        - if @event.closed?
-          .alert.alert-warning.mb-3 This event is no longer available.
+              -# .col-md-auto
+              -#   - if @event.event_tickets.present?
+              -#     %label Tickets
+              -#     %br
+              -#     %ul
+              -#       - @event.event_tickets.each do |ticket|
+              -#         %li= "#{ticket} (#{effective_events_ticket_price(@event, ticket)})"
 
-        - if @event.file.attached?
-          .d-flex.justify-content-center.mb-3
-            = image_tag(@event.file)
+          - if @event.file.present?
+            .col-lg-4
+              = image_tag url_for(@event.file), class: "effective-events-image d-none d-lg-flex align-self-start", alt: @event.title, width: "350", height: "220"
+
+        .py-3
 
         - if @event.body.present?
-          .content.my-5
+          .effective-event-body.mb-5
             = @event.body.to_s
+
+        = link_to("← #{events_name_label}".html_safe, effective_events.events_path, class: "btn btn-secondary my-4")

data/config/effective_events.rb

@@ -16,7 +16,7 @@ EffectiveEvents.setup do |config|
   config.categories = ['Events']
 
   # Hint text for event images attachments
-  config.events_hint_text = 'Hint text that includes required image dimensions'
+  config.events_hint_text = 'Optional. Shown on the events index and event pages. Dimensions are 220px tall and 350px wide.'
 
   # Validations for Event Registrants
   # config.event_registrant_required_fields = [:first_name, :last_name, :email, :company]

data/config/locales/effective_events.en.yml

@@ -1,12 +1,11 @@
 en:
   effective_events:
-    name: 'Effective Events'
-    acronym: 'Events'
+    name: 'Events'
 
   activerecord:
     models:
       effective/event: 'Event'
-      effective/event_registrant: 'Event Registrant'
+      effective/event_registrant: 'Event registrant'
 
     attributes:
       effective/event_registrant:

data/db/migrate/101_create_effective_events.rb

@@ -42,6 +42,8 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
 
       t.string :title
       t.integer :capacity
+      t.boolean :display_capacity, default: false
+
       t.boolean :waitlist, default: false
       t.string :category
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.17.0'.freeze
+  VERSION = '0.18.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -289,11 +289,11 @@ files:
 - app/views/effective/event_registrations/submitted.html.haml
 - app/views/effective/event_registrations/summary.html.haml
 - app/views/effective/event_registrations/tickets.html.haml
-- app/views/effective/events/_categories.html.haml
 - app/views/effective/events/_dashboard.html.haml
 - app/views/effective/events/_event.html.haml
 - app/views/effective/events/_form.html.haml
 - app/views/effective/events/_layout.html.haml
+- app/views/effective/events/_sidebar.html.haml
 - app/views/effective/events/index.html.haml
 - app/views/effective/events/show.html.haml
 - app/views/effective/events_mailer/event_registrant_purchased.liquid

data/app/views/effective/events/_categories.html.haml

@@ -1,6 +0,0 @@
-.effective-event-categories
-  %ul.nav.nav-pills{role: 'navigation'}
-    = nav_link_to('All Events', effective_events.events_path, class: "nav-pill-effective-event effective-event-all")
-
-    - EffectiveEvents.categories.each do |category|
-      = nav_link_to(category, effective_events.events_path + '/' + category.parameterize, class: "nav-pill-effective-event effective-event-#{category.parameterize}")