Changeset 6069

Timestamp:

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

Author:

douglasz

Message:

Ticket #2673 - Problemas com o mapa de disponibilidade.

Location:

trunk/prototype

Files:

• mapDisponibility.php (modified) (2 diffs)
• modules/calendar/js/map.disponibility.js (modified) (1 diff)
• modules/calendar/js/timezone.js (modified) (1 diff)

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']));
 
                         /* 

trunk/prototype/modules/calendar/js/map.disponibility.js

@@ -154 +154 @@
                 for(var map_attende in map_events){
                         for(var event_by_attende in map_events[map_attende]){
+                                var endTime = Timezone.getDateMapDisponibility(new Date(parseInt(map_events[map_attende][event_by_attende].endTime)));
+                                if(!!parseInt(map_events[map_attende][event_by_attende].allDay))
+                                        endTime.add({day: -1});
+
                                 eventSource.push(
                                 {
                                         id : "map_busy_events", 
                                         title : map.attendees[map_attende].name,
-                                        start: new Date(parseInt(map_events[map_attende][event_by_attende].startTime)),
-                                        end: new Date(parseInt(map_events[map_attende][event_by_attende].endTime)),
+                                        start: Timezone.getDateMapDisponibility(new Date(parseInt(map_events[map_attende][event_by_attende].startTime))),
+                                        end: endTime,
                                         editable : false,
                                         allDay : !!parseInt(map_events[map_attende][event_by_attende].allDay),

trunk/prototype/modules/calendar/js/timezone.js

@@ -50 +50 @@
                 var offsetDate = !!current ? this.currentOffset : date.getUTCOffset();
                 return date.add({hours: (parseInt(offsetDate.charAt(0) + offsetDate.charAt(2)) * (!!inverse ? -1 : 1) )});
+        },
+        
+        getDateMapDisponibility: function(date){
+                return this.normalizeDate(date, false, true);
         }
 }