Changeset 7828

Timestamp:

02/01/13 13:14:15 (11 years ago)

Author:

cristiano

Message:

Ticket #3333 - Em uma lista de eventos o ultimo evento do mes nao e visualizado

File:

• trunk/prototype/modules/calendar/js/helpers.js (modified) (4 diffs)

trunk/prototype/modules/calendar/js/helpers.js

@@ -2501 +2501 @@
         case 'basicDay':
         case 'agendaDay':
-            rangeStart = new Date.today().add({ days: page_index }).getTime();
+            rangeStart = new Date.add({ days: page_index }).getTime();
             rangeEnd = rangeStart + 86400000;
             break;
         case 'agendaWeek':
             var dateStart = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekStart]); 
-            var dateEnd = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekStart]); 
+            var dateEnd = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekStart]);
+            dateEnd.setHours(0,0,0);
+            dateStart.setHours(0,0,0);
             rangeStart = dateStart.add({ days: (7 * page_index) }).getTime();
             rangeEnd = dateEnd.add({ days: (7 * page_index)+7 }).getTime();
@@ -2513 +2515 @@
             var date = Date.today().add({ months: page_index })
             rangeStart = date.moveToFirstDayOfMonth().getTime();
-            rangeEnd = date.moveToLastDayOfMonth().getTime();
+            rangeEnd = date.moveToLastDayOfMonth().getTime() + 86400000;
             break;
         case 'year':
             var dateStart = new Date().add({ years: page_index });
             var dateEnd = new Date().add({ years: page_index });
+            dateEnd.setHours(0,0,0);
+            dateStart.setHours(0,0,0);
             if(dateStart.getMonth() != 0)
                     dateStart.moveToMonth(0, -1)
@@ -2524 +2528 @@
 
         rangeStart = dateStart.moveToFirstDayOfMonth().getTime();
-        rangeEnd = dateEnd.moveToLastDayOfMonth().getTime();
+        rangeEnd = dateEnd.moveToLastDayOfMonth().getTime() + 86400000;
             break;  
     }
@@ -2581 +2585 @@
             };
         }
-
+        
         var results = DataLayer.encode('schedulable:list', DataLayer.dispatch('modules/calendar/schedules', criteria));
-        //var results = DataLayer.get('schedulable:detail', criteria);
+        //var results = DataLayer.get('schedulable:detail', criteria);
         keyword = ( keyword || '' ).replace( /\s+/g, "_" );
         }