Changeset 3282 for branches/2.2/contactcenter/js

Timestamp:

09/23/10 10:14:52 (14 years ago)

Author:

eduardoalex

Message:

Ticket #1251 - Commit principal com adição da melhoria no módulo

Location:

branches/2.2/contactcenter/js

Files:

• cc_full_search.js (added)
• cc_search.js (modified) (3 diffs)
• cc_tree.js (modified) (2 diffs)

branches/2.2/contactcenter/js/cc_search.js

@@ -22 +22 @@
                         return false;
                 }
+
+                this.mount_handler = function (responseText)
+                {
+                        var data = new Array();
+                        data = unserialize(responseText);
+                        
+                        if( !data )
+                                return false;
+
+                        if( data[0] == 0 )
+                        {
+                                if (_this.onSearchFinish)
+                                        _this.onSearchFinish(null);
+                                return false;
+                        }
+                        
+                        if (data[3].length > 300)
+                        {
+                                alert("Mais de 300 resultados foram retornados! \n Favor refinar sua busca.");
+
+                                if (_this.onSearchFinish)
+                                        _this.onSearchFinish(null);
+
+                                return false;
+                        }
+                        
+                        ccSearchUpdate();
+        
+                        letter = 'search';
+
+                        if ( letter != CC_actual_letter )
+                        {
+                                CC_actual_page = '1';
+                        }
+                        else
+                        {
+                                CC_actual_page = parseInt(data[1]);
+                        }
+        
+                        CC_actual_letter = letter;
+        
+                        if (CC_max_cards[0] == 0)
+                        {
+                                if(CC_visual == 'cards')
+                                        drawCards(0);
+                                else if(CC_visual == 'table')
+                                        drawTable(0);
+        
+                                setPages(0,0);
+                                return;
+                        }
+        
+                        if (data[0] == '0')
+                        {
+                                Element('cc_type_contact').value = data[1];
+                                CC_npages = 0;
+                                CC_actual_page = 1;
+                                if(CC_visual == 'cards')
+                                        drawCards(0);
+                                else if(CC_visual == 'table')
+                                        drawTable(0);
+                                setPages(0,0);
+                                return;
+                        }
+                        else
+                        {
+                                Element('cc_type_contact').value = data[10];
+                        }
+        
+                        if (typeof(data) != 'object')
+                        {
+                                showMessage(Element('cc_msg_err_contacting_server').value);
+                                return;
+                        }
+        
+                        if (typeof(data[3]) == 'object')
+                        {
+                                CC_npages = parseInt(data[0]);
+                                CC_actual_page = parseInt(data[1]);
+                                if(CC_visual == 'cards')
+                                        drawCards(data[3].length, data[10]);
+                                else if(CC_visual == 'table')
+                                        drawTable(data[3].length, data[10]);
+                                resizeWindow();
+                                populateCards(data, data[10]);
+                                setPages(data[0], data[1]);
+                        }
+                        else if (data['error'])
+                        {
+                                showMessage(data['error']);
+                        }
+                        else
+                        {
+                                showMessage(Element('cc_msg_err_contacting_server').value);
+                                return;
+                        }
+                };
+
 
                 /* Attributes */
@@ -141 +239 @@
         ccSearchClass.prototype.go = function()
         {
+                if (this.DOMinput.value == '') {
+                        if ((ccTree.actualCatalog != 'bo_group_manager') && 
+                                        (ccTree.actualCatalog != 'bo_shared_group_manager') && 
+                                        (!ccTree.actualCatalogIsExternal)) { //Busca avançada para pessoal e catálogo geral
+                                ccFullSearchVar.showForm();
+                                return;
+                        }
+                }
                 var data = new Array();
                 
@@ -197 +303 @@
                 var _this = this;
                 
-                var handler = function (responseText)
-                {
-                        var data = new Array();
-                        data = unserialize(responseText);
-                        
-                        if( !data )
-                                return false;
-
-                        if( data[0] == 0 )
-                        {
-                                if (_this.onSearchFinish)
-                                        _this.onSearchFinish(null);
-                                return false;
-                        }
-                        
-                        if (data[3].length > 300)
-                        {
-                                alert("Mais de 300 resultados foram retornados! \n Favor refinar sua busca.");
-
-                                if (_this.onSearchFinish)
-                                        _this.onSearchFinish(null);
-
-                                return false;
-                        }
-                        
-                        ccSearchUpdate();
-        
-                        letter = 'search';
-
-                        if ( letter != CC_actual_letter )
-                        {
-                                CC_actual_page = '1';
-                        }
-                        else
-                        {
-                                CC_actual_page = parseInt(data[1]);
-                        }
-        
-                        CC_actual_letter = letter;
-        
-                        if (CC_max_cards[0] == 0)
-                        {
-                                if(CC_visual == 'cards')
-                                        drawCards(0);
-                                else if(CC_visual == 'table')
-                                        drawTable(0);
-        
-                                setPages(0,0);
-                                return;
-                        }
-        
-                        if (data[0] == '0')
-                        {
-                                Element('cc_type_contact').value = data[1];
-                                CC_npages = 0;
-                                CC_actual_page = 1;
-                                if(CC_visual == 'cards')
-                                        drawCards(0);
-                                else if(CC_visual == 'table')
-                                        drawTable(0);
-                                setPages(0,0);
-                                return;
-                        }
-                        else
-                        {
-                                Element('cc_type_contact').value = data[10];
-                        }
-        
-                        if (typeof(data) != 'object')
-                        {
-                                showMessage(Element('cc_msg_err_contacting_server').value);
-                                return;
-                        }
-        
-                        if (typeof(data[3]) == 'object')
-                        {
-                                CC_npages = parseInt(data[0]);
-                                CC_actual_page = parseInt(data[1]);
-                                if(CC_visual == 'cards')
-                                        drawCards(data[3].length, data[10]);
-                                else if(CC_visual == 'table')
-                                        drawTable(data[3].length, data[10]);
-                                resizeWindow();
-                                populateCards(data, data[10]);
-                                setPages(data[0], data[1]);
-                        }
-                        else if (data['error'])
-                        {
-                                showMessage(data['error']);
-                        }
-                        else
-                        {
-                                showMessage(Element('cc_msg_err_contacting_server').value);
-                                return;
-                        }
-                };
-
-                this.Connector.newRequest('search', CC_url+'search&data='+serialize(data), 'GET', handler);
+                var handler = this.mount_handler;
+        this.Connector.newRequest('search', CC_url+'search&data='+serialize(data), 'GET', handler);
         }

branches/2.2/contactcenter/js/cc_tree.js

@@ -34 +34 @@
                 this.tree = new dFTree({'name': params['name']+'_tree'});
                 this.actualLevel = null;
+                this.actualCatalog = null;
+                this.actualCatalogIsExternal = null;
                 this.treeAvailable = false;
                 this.afterSetCatalog = params['afterSetCatalog'];
@@ -57 +59 @@
                                 return;
                         }
-                        
+                        _this.actualCatalog = data['catalog'];//Atribuir o catalogo atual...
+                        _this.actualCatalogIsExternal = data['external'];
                         if (data['status'] != 'ok')
                         {