Changeset 2085 for trunk/workflow/inc/class.bo_userinterface.inc.php

Timestamp:

02/26/10 10:56:36 (14 years ago)

Author:

pedroerp

Message:

Ticket #928 - Adicionando suporte a buscas por telefone no organograma.

File:

• trunk/workflow/inc/class.bo_userinterface.inc.php (modified) (1 diff)

trunk/workflow/inc/class.bo_userinterface.inc.php

@@ -927 +927 @@
                         return $checkWarnings;
 
-                $result = $this->so->searchEmployee($params['searchTerm'], $this->organizationInfo['organizacao_id']);
-                $this->disconnect_all();
-
-                if ($result === false)
+                $result = array();
+
+                /* do the search */
+                $result['bytelephone'] = $this->so->searchEmployeeByTelephone($params['searchTerm'], $this->organizationInfo['organizacao_id']);
+                $result['employees'] = $this->so->searchEmployeeByName($params['searchTerm'], $this->organizationInfo['organizacao_id']);
+                $result['bygroup'] = $this->so->searchEmployeeByArea($params['searchTerm'], $this->organizationInfo['organizacao_id']);
+
+                $this->disconnect_all();
+
+                /* if all searches returned false */
+                if (!is_array($result['employees']) and
+                        !is_array($result['bygroup']) and
+                        !is_array($result['bytelephone']))
                         return array('error' => 'O sistema de busca não pode ser utilizado para sua organização');
-
-                $sort_function = create_function('$a,$b', 'return strcasecmp($a[\'cn\'],$b[\'cn\']);');
-
-                usort($result['employees'], $sort_function );
-                usort($result['bygroup'], $sort_function );
 
                 return $result;