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

Timestamp:

08/07/12 12:06:34 (12 years ago)

Author:

douglasz

Message:

Ticket #2966 - Adicionado as validacoes na tela de atividades.

File:

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

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

@@ -831 +831 @@
             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 ),
-            percentage: (objEvent.percentage) ? objEvent.percentage : '0'
+            percentage: (objEvent.percentage) ? objEvent.percentage : '0',
+                        status: objEvent.status
         }
     });
@@ -885 +886 @@
         due: (form.dueDate == '' )? 0 : Date.parseExact(form.dueDate + " "+$.trim(form.dueHour) , formatString ).toString(!!form.allDay ? 'yyyy-MM-dd 00:00:00' : 'yyyy-MM-dd HH:mm:00'),
         allDay: ( !!form.allDay ? 1 : 0 ),      
-        status: form.taskStatus,      
+        status: form.activityStatus,      
         id: form.idActivity,
         type: !!form.type ?  form.type : 2,
@@ -946 +947 @@
                     startHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(task.startTime)), task.timezone, task.calendar, obj.DayLigth, 'startTime'), User.preferences.hourFormat),
                     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)
+                    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
                 }