Changeset 6151 for trunk/prototype/modules/calendar/js/calendar.codecs.js

Timestamp:

05/09/12 17:50:59 (12 years ago)

Author:

acoutinho

Message:

Ticket #2709 - Inconsistencias na query de pesquisas de eventos

File:

• trunk/prototype/modules/calendar/js/calendar.codecs.js (modified) (5 diffs)

trunk/prototype/modules/calendar/js/calendar.codecs.js

@@ -222 +222 @@
     load: function(){
         var eventsDay = DataLayer.get('alarm:schedulable',['=', 'date', Date.today().getTime()]);
+        if(eventsDay)
         for(var i = 0; i < eventsDay.length; i++){
             this.addAlarm( eventsDay[i] );
@@ -405 +406 @@
                 
         });
-        
         return notArray ? res[0] : res;
     },
@@ -417 +417 @@
         
     encoder: function (evtObjt){
-        
-        if(notArray = typeof(evtObjt) == 'array' )
+        if(evtObjt == '') return false;
+
+        if((notArray = typeof(evtObjt) !== 'array') && (!evtObjt.length))
             evtObjt = [evtObjt];
                         
@@ -426 +427 @@
                                                                                         
             return{
-                id: objEvent.id,
+                id: objEvent.schedulable.id,
                 event_start: new Date( time ).setTimezoneOffset(Timezone.timezones[objEvent.schedulable.timezone]).toString( User.preferences.dateFormat),
-                sendTime: objEvent.sendTime,
+                sendTime: parseInt(objEvent.schedulable.sendTime) / 1000,
                 schedulable: {
                     startTime: dateCalendar.formatDate(Timezone.getDateEvent(new Date(time), objEvent.schedulable.timezone, objEvent.schedulable.DayLigth, 'startTime'), User.preferences.hourFormat),
                     id: objEvent.schedulable.id,
                     summary: objEvent.schedulable.summary,
-                    time: objEvent.time,        
-                    unit: dateCalendar.timeunit[objEvent.unit.toLowerCase()] + ( parseInt(objEvent.time) > 1 ? 's' : '' )
+                    time: objEvent.schedulable.time,    
+                    unit: (dateCalendar.timeunit[objEvent.schedulable.unit.toLowerCase()]) + ( parseInt(objEvent.schedulable.time) > 1 ? 's' : '' )
                 }
             }
         });
-        return notArray ? res[0] : res;
+        return res;
     }
 });
@@ -1145 +1146 @@
         for(var i in Calendar.signatureOf)
             timezone[i] = Calendar.signatureOf[i].calendar.timezone;
-                
+        
         return {
-            filter: ["AND", 
-
-            [ ">=", "rangeStart", filter.start.getTime() ],
-            [ "<=", "rangeEnd", filter.end.getTime() ],
-            [ "IN", "calendar", Calendar.calendarIds ]
-
-            ], 
+            filter: ['AND', 
+                        ['OR', 
+                            ['AND', 
+                                ['>=', 'rangeEnd', filter.start.getTime()], 
+                                ['<=', 'rangeEnd', filter.end.getTime()] , 
+                            ],
+                            ['AND', 
+                                ['>=', 'rangeStart', filter.start.getTime()], 
+                                ['<=', 'rangeStart', filter.end.getTime()] , 
+                            ],
+                            ['AND', 
+                                ['<=', 'rangeStart', filter.start.getTime()], 
+                                ['>=', 'rangeEnd', filter.end.getTime()] , 
+                            ]
+                        ],
+                        ['IN', 'calendar',  Calendar.calendarIds]
+                ], 
             criteria: {
                 deepness: 2,