Changeset 6069 for trunk/prototype/modules/calendar

Timestamp:

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

Author:

douglasz

Message:

Ticket #2673 - Problemas com o mapa de disponibilidade.

Location:

trunk/prototype/modules/calendar/js

Files:

• map.disponibility.js (modified) (1 diff)
• timezone.js (modified) (1 diff)

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);
         }
 }