fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [14556] booking: formatting code


From: Sigurd Nes
Subject: [Fmsystem-commits] [14556] booking: formatting code
Date: Thu, 10 Dec 2015 12:54:54 +0000

Revision: 14556
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14556
Author:   sigurdne
Date:     2015-12-10 12:54:52 +0000 (Thu, 10 Dec 2015)
Log Message:
-----------
booking: formatting code

Modified Paths:
--------------
    branches/dev-syncromind/booking/js/booking/allocation.js
    branches/dev-syncromind/booking/js/booking/allocation_list.js
    branches/dev-syncromind/booking/js/booking/application.js
    branches/dev-syncromind/booking/js/booking/booking.js
    branches/dev-syncromind/booking/js/booking/common.js
    branches/dev-syncromind/booking/js/booking/completed_reservation.js
    branches/dev-syncromind/booking/js/booking/datatable.js
    branches/dev-syncromind/booking/js/booking/document.js
    branches/dev-syncromind/booking/js/booking/email_send.js
    branches/dev-syncromind/booking/js/booking/event.js
    branches/dev-syncromind/booking/js/booking/group_new.js
    branches/dev-syncromind/booking/js/booking/permission.js
    branches/dev-syncromind/booking/js/booking/permission_root.js
    branches/dev-syncromind/booking/js/booking/report.js
    branches/dev-syncromind/booking/js/booking/resource_new.js
    branches/dev-syncromind/booking/js/booking/schedule.js
    branches/dev-syncromind/booking/js/booking/season.js
    branches/dev-syncromind/booking/js/booking/season.wtemplate.js

Modified: branches/dev-syncromind/booking/js/booking/allocation.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/allocation.js    2015-12-10 
10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/allocation.js    2015-12-10 
12:54:52 UTC (rev 14556)
@@ -1,103 +1,44 @@
 var building_id_selection = "";
-$(document).ready(function() {
-    
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
 
-                                                  'field_building_name', 
'field_building_id', 'building_container');
+$(document).ready(function () {
+       
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
+                       'field_building_name', 'field_building_id', 
'building_container');
 
-    
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
 
-                                         'field_org_name', 'field_org_id', 
'org_container');
+       
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
+                       'field_org_name', 'field_org_id', 'org_container');
 });
 
 
