Added single function for collecting reg rate input data and testing the results.

diff --git a/js/adminRegApp.js b/js/adminRegApp.js
index aa19549..0ac0c01 100644 (file)
--- a/js/adminRegApp.js
+++ b/js/adminRegApp.js
@@ -394,32 +394,31 @@ app.Views.Admin.RegRate = Backbone.View.extend({
         'click .rate-delete':     'delete'
     },
 
+    getInputData: function() {
+        var input = {
+            name:               this.$('.rate-name').val().trim(),
+            start_days:         this.$('.rate-start-days').val().trim(),
+            end_days:           this.$('.rate-end-days').val().trim(),
+            base_rate:          this.$('.rate-base-rate').val().trim(),
+            per_registrant:     this.$('.rate-per-registrant').val().trim(),
+            registrant_credits: this.$('.rate-registrant-credits').val().trim()
+        };
+        return input;
+    },
     
     add: function(){
 
         console.log('add called');
         
-        var cName  = this.$('.rate-name').val().trim();
-        var cStartDays  = this.$('.rate-end-days').val().trim();
-        var cEndDays  = this.$('.rate-start-days').val().trim();
-        var cBaseRate  = this.$('.rate-base-rate').val().trim();
-        var cPerRegistrant  = this.$('.rate-per-registrant').val().trim();
-        var cRegistrantCredits  = this.$('.rate-registrant-credits').val().trim();
-        
-        // Check for required data
-        if (cName == '') {
+        var formData = this.getInputData();
+
+        // Check for required data -- NEED TO MOVE THIS TO getInputData function 
+        if (formData.name == '') {
             alert('The Level Name is Required!');
             return;
         }
-        
-        this.model.set({ 
-            name: cName,
-            start_days: cStartDays,
-            end_days: cEndDays,
-            base_rate: cBaseRate,
-            per_registrant: cPerRegistrant,
-            registrant_credits: cRegistrantCredits
-        });
+
+        this.model.set(formData);
         
         // Get parent for id to send to backend for new rate
         var parentClass = this.model.get( 'parent' ); 
@@ -427,17 +426,12 @@ app.Views.Admin.RegRate = Backbone.View.extend({
         // Try to save the registration rate
         var newID = false;
         myself = this;
-        this.model.save({ 
-            wait: true,
-            option: 'add', 
-            name: cName,
-            start_days: cStartDays,
-            end_days: cEndDays,
-            base_rate: cBaseRate,
-            per_registrant: cPerRegistrant,
-            registrant_credits: cRegistrantCredits
-            
-        }).success(function(data){       
+        formData.wait = true;
+        formData.option = 'add';
+                
+        this.model.save(
+            formData
+        ).success(function(data){       
             if (data > 0) {
                 console.log('AJAX Rate Save Successful: ID = '+data);
                 myself.model.set({id: data});
@@ -491,22 +485,13 @@ app.Views.Admin.RegRate = Backbone.View.extend({
     
     update: function() {
         console.log('update called');
-        var cName  = this.$('.rate-name').val().trim();
-        var cStartDays  = this.$('.rate-start-days').val().trim();
-        var cEndDays  = this.$('.rate-end-days').val().trim();
-        var cBaseRate  = this.$('.rate-base-rate').val().trim();
-        var cPerRegistrant  = this.$('.rate-per-registrant').val().trim();
-        var cRegistrantCredits  = this.$('.rate-registrant-credits').val().trim();
         
-        if (!this.model.save({ 
-                option: 'update', 
-                name: cName,
-                start_days: cStartDays,
-                end_days: cEndDays,
-                base_rate: cBaseRate,
-                per_registrant: cPerRegistrant,
-                registrant_credits: cRegistrantCredits                
-            })) {
+        var formData = this.getInputData();
+        
+        formData.option = 'update';
+        if (!this.model.save(
+            formData
+        )) {
             console.log('Rate Save Error');
         } else {
             console.log('Rate Save Successful');

diff --git a/js/views/admin/regRate.js b/js/views/admin/regRate.js
index d88e87a..bf9f7a0 100644 (file)
--- a/js/views/admin/regRate.js
+++ b/js/views/admin/regRate.js
@@ -20,32 +20,31 @@ app.Views.Admin.RegRate = Backbone.View.extend({
         'click .rate-delete':     'delete'
     },
 
+    getInputData: function() {
+        var input = {
+            name:               this.$('.rate-name').val().trim(),
+            start_days:         this.$('.rate-start-days').val().trim(),
+            end_days:           this.$('.rate-end-days').val().trim(),
+            base_rate:          this.$('.rate-base-rate').val().trim(),
+            per_registrant:     this.$('.rate-per-registrant').val().trim(),
+            registrant_credits: this.$('.rate-registrant-credits').val().trim()
+        };
+        return input;
+    },
     
     add: function(){
 
         console.log('add called');
         
-        var cName  = this.$('.rate-name').val().trim();
-        var cStartDays  = this.$('.rate-end-days').val().trim();
-        var cEndDays  = this.$('.rate-start-days').val().trim();
-        var cBaseRate  = this.$('.rate-base-rate').val().trim();
-        var cPerRegistrant  = this.$('.rate-per-registrant').val().trim();
-        var cRegistrantCredits  = this.$('.rate-registrant-credits').val().trim();
-        
-        // Check for required data
-        if (cName == '') {
+        var formData = this.getInputData();
+
+        // Check for required data -- NEED TO MOVE THIS TO getInputData function 
+        if (formData.name == '') {
             alert('The Level Name is Required!');
             return;
         }
-        
-        this.model.set({ 
-            name: cName,
-            start_days: cStartDays,
-            end_days: cEndDays,
-            base_rate: cBaseRate,
-            per_registrant: cPerRegistrant,
-            registrant_credits: cRegistrantCredits
-        });
+
+        this.model.set(formData);
         
         // Get parent for id to send to backend for new rate
         var parentClass = this.model.get( 'parent' ); 
@@ -53,17 +52,12 @@ app.Views.Admin.RegRate = Backbone.View.extend({
         // Try to save the registration rate
         var newID = false;
         myself = this;
-        this.model.save({ 
-            wait: true,
-            option: 'add', 
-            name: cName,
-            start_days: cStartDays,
-            end_days: cEndDays,
-            base_rate: cBaseRate,
-            per_registrant: cPerRegistrant,
-            registrant_credits: cRegistrantCredits
-            
-        }).success(function(data){       
+        formData.wait = true;
+        formData.option = 'add';
+                
+        this.model.save(
+            formData
+        ).success(function(data){       
             if (data > 0) {
                 console.log('AJAX Rate Save Successful: ID = '+data);
                 myself.model.set({id: data});
@@ -117,22 +111,13 @@ app.Views.Admin.RegRate = Backbone.View.extend({
     
     update: function() {
         console.log('update called');
-        var cName  = this.$('.rate-name').val().trim();
-        var cStartDays  = this.$('.rate-start-days').val().trim();
-        var cEndDays  = this.$('.rate-end-days').val().trim();
-        var cBaseRate  = this.$('.rate-base-rate').val().trim();
-        var cPerRegistrant  = this.$('.rate-per-registrant').val().trim();
-        var cRegistrantCredits  = this.$('.rate-registrant-credits').val().trim();
         
-        if (!this.model.save({ 
-                option: 'update', 
-                name: cName,
-                start_days: cStartDays,
-                end_days: cEndDays,
-                base_rate: cBaseRate,
-                per_registrant: cPerRegistrant,
-                registrant_credits: cRegistrantCredits                
-            })) {
+        var formData = this.getInputData();
+        
+        formData.option = 'update';
+        if (!this.model.save(
+            formData
+        )) {
             console.log('Rate Save Error');
         } else {
             console.log('Rate Save Successful');

diff --git a/views/admin/registrations/eventEditLevels.html b/views/admin/registrations/eventEditLevels.html
index bf9198e..f5430d9 100644 (file)
--- a/views/admin/registrations/eventEditLevels.html
+++ b/views/admin/registrations/eventEditLevels.html
@@ -75,7 +75,7 @@
                     </div>
                     <div class="glm-rate-label" style="margin-bottom: .5em;">
                         <h3><%= name %></h3>
-                        <p>Start Days: <%= start_days %>, End Days: <%= start_days %>, Base: <%= base_rate %>. Per-Registrant: <%= per_registrant %>. Registrant Credits: <%= registrant_credits %></p> 
+                        Start Days: <%= start_days %>, End Days: <%= end_days %>, Base: <%= base_rate %>. Per-Registrant: <%= per_registrant %>. Registrant Credits: <%= registrant_credits %> 
                     </div>
                 </div>
             </div>