Changeset 8004 for branches/2.5

Timestamp:

03/12/13 16:32:44 (11 years ago)

Author:

douglas

Message:

Ticket #3387 - Ao criar um novo compromisso com o botão Adicionar evento

Location:

branches/2.5/prototype/modules/calendar/js

Files:

• calendar.codecs.js (modified) (1 diff)
• timezone.js (modified) (1 diff)

branches/2.5/prototype/modules/calendar/js/calendar.codecs.js

@@ -629 +629 @@
                 timezone: objEvent.timezone,
                 timezones: Timezone.timezones,
-                startDate: Timezone.getDate( (objEvent.DayLigth ? objEvent.DayLigth.event.startTime : objEvent.startTime), 'start', objEvent.allDay ),
+                startDate: Timezone.getDate( (objEvent.DayLigth ? objEvent.DayLigth.event.startTime : objEvent.startTime), 'start', objEvent.allDay , true),
         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 ),
+        endDate: Timezone.getDate( (objEvent.DayLigth ? objEvent.DayLigth.event.endTime : objEvent.endTime), 'end', objEvent.allDay , true),
                 endHour: objEvent.DayLigth ? Timezone.getHour( objEvent.DayLigth.event.endTime) : Timezone.formateHour( objEvent.endTime ),
                 allDay: !!parseInt( objEvent.allDay ),

branches/2.5/prototype/modules/calendar/js/timezone.js

@@ -78 +78 @@
     },
 
-    getDate: function( time, rang, isAllDay){
+    getDate: function( time, rang, isAllDay , notNormalize){
 
-        return  Timezone.normalizeDate(new Date( parseInt( time ) - ((rang == 'end' && isAllDay && parseInt(isAllDay) == 1) ? 86400000 : 0)), false, true).toString( User.preferences.dateFormat );
+        return  (notNormalize && !isAllDay) ? new Date( parseInt( time ) - ((rang == 'end' && isAllDay && parseInt(isAllDay) == 1) ? 86400000 : 0)).toString( User.preferences.dateFormat ) : Timezone.normalizeDate(new Date( parseInt( time ) - ((rang == 'end' && isAllDay && parseInt(isAllDay) == 1) ? 86400000 : 0)), false, true).toString( User.preferences.dateFormat );
 
     },