effective_events 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd744d00aed47ee8fe88bbfa4f9224f6dea924726a9d7f42be397e88315e5a0f
-  data.tar.gz: b24c00d8bc3a54e3ccad2f43db728ede8a53b5aaff618646386c3ad179c827ed
+  metadata.gz: 045e735e84e46c1926e1c1a1198a5e4639fe558c358a3a3af71dc7aee3c7be46
+  data.tar.gz: 910822a14b101f247b38a484fa73d51438e202abf74f376579f13b05ae7c3045
 SHA512:
-  metadata.gz: bee221260b8e2aad273c9b79250707bf4c053dc64a937c3eff477eb345e8bc3a10afb4b9504d45f2d2be778a842a62ffc7dc4a9ac76138915575eff8c295524c
-  data.tar.gz: 305c28be0450a00d070e15d32d0af3dc2de4c72bdbad1e345948c00851ccb882566b84b9a256d9c62786573902cced56a63a658204fd671614d4e59ebc3a58f2
+  metadata.gz: cea01d16ec0eac9e8352dae0fb5688b9a58ad5ca7ae8985a9ada5d9615be553e1e0f0a1e56d51d18e0e8bda63a728a66c77571e0db2ca04912ea4d1c9e57798f
+  data.tar.gz: 7293abfe2379e15a2899144910205f4c49debd72eed838bbe2144009e1f66af4a6215b87e48d1eac5aa84697071582ad7932654e057e1de3478bcbf533546d1b

data/README.md

@@ -1,6 +1,6 @@
 # Effective Events
 
-Events, event registrants, event tickets and event products.
+Events, event registrants, event tickets, and event products.
 
 ## Getting Started
 

data/app/controllers/effective/events_controller.rb

@@ -7,21 +7,6 @@ module Effective
       Effective::Event.events(user: current_user, unpublished: unpublished)
     }
 
-    def index
-      @events ||= resource_scope.published
-
-      @events = @events.paginate(page: params[:page])
-
-      # if params[:search].present?
-      #   search = params[:search].permit(EffectiveEvents.permitted_params).delete_if { |k, v| v.blank? }
-      #   @events = @events.where(search) if search.present?
-      # end
-
-      EffectiveResources.authorize!(self, :index, Effective::Event)
-
-      @page_title ||= ['Events', (" - Page #{params[:page]}" if params[:page])].compact.join
-    end
-
     def show
       @event = resource_scope.find(params[:id])
 

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -16,7 +16,7 @@ module Admin
         col :event_ticket, search: :string
       end
 
-      col :purchased_order
+      col :purchased_order, visible: false
 
       col :first_name
       col :last_name

data/app/datatables/admin/effective_event_registrations_datatable.rb

@@ -12,8 +12,8 @@ class Admin::EffectiveEventRegistrationsDatatable < Effective::Datatable
     col :event, search: :string
     col :owner
 
-    col :event_registrants, search: :string
-    col :event_addons, search: :string
+    col :event_registrants, search: :string, visible: false
+    col :event_addons, search: :string, visible: false
     col :orders, label: 'Order'
 
     actions_col

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -25,12 +25,6 @@ module Admin
       col :capacity, visible: false
       col :capacity_available, visible: false
 
-      col :purchased_event_registrants, label: 'Registrants' do |ticket|
-        ticket.purchased_event_registrants.sort_by(&:last_name).map do |registrant|
-          content_tag(:div, registrant.last_first_name, class: 'col-resource_item')
-        end.join.html_safe
-      end
-
       actions_col
     end
 

data/app/datatables/admin/effective_events_datatable.rb

@@ -13,19 +13,21 @@ module Admin
       col :created_at, visible: false
       col :id, visible: false
 
-      col :title
-      col :slug, visible: false
+      col :title do |event|
+        link_to event.title, effective_events.edit_admin_event_path(event)
+      end
 
+      col :slug, visible: false
       col :draft
-      col :start_at, label: 'Event Start Date'
-      col :end_at, label: 'Event End Date', visible: false
+      col :start_at, label: 'Start', visible: false
+      col :end_at, label: 'End', visible: false
       col :excerpt, visible: false
 
       col :registration_start_at, label: 'Registration opens', visible: false
       col :registration_end_at, label: 'Registration closes', visible: false
       col :early_bird_end_at, label: 'Early bird ends', visible: false
 
-      col :early_bird do |event|
+      col :early_bird, visible: false do |event|
         if event.early_bird?
           content_tag(:span, event.early_bird_status, class: 'badge badge-success')
         else
@@ -33,10 +35,11 @@ module Admin
         end
       end
 
