[Fmsystem-commits] [14156]

[Nelson Guerra]

Revision: 14156
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14156
Author:   nelson224
Date:     2015-10-13 00:11:42 +0000 (Tue, 13 Oct 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/booking/js/booking/schedule.js

Modified: branches/dev-syncromind/booking/js/booking/schedule.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/schedule.js      2015-10-13 
00:10:51 UTC (rev 14155)
+++ branches/dev-syncromind/booking/js/booking/schedule.js      2015-10-13 
00:11:42 UTC (rev 14156)
@@ -149,11 +149,26 @@
     $('#schedule_overlay').hide().remove();
 }
 
-schedule.newAllocationForm = function(id) {
+schedule.newAllocationForm = function(args) {
        
        var oArgs = {menuaction:'booking.uiseason.wtemplate_alloc'};
-       oArgs['id'] = id;
-       oArgs['season_id'] = season_id;
+       if (typeof(args['id']) !== 'undefined')
+       {
+               oArgs['id'] = args['id'];
+       } else {
+               if (typeof(args['_from']) !== 'undefined')
+               {
+                       oArgs['_from'] = args['_from'];
+               }
+               if (typeof(args['_to']) !== 'undefined')
+               {
+                       oArgs['_to'] = args['_to'];
+               }
+               if (typeof(args['wday']) !== 'undefined')
+               {
+                       oArgs['wday'] = args['wday'];
+               }
+       }
        
        var sUrl = phpGWLink('index.php', oArgs);
        
@@ -165,14 +180,8 @@
        close: true,
        closejs:false
        });
-               
-       /*JqueryPortico.execute_ajax(requestUrl, function(result){
-               console.log(result);
-       }, {}, 'GET', 'JSON');*/
-       
 };
 
-
 /*
 colors = ['color1', 'color2', 'color3', 'color4', 'color5', 'color6', 
'color7', 'color8', 'color9', 'color10',
                  'color11', 'color12', 'color13', 'color14', 'color15', 
'color16', 'color17', 'color18', 'color19', 'color20',