Changeset 6535 for trunk/workflow/inc

Timestamp:

06/18/12 14:24:17 (12 years ago)

Author:

leticiabohnert

Message:

Ticket #2851 - Inclusão da função, data de admissão e apelido no organograma.

Location:

trunk/workflow/inc

Files:

• class.so_orgchart.inc.php (modified) (3 diffs)
• class.so_userinterface.inc.php (modified) (2 diffs)

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

@@ -128 +128 @@
                 $this->acl = &$GLOBALS['ajax']->acl;
                 $this->db = &Factory::getInstance('WorkflowObjects')->getDBWorkflow()->Link_ID;
-                $this->db = &Factory::getInstance('WorkflowObjects')->getDBWorkflow()->Link_ID;
                 $this->db->SetFetchMode(ADODB_FETCH_ASSOC);
         }
@@ -835 +834 @@
         {
                 $this->_checkAccess($organizationID);
-                $this->validateDate($admDate);
+                if ($admDate!='')
+                        $this->validateDate($admDate);
+                else
+                        $admDate=NULL;
 
                 $query = 'SELECT area.sigla FROM funcionario, area WHERE (funcionario.area_id = area.area_id) AND (funcionario.funcionario_id = ?)';
@@ -876 +878 @@
         {
                 $this->_checkAccess($organizationID);
-                $this->validateDate($admDate);
+                if ($admDate!='')
+                        $this->validateDate($admDate);
+                else
+                        $admDate=NULL;
                 
-                $query = "UPDATE funcionario SET area_id = ?, centro_custo_id = ?, localidade_id = ?, funcionario_status_id = ?, cargo_id = ?, nivel = ?, funcionario_categoria_id = ?, titulo = ?, apelido = ?, funcao = ?, data_admissao = ? WHERE (funcionario_id = ?) AND (organizacao_id = ?)";
-                $result = $this->db->query($query, array($areaID, $costCenterID, $localID, $employeeStatusID, $jobTitleID, $level, $employeeCategoryID, $title,$nickname, $jobDesc, $admDate, $employeeID, $organizationID));
-                $this->_checkError($result);
-
+                $query = "UPDATE funcionario SET area_id = ?, centro_custo_id = ?, localidade_id = ?, funcionario_status_id = ?, cargo_id = ?, nivel = ?, funcionario_categoria_id = ?, titulo = ?, apelido = ?, funcao = ?, data_admissao =? WHERE (funcionario_id = ?) AND (organizacao_id = ?)";
+                        
+                $result = $this->db->query($query, array($areaID, $costCenterID, $localID, $employeeStatusID, $jobTitleID, $level, $employeeCategoryID, $title,$nickname, $jobDesc,$admDate, $employeeID, $organizationID));
+                
+                $this->_checkError($result);
+                
                 return (($result === false) ? false : true);
         }

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

@@ -289 +289 @@
 
                 /* load the employees from the area */
-                $query = "SELECT f.funcionario_id, f.organizacao_id, f.area_id, COALESCE(f.funcionario_categoria_id, 0) AS funcionario_categoria_id FROM funcionario f, funcionario_status s WHERE ((f.area_id = ?) OR (f.funcionario_id = ANY (?))) AND (f.funcionario_status_id = s.funcionario_status_id) AND (s.exibir = ?)";
+                $query = "SELECT f.funcionario_id, f.organizacao_id, f.area_id, f.funcao, to_char(f.data_admissao,'DD/MM/YYYY') as data_admissao, COALESCE(f.funcionario_categoria_id, 0) AS funcionario_categoria_id FROM funcionario f, funcionario_status s WHERE ((f.area_id = ?) OR (f.funcionario_id = ANY (?))) AND (f.funcionario_status_id = s.funcionario_status_id) AND (s.exibir = ?)";
                 $result = $this->db->query($query, array($areaID, $supervisors, 'S'));
 
@@ -301 +301 @@
                         for ($j = 0; $j < $result->_numOfFields; $j++)
                                 unset($employees[$i][$j]);
-                        
+                        if (!$this->authorized || !isset($employees[$i]['funcao']))
+                                $employees[$i]['funcao'] = '';
+                        else
+                                $employees[$i]['funcao'] = utf8_encode($employees[$i]['funcao']);       
+                        if (!$this->authorized || !isset($employees[$i]['data_admissao']))
+                                $employees[$i]['data_admissao'] = '';
                         $employees[$i]['cn'] = '';
                         $employees[$i]['telephoneNumber'] = '';