From: Steve Sutton Date: Mon, 30 Oct 2017 20:55:25 +0000 (-0400) Subject: Working on the time selection. X-Git-Tag: v1.0.0^2~309^2~3 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=adea940c27920998cf8b9c4b3a569fc8bcb6b3c8;p=WP-Plugins%2Fglm-member-db-registrations.git Working on the time selection. Lot's of redoing the forms and using the glm grlid more. --- diff --git a/classes/data/dataRegEvent.php b/classes/data/dataRegEvent.php index 88c9d1a..828403d 100644 --- a/classes/data/dataRegEvent.php +++ b/classes/data/dataRegEvent.php @@ -356,21 +356,28 @@ class GlmDataRegistrationsRegEvent extends GlmDataAbstract // echo '
$eventData: ' . print_r( $eventData, true ) . '
'; // Add to the registration event arraytrue - $result_data['intro'] = $eventData['intro']; - $result_data['descr'] = $eventData['descr']; - $result_data['image'] = $eventData['image']; - $result_data['contact_name'] = $eventData['contact_name']; - $result_data['contact_email'] = $eventData['contact_email']; - $result_data['contact_phone'] = $eventData['contact_phone']; - $result_data['url'] = $eventData['url']; + $result_data['intro'] = $eventData['intro']; + $result_data['descr'] = $eventData['descr']; + $result_data['image'] = $eventData['image']; + $result_data['contact_name'] = $eventData['contact_name']; + $result_data['contact_email'] = $eventData['contact_email']; + $result_data['contact_phone'] = $eventData['contact_phone']; + $result_data['url'] = $eventData['url']; + $result_data['hide_address'] = $eventData['hide_address']; + $result_data['use_member_location'] = $eventData['use_member_location']; + + // Check for times data and use that. if ( isset( $eventData['times'] ) && $eventData['times'] ) { - $result_data['times'] = $eventData['times']; + $result_data['times'] = $eventData['times']; } if ( isset( $eventData['starting_date'] ) && $eventData['starting_date'] ) { $result_data['starting_date'] = $eventData['starting_date']; } if ( isset( $eventData['ending_date'] ) && $eventData['ending_date'] ) { - $result_data['ending_date'] = $eventData['ending_date']; + $result_data['ending_date'] = $eventData['ending_date']; + } + if ( isset( $eventData['locations'] ) && $eventData['locations'] ) { + $result_data['locations'] = $eventData['locations']; } } diff --git a/css/front.css b/css/front.css index eb38cc2..2269f03 100644 --- a/css/front.css +++ b/css/front.css @@ -20,6 +20,9 @@ /*}}} end of tampering */ /*{{{ Event Registration List */ +#glm-reg-list h3 a { + text-transform: uppercase; +} .glm-reg-event-list { width: 100%; padding: 0; @@ -28,7 +31,7 @@ border: 1px solid black; padding: 10px; margin: 1.2rem 1rem; - position: relative; + /* position: relative; */ } .glm-reg-event-item h2 { font-size: 1.5rem; @@ -68,7 +71,7 @@ .glm-reg-entryforms { width: 100%; clear: both; - position: relative; + /* position: relative; */ } .glm-reg-level-add-registrant { float: right; @@ -86,13 +89,13 @@ } .glm-reg-compcode-entry { width: 11rem; - position: absolute; + /* position: absolute; */ top: .8rem; right: .5rem; } .glm-reg-submit { padding: 1rem; - position: absolute; + /* position: absolute; */ bottom: .3rem; right: .5rem; } diff --git a/js/frontRegApp.js b/js/frontRegApp.js index 6b23c4f..3a4d853 100644 --- a/js/frontRegApp.js +++ b/js/frontRegApp.js @@ -100,6 +100,7 @@ app.Models.Front.RegClass = Backbone.Model.extend({ reg_rate_per_reg: '', reg_count: 0, loggedIn: false, + selectedTime: 0, }, initialize: function(){ @@ -421,6 +422,11 @@ app.Views.Front.RegClass = Backbone.View.extend({ 'click .glm-add-new-account': 'addNewAccount', 'click .add-new-registrant': 'addNew', 'click .add-new-registrant-cancel': 'cancelAddNew', + 'click .timeSelection': 'updateTimeSelection', + }, + + updateTimeSelection: function(){ + this.model.set({ selectedTime: this.$('.timeSelection:checked').val() }); }, render: function(){ @@ -432,6 +438,9 @@ app.Views.Front.RegClass = Backbone.View.extend({ }); var accountContainer = this.$('.reg-class-accounts'); accountContainer.append(view); + if ( app.timeSpecific ) { + // this.setCalendar(); + } if ( loginAccount === '' ) { this.$('.glm-add-account').hide(); } @@ -441,8 +450,21 @@ app.Views.Front.RegClass = Backbone.View.extend({ return this; }, + getTimeArray: function(){ + var times = this.model.get( 'times' ); + var timeParts = []; + _.each( times, function(time){ + var testDate = new Date( time.start_datetime.datetime ); + timeParts.push( {id: time.id,date: testDate} ); + }); + console.log( timeParts ); + return timeParts; + }, + setCalendar: function(){ + console.log( 'setting calendar' ); var times = this.model.get( 'times' ); + console.log(times); $('#eventCalendar').fullCalendar({ events: function(start, end, timezone, callback) { var events = []; @@ -500,7 +522,7 @@ app.Views.Front.RegClass = Backbone.View.extend({ this.newRegAccountView = new app.Views.Front.RegistrantForm({model: registrant}); this.$el.append( this.newRegAccountView.render().el ); if ( app.timeSpecific ) { - this.setCalendar(); + // this.setCalendar(); } } } @@ -596,7 +618,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 ) { - this.setCalendar(); + // this.setCalendar(); } }, @@ -677,7 +699,7 @@ app.Views.Front.RegEvent = Backbone.View.extend({ tagName: 'div', - className: 'glm-reg-event-item clearfix', + className: 'glm-reg-event-item', template: _.template( jQuery('#regEvent-template').html() ), @@ -691,7 +713,8 @@ app.Views.Front.RegEvent = Backbone.View.extend({ var view = regEvent.classes.map(function(item){ return (new app.Views.Front.RegClass({ model: item })).render().el; }); - this.$el.append(view); + var classContainer = this.$('.glm-reg-classes'); + classContainer.append(view); return this; }, diff --git a/js/models/front/regClass.js b/js/models/front/regClass.js index 2efbc32..fae84e5 100644 --- a/js/models/front/regClass.js +++ b/js/models/front/regClass.js @@ -15,6 +15,7 @@ app.Models.Front.RegClass = Backbone.Model.extend({ reg_rate_per_reg: '', reg_count: 0, loggedIn: false, + selectedTime: 0, }, initialize: function(){ diff --git a/js/views/front/regClass.js b/js/views/front/regClass.js index df8e560..046b0a4 100644 --- a/js/views/front/regClass.js +++ b/js/views/front/regClass.js @@ -23,6 +23,11 @@ app.Views.Front.RegClass = Backbone.View.extend({ 'click .glm-add-new-account': 'addNewAccount', 'click .add-new-registrant': 'addNew', 'click .add-new-registrant-cancel': 'cancelAddNew', + 'click .timeSelection': 'updateTimeSelection', + }, + + updateTimeSelection: function(){ + this.model.set({ selectedTime: this.$('.timeSelection:checked').val() }); }, render: function(){ @@ -34,6 +39,9 @@ app.Views.Front.RegClass = Backbone.View.extend({ }); var accountContainer = this.$('.reg-class-accounts'); accountContainer.append(view); + if ( app.timeSpecific ) { + // this.setCalendar(); + } if ( loginAccount === '' ) { this.$('.glm-add-account').hide(); } @@ -43,8 +51,21 @@ app.Views.Front.RegClass = Backbone.View.extend({ return this; }, + getTimeArray: function(){ + var times = this.model.get( 'times' ); + var timeParts = []; + _.each( times, function(time){ + var testDate = new Date( time.start_datetime.datetime ); + timeParts.push( {id: time.id,date: testDate} ); + }); + console.log( timeParts ); + return timeParts; + }, + setCalendar: function(){ + console.log( 'setting calendar' ); var times = this.model.get( 'times' ); + console.log(times); $('#eventCalendar').fullCalendar({ events: function(start, end, timezone, callback) { var events = []; @@ -102,7 +123,7 @@ app.Views.Front.RegClass = Backbone.View.extend({ this.newRegAccountView = new app.Views.Front.RegistrantForm({model: registrant}); this.$el.append( this.newRegAccountView.render().el ); if ( app.timeSpecific ) { - this.setCalendar(); + // this.setCalendar(); } } } @@ -198,7 +219,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 ) { - this.setCalendar(); + // this.setCalendar(); } }, diff --git a/js/views/front/regEvent.js b/js/views/front/regEvent.js index 12e32af..17d8456 100644 --- a/js/views/front/regEvent.js +++ b/js/views/front/regEvent.js @@ -5,7 +5,7 @@ app.Views.Front.RegEvent = Backbone.View.extend({ tagName: 'div', - className: 'glm-reg-event-item clearfix', + className: 'glm-reg-event-item', template: _.template( jQuery('#regEvent-template').html() ), @@ -19,7 +19,8 @@ app.Views.Front.RegEvent = Backbone.View.extend({ var view = regEvent.classes.map(function(item){ return (new app.Views.Front.RegClass({ model: item })).render().el; }); - this.$el.append(view); + var classContainer = this.$('.glm-reg-classes'); + classContainer.append(view); return this; }, diff --git a/models/front/registrations/list.php b/models/front/registrations/list.php index 09db5f7..6ac8da1 100644 --- a/models/front/registrations/list.php +++ b/models/front/registrations/list.php @@ -143,7 +143,6 @@ // Compile template data $templateData = array( 'page' => 'register', - //'events' => $eventData, 'regEventsCount' => $regEventsCount, 'haveRegEvents' => $haveRegEvents, 'regEvents' => $list, diff --git a/views/front/registrations/list.html b/views/front/registrations/list.html index ff5d7cd..b6deb2c 100644 --- a/views/front/registrations/list.html +++ b/views/front/registrations/list.html @@ -1,31 +1,49 @@ {include file='front/registrations/header.html'} -
+ {if $haveRegEvents} {foreach $regEvents as $event} -
-

{$event.event_name}

- {if $event.image} - - {/if} +
+

{$event.event_name}

+ {if $event.image} {/if}

{$event.intro}

- - - - - {foreach $event.times as $time} - - - - {/foreach} -
Days/Times
- {if $time.recur_name != 'Imported Event Schedule'} - {$time.recur_name} - {/if} - {$time.start_time.timestamp|date_format:"%A, %B %e, %Y"} - {$time.start_time.timestamp|date_format:"%l:%M %P"} - - - {$time.end_time.timestamp|date_format:"%l:%M %P"} -
+
+
+ Dates/Times: +
+
+ {foreach $event.times as $time} + {if $time.recur_name && $time.recur_name != 'Imported Event Schedule'} + {$time.recur_name}
+ {/if} + {$time.start_time.timestamp|date_format:"%A, %B %e, %Y"} + {$time.start_time.timestamp|date_format:"%l:%M %P"} + - + {$time.end_time.timestamp|date_format:"%l:%M %P"}
+ {/foreach} +
+
+ {if $event.hide_address.name == 'No'} +
+
+ Location: +
+
+ {if !$event.use_member_location.value && ($event.locations.name || $event.locations.address)} + {if $event.locations.name}{$event.locations.name}
{/if} + {if $event.locations.address} {$event.locations.address}
{/if} + {if $event.locations.city.name}{$event.locations.city.name}{/if}{if $event.locations.state.value}, {$event.locations.state.value} {/if} + {if $event.locations.zip} {$event.locations.zip} {/if} + {if $event.locations.phone} {apply_filters('glm_associate_phone_filter', $event.locations.phone)} {/if} + {elseif $event.use_member_location.value || $event.other_ref_dest} + {if $event.member.member} {$event.member.member}
{/if} + {if $event.member.addr1} {$event.member.addr1}
{/if} + {if $event.member.city}{$event.member.city}{/if}{if $event.member.state.value}, {$event.member.state.value}{/if} + {if $event.member.zip} {$event.member.zip} {/if} + {if $event.member.phone} {apply_filters('glm_associate_phone_filter', $event.member.phone)} {/if} + {/if} +
+
+ {/if}
{/foreach} {else} @@ -33,4 +51,3 @@ {/if}
-{debug} diff --git a/views/front/registrations/registration.html b/views/front/registrations/registration.html index eea0c70..48d399d 100644 --- a/views/front/registrations/registration.html +++ b/views/front/registrations/registration.html @@ -8,58 +8,71 @@ {/literal} {* Template for the regEvent *}{literal} {/literal} {* Template for regClass *}{literal} @@ -67,44 +80,43 @@ {* Template for registrant add form *}{literal} {/literal} -
+

{$terms.reg_term_registrations_name}

{include file='front/registrations/header.html'} +
+
+
+
{* Bootstrap the models needed on page load *} {* Need to have RegEvent model created *}