Changeset 8036 for branches


Ignore:
Timestamp:
03/18/13 18:24:09 (6 years ago)
Author:
douglas
Message:

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

Location:
branches/2.5/prototype/modules/calendar/js
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.5/prototype/modules/calendar/js/calendar.codecs.js

    r8008 r8036  
    624624                calendars: Calendar.calendars, 
    625625                calendar: objEvent.calendar, 
     626        occurrences: objEvent.occurrences,  
    626627                summary: objEvent.summary, 
    627628        type: !!objEvent.type ? objEvent.type : 1, 
     
    16411642             
    16421643            var occurrences = [ startDate.getTime() ]; 
    1643                      
     1644  
    16441645            if( res[i].occurrences ) 
    16451646            { 
     
    16491650            for( var ii = 0; ii < occurrences.length; ii++ ) 
    16501651            { 
    1651                 var currentDate = new Date( occurrences[ii] ); 
     1652                var currentDate = new Date( parseInt(occurrences[ii]) ); 
    16521653                var counter = currentDate.clone(); 
    16531654                         
    16541655                var res2 = $.extend( {}, res[i], { 
    16551656                    'startDate': currentDate.toString( User.preferences.dateFormat ),  
    1656                     'endDate': new Date( occurrences[ii] + duration ).toString( User.preferences.dateFormat ) 
     1657                    'endDate': new Date( parseInt(occurrences[ii]) + duration ).toString( User.preferences.dateFormat ) 
    16571658                }); 
    16581659 
    16591660                if(res[i].repeat) 
    16601661                    res2.repeat = typeRepeat[res[i].repeat.frequency]; 
    1661                        
    16621662                var index = dateCalendar.dayNames[counter.getDay()] +' '+counter.toString('dd/MM'); 
    16631663 
  • branches/2.5/prototype/modules/calendar/js/helpers.js

    r8035 r8036  
    111111        var end = $("#calendar").fullCalendar('getView').visEnd.getTime()/1000; 
    112112        var criteria = DataLayer.criteria("schedulable:calendar", {'start':start, 'end':end} ); 
    113          
    114         var data = DataLayer.get("schedulable:print", criteria);         
     113  
     114    var data = DataLayer.encode('schedulable:print', DataLayer.dispatch('modules/calendar/schedules', criteria )  );  
    115115 
    116116        if($("#calendar").fullCalendar('getView').name == "month"){                              
Note: See TracChangeset for help on using the changeset viewer.