Changeset 3282 for branches/2.2/contactcenter/inc/class.ui_data.inc.php

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

File:

• branches/2.2/contactcenter/inc/class.ui_data.inc.php (modified) (8 diffs)

branches/2.2/contactcenter/inc/class.ui_data.inc.php

@@ -116 +116 @@
                         $GLOBALS['phpgw']->template->set_var('cc_qa_close',lang('Close'));
                         /* End Quick Add */
+
+                        /* Advanced Search */
+                        
+                        $GLOBALS['phpgw']->template->set_var('cc_corporate',lang('Corporate'));
+                        $GLOBALS['phpgw']->template->set_var('cc_cs_title',lang('Advanced Search'));
+                        $GLOBALS['phpgw']->template->set_var('cc_catalogues',lang('Catalogues'));
+                        
+                        
+                        
+                        /* End of Advanced Search*/
 
                         $cc_css_file = $GLOBALS['phpgw_info']['server']['webserver_url'].'/contactcenter/styles/cc.css';
@@ -470 +480 @@
                                 echo serialize(array(
                                         'status' => 'ok',
+                                        'catalog' => $catalog_info['class'],
+                                        'external' => $catalog_info['external']?true:false,
                                         'perms'  => $perms
                                 ));
@@ -2753 +2765 @@
                 }
 
+                //Traduz o campo na busca completa por entradas no catálogo do usuário.
+                function aux_full_search ($field,$isldap) {
+                        $retorno = '';
+                        if($isldap) {
+                                switch($field) {
+                                        case 'mail':
+                                                $retorno = 'contact.connection.mail';
+                                                break;
+                                        case 'phone':
+                                                $retorno = 'contact.connection.phone';
+                                                break;
+                                }
+                        }
+                        else {
+                                switch($field) {
+                                        case 'corporate':
+                                                $retorno = 'contact.corporate_name';
+                                                break;
+                                        case 'mail':
+                                        case 'phone':
+                                                $retorno = 'contact.contact_connection.connection.connection_value';
+                                                break;
+                                }
+                        }
+                        return $retorno;
+                }
 
                 /*!
@@ -2775 +2813 @@
                         // It's an external catalog?
                         $external = $this->bo->is_external($this->page_info['actual_catalog']);
-
-                        if (!is_array($data) || !$data['search_for'] || !is_array($data['fields']))
+                        $full_search = isset($data['full_search'])?$data['full_search']:false;
+                        
+                        if (!is_array($data) || (!$data['search_for'] && !$full_search) || !is_array($data['fields']))
                         {
                                 echo serialize(array(
@@ -2821 +2860 @@
                                 if (!is_array($names))
                                 {
-                                        echo serialize(array(
-                                                'msg'    => lang('Invalid Search Parameter'),
-                                                'status' => 'abort'
-                                        ));
+                                        if(!$full_search) {
+                                                echo serialize(array(
+                                                        'msg'    => lang('Invalid Search Parameter'),
+                                                        'status' => 'abort'
+                                                ));
+                                                exit;
+                                        }
+                                        else 
+                                                $names = array();
 
                                 }
@@ -2840 +2884 @@
                                          * must have attibute phpgwAccountStatus, phpgwAccountVisible != -1
                                          */
+                                        
                                         $rules = array(
                                                 0 => array(
@@ -2868 +2913 @@
                                                 ),
                                         );
+
+                                        foreach($full_search as $field => $value) {
+                                                if(trim($value)!='')
+                                                        array_push($rules,array(
+                                                                                        'field' => $this->aux_full_search($field,true),
+                                                                                        'type' => 'LIKE',
+                                                                                        'value' => '*'.$value.'*'
+                                                                                        ));
+                                        }
+
+                                }
+                                else if(!$external) {
+                                        
+                                        foreach($full_search as $field => $value) {
+                                                if(trim($value)!='')
+                                                        array_push($rules,array(
+                                                                                        'field' => $this->aux_full_search($field,false),
+                                                                                        'type' => 'iLIKE',
+                                                                                        'value' => '%'.$value.'%'
+                                                                                        ));
+                                        }
+                                
                                 }
 
@@ -2906 +2973 @@
                                         'contact.object_class',
                                         //'contact.account_status',
-                                        'contact.account_visible'
+                                        'contact.account_visible',
+                                        'contact.connection.mail',
+                                        'contact.connection.phone'
                                         ), $rules, array('order' => $data['fields']['search'], 'sort' => 'ASC'), $data['search_for_area'], $data['search_for'] != null );
                         }