Changeset 7228 for branches/2.4/workflow/inc/class.so_orgchart.inc.php

Timestamp:

09/17/12 14:30:47 (12 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.2.

Location:

branches/2.4

Files:

• . (modified) (1 prop)
• workflow/inc/class.so_orgchart.inc.php (modified) (5 diffs)

branches/2.4/workflow/inc/class.so_orgchart.inc.php

@@ -617 +617 @@
                 $this->_checkAccess($organizationID);
 
-                $query_fields = 'organizacao_id, localidade_id, centro_custo_id, descricao, empresa, endereco, complemento, cep, bairro, cidade, uf';
+                $query_fields = 'organizacao_id, localidade_id, centro_custo_id, descricao, empresa, endereco, complemento, cep, bairro, cidade, uf, externa';
                 $query = "SELECT {$query_fields} FROM localidade WHERE organizacao_id = ? ORDER BY descricao";
                 $result = $this->db->query($query, array($organizationID));
@@ -623 +623 @@
 
                 $output = $result->GetArray(-1);
-                for ($i = 0; $i < count($output); $i++)
+                for ($i = 0; $i < count($output); $i++){
                         for ($j = 0; $j < $result->_numOfFields; $j++)
                                 unset($output[$i][$j]);
+                        $output[$i]['centro_custo_id'] = empty($output[$i]['centro_custo_id']) ? 'NULL' : $output[$i]['centro_custo_id'];
+                }
 
                 return $output;
@@ -638 +640 @@
          * @access public
          */
-        function addLocal($organizationID, $costCenter, $description, $company, $address, $complement, $zipCode, $neighborhood, $city, $state )
-        {
-                $this->_checkAccess($organizationID);
-
-                $query = "INSERT INTO localidade(organizacao_id, centro_custo_id, descricao, empresa, endereco, complemento, cep, bairro, cidade, uf) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
-                $result = $this->db->query($query, array($organizationID, $costCenter, $description, $company, $address, $complement, $zipCode, $neighborhood, $city, $state ));
+        function addLocal($organizationID, $costCenter, $description, $company, $address, $complement, $zipCode, $neighborhood, $city, $state, $external )
+        {
+                $this->_checkAccess($organizationID);
+
+                $query = "INSERT INTO localidade(organizacao_id, centro_custo_id, descricao, empresa, endereco, complemento, cep, bairro, cidade, uf, externa) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+                $result = $this->db->query($query, array($organizationID, $costCenter, $description, $company, $address, $complement, $zipCode, $neighborhood, $city, $state, $external ));
                 $this->_checkError($result);
 
@@ -658 +660 @@
          * @access public
          */
-        function updateLocal($organizationID, $costCenter, $description, $localID, $company, $address, $complement, $zipCode, $neighborhood, $city, $state )
-        {
-                $this->_checkAccess($organizationID);
-
-                $query = "UPDATE localidade SET organizacao_id = ?, centro_custo_id = ?, descricao = ?, empresa = ?, endereco = ?, complemento = ?, cep = ?, bairro = ?, cidade = ?, uf = ? WHERE (localidade_id = ?)";
-                $result = $this->db->query($query, array($organizationID, $costCenter, $description, $company, $address, $complement, $zipCode, $neighborhood, $city, $state, $localID) );
+        function updateLocal($organizationID, $costCenter, $description, $localID, $company, $address, $complement, $zipCode, $neighborhood, $city, $state, $external )
+        {
+                $this->_checkAccess($organizationID);
+
+                $query = "UPDATE localidade SET organizacao_id = ?, centro_custo_id = ?, descricao = ?, empresa = ?, endereco = ?, complemento = ?, cep = ?, bairro = ?, cidade = ?, uf = ?, externa = ? WHERE (localidade_id = ?)";
+                $result = $this->db->query($query, array($organizationID, $costCenter, $description, $company, $address, $complement, $zipCode, $neighborhood, $city, $state, $external, $localID) );
                 $this->_checkError($result);
 
@@ -967 +969 @@
                         $row['titular_funcionario_id_desc'] = ($row['titular_funcionario_id'] != '') ? $ldap->getName($row['titular_funcionario_id']) : '';
                         $row['auxiliar_funcionario_id_desc'] = ($row['auxiliar_funcionario_id'] != '') ? $ldap->getName($row['auxiliar_funcionario_id']) : '';
+                        $row['superior_area_id'] = empty($row['superior_area_id']) ? 'NULL' : $row['superior_area_id'];
                         $output[] = $row;
                 }