Changeset 1446 for trunk/workflow/inc/class.so_userinterface.inc.php

Timestamp:

09/23/09 17:26:50 (15 years ago)

Author:

viani

Message:

Ticket #637 - Incluido click-to-call no organograma do workflow e melhorias na interface.

File:

• trunk/workflow/inc/class.so_userinterface.inc.php (modified) (3 diffs)

trunk/workflow/inc/class.so_userinterface.inc.php

@@ -352 +352 @@
         {
                 /* initialize some variables */
-                $output = array('employees' => array());
+                $output = array('employees' => array(), 'bygroup' => array( ) );
                 $ldapResult = array();
 
                 /* search for the $searchTerm in the LDAP */
                 $ldap = &$GLOBALS['workflow']['workflowObjects']->getLDAP();
+
                 $list = @ldap_search($ldap, $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getLDAPContext(), ('(&(cn=*' . $searchTerm . '*)(phpgwaccounttype=u))'), array('uidNumber', 'cn', 'telephoneNumber'));
                 if ($list === false)
@@ -367 +368 @@
 
                 /* check if any result was found */
-                if (count($ldapResult) < 1)
-                        return $output;
+                //if (count($ldapResult) < 1)
+                //      return $output;
+
+                $uids = implode( ',', array_keys( $ldapResult ) );
 
                 /* load employee information */
-                $query = "SELECT f.funcionario_id AS funcionario_id, f.area_id AS area_id, a.sigla AS area FROM funcionario f, area a, funcionario_status s WHERE (f.area_id = a.area_id) AND (f.organizacao_id = $organizationID) AND (f.funcionario_id IN (" . implode(',', array_keys($ldapResult))  .")) AND (f.funcionario_status_id = s.funcionario_status_id) AND (s.exibir = 'S')";
-                $result = $this->db->query($query);
+                $query = 'SELECT f.funcionario_id AS funcionario_id, f.area_id AS area_id, a.sigla AS area';
+                $query .= ' FROM funcionario f, area a, funcionario_status s';
+                $query .= " WHERE (f.area_id = a.area_id) AND (f.organizacao_id = {$organizationID})";
+                $query .= " AND (" . ( ( ! empty( $uids ) ) ? "f.funcionario_id IN ({$uids}) OR " : '' );
+                $query .= " a.sigla LIKE UPPER(?))";
+                $query .= " AND (f.funcionario_status_id = s.funcionario_status_id) AND (s.exibir = 'S')";
+                $query .= " ORDER BY a.sigla asc";
+
+                $result = $this->db->query($query, array( "%{$searchTerm}%" ) );
+
+                if ( ! $result )
+                        return array( );
+
+                $uids = array( );
 
                 $employees = $result->GetArray(-1);
@@ -379 +394 @@
                         for ($j = 0; $j < $result->_numOfFields; $j++)
                                 unset($employees[$i][$j]);
-                        $employees[$i]['cn'] = is_null($ldapResult[$employees[$i]['funcionario_id']]['cn']) ? '' : $ldapResult[$employees[$i]['funcionario_id']]['cn'];
-                        $employees[$i]['telephoneNumber'] = is_null($ldapResult[$employees[$i]['funcionario_id']]['telephoneNumber']) ? '' : $ldapResult[$employees[$i]['funcionario_id']]['telephoneNumber'];
-                }
-
-                $output['employees'] = $employees;
+
+                        if ( array_key_exists( $employees[$i]['funcionario_id'], $ldapResult ) )
+                        {
+                                $employees[$i]['cn'] = is_null($ldapResult[$employees[$i]['funcionario_id']]['cn']) ? '' : $ldapResult[$employees[$i]['funcionario_id']]['cn'];
+                                $employees[$i]['telephoneNumber'] = is_null($ldapResult[$employees[$i]['funcionario_id']]['telephoneNumber']) ? '' : $ldapResult[$employees[$i]['funcionario_id']]['telephoneNumber'];
+                        }
+                        else
+                        {
+                                $employees[$i]['cn'] = $employees[$i]['funcionario_id'];
+                                $employees[$i]['telephoneNumber'] = '';
+
+                                $output['bygroup'][ $employees[$i]['funcionario_id'] ] = $employees[ $i ];
+                                array_splice( $employees, $i--, 1 );
+                        }
+                }
+
+                if ( count( $output['bygroup'] ) )
+                {
+                        $list = ldap_search($ldap, $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getLDAPContext(), ('(&(|(uidNumber=' . implode( ')(uidNumber=', array_keys( $output['bygroup'] ) ) . '))(phpgwaccounttype=u))'), array('uidNumber', 'cn', 'telephoneNumber'));
+
+                        if ( $list !== false )
+                        {
+                                $entries = ldap_get_entries($ldap, $list);
+
+                                for ( $i = 0; $i < $entries[ 'count' ]; $i++ )
+                                {
+                                        $output[ 'bygroup' ][ $entries[$i]['uidnumber'][0] ][ 'cn' ] = $entries[$i]['cn'][0];
+                                        $output[ 'bygroup' ][ $entries[$i]['uidnumber'][0] ][ 'telephoneNumber' ] = $entries[$i]['telephonenumber'][0];
+                                }
+                        }
+                }
+
+                $output[ 'bygroup' ] = array_values( $output[ 'bygroup' ] );
+                $output[ 'employees' ] = $employees;
+
                 return $output;
         }