-$(window).load(function() {
-    var building_id = $('#field_building_id').val();
-    if(building_id) {
-        populateSelectSeason(building_id, season_id);
-        populateTableChkResources(building_id, initialSelection);
-        building_id_selection = building_id;
-    }
-    $("#field_building_name").on("autocompleteselect", function(event, ui){
-        var building_id = ui.item.value;        
-        if (building_id != building_id_selection){
-            populateSelectSeason(building_id, '');
-            populateTableChkResources(building_id, []);
-            building_id_selection = building_id;
-        }
-    });
+$(window).load(function () {
+       var building_id = $('#field_building_id').val();
+       if (building_id) {
+               populateSelectSeason(building_id, season_id);
+               populateTableChkResources(building_id, initialSelection);
+               building_id_selection = building_id;
+       }
+       $("#field_building_name").on("autocompleteselect", function (event, ui) 
{
+               var building_id = ui.item.value;
+               if (building_id != building_id_selection) {
+                       populateSelectSeason(building_id, '');
+                       populateTableChkResources(building_id, []);
+                       building_id_selection = building_id;
+               }
+       });
 });
 
-function populateSelectSeason (building_id, selection) {
-    var url = 
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' +  
building_id + '&phpgw_return_as=json&';
-    var container = $('#season_container');
-    var attr = [{name: 'name',value: 'season_id'},{name: 'data-validation', 
value: 'required'},{name: 'data-validation-error-msg', value: 'Please select a 
season'}];
-    populateSelect(url, selection, container, attr);
+function populateSelectSeason(building_id, selection) {
+       var url = 
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' + 
building_id + '&phpgw_return_as=json&';
+       var container = $('#season_container');
+       var attr = [{name: 'name', value: 'season_id'}, {name: 
'data-validation', value: 'required'}, {name: 'data-validation-error-msg', 
value: 'Please select a season'}];
+       populateSelect(url, selection, container, attr);
 }
-function populateTableChkResources (building_id, selection) {
-    var url = 
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' + 
 building_id + '&phpgw_return_as=json&';
-    var container = 'resources_container';
-    var colDefsResources = [{label: '', object: [{type: 'input', attrs: 
[{name: 'type', value: 'checkbox'},{name: 'name', value: 'resources[]'},{name: 
'data-validation', value: 'checkbox_group'},{name: 'data-validation-qty', 
value: 'min1'},{name: 'data-validation-error-msg', value: 'Please choose at 
least 1 resource'}]}], value: 'id', checked: selection},{key: 'name', label: 
lang['Name']}, {key: 'type', label: lang['Resource Type']}];
-    populateTableChk(url, container, colDefsResources);
+function populateTableChkResources(building_id, selection) {
+       var url = 
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' + 
building_id + '&phpgw_return_as=json&';
+       var container = 'resources_container';
+       var colDefsResources = [{label: '', object: [{type: 'input', attrs: 
[{name: 'type', value: 'checkbox'}, {name: 'name', value: 'resources[]'}, 
{name: 'data-validation', value: 'checkbox_group'}, {name: 
'data-validation-qty', value: 'min1'}, {name: 'data-validation-error-msg', 
value: 'Please choose at least 1 resource'}]}], value: 'id', checked: 
selection}, {key: 'name', label: lang['Name']}, {key: 'type', label: 
lang['Resource Type']}];
+       populateTableChk(url, container, colDefsResources);
 }
 
-function populateTableChk (url, container, colDefs) {    
-    createTable(container,url,colDefs);
+function populateTableChk(url, container, colDefs) {
+       createTable(container, url, colDefs);
 }
 
-
-/*
-populateSeasonTable = function(building_id, selection) {
-    YAHOO.booking.radioTableHelper('season_container', 
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' +  
building_id + '&phpgw_return_as=json&',
-    'season_id', selection);
-}
-
-populateResourceTable = function(building_id, selection) {
-    YAHOO.booking.checkboxTableHelper('resources_container', 
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' + 
 building_id + '&phpgw_return_as=json&',
-    'resources[]', selection, {additional_fields: [{key: 'type', label: 
lang['Resource Type']}]});
-}
-
-YAHOO.util.Event.addListener(window, "load", function() {
-    var building_id = YAHOO.util.Dom.get('field_building_id').value;
-    if(building_id) {
-               populateSeasonSelect(building_id, [YAHOO.booking.season_id * 
1]); 
-        populateResourceTable(building_id, YAHOO.booking.initialSelection);
-    }
-    var ac = 
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
 
-                                              'field_building_name', 
'field_building_id', 'building_container');
-    // Update the resource table as soon a new building is selected
-    ac.itemSelectEvent.subscribe(function(sType, aArgs) {
-               populateSeasonSelect(aArgs[2].id, YAHOO.booking.season_id); 
-        populateResourceTable(aArgs[2].id, []);
-    });
-    
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
 
-                                     'field_org_name', 'field_org_id', 
'org_container');
-});
-
-populateSeasonSelect = function(building_id, selection) {
-       var url = 
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' +  
building_id + '&phpgw_return_as=json&';
-       YAHOO.util.Connect.asyncRequest('GET', url, 
-       {
-               success: function(o) {
-                       var result = 
eval('x='+o.responseText)['ResultSet']['Result'];
-                       var container = YAHOO.util.Dom.get('season_container');
-                       container.innerHTML = '';
-                       var select = document.createElement('select');
-                       container.appendChild(select);
-                       select.setAttribute('name', 'season_id');
-                       var option = document.createElement('option');
-                       option.setAttribute('value', '');
-                       option.appendChild(document.createTextNode('-----'));
-                       select.appendChild(option);
-                       for(var i in result) {
-                               var option = document.createElement('option');
-                               select.appendChild(option);
-                               
option.appendChild(document.createTextNode(result[i]['name']));
-                               option.setAttribute('value', result[i]['id']);
-                               if(result[i]['id'] == selection) {
-                                       option.selected = true;
-                               }
-                       }
-               },
-               failure: function(o) {alert('nay' + o)},
-               argument: this
-       });
-}
-*/
\ No newline at end of file

Modified: branches/dev-syncromind/booking/js/booking/allocation_list.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/allocation_list.js       
2015-12-10 10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/allocation_list.js       
2015-12-10 12:54:52 UTC (rev 14556)
@@ -1,7 +1,7 @@
 var seasonFilterBuildingId = false;
 
 function updateBuildingFilter(sType, aArgs) {
-       YAHOO.util.Dom.get("filter_season_name").value = ""; 
+       YAHOO.util.Dom.get("filter_season_name").value = "";
        YAHOO.util.Dom.get("filter_season_id").value = "";
        seasonFilterBuildingId = aArgs[2].id;
 }
@@ -11,5 +11,5 @@
 }
 
 function requestWithBuildingFilter(sQuery) {
-       return 'query=' + sQuery + (seasonFilterBuildingId ? 
'&filter_building_id='+seasonFilterBuildingId : '');
+       return 'query=' + sQuery + (seasonFilterBuildingId ? 
'&filter_building_id=' + seasonFilterBuildingId : '');
 }

Modified: branches/dev-syncromind/booking/js/booking/application.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/application.js   2015-12-10 
10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/application.js   2015-12-10 
12:54:52 UTC (rev 14556)
@@ -1,421 +1,269 @@
 var building_id_selection = "";
 var regulations_select_all = "";
 
-$(document).ready(function() {
-    
JqueryPortico.autocompleteHelper('bookingfrontend/?menuaction=bookingfrontend.uibuilding.index&phpgw_return_as=json&',
-                                                  'field_building_name', 
'field_building_id', 'building_container');
+$(document).ready(function () {
+       
JqueryPortico.autocompleteHelper('bookingfrontend/?menuaction=bookingfrontend.uibuilding.index&phpgw_return_as=json&',
+                       'field_building_name', 'field_building_id', 
'building_container');
 
-    $("#field_activity").change(function(){
+       $("#field_activity").change(function () {
                var building_id = $('#field_building_id').val();
-               if(building_id)
+               if (building_id)
                {
                        populateTableChkResources(building_id, 
initialSelection);
                }
 
-               var oArgs = 
{menuaction:'bookingfrontend.uiapplication.get_activity_data', 
activity_id:$(this).val()};
-        var requestUrl = phpGWLink('bookingfrontend/', oArgs, true);
+               var oArgs = {menuaction: 
'bookingfrontend.uiapplication.get_activity_data', activity_id: $(this).val()};
+               var requestUrl = phpGWLink('bookingfrontend/', oArgs, true);
 
-        $.ajax({
-            type: 'POST',
-            dataType: 'json',
-            url: requestUrl,
-            success: function(data) {
-                var html_agegroups = '';
-                var html_audience = '';
-                
-                if( data != null)
-                {
-                    var agegroups = data.agegroups;
-                    for ( var i = 0; i < agegroups.length; ++i )
-                    {
-                        html_agegroups += "<tr>";
-                        html_agegroups += "<th>" + agegroups[i]['name'] + 
"</th>";
-                        html_agegroups += "<td>";
-                        html_agegroups += "<input class=\"input50\" 
type=\"text\" name='male[" +agegroups[i]['id'] + "]' value='0'></input>";
-                        html_agegroups += "</td>";
-                        html_agegroups += "<td>";
-                        html_agegroups += "<input class=\"input50\" 
type=\"text\" name='female[" +agegroups[i]['id'] + "]' value='0'></input>";
-                        html_agegroups += "</td>";
-                        html_agegroups += "</tr>";
-                    }
-                    $("#agegroup_tbody").html( html_agegroups );
+               $.ajax({
+                       type: 'POST',
+                       dataType: 'json',
+                       url: requestUrl,
+                       success: function (data) {
+                               var html_agegroups = '';
+                               var html_audience = '';
 
-                    var audience = data.audience;
-                    var checked = '';
-                    for ( var i = 0; i < audience.length; ++i )
-                    {
-                        checked = '';
-                        if (initialAudience) {
-                            for ( var j = 0; j < initialAudience.length; ++j )
-                            {
-                                if(audience[i]['id'] == initialAudience[j])
-                                {
-                                    checked = " checked='checked'";
-                                }
-                            }
-                        }
-                        html_audience += "<li>";
-                        html_audience += "<label>";
-                        html_audience += "<input type=\"radio\" 
name=\"audience[]\" value='" +audience[i]['id'] + "'" + checked+ "></input>";
-                        html_audience += audience[i]['name'];
-                        html_audience += "</label>";
-                        html_audience += "</li>";
-                    }
-                    $("#audience").html( html_audience );
-                }
-            }
-        });
-    });
+                               if (data != null)
+                               {
+                                       var agegroups = data.agegroups;
+                                       for (var i = 0; i < agegroups.length; 
++i)
+                                       {
+                                               html_agegroups += "<tr>";
+                                               html_agegroups += "<th>" + 
agegroups[i]['name'] + "</th>";
+                                               html_agegroups += "<td>";
+                                               html_agegroups += "<input 
class=\"input50\" type=\"text\" name='male[" + agegroups[i]['id'] + "]' 
value='0'></input>";
+                                               html_agegroups += "</td>";
+                                               html_agegroups += "<td>";
+                                               html_agegroups += "<input 
class=\"input50\" type=\"text\" name='female[" + agegroups[i]['id'] + "]' 
value='0'></input>";
+                                               html_agegroups += "</td>";
+                                               html_agegroups += "</tr>";
+                                       }
+                                       
$("#agegroup_tbody").html(html_agegroups);
 
+                                       var audience = data.audience;
+                                       var checked = '';
+                                       for (var i = 0; i < audience.length; 
++i)
+                                       {
+                                               checked = '';
+                                               if (initialAudience) {
+                                                       for (var j = 0; j < 
initialAudience.length; ++j)
+                                                       {
+                                                               if 
(audience[i]['id'] == initialAudience[j])
+                                                               {
+                                                                       checked 
= " checked='checked'";
+                                                               }
+                                                       }
+                                               }
+                                               html_audience += "<li>";
+                                               html_audience += "<label>";
+                                               html_audience += "<input 
type=\"radio\" name=\"audience[]\" value='" + audience[i]['id'] + "'" + checked 
+ "></input>";
+                                               html_audience += 
audience[i]['name'];
+                                               html_audience += "</label>";
+                                               html_audience += "</li>";
+                                       }
+                                       $("#audience").html(html_audience);
+                               }
+                       }
+               });
+       });
+
 });
 
-$(window).load(function(){
-    building_id = $('#field_building_id').val();
-    regulations_select_all = initialAcceptAllTerms;
-    resources = initialSelection;
-    if (building_id) {
-        populateTableChkResources(building_id, initialSelection);
-        populateTableChkRegulations(building_id, initialDocumentSelection, 
resources);
-        building_id_selection = building_id;
-    }
-    $("#field_building_name").on("autocompleteselect", function(event, ui){
-        var building_id = ui.item.value;
-        var selection = [];
-        var resources = [];
-        if (building_id != building_id_selection){
-            populateTableChkResources(building_id, initialSelection);
-            populateTableChkRegulations(building_id, selection, resources);
-            building_id_selection = building_id;
-        }
-    });
-    $('#resources_container').on('change', '.chkRegulations', function(){
-        var resources = new Array();
-        $('#resources_container 
input[name="resources[]"]:checked').each(function() {
-            resources.push($(this).val());
-        });
-        var selection = [];
-        populateTableChkRegulations(building_id_selection, selection, 
resources);
-    });
-    
-    if (!$.formUtils) {
-        $('#application_form').submit(function(e){
-            if(!validate_documents()){
-                e.preventDefault();
-                alert(lang['You must accept to follow all terms and conditions 
of lease first.']);
-            }
-        });
-    }
+$(window).load(function () {
+       building_id = $('#field_building_id').val();
+       regulations_select_all = initialAcceptAllTerms;
+       resources = initialSelection;
+       if (building_id) {
+               populateTableChkResources(building_id, initialSelection);
+               populateTableChkRegulations(building_id, 
initialDocumentSelection, resources);
+               building_id_selection = building_id;
+       }
+       $("#field_building_name").on("autocompleteselect", function (event, ui) 
{
+               var building_id = ui.item.value;
+               var selection = [];
+               var resources = [];
+               if (building_id != building_id_selection) {
+                       populateTableChkResources(building_id, 
initialSelection);
+                       populateTableChkRegulations(building_id, selection, 
resources);
+                       building_id_selection = building_id;
+               }
+       });
+       $('#resources_container').on('change', '.chkRegulations', function () {
+               var resources = new Array();
+               $('#resources_container 
input[name="resources[]"]:checked').each(function () {
+                       resources.push($(this).val());
+               });
+               var selection = [];
+               populateTableChkRegulations(building_id_selection, selection, 
resources);
+       });
+
+       if (!$.formUtils) {
+               $('#application_form').submit(function (e) {
+                       if (!validate_documents()) {
+                               e.preventDefault();
+                               alert(lang['You must accept to follow all terms 
and conditions of lease first.']);
+                       }
+               });
+       }
 });
 
 if ($.formUtils) {
-    $.formUtils.addValidator({
-        name: 'regulations_documents',
-        validatorFunction: function(value, $el, config, language, $form) {
-            var n = 0;
-            $('#regulation_documents 
input[name="accepted_documents[]"]').each(function(){
-                if(!$(this).is(':checked')) {
-                    n++;
-                }
-            });
-            var v = (n == 0) ? true : false;
-            return v;
-        },
-        errorMessage: 'You must accept to follow all terms and conditions of 
lease first.',
-        errorMessageKey: 'regulations_documents'
-    });
+       $.formUtils.addValidator({
+               name: 'regulations_documents',
+               validatorFunction: function (value, $el, config, language, 
$form) {
+                       var n = 0;
+                       $('#regulation_documents 
input[name="accepted_documents[]"]').each(function () {
+                               if (!$(this).is(':checked')) {
+                                       n++;
+                               }
+                       });
+                       var v = (n == 0) ? true : false;
+                       return v;
+               },
+               errorMessage: 'You must accept to follow all terms and 
conditions of lease first.',
+               errorMessageKey: 'regulations_documents'
+       });
 
-    $.formUtils.addValidator({
-        name: 'target_audience',
-        validatorFunction: function(value, $el, config, language, $form) {
-            var n = 0;
-            $('#audience input[name="audience[]"]').each(function(){
-               if ($(this).is(':checked')) {
-                   n++;
-               }
-            });
-            var v = (n > 0) ? true : false;
-            return v;
-        },
-        errorMessage: 'Please choose at least 1 target audience',
-        errorMessageKey: 'target_audience'
-    });
-    
-    $.formUtils.addValidator({
-        name: 'application_resources',
-        validatorFunction: function(value, $el, config, language, $form) {
-            var n = 0;
-            $('#resources_container table 
input[name="resources[]"]').each(function(){
-               if ($(this).is(':checked')) {
-                   n++;
-               }
-            });
-            var v = (n > 0) ? true : false;
-            return v;
-        },
-        errorMessage: 'Please choose at least 1 resource',
-        errorMessageKey: 'application_resources'
-    });
+       $.formUtils.addValidator({
+               name: 'target_audience',
+               validatorFunction: function (value, $el, config, language, 
$form) {
+                       var n = 0;
+                       $('#audience input[name="audience[]"]').each(function 
() {
+                               if ($(this).is(':checked')) {
+                                       n++;
+                               }
+                       });
+                       var v = (n > 0) ? true : false;
+                       return v;
+               },
+               errorMessage: 'Please choose at least 1 target audience',
+               errorMessageKey: 'target_audience'
+       });
 
-    $.formUtils.addValidator({
-        name: 'number_participants',
-        validatorFunction: function(value, $el, config, language, $form) {
-            var n = 0;
-            $('#agegroup_tbody input').each(function() {
-                if ($(this).val() != "" && $(this).val() > 0) {
-                    n++;
-                } 
-            });
-            var v = (n > 0) ? true : false;
-            return v;
-        },
-        errorMessage: 'Number of participants is required',
-        errorMessageKey: 'number_participants'
-    });
+       $.formUtils.addValidator({
+               name: 'application_resources',
+               validatorFunction: function (value, $el, config, language, 
$form) {
+                       var n = 0;
+                       $('#resources_container table 
input[name="resources[]"]').each(function () {
+                               if ($(this).is(':checked')) {
+                                       n++;
+                               }
+                       });
+                       var v = (n > 0) ? true : false;
+                       return v;
+               },
+               errorMessage: 'Please choose at least 1 resource',
+               errorMessageKey: 'application_resources'
+       });
 
-    $.formUtils.addValidator({
-        name: 'customer_identifier',
-        validatorFunction: function(value, $el, config, language, $form) {
-            var v = false;
-            var customer_ssn = $('#field_customer_ssn').val();
-            var customer_organization_number = 
$('#field_customer_organization_number').val();
-            if (customer_ssn != "" || customer_organization_number != "") {
-                v = true;
-            }
-            return v;
-       },
-       errorMessage: 'Customer identifier type is required',
-       errorMessageKey: 'customer_identifier'
-    });
+       $.formUtils.addValidator({
+               name: 'number_participants',
+               validatorFunction: function (value, $el, config, language, 
$form) {
+                       var n = 0;
+                       $('#agegroup_tbody input').each(function () {
+                               if ($(this).val() != "" && $(this).val() > 0) {
+                                       n++;
+                               }
+                       });
+                       var v = (n > 0) ? true : false;
+                       return v;
+               },
+               errorMessage: 'Number of participants is required',
+               errorMessageKey: 'number_participants'
+       });
 
-    $.formUtils.addValidator({
-        name: 'application_dates',
-        validatorFunction: function(value, $el, config, language, $form) {
-            var n = 0;
-            if ($('input[name="from_[]"]').length == 0 || 
$('input[name="from_[]"]').length == 0) {
-                return false;
-            }
-            $('input[name="from_[]"]').each(function(){
-                if ($(this).val() == "") {
-                    $($(this).addClass("error").css("border-color","red"));
-                    n++;
-                } else {
-                    $($(this).removeClass("error").css("border-color",""));
-                }
-            });
-            $('input[name="to_[]"]').each(function(){
-                if ($(this).val() == "") {
-                    $($(this).addClass("error").css("border-color","red"));
-                    n++;
-                } else {
-                    $($(this).removeClass("error").css("border-color",""));
-                }
-            });
-            var v = (n == 0) ? true : false;
-            return v;
-        },
-        errorMessage: 'Invalid date',
-        errorMessageKey: 'application_dates'
-    });
+       $.formUtils.addValidator({
+               name: 'customer_identifier',
+               validatorFunction: function (value, $el, config, language, 
$form) {
+                       var v = false;
+                       var customer_ssn = $('#field_customer_ssn').val();
+                       var customer_organization_number = 
$('#field_customer_organization_number').val();
+                       if (customer_ssn != "" || customer_organization_number 
!= "") {
+                               v = true;
+                       }
+                       return v;
+               },
+               errorMessage: 'Customer identifier type is required',
+               errorMessageKey: 'customer_identifier'
+       });
+
+       $.formUtils.addValidator({
+               name: 'application_dates',
+               validatorFunction: function (value, $el, config, language, 
$form) {
+                       var n = 0;
+                       if ($('input[name="from_[]"]').length == 0 || 
$('input[name="from_[]"]').length == 0) {
+                               return false;
+                       }
+                       $('input[name="from_[]"]').each(function () {
+                               if ($(this).val() == "") {
+                                       
$($(this).addClass("error").css("border-color", "red"));
+                                       n++;
+                               } else {
+                                       
$($(this).removeClass("error").css("border-color", ""));
+                               }
+                       });
+                       $('input[name="to_[]"]').each(function () {
+                               if ($(this).val() == "") {
+                                       
$($(this).addClass("error").css("border-color", "red"));
+                                       n++;
+                               } else {
+                                       
$($(this).removeClass("error").css("border-color", ""));
+                               }
+                       });
+                       var v = (n == 0) ? true : false;
+                       return v;
+               },
+               errorMessage: 'Invalid date',
+               errorMessageKey: 'application_dates'
+       });
 } else {
-    function validate_documents() {
-        var n = 0;
-        $('#regulation_documents 
input[name="accepted_documents[]"]').each(function(){
-             if(!$(this).is(':checked')) {
-                 n++;
-             }
-        });
-        var v = (n == 0) ? true : false;
-        return v;
-    }
+       function validate_documents() {
+               var n = 0;
+               $('#regulation_documents 
input[name="accepted_documents[]"]').each(function () {
+                       if (!$(this).is(':checked')) {
+                               n++;
+                       }
+               });
+               var v = (n == 0) ? true : false;
+               return v;
+       }
 }
 
-function populateTableChkResources (building_id, selection) {
-       oArgs = {menuaction: 'bookingfrontend.uiresource.index_json', 
sort:'name', filter_building_id:building_id, sub_activity_id: 
$("#field_activity").val()};
+function populateTableChkResources(building_id, selection) {
+       oArgs = {menuaction: 'bookingfrontend.uiresource.index_json', sort: 
'name', filter_building_id: building_id, sub_activity_id: 
$("#field_activity").val()};
        var url = phpGWLink('bookingfrontend/', oArgs, true);
-    var container = 'resources_container';
-    var colDefsResources = [{label: '', object: [{type: 'input', attrs: 
[{name: 'type', value: 'checkbox'},{name: 'name', value: 'resources[]'},{name: 
'class', value: 'chkRegulations'}]}], value: 'id', checked: selection},{key: 
'name', label: lang['Name']}, {key: 'type', label: lang['Resource Type']}];
-    populateTableResources(url, container, colDefsResources);
+       var container = 'resources_container';
+       var colDefsResources = [{label: '', object: [{type: 'input', attrs: 
[{name: 'type', value: 'checkbox'}, {name: 'name', value: 'resources[]'}, 
{name: 'class', value: 'chkRegulations'}]}], value: 'id', checked: selection}, 
{key: 'name', label: lang['Name']}, {key: 'type', label: lang['Resource 
Type']}];
+       populateTableResources(url, container, colDefsResources);
 }
 
-function populateTableChkRegulations (building_id, selection, resources) {
-    var url = 
'index.php?menuaction=booking.uidocument_view.regulations&sort=name&phpgw_return_as=json&owner[]=building::'+building_id;
-    for(var r in resources) {
-        url += '&owner[]=resource::'+resources[r];
-    }
-    var container = 'regulation_documents';
-    var colDefsRegulations = [{label: lang['Accepted'], object: [{type: 
'input', attrs: [{name: 'type', value: 'checkbox'},{name: 'name', value: 
'accepted_documents[]'}]}], value: 'id', checked: selection},{key: 
'name',label: lang['Document'],formatter: genericLink}];
-    if (regulations_select_all){
-        
colDefsRegulations[0]['object'][0]['attrs'].push({name:'checked',value: 
'checked'});
-    }
-    regulations_select_all = false;
-    populateTableRegulations(url, container, colDefsRegulations);
+function populateTableChkRegulations(building_id, selection, resources) {
+       var url = 
'index.php?menuaction=booking.uidocument_view.regulations&sort=name&phpgw_return_as=json&owner[]=building::'
 + building_id;
+       for (var r in resources) {
+               url += '&owner[]=resource::' + resources[r];
+       }
+       var container = 'regulation_documents';
+       var colDefsRegulations = [{label: lang['Accepted'], object: [{type: 
'input', attrs: [{name: 'type', value: 'checkbox'}, {name: 'name', value: 
'accepted_documents[]'}]}], value: 'id', checked: selection}, {key: 'name', 
label: lang['Document'], formatter: genericLink}];
+       if (regulations_select_all) {
+               colDefsRegulations[0]['object'][0]['attrs'].push({name: 
'checked', value: 'checked'});
+       }
+       regulations_select_all = false;
+       populateTableRegulations(url, container, colDefsRegulations);
 }
 
-function populateTableResources (url, container, colDefs) {
-    if (typeof tableClass !== 'undefined') {
-        createTable(container,url,colDefs,'results', tableClass);
-    } else {
-        createTable(container,url,colDefs,'results');
-    }
+function populateTableResources(url, container, colDefs) {
+       if (typeof tableClass !== 'undefined') {
+               createTable(container, url, colDefs, 'results', tableClass);
+       } else {
+               createTable(container, url, colDefs, 'results');
+       }
 }
 
-function populateTableRegulations (url, container, colDefs) {
-    if (typeof tableClass !== 'undefined') {
-        createTable(container,url,colDefs,'', tableClass);
-    } else {
-        createTable(container,url,colDefs);
-    }
-    
-}
-
-
-/*
-YAHOO.booking.RegulationsTable = function() { 
-       this.building_id = null;
-       this.resources = [];
-       this.container = 'regulation_documents';
-       this.selection = [];
-       this.doAcceptAll = false;
-       this.audience = [];
-};
-
-YAHOO.booking.RegulationsTable.prototype.update = function() {
-       var url = 
'index.php?menuaction=booking.uidocument_view.regulations&sort=name&phpgw_return_as=json&owner[]=building::'+this.building_id;
-
-       for(var r in this.resources) {
-               url += '&owner[]=resource::'+this.resources[r];
+function populateTableRegulations(url, container, colDefs) {
+       if (typeof tableClass !== 'undefined') {
+               createTable(container, url, colDefs, '', tableClass);
+       } else {
+               createTable(container, url, colDefs);
        }
 
-       var colDefs = [{key: 'name', label: lang['Name'], formatter: 
YAHOO.booking.formatLink}];
-       var options = {
-               defaultChecked: this.doAcceptAll,
-               selectionFieldOptions: {label: lang['Accepted']},
-               nameFieldOptions: {formatter: YAHOO.booking.formatLink, label: 
lang['Document']},
-               additional_fields: [{key: 'link', hidden: true}]
-       };
-       this.doAcceptAll = false;
-       YAHOO.booking.checkboxTableHelper(this.container, url, 
'accepted_documents[]', this.selection, options);
-};
-
-YAHOO.booking.RegulationsTable.prototype.setBuildingId = function(building_id) 
{
-       this.building_id = building_id;
-};
-
-YAHOO.booking.RegulationsTable.prototype.setResources = function(resources) {
-       this.resources = resources || [];
-};
-
-YAHOO.booking.RegulationsTable.prototype.setAudience = function(audience) {
-       this.audience = audience || [];
-};
-
-YAHOO.booking.RegulationsTable.prototype.setSelection = function(selection) {
-       this.selection = selection || [];
-};
-
-YAHOO.booking.RegulationsTable.prototype.allAccepted = function() {
-       return YAHOO.util.Dom.getElementsBy(function(e){return !e.checked;}, 
'input', this.container).length == 0;
 }
-
-YAHOO.booking.RegulationsTable.prototype.checkAll = function() {
-       this.doAcceptAll = true;
-}
-
-var regulationsTable = new YAHOO.booking.RegulationsTable();
-
-populateResourceTable = function(building_id, selection) {
-    YAHOO.booking.checkboxTableHelper('resources_container', 
'index.php?menuaction=bookingfrontend.uiresource.index_json&sort=name&filter_building_id='
 +  building_id + '&phpgw_return_as=json&',
-    'resources[]', selection, {
-               additional_fields: [{key: 'type', label: lang['Resource 
Type']}], 
-               onSelectionChanged: function(selectedItems) { 
regulationsTable.setResources(selectedItems); regulationsTable.update(); } 
-        });
-}
-
-populateAudienceTable = function(building_id, selection) {
-    //YAHOO.booking.checkboxTableHelper('audience_container', 
'index.php?menuaction=booking.uiaudience.index_json&sort=name&phpgw_return_as=json&',
-    YAHOO.booking.checkboxTableHelper('audience_container', 
'index.php?menuaction=booking.uiaudience.index&phpgw_return_as=json',
-    'audience[]', selection);
-}
-
-removeDateRow = function(e) {
-       this.parentNode.parentNode.removeChild(this.parentNode);
-       YAHOO.util.Event.stopEvent(e);
-}
-
-var createFromToDatePickerSection = function(containerEl) {
-       if (!this.counter) { this.counter = 0; }
-       containerEl.className = 'date-container';
-       containerEl.innerHTML = '                                               
        ' +
-'                      <a href="#" class="close-btn">-</a>             ' +
-'                      <div><label>'+lang['From']+'</label></div>              
                ' +
-'                      <div class="datetime-picker">                   ' +
-'                              <input id="js_date_'+this.counter+'_from" 
type="text" name="from_[]">   ' +
-'                      </div>                                                  
                ' +
-'                      <div><label>'+lang['To']+'</label></div>                
                ' +
-'                      <div class="datetime-picker">                   ' +
-'                              <input id="js_date_'+this.counter+'_to" 
type="text" name="to_[]">       ' +
-'                      </div>';
-       this.counter++;
-}
-
-YAHOO.util.Event.addListener(window, "load", function() {
-       var Dom = YAHOO.util.Dom;
-    var building_id = Dom.get('field_building_id').value;
-       
-    if(building_id) {
-               populateResourceTable(building_id, 
YAHOO.booking.initialSelection);
-               regulationsTable.setBuildingId(building_id);
-               regulationsTable.setResources(YAHOO.booking.initialSelection);
-               
regulationsTable.setSelection(YAHOO.booking.initialDocumentSelection);
-               regulationsTable.setAudience(YAHOO.booking.initialAudience);
-               
-               if (YAHOO.booking.initialAcceptAllTerms) {
-                       regulationsTable.checkAll();
-               }
-               
-               regulationsTable.update();
-    }
-       populateAudienceTable(building_id, YAHOO.booking.initialAudience);
-
-    var ac = 
YAHOO.booking.autocompleteHelper('index.php?menuaction=bookingfrontend.uibuilding.index&phpgw_return_as=json&',
 
-                                              'field_building_name', 
'field_building_id', 'building_container');
-    // Update the resource table as soon a new building is selected
-    ac.itemSelectEvent.subscribe(function(sType, aArgs) {
-        populateResourceTable(aArgs[2].id, []);
-                 regulationsTable.setBuildingId(aArgs[2].id);
-                 regulationsTable.setResources([]);
-                 regulationsTable.update();
-    });
-       Dom.getElementsByClassName('close-btn', 'a', null, function(a) {
-               a.onclick = removeDateRow;
-       });
-       // Add more From-To datepicker pairs when the user clicks on the add 
link/button
-       YAHOO.util.Event.addListener("add-date-link", "click", function(e) {
-               var container = Dom.get('dates-container');
-               var div = document.createElement('div');
-
-               createFromToDatePickerSection(div);     
-       
-               container.appendChild(div);
-               var a = div.getElementsByTagName('a')[0];
-               a.onclick = removeDateRow;
-               YAHOO.booking.setupDatePickers();
-               YAHOO.util.Event.stopEvent(e);
-       }); 
-       
-       
-       YAHOO.util.Event.addListener('application_form', "submit", function(e) {
-               if (!regulationsTable.allAccepted()) {
-                       YAHOO.util.Event.stopEvent(e);
-                       alert(lang['You must accept to follow all terms and 
conditions of lease first.']);
-               }
-   });
-
-
-    YAHOO.util.Event.addListener("field_customer_identifier_type", "change", 
function(e) {
-
-    });
-
-});
-
-*/
\ No newline at end of file

Modified: branches/dev-syncromind/booking/js/booking/booking.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/booking.js       2015-12-10 
10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/booking.js       2015-12-10 
12:54:52 UTC (rev 14556)
@@ -1,277 +1,169 @@
 var building_id_selection = "";
 var organization_id_selection = "";
-$(document).ready(function() {
-    
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
 
-                                                  'field_building_name', 
'field_building_id', 'building_container');
+$(document).ready(function () {
+       
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
+                       'field_building_name', 'field_building_id', 
'building_container');
 
-    
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
 
-                                         'field_org_name', 'field_org_id', 
'org_container');
+       
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
+                       'field_org_name', 'field_org_id', 'org_container');
 
-    $("#field_activity").change(function(){
-        var oArgs = 
{menuaction:'bookingfrontend.uiapplication.get_activity_data', 
activity_id:$(this).val()};
-        var requestUrl = phpGWLink('bookingfrontend/', oArgs, true);
+       $("#field_activity").change(function () {
+               var oArgs = {menuaction: 
'bookingfrontend.uiapplication.get_activity_data', activity_id: $(this).val()};
+               var requestUrl = phpGWLink('bookingfrontend/', oArgs, true);
 
-        $.ajax({
-            type: 'POST',
-            dataType: 'json',
-            url: requestUrl,
-            success: function(data) {
-                var html_agegroups = '';
-                var html_audience = '';
+               $.ajax({
+                       type: 'POST',
+                       dataType: 'json',
+                       url: requestUrl,
+                       success: function (data) {
+                               var html_agegroups = '';
+                               var html_audience = '';
 
-                if( data != null)
-                {
-                    var agegroups = data.agegroups;
-                    for ( var i = 0; i < agegroups.length; ++i )
-                    {
-                        html_agegroups += "<tr>";
-                        html_agegroups += "<th>" + agegroups[i]['name'] + 
"</th>";
-                        html_agegroups += "<td>";
-                        html_agegroups += "<input class=\"input50\" 
type=\"text\" name='male[" +agegroups[i]['id'] + "]' value='0'></input>";
-                        html_agegroups += "</td>";
-                        html_agegroups += "<td>";
-                        html_agegroups += "<input class=\"input50\" 
type=\"text\" name='female[" +agegroups[i]['id'] + "]' value='0'></input>";
-                        html_agegroups += "</td>";
-                        html_agegroups += "</tr>";
-                    }
-                    $("#agegroup_tbody").html( html_agegroups );
+                               if (data != null)
+                               {
+                                       var agegroups = data.agegroups;
+                                       for (var i = 0; i < agegroups.length; 
++i)
+                                       {
+                                               html_agegroups += "<tr>";
+                                               html_agegroups += "<th>" + 
agegroups[i]['name'] + "</th>";
+                                               html_agegroups += "<td>";
+                                               html_agegroups += "<input 
class=\"input50\" type=\"text\" name='male[" + agegroups[i]['id'] + "]' 
value='0'></input>";
+                                               html_agegroups += "</td>";
+                                               html_agegroups += "<td>";
+                                               html_agegroups += "<input 
class=\"input50\" type=\"text\" name='female[" + agegroups[i]['id'] + "]' 
value='0'></input>";
+                                               html_agegroups += "</td>";
+                                               html_agegroups += "</tr>";
+                                       }
+                                       
$("#agegroup_tbody").html(html_agegroups);
 
-                    var audience = data.audience;
-                    var checked = '';
-                    for ( var i = 0; i < audience.length; ++i )
-                    {
-                        checked = '';
-                        if (initialAudience) {
-                            for ( var j = 0; j < initialAudience.length; ++j )
-                            {
-                                if(audience[i]['id'] == initialAudience[j])
-                                {
-                                    checked = " checked='checked'";
-                                }
-                            }
-                        }
-                        html_audience += "<li>";
-                        html_audience += "<label>";
-                        html_audience += "<input type=\"radio\" 
name=\"audience[]\" value='" +audience[i]['id'] + "'" + checked+ "></input>";
-                        html_audience += audience[i]['name'];
-                        html_audience += "</label>";
-                        html_audience += "</li>";
-                    }
-                    $("#audience").html( html_audience );
-                }
-            }
-        });
-    });
+                                       var audience = data.audience;
+                                       var checked = '';
+                                       for (var i = 0; i < audience.length; 
++i)
+                                       {
+                                               checked = '';
+                                               if (initialAudience) {
+                                                       for (var j = 0; j < 
initialAudience.length; ++j)
+                                                       {
+                                                               if 
(audience[i]['id'] == initialAudience[j])
+                                                               {
+                                                                       checked 
= " checked='checked'";
+                                                               }
+                                                       }
+                                               }
+                                               html_audience += "<li>";
+                                               html_audience += "<label>";
+                                               html_audience += "<input 
type=\"radio\" name=\"audience[]\" value='" + audience[i]['id'] + "'" + checked 
+ "></input>";
+                                               html_audience += 
audience[i]['name'];
+                                               html_audience += "</label>";
+                                               html_audience += "</li>";
+                                       }
+                                       $("#audience").html(html_audience);
+                               }
+                       }
+               });
+       });
 });
 
 
-$(window).load(function() {
-    var building_id = $('#field_building_id').val();
-    var organization_id = $('#field_org_id').val();
-    if(building_id) {
-        populateSelectSeason(building_id, season_id);
-        populateTableChkResources(building_id, initialSelection);
-        building_id_selection = building_id;
-    }
-    if (organization_id) {
-        populateSelectGroup(organization_id, group_id);
-        organization_id_selection = organization_id;
-    }
-    $("#field_building_name").on("autocompleteselect", function(event, ui){
-        var building_id = ui.item.value;        
-        if (building_id != building_id_selection){
-            populateSelectSeason(building_id, '');
-            populateTableChkResources(building_id, []);
-            building_id_selection = building_id;
-        }
-    });    
-    $('#field_org_name').on('autocompleteselect', function(event, ui){
-       var organization_id = ui.item.value;
-       if (organization_id != organization_id_selection) {
-           populateSelectGroup(organization_id, '');
-           organization_id_selection = organization_id;
-       }
-    });
+$(window).load(function () {
+       var building_id = $('#field_building_id').val();
+       var organization_id = $('#field_org_id').val();
+       if (building_id) {
+               populateSelectSeason(building_id, season_id);
+               populateTableChkResources(building_id, initialSelection);
+               building_id_selection = building_id;
+       }
+       if (organization_id) {
+               populateSelectGroup(organization_id, group_id);
+               organization_id_selection = organization_id;
+       }
+       $("#field_building_name").on("autocompleteselect", function (event, ui) 
{
+               var building_id = ui.item.value;
+               if (building_id != building_id_selection) {
+                       populateSelectSeason(building_id, '');
+                       populateTableChkResources(building_id, []);
+                       building_id_selection = building_id;
+               }
+       });
+       $('#field_org_name').on('autocompleteselect', function (event, ui) {
+               var organization_id = ui.item.value;
+               if (organization_id != organization_id_selection) {
+                       populateSelectGroup(organization_id, '');
+                       organization_id_selection = organization_id;
+               }
+       });
 });
 
 if ($.formUtils) {
-    $.formUtils.addValidator({
-        name: 'target_audience',
-        validatorFunction: function(value, $el, config, languaje, $form) {
-            var n = 0;
-            $('#audience input[name="audience[]"]').each(function(){
-               if ($(this).is(':checked')) {
-                   n++;
-               }
-            });
-            var v = (n > 0) ? true : false;
-            return v;
-        },
-        errorMessage: 'Please choose at least 1 target audience',
-        errorMessageKey: ''
-    });
+       $.formUtils.addValidator({
+               name: 'target_audience',
+               validatorFunction: function (value, $el, config, languaje, 
$form) {
+                       var n = 0;
+                       $('#audience input[name="audience[]"]').each(function 
() {
+                               if ($(this).is(':checked')) {
+                                       n++;
+                               }
+                       });
+                       var v = (n > 0) ? true : false;
+                       return v;
+               },
+               errorMessage: 'Please choose at least 1 target audience',
+               errorMessageKey: ''
+       });
 
-    $.formUtils.addValidator({
-        name: 'application_resources',
-        validatorFunction: function(value, $el, config, language, $form) {
-            var n = 0;
-            $('#resources_container table 
input[name="resources[]"]').each(function(){
-               if ($(this).is(':checked')) {
-                   n++;
-               }
-            });
-            var v = (n > 0) ? true : false;
-            return v;
-        },
-        errorMessage: 'Please choose at least 1 resource',
-        errorMessageKey: 'application_resources'
-    });
-
-    $.formUtils.addValidator({
-        name: 'number_participants',
-        validatorFunction: function(value, $el, config, languaje, $form) {
-            var n = 0;
-            $('#agegroup_tbody input').each(function() {
-                if ($(this).val() != "" && $(this).val() > 0) {
-                    n++;
-                } 
-            });
-            var v = (n > 0) ? true : false;
-            return v;
-        },
-        errorMessage: 'Number of participants is required',
-        errorMessageKey: ''
-    });
-}
-
-function populateSelectSeason (building_id, selection) {
-    var url = 
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' +  
building_id + '&phpgw_return_as=json&';
-    var container = $('#season_container');
-    var attr = [{name: 'name',value: 'season_id'},{name: 'data-validation', 
value: 'required'},{name: 'data-validation-error-msg', value: lang['Please 
select a season']}];
-    populateSelect(url, selection, container, attr);
-}
-function populateSelectGroup (organization_id, selection) {
-    var url = 
'index.php?menuaction=booking.uigroup.index&filter_organization_id=' + 
organization_id + '&phpgw_return_as=json';
-    var container = $('#group_container');
-    var attr = [{name: 'name',value: 'group_id'},{name: 'data-validation', 
value: 'required'},{name: 'data-validation-error-msg', value: lang['Please 
select a group']}];
-    populateSelect(url, selection, container, attr);
-};
-function populateTableChkResources (building_id, selection) {
-    var url = 
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' + 
 building_id + '&phpgw_return_as=json&';
-    var container = 'resources_container';
-    var colDefsResources = [{label: '', object: [{type: 'input', attrs: 
[{name: 'type', value: 'checkbox'},{name: 'name', value: 'resources[]'}]}], 
value: 'id', checked: selection},{key: 'name', label: lang['Name']}, {key: 
'type', label: lang['Resource Type']}];
-    populateTableChk(url, container, colDefsResources);
-}
-
-function populateTableChk (url, container, colDefs) {    
-    createTable(container,url,colDefs);
-}
-
-
-
-
-
-/*
-populateSeasonTable = function(building_id, selection) {
-    YAHOO.booking.radioTableHelper('season_container', 
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' +  
building_id + '&phpgw_return_as=json&',
-    'season_id', selection);
-}
-
-populateResourceTable = function(building_id, selection) {
-    YAHOO.booking.checkboxTableHelper('resources_container', 
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' + 
 building_id + '&phpgw_return_as=json&',
-    'resources[]', selection, {additional_fields: [{key: 'type', label: 
lang['Resource Type']}]});
-}
-
-populateGroupSelect = function(org_id, selection) {
-       var url = 
'index.php?menuaction=booking.uigroup.index&filter_organization_id=' + org_id + 
'&phpgw_return_as=json';
-
-       YAHOO.util.Connect.asyncRequest('GET', url, 
-       {
-               success: function(o) {
-                       var result = 
eval('x='+o.responseText)['ResultSet']['Result'];
-                       var container = YAHOO.util.Dom.get('group_container');
-                       container.innerHTML = '';
-                       var select = document.createElement('select');
-                       container.appendChild(select);
-                       select.setAttribute('name', 'group_id');
-                       var option = document.createElement('option');
-                       option.setAttribute('value', '');
-                       option.appendChild(document.createTextNode('-----'));
-                       select.appendChild(option);
-                       for(var i in result) {
-                               var option = document.createElement('option');
-                               select.appendChild(option);
-                               
option.appendChild(document.createTextNode(result[i]['name']));
-                               option.setAttribute('value', result[i]['id']);
-                               if(result[i]['id'] == selection) {
-                                       option.selected = true;
+       $.formUtils.addValidator({
+               name: 'application_resources',
+               validatorFunction: function (value, $el, config, language, 
$form) {
+                       var n = 0;
+                       $('#resources_container table 
input[name="resources[]"]').each(function () {
+                               if ($(this).is(':checked')) {
+                                       n++;
                                }
-                       }
+                       });
+                       var v = (n > 0) ? true : false;
+                       return v;
                },
-               failure: function(o) {alert('nay' + o)},
-               argument: this
+               errorMessage: 'Please choose at least 1 resource',
+               errorMessageKey: 'application_resources'
        });
-}
 
-populateSeasonSelect = function(building_id, selection) {
-       var url = 
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' +  
building_id + '&phpgw_return_as=json&';
-       YAHOO.util.Connect.asyncRequest('GET', url, 
-       {
-               success: function(o) {
-                       var result = 
eval('x='+o.responseText)['ResultSet']['Result'];
-                       var container = YAHOO.util.Dom.get('season_container');
-                       container.innerHTML = '';
-                       var select = document.createElement('select');
-                       container.appendChild(select);
-                       select.setAttribute('name', 'season_id');
-                       var option = document.createElement('option');
-                       option.setAttribute('value', '');
-                       option.appendChild(document.createTextNode('-----'));
-                       select.appendChild(option);
-                       for(var i in result) {
-                               var option = document.createElement('option');
-                               select.appendChild(option);
-                               
option.appendChild(document.createTextNode(result[i]['name']));
-                               option.setAttribute('value', result[i]['id']);
-                               if(result[i]['id'] == selection) {
-                                       option.selected = true;
+       $.formUtils.addValidator({
+               name: 'number_participants',
+               validatorFunction: function (value, $el, config, languaje, 
$form) {
+                       var n = 0;
+                       $('#agegroup_tbody input').each(function () {
+                               if ($(this).val() != "" && $(this).val() > 0) {
+                                       n++;
                                }
-                       }
+                       });
+                       var v = (n > 0) ? true : false;
+                       return v;
                },
-               failure: function(o) {alert('nay' + o)},
-               argument: this
+               errorMessage: 'Number of participants is required',
+               errorMessageKey: ''
        });
 }
 
-YAHOO.util.Event.addListener(window, "load", function() {
-    var building_id = YAHOO.util.Dom.get('field_building_id').value;
-    if(building_id) {
-               populateSeasonSelect(building_id, [YAHOO.booking.season_id * 
1]);
-        populateResourceTable(building_id, YAHOO.booking.initialSelection);
-    }
-    var org_id = YAHOO.util.Dom.get('field_org_id').value;
-       if(org_id) {
-       populateGroupSelect(org_id, YAHOO.booking.group_id);
-       }
+function populateSelectSeason(building_id, selection) {
+       var url = 
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' + 
building_id + '&phpgw_return_as=json&';
+       var container = $('#season_container');
+       var attr = [{name: 'name', value: 'season_id'}, {name: 
'data-validation', value: 'required'}, {name: 'data-validation-error-msg', 
value: lang['Please select a season']}];
+       populateSelect(url, selection, container, attr);
+}
+function populateSelectGroup(organization_id, selection) {
+       var url = 
'index.php?menuaction=booking.uigroup.index&filter_organization_id=' + 
organization_id + '&phpgw_return_as=json';
+       var container = $('#group_container');
+       var attr = [{name: 'name', value: 'group_id'}, {name: 
'data-validation', value: 'required'}, {name: 'data-validation-error-msg', 
value: lang['Please select a group']}];
+       populateSelect(url, selection, container, attr);
+}
+;
+function populateTableChkResources(building_id, selection) {
+       var url = 
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' + 
building_id + '&phpgw_return_as=json&';
+       var container = 'resources_container';
+       var colDefsResources = [{label: '', object: [{type: 'input', attrs: 
[{name: 'type', value: 'checkbox'}, {name: 'name', value: 'resources[]'}]}], 
value: 'id', checked: selection}, {key: 'name', label: lang['Name']}, {key: 
'type', label: lang['Resource Type']}];
+       populateTableChk(url, container, colDefsResources);
+}
 
-    var ac = 
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
 
-                                              'field_building_name', 
'field_building_id', 'building_container');
-    // Update the resource table as soon a new building is selected
-    ac.itemSelectEvent.subscribe(function(sType, aArgs) {
-               populateSeasonSelect(aArgs[2].id, YAHOO.booking.season_id);
-        populateResourceTable(aArgs[2].id, []);
-    });
-
-    var ac = 
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
 
-                                              'field_org_name', 
'field_org_id', 'org_container');
-    // Update the resource table as soon a new building is selected
-    ac.itemSelectEvent.subscribe(function(sType, aArgs) {
-        populateGroupSelect(aArgs[2].id);
-    });
-
-
-
-    
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uigroup.index&phpgw_return_as=json&',
 
-                                     'field_group_name', 'field_group_id', 
'group_container');
-});
-*/
\ No newline at end of file
+function populateTableChk(url, container, colDefs) {
+       createTable(container, url, colDefs);
+}

Modified: branches/dev-syncromind/booking/js/booking/common.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/common.js        2015-12-10 
10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/common.js        2015-12-10 
12:54:52 UTC (rev 14556)
@@ -1,782 +1,3 @@
-/*
-YAHOO.namespace('booking');
-
-YAHOO.booking.js_alias_method_chain = function(constructor_func, func_name, 
new_feature_name, feature_impl_func) {
-       constructor_func.prototype[func_name+'_without_'+new_feature_name] = 
constructor_func.prototype[func_name];
-       constructor_func.prototype[func_name+'_with_'+new_feature_name] = 
feature_impl_func;
-       constructor_func.prototype[func_name] = 
constructor_func.prototype[func_name+'_with_'+new_feature_name];
-};
-
-YAHOO.booking.lang = function(section, config) {
-       config = config || {};
-       if (YAHOO && YAHOO.booking && YAHOO.booking.i18n && 
YAHOO.booking.i18n[section]) {
-               YAHOO.booking.i18n[section](config);
-       }
-       return config;
-};
-*/
-/** Hook widgets to translations **/
-/*
-YAHOO.booking.js_alias_method_chain(YAHOO.widget.Calendar, 'init', 'i18n', 
function(id, container, config) {
-       YAHOO.booking.lang('Calendar', config);
-       return this.init_without_i18n(id, container, config);
-});
-
-YAHOO.booking.js_alias_method_chain(YAHOO.widget.DataTable, '_initConfigs', 
'i18n', function(config) {
-       YAHOO.booking.lang('DataTable', config);
-       return this._initConfigs_without_i18n(config);
-});
-
-function y2k(number) { return (number < 1000) ? number + 1900 : number; }
-YAHOO.booking.weeknumber = function(when) {
-       var year = when.getFullYear();
-       var month = when.getMonth();
-       var day = when.getDate();
-
-       var newYear = new Date(year,0,1);
-       var modDay = newYear.getDay();
-       if (modDay == 0) modDay=6; else modDay--;
-
-       var daynum = ((Date.UTC(y2k(year),when.getMonth(),when.getDate(),0,0,0) 
- Date.UTC(y2k(year),0,1,0,0,0)) /1000/60/60/24) + 1;
-
-  if (modDay < 4 ) {
-    var weeknum = Math.floor((daynum+modDay-1)/7)+1;
-  } else {
-    var weeknum = Math.floor((daynum+modDay-1)/7);
-    if (weeknum == 0) {
-      year--;
-      var prevNewYear = new Date(year,0,1);
-      var prevmodDay = prevNewYear.getDay();
-      if (prevmodDay == 0) prevmodDay = 6; else prevmodDay--;
-      if (prevmodDay < 4) weeknum = 53; else weeknum = 52;
-    }
-  }
-  return + weeknum;
-}
-
-parseISO8601 = function (string) {
-       var regexp = "(([0-9]{4})(-([0-9]{1,2})(-([0-9]{1,2}))))?( 
)?(([0-9]{1,2}):([0-9]{1,2}))?";
-       var d = string.match(new RegExp(regexp));
-       var year = d[2] ? (d[2] * 1) : 0;
-       date = new Date(year, (d[4]||1)-1, d[6]||0);
-       if(d[9])
-               date.setHours(d[9]);
-       if(d[10])
-               date.setMinutes(d[10]);
-       return date;
-};
-
-YAHOO.booking.serializeForm = function(formID) {
-       var form = YAHOO.util.Dom.get(formID);
-       var values = [];
-       for(var i=0; i < form.elements.length; i++) {
-               var e = form.elements[i];
-               if(e.type=='checkbox' || e.type=='radio') {
-                       if(e.checked) {
-                               values.push(e.name + '=' + 
encodeURIComponent(e.value));
-                       }
-               } 
-               else if(e.name) {
-                       values.push(e.name + '=' + encodeURIComponent(e.value));
-               }
-       }
-       return values.join('&');
-};
-
-YAHOO.booking.fillForm = function(formID, params) {
-       var form = YAHOO.util.Dom.get(formID);
-       var values = [];
-       for(var i=0; i < form.elements.length; i++) {
-               var e = form.elements[i];
-               if((e.type=='checkbox' || e.type=='radio') && params[e.name]) {
-                       e.checked = true;
-               } 
-               else if(e.name && params[e.name] != undefined) {
-                       e.value = params[e.name];
-                       if(e._update) { // Is this connected to a date picker?
-                               e._update();
-                       }
-               }
-       }
-       return values.join('&');
-};
-
-YAHOO.booking.parseQS = function(qs) {
-       qs = qs.replace(/\+/g, ' ');
-       var args = qs.split('&');
-       var params = {};
-       for (var i = 0; i < args.length; i++) {
-               var pair = args[i].split('=');
-               var name = decodeURIComponent(pair[0]);
-               var value = (pair.length==2) ? decodeURIComponent(pair[1]) : 
name;
-               params[name] = value;
-       }
-       return params;
-}
-
-YAHOO.booking.formatLink = function(elCell, oRecord, oColumn, oData) { 
-       var name = oRecord.getData(oColumn.key);
-       var link = oRecord.getData('link');
-       elCell.innerHTML = '<a href="' + link + '">' + name + '</a>'; 
-};
-
-YAHOO.booking.formatLink2 = function(elCell, oRecord, oColumn, oData) { 
-       var name = 'slett';
-       var text = "'Er du sikker på at du vil slette denne?'";
-       var link = oRecord.getData('dellink');
-       elCell.innerHTML = '<a onclick="return confirm('+ text +');" href="' + 
link + '">' + name + '</a>'; 
-};
-
-YAHOO.booking.formatGenericLink = function() {
-       var links = [];
-       var nOfLinks = arguments.length;
-       
-       for (var i=0; i < nOfLinks; i++) { links[i] = arguments[i]; }
-       
-       return function(elCell, oRecord, oColumn, oData)
-       {
-               var nOfLinks = links.length;
-               var data = oRecord.getData(oColumn.key);
-               
-               var linksHtml = '';
-               if (nOfLinks > 0) {
-                       //Use specified link names
-                       for (var i=0; i < nOfLinks; i++) {
-                               if (data[i])
-                               {
-                                       linksHtml += '<div><a href="' + data[i] 
+ '">' + links[i] + '</a></div>';
-                               }
-                       }
-               } else {
-                       //Get label from embedded data
-                       if (data['href'] != undefined && data['label'] != 
undefined) {
-                               linksHtml += '<div><a href="' + data['href'] + 
'">' + data['label'] + '</a></div>';
-                       } else if(data['href'] == undefined && data['label'] != 
undefined) {
-                               linksHtml += '<div>'+data['label']+'</div>';
-                       }
-               }
-               
-               elCell.innerHTML = linksHtml;
-       };
-};
-
-YAHOO.booking.autocompleteHelper = function(url, field, hidden, container, 
label_attr) {
-       label_attr = label_attr || 'name';
-       var myDataSource = new YAHOO.util.DataSource(url);
-       myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
-       myDataSource.connXhrMode = "queueRequests";
-       myDataSource.responseSchema = {
-               resultsList: "ResultSet.Result",
-               fields: [label_attr, 'id']
-       };
-       myDataSource.maxCacheEntries = 5; 
-       var ac = new YAHOO.widget.AutoComplete(field, container, myDataSource);
-       ac.queryQuestionMark = false;
-       ac.resultTypeList = false;
-       ac.forceSelection = true;
-       ac.itemSelectEvent.subscribe(function(sType, aArgs) {
-               YAHOO.util.Dom.get(hidden).value = aArgs[2].id;
-       });
-       return ac;
-};
-
-YAHOO.booking.setupInlineTablePaginator = function(container) {
-       var paginatorConfig = {
-        rowsPerPage: 10,
-        alwaysVisible: false,
-        template: "{PreviousPageLink} <strong>{CurrentPageReport}</strong> 
{NextPageLink}",
-        pageReportTemplate: "Showing items {startRecord} - {endRecord} of 
{totalRecords}",
-        containers: [YAHOO.util.Dom.get(container)]
-    };
-       
-       YAHOO.booking.lang('setupPaginator', paginatorConfig);
-       var pag = new YAHOO.widget.Paginator(paginatorConfig);
-   pag.render();
-       return pag;
-};
-
-YAHOO.booking.inlineTableHelper = function(container, url, colDefs, options, 
disablePagination) {
-       var Dom = YAHOO.util.Dom;
-       
-       var container = Dom.get(container);
-       if(!disablePagination) {
-               var paginatorContainer = 
container.appendChild(document.createElement('div'));
-               var dataTableContainer = 
container.appendChild(document.createElement('div'));
-       }
-       else {
-               dataTableContainer = container;
-       }
-       options = options || {};
-       options.dynamicData = true;
-       
-       if(!disablePagination) {
-               options.paginator = 
YAHOO.booking.setupInlineTablePaginator(paginatorContainer);
-               url += 'results=' + options.paginator.getRowsPerPage() + '&';
-       }
-       var myDataSource = new YAHOO.util.DataSource(url);
-       myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
-       myDataSource.connXhrMode = "queueRequests";
-       myDataSource.responseSchema = {
-               resultsList: "ResultSet.Result",
-               metaFields : { totalResultsAvailable: 
"ResultSet.totalResultsAvailable", actions: 'Actions' }
-       };
-       
-       var myDataTable = new YAHOO.widget.DataTable(dataTableContainer, 
colDefs, myDataSource, options);
-       
-       myDataTable.handleDataReturnPayload = function(oRequest, oResponse, 
oPayload) {
-       oPayload.totalRecords = oResponse.meta.totalResultsAvailable;
-       return oPayload;
-   }
-       
-       myDataTable.doBeforeLoadData = function(nothing, data) {
-               if (!data.meta.actions) return data;
-               
-               actions = data.meta.actions;
-               
-               for (var key in actions) {
-                       var actionLink = document.createElement('a');
-                       actionLink.href = actions[key].href.replace(/&amp;/gi, 
'&');
-                       actionLink.innerHTML = actions[key].text;
-                       YAHOO.util.Dom.insertAfter(actionLink, container);
-               };
-               
-               return data;
-       };
-       return {dataTable: myDataTable, dataSource: myDataSource};
-};
-
-YAHOO.booking.inlineImages = function(container, url, options)
-{
-       options = options || {};
-       var myDataSource = new YAHOO.util.DataSource(url);
-       myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
-       myDataSource.connXhrMode = "queueRequests";
-       myDataSource.responseSchema = {
-               resultsList: "ResultSet.Result",
-               metaFields : { totalResultsAvailable: 
"ResultSet.totalResultsAvailable", actions: 'Actions' }
-       };
-       
-       myDataSource.sendRequest('', {success: function(sRequest, oResponse, 
oPayload) {
-               var dlImages = new 
YAHOO.util.Element(document.createElement('dl'));
-               dlImages.addClass('proplist images');
-               
-               var displayContainer = false;
-               
-        for(var key in oResponse.results) { 
-                       displayContainer = true;
-                       var imgEl = 
dlImages.appendChild(document.createElement('dd')).appendChild(document.createElement('img'));
-                       var captionEl = 
dlImages.appendChild(document.createElement('dt'));
-                       imgEl.src = 
oResponse.results[key].src.replace(/&amp;/gi, '&');
-                       
captionEl.appendChild(document.createTextNode(oResponse.results[key].description));
-               }
-               
-               if (displayContainer)
-               {
-                       new YAHOO.util.Element(container).appendChild(dlImages);
-               } else {
-                       new YAHOO.util.Element(container).setStyle('display', 
'none');
-               }
-    }});
-};
-
-
-YAHOO.booking.radioTableHelper = function(container, url, name, selection) {
-       return YAHOO.booking.checkboxTableHelper(container, url, name, 
selection, {type: 'radio'});
-};
-
-YAHOO.booking.checkboxTableHelper = function(container, url, name, selection, 
options) {
-       options = YAHOO.lang.isObject(options) ? options : {};
-       
-       options = YAHOO.lang.merge(
-               {type: 'checkbox', selectionFieldOptions: {}, nameFieldOptions: 
{}, defaultChecked: false}, 
-               options
-       );
-       
-       var type = options['type'] || 'checkbox';
-       selection = selection || [];
-       var myDataSource = new YAHOO.util.DataSource(url);
-       myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
-       myDataSource.connXhrMode = "queueRequests";
-       myDataSource.responseSchema = {
-               resultsList: "ResultSet.Result",
-               metaFields : { totalResultsAvailable: 
"ResultSet.totalResultsAvailable" }
-       };
-       
-       var lang = {LBL_NAME: 'Name'};
-       YAHOO.booking.lang('common', lang);
-       
-       var changeListener = false;
-       
-       if (options.onSelectionChanged) {
-               changeListener = function(e) {
-                       var selectedItems = [];
-                       var items = 
YAHOO.util.Dom.getElementsBy(function(i){return i.checked;}, 'input', 
container);
-                       
-                       YAHOO.util.Dom.batch(items, function(e, selectedItems) {
-                               selectedItems.push(e.value);
-                       }, selectedItems);
-                       
-                       options.onSelectionChanged(selectedItems);
-               };
-       }
-       
-       var checkboxFormatter = function(elCell, oRecord, oColumn, oData) { 
-               var checked = false;
-               var newInput; 
-               for(var i=0; i < selection.length; i++) {
-                       if (selection[i] == oData) {
-                               checked = true;
-                               break;
-                       }
-               }
-               
-               newInput = document.createElement('input');
-               newInput.setAttribute('type', type);
-               newInput.setAttribute('name', name);
-               newInput.setAttribute('value', oData);
-               if (checked || options.defaultChecked) {
-                       newInput.setAttribute('checked', 'checked');
-                       newInput.setAttribute('defaultChecked', true); //Needed 
for IE compatibility
-               }
-               
-               if (changeListener != false) {
-                       //Using 'click' event on IE as the change event does 
not work as expected there.
-                       YAHOO.util.Event.addListener(newInput, (YAHOO.env.ua.ie 
> 0 ? 'click' : 'change'), changeListener);
-               }
-               
-               elCell.appendChild(newInput);
-               
-       };
-       var colDefs = [
-               YAHOO.lang.merge({key: "id", formatter: checkboxFormatter, 
label: ''}, options.selectionFieldOptions),
-               YAHOO.lang.merge({key: "name", label: lang['LBL_NAME'], 
sortable: true}, options.nameFieldOptions)
-       ];
-       
-       if (options['additional_fields'] && 
YAHOO.lang.isArray(options['additional_fields'])) {
-               for (var i=0; i < options['additional_fields'].length; i++) {
-                       colDefs.push(options['additional_fields'][i]);
-               }
-       }
-       
-       var myDataTable = new YAHOO.widget.DataTable(container, colDefs, 
myDataSource, {
-          sortedBy: {key: 'name', dir: YAHOO.widget.DataTable.CLASS_ASC}
-       });
-};
-
-YAHOO.booking.setupDatePickers = function() {
-       YAHOO.util.Dom.getElementsByClassName('date-picker', null, null, 
YAHOO.booking.setupDatePickerHelper, [true, false]);
-       YAHOO.util.Dom.getElementsByClassName('time-picker', null, null, 
YAHOO.booking.setupDatePickerHelper, [false, true]);
-       YAHOO.util.Dom.getElementsByClassName('datetime-picker', null, null, 
YAHOO.booking.setupDatePickerHelper, [true, true]);
-};
-
-YAHOO.booking.setupDatePickerHelper = function(field, args) {
-       if (!YAHOO.booking.setupDatePickerHelper.groups) {
-               YAHOO.booking.setupDatePickerHelper.groups = {};
-       }
-       
-       var groups = YAHOO.booking.setupDatePickerHelper.groups;
-       var Dom = YAHOO.util.Dom;
-       
-       if(field._converted)
-               return;
-       field._converted = true;
-       var date = args[0];
-       var time = args[1];
-       var Dom = YAHOO.util.Dom;
-       var Event = YAHOO.util.Event;
-       var oCalendarMenu = new YAHOO.widget.Overlay(Dom.generateId(), { 
visible: false});
-       var oButton = new YAHOO.widget.Button({type: "menu", id: 
Dom.generateId(), menu: oCalendarMenu, container: field});
-       
-       oButton.with_time = time;
-       oButton.with_date = date;
-       
-       var lang = {LBL_CHOOSE_DATE: 'Choose a date'};
-       YAHOO.booking.lang('setupDatePickerHelper', lang);
-       
-       oButton._calendarMenu = oCalendarMenu;
-       oButton._input = field._input = Dom.getElementsBy(function(){return 
true;}, 'input', field)[0];
-       
-       oButton.hasDateSection = function() { return this.with_date; };
-       oButton.hasTimeSection = function() { return this.with_time; };
-       
-       oButton.fireUpdateEvent = function() {
-               if (oButton.on_update) {
-                       oButton.on_update.func.call(oButton.on_update.context, 
oButton);
-               }
-       };
-       
-       oButton.on("appendTo", function () {
-               this._calendarMenu.setBody(" ");
-               this._calendarMenu.body.id = Dom.generateId();
-       });
-       if(!date)
-               oButton.setStyle('display', 'none');
-       //oButton._input.setAttribute('type', 'hidden');
-       oButton._input.style.display = 'none';
-       if(oButton._input.value)
-               oButton._date = parseISO8601(oButton._input.value);
-       else
-               oButton._date = new Date(1, 1, 1);
-       oButton._input._update = function() {
-               if(oButton._input.value)
-                       oButton._date = parseISO8601(oButton._input.value);
-               else
-                       oButton._date = new Date(1, 1, 1);
-               oButton._update(false);
-       };
-       oButton._update = function(fire_update_event) {
-               var year = this._date.getFullYear();
-               var month = this._date.getMonth() + 1;
-               var day = this._date.getDate();
-               var hours = this._date.getHours();
-               var minutes = this._date.getMinutes();
-               var month = month < 10 ? '0' + month : '' + month;
-               var day = day < 10 ? '0' + day : '' + day;
-               var hours = hours < 10 ? '0' + hours : '' + hours;
-               var minutes = minutes  < 10 ? '0' + minutes : '' + minutes;
-               var dateValue = year + '-' + month + '-' + day;
-               var timeValue = hours + ':' + minutes;
-               if(year == 1901) {
-                       this.set('label', lang.LBL_CHOOSE_DATE);
-               } else {
-                       this.set('label', dateValue);
-               }
-               if(time) {
-                       this._hours.set('value', parseInt(hours, 10));
-                       this._minutes.set('value', parseInt(minutes, 10));
-                       this._hours.update();
-                       this._minutes.update();
-               }
-               if(year != 1901 && date && time)
-                       this._input.value = dateValue + ' ' + timeValue;
-               else if (year != 1901 && date)
-                       this._input.value = dateValue;
-               else if(!date && time)
-                       this._input.value = timeValue;
-               
-               if (fire_update_event) {
-                       oButton.fireUpdateEvent();
-               }
-       };
-       
-       oButton.getDate = function() {
-               return this._date;
-       };
-
-       oButton.on("click", function () {
-               YAHOO.widget.DateMath.WEEK_ONE_JAN_DATE = 4;
-               var oCalendar = new YAHOO.widget.Calendar(Dom.generateId(), 
this._calendarMenu.body.id, {START_WEEKDAY: 1,SHOW_WEEK_HEADER:true});
-               oCalendar._button = this;
-               if(this._date.getFullYear() == 1901) {
-                       var d = new Date();
-                       oCalendar.cfg.setProperty("pagedate", (d.getMonth()+1) 
+ "/" + d.getFullYear());
-               } else {
-                       oCalendar.select(this._date);
-                       oCalendar.cfg.setProperty("pagedate", 
(this._date.getMonth()+1) + "/" + this._date.getFullYear());
-               }
-               
-               oCalendar.render();
-               // Hide date picker on ESC
-               Event.on(this._calendarMenu.element, "keydown", function 
(p_oEvent) {
-                       if (Event.getCharCode(p_oEvent) === 27) {
-                               this._calendarMenu.hide();
-                               this.focus();
-                       }
-               }, null, this);
-               oCalendar.selectEvent.subscribe(function (p_sType, p_aArgs) {
-                       if (p_aArgs) {
-                               var aDate = p_aArgs[0][0];
-                               this._date.setFullYear(aDate[0]);
-                               this._date.setMonth(aDate[1]-1);
-                               this._date.setDate(aDate[2]);
-                               this._update(true);
-                               //this._input.value = value;
-                       }
-                       this._calendarMenu.hide();
-               }, this, true);
-       });
-       if(time) {
-               oButton._hours = new YAHOO.booking.InputNumberRange({min: 0, 
max:23});
-               oButton._minutes = new YAHOO.booking.InputNumberRange({min: 0, 
max:59});
-               
-               oButton._hours.on('updateEvent', function() {
-                       oButton._date.setHours(this.get('value'));
-                       oButton._update(true);
-               });
-               
-               oButton._minutes.on('updateEvent', function() {
-                       oButton._date.setMinutes(this.get('value'));
-                       oButton._update(true);
-               });
-               
-               oButton.on("appendTo", function () {
-                       var timePicker = 
Dom.get(field).appendChild(document.createElement('span'));
-                       Dom.addClass(timePicker, 'time-picker-inputs');
-                       timePicker.appendChild(document.createTextNode(' '));
-                       oButton._hours.render(timePicker);
-                       timePicker.appendChild(document.createTextNode(' : '));
-                       oButton._minutes.render(timePicker);
-                       oButton._update(false);
-               });
-       }
-       oButton._update(false);
-       
-       var id = Dom.getAttribute(oButton._input, 'id');
-       var matches = /^([a-zA-Z][\w0-9\-_.:]+)_(from|to)$/.exec(id);
-       
-       var group_name = matches ? matches[1] : false;
-       var from_to = matches ? matches[2] : false;
-       
-       if (group_name && from_to && oButton.hasDateSection()) {
-               if (!groups[group_name]) { groups[group_name] = {}; }
-               
-               groups[group_name][from_to] = oButton;
-
-               if (groups[group_name]['from'] && groups[group_name]['to']) {
-                       groups[group_name]['from'].on_update = {
-                               context: groups[group_name]['to'], 
-                               func: function(fromDateButton) {
-                                       var fromDate = fromDateButton.getDate();
-                                       var currentYear = 
this._date.getFullYear();
-                                       
-                                       if (this._date.getFullYear() == 1901) {
-                                               
this._date.setFullYear(fromDate.getFullYear());
-                                               
this._date.setMonth(fromDate.getMonth());
-                                               
this._date.setDate(fromDate.getDate());
-                                       } else if (fromDate.getFullYear() <= 
this._date.getFullYear() && fromDate.getMonth() <= this._date.getMonth() && 
fromDate.getDate() <= this._date.getDate()) {
-                                               //this._date.
-                                       }
-                               
-                                       this._update(false);
-                               }
-                       };
-                       
-                       delete groups[group_name];
-               }
-       }
-};
-
-// Executed on all booking.uicommon-based pages
-YAHOO.util.Event.addListener(window, "load", function() {
-       YAHOO.booking.setupDatePickers();
-});
-var showIfNotEmpty = function(event, fieldname) {
-    if (document.getElementById(fieldname).value.length > 1) {
-        YAHOO.util.Dom.replaceClass(fieldname + "_edit", "hideit", "showit");
-    } else {
-        YAHOO.util.Dom.replaceClass(fieldname + "_edit", "showit", "hideit");
-    }
-};
-
-YAHOO.booking.rtfEditorHelper = function(textarea_id, options) {
-       options = YAHOO.lang.merge({width:522, height:300}, (options || {}));
-       var descEdit = new YAHOO.widget.SimpleEditor(textarea_id, {
-           height: options.height+'px',
-           width: options.width+'px',
-           dompath: true,
-           animate: true,
-               handleSubmit: true
-       });
-       descEdit.render();
-       return descEdit;
-};
-
-YAHOO.booking.postToUrl = function(path, params, method) {
-    method = method || "post"; // Set method to post by default, if not 
specified.
-    var form = document.createElement("form");
-    form.setAttribute("method", method);
-    form.setAttribute("action", path);
-
-    for(var key in params) {
-        var hiddenField = document.createElement("input");
-        hiddenField.setAttribute("type", "hidden");
-        hiddenField.setAttribute("name", params[key][0]);
-        hiddenField.setAttribute("value", params[key][1]);
-        form.appendChild(hiddenField);
-    }
-    document.body.appendChild(form);    // Not entirely sure if this is 
necessary
-    form.submit();
-};
-
-(function(){
-    var Dom = YAHOO.util.Dom,
-        Event = YAHOO.util.Event,
-        Panel = YAHOO.widget.Panel,
-               Lang = YAHOO.lang;
-
-       var CSS_PREFIX = 'booking_number_range_';
- 
-       var InputNumberRange = function(oConfigs) {
-           InputNumberRange.superclass.constructor.call(this, 
document.createElement('span'), oConfigs);
-           this.createEvent('updateEvent');
-               this.refresh(['id'],true);
-       };
-
-       YAHOO.booking.InputNumberRange = InputNumberRange;
-
-       Lang.extend(InputNumberRange, YAHOO.util.Element, {
-               initAttributes: function (oConfigs) { 
-                       InputNumberRange.superclass.initAttributes.call(this, 
oConfigs);
-                       
-                       var container = this.get('element');
-               
-                       this.setAttributeConfig('inputEl', {
-                       readOnly: true,
-                       value: 
container.appendChild(document.createElement('span'))
-                   });
-       
-                       this.setAttributeConfig('id', {
-                       writeOnce: true,
-                       validator: function (value) {
-                           return /^[a-zA-Z][\w0-9\-_.:]*$/.test(value);
-                       },
-                       value: Dom.generateId(),
-                       method: function (value) {
-                           this.get('inputEl').id = value;
-                       }
-                   });
-       
-                       this.setAttributeConfig('value', {
-                               value: 0,
-                               validator: Lang.isNumber
-                 });
-               
-                       this.setAttributeConfig('input', {
-                               value: null
-                 });
-               
-                       this.setAttributeConfig('min', {
-                               validator: Lang.isNumber,
-                               value: 100
-                 });
-               
-                       this.setAttributeConfig('max', {
-                               validator: Lang.isNumber,
-                               value: 0
-                       });
-               
-                       this.setAttributeConfig('input_length', {
-                               validator: Lang.isNumber,
-                               value: null
-                       });
-               },
-       
-               destroy: function () { 
-                       var el = this.get('element');
-                   Event.purgeElement(el, true);
-                   el.parentNode.removeChild(el);
-               },
-               
-               _padValue: function(value)
-               {
-                       value = value.toString('10');
-                       var padding = this.get('input_length') - value.length;
-                       if (padding > 0) {
-                               return ((new Array(padding+1).join('0')) + 
value);
-                       }
-                       return value;
-               },
-               
-               _updateValue: function() {
-                       var input = this.get('input');
-                       var value;
-                       
-                       if (input.value.length > 0) {
-                               value = parseInt(input.value, 10);
-                       } else {
-                               value = 0;
-                       }
-                               
-                       if (isNaN(value)) { 
-                               value = this.get('min');
-                       }
-                       
-                       if (value < this.get('min')) {
-                               value = this.get('min');
-                       }
-                       
-                       if (value > this.get('max')) {
-                               value = this.get('max');
-                       }
-                       
-                       this.set('value', value);
-               },
-               
-               _fireUpdateEvent: function()
-               {
-                       this._updateValue();
-                       this.update();
-                       
-                       this.fireEvent('updateEvent');
-               },
-               
-               update: function() {
-                       if (!this.get('input')) { return; }
-                       this.get('input').value = 
this._padValue(this.get('value'));
-               },
-               
-               render: function (parentEl) {
-                       parentEl = Dom.get(parentEl);
-           
-                       if (!parentEl) {
-                               YAHOO.log('Missing mandatory argument in 
YAHOO.booking.InputNumberRange.render:  parentEl','error','Field');
-                               return null;
-                 }
-               
-                       var containerEl = this.get('element');
-                       this.addClass(CSS_PREFIX + 'container');
-               
-                       var inputEl = this.get('inputEl');
-                       Dom.addClass(inputEl, CSS_PREFIX + 'input');
-               
-                       this._renderInputEl(inputEl);
-               
-                       parentEl.appendChild(containerEl); //Appends to 
document to show the component
-               },
-               
-               _renderInputEl: function (containerEl) { 
-                       var input = 
containerEl.appendChild(document.createElement('input'));
-               
-                       if (!this.get('input_length')) {
-                               this.set('input_length', 
this.get('max').toString().length);
-                       }
-               
-                       var size = this.get('input_length');
-                       input.setAttribute('size', size);
-                       input.setAttribute('maxlength', size);
-                       
-                       if (YAHOO.env.ua.ie > 6) {
-                               YAHOO.util.Dom.setStyle(input, 'width', '2em');
-                       }
-                       
-                       input.value = this._padValue(this.get('value'));
-               
-                       this.set('input', input);
-               
-                       Event.on(input,'keyup', function (oArgs) {
-                               this._updateValue();
-                               }, this, true);
-               
-                       Event.on(input, 'change', function(oArgs) {
-                               this._fireUpdateEvent();
-                       }, this, true);
-                       
-                       oForm = input.form;
-                       
-                       if (oForm) {
-                               Event.on(oForm, "submit", function() {
-                                       this._fireUpdateEvent();
-                               }, null, this);
-                       }
-                       
-               }
-       });
-
-})();
-
-*/
-
-
 JqueryPortico.booking = {};
 
 JqueryPortico.booking.postToUrl = function(path, params, method) {

Modified: branches/dev-syncromind/booking/js/booking/completed_reservation.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/completed_reservation.js 
2015-12-10 10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/completed_reservation.js 
2015-12-10 12:54:52 UTC (rev 14556)
@@ -1,7 +1,7 @@
 var seasonFilterBuildingId = false;
 
 function updateBuildingFilter(sType, aArgs) {
-       YAHOO.util.Dom.get("filter_season_name").value = ""; 
+       YAHOO.util.Dom.get("filter_season_name").value = "";
        YAHOO.util.Dom.get("filter_season_id").value = "";
        seasonFilterBuildingId = aArgs[2].id;
 }
@@ -11,5 +11,5 @@
 }
 
 function requestWithBuildingFilter(sQuery) {
-       return 'query=' + sQuery + (seasonFilterBuildingId ? 
'&filter_building_id='+seasonFilterBuildingId : '');
+       return 'query=' + sQuery + (seasonFilterBuildingId ? 
'&filter_building_id=' + seasonFilterBuildingId : '');
 }
\ No newline at end of file

Modified: branches/dev-syncromind/booking/js/booking/datatable.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/datatable.js     2015-12-10 
10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/datatable.js     2015-12-10 
12:54:52 UTC (rev 14556)
@@ -1,155 +1,157 @@
-YAHOO.booking.setupToolbar = function() {
+YAHOO.booking.setupToolbar = function () {
        YAHOO.booking.renderUiFormItems('toolbar');
 };
 
-YAHOO.booking.setupListActions = function() {
+YAHOO.booking.setupListActions = function () {
        YAHOO.booking.renderUiFormItems('list_actions');
 };
 
-YAHOO.booking.renderUiFormItems = function(container) {
-       var items = YAHOO.util.Dom.getElementsBy(function(){return true;}, 
'input', container);
-   for(var i=0; i < items.length; i++) {
-       var type = items[i].getAttribute('type');
-       if(type == 'link') {
-           new YAHOO.widget.Button(items[i], 
-                                   {type: 'link', 
-                                    href: items[i].getAttribute('href')});
-       }
-       else if(type == 'submit') {
-           new YAHOO.widget.Button(items[i], {type: 'submit'});
-       }
-   }
+YAHOO.booking.renderUiFormItems = function (container) {
+       var items = YAHOO.util.Dom.getElementsBy(function () {
+               return true;
+       }, 'input', container);
+       for (var i = 0; i < items.length; i++) {
+               var type = items[i].getAttribute('type');
+               if (type == 'link') {
+                       new YAHOO.widget.Button(items[i],
+                                       {type: 'link',
+                                               href: 
items[i].getAttribute('href')});
+               }
+               else if (type == 'submit') {
+                       new YAHOO.widget.Button(items[i], {type: 'submit'});
+               }
+       }
 };
 
-YAHOO.booking.setupPaginator = function() {
+YAHOO.booking.setupPaginator = function () {
        var paginatorConfig = {
-        rowsPerPage: 10,
-        alwaysVisible: false,
-        template: "{PreviousPageLink} <strong>{CurrentPageReport}</strong> 
{NextPageLink}",
-        pageReportTemplate: "Showing items {startRecord} - {endRecord} of 
{totalRecords}",
-        containers: ['paginator']
-    };
-       
+               rowsPerPage: 10,
+               alwaysVisible: false,
+               template: "{PreviousPageLink} 
<strong>{CurrentPageReport}</strong> {NextPageLink}",
+               pageReportTemplate: "Showing items {startRecord} - {endRecord} 
of {totalRecords}",
+               containers: ['paginator']
+       };
+
        YAHOO.booking.lang('setupPaginator', paginatorConfig);
        var pag = new YAHOO.widget.Paginator(paginatorConfig);
-    pag.render();
+       pag.render();
        return pag;
 };
 
 YAHOO.booking.preSerializeQueryFormListeners = new Array();
 
-       YAHOO.booking.addPreSerializeQueryFormListener = function(func) {
+YAHOO.booking.addPreSerializeQueryFormListener = function (func) {
        YAHOO.booking.preSerializeQueryFormListeners.push(func);
 }
 
-YAHOO.booking.preSerializeQueryForm = function(form) {
+YAHOO.booking.preSerializeQueryForm = function (form) {
        for (var key in YAHOO.booking.preSerializeQueryFormListeners) {
                YAHOO.booking.preSerializeQueryFormListeners[key](form);
        }
 }
 
-YAHOO.booking.initializeDataTable = function()
+YAHOO.booking.initializeDataTable = function ()
 {
        YAHOO.booking.setupToolbar();
        YAHOO.booking.setupListActions();
        YAHOO.booking.setupDatasource();
        var pag = YAHOO.booking.setupPaginator();
 
-    var fields = [];
-    for(var i=0; i < YAHOO.booking.columnDefs.length; i++) {
-        fields.push(YAHOO.booking.columnDefs[i].key);
-    }
-    var baseUrl = YAHOO.booking.dataSourceUrl;
-    if(baseUrl[baseUrl.length - 1] != '&') {
-        baseUrl += '&';
-    }
-    
-    if (YAHOO.booking.initialSortedBy) {
-      baseUrl += 'sort=' + YAHOO.booking.initialSortedBy.key + '&dir=' + 
YAHOO.booking.initialSortedBy.dir;
-    } else {
-      baseUrl += 'sort=' + fields[0];
-    }
-       
-         baseUrl += '&results=' + pag.getRowsPerPage() + '&';
-    var myDataSource = new YAHOO.util.DataSource(baseUrl);
+       var fields = [];
+       for (var i = 0; i < YAHOO.booking.columnDefs.length; i++) {
+               fields.push(YAHOO.booking.columnDefs[i].key);
+       }
+       var baseUrl = YAHOO.booking.dataSourceUrl;
+       if (baseUrl[baseUrl.length - 1] != '&') {
+               baseUrl += '&';
+       }
 
-    myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
-    myDataSource.connXhrMode = "queueRequests";
-    myDataSource.responseSchema = {
-        resultsList: "ResultSet.Result",
-        fields: fields,
-        metaFields : {
-            totalResultsAvailable: "ResultSet.totalResultsAvailable",
+       if (YAHOO.booking.initialSortedBy) {
+               baseUrl += 'sort=' + YAHOO.booking.initialSortedBy.key + 
'&dir=' + YAHOO.booking.initialSortedBy.dir;
+       } else {
+               baseUrl += 'sort=' + fields[0];
+       }
+
+       baseUrl += '&results=' + pag.getRowsPerPage() + '&';
+       var myDataSource = new YAHOO.util.DataSource(baseUrl);
+
+       myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
+       myDataSource.connXhrMode = "queueRequests";
+       myDataSource.responseSchema = {
+               resultsList: "ResultSet.Result",
+               fields: fields,
+               metaFields: {
+                       totalResultsAvailable: 
"ResultSet.totalResultsAvailable",
                        startIndex: 'ResultSet.startIndex',
                        sortKey: 'ResultSet.sortKey',
                        sortDir: 'ResultSet.sortDir'
-        }
-    };
-    var myDataTable = new YAHOO.widget.DataTable("datatable-container", 
-        YAHOO.booking.columnDefs, myDataSource, {
-            paginator: pag,
-            dynamicData: true,
-            sortedBy: YAHOO.booking.initialSortedBy || {key: fields[0], dir: 
YAHOO.widget.DataTable.CLASS_ASC}
-    });
-    var handleSorting = function (oColumn) {
-        var sDir = this.getColumnSortDir(oColumn);
-        var newState = getState(oColumn.key, sDir);
-        History.navigate("state", newState);
-    };
-    myDataTable.sortColumn = handleSorting;
+               }
+       };
+       var myDataTable = new YAHOO.widget.DataTable("datatable-container",
+                       YAHOO.booking.columnDefs, myDataSource, {
+                               paginator: pag,
+                               dynamicData: true,
+                               sortedBy: YAHOO.booking.initialSortedBy || 
{key: fields[0], dir: YAHOO.widget.DataTable.CLASS_ASC}
+                       });
+       var handleSorting = function (oColumn) {
+               var sDir = this.getColumnSortDir(oColumn);
+               var newState = getState(oColumn.key, sDir);
+               History.navigate("state", newState);
+       };
+       myDataTable.sortColumn = handleSorting;
 
-    var handlePagination = function(state) {
-        var sortedBy  = this.get("sortedBy");
-        var newState = getState(sortedBy.key, sortedBy.dir, 
state.recordOffset);
-        History.navigate("state", newState);
-     };
-    pag.unsubscribe("changeRequest", myDataTable.onPaginatorChangeRequest);
-    pag.subscribe("changeRequest", handlePagination, myDataTable, true);
-    myDataTable.doBeforeLoadData = function(oRequest, oResponse, oPayload) {
-        oPayload.totalRecords = oResponse.meta.totalResultsAvailable;
-               oPayload.pagination = { 
-                       rowsPerPage: oResponse.meta.paginationRowsPerPage || 
10, 
-                       recordOffset: oResponse.meta.startIndex || 0 
-           }
-               oPayload.sortedBy = { 
-                       key: oResponse.meta.sortKey || "id", 
-                       dir: (oResponse.meta.sortDir) ? "yui-dt-" + 
oResponse.meta.sortDir : "yui-dt-asc" 
+       var handlePagination = function (state) {
+               var sortedBy = this.get("sortedBy");
+               var newState = getState(sortedBy.key, sortedBy.dir, 
state.recordOffset);
+               History.navigate("state", newState);
+       };
+       pag.unsubscribe("changeRequest", myDataTable.onPaginatorChangeRequest);
+       pag.subscribe("changeRequest", handlePagination, myDataTable, true);
+       myDataTable.doBeforeLoadData = function (oRequest, oResponse, oPayload) 
{
+               oPayload.totalRecords = oResponse.meta.totalResultsAvailable;
+               oPayload.pagination = {
+                       rowsPerPage: oResponse.meta.paginationRowsPerPage || 10,
+                       recordOffset: oResponse.meta.startIndex || 0
+               }
+               oPayload.sortedBy = {
+                       key: oResponse.meta.sortKey || "id",
+                       dir: (oResponse.meta.sortDir) ? "yui-dt-" + 
oResponse.meta.sortDir : "yui-dt-asc"
                };
                return true;
-    }
+       }
 
        YAHOO.util.Event.on(
-           YAHOO.util.Selector.query('select'), 'change', function (e) {
-               //var val = this.value;
-                       var state = getState();
-                       YAHOO.util.Dom.setStyle('list_flash', 'display', 
'none');
-                       History.navigate('state', state);
+                       YAHOO.util.Selector.query('select'), 'change', function 
(e) {
+               //var val = this.value;
+               var state = getState();
+               YAHOO.util.Dom.setStyle('list_flash', 'display', 'none');
+               History.navigate('state', state);
        });
 
-    YAHOO.util.Event.addListener('queryForm', "submit", function(e){
-        YAHOO.util.Event.stopEvent(e);
+       YAHOO.util.Event.addListener('queryForm', "submit", function (e) {
+               YAHOO.util.Event.stopEvent(e);
                var state = getState();
                YAHOO.util.Dom.setStyle('list_flash', 'display', 'none');
                History.navigate('state', state);
-    });
+       });
 
-       YAHOO.util.Event.addListener('list_actions_form', "submit", function(e){
+       YAHOO.util.Event.addListener('list_actions_form', "submit", function 
(e) {
                YAHOO.util.Event.stopEvent(e);
-               window.setTimeout(function() {
+               window.setTimeout(function () {
                        var state = getState();
                        var action = myDataSource.liveData + '&' + state;
                        action = action.replace('&phpgw_return_as=json', '');
                        
YAHOO.util.Dom.setAttribute(document.getElementById('list_actions_form'), 
'action', action);
-                  document.getElementById('list_actions_form').submit();
+                       document.getElementById('list_actions_form').submit();
                }, 0);
        });
 
-       var History = YAHOO.util.History; 
-       var getState = function(skey, sdir, start) {
+       var History = YAHOO.util.History;
+       var getState = function (skey, sdir, start) {
                var state = YAHOO.booking.serializeForm('queryForm');
-               var sortedBy  = myDataTable.get("sortedBy");
+               var sortedBy = myDataTable.get("sortedBy");
                skey = skey ? skey : sortedBy.key;
-               sdir = sdir ? sdir : sortedBy.dir; 
+               sdir = sdir ? sdir : sortedBy.dir;
                sdir = sdir == 'yui-dt-asc' ? 'asc' : 'desc';
                start = start ? start : 0;
                state += '&sort=' + skey;
@@ -161,11 +163,11 @@
        var handleHistoryNavigation = function (state) {
                var params = YAHOO.booking.parseQS(state);
                YAHOO.booking.fillForm('queryForm', params);
-               myDataSource.sendRequest(state, {success: function(sRequest, 
oResponse, oPayload) {
-                       myDataTable.onDataReturnInitializeTable(sRequest, 
oResponse, pag);
-               }});
+               myDataSource.sendRequest(state, {success: function (sRequest, 
oResponse, oPayload) {
+                               
myDataTable.onDataReturnInitializeTable(sRequest, oResponse, pag);
+                       }});
        };
-       
+
        var initialRequest = History.getBookmarkedState("state") || getState();
        History.register("state", initialRequest, handleHistoryNavigation);
 //     History.onReady(function() {

Modified: branches/dev-syncromind/booking/js/booking/document.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/document.js      2015-12-10 
10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/document.js      2015-12-10 
12:54:52 UTC (rev 14556)
@@ -1,20 +1,10 @@
 var ownerType = "";
-$(document).ready(function() {
-       var ownerType = documentOwnerType;      
+$(document).ready(function () {
+       var ownerType = documentOwnerType;
        if (documentOwnerAutocomplete) {
                label_attr = ownerType == 'resource' ? 'full_name' : 'name';
-               
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.ui'+ownerType+'.index&phpgw_return_as=json&',
 
-                                         'field_owner_name', 'field_owner_id', 
'owner_container', label_attr);
+               
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.ui' + ownerType 
+ '.index&phpgw_return_as=json&',
+                               'field_owner_name', 'field_owner_id', 
'owner_container', label_attr);
        }
 });
 
-
-//YAHOO.util.Event.addListener(window, "load", function() {
-//     var ownerType = YAHOO.booking.documentOwnerType;
-//     
-//     if (YAHOO.booking.documentOwnerAutocomplete) {
-//             label_attr = ownerType == 'resource' ? 'full_name' : 'name';
-//             
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.ui'+ownerType+'.index&phpgw_return_as=json&',
 
-//                                         'field_owner_name', 
'field_owner_id', 'owner_container', label_attr);
-//     }
-//});
\ No newline at end of file

Modified: branches/dev-syncromind/booking/js/booking/email_send.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/email_send.js    2015-12-10 
10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/email_send.js    2015-12-10 
12:54:52 UTC (rev 14556)
@@ -1,73 +1,52 @@
 var building_id_selection = "";
 
-$(document).ready(function() {
-    
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
 
-                                              'field_building_name', 
'field_building_id', 'building_container');
+$(document).ready(function () {
+       
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
+                       'field_building_name', 'field_building_id', 
'building_container');
 });
 
 
-$(window).load(function(){
-    building_id = $('#field_building_id').val();
-    if (building_id) {
-        populateTableChkSeasons(building_id, []);
-        building_id_selection = building_id;
-    }
-    $('#field_building_name').on('autocompleteselect', function(event, ui){
-        var building_id = ui.item.value;
-        var selection = [];
-        if (building_id != building_id_selection) {
-            populateTableChkSeasons(building_id, selection);
-            building_id_selection = building_id;
-        }
-    });
+$(window).load(function () {
+       building_id = $('#field_building_id').val();
+       if (building_id) {
+               populateTableChkSeasons(building_id, []);
+               building_id_selection = building_id;
+       }
+       $('#field_building_name').on('autocompleteselect', function (event, ui) 
{
+               var building_id = ui.item.value;
+               var selection = [];
+               if (building_id != building_id_selection) {
+                       populateTableChkSeasons(building_id, selection);
+                       building_id_selection = building_id;
+               }
+       });
 });
 
 if ($.formUtils) {
-    $.formUtils.addValidator({
-        name: 'application_season',
-        validatorFunction: function(value, $el, config, language, $form) {
-            var n = 0;
-            $('#season_container table 
input[name="seasons[]"]').each(function(){
-               if ($(this).is(':checked')) {
-                   n++;
-               }
-            });
-            var v = (n > 0) ? true : false;
-            return v;
-        },
-        errorMessage: 'Please choose at least 1 season',
-        errorMessageKey: 'application_season'
-    });
+       $.formUtils.addValidator({
+               name: 'application_season',
+               validatorFunction: function (value, $el, config, language, 
$form) {
+                       var n = 0;
+                       $('#season_container table 
input[name="seasons[]"]').each(function () {
+                               if ($(this).is(':checked')) {
+                                       n++;
+                               }
+                       });
+                       var v = (n > 0) ? true : false;
+                       return v;
+               },
+               errorMessage: 'Please choose at least 1 season',
+               errorMessageKey: 'application_season'
+       });
 }
 
-function populateTableChkSeasons (building_id, selection) {
-    var url = 
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' +  
building_id + '&phpgw_return_as=json&';
-    var container = 'season_container';
-    var colDefsSeasons = [{label: '', object: [{type: 'input', attrs: [{name: 
'type', value: 'checkbox'},{name: 'name', value: 'seasons[]'}]}], value: 'id', 
checked: selection}, {key: 'name', label: lang['Name']}];
-    populateTableChk(url, container, colDefsSeasons);
+function populateTableChkSeasons(building_id, selection) {
+       var url = 
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' + 
building_id + '&phpgw_return_as=json&';
+       var container = 'season_container';
+       var colDefsSeasons = [{label: '', object: [{type: 'input', attrs: 
[{name: 'type', value: 'checkbox'}, {name: 'name', value: 'seasons[]'}]}], 
value: 'id', checked: selection}, {key: 'name', label: lang['Name']}];
+       populateTableChk(url, container, colDefsSeasons);
 }
 
-function populateTableChk (url, container, colDefs) {
-    createTable(container,url,colDefs);
+function populateTableChk(url, container, colDefs) {
+       createTable(container, url, colDefs);
 }
-
-//
-//populateSeasonTable = function(building_id, selection) {
-//    YAHOO.booking.checkboxTableHelper('season_container', 
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' +  
building_id + '&phpgw_return_as=json&',
-//    'seasons[]', selection);
-//}
-//
-//YAHOO.util.Event.addListener(window, "load", function() {
-//    var building_id = YAHOO.util.Dom.get('field_building_id').value;
-//    if(building_id) {
-//        populateSeasonTable(building_id, [YAHOO.booking.season_id * 1]);
-//    }
-//    var ac = 
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
 
-//                                              'field_building_name', 
'field_building_id', 'building_container');
-//    // Update the season table as soon a n ew building is selected
-//    ac.itemSelectEvent.subscribe(function(sType, aArgs) {
-//        populateSeasonTable(aArgs[2].id, []);
-//    });
-//    
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
 
-//                                     'field_org_name', 'field_org_id', 
'org_container');
-//});

Modified: branches/dev-syncromind/booking/js/booking/event.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/event.js 2015-12-10 10:15:04 UTC 
(rev 14555)
+++ branches/dev-syncromind/booking/js/booking/event.js 2015-12-10 12:54:52 UTC 
(rev 14556)
@@ -1,239 +1,176 @@
 var building_id_selection = "";
-$(document).ready(function() {
-    
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
 
-                                                  'field_building_name', 
'field_building_id', 'building_container');
+$(document).ready(function () {
+       
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
+                       'field_building_name', 'field_building_id', 
'building_container');
 
-    
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
 
-                                         'field_org_name', 'field_org_id', 
'org_container');
+       
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
+                       'field_org_name', 'field_org_id', 'org_container');
 
-    $("#field_activity").change(function(){
-        var oArgs = 
{menuaction:'bookingfrontend.uiapplication.get_activity_data', 
activity_id:$(this).val()};
-        var requestUrl = phpGWLink('bookingfrontend/', oArgs, true);
+       $("#field_activity").change(function () {
+               var oArgs = {menuaction: 
'bookingfrontend.uiapplication.get_activity_data', activity_id: $(this).val()};
+               var requestUrl = phpGWLink('bookingfrontend/', oArgs, true);
 
-        $.ajax({
-            type: 'POST',
-            dataType: 'json',
-            url: requestUrl,
-            success: function(data) {
-                var html_agegroups = '';
-                var html_audience = '';
+               $.ajax({
+                       type: 'POST',
+                       dataType: 'json',
+                       url: requestUrl,
+                       success: function (data) {
+                               var html_agegroups = '';
+                               var html_audience = '';
 
-                if( data != null)
-                {
-                    var agegroups = data.agegroups;
-                    for ( var i = 0; i < agegroups.length; ++i )
-                    {
-                        html_agegroups += "<tr>";
-                        html_agegroups += "<th>" + agegroups[i]['name'] + 
"</th>";
-                        html_agegroups += "<td>";
-                        html_agegroups += "<input class=\"input50\" 
type=\"text\" name='male[" +agegroups[i]['id'] + "]' value='0'></input>";
-                        html_agegroups += "</td>";
-                        html_agegroups += "<td>";
-                        html_agegroups += "<input class=\"input50\" 
type=\"text\" name='female[" +agegroups[i]['id'] + "]' value='0'></input>";
-                        html_agegroups += "</td>";
-                        html_agegroups += "</tr>";
-                    }
-                    $("#agegroup_tbody").html( html_agegroups );
+                               if (data != null)
+                               {
+                                       var agegroups = data.agegroups;
+                                       for (var i = 0; i < agegroups.length; 
++i)
+                                       {
+                                               html_agegroups += "<tr>";
+                                               html_agegroups += "<th>" + 
agegroups[i]['name'] + "</th>";
+                                               html_agegroups += "<td>";
+                                               html_agegroups += "<input 
class=\"input50\" type=\"text\" name='male[" + agegroups[i]['id'] + "]' 
value='0'></input>";
+                                               html_agegroups += "</td>";
+                                               html_agegroups += "<td>";
+                                               html_agegroups += "<input 
class=\"input50\" type=\"text\" name='female[" + agegroups[i]['id'] + "]' 
value='0'></input>";
+                                               html_agegroups += "</td>";
+                                               html_agegroups += "</tr>";
+                                       }
+                                       
$("#agegroup_tbody").html(html_agegroups);
 
-                    var audience = data.audience;
-                    for ( var i = 0; i < audience.length; ++i )
-                    {
-                            html_audience += "<li>";
-                            html_audience += "<label>";
-                            html_audience += "<input type=\"radio\" 
name=\"audience[]\" value='" +audience[i]['id'] + "'></input>";
-                            html_audience += audience[i]['name'];
-                            html_audience += "</label>";
-                            html_audience += "</li>";
-                    }
-                    $("#audience").html( html_audience );
-                }
-            }
-        });
-    });
+                                       var audience = data.audience;
+                                       for (var i = 0; i < audience.length; 
++i)
+                                       {
+                                               html_audience += "<li>";
+                                               html_audience += "<label>";
+                                               html_audience += "<input 
type=\"radio\" name=\"audience[]\" value='" + audience[i]['id'] + "'></input>";
+                                               html_audience += 
audience[i]['name'];
+                                               html_audience += "</label>";
+                                               html_audience += "</li>";
+                                       }
+                                       $("#audience").html(html_audience);
+                               }
+                       }
+               });
+       });
 });
-    
-$(window).load(function() {
-    var building_id = $('#field_building_id').val();
-    if(building_id) {
-        populateTableChkResources(building_id, initialSelection);
-        building_id_selection = building_id;
-    }
-    $("#field_building_name").on("autocompleteselect", function(event, ui){
-        var building_id = ui.item.value;        
-        if (building_id != building_id_selection){
-            populateTableChkResources(building_id, []);
-            building_id_selection = building_id;
-        }
-    });
+
+$(window).load(function () {
+       var building_id = $('#field_building_id').val();
+       if (building_id) {
+               populateTableChkResources(building_id, initialSelection);
+               building_id_selection = building_id;
+       }
+       $("#field_building_name").on("autocompleteselect", function (event, ui) 
{
+               var building_id = ui.item.value;
+               if (building_id != building_id_selection) {
+                       populateTableChkResources(building_id, []);
+                       building_id_selection = building_id;
+               }
+       });
 });
 
 if ($.formUtils) {
-    $.formUtils.addValidator({
-        name: 'target_audience',
-        validatorFunction: function(value, $el, config, languaje, $form) {
-            var n = 0;
-            $('#audience input[name="audience[]"]').each(function(){
-               if ($(this).is(':checked')) {
-                   n++;
-               }
-            });
-            var v = (n > 0) ? true : false;
-            return v;
-        },
-        errorMessage: 'Please choose at least 1 target audience',
-        errorMessageKey: ''
-    });
+       $.formUtils.addValidator({
+               name: 'target_audience',
+               validatorFunction: function (value, $el, config, languaje, 
$form) {
+                       var n = 0;
+                       $('#audience input[name="audience[]"]').each(function 
() {
+                               if ($(this).is(':checked')) {
+                                       n++;
+                               }
+                       });
+                       var v = (n > 0) ? true : false;
+                       return v;
+               },
+               errorMessage: 'Please choose at least 1 target audience',
+               errorMessageKey: ''
+       });
 
-    $.formUtils.addValidator({
-        name: 'number_participants',
-        validatorFunction: function(value, $el, config, languaje, $form) {
-            var n = 0;
-            $('#agegroup_tbody input').each(function() {
-                if ($(this).val() != "" && $(this).val() > 0) {
-                    n++;
-                } 
-            });
-            var v = (n > 0) ? true : false;
-            return v;
-        },
-        errorMessage: 'Number of participants is required',
-        errorMessageKey: ''
-    });
+       $.formUtils.addValidator({
+               name: 'number_participants',
+               validatorFunction: function (value, $el, config, languaje, 
$form) {
+                       var n = 0;
+                       $('#agegroup_tbody input').each(function () {
+                               if ($(this).val() != "" && $(this).val() > 0) {
+                                       n++;
+                               }
+                       });
+                       var v = (n > 0) ? true : false;
+                       return v;
+               },
+               errorMessage: 'Number of participants is required',
+               errorMessageKey: ''
+       });
 
-    $.formUtils.addValidator({
-        name: 'customer_identifier',
-        validatorFunction: function(value, $el, config, languaje, $form) {
-            var v = true;
-            var customer_ssn = $('#field_customer_ssn').val();
-            var customer_organization_number = 
$('#field_customer_organization_number').val();
-            var cost = $('#field_cost').val();
-            if ( (customer_ssn == "" && customer_organization_number == "") && 
(cost > 0) ) {
-               v = false;
-            }
-            return v;
-        },
-        errorMessage: 'There is set a cost, but no invoice data is filled inn',
-        errorMessageKey: ''
-    });
+       $.formUtils.addValidator({
+               name: 'customer_identifier',
+               validatorFunction: function (value, $el, config, languaje, 
$form) {
+                       var v = true;
+                       var customer_ssn = $('#field_customer_ssn').val();
+                       var customer_organization_number = 
$('#field_customer_organization_number').val();
+                       var cost = $('#field_cost').val();
+                       if ((customer_ssn == "" && customer_organization_number 
== "") && (cost > 0)) {
+                               v = false;
+                       }
+                       return v;
+               },
+               errorMessage: 'There is set a cost, but no invoice data is 
filled inn',
+               errorMessageKey: ''
+       });
 
-    $.formUtils.addValidator({
-        name: 'application_dates',
-        validatorFunction: function(value, $el, config, languaje, $form) {
-            var n = 0;
-            if ($('input[name="from_[]"]').length == 0 || 
$('input[name="from_[]"]').length == 0) {
-                return false;
-            }
-            $('input[name="from_[]"]').each(function(){
-                if ($(this).val() == "") {
-                    $($(this).addClass("error").css("border-color","red"));
-                    n++;
-                } else {
-                    $($(this).removeClass("error").css("border-color",""));
-                }
-            });
-            $('input[name="to_[]"]').each(function(){
-                if ($(this).val() == "") {
-                    $($(this).addClass("error").css("border-color","red"));
-                    n++;
-                } else {
-                    $($(this).removeClass("error").css("border-color",""));
-                }
-            });
-            var v = (n == 0) ? true : false;
-            return v;
-        },
-        errorMessage: 'Invalid date',
-        errorMessageKey: ''
-    });
+       $.formUtils.addValidator({
+               name: 'application_dates',
+               validatorFunction: function (value, $el, config, languaje, 
$form) {
+                       var n = 0;
+                       if ($('input[name="from_[]"]').length == 0 || 
$('input[name="from_[]"]').length == 0) {
+                               return false;
+                       }
+                       $('input[name="from_[]"]').each(function () {
+                               if ($(this).val() == "") {
+                                       
$($(this).addClass("error").css("border-color", "red"));
+                                       n++;
+                               } else {
+                                       
$($(this).removeClass("error").css("border-color", ""));
+                               }
+                       });
+                       $('input[name="to_[]"]').each(function () {
+                               if ($(this).val() == "") {
+                                       
$($(this).addClass("error").css("border-color", "red"));
+                                       n++;
+                               } else {
+                                       
$($(this).removeClass("error").css("border-color", ""));
+                               }
+                       });
+                       var v = (n == 0) ? true : false;
+                       return v;
+               },
+               errorMessage: 'Invalid date',
+               errorMessageKey: ''
+       });
 
-    $.formUtils.addValidator({
-        name: 'application_resources',
-        validatorFunction: function(value, $el, config, language, $form) {
-            var n = 0;
-            $('#resources_container table 
input[name="resources[]"]').each(function(){
-               if ($(this).is(':checked')) {
-                   n++;
-               }
-            });
-            var v = (n > 0) ? true : false;
-            return v;
-        },
-        errorMessage: 'Please choose at least 1 resource',
-        errorMessageKey: 'application_resources'
-    });
+       $.formUtils.addValidator({
+               name: 'application_resources',
+               validatorFunction: function (value, $el, config, language, 
$form) {
+                       var n = 0;
+                       $('#resources_container table 
input[name="resources[]"]').each(function () {
+                               if ($(this).is(':checked')) {
+                                       n++;
+                               }
+                       });
+                       var v = (n > 0) ? true : false;
+                       return v;
+               },
+               errorMessage: 'Please choose at least 1 resource',
+               errorMessageKey: 'application_resources'
+       });
 }
 
-function populateTableChkResources (building_id, selection) {
-    var url = 
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' + 
 building_id + '&phpgw_return_as=json&';
-    var container = 'resources_container';
-    var colDefsResources = [{label: '', object: [{type: 'input', attrs: 
[{name: 'type', value: 'checkbox'},{name: 'name', value: 'resources[]'}]}], 
value: 'id', checked: selection},{key: 'name', label: lang['Name']}, {key: 
'type', label: lang['Resource Type']}];
-    populateTableChk(url, container, colDefsResources);
+function populateTableChkResources(building_id, selection) {
+       var url = 
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' + 
building_id + '&phpgw_return_as=json&';
+       var container = 'resources_container';
+       var colDefsResources = [{label: '', object: [{type: 'input', attrs: 
[{name: 'type', value: 'checkbox'}, {name: 'name', value: 'resources[]'}]}], 
value: 'id', checked: selection}, {key: 'name', label: lang['Name']}, {key: 
'type', label: lang['Resource Type']}];
+       populateTableChk(url, container, colDefsResources);
 }
 
-function populateTableChk (url, container, colDefs) {    
-    createTable(container,url,colDefs);
+function populateTableChk(url, container, colDefs) {
+       createTable(container, url, colDefs);
 }
 
-
-/*
-
-populateResourceTable = function(building_id, selection) {
-    YAHOO.booking.checkboxTableHelper('resources_container', 
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' + 
 building_id + '&phpgw_return_as=json&',
-    'resources[]', selection, {additional_fields: [{key: 'type', label: 
lang['Resource Type']}]});
-}
-
-var createFromToDatePickerSection = function(containerEl) {
-       if (!this.counter) { this.counter = 0; }
-       containerEl.className = 'date-container';
-       containerEl.innerHTML = '                                               
        ' +
-'                      <a href="#" class="close-btn">-</a>             ' +
-'                      <div><label>'+lang['From']+'</label></div>              
                ' +
-'                      <div class="datetime-picker">                   ' +
-'                              <input id="js_date_'+this.counter+'_from" 
type="text" name="from_[]">   ' +
-'                      </div>                                                  
                ' +
-'                      <div><label>'+lang['To']+'</label></div>                
                ' +
-'                      <div class="datetime-picker">                   ' +
-'                              <input id="js_date_'+this.counter+'_to" 
type="text" name="to_[]">       ' +
-'                      </div>';
-       this.counter++;
-}
-
-removeDateRow = function(e) {
-       this.parentNode.parentNode.removeChild(this.parentNode);
-       YAHOO.util.Event.stopEvent(e);
-}
-
-YAHOO.util.Event.addListener(window, "load", function() {
-       var Dom = YAHOO.util.Dom;
-    var building_id = YAHOO.util.Dom.get('field_building_id').value;
-    if(building_id) {
-        populateResourceTable(building_id, YAHOO.booking.initialSelection);
-    }
-    var ac = 
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
 
-                                              'field_building_name', 
'field_building_id', 'building_container');
-    // Update the resource table as soon a new building is selected
-    ac.itemSelectEvent.subscribe(function(sType, aArgs) {
-        populateResourceTable(aArgs[2].id, []);
-    });
-       Dom.getElementsByClassName('close-btn', 'a', null, function(a) {
-               a.onclick = removeDateRow;
-       });
-       // Add more From-To datepicker pairs when the user clicks on the add 
link/button
-       YAHOO.util.Event.addListener("add-date-link", "click", function(e) {
-               var container = Dom.get('dates-container');
-               var div = document.createElement('div');
-
-               createFromToDatePickerSection(div);     
-       
-               container.appendChild(div);
-               var a = div.getElementsByTagName('a')[0];
-               a.onclick = removeDateRow;
-               YAHOO.booking.setupDatePickers();
-               YAHOO.util.Event.stopEvent(e);
-       });
-    
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
 
-                                     'field_org_name', 'field_org_id', 
'org_container');
-});
-
-
-*/
\ No newline at end of file

Modified: branches/dev-syncromind/booking/js/booking/group_new.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/group_new.js     2015-12-10 
10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/group_new.js     2015-12-10 
12:54:52 UTC (rev 14556)
@@ -1,4 +1,4 @@
-YAHOO.util.Event.addListener(window, "load", function() {
-    
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
-                                     'field_organization_name', 
'field_organization_id', 'organization_container');
+$(document).ready(function () {
+       
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
+                       'field_organization_name', 'field_organization_id', 
'organization_container');
 });

Modified: branches/dev-syncromind/booking/js/booking/permission.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/permission.js    2015-12-10 
10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/permission.js    2015-12-10 
12:54:52 UTC (rev 14556)
@@ -1,24 +1,10 @@
 var objectType = "";
-$(document).ready(function() {
-    if (objectAutocomplete){
-        label_attr = objectType == 'resource' ? 'full_name' : 'name';
-        
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.ui'+objectType+'.index&phpgw_return_as=json&',
 
-                                 'field_object_name', 'field_object_id', 
'object_container', label_attr);
-    }
-    
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uipermission_'+objectType+'.index_accounts&phpgw_return_as=json&',
 
-                                                  'field_subject_name', 
'field_subject_id', 'subject_container');
+$(document).ready(function () {
+       if (objectAutocomplete) {
+               label_attr = objectType == 'resource' ? 'full_name' : 'name';
+               
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.ui' + objectType 
+ '.index&phpgw_return_as=json&',
+                               'field_object_name', 'field_object_id', 
'object_container', label_attr);
+       }
+       
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uipermission_' + 
objectType + '.index_accounts&phpgw_return_as=json&',
+                       'field_subject_name', 'field_subject_id', 
'subject_container');
 });
-
-
-////YAHOO.util.Event.addListener(window, "load", function() {
-//     var objectType = YAHOO.booking.objectType;
-//     
-//     if (YAHOO.booking.objectAutocomplete) {
-//             label_attr = objectType == 'resource' ? 'full_name' : 'name';
-//             
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.ui'+objectType+'.index&phpgw_return_as=json&',
 
-//                                         'field_object_name', 
'field_object_id', 'object_container', label_attr);
-//     }
-//     
-//     
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uipermission_'+objectType+'.index_accounts&phpgw_return_as=json&',
 
-//                                     'field_subject_name', 
'field_subject_id', 'subject_container');
-//});
\ No newline at end of file

Modified: branches/dev-syncromind/booking/js/booking/permission_root.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/permission_root.js       
2015-12-10 10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/permission_root.js       
2015-12-10 12:54:52 UTC (rev 14556)
@@ -1,9 +1,4 @@
-$(document).ready(function() {
-    
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uipermission_root.index_accounts&phpgw_return_as=json&',
 
-                                              'field_subject_name', 
'field_subject_id', 'subject_container');
+$(document).ready(function () {
+       
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uipermission_root.index_accounts&phpgw_return_as=json&',
+                       'field_subject_name', 'field_subject_id', 
'subject_container');
 });
-
-//YAHOO.util.Event.addListener(window, "load", function() {
-//     
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uipermission_root.index_accounts&phpgw_return_as=json&',
 
-//                                     'field_subject_name', 
'field_subject_id', 'subject_container');
-//});
\ No newline at end of file

Modified: branches/dev-syncromind/booking/js/booking/report.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/report.js        2015-12-10 
10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/report.js        2015-12-10 
12:54:52 UTC (rev 14556)
@@ -21,7 +21,7 @@
 });
 
 function populateTableChkResources(building_id, selection) {
-       oArgs = {menuaction: 'booking.uiresource.index', sort:'name', 
filter_building_id:building_id, filter_activity_id: $("#field_activity").val()};
+       oArgs = {menuaction: 'booking.uiresource.index', sort: 'name', 
filter_building_id: building_id, filter_activity_id: 
$("#field_activity").val()};
        var requestUrl = phpGWLink('index.php', oArgs, true);
        var container = 'resources_container';
        var colDefsResources = [{label: '', object: [{type: 'input', attrs: 
[{name: 'type', value: 'checkbox'}, {name: 'name', value: 'resources[]'}, 
{name: 'checked', value: 'checked'}]}], value: 'id'/*, checked: selection*/}, 
{key: 'name', label: lang['Name']}, {key: 'type', label: lang['Resource 
Type']}];
@@ -32,10 +32,10 @@
        createTable(container, url, colDefs);
 }
 
-$(document).ready(function(){
+$(document).ready(function () {
 
-       $( "#check_all_buildings" ).on( "click", function() {
-               if($(this).prop("checked"))
+       $("#check_all_buildings").on("click", function () {
+               if ($(this).prop("checked"))
                {
                        $("#building_container").hide();
                        $("#resources_container").hide();
@@ -50,48 +50,48 @@
        $("#field_activity").change(function () {
                oArgs = {menuaction: 'booking.uireports.get_custom'};
                var requestUrl = phpGWLink('index.php', oArgs, true);
-               var activity_id =$("#field_activity").val();
+               var activity_id = $("#field_activity").val();
                //reset resources on activity change
 //             $("#field_building_name").val('');
                var building_id = $('#field_building_id').val();
-               if(building_id)
+               if (building_id)
                {
                        populateTableChkResources(building_id, []);
                }
 
-               
-               if(!$("#check_all_buildings").prop("checked"))
+
+               if (!$("#check_all_buildings").prop("checked"))
                {
 //                     $("#resources_container").html(lang['Select a building 
first']);
                }
 
                $.ajax({
-                               type: 'POST',
-                               data: {activity_id:activity_id},
-                               dataType: 'json',
-                               url: requestUrl,
-                               success: function(data) {
-                                       if( data != null)
+                       type: 'POST',
+                       data: {activity_id: activity_id},
+                       dataType: 'json',
+                       url: requestUrl,
+                       success: function (data) {
+                               if (data != null)
+                               {
+                                       var message = data.message;
+                                       var variable_horizontal = 
data.variable_horizontal;
+                                       var variable_vertical = 
data.variable_vertical;
+
+                                       htmlString = "";
+                                       var msg_class = "msg_good";
+                                       if (data.status == 'error')
                                        {
-                                               var message = data.message;
-                                               var variable_horizontal = 
data.variable_horizontal;
-                                               var variable_vertical = 
data.variable_vertical;
-
-                                               htmlString = "";
-                                               var msg_class = "msg_good";
-                                               if(data.status =='error')
-                                               {
-                                                       msg_class = "error";
-                                               }
-                                               htmlString += "<div class=\"" + 
msg_class + "\">";
-                                               htmlString += message;
-                                               htmlString += '</div>';
-                                               
//$("#receipt").html(htmlString);
-                               //              
$("#custom_elements_horizontal").html( variable_horizontal );
-                                               
$("#custom_elements_vertical").html( variable_vertical );
+                                               msg_class = "error";
                                        }
+                                       htmlString += "<div class=\"" + 
msg_class + "\">";
+                                       htmlString += message;
+                                       htmlString += '</div>';
+                                       //$("#receipt").html(htmlString);
+                                       //              
$("#custom_elements_horizontal").html( variable_horizontal );
+                                       
$("#custom_elements_vertical").html(variable_vertical);
                                }
-                       });
+                       }
+               });
 
        });
 });
\ No newline at end of file

Modified: branches/dev-syncromind/booking/js/booking/resource_new.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/resource_new.js  2015-12-10 
10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/resource_new.js  2015-12-10 
12:54:52 UTC (rev 14556)
@@ -1,11 +1,4 @@
-$(document).ready(function() {
-    
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
 
-                                                  'field_building_name', 
'field_building_id', 'building_container');
+$(document).ready(function () {
+       
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
+                       'field_building_name', 'field_building_id', 
'building_container');
 });
-
-/*
-YAHOO.util.Event.addListener(window, "load", function() {
-    
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
-                                     'field_building_name', 
'field_building_id', 'building_container');
-});
-*/
\ No newline at end of file

Modified: branches/dev-syncromind/booking/js/booking/schedule.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/schedule.js      2015-12-10 
10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/schedule.js      2015-12-10 
12:54:52 UTC (rev 14556)
@@ -1,490 +1,235 @@
 var schedule = new Array();
 
-schedule.renderSchedule = function(container, url, date, colFormatter, 
includeResource, classTable) {
-    classTable = (classTable) ? classTable : "pure-table";
-    while(date.getDay() != 1) {
-        date.setDate(date.getDate()-1);
-    }
+schedule.renderSchedule = function (container, url, date, colFormatter, 
includeResource, classTable) {
+       classTable = (classTable) ? classTable : "pure-table";
+       while (date.getDay() != 1) {
+               date.setDate(date.getDate() - 1);
+       }
 //    var container = document.getElementById(container);
 //    container.innerHTML = '';
-       var datestr = date.getFullYear() + '-' + (date.getMonth()+1) + '-' + 
date.getDate();
+       var datestr = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + 
date.getDate();
        url += '&date=' + datestr;
 
-    var lang = {
-            WEEKDAYS_FULL: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 
'Thursday', 'Friday', 'Saturday'],
-            MONTHS_LONG: ['January', 'February', 'March', 'April', 'May', 
'June', 'July', 'August', 'September', 'October', 'November', 'December'],
-            LBL_TIME: 'Time',
-            LBL_RESOURCE: 'Resource',
-            LBL_WEEK: 'Week'
-    };
-    
-    var colDefs = [{key: 'time', label: date.getFullYear() +'<br/>' + 
lang['LBL_TIME']}];
-    if(includeResource) {
-        colDefs.push({key: 'resource', label: lang['LBL_RESOURCE'], formatter: 
'scheduleResourceColumn'});
-    }
-    schedule.dates = {};
-    var keys = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
-    for (var i=0;i<7;i++) {
-        var d = new Date(date.getFullYear(), date.getMonth(), date.getDate());
-        d.setDate(d.getDate() + i);
-        var x = (i<6) ? i+1 : 0;
-        schedule.dates[keys[x]] = d;
-        colDefs.push({key: keys[x], label: lang['WEEKDAYS_FULL'][x] + '<br>' + 
lang['MONTHS_LONG'][d.getMonth()] + ' ' + d.getDate(), formatter: colFormatter, 
date: d, day: d.getDate()});
-    }
-    var r = [{n: 'ResultSet'},{n: 'Result'}];
+       var lang = {
+               WEEKDAYS_FULL: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 
'Thursday', 'Friday', 'Saturday'],
+               MONTHS_LONG: ['January', 'February', 'March', 'April', 'May', 
'June', 'July', 'August', 'September', 'October', 'November', 'December'],
+               LBL_TIME: 'Time',
+               LBL_RESOURCE: 'Resource',
+               LBL_WEEK: 'Week'
+       };
+
+       var colDefs = [{key: 'time', label: date.getFullYear() + '<br/>' + 
lang['LBL_TIME']}];
+       if (includeResource) {
+               colDefs.push({key: 'resource', label: lang['LBL_RESOURCE'], 
formatter: 'scheduleResourceColumn'});
+       }
+       schedule.dates = {};
+       var keys = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+       for (var i = 0; i < 7; i++) {
+               var d = new Date(date.getFullYear(), date.getMonth(), 
date.getDate());
+               d.setDate(d.getDate() + i);
+               var x = (i < 6) ? i + 1 : 0;
+               schedule.dates[keys[x]] = d;
+               colDefs.push({key: keys[x], label: lang['WEEKDAYS_FULL'][x] + 
'<br>' + lang['MONTHS_LONG'][d.getMonth()] + ' ' + d.getDate(), formatter: 
colFormatter, date: d, day: d.getDate()});
+       }
+       var r = [{n: 'ResultSet'}, {n: 'Result'}];
 //    createta d u c r cl
-    createTableSchedule(container, url, colDefs, r, classTable, datestr);
+       createTableSchedule(container, url, colDefs, r, classTable, datestr);
 
 };
 
-schedule.setupWeekPicker = function(){}
-$(function() {
-    $( "#cal_container #datepicker" ).datepicker({
-        showWeek: true,
-        changeMonth: true,
-        changeYear: true,
-        firstDay: 1,
-        onSelect: function(a,e){
-            if (a != schedule.dateSelected){
-                var date = new Date(a);
-                schedule.dateSelected = a;
-                schedule.updateSchedule(date);
-            }
-        }
-    });
-    $("#cal_container #pickerImg").on('click', function(){
-        $( "#cal_container #datepicker" ).datepicker( "show" );
-    });
+schedule.setupWeekPicker = function () {
+}
+$(function () {
+       $("#cal_container #datepicker").datepicker({
+               showWeek: true,
+               changeMonth: true,
+               changeYear: true,
+               firstDay: 1,
+               onSelect: function (a, e) {
+                       if (a != schedule.dateSelected) {
+                               var date = new Date(a);
+                               schedule.dateSelected = a;
+                               schedule.updateSchedule(date);
+                       }
+               }
+       });
+       $("#cal_container #pickerImg").on('click', function () {
+               $("#cal_container #datepicker").datepicker("show");
+       });
 });
 
 schedule.updateSchedule = function (date) {
-    schedule.week = $.datepicker.iso8601Week(date);
-    $('#cal_container #numberWeek').text(schedule.week);
-    $("#cal_container #datepicker").datepicker("setDate", date);
-    classTable = (schedule.classTable) ? schedule.classTable : 'pure-table';
+       schedule.week = $.datepicker.iso8601Week(date);
+       $('#cal_container #numberWeek').text(schedule.week);
+       $("#cal_container #datepicker").datepicker("setDate", date);
+       classTable = (schedule.classTable) ? schedule.classTable : 'pure-table';
 
-    var url = self.location.href;
-    url = url.substr(0, (url.indexOf("#date")));
-    url += '#date=' + date.getFullYear() + '-' + (date.getMonth()+1) + '-' + 
date.getDate();
-    location.replace(url);
-    schedule.renderSchedule('schedule_container', schedule.datasourceUrl, 
date, schedule.colFormatter, schedule.includeResource, classTable);
-    schedule.date = date;
+       var url = self.location.href;
+       url = url.substr(0, (url.indexOf("#date")));
+       url += '#date=' + date.getFullYear() + '-' + (date.getMonth() + 1) + 
'-' + date.getDate();
+       location.replace(url);
+       schedule.renderSchedule('schedule_container', schedule.datasourceUrl, 
date, schedule.colFormatter, schedule.includeResource, classTable);
+       schedule.date = date;
 }
 
 schedule.moveWeek = function (n) {
-    var date = schedule.date;
-    while(date.getDay() != 1) {
-        date.setDate(date.getDate()-1);
-    }
-    date.setDate(date.getDate() + n);
-    schedule.updateSchedule(date);
+       var date = schedule.date;
+       while (date.getDay() != 1) {
+               date.setDate(date.getDate() - 1);
+       }
+       date.setDate(date.getDate() + n);
+       schedule.updateSchedule(date);
 }
 schedule.prevWeek = function () {
-    schedule.moveWeek(-7)
+       schedule.moveWeek(-7)
 };
 schedule.nextWeek = function () {
-    schedule.moveWeek(7)
+       schedule.moveWeek(7)
 }
 
 
-schedule.newApplicationForm = function(date, _from, _to, resource) {
+schedule.newApplicationForm = function (date, _from, _to, resource) {
 //    console.log(arguments);
 //    console.log(arguments.length);
-    var url = schedule.newApplicationUrl;
-    if (!url){
-        return;
-    }
-    if (arguments.length == 0) {
-        window.location.href = url;
-        return;
-    }
-    resource = (resource) ? resource : null;
-    date = (date) ? date : schedule.date;
-    _from = _from ? '%20' + _from: '';
-    _to = _to ? '%20' + _to: '';
-    var state = date.getFullYear() + '-' + (date.getMonth()+1) + '-' + 
date.getDate();
-    var day = date.getDay();
-    var weekday=new Array(7);
-    weekday[0]="sunday";
-    weekday[1]="monday";
-    weekday[2]="tuesday";
-    weekday[3]="wednesday";
-    weekday[4]="thursday";
-    weekday[5]="friday";
-    weekday[6]="saturday";
-    url += '&from_[]=' + state + _from + '&to_[]=' + state + _to + '&weekday=' 
+ weekday[day];
-    if (resource){
-        url += '&resource=' + resource;
-    }
-    window.location.href = url;
+       var url = schedule.newApplicationUrl;
+       if (!url) {
+               return;
+       }
+       if (arguments.length == 0) {
+               window.location.href = url;
+               return;
+       }
+       resource = (resource) ? resource : null;
+       date = (date) ? date : schedule.date;
+       _from = _from ? '%20' + _from : '';
+       _to = _to ? '%20' + _to : '';
+       var state = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + 
date.getDate();
+       var day = date.getDay();
+       var weekday = new Array(7);
+       weekday[0] = "sunday";
+       weekday[1] = "monday";
+       weekday[2] = "tuesday";
+       weekday[3] = "wednesday";
+       weekday[4] = "thursday";
+       weekday[5] = "friday";
+       weekday[6] = "saturday";
+       url += '&from_[]=' + state + _from + '&to_[]=' + state + _to + 
'&weekday=' + weekday[day];
+       if (resource) {
+               url += '&resource=' + resource;
+       }
+       window.location.href = url;
 }
 
-schedule.showInfo2 = function(url, resource) {
-    var content_overlay = document.getElementById('content_overlay');
-    var overlay = document.createElement('div');
-    var img = document.createElement('img');
-    
img.setAttribute('src','/portico/phpgwapi/templates/pure/images/loading_overlay.gif');
    
-    overlay.appendChild(img);
-    content_overlay.appendChild(overlay);
-    var hc = $('#content_overlay').height();
-    var ho = $('#schedule_overlay').height();
-    var top = (hc-(ho+42))/2;
-    overlay.style.top = top+"px";
-    overlay.style.display = 'block';
-    resource = (resource) ? resource : null;
-    url = url.replace(/&amp;/gi, '&') + '&resource=' + resource;
-    overlay.setAttribute('id', 'schedule_overlay');
-    content_overlay.appendChild(overlay);
-    $.get(url, function(data){
-       overlay.innerHTML = data;
-       var hc = $('#content_overlay').height();
-       var ho = $('#schedule_overlay').height();
-       var top = (hc-(ho+42))/2;
-       overlay.style.top = top+"px";
-       overlay.style.display = 'block';
-    })
-    .fail(function() {
-        $('#schedule_overlay').hide().remove();
-        alert( "Failed to load booking details page" );
-    });
+schedule.showInfo2 = function (url, resource) {
+       var content_overlay = document.getElementById('content_overlay');
+       var overlay = document.createElement('div');
+       var img = document.createElement('img');
+       img.setAttribute('src', 
'/portico/phpgwapi/templates/pure/images/loading_overlay.gif');
+       overlay.appendChild(img);
+       content_overlay.appendChild(overlay);
+       var hc = $('#content_overlay').height();
+       var ho = $('#schedule_overlay').height();
+       var top = (hc - (ho + 42)) / 2;
+       overlay.style.top = top + "px";
+       overlay.style.display = 'block';
+       resource = (resource) ? resource : null;
+       url = url.replace(/&amp;/gi, '&') + '&resource=' + resource;
+       overlay.setAttribute('id', 'schedule_overlay');
+       content_overlay.appendChild(overlay);
+       $.get(url, function (data) {
+               overlay.innerHTML = data;
+               var hc = $('#content_overlay').height();
+               var ho = $('#schedule_overlay').height();
+               var top = (hc - (ho + 42)) / 2;
+               overlay.style.top = top + "px";
+               overlay.style.display = 'block';
+       })
+                       .fail(function () {
+                               $('#schedule_overlay').hide().remove();
+                               alert("Failed to load booking details page");
+                       });
 }
 
-schedule.showInfo = function(url, resource) {
-    var dialog = document.getElementById('dialog_schedule');
-    var img = document.createElement('img');
-    
img.setAttribute('src','/portico/phpgwapi/templates/pure/images/loading_overlay.gif');
-    img.style.display = "block";
-    img.style.margin = "37px auto 0";
-    dialog.appendChild(img);
-    
-    schedule.dialogSchedule.dialog("close");
-    schedule.dialogSchedule.dialog("destroy");
-    schedule.createDialogSchedule(300);
-    schedule.dialogSchedule.dialog("open");
-    
-    resource = (resource) ? resource : null;
-    url = url.replace(/&amp;/gi, '&') + '&resource=' + resource;
-    
-    $.get(url, function(data){
-       schedule.dialogSchedule.dialog("close");
-       schedule.dialogSchedule.dialog("destroy");
-       dialog.innerHTML = data;
-       schedule.createDialogSchedule(650);
-       schedule.dialogSchedule.dialog("open");
-    })
-    .fail(function() {
-        schedule.dialogSchedule.dialog("close");
-        alert( "Failed to load booking details page" );
-    });
+schedule.showInfo = function (url, resource) {
+       var dialog = document.getElementById('dialog_schedule');
+       var img = document.createElement('img');
+       img.setAttribute('src', 
'/portico/phpgwapi/templates/pure/images/loading_overlay.gif');
+       img.style.display = "block";
+       img.style.margin = "37px auto 0";
+       dialog.appendChild(img);
+
+       schedule.dialogSchedule.dialog("close");
+       schedule.dialogSchedule.dialog("destroy");
+       schedule.createDialogSchedule(300);
+       schedule.dialogSchedule.dialog("open");
+
+       resource = (resource) ? resource : null;
+       url = url.replace(/&amp;/gi, '&') + '&resource=' + resource;
+
+       $.get(url, function (data) {
+               schedule.dialogSchedule.dialog("close");
+               schedule.dialogSchedule.dialog("destroy");
+               dialog.innerHTML = data;
+               schedule.createDialogSchedule(650);
+               schedule.dialogSchedule.dialog("open");
+       })
+                       .fail(function () {
+                               schedule.dialogSchedule.dialog("close");
+                               alert("Failed to load booking details page");
+                       });
 }
 
-schedule.createDialogSchedule = function(w){
-    var ww = $(window).width();
-    w = (w > (ww-40)) ? (ww-40) : w;
-    schedule.dialogSchedule = $('#dialog_schedule').dialog({
-        autoOpen: false,
-        modal: true,
-        width: w,
-        close: function(){
-            schedule.cleanDialog();
-        }
-    });
+schedule.createDialogSchedule = function (w) {
+       var ww = $(window).width();
+       w = (w > (ww - 40)) ? (ww - 40) : w;
+       schedule.dialogSchedule = $('#dialog_schedule').dialog({
+               autoOpen: false,
+               modal: true,
+               width: w,
+               close: function () {
+                       schedule.cleanDialog();
+               }
+       });
 }
 
-schedule.cleanDialog = function(){
-    $('#dialog_schedule').html("");
+schedule.cleanDialog = function () {
+       $('#dialog_schedule').html("");
 }
 
-schedule.closeOverlay = function(){
-    $('#schedule_overlay').hide().remove();
+schedule.closeOverlay = function () {
+       $('#schedule_overlay').hide().remove();
 }
 
-schedule.newAllocationForm = function(args) {
-       
-       var oArgs = {menuaction:'booking.uiseason.wtemplate_alloc'};
-       if (typeof(args['id']) !== 'undefined')
+schedule.newAllocationForm = function (args) {
+
+       var oArgs = {menuaction: 'booking.uiseason.wtemplate_alloc'};
+       if (typeof (args['id']) !== 'undefined')
        {
                oArgs['id'] = args['id'];
        } else {
-               if (typeof(args['_from']) !== 'undefined')
+               if (typeof (args['_from']) !== 'undefined')
                {
                        oArgs['_from'] = args['_from'];
                }
-               if (typeof(args['_to']) !== 'undefined')
+               if (typeof (args['_to']) !== 'undefined')
                {
                        oArgs['_to'] = args['_to'];
                }
-               if (typeof(args['wday']) !== 'undefined')
+               if (typeof (args['wday']) !== 'undefined')
                {
                        oArgs['wday'] = args['wday'];
                }
        }
-       
+
        var sUrl = phpGWLink('index.php', oArgs);
-       
-    for(var i=0; i< resource_ids.length; i++) {
+
+       for (var i = 0; i < resource_ids.length; i++) {
                sUrl += '&filter_id[]=' + resource_ids[i];
        }
-       
-       TINY.box.show({iframe:sUrl, 
boxid:'frameless',width:650,height:500,fixed:false,maskid:'darkmask',maskopacity:40,
 mask:true, animate:true,
-       close: true,
-       closejs:false
+
+       TINY.box.show({iframe: sUrl, boxid: 'frameless', width: 650, height: 
500, fixed: false, maskid: 'darkmask', maskopacity: 40, mask: true, animate: 
true,
+               close: true,
+               closejs: false
        });
 };
 
-
-
-
-
-/*
-colors = ['color1', 'color2', 'color3', 'color4', 'color5', 'color6', 
'color7', 'color8', 'color9', 'color10',
-                 'color11', 'color12', 'color13', 'color14', 'color15', 
'color16', 'color17', 'color18', 'color19', 'color20',
-          'color21', 'color22', 'color23', 'color24', 'color25', 'color26', 
'color27', 'color28', 'color29', 'color30',
-          'color31', 'color32', 'color33', 'color34', 'color35', 'color36', 
'color37', 'color38', 'color39', 'color40',
-          'color41', 'color42', 'color43', 'color44', 'color45', 'color46', 
'color47', 'color48', 'color49', 'color50',
-          'color51', 'color52', 'color53', 'color54', 'color55', 'color56', 
'color57', 'color58', 'color59', 'color60',];
-colorMap = {};
-
-YAHOO.booking.shorten = function(text, max) {
-       if(max && text.length > max)
-               text = text.substr(text, max) + '...';
-       return text;
-}
-
-YAHOO.booking.link = function(label, link, max) {
-       label = YAHOO.booking.shorten(label, max);
-       if(link)
-               return '<a href="' + link + '">' + label + '</a>';
-       else
-               return label;
-}
-
-YAHOO.booking.scheduleResourceColFormatter = function(elCell, oRecord, 
oColumn, text) {
-       if(text && oRecord.getData('resource_link')) {
-               elTr = elCell.parentNode.parentNode;
-               elTr.setAttribute("resource", oRecord.getData('resource_id'));
-               elCell.innerHTML = '<a href="' + 
oRecord.getData('resource_link') + '">' + text + '</a>';
-       }
-       else if (text) {
-               elCell.innerHTML = text;
-       }
-}
-
-YAHOO.booking.frontendScheduleColorFormatter = function(elCell, oRecord, 
oColumn, booking) { 
-       if(booking) {
-               if(!colorMap[booking.name]) {
-                       colorMap[booking.name] = colors.length ? colors.shift() 
: 'color60';
-               }1
-               var color = colorMap[booking.name];
-               YAHOO.util.Dom.addClass(elCell, 'info');
-               YAHOO.util.Dom.addClass(elCell, color);
-               YAHOO.util.Dom.addClass(elCell, booking.type);
-               if (booking.is_public == 0) {
-                       elCell.innerHTML = YAHOO.booking.shorten('Privat arr.', 
9);
-               } else {
-                       if (booking.shortname)
-                               elCell.innerHTML = 
YAHOO.booking.shorten(booking.shortname, 9);
-                       else    
-                               elCell.innerHTML = 
YAHOO.booking.shorten(booking.name, 9);
-               }
-               elCell.onclick = function() 
{YAHOO.booking.showBookingInfo(booking,elCell); return false; };
-       }
-       else {
-               elCell.innerHTML = '...';
-               var data = oRecord.getData();
-               elCell.ondblclick = function() 
{YAHOO.booking.newApplicationForm(YAHOO.booking.dates[oColumn.field], 
data._from, data._to, elCell); return false; };
-       }
-};
-
-YAHOO.booking.showBookingInfo = function(booking,elCell) {
-       var overlay = new YAHOO.widget.Overlay("overlay-info", { 
fixedcenter:true, visible:true, width:"400px" } );     
-       var callback = {
-               success : function(o) {
-                       overlay.setBody(o.responseText);
-               },
-               failure : function(o) {
-                       overlay.hide();
-                       alert('Failed to load booking details page');
-               }
-       }
-       resource = elCell.parentNode.parentNode.getAttribute('resource');
-       var conn = YAHOO.util.Connect.asyncRequest("GET", 
booking.info_url.replace(/&amp;/gi, '&') + '&resource=' + resource, callback);
-       overlay.setBody('<img 
src="http://l.yimg.com/a/i/us/per/gr/gp/rel_interstitial_loading.gif"; />');
-       overlay.render(document.body);
-}
-
-YAHOO.booking.bookingToHtml = function(booking) { 
-       if(booking.type == 'booking') {
-               var link = 'index.php?menuaction=booking.uibooking.edit&id=' + 
booking.id;
-       }
-       else if(booking.type == 'allocation') {
-               var link = 'index.php?menuaction=booking.uiallocation.edit&id=' 
+ booking.id;
-       }
-       else if(booking.type == 'event') {
-               var link = 'index.php?menuaction=booking.uievent.edit&id=' + 
booking.id;
-       }
-       else {
-               var link = null;
-       }
-       if (booking.shortname)
-               var html = YAHOO.booking.link(booking.shortname, link, 9);
-       else 
-               var html = YAHOO.booking.link(booking.name, link, 9);
-
-       if(booking.type == 'event' && booking.conflicts) {
-               for(var i=0; i<booking.conflicts.length;i++) {
-                       html += '<div class="conflict">conflicts with: ' + 
YAHOO.booking.bookingToHtml(booking.conflicts[i]) + '</div>';
-               }
-       }
-       return html;
-};
-
-YAHOO.booking.backendScheduleColorFormatter = function(elCell, oRecord, 
oColumn, booking) { 
-       if(booking) {
-               if(!colorMap[booking.name]) {
-                       colorMap[booking.name] = colors.length ? colors.shift() 
: 'color60';
-               }
-               var color = colorMap[booking.name];
-               YAHOO.util.Dom.addClass(elCell, color);
-               YAHOO.util.Dom.addClass(elCell, booking.type);
-               elCell.innerHTML = YAHOO.booking.bookingToHtml(booking);
-       }
-       else {
-               elCell.innerHTML = '...';
-       }
-};
-
-YAHOO.booking.scheduleColorFormatter = function(elCell, oRecord, oColumn, 
booking) { 
-       if(booking) {
-               if(!colorMap[booking.name]) {
-                       colorMap[booking.name] = colors.length ? colors.shift() 
: 'color60';
-               }
-               var color = colorMap[booking.name];
-               YAHOO.util.Dom.addClass(elCell, color);
-               if (booking.shortname)
-                       elCell.innerHTML = 
YAHOO.booking.link(booking.shortname, null, 9);
-               else
-                       elCell.innerHTML = YAHOO.booking.link(booking.name, 
null, 9);
-       }
-       else {
-               elCell.innerHTML = '...';
-       }
-};
-
-
-YAHOO.booking.scheduleRowFormatter = function(elTr, oRecord) { 
-       if (!oRecord.getData('resource')) {
-               YAHOO.util.Dom.addClass(elTr, 'free'); 
-       } 
-       if (oRecord.getData('time')) { 
-               YAHOO.util.Dom.addClass(elTr, 'time'); 
-       }
-       return true; 
-};
-
-YAHOO.booking.renderSchedule = function(container, url, date, colFormatter, 
includeResource) {
-       // Make sure date is a Monday
-       while(date.getDay() != 1)
-               date.setDate(date.getDate()-1);
-       var container = YAHOO.util.Dom.get(container);
-       container.innerHTML = '';
-       url += '&date=' + date.getFullYear() + '-' + (date.getMonth()+1) + '-' 
+ date.getDate();
-
-       var lang = {
-               WEEKDAYS_FULL: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 
'Thursday', 'Friday', 'Saturday'],
-               MONTHS_LONG: ['January', 'February', 'March', 'April', 'May', 
'June', 'July', 'August', 'September', 'October', 'November', 'December'],
-               LBL_TIME: 'Time',
-               LBL_RESOURCE: 'Resource',
-               LBL_WEEK: 'Week'
-       };
-       YAHOO.booking.lang('Calendar', lang);
-       YAHOO.booking.lang('common', lang);
-       YAHOO.booking.oButton.set('label', lang['LBL_WEEK'] + ' ' + 
YAHOO.booking.weeknumber(date));
-
-       var colDefs = [{key: 'time', label: date.getFullYear() +'<br/>' + 
lang['LBL_TIME']}];
-       if(includeResource) 
-               colDefs.push({key: 'resource', label: lang['LBL_RESOURCE'], 
formatter: YAHOO.booking.scheduleResourceColFormatter});
-       YAHOO.booking.dates = {};
-    var keys = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
-       for(var i=0; i < 7; i++) {
-               var d = new Date(date.getFullYear(), date.getMonth(), 
date.getDate());
-               d.setDate(d.getDate() + i);
-               var x = i < 6 ? i+1: 0;
-               YAHOO.booking.dates[keys[x]] = d;
-               colDefs.push({key: keys[x], label: lang['WEEKDAYS_FULL'][x] + 
'<br/>' + lang['MONTHS_LONG'][d.getMonth()] + ' ' + d.getDate(), formatter: 
colFormatter, 'date': d});
-       }
-       YAHOO.booking.inlineTableHelper('schedule_container', url, colDefs, {
-               formatRow: YAHOO.booking.scheduleRowFormatter
-       }, true);
-}
-
-YAHOO.booking.prevWeek = function() {
-       YAHOO.booking.date.setDate(YAHOO.booking.date.getDate() - 7);
-       var state = YAHOO.booking.date.getFullYear() + '-' + 
(YAHOO.booking.date.getMonth()+1) + '-' + YAHOO.booking.date.getDate();
-       YAHOO.util.History.navigate('date', state);
-}
-
-YAHOO.booking.nextWeek = function() {
-       YAHOO.booking.date.setDate(YAHOO.booking.date.getDate() + 7);
-       var state = YAHOO.booking.date.getFullYear() + '-' + 
(YAHOO.booking.date.getMonth()+1) + '-' + YAHOO.booking.date.getDate();
-       YAHOO.util.History.navigate('date', state);
-}
-
-YAHOO.booking.newApplicationForm = function(date, _from, _to, elCell) {
-       if(elCell) 
-       {       
-               resource = 
elCell.parentNode.parentNode.getAttribute('resource');
-       }
-       else
-       {
-               resource = null;
-       }
-       date = date ? date : YAHOO.booking.date;
-       _from = _from ? '%20' + _from: '';
-       _to = _to ? '%20' + _to: '';
-       var url = YAHOO.booking.newApplicationUrl;
-       var state = date.getFullYear() + '-' + (date.getMonth()+1) + '-' + 
date.getDate();
-    var day = date.getDay();
-    var weekday=new Array(7);
-    weekday[0]="sunday";
-    weekday[1]="monday";
-    weekday[2]="tuesday";
-    weekday[3]="wednesday";
-    weekday[4]="thursday";
-    weekday[5]="friday";
-    weekday[6]="saturday";
-       url += '&from_[]=' + state + _from + '&to_[]=' + state + _to + 
'&resource=' + resource + '&weekday=' + weekday[day];
-    if (YAHOO.booking.endOfSeason === undefined || YAHOO.booking.endOfSeason > 
date) {
-       window.location.href = url;
-    }
-    
-}
-
-YAHOO.booking.setupWeekPicker = function(container) {
-       var Dom = YAHOO.util.Dom;
-       var oCalendarMenu = new YAHOO.widget.Overlay(Dom.generateId(), { 
visible: false});
-       var oButton = new YAHOO.widget.Button({type: "menu", id: 
Dom.generateId(), menu: oCalendarMenu, container: container});
-       YAHOO.booking.oButton = oButton;
-       oButton.on("appendTo", function () {
-               oCalendarMenu.setBody(" ");
-               oCalendarMenu.body.id = Dom.generateId();
-       });
-       oButton.on("click", function () {
-               var oCalendar = new YAHOO.widget.Calendar(Dom.generateId(), 
oCalendarMenu.body.id, {START_WEEKDAY: 1});
-               oCalendar.cfg.setProperty("pagedate", 
(YAHOO.booking.date.getMonth()+1) + "/" + YAHOO.booking.date.getFullYear());
-               oCalendar.render();
-               oCalendar.selectEvent.subscribe(function (p_sType, p_aArgs) {
-                       if (p_aArgs) {
-                               var aDate = p_aArgs[0][0];
-                               YAHOO.util.History.navigate('date', aDate[0] + 
'-' + aDate[1] + '-' + aDate[2]);
-                       }
-                       oCalendarMenu.hide();
-               }, this, true);
-       });
-}
-
-YAHOO.booking.closeOverlay = function() {
-       var o = YAHOO.util.Dom.get('overlay-info');
-       o.parentNode.removeChild(o);
-}
-*/

Modified: branches/dev-syncromind/booking/js/booking/season.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/season.js        2015-12-10 
10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/season.js        2015-12-10 
12:54:52 UTC (rev 14556)
@@ -1,79 +1,54 @@
 var building_id_selection = "";
 var regulations_select_all = "";
 
-$(document).ready(function() {
-    
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uipermission_root.index_accounts&phpgw_return_as=json&',
 
-                                                  'field_officer_name', 
'field_officer_id', 'officer_container');
-    
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
 
-                                                  'field_building_name', 
'field_building_id', 'building_container');
+$(document).ready(function () {
+       
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uipermission_root.index_accounts&phpgw_return_as=json&',
+                       'field_officer_name', 'field_officer_id', 
'officer_container');
+       
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
+                       'field_building_name', 'field_building_id', 
'building_container');
 });
 
-$(window).load(function(){
-    building_id = $('#field_building_id').val();
-    if (building_id) {
-        populateTableChkResources(building_id, initialSelection);
-        building_id_selection = building_id;
-    }
-    $("#field_building_name").on("autocompleteselect", function(event, ui){
-        var building_id = ui.item.value;
-        var selection = [];
-        if (building_id != building_id_selection){
-            populateTableChkResources(building_id, selection);
-            building_id_selection = building_id;
-        }
-    });
+$(window).load(function () {
+       building_id = $('#field_building_id').val();
+       if (building_id) {
+               populateTableChkResources(building_id, initialSelection);
+               building_id_selection = building_id;
+       }
+       $("#field_building_name").on("autocompleteselect", function (event, ui) 
{
+               var building_id = ui.item.value;
+               var selection = [];
+               if (building_id != building_id_selection) {
+                       populateTableChkResources(building_id, selection);
+                       building_id_selection = building_id;
+               }
+       });
 });
 
 if ($.formUtils) {
-    $.formUtils.addValidator({
-        name: 'application_resources',
-        validatorFunction: function(value, $el, config, language, $form) {
-            var n = 0;
-            $('#resources-container table 
input[name="resources[]"]').each(function(){
-               if ($(this).is(':checked')) {
-                   n++;
-               }
-            });
-            var v = (n > 0) ? true : false;
-            return v;
-        },
-        errorMessage: 'Please choose at least 1 resource',
-        errorMessageKey: 'application_resources'
-    });
+       $.formUtils.addValidator({
+               name: 'application_resources',
+               validatorFunction: function (value, $el, config, language, 
$form) {
+                       var n = 0;
+                       $('#resources-container table 
input[name="resources[]"]').each(function () {
+                               if ($(this).is(':checked')) {
+                                       n++;
+                               }
+                       });
+                       var v = (n > 0) ? true : false;
+                       return v;
+               },
+               errorMessage: 'Please choose at least 1 resource',
+               errorMessageKey: 'application_resources'
+       });
 }
 
-function populateTableChkResources (building_id, selection) {
-    var url = 
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' + 
 building_id + '&phpgw_return_as=json&';
-    var container = 'resources-container';
-    var colDefsResources = [{label: '', object: [{type: 'input', attrs: 
[{name: 'type', value: 'checkbox'},{name: 'name', value: 'resources[]'}]}], 
value: 'id', checked: selection},{key: 'name', label: lang['Name']}, {key: 
'type', label: lang['Resource Type']}];
-    populateTableChk(url, container, colDefsResources);
+function populateTableChkResources(building_id, selection) {
+       var url = 
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' + 
building_id + '&phpgw_return_as=json&';
+       var container = 'resources-container';
+       var colDefsResources = [{label: '', object: [{type: 'input', attrs: 
[{name: 'type', value: 'checkbox'}, {name: 'name', value: 'resources[]'}]}], 
value: 'id', checked: selection}, {key: 'name', label: lang['Name']}, {key: 
'type', label: lang['Resource Type']}];
+       populateTableChk(url, container, colDefsResources);
 }
 
-function populateTableChk (url, container, colDefs) {
-    createTable(container,url,colDefs);
+function populateTableChk(url, container, colDefs) {
+       createTable(container, url, colDefs);
 }
-
-
-
-/*
-populateResourceTable = function(building_id, selection) {
-    YAHOO.booking.checkboxTableHelper('resources-container', 
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' + 
 building_id + '&phpgw_return_as=json&',
-    'resources[]', selection, {additional_fields: [{key: 'type', label: 
lang['Resource Type']}]});
-}
-
-YAHOO.util.Event.addListener(window, "load", function() {
-    var building_id = YAHOO.util.Dom.get('field_building_id').value;
-    if(building_id)
-        populateResourceTable(building_id, YAHOO.booking.initialSelection);
-    var ac = 
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
-                                             'field_building_name', 
'field_building_id', 'building_container');
-    // Update the resource table as soon a new building is selected
-    ac.itemSelectEvent.subscribe(function(sType, aArgs) {
-        populateResourceTable(aArgs[2].id, []);
-    });
-
-       
YAHOO.booking.autocompleteHelper('index.php?menuaction=booking.uipermission_root.index_accounts&phpgw_return_as=json&',
 
-                                            'field_officer_name', 
'field_officer_id', 'officer_container');
-});
-*/
-

Modified: branches/dev-syncromind/booking/js/booking/season.wtemplate.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/season.wtemplate.js      
2015-12-10 10:15:04 UTC (rev 14555)
+++ branches/dev-syncromind/booking/js/booking/season.wtemplate.js      
2015-12-10 12:54:52 UTC (rev 14556)
@@ -1,56 +1,56 @@
 
-saveTemplateAlloc = function(){
-    
+saveTemplateAlloc = function () {
+
        var resources_checks = $('.resources_checks');
-       
+
        var values = {};
 
-       values['cost']  = $('#cost').val();
-       var from_ = $('#from_h').val() +':'+ $('#from_m').val();
+       values['cost'] = $('#cost').val();
+       var from_ = $('#from_h').val() + ':' + $('#from_m').val();
        values['from_'] = from_;
-       values['id']    = $('#id').val();
+       values['id'] = $('#id').val();
        values['organization_id'] = $('#organization_id').val();
-       var to_ = $('#to_h').val() +':'+ $('#to_m').val();
-       values['to_']   = to_;
-       values['wday']  = $('#wday').val();
+       var to_ = $('#to_h').val() + ':' + $('#to_m').val();
+       values['to_'] = to_;
+       values['wday'] = $('#wday').val();
        values['season_id'] = parent.season_id;
        values['resources'] = {};
-       
+
        var n = 0;
-       resources_checks.each(function(i, obj) {
-               if (obj.checked) 
+       resources_checks.each(function (i, obj) {
+               if (obj.checked)
                {
                        values['resources'][n] = obj.value;
                        n++;
                }
        });
-               
-       var oArgs = {menuaction:'booking.uiseason.wtemplate_alloc'};
-       var requestUrl = phpGWLink('index.php', oArgs, true);   
-                                       
+
+       var oArgs = {menuaction: 'booking.uiseason.wtemplate_alloc'};
+       var requestUrl = phpGWLink('index.php', oArgs, true);
+
        var data = values;
-       JqueryPortico.execute_ajax(requestUrl, function(result){
+       JqueryPortico.execute_ajax(requestUrl, function (result) {
 
-               if (typeof(result.error) !== 'undefined')
+               if (typeof (result.error) !== 'undefined')
                {
-                       JqueryPortico.show_message('',result);
+                       JqueryPortico.show_message('', result);
                } else {
-                       parent.createTableSchedule('schedule_container', 
parent.weekUrl, parent.colDefs, parent.r, 'pure-table' );
+                       parent.createTableSchedule('schedule_container', 
parent.weekUrl, parent.colDefs, parent.r, 'pure-table');
                        parent.TINY.box.hide();
                }
 
        }, data, "POST", "JSON");
 };
 
-deleteTemplateAlloc = function(){
-               
-       var oArgs = {menuaction:'booking.uiseason.delete_wtemplate_alloc'};
-       var requestUrl = phpGWLink('index.php', oArgs, true);   
-                                       
+deleteTemplateAlloc = function () {
+
+       var oArgs = {menuaction: 'booking.uiseason.delete_wtemplate_alloc'};
+       var requestUrl = phpGWLink('index.php', oArgs, true);
+
        var data = {'id': $('#id').val()};
-       JqueryPortico.execute_ajax(requestUrl, function(result){
+       JqueryPortico.execute_ajax(requestUrl, function (result) {
 
-               parent.createTableSchedule('schedule_container', 
parent.weekUrl, parent.colDefs, parent.r, 'pure-table' );
+               parent.createTableSchedule('schedule_container', 
parent.weekUrl, parent.colDefs, parent.r, 'pure-table');
                parent.TINY.box.hide();
 
        }, data, "POST", "JSON");




reply via email to

[Prev in Thread] Current Thread [Next in Thread]