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

Timestamp:

07/24/12 10:20:48 (12 years ago)

Author:

marcieli

Message:

Ticket #2966 - Listagem e consulta separada por tipo (evento, tarefa, atividade).

Location:

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

Files:

• helpers.js (modified) (9 diffs)
• init.js (modified) (1 diff)

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

@@ -1927 +1927 @@
 }
 
-function getSelectedCalendars( reverse ){
+function getSelectedCalendars( reverse, type ){
+        var selector = "";
+        if(type == 0)
+                selector = ".my-calendars";
+        if(type == 1)
+                selector = ".my-groups-task";
     var selecteds = {};
     var cont = 0; 
     jQuery(function() {
-        jQuery(".my-calendars .calendar-view").each(function(i, obj) { 
+        jQuery(selector+" .calendar-view").each(function(i, obj) { 
             var check_box = obj;
             if( reverse ? !check_box.checked : check_box.checked ) {
@@ -1989 +1994 @@
 
 function remove_event(eventId, idCalendar){
-    $.Zebra_Dialog('Tem certeza que deseja excluir o evento?', {
+    $.Zebra_Dialog('Tem certeza que deseja excluir?', {
         'type':     'question',
         'overlay_opacity': '0.5',
@@ -2319 +2324 @@
 }
 
-function add_events_list(keyword)
+function add_events_list(keyword, type)
 {
     var tab_title = ""; 
     if (keyword){
-        if(keyword.length < 10)
-            tab_title = keyword; 
-        else
-            tab_title = keyword.substr(0,10) + '..."'; 
+                type = 2;
+                if(keyword.length < 10)
+                        tab_title = keyword; 
+                else
+                        tab_title = keyword.substr(0,10) + '..."'; 
     }else{
-        tab_title = "Lista de eventos";
-    }
+                if(type){
+                        if(!!parseInt(type))
+                                tab_title = "Lista de tarefas";
+                        else
+                                tab_title = "Lista de eventos";
+                }
+    }
+        var tab_selector = ['tab_events_list_', 'tab_tasks_list_', 'tab_all_list_'];
     keyword = ( keyword || '' ).replace( /\s+/g, "_" );
         
-    if(!(document.getElementById('tab_events_list_' + (Base64.encode(keyword)).replace(/[^\w\s]/gi, "") )))     
+    if(!(document.getElementById(tab_selector[type] + (Base64.encode(keyword)).replace(/[^\w\s]/gi, "") )))     
     {
         Encoder.EncodeType = "entity";
-        $tabs.tabs( "add", "#tab_events_list_" + (Base64.encode(keyword)).replace(/[^\w\s]/gi, ""), Encoder.htmlEncode(tab_title) );
+        $tabs.tabs( "add", "#"+tab_selector[type] + (Base64.encode(keyword)).replace(/[^\w\s]/gi, ""), Encoder.htmlEncode(tab_title) );
     }
     else /* Tab already opened */
     {
-        $tabs.tabs("option", "selected", 2);
-    }
-        
-    pageselectCallback(keyword, 0); // load page 1 and insert data on event_list.ejs
+                //$tabs.tabs("option", "selected", 2);
+        }
+        
+    pageselectCallback(keyword, 0, false, 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();
@@ -2553 +2565 @@
 }
 
-function pageselectCallback(keyword, page_index, jq, view){
+function pageselectCallback(keyword, page_index, jq, view, type){
     $('.qtip.qtip-blue').remove();
         
-    var selecteds = getSelectedCalendars();
-    if(!selecteds && (keyword != '' && keyword != null)){       
-        jQuery('#tab_events_list_' + ((Base64.encode(keyword)).replace(/[^\w\s]/gi, "")|| '')).html(
-            '<div title="Lista de eventos" class="events-list events-list-win active empty">' +
-            '<label>Por favor selecione ao menos uma agenda.</label>' +
+        var tab_selector = ['tab_events_list_', 'tab_tasks_list_', 'tab_all_list_'];
+        var tab_title = ['Lista de eventos', 'Lista de tarefas'];
+        var label_noselect_calendar = ['Por favor selecione ao menos uma agenda.', 'Por favor selecione ao menos um grupo.', 'Por favor selecione ao menos uma agenda ou grupo.'];
+        var label_nofound_search = ['Não foi encontrado nenhum evento correspondente à sua pesquisa.', 'Não foi encontrado nenhuma tarefa ou atividade correspondente à sua pesquisa.', 'Não foi encontrado nenhum evento ou tarefa ou atividade correspondente à sua pesquisa.'];
+        var label_nofound = ['Não foram encontrados eventos neste intervalo.', 'Não foram encontradas tarefas ou atividades neste intervalo.', 'Não foram encontrados eventos ou tarefas ou atividades neste intervalo.'];
+        var selecteds = getSelectedCalendars(false, type);
+    
+        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>'
             );
@@ -2580 +2598 @@
     var results = DataLayer.get('schedulable:detail', criteria);
     keyword = ( keyword || '' ).replace( /\s+/g, "_" ); 
-}
+        }
 // não há resultados    
 
-var currentView = '#tab_events_list_' + ((Base64.encode(keyword)).replace(/[^\w\s]/gi, "") || '');
+var currentView = '#'+tab_selector[type] + ((Base64.encode(keyword)).replace(/[^\w\s]/gi, "") || '');
 
 if ((((typeof(results) == 'undefined') || (!results.events_list )) && selecteds) &&(keyword != '' && keyword != null)) {
     $(currentView).html(
-                '<div title="Lista de eventos" class="events-list events-list-win active empty">' +
-                '<label>Não foi encontrado nenhum evento correspondente à sua pesquisa.</label>' +
+                '<div title="'+title+'" class="events-list events-list-win active empty">' +
+                '<label>'+label_nofound_search[type]+'</label>' +
                 '</div>'
         );
@@ -2596 +2614 @@
                 results['page_index'] = page_index;
                 results['keyword'] = keyword;
-                                
+                results['tab_title'] = tab_title[type]; 
                 DataLayer.render( 'templates/event_list.ejs', results, function( html ){
                         
@@ -2611 +2629 @@
                                 remove_event(eventId, calendarId);
                         })
-                        .end().find('.button.edit').click(function(){                           
-                                eventDetails( DataLayer.get( "schedulable", $(this).siblings('[name="eventid"]').val() ), true );                                       
+                        .end().find('.button.edit').click(function(){   
+                                if($(this).siblings('[name="eventtype"]').val() == 1)
+                                        eventDetails( DataLayer.get( "schedulable", $(this).siblings('[name="eventid"]').val() ), true );               
+                                else
+                                        taskDetails( DataLayer.get( "schedulable", $(this).siblings('[name="eventid"]').val() ), true );
                         });
 
@@ -2620 +2641 @@
     }else{
                 $(currentView).html(
-                        '<div title="Lista de eventos" class="events-list events-list-win active empty">' +
+                        '<div title="'+title+'" class="events-list events-list-win active empty">' +
                         '<input type="hidden" name="page_index" value="'+page_index+'"></inpunt>'+
                         '<input type="hidden" name="keyword" value="'+keyword+'"></inpunt>'+
-                        '<label class="empty-result">Não foram encontrados eventos neste intervalo.</label>' +
+                        '<label class="empty-result">'+label_nofound[type]+'</label>' +
                         '</div>'
                         );
@@ -2629 +2650 @@
     }
 }
-        if(currentView != '#tab_events_list_')
+        if(currentView != '#'+tab_selector[type])
             $tabs.tabs("select", currentView);
 }

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

@@ -321 +321 @@
                          * TODO - Encontrar icones mais filé
                          */
-            element.find(".fc-event-inner.fc-event-skin").prepend($('<img class="" src="../prototype/modules/calendar/img/' + ( (event.type == 1) ? "event" : "task" ) + '.png"></img>'));
+                        var img_icon = "";
+                        if(event.type == 1)
+                                img_icon = "event.png";
+                        if(event.type == 2)
+                                img_icon = "task.png";
+                        if(event.type == 3)
+                                img_icon = "activity_icon.jpg";
+            element.find(".fc-event-inner.fc-event-skin").prepend($('<img class="" src="../prototype/modules/calendar/img/' + img_icon + '"></img>'));
                 },