Changeset 6880 for sandbox/2.4.2-expresso1/prototype/modules/calendar/js

Timestamp:

07/26/12 09:44:14 (12 years ago)

Author:

acoutinho

Message:

Ticket #2966 - Correcoes e melhorias na listagem de eventos e tarefas

Location:

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

Files:

• calendar.codecs.js (modified) (6 diffs)
• helpers.js (modified) (9 diffs)

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

@@ -511 +511 @@
                 calendar: objEvent.calendar,
                 summary: objEvent.summary,
+        type: !!objEvent.type ? objEvent.type : 1,
                 description: objEvent.description,
                 timezone: objEvent.timezone,
@@ -621 +622 @@
         id: form.idTask,
         location: form.location,
-        type: 2,
+        type: !!form.type ?  form.type : 2,
         percentage: form.percentage,
         priority: form.priority,
@@ -669 +670 @@
                     id: attendee,
                     isOrganizer: (form.attendee_organizer == attendee ? 1 : 0 ),
-                    isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0,
+                    isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0
                     };
             };
@@ -713 +714 @@
         group: objEvent.group,
         summary: objEvent.summary,
+        type: !!objEvent.type ? objEvent.type : 2,
         description: objEvent.description,
         timezone: objEvent.timezone,
@@ -1007 +1009 @@
 
         var pref = User.preferences;
-
-        var res =  DataLayer.encode('schedulable:preview', evtObj);
+    var res = [];
+
+    for(var i = 0; i < evtObj.length; i++){
+           res.push(DataLayer.encode('schedulable:' + (evtObj[i].type == '1' ?  'preview' : 'task'), evtObj[i]));
+    }
 
         if( !notArray ){
@@ -1043 +1048 @@
                         'endDate': new Date( occurrences[ii] + duration ).toString( User.preferences.dateFormat )
                         } );
-                                  
-                                  
-                                  
-                                  
-                    res2.repeat = typeRepeat[res[i].repeat.frequency];
+
+                    if(res[i].repeat)
+                res2.repeat = typeRepeat[res[i].repeat.frequency];
                                   
                     while (counter.compareTo( currentDate ) == 0) {

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

@@ -2353 +2353 @@
         }
         
-    pageselectCallback(keyword, 0, false, false, type); // load page 1 and insert data on event_list.ejs
+    pageselectCallback(keyword, 0, false, type); // load page 1 and insert data on event_list.ejs
         
     $('.preferences-win.active .button.save, .preferences-win.active .button.cancel, .preferences-win.active .button.import, .preferences-win.active .button.export').button();
@@ -2373 +2373 @@
         if(paginator.indexOf('next') > 0){
             if(parseInt($(currentView+' [name = results]').val()) > 25)
-                pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($(currentView+' [name = page_index]').val())) +1));
+                pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($(currentView+' [name = page_index]').val())) +1), false,  2);
         }else{
             if(parseInt($(currentView+' [name = page_index]').val()) > 0)
-                pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($(currentView+' [name = page_index]').val())) -1));
+                pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($(currentView+' [name = page_index]').val())) -1), false, 2);
         }
     });
@@ -2414 +2414 @@
 }
 
-function paginatorList(currentView, view){
+function paginatorList(currentView, view, type){
     $(currentView+' .events-list.events-list-win.active .list-events-paginator .fc-header-title').html('<h2>'+mountTitleList( parseInt($('[name = page_index]').val()),view)+'</h2>');
     $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right .fc-button').removeClass('fc-state-active')
@@ -2435 +2435 @@
         var goView = $(this).attr('class');
         if(goView.indexOf('agendaDay') > 0)
-            pageselectCallback($(currentView+' [name = keyword]').val(), 0, '', 'agendaDay');
+            pageselectCallback($(currentView+' [name = keyword]').val(), 0, 'agendaDay', type);
         else if(goView.indexOf('month') > 0)
-            pageselectCallback($(currentView+' [name = keyword]').val(), 0, '', 'month');
+            pageselectCallback($(currentView+' [name = keyword]').val(), 0, 'month', type);
         else if(goView.indexOf('year') > 0)
-            pageselectCallback($(currentView+' [name = keyword]').val(), 0, '', 'year');
+            pageselectCallback($(currentView+' [name = keyword]').val(), 0, 'year', type);
         else if(goView.indexOf('agendaWeek') > 0)
-            pageselectCallback($(currentView+' [name = keyword]').val(), 0, '', 'agendaWeek');
+            pageselectCallback($(currentView+' [name = keyword]').val(), 0, 'agendaWeek', type);
 
     });
@@ -2457 +2457 @@
         var paginator = $(this).attr('class');
         if(paginator.indexOf('next') > 0)
-            pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($('[name = page_index]').val())) +1), '', view);
+            pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($('[name = page_index]').val())) +1), view, type);
         else
-            pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($('[name = page_index]').val())) -1), '', view);
+            pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($('[name = page_index]').val())) -1), view, type);
     }); 
 }
 
-function paginatorListEvent(currentView, typeView, view){
+function paginatorListEvent(currentView, typeView, view, type){
     if(!!$(currentView).find('.fc-calendar').length)
         return;
@@ -2487 +2487 @@
         paginatorSearch(currentView);
     }else
-        paginatorList(currentView, view);
+        paginatorList(currentView, view, type);
 }
 
@@ -2564 +2564 @@
 }
 
-function pageselectCallback(keyword, page_index, jq, view, type){
+function pageselectCallback(keyword, page_index, view, type){
     $('.qtip.qtip-blue').remove();
         
@@ -2636 +2636 @@
 
                         });
-                        paginatorListEvent(currentView, (keyword == '' || keyword == null) ? 'list' : 'search',  !!view ? view : User.preferences.defaultCalView);
+                        paginatorListEvent(currentView, (keyword == '' || keyword == null) ? 'list' : 'search',  !!view ? view : User.preferences.defaultCalView, type);
                 });
     }else{
@@ -2646 +2646 @@
                         '</div>'
                         );
-                paginatorListEvent(currentView, 'list', !!view ? view : User.preferences.defaultCalView);
+                paginatorListEvent(currentView, 'list', !!view ? view : User.preferences.defaultCalView, type);
     }
 }