Changeset 7702 for trunk/prototype/modules/calendar/js/helpers.js

Timestamp:

01/03/13 08:46:17 (11 years ago)

Author:

acoutinho

Message:

Ticket #3259 - Otimizar carregamento de eventos no modulo ExpressoCalendar?

File:

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

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

@@ -1964 +1964 @@
             if(clicked == 'Sim'){
 
-                var schedulable = DataLayer.get('schedulable', ''+eventId);
+                var schedulable = getSchedulable( eventId, '');
                 schedulable.calendar = ''+idCalendar;
                 var schudableDecode = DataLayer.encode( "schedulable:preview", schedulable);
@@ -1982 +1982 @@
 
 function mount_exception(eventID, idException){
-    
-    var schedulable = DataLayer.get('schedulable', ''+eventID);
-    var edit = {
-        repeat: (DataLayer.get('repeat', schedulable.repeat))
-        };                                   
+
+    getSchedulable( eventID.toString() , '');
+    var schedulable = DataLayer.get('schedulable', eventID.toString() )
+    var edit = { repeat: (DataLayer.get('repeat', schedulable.repeat)) };
 
     edit.repeat.startTime = new Date(parseInt(edit.repeat.startTime)).toString('yyyy-MM-dd HH:mm:00');
@@ -2502 +2501 @@
         case 'basicDay':
         case 'agendaDay':
-            rangeStart = new Date.today().add({
-                days: page_index
-            }).getTime();
+            rangeStart = new Date.today().add({ days: page_index }).getTime();
             rangeEnd = rangeStart + 86400000;
             break;
@@ -2510 +2507 @@
             var dateStart = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekStart]); 
             var dateEnd = new Date().moveToDayOfWeek(dateCalendar.dayOfWeek[User.preferences.weekStart]); 
-            rangeStart = dateStart.add({
-                days: (7 * page_index)
-                }).getTime();
-            rangeEnd = dateEnd.add({
-                days: (7 * page_index)+7
-                }).getTime();
+            rangeStart = dateStart.add({ days: (7 * page_index) }).getTime();
+            rangeEnd = dateEnd.add({ days: (7 * page_index)+7 }).getTime();
             break;
         case 'month':
-            var date = Date.today().add({
-                months: page_index
-            }) 
+            var date = Date.today().add({ months: page_index })
             rangeStart = date.moveToFirstDayOfMonth().getTime();
             rangeEnd = date.moveToLastDayOfMonth().getTime();
             break;
         case 'year':
-            var dateStart = new Date().add({
-                years: page_index
-            }); 
-            var dateEnd = new Date().add({
-                years: page_index
-            });
+            var dateStart = new Date().add({ years: page_index });
+            var dateEnd = new Date().add({ years: page_index });
             if(dateStart.getMonth() != 0)
-                dateStart.moveToMonth(0, -1)
+                    dateStart.moveToMonth(0, -1)
             if(dateEnd.getMonth() != 11)
-                dateEnd.moveToMonth(11) 
-            rangeStart =    dateStart.moveToFirstDayOfMonth().getTime();
-            rangeEnd = dateEnd.moveToLastDayOfMonth().getTime();
+            dateEnd.moveToMonth(11)
+
+        rangeStart = dateStart.moveToFirstDayOfMonth().getTime();
+        rangeEnd = dateEnd.moveToLastDayOfMonth().getTime();
             break;  
     }
@@ -2542 +2530 @@
     var timezone = {};
     for(var i in Calendar.signatureOf)
