effective_events 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3286a2f4da1e484f185381cdbf1364c6d966825493a24694c60f7f2da84756b7
-  data.tar.gz: d8fdf171da09d771b7f0068071e526df263134cab9666e663e6828f0df1e91c1
+  metadata.gz: b2a6d166ba053eb00016f2ea09e4f9fe64ebf8e2ddd3778261553891f664b81b
+  data.tar.gz: ebb4c682a522a196dcc9714cacd50cfb9cac974e8f92b3412fca65ea7a470f7c
 SHA512:
-  metadata.gz: f197f262daafb0496e7bf4b07c1bd339eac4ae2b921a6d98d57e1063242f5a901131233dda5626fe907faa39bb033daaacf3231c677b550e549e99c33426a0f3
-  data.tar.gz: 2c09ff365be81a9dfb9f9bab9dd93a9bb66fdcb260ce5a1998d2f61a5e5b21dd3c2db63f83dd37cf8cbb2a8cfecf1f521a6e4fbb76842b037054a3d5a85c3301
+  metadata.gz: c44d5e9c255466984eda2b7470f7690810982d176ca4ef8c6c29225c3703ceb25d6c263e9ebc7792aa710450a54ad0370899a5295182665743e725ebe1d6b2c4
+  data.tar.gz: 726518bd5c9fb10b52d4d1b92d03ff1ca7f08a8c474b0494fbc6c55cf4da9d573dbd43d13905076305415f0208a6ea17a9c0a42e4332fe1a4884e2103d5c9397

data/app/controllers/effective/event_registrations_controller.rb

@@ -6,7 +6,7 @@ module Effective
 
     resource_scope -> {
       event = Effective::Event.find(params[:event_id])
-      EffectiveEvents.EventRegistration.deep.where(owner: current_owner, event: event)
+      EffectiveEvents.EventRegistration.deep.where(owner: current_user, event: event)
     }
 
     # Allow only 1 in-progress event registration at a time
@@ -37,10 +37,6 @@ module Effective
 
     private
 
-    def current_owner
-      (current_user.class.respond_to?(:effective_memberships_owner?) ? current_user.effective_memberships_owners : current_user)
-    end
-
     def permitted_params
       model = (params.key?(:effective_event_registration) ? :effective_event_registration : :event_registration)
 

data/app/datatables/effective_event_registrations_datatable.rb

@@ -10,7 +10,10 @@ class EffectiveEventRegistrationsDatatable < Effective::Datatable
       er.submitted_at&.strftime('%F') || 'Incomplete'
     end
 
-    col :event, search: :string
+    col :event, search: :string do |er|
+      er.event.to_s
+    end
+
     col :owner, visible: false, search: :string
     col :status, visible: false
     col :event_registrants, search: :string
@@ -27,9 +30,7 @@ class EffectiveEventRegistrationsDatatable < Effective::Datatable
   end
 
   collection do
-    owner = (current_user.respond_to?(:effective_memberships_owners) ? current_user.effective_memberships_owners : current_user)
-
-    EffectiveEvents.EventRegistration.deep.where(owner: owner)
+    EffectiveEvents.EventRegistration.deep.where(owner: current_user)
   end
 
 end

data/app/datatables/effective_events_datatable.rb

@@ -10,14 +10,20 @@ class EffectiveEventsDatatable < Effective::Datatable
     order :title
     col :id, visible: false
 
-    col :start_at, label: 'Event Date'
-    col :title, label: 'Event', action: :show
-    col :excerpt, label: 'Details'
+    col :start_at, label: 'Event Date', as: :date
+
+    col :title, label: 'Event' do |event|
+      if event.registerable?
+        link_to(event.to_s, effective_events.new_event_event_registration_path(event))
+      else
+        event.to_s
+      end
+    end
 
     col :registration_start_at, visible: false
-    col :registration_end_at, label: 'Registration ends'
+    col :registration_end_at, label: 'Registration Closes', 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
@@ -28,7 +34,7 @@ class EffectiveEventsDatatable < Effective::Datatable
     col :event_tickets, visible: false, search: :string
     col :early_bird_end_at, label: 'Early bird ends', visible: false
 
-    actions_col do |event|
+    actions_col show: false do |event|
       if event.registerable?
         dropdown_link_to('Register', effective_events.new_event_event_registration_path(event))
       end

data/app/helpers/effective_events_helper.rb

@@ -5,7 +5,7 @@ module EffectiveEventsHelper
 
     event.event_tickets.map do |ticket|
       label = ticket.to_s
