- Timestamp:
- 06/18/12 14:24:17 (12 years ago)
- Location:
- trunk/workflow
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/workflow/inc/class.so_orgchart.inc.php
r6490 r6535 128 128 $this->acl = &$GLOBALS['ajax']->acl; 129 129 $this->db = &Factory::getInstance('WorkflowObjects')->getDBWorkflow()->Link_ID; 130 $this->db = &Factory::getInstance('WorkflowObjects')->getDBWorkflow()->Link_ID;131 130 $this->db->SetFetchMode(ADODB_FETCH_ASSOC); 132 131 } … … 835 834 { 836 835 $this->_checkAccess($organizationID); 837 $this->validateDate($admDate); 836 if ($admDate!='') 837 $this->validateDate($admDate); 838 else 839 $admDate=NULL; 838 840 839 841 $query = 'SELECT area.sigla FROM funcionario, area WHERE (funcionario.area_id = area.area_id) AND (funcionario.funcionario_id = ?)'; … … 876 878 { 877 879 $this->_checkAccess($organizationID); 878 $this->validateDate($admDate); 880 if ($admDate!='') 881 $this->validateDate($admDate); 882 else 883 $admDate=NULL; 879 884 880 $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 = ?)"; 881 $result = $this->db->query($query, array($areaID, $costCenterID, $localID, $employeeStatusID, $jobTitleID, $level, $employeeCategoryID, $title,$nickname, $jobDesc, $admDate, $employeeID, $organizationID)); 882 $this->_checkError($result); 883 885 $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 887 $result = $this->db->query($query, array($areaID, $costCenterID, $localID, $employeeStatusID, $jobTitleID, $level, $employeeCategoryID, $title,$nickname, $jobDesc,$admDate, $employeeID, $organizationID)); 888 889 $this->_checkError($result); 890 884 891 return (($result === false) ? false : true); 885 892 } -
trunk/workflow/inc/class.so_userinterface.inc.php
r6478 r6535 289 289 290 290 /* load the employees from the area */ 291 $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 = ?)";291 $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 = ?)"; 292 292 $result = $this->db->query($query, array($areaID, $supervisors, 'S')); 293 293 … … 301 301 for ($j = 0; $j < $result->_numOfFields; $j++) 302 302 unset($employees[$i][$j]); 303 303 if (!$this->authorized || !isset($employees[$i]['funcao'])) 304 $employees[$i]['funcao'] = ''; 305 else 306 $employees[$i]['funcao'] = utf8_encode($employees[$i]['funcao']); 307 if (!$this->authorized || !isset($employees[$i]['data_admissao'])) 308 $employees[$i]['data_admissao'] = ''; 304 309 $employees[$i]['cn'] = ''; 305 310 $employees[$i]['telephoneNumber'] = ''; -
trunk/workflow/js/orgchart/organization.js
r6490 r6535 703 703 content += '<a href="javascript:void(0)" onclick="openParticipants(\'funcionario_id\', \'uid=1&hidegroups=1\');" id="addEmployeeLink"><img border="0" width="16" height="16" src="workflow/templateFile.php?file=images/add_user.png" /></a>'; 704 704 content += '</td></tr>'; 705 content += '<tr><td><label for="apelido">Apelido</label></td><td><input type="text" size="20" maxlength="20" name="apelido" id="apelido" /></td></tr>';705 content += '<tr><td><label for="apelido">Apelido</label></td><td><input type="text" size="20" maxlength="20" name="apelido" id="apelido" value=""/></td></tr>'; 706 706 content += '<tr><td><label for="funcionario_status_id">Status</label></td><td id="comboStatus"><i>carregando</i></td></tr>'; 707 707 content += '<tr><td><label for="funcionario_categoria_id">Categoria</label></td><td id="comboFuncionarioCategoria"><i>carregando</i></td></tr>'; 708 708 content += '<tr><td><label for="cargo_id">Cargo</label></td><td id="comboCargo"><i>carregando</i></td></tr>'; 709 content += '<tr><td><label for="funcao">Função</label></td><td><input type="text" size="50" maxlength="200" name="funcao" id="funcao" /></td></tr>';710 content += '<tr><td><label for="data_admissao">Data de admissão</label></td><td><input type="text" name="data_admissao" id="data_admissao" size="15" onkeypress="return formatDateField(event, this);" /></td></tr>';711 content += '<tr><td><label for="titulo">Título</label></td><td><input type="text" size="30" name="titulo" id="titulo" /></td></tr>';709 content += '<tr><td><label for="funcao">Função</label></td><td><input type="text" size="50" maxlength="200" name="funcao" id="funcao" value=""/></td></tr>'; 710 content += '<tr><td><label for="data_admissao">Data de admissão</label></td><td><input type="text" name="data_admissao" id="data_admissao" value="" size="15" onkeypress="return formatDateField(event, this);" /></td></tr>'; 711 content += '<tr><td><label for="titulo">Título</label></td><td><input type="text" size="30" name="titulo" id="titulo" value=""/></td></tr>'; 712 712 713 713 content += '<tr><td><label for="nivel">Nível</label></td><td><input type="text" size="3" name="nivel" id="nivel"/></td></tr>'; -
trunk/workflow/js/userinterface/orgchartPrint.js
r6479 r6535 88 88 if (showUserPhoto){ 89 89 var content = '<img src="workflow/showUserPicture.php?userID=' + areas[area_id].employees[user_id].funcionario_id + '"/>'; 90 element.append($('<td >' + content + '</td>').css('width', '8%'));90 element.append($('<td valign="top">' + content + '</td>').css('width', '8%')); 91 91 } 92 92 93 93 /* name: first column */ 94 94 element.append( 95 $('<td ></td>')95 $('<td valign="top"></td>') 96 96 .append( 97 97 $('<span></span>') … … 99 99 .append(areas[area_id].employees[user_id].cn) 100 100 ) 101 .css('width', ' 30%')101 .css('width', '23.5%') 102 102 ); 103 103 … … 106 106 element.append( 107 107 $('<td>' + areas[area_id].sigla + '</td>') 108 .css('width', '10%')109 108 ); 110 109 111 110 /* login: show uid attribute */ 112 111 element.append( 113 $('<td >' + areas[area_id].employees[user_id].uid + '</td>')114 .css('width', '1 5%')112 $('<td valign="top">' + areas[area_id].employees[user_id].uid + '</td>') 113 .css('width', '11%') 115 114 ) 116 115 … … 118 117 /* telephone: last column */ 119 118 element.append( 120 $('<td >' + areas[area_id].employees[user_id].telephoneNumber + '</td>')121 .css('width', ' 15%')119 $('<td valign="top">' + areas[area_id].employees[user_id].telephoneNumber + '</td>') 120 .css('width', '9.75%') 122 121 ) 123 122 124 123 /* VÃnculo: show cargo vÃnculo */ 125 124 element.append( 126 $('<td >' + areas[area_id].employees[user_id].vinculo + '</td>')127 .css('width', ' 15%')125 $('<td valign="top">' + areas[area_id].employees[user_id].vinculo + '</td>') 126 .css('width', '9%') 128 127 ) 129 128 130 129 /* Cargo: show cargo attribute */ 131 130 element.append( 132 $('<td>' + areas[area_id].employees[user_id].cargo + '</td>') 133 .css('width', '15%') 134 ) 131 $('<td valign="top">' + areas[area_id].employees[user_id].cargo + '</td>') 132 .css('width', '12.5%') 133 ) 134 135 /* data_admissao: show data_admissao attribute */ 136 element.append( 137 $('<td valign="top">' + areas[area_id].employees[user_id].data_admissao + '</td>') 138 .css('width', '6.75%') 139 ) 140 141 /* Funcao: show funcao attribute */ 142 element.append( 143 $('<td> ' + areas[area_id].employees[user_id].funcao + ' </td>') 144 .css('width', '26%') 145 ) 146 135 147 136 148 .addClass('employees');
Note: See TracChangeset
for help on using the changeset viewer.