Changeset 6880 for sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.codecs.js

Timestamp:

07/26/12 09:44:14 (12 years ago)

Author:

acoutinho

Message:

Ticket #2966 - Correcoes e melhorias na listagem de eventos e tarefas

File:

• sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.codecs.js (modified) (6 diffs)

sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.codecs.js

@@ -511 +511 @@
                 calendar: objEvent.calendar,
                 summary: objEvent.summary,
+        type: !!objEvent.type ? objEvent.type : 1,
                 description: objEvent.description,
                 timezone: objEvent.timezone,
@@ -621 +622 @@
         id: form.idTask,
         location: form.location,
-        type: 2,
+        type: !!form.type ?  form.type : 2,
         percentage: form.percentage,
         priority: form.priority,
@@ -669 +670 @@
                     id: attendee,
                     isOrganizer: (form.attendee_organizer == attendee ? 1 : 0 ),
-                    isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0,
+                    isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0
                     };
             };
@@ -713 +714 @@
         group: objEvent.group,
         summary: objEvent.summary,
+        type: !!objEvent.type ? objEvent.type : 2,
         description: objEvent.description,
         timezone: objEvent.timezone,
@@ -1007 +1009 @@
 
         var pref = User.preferences;
-
-        var res =  DataLayer.encode('schedulable:preview', evtObj);
+    var res = [];
+
+    for(var i = 0; i < evtObj.length; i++){
+           res.push(DataLayer.encode('schedulable:' + (evtObj[i].type == '1' ?  'preview' : 'task'), evtObj[i]));
+    }
 
         if( !notArray ){
@@ -1043 +1048 @@
                         'endDate': new Date( occurrences[ii] + duration ).toString( User.preferences.dateFormat )
                         } );
-                                  
-                                  
-                                  
-                                  
-                    res2.repeat = typeRepeat[res[i].repeat.frequency];
+
+                    if(res[i].repeat)
+                res2.repeat = typeRepeat[res[i].repeat.frequency];
                                   
                     while (counter.compareTo( currentDate ) == 0) {