Changeset 8232 for branches/2.5/prototype/modules/calendar/js/calendar.codecs.js

Timestamp:

10/08/13 16:20:46 (11 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

File:

• branches/2.5/prototype/modules/calendar/js/calendar.codecs.js (modified) (13 diffs)

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

@@ -75 +75 @@
                         Calendar.currentView =  DataLayer.encode('schedulable:calendar', DataLayer.dispatch('modules/calendar/schedules', DataLayer.criteria('schedulable:calendar', {start: start,end: end}))  );   //DataLayer.get( 'schedulable:calendar', {start: start,end: end} );
                     }
-             if( !!Calendar.currentView[ signature.calendar.id ]) 
-            { 
-                if(signature.hidden == true  ) 
-                    Calendar.currentView[ signature.calendar.id ].hidden = true; 
-                else 
-                    Calendar.currentView[ signature.calendar.id ].hidden = false; 
-            } 
- 
+
+            if( !!Calendar.currentView[ signature.calendar.id ])
+            {
+                if(signature.hidden == true  )
+                    Calendar.currentView[ signature.calendar.id ].hidden = true;
+                else
+                    Calendar.currentView[ signature.calendar.id ].hidden = false;
+            }
+
                     var view = Calendar.currentView[ signature.calendar.id ];
- 
- 
+
+
                     callback( view && !view.hidden ? view : [] );
                 },
@@ -211 +212 @@
 
             Calendar.rerenderView(true);
-            if(updateActivity){ 
- 
-                DataLayer.remove('taskToActivity', false); 
+            if(updateActivity){
+
+                DataLayer.remove('taskToActivity', false);
                 refreshTaskActivity();
-            } 
- 
+            }
+
         });
     }
@@ -624 +625 @@
                 calendars: Calendar.calendars,
                 calendar: objEvent.calendar,
-        occurrences: objEvent.occurrences, 
+        occurrences: objEvent.occurrences,
                 summary: objEvent.summary,
         type: !!objEvent.type ? objEvent.type : 1,
@@ -632 +633 @@
                 startDate: Timezone.getDate( (objEvent.DayLigth ? objEvent.DayLigth.event.startTime : objEvent.startTime), 'start', objEvent.allDay , true),
         startHour: objEvent.DayLigth ? Timezone.getHour( objEvent.DayLigth.event.startTime) : Timezone.formateHour( objEvent.startTime ),
-        startUnixTime: objEvent.DayLigth ? objEvent.DayLigth.event.startTime : objEvent.startTime, 
+        startUnixTime: objEvent.DayLigth ? objEvent.DayLigth.event.startTime : objEvent.startTime,
         endDate: Timezone.getDate( (objEvent.DayLigth ? objEvent.DayLigth.event.endTime : objEvent.endTime), 'end', objEvent.allDay , true),
                 endHour: objEvent.DayLigth ? Timezone.getHour( objEvent.DayLigth.event.endTime) : Timezone.formateHour( objEvent.endTime ),
@@ -832 +833 @@
         location: objEvent.location,
         category: objEvent.category,
-        calendar: objEvent.calendar, 
+        calendar: objEvent.calendar,
         taskStatus: objEvent.status,
         groups: Calendar.groups,
@@ -840 +841 @@
         description: objEvent.description,
         timezone: objEvent.timezone,
-        startUnixTime: objEvent.startTime, 
+        startUnixTime: objEvent.startTime,
         timezones: Timezone.timezones,
         percentage: (objEvent.percentage) ? objEvent.percentage : '0',
@@ -1189 +1190 @@
                                         percentage: task.percentage,
                                         priority: task.priority,
-                                        summary: task.summary
+                                        summary: task.summary,
+                                        group: task.calendar
                 }
 
@@ -1217 +1219 @@
         percentage: (objEvent.percentage) ? objEvent.percentage : '0',
         priority: objEvent.priority,
-        startUnixTime: objEvent.startTime, 
+        startUnixTime: objEvent.startTime,
         startDate: new Date( parseInt(objEvent.startTime) ).setTimezoneOffset( Timezone.timezone( objEvent.timezone ) ).toString( User.preferences.dateFormat ),
         startHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(objEvent.startTime)), objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'startTime'), User.preferences.hourFormat),
@@ -1637 +1639 @@
         }
 
-        var orderByStartUnixTime = function( a , b ) 
-        { 
-            return parseInt(a.startUnixTime) > parseInt(b.startUnixTime); 
-        } 
- 
+        var orderByStartUnixTime = function( a , b )
+        {
+            return parseInt(a.startUnixTime) > parseInt(b.startUnixTime);
+        }
+
         for (var i=0; i < res.length; i++) {
- 
-            if(Calendar.currentView[res[i].calendar].hidden == true) 
-                continue; 
- 
+
+            if(Calendar.currentView[res[i].calendar].hidden == true)
+                continue;
+
                         res[i].type = (res[i].type == '2' && !!res[i].tasks) ? '3' : res[i].type;
                 
             var startDate = Date.parseExact( res[i]['startDate'], User.preferences.dateFormat );
             var endDate   = Date.parseExact( res[i]['endDate'], User.preferences.dateFormat );
-                  
+
             var duration = parseInt( endDate.getTime() ) - parseInt( startDate.getTime() );
-            
+
             var occurrences = [  res[i].startUnixTime ];
- 
+
             if( res[i].occurrences )
             {
@@ -1671 +1673 @@
                 });
 
-                res2.startUnixTime = parseInt(occurrences[ii]); 
- 
+                res2.startUnixTime = parseInt(occurrences[ii]);
+
                 if(res[i].repeat)
                     res2.repeat = typeRepeat[res[i].repeat.frequency];
@@ -1683 +1685 @@
 
                 dates[index].events.push(res2);
- 
-                dates[index].events = dates[index].events.sort(orderByStartUnixTime); 
+
+                dates[index].events = dates[index].events.sort(orderByStartUnixTime);
                   
             }
@@ -1812 +1814 @@
                 return (evt.editable == '1' ) ?
                 {
+                    selectable: true,
                     editable: true,
-                    selectable: true,
                     className: 'fullcalendar-context-menu  event-type-1 event-id-'+idEvent+' calendar-id-'+calendar.id+ (isRecurrence ? ' isRecurrence Recurrence-id-'+Recurrence : '')
                 } : {
@@ -1874 +1876 @@
                                 occurrence: occurrences[i],
                                 type: typeEvent,
-                                calendar: evt.calendar, 
-                unanswered: evt.unanswered, 
+                                calendar: evt.calendar,
+                unanswered: evt.unanswered,
+                                status: evt.status
                                 }, (parseInt(typeEvent) == 1 ? eventEditable(evt.id, isRepeat, i ) : (parseInt(typeEvent) == 2 ? taskEditable(evt.id) : {editable: false, disableResizing: true, disableDragging: true}))));
         }