-      col :event_tickets, search: :string
-      col :event_products, search: :string
-      col :event_registrants, search: :string
-      col :event_addons, search: :string
+      # These show too much information to be useful to admins, rely on the edit screen
+      # col :event_tickets, search: :string
+      # col :event_products, search: :string
+      # col :event_registrants, search: :string
+      # col :event_addons, search: :string
 
       col :roles, visible: false
       col :authenticate_user, visible: false

data/app/datatables/effective_event_registrants_datatable.rb

@@ -1,4 +1,4 @@
-# Used on the Event Registrations registrants step
+# Used on the Event Registrations tickets step
 
 class EffectiveEventRegistrantsDatatable < Effective::Datatable
   datatable do

data/app/datatables/effective_events_datatable.rb

@@ -13,11 +13,7 @@ class EffectiveEventsDatatable < Effective::Datatable
     col :start_at, label: 'Date', as: :date
 
     col :title, label: 'Title' do |event|
-      if event.registerable?
-        link_to(event.to_s, effective_events.new_event_event_registration_path(event))
-      else
-        event.to_s
-      end
+      link_to(event.to_s, effective_events.event_path(event))
     end
 
     col :registration_start_at, visible: false

data/app/models/concerns/effective_events_event_registration.rb

@@ -90,7 +90,7 @@ module EffectiveEventsEventRegistration
     validates :owner, presence: true
     validates :event, presence: true
 
-    # Registrants Step
+    # Tickets Step
     validate(if: -> { current_step == :tickets }) do
       self.errors.add(:event_registrants, "can't be blank") unless present_event_registrants.present?
     end

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

@@ -1,21 +1,41 @@
-.effective-event
-  %table.table.effective-event-table
-    %tbody
-      %tr
-        %td Starts
-        %td= event.start_at
+.card
+  .card-body
+    %table.table.effective-events-table
+      %tbody
+        %tr
+          %th Dates
+          %td
+            Starts: #{event.start_at&.strftime('%F %R')}
+            %br
+            Ends: #{event.end_at&.strftime('%F %R')}
 
-      %tr
-        %td Ends
-        %td= event.end_at
+        %tr
+          %th Registration Closes
+          %td= event.registration_end_at.strftime('%F %R')
 
-      %tr
-        %td Registration Closes
-        %td= event.registration_end_at
+        %tr
+          %th Early Bird
+          %td
+            Status: #{event.early_bird_status}
+            %br
+            Ends: #{event.early_bird_end_at&.strftime('%F %R')}
 
-      %tr
-        %td Early Bird Status
-        %td= event.early_bird_status
+        %tr
+          %th Tickets
+          %td
+            %ul.pl-3
+              - event.event_tickets.each do |ticket|
+                %li= "#{ticket} (#{price_to_currency(ticket.price)})"
 
-  .event-content.event-excerpt
-    = event.excerpt
+        - if event.event_products.present?
+          %tr
+            %th Add-ons
+            %td
+              %ul.pl-0
+                - event.event_products.each do |product|
+                  %li= "#{product} (#{price_to_currency(product.price)})"
+
+        - if event.body.present?
+          %tr
+            %th Description
+            %td= event.body

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

@@ -1,8 +1,5 @@
-%h1= @page_title
-
-= render 'layout' do
-  .effective-events
-    = render partial: @events, spacer_template: 'spacer'
-
-  %nav.d-flex.justify-content-center
-    = bootstrap_paginate(@events, per_page: EffectiveEvents.per_page)
+= card do
+  - if @datatable
+    = render_datatable(@datatable, simple: true)
+  - else
+    %p There are no events open for registration. When there are, we'll show them here.

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

@@ -1,16 +1,12 @@
-= render 'layout' do
-  .effective-event
-    - if @event.sold_out?
-      .alert.alert-warning This event is sold out.
+.effective-event
+  - if @event.sold_out?
+    .alert.alert-warning This event is sold out.
 
-    - if @event.closed?
-      .alert.alert-warning This event is no longer available.
+  - if @event.closed?
+    .alert.alert-warning This event is no longer available.
 
-    - if @event.registerable?
-      .resource-buttons
-        = link_to 'Register', effective_events.new_event_event_registration_path(@event), class: 'btn btn-primary'
+  - if @event.registerable?
+    .resource-buttons
+      = link_to 'Register', effective_events.new_event_event_registration_path(@event), class: 'btn btn-primary'
 
-    = render 'effective/events/event', event: @event
-
-    .event-body.event-content
-      = @event.body
+  = render 'effective/events/event', event: @event

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Code and Effect
@@ -253,8 +253,6 @@ files:
 - app/views/effective/event_registrations/tickets.haml
 - app/views/effective/events/_dashboard.html.haml
 - app/views/effective/events/_event.html.haml
-- app/views/effective/events/_layout.html.haml
-- app/views/effective/events/_spacer.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/_layout.html.haml

@@ -1 +0,0 @@
-= yield

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

@@ -1 +0,0 @@
-%hr