Changeset 2371 for sandbox/workflow/trunk/inc
- Timestamp:
- 03/29/10 14:36:50 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/workflow/trunk/inc/local/classes/class.wf_orgchart.php
r2056 r2371 140 140 " LEFT OUTER JOIN substituicao s " . 141 141 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 142 " WHERE " . 142 " WHERE " . 143 143 " (a.organizacao_id = ?) " . 144 144 " ORDER BY a.sigla, a.descricao"; … … 331 331 " LEFT OUTER JOIN substituicao s " . 332 332 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 333 " WHERE " . 333 " WHERE " . 334 334 " (a.area_id = ?) " . 335 335 " ORDER BY a.sigla, a.descricao"; … … 374 374 " LEFT OUTER JOIN substituicao s " . 375 375 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 376 " WHERE " . 376 " WHERE " . 377 377 " (UPPER(a.sigla) = UPPER(?)) " . 378 " AND " . 378 " AND " . 379 379 " (a.organizacao_id = ?) " . 380 380 " ORDER BY a.sigla, a.descricao"; … … 420 420 " LEFT OUTER JOIN substituicao s " . 421 421 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 422 " WHERE " . 422 " WHERE " . 423 423 " (a.area_status_id = ?) " . 424 424 " ORDER BY a.sigla, a.descricao"; … … 468 468 " LEFT OUTER JOIN substituicao s " . 469 469 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 470 " WHERE " . 470 " WHERE " . 471 471 " (a.area_id IN ($areas)) " . 472 472 " ORDER BY a.sigla, a.descricao"; … … 542 542 " LEFT OUTER JOIN substituicao s " . 543 543 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 544 " WHERE " . 544 " WHERE " . 545 545 " (a.superior_area_id = ?) "; 546 546 … … 1202 1202 return false; 1203 1203 1204 return $employee['centro_custo_id']; 1204 $costCenterID = $employee['centro_custo_id']; 1205 if(!empty($costCenterID)){ 1206 return $costCenterID; 1207 } else { 1208 $employeeArea = $this->getArea($employee['area_id']); 1209 return $employeeArea['centro_custo_id']; 1210 } 1205 1211 } 1206 1212
Note: See TracChangeset
for help on using the changeset viewer.