Changeset 7594 for branches/2.4/prototype/modules/calendar/js

Timestamp:

12/03/12 17:01:59 (12 years ago)

Author:

douglas

Message:

Ticket #3143 - problema ao copiar evento ou tarefa no modulo expressocalendar

Location:

branches/2.4/prototype/modules/calendar/js

Files:

• calendar.codecs.js (modified) (5 diffs)
• timezone.js (modified) (3 diffs)

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

@@ -604 +604 @@
                 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,
@@ -1405 +1405 @@
                             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]
                             } : {});
@@ -1746 +1746 @@
             }
 
-                var duration = parseInt( evt.endTime ) - parseInt( evt.startTime ), isRepeat = false;
-
-                var occurrences = [];
+                var duration =parseInt( evt.DayLigth.calendar.endTime ) - parseInt( evt.DayLigth.calendar.startTime ), isRepeat = false;
+
+        var occurrences = [];
                 
                 if( evt.occurrences )
@@ -1755 +1755 @@
                         occurrences = evt.occurrences;
             }else
-                        occurrences[ occurrences.length ] = evt.startTime;
-
-            //occurrences = DataLayer.unique( occurrences ).sort();
+                        occurrences[ occurrences.length ] = evt.DayLigth.calendar.startTime;
+
+        //occurrences = DataLayer.unique( occurrences ).sort();
                 var typeEvent;  
             for( var i = 0; i < occurrences.length; i++ )
@@ -1766 +1766 @@
                                 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),
-                                allDay: parseInt( evt.allDay ),
+                                start: Timezone.getDateObjCalendar( occurrences[i], 'start', evt.allDay),
+                end:   Timezone.getDateObjCalendar( (parseInt( occurrences[i] ) + duration), 'end', evt.allDay),
+                allDay: parseInt( evt.allDay ),
                                 isRepeat: isRepeat,
                                 occurrence: i,

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

@@ -11 +11 @@
         daylightSaving: isNaN(parseInt( objTime.isDaylightSaving )) ? 0 : parseInt( objTime.isDaylightSaving ),
 
-        timezones: objTime.timezones,     
+    timezones: objTime.timezones,
         timezone: function( tzId ){
 
@@ -18 +18 @@
         },
         
-        getDateCalendar: function(date, tzId, isDay){
-                var timezone = this.timezone( tzId );
-
-                if(!timezone)
-                        return date;
-
-                date = this.normalizeDate(date, false, true);
-
-                return date.add({hours: parseInt(timezone.charAt(0) + timezone.charAt(2))  +  parseInt(isDay) });
+        getDateCalendar: function(date, tzId, isDayLigth ){
+                return date;
         },
         
-        getDateEvent: function(date, tzId, idCalendar, isDay, type){
-                var timezone = this.timezone( tzId );
-                var timezoneCurrent = this.timezone(DataLayer.get('calendar', idCalendar).timezone);
+        getDateEvent: function(date, tzId, isDayLigth){
+        if(!tzId)
+            return date;
 
-                if(timezone == timezoneCurrent)
-                        return date;
-                
-                var to = parseInt(timezone.charAt(0) + timezone.charAt(2)) + parseInt(isDay.event[type]);
-                var current = parseInt(timezoneCurrent.charAt(0) + timezoneCurrent.charAt(2)) + parseInt(isDay.calendar[type]);
-                
-                if(timezone.charAt(0) == timezoneCurrent.charAt(0))
-                        hours =   (  to + (current * - 1)) ;
-                else
-                        hours =  to + (( current ) * (timezone.charAt(0) ==  '+'  ? -1 : 1)) ;
-                
-                return date.add({hours: hours});
-        },
-        
-        normalizeDate: function(date, current, inverse){
+        var timezone = this.timezone( tzId );
+
+        if(!timezone)
+            return date;
+
+        date = this.normalizeDate(date, false, true);
+
+        return date.add({hours: (parseInt(timezone.charAt(0) + timezone.charAt(2)) + Timezone.diff( isDayLigth )) });
+
+    },
+
+    diff: function(isDayLigth){
+
+        if( !parseInt( isDayLigth ) ){
+
+            return 0;
+
+        }else{
+
+            return (parseInt( isDayLigth ) == 1 ? 1 : -1);
+        }
+
+    },
+
+    normalizeDate: function(date, current, inverse){
                 var offsetDate = !!current ? this.currentOffset : date.getUTCOffset();
                 return date.add({hours: (parseInt(offsetDate.charAt(0) + offsetDate.charAt(2)) * (!!inverse ? -1 : 1) )});
@@ -54 +57 @@
         getDateMapDisponibility: function(date){
                 return this.normalizeDate(date, false, true);
-        }
+        },
+
+    getHour: function(time){
+
+        return dateCalendar.formatDate( Timezone.normalizeDate( new Date( parseInt( time ) ), false, true) , User.preferences.hourFormat);
+
+    },
+
+    formateHour: function(time){
+
+        return dateCalendar.formatDate(  new Date( parseInt( time ) ) , User.preferences.hourFormat);
+
+    },
+
+    getDate: function( time, rang, isAllDay){
+
+        return (new Date( parseInt( time ) - ((rang == 'end' && isAllDay && parseInt(isAllDay) == 1) ? 86400000 : 0) )).toString( User.preferences.dateFormat );
+
+    },
+
+    getDateObj: function( time, rang, isAllDay){
+
+        return Timezone.normalizeDate(new Date( parseInt( time ) - ((rang == 'end' && isAllDay && parseInt(isAllDay) == 1) ? 86400000 : 0) ), false, true);
+
+    },
+
+    getDateObjCalendar: function( time, rang, isAllDay){
+
+        return  Timezone.normalizeDate(new Date( parseInt( time ) - ((rang == 'end' && isAllDay && parseInt(isAllDay) == 1) ? 86400000 : 0)), false, true);
+
+    }
 }