[Fmsystem-commits] [15670]

[saul . huanay]

Revision: 15670
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15670
Author:   psaul
Date:     2016-09-15 01:08:18 +0000 (Thu, 15 Sep 2016)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/phpgwapi/js/jquery/common.js
    branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php
    branches/dev-syncromind-2/rental/templates/base/application.xsl

Modified: branches/dev-syncromind-2/phpgwapi/js/jquery/common.js
===================================================================
--- branches/dev-syncromind-2/phpgwapi/js/jquery/common.js      2016-09-14 
14:42:37 UTC (rev 15669)
+++ branches/dev-syncromind-2/phpgwapi/js/jquery/common.js      2016-09-15 
01:08:18 UTC (rev 15670)
@@ -1276,6 +1276,7 @@
 function createTableSchedule (d, u, c, r, cl, dt, a, p, t)
 {
        var container = document.getElementById(d);
+       var container_toolbar = document.createElement('div');
        var xtable = document.createElement('table');
        var tableHead = document.createElement('thead');
        var tableHeadTr = document.createElement('tr');
@@ -1309,6 +1310,7 @@
        xtable.appendChild(tableBody);
 
        container.innerHTML = "";
+       container.appendChild(container_toolbar);
        container.appendChild(xtable);
 
        $.post(u, a, function (data)
@@ -1444,7 +1446,8 @@
                        if (t)
                        {
                                var toolbar = schedule.createToolbar();
-                               container.insertBefore(toolbar, xtable);
+                               container_toolbar.appendChild(toolbar);
+//                             container.insertBefore(toolbar, xtable);
                        }
                }
        });

Modified: branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php      
2016-09-14 14:42:37 UTC (rev 15669)
+++ branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php      
2016-09-15 01:08:18 UTC (rev 15670)
@@ -1279,15 +1279,65 @@
 
                        foreach ($composites_data as $composite)
                        {
-                               $composites[$n]['id'] = $composite['id'];
-                               $composites[$n]['name'] = $composite['name'];
-                               $composites[$n]['object_number'] = 
$composite['location_code'];
+                               $composite_obj = 
rental_socomposite::get_instance()->get_single($composite['id']);
+                               $contracts = $composite_obj->get_contracts();
+                               $c = 0;
+                               if (count($contracts) > 0)
+                               {
+                                       foreach ($contracts as $contract)
+                                       {
+                                               $contract = 
$contract->serialize();
 
-                               foreach ($days as $day)
+                                               if ($composites[$n-1]['id'] != 
$composite['id'])
+                                               {
+                                                       $composites[$n]['id'] = 
$composite['id'];
+                                               }
+                                               
+                                               $composites[$n]['name'] = 
$composite['name'];
+                                               
$composites[$n]['object_number'] = $composite['location_code'];
+
+                                               $contract_date_start = new 
DateTime(date('Y-m-d', 
phpgwapi_datetime::date_to_timestamp($contract['date_start'])));
+                                               $contract_date_end = new 
DateTime(date('Y-m-d', 
phpgwapi_datetime::date_to_timestamp($contract['date_end'])));
+                                               
+                                               foreach ($days as $day)
+                                               {
+                                                       if 
($composites[$n][date_format($day, 'D')]['status'] == 'Ikke ledig') {
+                                                               break 2;
+                                                       }
+                                                       if ($day >= 
$contract_date_start && ($day <= $contract_date_end || $contract['date_end'] != 
''))
+                                                       {
+                                                               
$composites[$n][date_format($day, 'D')]['status'] = 'Ikke ledig';
+                                                               $c++;
+                                                       }
+                                                       else
+                                                       {
+                                                               
$composites[$n][date_format($day, 'D')]['status'] = 'Ledig';
+                                                       }
+                                               }
+//                                             $n++;
+                                       }
+                               }
+                               else
                                {
-                                       $composites[$n][date_format($day, 
'D')]['status'] = $composite['status'];
+                                       $composites[$n]['id'] = 
$composite['id'];
+                                       $composites[$n]['name'] = 
$composite['name'];
+                                       $composites[$n]['object_number'] = 
$composite['location_code'];
+
+                                       foreach ($days as $day)
+                                       {
+                                               
$composites[$n][date_format($day, 'D')]['status'] = 'Ledig';
+                                       }
+//                                     $n++;
                                }
-                               $n++;
+                               if ($c >= 7)
+                               {
+                                       unset($composites[$n]);
+                               }
+                               else
+                               {
+                                       $n++;
+                               }
+                               //$n++;
                        }
 
                        $data = array(

Modified: branches/dev-syncromind-2/rental/templates/base/application.xsl
===================================================================
--- branches/dev-syncromind-2/rental/templates/base/application.xsl     
2016-09-14 14:42:37 UTC (rev 15669)
+++ branches/dev-syncromind-2/rental/templates/base/application.xsl     
2016-09-15 01:08:18 UTC (rev 15670)
@@ -433,13 +433,22 @@
                                                                <xsl:with-param 
name="schedule" select ='./schedule'/>
                                                        </xsl:call-template>
                                                        <script 
type="text/javascript">
-                                                               
$(document).ready(function ()
+                                                               
$(window).load(function ()
                                                                {
+
+                                                                       <xsl:if 
test="application/assign_date_start != 0 and application/assign_date_start != 
''">
+                                                                               
var adend = '<xsl:value-of select="php:function('date', $date_format, 
number(application/assign_date_start))"/>';
+                                                                               
var adend_date = new Date(adend.substr(6,4), adend.substr(3,2) - 1, 
adend.substr(0,2));
+                                                                               
schedule.updateSchedule(adend_date);
+                                                                       
</xsl:if>
+
                                                                        
$('#assign_date_start').datepicker("option", "onSelect", function (a, e) {
                                                                                
console.log(a);
                                                                                
//console.log(e);
                                                                                
schedule.params.availability_date_from = a;
-                                                                               
schedule.renderSchedule('schedule_container', schedule.datasourceUrl, 
schedule.date, schedule.colFormatter, schedule.includeResource);
+                                                                               
var date = new Date(a);
+                                                                               
schedule.updateSchedule(date);
+                                                                               
//schedule.renderSchedule('schedule_container', schedule.datasourceUrl, 
schedule.date, schedule.colFormatter, schedule.includeResource);
                                                                        });
 
                                                                        
$('#assign_date_end').datepicker("option", "onSelect", function (a, e) {