Changeset 8045 for trunk

Timestamp:

03/20/13 16:09:47 (10 years ago)

Author:

cristiano

Message:

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

Location:

trunk/prototype/modules/calendar

Files:

• interceptors/DBMapping.php (modified) (1 diff)
• js/calendar.codecs.js (modified) (7 diffs)

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -1429 +1429 @@
 
 
-            self::lg($defaultCalendar);
             if(isset($defaultCalendar[0])  && $defaultCalendar[0]['value'] == $signature['calendar'] )
             {

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

@@ -633 +633 @@
                 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 ),
@@ -840 +841 @@
         description: objEvent.description,
         timezone: objEvent.timezone,
+        startUnixTime: objEvent.startTime,
         timezones: Timezone.timezones,
         percentage: (objEvent.percentage) ? objEvent.percentage : '0',
@@ -1217 +1219 @@
         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),
@@ -1636 +1639 @@
         }
 
+        var orderByStartUnixTime = function( a , b )
+        {
+            return parseInt(a.startUnixTime) > parseInt(b.startUnixTime);
+        }
+
         for (var i=0; i < res.length; i++) {
 
@@ -1645 +1653 @@
             var startDate = Date.parseExact( res[i]['startDate'], User.preferences.dateFormat );
             var endDate   = Date.parseExact( res[i]['endDate'], User.preferences.dateFormat );
-                  
+
             var duration = parseInt( endDate.getTime() ) - parseInt( startDate.getTime() );
-            
-            var occurrences = [ startDate.getTime() ];
+
+            var occurrences = [  res[i].startUnixTime ];
 
             if( res[i].occurrences )
@@ -1665 +1673 @@
                 });
 
+                res2.startUnixTime = parseInt(occurrences[ii]);
+
                 if(res[i].repeat)
                     res2.repeat = typeRepeat[res[i].repeat.frequency];
@@ -1675 +1685 @@
 
                 dates[index].events.push(res2);
+
+                dates[index].events = dates[index].events.sort(orderByStartUnixTime);
                   
             }