[Fmsystem-commits] [6896] bkbooking: bugfix in schedule yui datatable generation

[Kjell Arne Espedal]

Revision: 6896
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6896
Author:   kjell
Date:     2011-02-01 11:15:18 +0000 (Tue, 01 Feb 2011)
Log Message:
-----------
bkbooking: bugfix in schedule yui datatable generation

Modified Paths:
--------------
    trunk/booking/inc/schedule.php

Modified: trunk/booking/inc/schedule.php
===================================================================
--- trunk/booking/inc/schedule.php      2011-02-01 08:47:03 UTC (rev 6895)
+++ trunk/booking/inc/schedule.php      2011-02-01 11:15:18 UTC (rev 6896)
@@ -11,7 +11,6 @@
        function get_to($a) {return $a['to_'];};
        function cmp_from($a, $b) {return strcmp($a['from_'], $b['from_']);};
        function cmp_to($a, $b) {return strcmp($a['to_'], $b['to_']);};
-       
        while(true) {
                usort($bookings, 'cmp_from');
                // No bookings left
@@ -55,7 +54,7 @@
                                $row['_from'] = $t;
                                $row['_to'] = $tmp_t;
                                $empty = true;
-                $testdata = array();
+                $tempbooking = array();
                                foreach($bookings as $booking)
                                {
                                        if($booking['from_'] > $t)
@@ -64,14 +63,12 @@
                                        }
                                        if(in_array($res['id'], 
$booking['resources']))
                                        {
-                        if(($testdata[$booking['wday']]['from_'] == 
$booking['from_']) and ($testdata[$booking['wday']]['to_'] == $booking['to_']) 
and ($testdata[$booking['wday']]['allocation_id'] == $booking['id'])){
-                            //
-                       } else {
+                        if(!(($tempbooking[$booking['wday']]['from_'] <= 
$booking['from_']) and ($tempbooking[$booking['wday']]['to_'] == 
$booking['to_']) and ($tempbooking[$booking['wday']]['allocation_id'] == 
$booking['id']) and ($booking['type'] == 'allocation'))){
                                                    $empty = false;
                                                    $row[$booking['wday']] = 
$booking;
                         }
                         if($booking['type'] == 'booking'){
-                                               $testdata[$booking['wday']] = 
$booking;
+                                               $tempbooking[$booking['wday']] 
= $booking;
                         } 
                                        }
                                }