-      price = (ticket.price == 0 ? '$0' : number_to_currency(ticket.price))
+      price = (ticket.price == 0 ? '$0' : price_to_currency(ticket.price))
 
       ["#{label} - #{price}", ticket.to_param]
     end

data/app/models/concerns/effective_events_event_registration.rb

@@ -78,10 +78,7 @@ module EffectiveEventsEventRegistration
     scope :in_progress, -> { where.not(status: [:submitted]) }
     scope :done, -> { where(status: [:submitted]) }
 
-    scope :for, -> (user) {
-      owner = (user.respond_to?(:effective_memberships_owners) ? user.effective_memberships_owners : user)
-      where(owner: owner)
-    }
+    scope :for, -> (user) { where(owner: user) }
 
     # All Steps validations
     validates :owner, presence: true
@@ -132,7 +129,11 @@ module EffectiveEventsEventRegistration
   def build_event_registrants
     if event_registrants.blank?
       raise('expected owner and event to be present') unless owner && event
-      event_registrants.build(first_name: owner.first_name, last_name: owner.last_name, email: owner.email)
+      event_registrants.build(
+        first_name: owner.try(:first_name),
+        last_name: owner.try(:last_name),
+        email: owner.try(:email)
+      )
     end
 
     event_registrants

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

@@ -10,7 +10,7 @@
     .row
       .col-lg= f.text_field :first_name
       .col-lg= f.text_field :last_name
-      .col-lg= f.text_field :number
+      .col-lg= f.text_field :number, label: 'Member Number'
 
     .row
       .col-lg= f.email_field :email

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

@@ -26,5 +26,6 @@
 - else
   %p You have no past event registrations. When you do, we'll show them here.
 
-- if registration.blank?
+-# TODO enable an all events page
+- if false # if registration.blank?
   %p= link_to 'View all Events', effective_events.events_path, class: 'btn btn-primary'

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

@@ -11,13 +11,13 @@
 
         - if request.path.start_with?('/admin')
           %tr
-            %th Owner
+            %th Registered by
             %td
               - url = (polymorphic_admin_path(event_registration.owner) rescue "/admin/users/#{event_registration.owner.to_param}/edit")
               = link_to(event_registration.owner, url)
         - else
           %tr
-            %th Owner
+            %th Registered by
             %td= event_registration.owner
 
 

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

@@ -11,4 +11,5 @@
 - datatable = EffectiveEventsDatatable.new(self, namespace: :effective)
 = render_datatable(datatable, simple: true)
 
-%p= link_to 'View All Events', effective_events.events_path, class: 'btn btn-primary'
+-# TODO enable view all events
+-# %p= link_to 'View All Events', effective_events.events_path, class: 'btn btn-primary'

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

@@ -1,6 +1,4 @@
 .effective-event
-  %h2.event-title= link_to event, effective_events.event_path(event)
-
   %table.table.effective-events-table
     %tbody
       %tr
@@ -16,7 +14,7 @@
         %td= event.registration_end_at
 
       %tr
-        %td Early Bird
+        %td Early Bird Status
         %td= event.early_bird_status
 
   .event-content.event-excerpt

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

@@ -1,6 +1,5 @@
 = render 'layout' do
   .effective-event
-
     - if @event.sold_out?
       .alert.alert-warning This event is sold out.
 
@@ -8,7 +7,8 @@
       .alert.alert-warning This event is no longer available.
 
     - if @event.registerable?
-      = link_to 'Register For This Event', effective_events.new_event_event_registration_path(@event), class: 'btn btn-primary'
+      .resource-buttons
+        = link_to 'Register', effective_events.new_event_event_registration_path(@event), class: 'btn btn-primary'
 
     = render 'effective/events/event', event: @event
 

data/db/seeds.rb

@@ -7,10 +7,11 @@ if Rails.env.test?
   ActionText::RichText.where(record_type: ['Effective::Event', 'Effective::Ticket']).delete_all
 end
 
-# Build the first CpdCycle
+# Build an example event
 event = Effective::Event.create!(
   title: "#{now.year} Main Event",
-  body: '<p>This is a great event!</p>',
+  rich_text_excerpt: '<p>This is a great event</p>',
+  rich_text_body: '<p>This is a really great event!</p>',
 
   start_at: (now + 1.week),
   end_at: (now + 1.week + 1.hour),

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.4'.freeze
 end

data/lib/generators/effective_events/install_generator.rb

@@ -1,4 +1,4 @@
-module EffectiveMemberships
+module EffectiveEvents
   module Generators
     class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails