From 4bb761a104ff85d615d073f0cc853df1dd873009 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Thu, 2 Nov 2017 16:55:42 -0400 Subject: [PATCH] Updates for front end work working on styling for mobile and for time entry. --- css/front.css | 6 ++++-- js/frontRegApp.js | 5 ++++- js/models/front/regEvent.js | 2 ++ js/views/front/regClass.js | 3 ++- views/front/registrations/list.html | 8 +++---- views/front/registrations/registration.html | 24 ++++++++++++++------- 6 files changed, 32 insertions(+), 16 deletions(-) diff --git a/css/front.css b/css/front.css index 71fc70c..ef8e0ff 100644 --- a/css/front.css +++ b/css/front.css @@ -30,8 +30,7 @@ .glm-reg-event-item { border: 1px solid black; padding: 10px; - margin: 1.2rem 1rem; - /* position: relative; */ + margin: 1rem 0; } .glm-reg-event-item h2 { font-size: 1.5rem; @@ -163,6 +162,9 @@ label.registrant-label { .glm-registrant-edit { cursor: pointer; } +label.reg-time { + display: inline; +} /*}}} End New Attendee Form */ /*{{{ Login Page */ diff --git a/js/frontRegApp.js b/js/frontRegApp.js index 03017b4..a981ee9 100644 --- a/js/frontRegApp.js +++ b/js/frontRegApp.js @@ -161,6 +161,8 @@ app.Models.Front.RegEvent = Backbone.Model.extend({ var foundClass = this.classes.findWhere({ id: registrants[i].class_id }); if ( foundClass != undefined ) { foundClass.registrants.create( registrants[i] ); + var newReg = foundClass.registrants.pop(); + foundClass.set({selectedTime: newReg.get( 'reg_time' ) }); } } }, @@ -471,7 +473,7 @@ app.Views.Front.RegClass = Backbone.View.extend({ var timeParts = []; _.each( times, function(time){ var testDate = new Date( time.start_datetime.datetime ); - timeParts.push( {id: time.id,date: testDate} ); + timeParts.push( {id: time.id,date: testDate, name: time.name} ); }); // console.log( timeParts ); return timeParts; @@ -700,6 +702,7 @@ app.Views.Front.RegClass = Backbone.View.extend({ }, addOne: function( item ){ + this.model.set({selectedTime: item.get('reg_time') }) this.render(); }, diff --git a/js/models/front/regEvent.js b/js/models/front/regEvent.js index 607bd46..b39f216 100644 --- a/js/models/front/regEvent.js +++ b/js/models/front/regEvent.js @@ -31,6 +31,8 @@ app.Models.Front.RegEvent = Backbone.Model.extend({ var foundClass = this.classes.findWhere({ id: registrants[i].class_id }); if ( foundClass != undefined ) { foundClass.registrants.create( registrants[i] ); + var newReg = foundClass.registrants.pop(); + foundClass.set({selectedTime: newReg.get( 'reg_time' ) }); } } }, diff --git a/js/views/front/regClass.js b/js/views/front/regClass.js index d79124e..a0f7715 100644 --- a/js/views/front/regClass.js +++ b/js/views/front/regClass.js @@ -72,7 +72,7 @@ app.Views.Front.RegClass = Backbone.View.extend({ var timeParts = []; _.each( times, function(time){ var testDate = new Date( time.start_datetime.datetime ); - timeParts.push( {id: time.id,date: testDate} ); + timeParts.push( {id: time.id,date: testDate, name: time.name} ); }); // console.log( timeParts ); return timeParts; @@ -301,6 +301,7 @@ app.Views.Front.RegClass = Backbone.View.extend({ }, addOne: function( item ){ + this.model.set({selectedTime: item.get('reg_time') }) this.render(); }, diff --git a/views/front/registrations/list.html b/views/front/registrations/list.html index 6ea9e0d..da599af 100644 --- a/views/front/registrations/list.html +++ b/views/front/registrations/list.html @@ -1,12 +1,12 @@ {include file='front/registrations/header.html'} - +
{if $haveRegEvents} {foreach $regEvents as $event} -
+

{$event.event_name}

{if $event.image} {/if}

{$event.intro}

-
+
Dates/Times:
@@ -23,7 +23,7 @@
{if $event.hide_address.name == 'No'} -
+
Location:
diff --git a/views/front/registrations/registration.html b/views/front/registrations/registration.html index 009eea2..7c6b570 100644 --- a/views/front/registrations/registration.html +++ b/views/front/registrations/registration.html @@ -44,7 +44,7 @@ {* Template for regClass *}{literal}