Changeset 7397 for trunk/prototype/modules/calendar/js/calendar.codecs.js
- Timestamp:
- 10/10/12 10:09:54 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/calendar/js/calendar.codecs.js
r7388 r7397 1124 1124 1125 1125 var historic = []; 1126 1126 var alarmsActivity = []; 1127 1127 var decodeTasks = function(obj){ 1128 1128 1129 1129 var tasks = {}, task = {}; 1130 1130 1131 1131 for(var i =0; i < obj.taskToActivity.length; i++){ 1132 1132 … … 1167 1167 1168 1168 }; 1169 1169 1170 1170 return { 1171 1171 "class": objEvent["class"], … … 1173 1173 location: objEvent.location, 1174 1174 category: objEvent.category, 1175 activityStatus: objEvent.status,1175 status: objEvent.status, 1176 1176 groups: Calendar.groups, 1177 1177 group: objEvent.group ? objEvent.group : objEvent.calendar, … … 1207 1207 var attend = DataLayer.get('participant', (participant.id || participant)); 1208 1208 attend.user = DataLayer.get('user', attend.user); 1209 1209 1210 1210 return { 1211 1211 id: attend.id, 1212 1212 alarms : $.map(attend.alarms || [], function( alarm ){ 1213 1213 var alarm = DataLayer.get('alarm', alarm); 1214 alarmsActivity.push(alarm == "" ? (null) : alarm); 1214 1215 return (alarm == "" ? (null) : alarm); 1215 1216 }) 1216 1217 }; 1217 }) 1218 1218 }), 1219 alarms: alarmsActivity 1219 1220 }; 1220 1221 }); … … 1419 1420 1420 1421 encoder: function( evtObj ){ 1421 1422 1422 if(!(!!evtObj)) 1423 1423 return undefined;
Note: See TracChangeset
for help on using the changeset viewer.