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

[Kjell Arne Espedal]

Revision: 6892
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6892
Author:   kjell
Date:     2011-02-01 08:36:39 +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-01-31 20:50:37 UTC (rev 6891)
+++ trunk/booking/inc/schedule.php      2011-02-01 08:36:39 UTC (rev 6892)
@@ -55,6 +55,7 @@
                                $row['_from'] = $t;
                                $row['_to'] = $tmp_t;
                                $empty = true;
+                $testdata = array();
                                foreach($bookings as $booking)
                                {
                                        if($booking['from_'] > $t)
@@ -63,8 +64,15 @@
                                        }
                                        if(in_array($res['id'], 
$booking['resources']))
                                        {
-                                               $empty = false;
-                                               $row[$booking['wday']] = 
$booking;
+                        if(($testdata['wday'] == $booking['wday']) and 
($testdata['from_'] == $booking['from_']) and ($testdata['to_'] == 
$booking['to_']) and ($testdata['allocation_id'] == $booking['id'])){
+                            //
+                       } else {
+                                                   $empty = false;
+                                                   $row[$booking['wday']] = 
$booking;
+                        }
+                        if($booking['type'] == 'booking'){
+                                               $testdata = $booking;
+                        } 
                                        }
                                }
                                if(!$empty) {
@@ -82,4 +90,4 @@
 
        }
        return $data;
-}
\ No newline at end of file
+}