Changeset 7013

Timestamp:

08/15/12 09:58:35 (12 years ago)

Author:

asaikawa

Message:

Ticket #3019 - Incluido no formulario o campo para o registro de uma localidade externa a organizacao

Location:

trunk/workflow

Files:

• inc/class.bo_orgchart.inc.php (modified) (2 diffs)
• inc/class.so_orgchart.inc.php (modified) (4 diffs)
• js/orgchart/organization.js (modified) (2 diffs)

trunk/workflow/inc/class.bo_orgchart.inc.php

@@ -407 +407 @@
         {
                 extract( $params );
-                $result = $this->so->addLocal($organizacao_id, $this->_nullReplace($centro_custo_id), $descricao, $empresa, $endereco, $complemento, $cep, $bairro, $cidade, $uf );
+                $result = $this->so->addLocal($organizacao_id, $this->_nullReplace($centro_custo_id), $descricao, $empresa, $endereco, $complemento, $cep, $bairro, $cidade, $uf, $externa );
                 $this->disconnect_all();
 
@@ -422 +422 @@
         {
                 extract( $params );
-                $result = $this->so->updateLocal($organizacao_id, $this->_nullReplace($centro_custo_id), $descricao, $localidade_id, $empresa, $endereco, $complemento, $cep, $bairro, $cidade, $uf );
+                $result = $this->so->updateLocal($organizacao_id, $this->_nullReplace($centro_custo_id), $descricao, $localidade_id, $empresa, $endereco, $complemento, $cep, $bairro, $cidade, $uf, $externa );
                 $this->disconnect_all();
 

trunk/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);
 

trunk/workflow/js/orgchart/organization.js

@@ -659 +659 @@
 function loadAddLocalUI(organizationID)
 {
+        var valoresSimNao = new Array();
+        valoresSimNao['S'] = 'Sim';
+        valoresSimNao['N'] = 'Não';
+
         var content;
         content = '<h2 id="modalTitle">Adicionar Localidade</h2>';
@@ -675 +679 @@
 
         content += '<tr><td><label for="centro_custo_id">Centro de Custo</label></td><td id="comboCentroCusto"><i>carregando</i></td></tr>';
+        content += '<tr><td><label for="externa">Externa à organização</label></td><td>' + constructSelectBox('externa', valoresSimNao) + '</td></tr>';
         content += "</table>";
         content += '</form>';