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

Timestamp:

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

Author:

douglas

Message:

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

File:

• branches/2.4/prototype/modules/calendar/js/timezone.js (modified) (3 diffs)

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