Changeset 2056 for trunk/workflow/inc/local/classes/class.wf_orgchart.php
- Timestamp:
- 02/23/10 15:28:20 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/workflow/inc/local/classes/class.wf_orgchart.php
r2042 r2056 139 139 " FROM area a " . 140 140 " LEFT OUTER JOIN substituicao s " . 141 " USING(area_id) " .141 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 142 142 " WHERE " . 143 143 " (a.organizacao_id = ?) " . 144 " AND " .145 " ((CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim) " .146 " OR " .147 " (s.substituicao_id is null)) " .148 144 " ORDER BY a.sigla, a.descricao"; 149 145 … … 334 330 " FROM area a " . 335 331 " LEFT OUTER JOIN substituicao s " . 336 " USING(area_id) " .332 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 337 333 " WHERE " . 338 334 " (a.area_id = ?) " . 339 " AND " .340 " ((CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim) " .341 " OR " .342 " (s.substituicao_id is null)) " .343 335 " ORDER BY a.sigla, a.descricao"; 344 336 … … 381 373 " FROM area a " . 382 374 " LEFT OUTER JOIN substituicao s " . 383 " USING(area_id) " .375 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 384 376 " WHERE " . 385 377 " (UPPER(a.sigla) = UPPER(?)) " . 386 378 " AND " . 387 379 " (a.organizacao_id = ?) " . 388 " AND " .389 " ((CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim) " .390 " OR " .391 " (s.substituicao_id is null)) " .392 380 " ORDER BY a.sigla, a.descricao"; 393 381 … … 431 419 " FROM area a " . 432 420 " LEFT OUTER JOIN substituicao s " . 433 " USING(area_id) " .421 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 434 422 " WHERE " . 435 423 " (a.area_status_id = ?) " . 436 " AND " .437 " ((CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim) " .438 " OR " .439 " (s.substituicao_id is null)) " .440 424 " ORDER BY a.sigla, a.descricao"; 441 425 … … 483 467 " FROM area a " . 484 468 " LEFT OUTER JOIN substituicao s " . 485 " USING(area_id) " .469 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 486 470 " WHERE " . 487 471 " (a.area_id IN ($areas)) " . 488 " AND " .489 " ((CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim) " .490 " OR " .491 " (s.substituicao_id is null)) " .492 472 " ORDER BY a.sigla, a.descricao"; 493 473 … … 561 541 " FROM area a " . 562 542 " LEFT OUTER JOIN substituicao s " . 563 " USING(area_id) " .543 " ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " . 564 544 " WHERE " . 565 " (a.superior_area_id = ?) " . 566 " AND " . 567 " ((CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim) " . 568 " OR " . 569 " (s.substituicao_id is null)) "; 545 " (a.superior_area_id = ?) "; 570 546 571 547
Note: See TracChangeset
for help on using the changeset viewer.