Changeset 8028 for trunk

Timestamp:

03/18/13 15:22:45 (11 years ago)

Author:

cristiano

Message:

Ticket #3397 - Problema ao imprimir eventos com repetição na visão semana/mensa

Location:

trunk/prototype/modules/calendar/js

Files:

• calendar.codecs.js (modified) (3 diffs)
• helpers.js (modified) (1 diff)

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

@@ -625 +625 @@
                 calendars: Calendar.calendars,
                 calendar: objEvent.calendar,
+        occurrences: objEvent.occurrences,
                 summary: objEvent.summary,
         type: !!objEvent.type ? objEvent.type : 1,
@@ -1643 +1644 @@
             
             var occurrences = [ startDate.getTime() ];
-                    
+
             if( res[i].occurrences )
             {
@@ -1651 +1652 @@
             for( var ii = 0; ii < occurrences.length; ii++ )
             {
-                var currentDate = new Date( occurrences[ii] );
+                var currentDate = new Date( parseInt(occurrences[ii]) );
                 var counter = currentDate.clone();
                         
                 var res2 = $.extend( {}, res[i], {
                     'startDate': currentDate.toString( User.preferences.dateFormat ), 
-                    'endDate': new Date( occurrences[ii] + duration ).toString( User.preferences.dateFormat )
+                    'endDate': new Date( parseInt(occurrences[ii]) + duration ).toString( User.preferences.dateFormat )
                 });
 
                 if(res[i].repeat)
                     res2.repeat = typeRepeat[res[i].repeat.frequency];
-                      
                 var index = dateCalendar.dayNames[counter.getDay()] +' '+counter.toString('dd/MM');
 

trunk/prototype/modules/calendar/js/helpers.js

@@ -111 +111 @@
         var end = $("#calendar").fullCalendar('getView').visEnd.getTime()/1000;
         var criteria = DataLayer.criteria("schedulable:calendar", {'start':start, 'end':end} );
-        
-        var data = DataLayer.get("schedulable:print", criteria);        
+
+    var data = DataLayer.encode('schedulable:print', DataLayer.dispatch('modules/calendar/schedules', criteria )  );
 
         if($("#calendar").fullCalendar('getView').name == "month"){