From: Chuck Scott Date: Tue, 12 Sep 2017 18:39:43 +0000 (-0400) Subject: Moved add level button to ID from class. X-Git-Tag: v1.0.0^2~415 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=19a55899d634e952f5edebb537689b37a09ff739;p=WP-Plugins%2Fglm-member-db-registrations.git Moved add level button to ID from class. Updated registrations admin.css to improve registrations levels & charges setup. Changed eventEditLevels.html for improved layout. --- diff --git a/css/admin.css b/css/admin.css index 9acebfd..788b7ea 100644 --- a/css/admin.css +++ b/css/admin.css @@ -20,12 +20,6 @@ clear: both; display: block; } -.glm-reg-event-item { - border: 1px solid black; - padding: 10px; - margin: 1.2rem 1rem; - position: relative; -} .glm-reg-event-item h2 { font-size: 1.5rem; font-weight: bold; @@ -34,15 +28,18 @@ width: 80%; } .glm-reg-level { - width: 48%; - float: left; - clear: left; -} -.glm-reg-level h3 { - font-size: 1rem; - font-weight: bold; - text-decoration: none; - padding: .3rem; + width: 99%; + padding-bottom: .7em; + padding-top: 1em; +} +.glm-class-label { + height: 1em; +} +.glm-class-header { + width: 99%; + border-bottom-style: solid; + padding-bottom: 1em; + padding-top: 1em; } .glm-reg-submit { padding: 1rem; diff --git a/js/adminRegApp.js b/js/adminRegApp.js index c0a020f..75cbb65 100644 --- a/js/adminRegApp.js +++ b/js/adminRegApp.js @@ -1 +1 @@ -app.Models.Admin.RegClass=Backbone.Model.extend({defaults:{id:null,parent:0,reg_event:0,name:"",descr:""},initialize:function(){this.rates=new app.Collections.Admin.RegRates}}),app.Models.Admin.RegEvent=Backbone.Model.extend({defaults:{name:"regEvent",event_name:"",event_code:"",notify_email:"",attendees_max:0,attendees_max_per_reg:0,reg_hold_minutes:0,cart_hold_days:0,terms:""},initialize:function(){this.classes=new app.Collections.Admin.RegClasses},setClasses:function(e){this.classes.reset(e)}}),app.Models.Admin.RegRate=Backbone.Model.extend({defaults:{reg_event:0,reg_class:"",name:"",start_days:0,end_days:0,base_rate:0,per_registrant:0,registrant_credits:0},initialize:function(){}}),app.Collections.Admin.RegClasses=Backbone.Collection.extend({model:app.Models.Admin.RegClass,localStorage:new Backbone.LocalStorage("Classes")}),app.Collections.Admin.RegRates=Backbone.Collection.extend({model:app.Models.Admin.RegRate}),Backbone.emulateJSON=!0,Backbone.emulateHTTP=!0,app.Views.Admin.EventEditLevels=Backbone.View.extend({el:"#regApp",initialize:function(){this.event=new app.Views.Admin.RegEvent({model:regEvent}),this.render()},render:function(){return this.$el.append(this.event.render().el),this},events:{}}),app.Views.Admin.RegClass=Backbone.View.extend({tagName:"div",className:"glm-reg-level",template:_.template(jQuery("#regClass-template").html()),initialize:function(){return this.listenTo(this.model,"change",this.render),this},events:{"click .edit-level":"editLevel","click .class-update":"update","click .class-add":"add","click .class-cancel":"cancel"},update:function(){console.log("Update called");var e=this.$(".class-name").val().trim(),t=this.$(".class-descr").val().trim();this.model.save({name:e,descr:t}),this.$(".class-edit-form").hide(),this.$(".class-label").show()},add:function(){console.log("Add called");var e=this.$(".class-name").val().trim(),t=this.$(".class-descr").val().trim();this.model.set({name:e,descr:t}),this.model.get("parent").classes.create(this.model)},cancel:function(){console.log("Cancel called"),this.remove()},editLevel:function(){this.$(".class-edit-form").show(),this.$(".class-label").hide(),this.$(".class-name").focus()},render:function(){return this.$el.html(this.template(this.model.toJSON())),this},addOne:function(e){if(e.isValid()){var t=new app.Views.Admin.RegClasses({model:e});this.$el.append(t.render().el)}},addAll:function(){jQuery(".glm-reg-level").html("")}}),app.Views.Admin.RegEvent=Backbone.View.extend({tagName:"div",className:"glm-reg-event-item clearfix",template:_.template(jQuery("#regEvent-template").html()),initialize:function(){this.listenTo(this.model,"change",this.render),this.listenTo(this.model.classes,"add",this.addOne),this.listenTo(this.model.classes,"create",this.addOne),this.listenTo(this.model.classes,"reset",this.addAll)},events:{"click .add-reg-level":"addLevel"},addLevel:function(){console.log("Add Level Called");var e=new app.Models.Admin.RegClass({parent:this.model}),t=new app.Views.Admin.RegClass({model:e});this.$el.append(t.render().el)},render:function(){this.$el.html(this.template(this.model.toJSON()));var e=regEvent.classes.map(function(e){return new app.Views.Admin.RegClass({model:e}).render().el});return this.$el.append(e),this}}); \ No newline at end of file +app.Models.Admin.RegClass=Backbone.Model.extend({defaults:{id:null,parent:0,reg_event:0,name:"",descr:""},initialize:function(){this.rates=new app.Collections.Admin.RegRates}}),app.Models.Admin.RegEvent=Backbone.Model.extend({defaults:{name:"regEvent",event_name:"",event_code:"",notify_email:"",attendees_max:0,attendees_max_per_reg:0,reg_hold_minutes:0,cart_hold_days:0,terms:""},initialize:function(){this.classes=new app.Collections.Admin.RegClasses},setClasses:function(e){this.classes.reset(e)}}),app.Models.Admin.RegRate=Backbone.Model.extend({defaults:{reg_event:0,reg_class:"",name:"",start_days:0,end_days:0,base_rate:0,per_registrant:0,registrant_credits:0},initialize:function(){}}),app.Collections.Admin.RegClasses=Backbone.Collection.extend({model:app.Models.Admin.RegClass,localStorage:new Backbone.LocalStorage("Classes")}),app.Collections.Admin.RegRates=Backbone.Collection.extend({model:app.Models.Admin.RegRate}),Backbone.emulateJSON=!0,Backbone.emulateHTTP=!0,app.Views.Admin.EventEditLevels=Backbone.View.extend({el:"#regApp",initialize:function(){this.event=new app.Views.Admin.RegEvent({model:regEvent}),this.render()},render:function(){return this.$el.append(this.event.render().el),this},events:{}}),app.Views.Admin.RegClass=Backbone.View.extend({tagName:"div",className:"glm-reg-level",template:_.template(jQuery("#regClass-template").html()),initialize:function(){return this.listenTo(this.model,"change",this.render),this},events:{"click .edit-level":"editLevel","click .class-update":"update","click .class-add":"add","click .class-cancel":"cancel"},update:function(){console.log("Update called");var e=this.$(".class-name").val().trim(),t=this.$(".class-descr").val().trim();this.model.save({name:e,descr:t}),this.$(".class-edit-form").hide(),this.$(".class-label").show()},add:function(){console.log("Add called");var e=this.$(".class-name").val().trim(),t=this.$(".class-descr").val().trim();this.model.set({name:e,descr:t}),this.model.get("parent").classes.create(this.model)},cancel:function(){console.log("Cancel called"),this.remove()},editLevel:function(){this.$(".class-edit-form").show(),this.$(".class-label").hide(),this.$(".class-name").focus()},render:function(){return this.$el.html(this.template(this.model.toJSON())),this},addOne:function(e){if(e.isValid()){var t=new app.Views.Admin.RegClasses({model:e});this.$el.append(t.render().el)}},addAll:function(){jQuery(".glm-reg-level").html("")}}),app.Views.Admin.RegEvent=Backbone.View.extend({tagName:"div",className:"glm-reg-event-item clearfix",template:_.template(jQuery("#regEvent-template").html()),initialize:function(){this.listenTo(this.model,"change",this.render),this.listenTo(this.model.classes,"add",this.addOne),this.listenTo(this.model.classes,"create",this.addOne),this.listenTo(this.model.classes,"reset",this.addAll)},events:{"click #add-reg-level":"addLevel"},addLevel:function(){console.log("Add Level Called");var e=new app.Models.Admin.RegClass({parent:this.model}),t=new app.Views.Admin.RegClass({model:e});this.$el.append(t.render().el)},render:function(){this.$el.html(this.template(this.model.toJSON()));var e=regEvent.classes.map(function(e){return new app.Views.Admin.RegClass({model:e}).render().el});return this.$el.append(e),this}}); \ No newline at end of file diff --git a/js/views/admin/regEvent.js b/js/views/admin/regEvent.js index e1ca8e7..34ce042 100644 --- a/js/views/admin/regEvent.js +++ b/js/views/admin/regEvent.js @@ -18,8 +18,7 @@ app.Views.Admin.RegEvent = Backbone.View.extend({ }, events: { - 'click .add-reg-level': 'addLevel', - //'click .class-add': 'add', + 'click #add-reg-level': 'addLevel', }, addLevel: function(){ diff --git a/models/admin/registrations/events.php b/models/admin/registrations/events.php index 8f949cc..f128148 100644 --- a/models/admin/registrations/events.php +++ b/models/admin/registrations/events.php @@ -83,8 +83,6 @@ class GlmMembersAdmin_registrations_events extends GlmDataRegistrationsRegEvent $option = 'dashboard'; $view = false; - $where = ' true '; - $alphaWhere = ' true '; $numbDisplayed = false; $lastDisplayed = false; $paging = true; @@ -93,7 +91,7 @@ class GlmMembersAdmin_registrations_events extends GlmDataRegistrationsRegEvent $start = 1; $limit = 20; // Set to the number of listings per page $textSearch = false; - $where = "TRUE"; + $where = ' TRUE '; $alphaList = false; $alphaWhere = ''; $alphaSelected = false; @@ -422,15 +420,21 @@ class GlmMembersAdmin_registrations_events extends GlmDataRegistrationsRegEvent $alphaWhere .= " AND T.event_name LIKE '$alphaSelected%'"; } + $where = ' TRUE '; + if (isset($_REQUEST['text_search']) && trim($_REQUEST['text_search'] != '')) { + $textSearch = trim($_REQUEST['text_search']); + $where = "event_name LIKE '%".$textSearch."%'"; + + // Clean up for use in redisplaying search value + $textSearch = stripslashes($textSearch); + } + // Get full list for all other filters, but not filtered by alpha (that would be silly) - $alphaList = $this->getAlphaList(' AND '.$where, $alphaSelected); + $alphaList = $this->getAlphaList(''); // Get count of reg event listed $regEventsCount = $this->getStats($where); - // Get stats for number of registration events found matching current selection criteria (includes alpha selection) - $filteredRegEventsFound = $this->getStats(str_replace('T.', '', $where.$alphaWhere)); - // Get a current list of reg events $listResult = $this->getSimpleRegEventsList($where.$alphaWhere, 'event_name', true, 'id', $start, $limit, true); diff --git a/views/admin/registrations/eventEditLevels.html b/views/admin/registrations/eventEditLevels.html index 6fdb4f9..2c58c4d 100644 --- a/views/admin/registrations/eventEditLevels.html +++ b/views/admin/registrations/eventEditLevels.html @@ -21,60 +21,80 @@ Edit Registration Settings Registration Levels & Charges + {* Event Registration App - Backbone.js *} {* Underscore Templates for the Event Registration App *} + {literal} - - + + + + +
+ + +
+ + + + {/literal} +
+ {* Bootstrap the models needed on page load *} {* Need to have RegEvent model created *} {* And create the RegClasses collection *} diff --git a/views/admin/registrations/eventsDashboard.html b/views/admin/registrations/eventsDashboard.html index 6832a38..3fd9a90 100644 --- a/views/admin/registrations/eventsDashboard.html +++ b/views/admin/registrations/eventsDashboard.html @@ -4,7 +4,6 @@
- @@ -13,64 +12,65 @@

List of Registration Events

- Text Search: + Text Search:
-

Total found: {$regEventsCount}  

+
-
+

Total found: {$regEventsCount}  

- +
- {if $paging} - - - {/if} + -
- All - {foreach $alphaList as $a} - {$a.alpha} - {/foreach} -
- - - - - - - - - - {if $haveRegEvents} - {assign var="i" value="0"} - {foreach $regEvents as $r} - {if $i++ is odd by 1} - - {else} - - {/if} - - - - {/foreach} - {else} - + {if $paging} + + {/if} - -
IDEvent Name
- {$r.id} - - {$r.event_name} -
(no registration events listed)
- {if $paging} - - +
+ All + {foreach $alphaList as $a} + {$a.alpha} + {/foreach} +
+ + + + + + + + + +{if $haveRegEvents} + {assign var="i" value="0"} + {foreach $regEvents as $r}z + {if $i++ is odd by 1} + + {else} + {/if} + + + + {/foreach} +{else} + +{/if} + +
IDEvent Name
+ {$r.id} + + {$r.event_name} +
(no registration events listed)
+ + {if $paging} + + + {/if} -