-        timezone[i] = Calendar.signatureOf[i].calendar.timezone;                
-        
-    return {
-         filter: ['AND', 
-                    ['OR', 
-                        ['AND', 
-                            ['>=', 'rangeEnd', rangeStart], 
-                            ['<=', 'rangeEnd', rangeEnd]
-                        ],
-                        ['AND', 
-                            ['>=', 'rangeStart', rangeStart], 
-                            ['<=', 'rangeStart', rangeEnd]
-                        ],
-                        ['AND', 
-                            ['<=', 'rangeStart', rangeStart], 
-                            ['>=', 'rangeEnd', rangeEnd]
-                        ]
-                    ],
-                    ['IN', 'calendar',  calerdars_selecteds]
-                ], 
-        criteria: {
-            deepness: 2, 
+            timezone[i] = Calendar.signatureOf[i].calendar.timezone;
+        
+    return  {
+        rangeStart: rangeStart,
+        rangeEnd: rangeEnd,
             order: 'startTime', 
-            timezones: timezone
-        }
-    }; 
-
+            timezones: timezone,
+        calendar: calerdars_selecteds
+        };
 }
 
@@ -2581 +2551 @@
     
         if(!selecteds && (keyword != '' && keyword != null)){   
-        jQuery('#'+tab_selector[type] + ((Base64.encode(keyword)).replace(/[^\w\s]/gi, "")|| '')).html(
-            '<div title="'+tab_title[type]+'" class="events-list events-list-win active empty">' +
-            '<label>'+label_noselect_calendar[type]+'</label>' +
-            '</div>'
-            );
+        jQuery('#'+tab_selector[type] + ((Base64.encode(keyword)).replace(/[^\w\s]/gi, "")|| '')).html(
+            '<div title="'+tab_title[type]+'" class="events-list events-list-win active empty">' +
+            '<label>'+label_noselect_calendar[type]+'</label>' +
+            '</div>'
+        );
     }else{
-        var criteria = null;
-        if(keyword == '' || keyword == null)
-            criteria = mountCriteriaList(!!view ? view : User.preferences.defaultCalView, page_index, selecteds)
-        else
-            criteria =  {
-                filter: ['AND', ['OR', ["i*", "summary", keyword], ["i*", "description", keyword]], ['IN', 'calendar',  selecteds]], 
-                criteria: {
-                    searchEvent: true,
-                    order: 'startTime', 
-                    offset: (25 * page_index), 
-                    limit: (((25 * page_index) + 25) + 1), 
-                    deepness: 2
-                }
-            };
-    var results = DataLayer.get('schedulable:detail', criteria);
-    keyword = ( keyword || '' ).replace( /\s+/g, "_" ); 
+        var criteria = null;
+        if(keyword == '' || keyword == null){
+
+            criteria = mountCriteriaList(!!view ? view : User.preferences.defaultCalView, page_index, selecteds);
+
+        }else{
+
+            var timezone = {};
+            for(var i in Calendar.signatureOf)
+                timezone[i] = Calendar.signatureOf[i].calendar.timezone;
+
+            criteria =  {
+
+                searchEvent: true,
+                order: 'startTime',
+                offset: (25 * page_index),
+                limit: (((25 * page_index) + 25) + 1),
+                summary: keyword,
+                description: keyword,
+                calendar: selecteds,
+                timezones: timezone
+
+            };
+        }
+
+        var results = DataLayer.encode('schedulable:list', DataLayer.dispatch('modules/calendar/schedules', criteria));
+        //var results = DataLayer.get('schedulable:detail', criteria);
+        keyword = ( keyword || '' ).replace( /\s+/g, "_" );
         }
 // não há resultados    
