Changeset 2063 for trunk/workflow
- Timestamp:
- 02/24/10 15:22:40 (14 years ago)
- Location:
- trunk/workflow
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/workflow/inc/class.so_orgchart.inc.php
r2056 r2063 699 699 $this->_checkAccess($organizationID); 700 700 701 $supervisors = '{' . implode(', ', $this->db->GetRow('SELECT COALESCE(a.titular_funcionario_id, -1) AS titular_funcionario_id, COALESCE(s.funcionario_id, -1) AS substituto_funcionario_id FROM area a LEFT OUTER JOIN substituicao s ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) WHERE (area_id = ?) AND (organizacao_id = ?)', array($areaID, $organizationID))) . '}'; 701 /* gather some info from the area */ 702 $areaInfo = $this->db->query('SELECT COALESCE(a.titular_funcionario_id, -1) AS titular_funcionario_id, COALESCE(s.funcionario_id, -1) AS substituto_funcionario_id FROM area a LEFT OUTER JOIN substituicao s ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) WHERE (a.organizacao_id = ?) AND (a.area_id = ?)', array($organizationID, $areaID))->GetArray(-1); 703 if (empty($areaInfo)) 704 return false; 705 $areaInfo = $areaInfo[0]; 706 $supervisors = '{' . implode(', ', $areaInfo) . '}'; 707 702 708 $query = "SELECT funcionario_id, funcionario_status_id, centro_custo_id, localidade_id, organizacao_id, area_id, cargo_id, nivel, funcionario_categoria_id, titulo FROM funcionario WHERE ((area_id = ?) AND (organizacao_id = ?)) OR (funcionario_id = ANY (?))"; 703 709 $result = $this->db->query($query, array($areaID, $organizationID, $supervisors)); … … 711 717 $output[$i]['funcionario_id_desc'] = ''; 712 718 $output[$i]['uid'] = ''; 719 720 if (in_array($output[$i]['funcionario_id'], $areaInfo)) 721 $output[$i]['chief'] = ($output[$i]['funcionario_id'] == $areaInfo['titular_funcionario_id']) ? 1 : 2; 722 713 723 if (($entry = $cachedLDAP->getEntryByID($output[$i]['funcionario_id']))) 714 724 { -
trunk/workflow/js/orgchart/organization.js
r2056 r2063 520 520 tableHeader['uid'] = 'UID'; 521 521 tableHeader['actions'] = 'Ações'; 522 523 var complement; 522 524 for (var i = 0; i < data.length; i++) 523 525 { … … 527 529 dataHash[j] = data[i][j]; 528 530 531 // are you a chief ('titular' or 'substituto')? 532 complement = ''; 533 if (data[i]['chief']) 534 complement = ' <strong>(' + ((data[i]['chief'] == 1) ? 'Titular' : 'Substituto') + ')</strong>'; 535 529 536 data[i]['tr_attributes'] = new Array(); 530 537 data[i]['tr_attributes']['class'] = "linha" + i%2; 531 538 data[i]['tr_attributes']['className'] = "linha" + i%2; 532 data[i]['funcionario_id_desc'] = '<a href="javascript:void(0)" class="lbOn" onmouseover="getEmployeeInfoTimer(event, ' + data[i]['funcionario_id'] + ', ' + organizationID + '); return false;" onmouseout="hideEmployeeInfo(); return false;" onclick="loadAddEmployeeUI(' + organizationID + ', function(){objEmployee.fillForm(' + dataHash.customInspect() + ')}); $(\'addEmployeeLink\').parentNode.removeChild($(\'addEmployeeLink\')); return false;">' + data[i]['funcionario_id_desc'] + ' </a>' + (data[i]['removed'] ? ' <font color="red">(excluído)</font>' : '');539 data[i]['funcionario_id_desc'] = '<a href="javascript:void(0)" class="lbOn" onmouseover="getEmployeeInfoTimer(event, ' + data[i]['funcionario_id'] + ', ' + organizationID + '); return false;" onmouseout="hideEmployeeInfo(); return false;" onclick="loadAddEmployeeUI(' + organizationID + ', function(){objEmployee.fillForm(' + dataHash.customInspect() + ')}); $(\'addEmployeeLink\').parentNode.removeChild($(\'addEmployeeLink\')); return false;">' + data[i]['funcionario_id_desc'] + ' ' + complement + '</a>' + (data[i]['removed'] ? ' <font color="red">(excluído)</font>' : ''); 533 540 data[i]['actions'] = '<a href="#" onclick="objEmployee.remove({\'funcionario_id\': ' + data[i]['funcionario_id'] + ', \'organizacao_id\': ' + organizationID + '} , this.parentNode.parentNode); return false;"><img border="0" width="16" height="16" src="workflow/templateFile.php?file=images/button_cancel.png" /></a>'; 534 541 window.scrollTo(0,0);
Note: See TracChangeset
for help on using the changeset viewer.