From: Steve Sutton Date: Thu, 16 Nov 2017 18:27:33 +0000 (-0500) Subject: Updating style for the entry attendee form and edit. X-Git-Tag: v1.0.0^2~265 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=0b3a285c1fccc9b508a52aaa2f1fe73044d78ab6;p=WP-Plugins%2Fglm-member-db-registrations.git Updating style for the entry attendee form and edit. Also clean up all console.log --- diff --git a/css/front.css b/css/front.css index aff53f4..59c3718 100644 --- a/css/front.css +++ b/css/front.css @@ -159,6 +159,14 @@ label.registrant-label { /*}}} End Event Registration Page */ /*{{{ New Attendee Form */ +.new-reg, .reg-edit-form { + padding: 0 5px; + border: solid 1px black; + background-color: white; +} +.new-reg h4 { + font-size: 22px; +} .glm-registrant-edit { cursor: pointer; } diff --git a/js/adminRegApp.js b/js/adminRegApp.js index 4a41417..7d60191 100644 --- a/js/adminRegApp.js +++ b/js/adminRegApp.js @@ -159,8 +159,6 @@ app.Views.Admin.RegClass = Backbone.View.extend({ add: function(){ - console.log('add called in regClass.js'); - // Get data from form var cName = this.$('.class-name').val().trim(); var cDescr = this.$('.class-descr').val().trim(); @@ -187,7 +185,6 @@ app.Views.Admin.RegClass = Backbone.View.extend({ descr: cDescr }).success(function(data){ if (data > 0) { - console.log('AJAX Class Save Successful: ID = '+data); myself.model.set({id: data}); myself.$('.class-display-template').show(); myself.$('.class-edit-template').hide(); @@ -200,18 +197,14 @@ app.Views.Admin.RegClass = Backbone.View.extend({ alert('Unable to store class ata at this time.'); } }).error(function(m, e){ - console.log(e); alert('There was a problem communicating with the AJAX server.'); }); - console.log('New ID = '+newID); - glmSubmitRequired -= 1; }, delete: function(){ - console.log('deleteLevel called'); if (glmSubmitRequired) { alert('Please complete your other edit first.'); @@ -236,7 +229,6 @@ app.Views.Admin.RegClass = Backbone.View.extend({ }, cancel: function(){ - console.log('cancel called'); this.remove(); }, @@ -245,7 +237,6 @@ app.Views.Admin.RegClass = Backbone.View.extend({ alert('Please complete your other edit first.'); return false; } - console.log('edit called'); this.$('.class-display-template').hide(); this.$('.class-edit-template').show(); this.$('.class-update').show(); @@ -256,13 +247,12 @@ app.Views.Admin.RegClass = Backbone.View.extend({ }, update: function(){ - console.log('update called'); var cName = this.$('.class-name').val().trim(); var cDescr = this.$('.class-descr').val().trim(); if (!this.model.save({ option: 'update', name: cName, descr: cDescr })) { - console.log('Class Save Error'); + // console.log('Class Save Error'); } else { - console.log('Class Save Successful'); + // console.log('Class Save Successful'); } this.$('.class-display-template').show(); this.$('.class-edit-template').hide(); @@ -274,7 +264,7 @@ app.Views.Admin.RegClass = Backbone.View.extend({ addRate: function(){ - console.log( 'addRate Called'); + // console.log( 'addRate Called'); if (glmSubmitRequired) { alert('Please complete your other edit first.'); @@ -318,7 +308,7 @@ app.Views.Admin.RegClass = Backbone.View.extend({ */ if (addFlag === true) { - console.log('New level created'); + // console.log('New level created'); this.$('.class-display-template').hide(); this.$('.class-edit-template').show(); this.$('.class-update').hide(); @@ -357,28 +347,26 @@ app.Views.Admin.RegEvent = Backbone.View.extend({ events: { 'click #class-add': 'addLevel', - }, + }, + + addLevel: function(){ - addLevel: function(){ - if (glmSubmitRequired) { alert('Please complete your other edit first.'); return false; } - console.log( 'addLevel Called' ); - - var regClass = new app.Models.Admin.RegClass({ - glmAction: 'regClass', - parent: this.model + var regClass = new app.Models.Admin.RegClass({ + glmAction: 'regClass', + parent: this.model }); - - var view = new app.Views.Admin.RegClass({ - model: regClass + + var view = new app.Views.Admin.RegClass({ + model: regClass }); this.$el.append(view.render(true).el); }, - + render: function(){ this.$el.html( this.template( this.model.toJSON() ) ); var view = regEvent.classes.map(function(item){ @@ -390,7 +378,7 @@ app.Views.Admin.RegEvent = Backbone.View.extend({ }); -// js/views/regRate.js +js/views/regRate.js var calendar = false; @@ -438,8 +426,6 @@ app.Views.Admin.RegRate = Backbone.View.extend({ add: function(){ - console.log('add called in regRate.js'); - // Get parent for id to send to backend for new rate var parentClass = this.model.get( 'parent' ); @@ -464,7 +450,7 @@ app.Views.Admin.RegRate = Backbone.View.extend({ formData ).success(function(data){ if (data > 0) { - console.log('AJAX Rate Save Successful: ID = '+data); + // console.log('AJAX Rate Save Successful: ID = '+data); myself.model.set({id: data}); myself.$('.rate-display-template').show(); myself.$('.rate-edit-template').hide(); @@ -477,7 +463,7 @@ app.Views.Admin.RegRate = Backbone.View.extend({ alert('Unable to store rate data at this time.'); } }).error(function(m, e){ - console.log(e); + // console.log(e); alert('There was a problem communicating with the AJAX server.'); }); @@ -489,7 +475,7 @@ app.Views.Admin.RegRate = Backbone.View.extend({ }, delete: function() { - console.log('deleteRate called'); + // console.log('deleteRate called'); if (glmSubmitRequired) { alert('Please complete your other edit first.'); @@ -517,7 +503,7 @@ app.Views.Admin.RegRate = Backbone.View.extend({ alert('Please complete your other edit first.'); return false; } - console.log('edit called'); + // console.log('edit called'); this.$('.rate-display-template').hide(); this.$('.rate-edit-template').show(); this.$('.rate-update').show(); @@ -528,7 +514,7 @@ app.Views.Admin.RegRate = Backbone.View.extend({ }, update: function() { - console.log('update called'); + // console.log('update called'); var formData = this.getInputData(); @@ -542,9 +528,9 @@ app.Views.Admin.RegRate = Backbone.View.extend({ if (!this.model.save( formData )) { - console.log('Rate Save Error'); + // console.log('Rate Save Error'); } else { - console.log('Rate Save Successful'); + // console.log('Rate Save Successful'); } this.$('.rate-display-template').show(); this.$('.rate-edit-template').hide(); @@ -567,7 +553,7 @@ app.Views.Admin.RegRate = Backbone.View.extend({ if (addFlag === true) { // Setup to edit this for the first time - console.log('New rate created'); + // console.log('New rate created'); this.$('.rate-display-template').hide(); this.$('.rate-edit-template').show(); this.$('.rate-update').hide(); diff --git a/js/frontRegApp.js b/js/frontRegApp.js index b3a3b1d..2c8dce4 100644 --- a/js/frontRegApp.js +++ b/js/frontRegApp.js @@ -150,27 +150,19 @@ app.Models.Front.RegEvent = Backbone.Model.extend({ // Then is can add the registrant into that regTime model. setClassRegistrants: function( registrants ){ for ( var i = 0; i < registrants.length; i++ ) { - // console.log(registrants[i]); var foundClass = this.classes.findWhere({ id: registrants[i].class_id }); - // console.log(foundClass); if ( foundClass != undefined ) { // Try looking through the class times // var foundRegTime = foundClass.regTimes.findWhere({id: registrants[i].reg_time}); -console.log(registrants[i].reg_time); var foundRegTime = _.findWhere(foundClass.get('times'), { id: registrants[i].reg_time }); -console.log(foundClass); -console.log(registrants); if ( foundRegTime ) { foundRegTime.reg_event = foundClass.get('reg_event'); - console.log(foundRegTime); } - // Now add the time if needed + // Now add the time if needed var hasRegTime = _.findWhere(foundClass, { reg_time: foundRegTime.id }); - // console.log(hasRegTime); if ( !hasRegTime ) { foundClass.regTimes.create( foundRegTime ); hasRegTime = foundClass.regTimes.findWhere({ id: foundRegTime.id }); - // console.log(hasRegTime); hasRegTime.set({ parent: foundClass }); } // Add the registrant @@ -215,7 +207,7 @@ app.Models.Front.RegRequestRegistrant = Backbone.Model.extend({ validated: false, reg_event: 0, reg_class: 0, - event_name: '', + // event_name: '', reg_time: 0, reg_time_text: '', event_datetime: '', @@ -559,7 +551,6 @@ app.Views.Front.RegClass = Backbone.View.extend({ this.$('.glm-add-account').hide(); } if ( !app.timeSpecific ) { - console.log('Should be showing the add attendee part now'); // this.$('.glm-add-new-account').show(); this.updateTimeSelection(); } else { @@ -591,7 +582,7 @@ app.Views.Front.RegClass = Backbone.View.extend({ return timeParts; }, - // called durring render to check for this.el in document + // called during render to check for this.el in document // then it can setup the fullCaldendar onRenderComplete: function() { if (!$.contains(document.documentElement, this.el)) { @@ -716,7 +707,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' ), + // event_name: regEvent.get( 'event_name' ), reg_rate: this.model.get('reg_rate_id'), email: account.email, }); @@ -731,7 +722,7 @@ app.Views.Front.RegClass = Backbone.View.extend({ } }) .fail(function(msg){ - console.log('Fail: ' + msg); + // console.log('Fail: ' + msg); }); }, @@ -942,10 +933,7 @@ app.Views.Front.RegTime = Backbone.View.extend({ var times = this.model.get( 'times' ); } var rateId = this.model.get( 'rate_id' ); - console.log(rateId); if ( !rateId ) { - // console.log( 'No rate id!' ); - // console.log( sTime ); return; } if ( fname === '' || lname === '' ) { @@ -962,9 +950,7 @@ app.Views.Front.RegTime = Backbone.View.extend({ } var regRequest = cart.get( 'request' ); var parent = this.model.get('parent'); - // console.log( parent ); if ( !parent ) { - // console.log( 'Parent not there!' ); return; } if ( findByEmail.length === 0 ) { @@ -974,7 +960,7 @@ app.Views.Front.RegTime = Backbone.View.extend({ reg_time: this.model.get( 'id' ), reg_event: this.model.get( 'reg_event' ), // Todo: use correct reg_event reg_class: this.model.get( 'parent' ).id, // Todo: use correct reg_class - event_name: regEvent.get( 'event_name' ), + // event_name: regEvent.get( 'event_name' ), reg_rate: rateId, email: email, fname: fname, @@ -1073,7 +1059,7 @@ app.Views.Front.RegistrantForm = Backbone.View.extend({ } }) .fail(function(msg){ - console.log('Fail: ' + msg); + // console.log('Fail: ' + msg); }); } }, diff --git a/js/models/front/regEvent.js b/js/models/front/regEvent.js index 7416df7..3e66a4c 100644 --- a/js/models/front/regEvent.js +++ b/js/models/front/regEvent.js @@ -34,27 +34,19 @@ app.Models.Front.RegEvent = Backbone.Model.extend({ // Then is can add the registrant into that regTime model. setClassRegistrants: function( registrants ){ for ( var i = 0; i < registrants.length; i++ ) { - // console.log(registrants[i]); var foundClass = this.classes.findWhere({ id: registrants[i].class_id }); - // console.log(foundClass); if ( foundClass != undefined ) { // Try looking through the class times // var foundRegTime = foundClass.regTimes.findWhere({id: registrants[i].reg_time}); -console.log(registrants[i].reg_time); var foundRegTime = _.findWhere(foundClass.get('times'), { id: registrants[i].reg_time }); -console.log(foundClass); -console.log(registrants); if ( foundRegTime ) { foundRegTime.reg_event = foundClass.get('reg_event'); - console.log(foundRegTime); } - // Now add the time if needed + // Now add the time if needed var hasRegTime = _.findWhere(foundClass, { reg_time: foundRegTime.id }); - // console.log(hasRegTime); if ( !hasRegTime ) { foundClass.regTimes.create( foundRegTime ); hasRegTime = foundClass.regTimes.findWhere({ id: foundRegTime.id }); - // console.log(hasRegTime); hasRegTime.set({ parent: foundClass }); } // Add the registrant diff --git a/js/models/front/regRequestRegistrant.js b/js/models/front/regRequestRegistrant.js index e1b08b1..167a9d1 100644 --- a/js/models/front/regRequestRegistrant.js +++ b/js/models/front/regRequestRegistrant.js @@ -6,7 +6,7 @@ app.Models.Front.RegRequestRegistrant = Backbone.Model.extend({ validated: false, reg_event: 0, reg_class: 0, - event_name: '', + // event_name: '', reg_time: 0, reg_time_text: '', event_datetime: '', diff --git a/js/views/admin/regClass.js b/js/views/admin/regClass.js index ab9b489..9098f38 100644 --- a/js/views/admin/regClass.js +++ b/js/views/admin/regClass.js @@ -28,8 +28,6 @@ app.Views.Admin.RegClass = Backbone.View.extend({ add: function(){ - console.log('add called in regClass.js'); - // Get data from form var cName = this.$('.class-name').val().trim(); var cDescr = this.$('.class-descr').val().trim(); @@ -56,7 +54,6 @@ app.Views.Admin.RegClass = Backbone.View.extend({ descr: cDescr }).success(function(data){ if (data > 0) { - console.log('AJAX Class Save Successful: ID = '+data); myself.model.set({id: data}); myself.$('.class-display-template').show(); myself.$('.class-edit-template').hide(); @@ -69,18 +66,14 @@ app.Views.Admin.RegClass = Backbone.View.extend({ alert('Unable to store class ata at this time.'); } }).error(function(m, e){ - console.log(e); alert('There was a problem communicating with the AJAX server.'); }); - console.log('New ID = '+newID); - glmSubmitRequired -= 1; }, delete: function(){ - console.log('deleteLevel called'); if (glmSubmitRequired) { alert('Please complete your other edit first.'); @@ -105,7 +98,6 @@ app.Views.Admin.RegClass = Backbone.View.extend({ }, cancel: function(){ - console.log('cancel called'); this.remove(); }, @@ -114,7 +106,6 @@ app.Views.Admin.RegClass = Backbone.View.extend({ alert('Please complete your other edit first.'); return false; } - console.log('edit called'); this.$('.class-display-template').hide(); this.$('.class-edit-template').show(); this.$('.class-update').show(); @@ -125,13 +116,12 @@ app.Views.Admin.RegClass = Backbone.View.extend({ }, update: function(){ - console.log('update called'); var cName = this.$('.class-name').val().trim(); var cDescr = this.$('.class-descr').val().trim(); if (!this.model.save({ option: 'update', name: cName, descr: cDescr })) { - console.log('Class Save Error'); + // console.log('Class Save Error'); } else { - console.log('Class Save Successful'); + // console.log('Class Save Successful'); } this.$('.class-display-template').show(); this.$('.class-edit-template').hide(); @@ -143,7 +133,7 @@ app.Views.Admin.RegClass = Backbone.View.extend({ addRate: function(){ - console.log( 'addRate Called'); + // console.log( 'addRate Called'); if (glmSubmitRequired) { alert('Please complete your other edit first.'); @@ -187,7 +177,7 @@ app.Views.Admin.RegClass = Backbone.View.extend({ */ if (addFlag === true) { - console.log('New level created'); + // console.log('New level created'); this.$('.class-display-template').hide(); this.$('.class-edit-template').show(); this.$('.class-update').hide(); diff --git a/js/views/admin/regEvent.js b/js/views/admin/regEvent.js index a36cde4..74b011a 100644 --- a/js/views/admin/regEvent.js +++ b/js/views/admin/regEvent.js @@ -20,28 +20,26 @@ app.Views.Admin.RegEvent = Backbone.View.extend({ events: { 'click #class-add': 'addLevel', - }, + }, + + addLevel: function(){ - addLevel: function(){ - if (glmSubmitRequired) { alert('Please complete your other edit first.'); return false; } - console.log( 'addLevel Called' ); - - var regClass = new app.Models.Admin.RegClass({ - glmAction: 'regClass', - parent: this.model + var regClass = new app.Models.Admin.RegClass({ + glmAction: 'regClass', + parent: this.model }); - - var view = new app.Views.Admin.RegClass({ - model: regClass + + var view = new app.Views.Admin.RegClass({ + model: regClass }); this.$el.append(view.render(true).el); }, - + render: function(){ this.$el.html( this.template( this.model.toJSON() ) ); var view = regEvent.classes.map(function(item){ diff --git a/js/views/admin/regRate.js b/js/views/admin/regRate.js index c3b6d48..2587b55 100644 --- a/js/views/admin/regRate.js +++ b/js/views/admin/regRate.js @@ -1,4 +1,4 @@ -// js/views/regRate.js +js/views/regRate.js var calendar = false; @@ -46,8 +46,6 @@ app.Views.Admin.RegRate = Backbone.View.extend({ add: function(){ - console.log('add called in regRate.js'); - // Get parent for id to send to backend for new rate var parentClass = this.model.get( 'parent' ); @@ -72,7 +70,7 @@ app.Views.Admin.RegRate = Backbone.View.extend({ formData ).success(function(data){ if (data > 0) { - console.log('AJAX Rate Save Successful: ID = '+data); + // console.log('AJAX Rate Save Successful: ID = '+data); myself.model.set({id: data}); myself.$('.rate-display-template').show(); myself.$('.rate-edit-template').hide(); @@ -85,7 +83,7 @@ app.Views.Admin.RegRate = Backbone.View.extend({ alert('Unable to store rate data at this time.'); } }).error(function(m, e){ - console.log(e); + // console.log(e); alert('There was a problem communicating with the AJAX server.'); }); @@ -97,7 +95,7 @@ app.Views.Admin.RegRate = Backbone.View.extend({ }, delete: function() { - console.log('deleteRate called'); + // console.log('deleteRate called'); if (glmSubmitRequired) { alert('Please complete your other edit first.'); @@ -125,7 +123,7 @@ app.Views.Admin.RegRate = Backbone.View.extend({ alert('Please complete your other edit first.'); return false; } - console.log('edit called'); + // console.log('edit called'); this.$('.rate-display-template').hide(); this.$('.rate-edit-template').show(); this.$('.rate-update').show(); @@ -136,7 +134,7 @@ app.Views.Admin.RegRate = Backbone.View.extend({ }, update: function() { - console.log('update called'); + // console.log('update called'); var formData = this.getInputData(); @@ -150,9 +148,9 @@ app.Views.Admin.RegRate = Backbone.View.extend({ if (!this.model.save( formData )) { - console.log('Rate Save Error'); + // console.log('Rate Save Error'); } else { - console.log('Rate Save Successful'); + // console.log('Rate Save Successful'); } this.$('.rate-display-template').show(); this.$('.rate-edit-template').hide(); @@ -175,7 +173,7 @@ app.Views.Admin.RegRate = Backbone.View.extend({ if (addFlag === true) { // Setup to edit this for the first time - console.log('New rate created'); + // console.log('New rate created'); this.$('.rate-display-template').hide(); this.$('.rate-edit-template').show(); this.$('.rate-update').hide(); diff --git a/js/views/front/regClass.js b/js/views/front/regClass.js index a5617c1..fda4f4e 100644 --- a/js/views/front/regClass.js +++ b/js/views/front/regClass.js @@ -70,7 +70,6 @@ app.Views.Front.RegClass = Backbone.View.extend({ this.$('.glm-add-account').hide(); } if ( !app.timeSpecific ) { - console.log('Should be showing the add attendee part now'); // this.$('.glm-add-new-account').show(); this.updateTimeSelection(); } else { @@ -102,7 +101,7 @@ app.Views.Front.RegClass = Backbone.View.extend({ return timeParts; }, - // called durring render to check for this.el in document + // called during render to check for this.el in document // then it can setup the fullCaldendar onRenderComplete: function() { if (!$.contains(document.documentElement, this.el)) { @@ -227,7 +226,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' ), + // event_name: regEvent.get( 'event_name' ), reg_rate: this.model.get('reg_rate_id'), email: account.email, }); @@ -242,7 +241,7 @@ app.Views.Front.RegClass = Backbone.View.extend({ } }) .fail(function(msg){ - console.log('Fail: ' + msg); + // console.log('Fail: ' + msg); }); }, diff --git a/js/views/front/regTime.js b/js/views/front/regTime.js index 499264d..b9afd57 100644 --- a/js/views/front/regTime.js +++ b/js/views/front/regTime.js @@ -68,10 +68,7 @@ app.Views.Front.RegTime = Backbone.View.extend({ var times = this.model.get( 'times' ); } var rateId = this.model.get( 'rate_id' ); - console.log(rateId); if ( !rateId ) { - // console.log( 'No rate id!' ); - // console.log( sTime ); return; } if ( fname === '' || lname === '' ) { @@ -88,9 +85,7 @@ app.Views.Front.RegTime = Backbone.View.extend({ } var regRequest = cart.get( 'request' ); var parent = this.model.get('parent'); - // console.log( parent ); if ( !parent ) { - // console.log( 'Parent not there!' ); return; } if ( findByEmail.length === 0 ) { @@ -100,7 +95,7 @@ app.Views.Front.RegTime = Backbone.View.extend({ reg_time: this.model.get( 'id' ), reg_event: this.model.get( 'reg_event' ), // Todo: use correct reg_event reg_class: this.model.get( 'parent' ).id, // Todo: use correct reg_class - event_name: regEvent.get( 'event_name' ), + // event_name: regEvent.get( 'event_name' ), reg_rate: rateId, email: email, fname: fname, diff --git a/js/views/front/registrantForm.js b/js/views/front/registrantForm.js index 7765ec0..21a937d 100644 --- a/js/views/front/registrantForm.js +++ b/js/views/front/registrantForm.js @@ -60,7 +60,7 @@ app.Views.Front.RegistrantForm = Backbone.View.extend({ } }) .fail(function(msg){ - console.log('Fail: ' + msg); + // console.log('Fail: ' + msg); }); } }, diff --git a/models/admin/ajax/regFront/registrant.php b/models/admin/ajax/regFront/registrant.php index 408b13d..fae4e50 100644 --- a/models/admin/ajax/regFront/registrant.php +++ b/models/admin/ajax/regFront/registrant.php @@ -423,6 +423,15 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations ), ARRAY_A ); + if ( (!isset( $regRequestEventId ) || !$regRequestEventId) && $modelData['reg_request_event']) { + $regRequestEventId = $modelData['reg_request_event']; + } + if ( (!isset( $regRequestClassId ) || !$regRequestClassId) && $modelData['reg_request_class']) { + $regRequestClassId = $modelData['reg_request_class']; + } + if ( (!isset( $regRequestRate ) || !$regRequestRate) && $modelData['reg_request_rate']) { + $regRequestRate = $modelData['reg_request_rate']; + } $data = array( 'account' => $accountId, 'reg_event' => $modelData['reg_event'], diff --git a/views/front/registrations/registration.html b/views/front/registrations/registration.html index 056b2b0..b0b72eb 100644 --- a/views/front/registrations/registration.html +++ b/views/front/registrations/registration.html @@ -90,7 +90,7 @@ {/if}{literal}
-

{/literal}{$terms.reg_term_contact_information}{literal}

+

{/literal}{$terms.reg_term_attendee_cap} Info{literal}

First Name
@@ -152,7 +152,7 @@
{/literal}{literal}
-

{/literal}{$terms.reg_term_contact_information}{literal}

+

{/literal}{$terms.reg_term_attendee_cap} Info{literal}

First Name