@@ -2627 +2609 @@
                         $(".event-details-item").parent().click(function(event){
                         event.stopImmediatePropagation();
-                        $(this).siblings("div.details-event-list").toggleClass("hidden")
+            var container = $(this).siblings("div.details-event-list");
+
+
+            //lazy data
+            if( container.hasClass('hidden') ){
+
+                //only first click
+                if(!container.find('fieldset').length){
+
+                   $(this).append( '<span style="width: 20px;" class="load-event-detail"><img style="width: 20px;" src="'+DataLayer.dispatchPath+'/modules/calendar/img/loading.gif"></img></span>');
+
+                    var schedulable = container.find('input[name="eventid"]').val();
+                    schedulable = DataLayer.encode('schedulable:detail', [getSchedulable( schedulable, '' )]);
+
+                    schedulable = $.isArray( schedulable ) ? schedulable[0] : schedulable;
+
+                    container.prepend( DataLayer.render( 'templates/event_detail_list.ejs', {'_event': schedulable}));
+
+                    $(this).find('span.load-event-detail').remove();
+                }
+            }
+
+            container.toggleClass("hidden")
                         .find('.button.delete').click(function(event){
                                 var eventId = $(this).siblings('[name="eventid"]').val();
@@ -2635 +2639 @@
                         })
                         .end().find('.button.edit').click(function(event){
+
+                var schedulable = $(this).siblings('[name="eventid"]').val();
                 switch($(this).siblings('[name="eventtype"]').val()){
+
                     case '1':
-                        eventDetails( DataLayer.get( "schedulable", $(this).siblings('[name="eventid"]').val() ), true );
+                        eventDetails( getSchedulable( schedulable, '' ), true );
                     break;
                     case '2':
-                        taskDetails( DataLayer.get( "schedulable", $(this).siblings('[name="eventid"]').val() ), true );
+                        taskDetails( getSchedulable( schedulable, '' ), true );
                     break;
                     case '3':
-                        activityDetails( DataLayer.get( "schedulable", $(this).siblings('[name="eventid"]').val() ), true );
+                        activityDetails( getSchedulable( schedulable, '' ), true );
                     break; 
                 }
@@ -2829 +2836 @@
         type = $('.calendar-copy-move input[name="typeEvent"]').val();
 
-    var schedulable = DataLayer.get('schedulable', event+'');
+    getSchedulable(event,'');
+    var schedulable = DataLayer.get('schedulable', event.toString());
     schedulable['class'] = '1';
         
@@ -2843 +2851 @@
                 
         schedulable.lastCalendar = schedulable.calendar;
-        schedulable.calendar = calendar;        
+    schedulable.calendar = calendar;
         DataLayer.put('schedulable', schedulable);
         
@@ -2868 +2876 @@
             delete repeat.schedulable;
             delete repeat.id;
-            repeat.startTime = new Date(parseInt(repeat.startTime)).toString('yyyy-MM-dd HH:mm:00');
-            repeat.endTime = new Date(parseInt(repeat.endTime)).toString('yyyy-MM-dd HH:mm:00');
+            repeat.startTime = repeat.startTime == '' ? '' : new Date(parseInt(repeat.startTime)).toString('yyyy-MM-dd HH:mm:00');
+            repeat.endTime = repeat.endTime == '' ? '' : new Date(parseInt(repeat.endTime)).toString('yyyy-MM-dd HH:mm:00');
                     
             var exceptions = DataLayer.get('repeatOccurrence', {
@@ -2892 +2900 @@
         delete schedulable.occurrences;
                 
-        schedulable.calendar = DataLayer.copy(calendar);        
+        schedulable.calendar = DataLayer.copy(calendar);
                 
         var participants = DataLayer.copy(schedulable.participants);
@@ -2925 +2933 @@
             return newSchedulable;
         }
-        newSchedulable.endTime = new Date(parseInt(newSchedulable.endTime) - (newSchedulable.allDay ? 86400000 : 0)).toString('yyyy-MM-dd hh:mm:00');
-        newSchedulable.startTime = new Date(parseInt(newSchedulable.startTime)).toString('yyyy-MM-dd hh:mm:00'); 
+        newSchedulable.endTime = new Date(parseInt(newSchedulable.endTime) - (parseInt(newSchedulable.allDay) ? 86400000 : 0)).toString('yyyy-MM-dd HH:mm:00');
+        newSchedulable.startTime = new Date(parseInt(newSchedulable.startTime)).toString('yyyy-MM-dd HH:mm:00');
         
         DataLayer.put('schedulable', newSchedulable);