Changeset 2063 for trunk/workflow/inc/class.so_orgchart.inc.php

Timestamp:

02/24/10 15:22:40 (14 years ago)

Author:

pedroerp

Message:

Ticket #869 - Inseridas tags 'titular' e 'substituto' na lista de usuários da adm do organograma.

File:

• trunk/workflow/inc/class.so_orgchart.inc.php (modified) (2 diffs)

trunk/workflow/inc/class.so_orgchart.inc.php

@@ -699 +699 @@
                 $this->_checkAccess($organizationID);
 
-                $supervisors = '{' . implode(', ', $this->db->GetRow('SELECT COALESCE(a.titular_funcionario_id, -1) AS titular_funcionario_id, COALESCE(s.funcionario_id, -1) AS substituto_funcionario_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 (area_id = ?) AND (organizacao_id = ?)', array($areaID, $organizationID))) . '}';
+                /* gather some info from the area */
+                $areaInfo = $this->db->query('SELECT COALESCE(a.titular_funcionario_id, -1) AS titular_funcionario_id, COALESCE(s.funcionario_id, -1) AS substituto_funcionario_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.organizacao_id = ?) AND (a.area_id = ?)', array($organizationID, $areaID))->GetArray(-1);
+                if (empty($areaInfo))
+                        return false;
+                $areaInfo = $areaInfo[0];
+                $supervisors = '{' . implode(', ', $areaInfo) . '}';
+
                 $query = "SELECT funcionario_id, funcionario_status_id, centro_custo_id, localidade_id, organizacao_id, area_id, cargo_id, nivel, funcionario_categoria_id, titulo FROM funcionario WHERE ((area_id = ?) AND (organizacao_id = ?)) OR (funcionario_id = ANY (?))";
                 $result = $this->db->query($query, array($areaID, $organizationID, $supervisors));
@@ -711 +717 @@
                         $output[$i]['funcionario_id_desc'] = '';
                         $output[$i]['uid'] = '';
+
+                        if (in_array($output[$i]['funcionario_id'], $areaInfo))
+                                $output[$i]['chief'] = ($output[$i]['funcionario_id'] == $areaInfo['titular_funcionario_id']) ? 1 : 2;
+
                         if (($entry = $cachedLDAP->getEntryByID($output[$i]['funcionario_id'])))
                         {