Changeset 7402 for branches/2.4

Timestamp:

10/10/12 11:46:26 (12 years ago)

Author:

eduardow

Message:

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

File:

• branches/2.4/prototype/modules/calendar/js/calendar.codecs.js (modified) (3 diffs)

branches/2.4/prototype/modules/calendar/js/calendar.codecs.js

@@ -1122 +1122 @@
         
         var historic = [];
-
+                var alarmsActivity = [];
         var decodeTasks = function(obj){
 
@@ -1171 +1171 @@
         location: objEvent.location,
         category: objEvent.category,
-        activityStatus: objEvent.status,
+        status: objEvent.status,
         groups: Calendar.groups,
         group: objEvent.group ? objEvent.group : objEvent.calendar,
@@ -1210 +1210 @@
                 alarms : $.map(attend.alarms || [], function( alarm ){
                     var alarm = DataLayer.get('alarm', alarm);
+                                                        alarmsActivity.push(alarm == "" ? (null) : alarm);
                     return (alarm == "" ? (null) : alarm);
                 })
             };
-        })
-
+        }), 
+                alarms: alarmsActivity
         };
     });