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

Timestamp:

08/09/12 12:25:44 (12 years ago)

Author:

acoutinho

Message:

Ticket #2966 - Correcoes de bugs e melhorias / suporte a historico em atividades

File:

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

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

@@ -626 +626 @@
         priority: form.priority,
         category: form.category,
-        summary: form.summary,
+        summary: form.summary == '' ? 'Tarefa sem título' : form.summary,
         description: form.description,
         timezone: tzId,
@@ -827 +827 @@
             case 'due':
                 return {
-                    user : historic.user,
+                    user :$.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user),
                     attribute : attributeDecoded[historic.attribute],
                     beforeValue : decodeDate(historic.beforeValue),
@@ -836 +836 @@
             case 'participant':
                 return{
-                    user : historic.user,
+                    user :$.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user),
                     attribute : historic.beforeValue == '' ? ('Novo participante') : ('Rem. participante'),
                     beforeValue : historic.beforeValue == '' ? '' : historic.beforeValue.mail,
@@ -845 +845 @@
             case 'attachment':
                 return{
-                    user : historic.user,
+                    user : $.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user),
                     attribute : historic.beforeValue == '' ? ('Novo anexo') : ('Rem. anexo'),
                     beforeValue : historic.beforeValue,
@@ -853 +853 @@
             case 'percentage':
                     return{
-                    user : historic.user,
+                    user :$.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user),
                     attribute :attributeDecoded[historic.attribute],
                     beforeValue : historic.beforeValue+' %',
@@ -862 +862 @@
             default:
                 return {
-                    user : historic.user,
+                    user : $.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user),
                     attribute : attributeDecoded[historic.attribute],
                     beforeValue : historic.beforeValue,
@@ -929 +929 @@
     
         var tzId =  form.timezone || Calendar.signatureOf[form.group].calendar.timezone || User.preferences.timezone,
-
         formatString = pref.dateFormat + " " + pref.hourFormat;
 
@@ -969 +968 @@
         priority: form.priority,
         category: form.category,
-        summary: form.summary,
+        summary: form.summary == '' ? 'Atividade sem título' : form.summary,
         description: form.description,
         timezone: tzId,
@@ -1003 +1002 @@
         if(!(typeof(objEvent) == 'object'))
             return (null);
+        
+        var historic = [];
 
         var decodeTasks = function(obj){
@@ -1025 +1026 @@
                     endDate: new Date( parseInt(task.endTime) - (!!parseInt(task.allDay) ? 86400000 : 0)  ).setTimezoneOffset( Timezone.timezone( task.timezone ) ).toString( User.preferences.dateFormat ),
                     endHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date(parseInt(task.endTime)),  task.timezone, obj.calendar, obj.DayLigth, 'endTime'), User.preferences.hourFormat),
-                                        status: task.status,
-                                        percentage: task.percentage
+                    status: task.status,
+                    percentage: task.percentage
                 }
 
                 tasks[task.id].description = tasks[task.id].startDate + ' - ' + (!!task.summary ? task.summary : task.description);
 
+                historic.push({'task': (!!task.summary ? task.summary : task.description) , 'historic': decodeHistotic(task)});
             }
 
@@ -1060 +1062 @@
         dueTime: (!objEvent.due || objEvent.due == '' || objEvent.due == '0') ? '' : dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(objEvent.due)), objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'startTime'), User.preferences.hourFormat),
         allDay: !!parseInt( objEvent.allDay ),
-        historic: [],
+        historic: historic,
         tasks: objEvent.taskToActivity ? decodeTasks(objEvent) : {},
         attachments: $.map(objEvent.attachments || [], function( attachment, i ){
@@ -1226 +1228 @@
                 type: 1,
                 category: form.category,
-                summary: form.summary,
+                summary: form.summary == '' ? 'Evento sem título' : form.summary,
                 description: form.description,
                 timezone: tzId,
@@ -1435 +1437 @@
                 if(!dates[index] || !$.isArray(dates[index].events))
                     dates[index] = {events:  []};                    
+
+                res2['isOneDay'] = duration <= 86400000 ? true : false;
 
                 dates[index].events.push(res2);