Changeset 8051 for branches/2.5/prototype/modules/calendar/js/calendar.codecs.js

Timestamp:

03/20/13 18:20:03 (11 years ago)

Author:

douglas

Message:

Ticket #3401 - Eventos desordenados na opção imprimir

File:

• branches/2.5/prototype/modules/calendar/js/calendar.codecs.js (modified) (7 diffs)

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

@@ -632 +632 @@
                 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 ),
+        startUnixTime: objEvent.DayLigth ? objEvent.DayLigth.event.startTime : objEvent.startTime, 
         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 ),
@@ -839 +840 @@
         description: objEvent.description,
         timezone: objEvent.timezone,
+        startUnixTime: objEvent.startTime, 
         timezones: Timezone.timezones,
         percentage: (objEvent.percentage) ? objEvent.percentage : '0',
@@ -1215 +1217 @@
         percentage: (objEvent.percentage) ? objEvent.percentage : '0',
         priority: objEvent.priority,
+        startUnixTime: objEvent.startTime, 
         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),
@@ -1634 +1637 @@
         }
 
+        var orderByStartUnixTime = function( a , b ) 
+        { 
+            return parseInt(a.startUnixTime) > parseInt(b.startUnixTime); 
+        } 
+ 
         for (var i=0; i < res.length; i++) {
  
@@ -1646 +1654 @@
             var duration = parseInt( endDate.getTime() ) - parseInt( startDate.getTime() );
             
-            var occurrences = [ startDate.getTime() ];
+            var occurrences = [  res[i].startUnixTime ];
  
             if( res[i].occurrences )
@@ -1663 +1671 @@
                 });
 
+                res2.startUnixTime = parseInt(occurrences[ii]); 
+ 
                 if(res[i].repeat)
                     res2.repeat = typeRepeat[res[i].repeat.frequency];
@@ -1673 +1683 @@
 
                 dates[index].events.push(res2);
+ 
+                dates[index].events = dates[index].events.sort(orderByStartUnixTime); 
                   
             }