- Timestamp:
- 06/21/12 18:02:30 (12 years ago)
- Location:
- trunk/workflow
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/workflow/inc/class.so_orgchart.inc.php
r6535 r6568 783 783 784 784 /* load employee information */ 785 $query = "SELECT f.funcionario_id, f.funcionario_status_id, f.centro_custo_id, f.localidade_id, f.organizacao_id, f.area_id, f.cargo_id, f.nivel, f.funcionario_categoria_id, f.titulo, f.apelido, f.funcao, f.data_admisao, a.sigla AS area_sigla FROM funcionario f, area a WHERE (f.area_id = a.area_id) AND (f.organizacao_id = $organizationID) AND (f.funcionario_id IN (" . implode(',', array_keys($unifiedResult)) ."))";785 $query = "SELECT f.funcionario_id, f.funcionario_status_id, f.centro_custo_id, f.localidade_id, f.organizacao_id, f.area_id, f.cargo_id, f.nivel, f.funcionario_categoria_id, f.titulo, f.apelido, f.funcao, to_char(f.data_admissao, 'DD/MM/YYYY') as data_admissao, a.sigla AS area_sigla FROM funcionario f, area a WHERE (f.area_id = a.area_id) AND (f.organizacao_id = $organizationID) AND (f.funcionario_id IN (" . implode(',', array_keys($unifiedResult)) ."))"; 786 786 $result = $this->db->query($query); 787 787 $this->_checkError($result); … … 835 835 $this->_checkAccess($organizationID); 836 836 if ($admDate!='') 837 { 837 838 $this->validateDate($admDate); 839 $admission_date = implode('-', array_reverse(explode('/', $admDate))); 840 } 838 841 else 839 $admDate=NULL; 842 { 843 $admission_date=NULL; 844 } 840 845 841 846 $query = 'SELECT area.sigla FROM funcionario, area WHERE (funcionario.area_id = area.area_id) AND (funcionario.funcionario_id = ?)'; … … 851 856 852 857 $query = "INSERT INTO funcionario(funcionario_id, organizacao_id, area_id, centro_custo_id, localidade_id, funcionario_status_id, cargo_id, nivel, funcionario_categoria_id, titulo, apelido, funcao, data_admissao) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; 853 $result = $this->db->query($query, array($employeeID, $organizationID, $areaID, $costCenterID, $localID, $employeeStatusID, $jobTitleID, $level, $employeeCategoryID, $title, $nickname, $jobDesc, $adm Date));858 $result = $this->db->query($query, array($employeeID, $organizationID, $areaID, $costCenterID, $localID, $employeeStatusID, $jobTitleID, $level, $employeeCategoryID, $title, $nickname, $jobDesc, $admission_date)); 854 859 $this->_checkError($result); 855 860 … … 879 884 $this->_checkAccess($organizationID); 880 885 if ($admDate!='') 886 { 881 887 $this->validateDate($admDate); 888 $admission_date = implode('-', array_reverse(explode('/', $admDate))); 889 } 882 890 else 883 $admDate=NULL; 884 891 { 892 $admission_date=NULL; 893 } 894 885 895 $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 = ?)"; 886 896 887 $result = $this->db->query($query, array($areaID, $costCenterID, $localID, $employeeStatusID, $jobTitleID, $level, $employeeCategoryID, $title,$nickname, $jobDesc, $admDate, $employeeID, $organizationID));897 $result = $this->db->query($query, array($areaID, $costCenterID, $localID, $employeeStatusID, $jobTitleID, $level, $employeeCategoryID, $title,$nickname, $jobDesc, $admission_date, $employeeID, $organizationID)); 888 898 889 899 $this->_checkError($result); -
trunk/workflow/js/userinterface/orgchartPrint.js
r6535 r6568 141 141 /* Funcao: show funcao attribute */ 142 142 element.append( 143 $('<td > ' + areas[area_id].employees[user_id].funcao + ' </td>')143 $('<td valign="top"> ' + areas[area_id].employees[user_id].funcao + ' </td>') 144 144 .css('width', '26%') 145 145 )
Note: See TracChangeset
for help on using the changeset viewer.