Changeset 7579 for trunk/prototype/modules/calendar/js/calendar.codecs.js

Timestamp:

11/29/12 17:12:33 (11 years ago)

Author:

acoutinho

Message:

Ticket #3233 - Problemas na configuracao da hora de um evento.

File:

• trunk/prototype/modules/calendar/js/calendar.codecs.js (modified) (5 diffs)

trunk/prototype/modules/calendar/js/calendar.codecs.js

@@ -605 +605 @@
                 timezone: objEvent.timezone,
                 timezones: Timezone.timezones,
-                startDate: new Date( parseInt(objEvent.startTime) ).setTimezoneOffset( Timezone.timezone( objEvent.timezone ) ).toString( User.preferences.dateFormat ),
-                startHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(objEvent.startTime)), objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'startTime'), User.preferences.hourFormat),
-                endDate: new Date( parseInt(objEvent.endTime) - (!!parseInt(objEvent.allDay) ? 86400000 : 0)  ).setTimezoneOffset( Timezone.timezone( objEvent.timezone ) ).toString( User.preferences.dateFormat ),
-                endHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date(parseInt(objEvent.endTime)),  objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'endTime'), User.preferences.hourFormat),
+                startDate: Timezone.getDate( (objEvent.DayLigth ? objEvent.DayLigth.event.startTime : objEvent.startTime), 'start', objEvent.allDay ),
+        startHour: objEvent.DayLigth ? Timezone.getHour( objEvent.DayLigth.event.startTime) : Timezone.formateHour( objEvent.startTime ),
+        endDate: Timezone.getDate( (objEvent.DayLigth ? objEvent.DayLigth.event.endTime : objEvent.endTime), 'end', objEvent.allDay ),
+                endHour: objEvent.DayLigth ? Timezone.getHour( objEvent.DayLigth.event.endTime) : Timezone.formateHour( objEvent.endTime ),
                 allDay: !!parseInt( objEvent.allDay ),
                 dueDate: objEvent.dueDate,
@@ -1407 +1407 @@
                             isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0,
                             acl: form.attendee_organizer == attendee ? (form.attendeeAcl[i].indexOf('o') < 0 ? form.attendeeAcl[i]+'o' : form.attendeeAcl[i]) : form.attendeeAcl[i].replace('o', '')
-                        }, form.delegatedFrom[i] != '0' ? {
+                        }, (form.delegatedFrom[i] != '0' && form.delegatedFrom[i] != '') ? {
                             delegatedFrom: form.delegatedFrom[i]
                             } : {});
@@ -1747 +1747 @@
             }
 
-                var duration = parseInt( evt.endTime ) - parseInt( evt.startTime ), isRepeat = false;
+                var duration = parseInt( evt.DayLigth.calendar.endTime ) - parseInt( evt.DayLigth.calendar.startTime ), isRepeat = false;
 
                 var occurrences = [];
@@ -1756 +1756 @@
                         occurrences = evt.occurrences;
             }else
-                        occurrences[ occurrences.length ] = evt.startTime;
+                        occurrences[ occurrences.length ] = evt.DayLigth.calendar.startTime;
 
             //occurrences = DataLayer.unique( occurrences ).sort();
@@ -1767 +1767 @@
                                 id: evt.URI || evt.id+ '-' + i,
                                 title: Encoder.htmlDecode(evt.summary),
-                                start: Timezone.getDateCalendar(new Date( parseInt( occurrences[i] ) ), calendar.timezone,  !!evt.DayLigth ? evt.DayLigth.calendar.startTime : Timezone.daylightSaving),
-                                end:   Timezone.getDateCalendar(new Date( parseInt( occurrences[i] ) + duration - (!!parseInt(evt.allDay) ? 86400000 : 0)), calendar.timezone, !!evt.DayLigth ? evt.DayLigth.calendar.startTime : Timezone.daylightSaving),
+                                start: Timezone.getDateObjCalendar( occurrences[i], 'start', evt.allDay),
+                end: Timezone.getDateObjCalendar( (parseInt( occurrences[i] ) + duration), 'end', evt.allDay),
                                 allDay: parseInt( evt.allDay ),
                                 isRepeat: isRepeat,