[Fmsystem-commits] [6895] bkbooking: update logic YUI DataTable generation

[Kjell Arne Espedal]

Revision: 6895
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6895
Author:   kjell
Date:     2011-02-01 08:47:03 +0000 (Tue, 01 Feb 2011)
Log Message:
-----------
bkbooking: update logic 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:02 UTC (rev 6894)
+++ trunk/booking/inc/schedule.php      2011-02-01 08:47:03 UTC (rev 6895)
@@ -64,14 +64,14 @@
                                        }
                                        if(in_array($res['id'], 
$booking['resources']))
                                        {
-                        if(($testdata['wday'] == $booking['wday']) and 
($testdata['from_'] == $booking['from_']) and ($testdata['to_'] == 
$booking['to_']) and ($testdata['allocation_id'] == $booking['id'])){
+                        if(($testdata[$booking['wday']]['from_'] == 
$booking['from_']) and ($testdata[$booking['wday']]['to_'] == $booking['to_']) 
and ($testdata[$booking['wday']]['allocation_id'] == $booking['id'])){
                             //
                        } else {
                                                    $empty = false;
                                                    $row[$booking['wday']] = 
$booking;
                         }
                         if($booking['type'] == 'booking'){
-                                               $testdata = $booking;
+                                               $testdata[$booking['wday']] = 
$booking;
                         } 
                                        }
                                }