WIP for attendees

Still working on issue with the full calendar.
I have the event_name now being set when adding registrants.

diff --git a/js/frontRegApp.js b/js/frontRegApp.js
index 8ff12ce..8d2da7b 100644 (file)
--- a/js/frontRegApp.js
+++ b/js/frontRegApp.js
@@ -801,6 +801,7 @@ app.Views.Front.RegClass = Backbone.View.extend({
                 reg_time: rTime,
                 reg_event: this.model.get( 'reg_event' ),
                 reg_class: this.model.get( 'id' ),
+                event_name: regEvent.get( 'event_name' ),
                 reg_rate: this.model.get( 'reg_rate_id' ),
                 email: email,
                 fname: fname,
@@ -815,11 +816,13 @@ app.Views.Front.RegClass = Backbone.View.extend({
         }
         this.newRegAccount.destroy();
         this.newRegAccountView.remove();
+        app.calendar = false;
     },
 
     cancelAddNew: function(){
         this.newRegAccount.destroy();
         this.newRegAccountView.remove();
+        app.calendar = false;
     },
 
     addNewAccount: function(){
@@ -829,7 +832,7 @@ app.Views.Front.RegClass = Backbone.View.extend({
         this.newRegAccountView = new app.Views.Front.RegistrantForm({model: this.newRegAccount});
         this.$el.append( this.newRegAccountView.render().el );
         if ( app.timeSpecific ) {
-            app.initFullCalendar( true );
+            app.calendar = app.initFullCalendar( true, false );
             console.log('called app.initFullCalendar()');
         }
     },
@@ -876,6 +879,7 @@ app.Views.Front.RegClass = Backbone.View.extend({
                     reg_request: regRequest.id,
                     reg_event: this.model.get( 'reg_event' ),
                     reg_class: this.model.get( 'id' ),
+                    event_name: regEvent.get( 'event_name' ),
                     reg_rate: this.model.get('reg_rate_id'),
                     email: account.email,
                 });
@@ -1002,7 +1006,7 @@ app.Views.Front.RegRequestRegistrant = Backbone.View.extend({
         this.$('.reg-edit-form').show();
         if ( app.timeSpecific === true ) {
             this.$('#reg-select-time').val( this.model.get( 'reg_time' ) );
-            app.initFullCalendar( false );
+            app.initFullCalendar( false, this.model.get( 'id' ) );
             console.log( this.model.get( 'reg_time' ) );
         }
     },

diff --git a/js/views/front/regClass.js b/js/views/front/regClass.js
index 4b39580..9fab5f5 100644 (file)
--- a/js/views/front/regClass.js
+++ b/js/views/front/regClass.js
@@ -111,6 +111,7 @@ app.Views.Front.RegClass = Backbone.View.extend({
                 reg_time: rTime,
                 reg_event: this.model.get( 'reg_event' ),
                 reg_class: this.model.get( 'id' ),
+                event_name: regEvent.get( 'event_name' ),
                 reg_rate: this.model.get( 'reg_rate_id' ),
                 email: email,
                 fname: fname,
@@ -125,11 +126,13 @@ app.Views.Front.RegClass = Backbone.View.extend({
         }
         this.newRegAccount.destroy();
         this.newRegAccountView.remove();
+        app.calendar = false;
     },
 
     cancelAddNew: function(){
         this.newRegAccount.destroy();
         this.newRegAccountView.remove();
+        app.calendar = false;
     },
 
     addNewAccount: function(){
@@ -139,7 +142,7 @@ app.Views.Front.RegClass = Backbone.View.extend({
         this.newRegAccountView = new app.Views.Front.RegistrantForm({model: this.newRegAccount});
         this.$el.append( this.newRegAccountView.render().el );
         if ( app.timeSpecific ) {
-            app.initFullCalendar( true );
+            app.calendar = app.initFullCalendar( true, false );
             console.log('called app.initFullCalendar()');
         }
     },
@@ -186,6 +189,7 @@ app.Views.Front.RegClass = Backbone.View.extend({
                     reg_request: regRequest.id,
                     reg_event: this.model.get( 'reg_event' ),
                     reg_class: this.model.get( 'id' ),
+                    event_name: regEvent.get( 'event_name' ),
                     reg_rate: this.model.get('reg_rate_id'),
                     email: account.email,
                 });

diff --git a/js/views/front/regRequestRegistrant.js b/js/views/front/regRequestRegistrant.js
index 9f62500..2b8596e 100644 (file)
--- a/js/views/front/regRequestRegistrant.js
+++ b/js/views/front/regRequestRegistrant.js
@@ -69,7 +69,7 @@ app.Views.Front.RegRequestRegistrant = Backbone.View.extend({
         this.$('.reg-edit-form').show();
         if ( app.timeSpecific === true ) {
             this.$('#reg-select-time').val( this.model.get( 'reg_time' ) );
-            app.initFullCalendar( false );
+            app.initFullCalendar( false, this.model.get( 'id' ) );
             console.log( this.model.get( 'reg_time' ) );
         }
     },

diff --git a/views/front/registrations/registration.html b/views/front/registrations/registration.html
index 2ec44d0..cab13d0 100644 (file)
--- a/views/front/registrations/registration.html
+++ b/views/front/registrations/registration.html
@@ -203,8 +203,8 @@
             </div>
             {/literal}{if $regEvent.time_specific.value}
                 <div>
-                    Selected Time: <span id="reg-select-time-display">{literal}<%= reg_time_text %>{/literal}</span>
-                    <input type="hidden" id="reg-select-time">
+                    Selected Time: <span id="reg-time-display-{literal}<%= id %>{/literal}">{literal}<%= reg_time_text %>{/literal}</span>
+                    <input type="hidden" id="reg-time-{literal}<%= id %>{/literal}">
                 </div>
             {/if}{literal}
             <div>
@@ -240,10 +240,9 @@ var app = {
         return regex.test(email);
     },
     {if $regEvent.time_specific.value}
-    initFullCalendar: function( isNew ){
-        console.log( isNew );
+    initFullCalendar: function( isNew, idVal ){
         if ({$regEvent.time_specific.value}) {
-            $('#eventCalendar').fullCalendar({
+            var calendar = $('#eventCalendar').fullCalendar({
                 {if $regEvent}
                     events: [
                         {$sep = ''}
@@ -268,22 +267,24 @@ var app = {
                     eventClick: function(calEvent, jsEvent, view) {
                         $('.fc-event').css('background-color', '#3a67ad');
                         if ( isNew ) {
-                            jQuery('#add_reg-select-time').val( calEvent.reg_time );
-                            jQuery('#add_reg-select-time-display').html( calEvent.start.format('L LT') );
+                            jQuery( '#add_reg-select-time' ).val( calEvent.reg_time );
+                            jQuery( '#add_reg-select-time-display' ).html( calEvent.start.format('L LT') );
                         } else {
-                            jQuery('#reg-select-time').val( calEvent.reg_time );
-                            jQuery('#reg-select-time-display').html( calEvent.start.format('L LT') );
+                            jQuery( '#reg-time-' + idVal ).val( calEvent.reg_time );
+                            jQuery( '#reg-time-display-' + idVal ).html( calEvent.start.format('L LT') );
                         }
                         $(this).css('background-color', 'red');
                     }
                 {/if}
             });
         }
+        return calendar;
     },
     timeSpecific: true,
     {else}
     timeSpecific: false,
     {/if}
+    calendar: false,
 };
 var regEvent = '';
 var cart = '';