Changeset 3225 for branches/2.2/workflow/inc/local/classes/class.wf_orgchart.php

Timestamp:

09/09/10 15:56:47 (14 years ago)

Author:

viani

Message:

Ticket #1186 - Correção no array de atributos Ldap retornados pela pesquisa de employee

File:

• branches/2.2/workflow/inc/local/classes/class.wf_orgchart.php (modified) (4 diffs)

branches/2.2/workflow/inc/local/classes/class.wf_orgchart.php

@@ -157 +157 @@
                 return $output;
         }
-        
+
         /**
          * Searches for all the supervisors of an organization.
          *
-         * This method will search in table areas for all the supervisors and replacement in the organization., todas as áreas que pertencem à organização solicitada.
+         * This method will search in table areas for all the supervisors and replacement in the organization.
          * @param int $organizationID the ID of the Organization.
          * @return array Uma array seqüencial contendo as áreas de uma organização e seus titulares e substitutos. Cada linha do array conterá:
@@ -170 +170 @@
          */
         function getOrganizationSupervisors($organizationID) {
-                $query = "  SELECT 
-                                                a.titular_funcionario_id, 
-                                                s.funcionario_id as substituto_funcionario_id, 
+                $query = "  SELECT
+                                                a.titular_funcionario_id,
+                                                s.funcionario_id as substituto_funcionario_id,
                                                 a.area_id
-                                        FROM 
-                                                area a 
-                                                LEFT OUTER JOIN substituicao s 
+                                        FROM
+                                                area a
+                                                LEFT OUTER JOIN substituicao s
                                                 ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim))
-                                        WHERE 
-                                                a.titular_funcionario_id is not null 
-                                                and a.ativa = 'S' 
-                                                AND organizacao_id = ?
-                                        GROUP BY 
+                                        WHERE
+                                                a.titular_funcionario_id is not null
+                                                and a.ativa = 'S'
+                                                AND a.organizacao_id = ?
+                                        GROUP BY
                                                 a.titular_funcionario_id,
-                                                s.funcionario_id, 
+                                                s.funcionario_id,
                                                 a.area_id";
                 $result = $this->db->query($query, array($organizationID));
@@ -518 +518 @@
                 return $output;
         }
-        
+
         /**
          * Return all areas that the employee is a supervisor.
-         * 
+         *
          * Search in the organization for all areas that the employee is a supervisor.
          * @param int $employeeID The ID of employee
@@ -533 +533 @@
                 }
 
-                $query = "SELECT 
+                $query = "SELECT
                                                 a.area_id
-                                        FROM 
-                                                area a 
-                                                LEFT OUTER JOIN substituicao s ON ((a.area_id = s.area_id) 
-                                                AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) 
-                                        WHERE 
-                                                a.titular_funcionario_id = ? OR 
+                                        FROM
+                                                area a
+                                                LEFT OUTER JOIN substituicao s ON ((a.area_id = s.area_id)
+                                                AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim))
+                                        WHERE
+                                                a.titular_funcionario_id = ? OR
                                                 s.funcionario_id = ?
                                         GROUP BY
                                                 a.area_id";
-                
+
                 $result = $this->db->query($query, array($employeeID,$employeeID));
                 if (!$result)
                         return false;
-                
+
                 $output = $result->GetArray(-1);
                 return $output;