Changeset 7397

Timestamp:

10/10/12 10:09:54 (12 years ago)

Author:

marcieli

Message:

Ticket #3158 - Corrigida inconsistência na exibição dos dados de Atividade.

File:

• trunk/prototype/modules/calendar/js/calendar.codecs.js (modified) (5 diffs)

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

@@ -1124 +1124 @@
         
         var historic = [];
-
+        var alarmsActivity = [];
         var decodeTasks = function(obj){
 
             var tasks = {}, task = {};
-
+                        
             for(var i =0; i < obj.taskToActivity.length; i++){
 
@@ -1167 +1167 @@
 
         };
-
+                
         return {
         "class": objEvent["class"],
@@ -1173 +1173 @@
         location: objEvent.location,
         category: objEvent.category,
-        activityStatus: objEvent.status,
+        status: objEvent.status,
         groups: Calendar.groups,
         group: objEvent.group ? objEvent.group : objEvent.calendar,
@@ -1207 +1207 @@
             var attend = DataLayer.get('participant', (participant.id || participant));
             attend.user = DataLayer.get('user', attend.user);
-
+                        
             return {
                 id: attend.id,
                 alarms : $.map(attend.alarms || [], function( alarm ){
                     var alarm = DataLayer.get('alarm', alarm);
+                                        alarmsActivity.push(alarm == "" ? (null) : alarm);
                     return (alarm == "" ? (null) : alarm);
                 })
             };
-        })
-
+        }),
+                alarms: alarmsActivity
         };
     });
@@ -1419 +1420 @@
 
     encoder: function( evtObj ){
-        
         if(!(!!evtObj))
             return undefined;