Changeset 6069 for trunk/prototype/mapDisponibility.php

Timestamp:

05/02/12 15:17:17 (12 years ago)

Author:

douglasz

Message:

Ticket #2673 - Problemas com o mapa de disponibilidade.

File:

• trunk/prototype/mapDisponibility.php (modified) (2 diffs)

trunk/prototype/mapDisponibility.php

@@ -39 +39 @@
                         
                         
-                        
-                        $sql = 'SELECT calendar_object.range_start as "startTime" , calendar_object.range_end as "endTime", calendar_object.allday as "allDay" FROM calendar_object WHERE (range_start >=  '.$data['startTime']
-                        .' AND range_end <= '.$data['endTime'].' AND transp = 0  AND id IN ( SELECT calendar_object_id from calendar_to_calendar_object where '
+                        $sql = 'SELECT calendar_object.range_start as "startTime" , calendar_object.range_end as "endTime", calendar_object.allday as "allDay", calendar_object.tzid as "timezone" FROM calendar_object WHERE ('
+                        .'((range_start >=  '.$data['startTime'].' AND range_start <= '.$data['endTime'].')'
+                        .' OR (range_end >=  '.$data['startTime'].' AND range_end <= '.$data['endTime'].')'
+                        .' OR (range_start <=  '.$data['startTime'].' AND range_end >= '.$data['endTime'].') )'
+                        .' AND transp = 0  AND id IN ( SELECT calendar_object_id from calendar_to_calendar_object where '
                         .'calendar_id IN (SELECT calendar_id FROM calendar_signature WHERE (user_uidnumber = '. $value['id'] .'  AND is_owner = 1 ))  ))';
 
@@ -50 +52 @@
                         
                         $disponibilyUser = array();
-                
+                        
+                        $startTime = new DateTime('now', new DateTimeZone($data['timezone']));
+                        $endTime = new DateTime('now', new DateTimeZone($data['timezone']));
+                        
                         foreach($result as $ke => $va){
-                        
-                        array_push($disponibilyUser, array('startTime' => $va['startTime'], 'endTime' => $va['endTime'], 'allDay' => $va['allDay']));
+
+                                $startTime->setTimestamp((int) ($va['startTime'] / 1000));
+                                $endTime->setTimestamp((int) ($va['endTime'] / 1000));
+                                
+                                array_push($disponibilyUser, array('startTime' => ($startTime->format('U') + ( $startTime->format('O') * (36) )).'000', 'endTime' => ($endTime->format('U') + ( $startTime->format('O') * (36) )).'000', 'allDay' => $va['allDay']));
 
                         /*