Changeset 8036 for branches/2.5/prototype
- Timestamp:
- 03/18/13 18:24:09 (12 years ago)
- 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 624 624 calendars: Calendar.calendars, 625 625 calendar: objEvent.calendar, 626 occurrences: objEvent.occurrences, 626 627 summary: objEvent.summary, 627 628 type: !!objEvent.type ? objEvent.type : 1, … … 1641 1642 1642 1643 var occurrences = [ startDate.getTime() ]; 1643 1644 1644 1645 if( res[i].occurrences ) 1645 1646 { … … 1649 1650 for( var ii = 0; ii < occurrences.length; ii++ ) 1650 1651 { 1651 var currentDate = new Date( occurrences[ii]);1652 var currentDate = new Date( parseInt(occurrences[ii]) ); 1652 1653 var counter = currentDate.clone(); 1653 1654 1654 1655 var res2 = $.extend( {}, res[i], { 1655 1656 '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 ) 1657 1658 }); 1658 1659 1659 1660 if(res[i].repeat) 1660 1661 res2.repeat = typeRepeat[res[i].repeat.frequency]; 1661 1662 1662 var index = dateCalendar.dayNames[counter.getDay()] +' '+counter.toString('dd/MM'); 1663 1663 -
branches/2.5/prototype/modules/calendar/js/helpers.js
r8035 r8036 111 111 var end = $("#calendar").fullCalendar('getView').visEnd.getTime()/1000; 112 112 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 ) ); 115 115 116 116 if($("#calendar").fullCalendar('getView').name == "month"){
Note: See TracChangeset
for help on using the changeset viewer.