Changeset 2348

Timestamp:

03/26/10 11:35:03 (14 years ago)

Author:

gbisotto

Message:

Ticket #1004 - Melhorado o método getEmployeeCostCenterID para retornar o centro de custo da area

File:

• trunk/workflow/inc/local/classes/class.wf_orgchart.php (modified) (7 diffs)

trunk/workflow/inc/local/classes/class.wf_orgchart.php

@@ -140 +140 @@
                                  "  LEFT OUTER JOIN substituicao s " .
                                  "  ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " .
-                                 " WHERE " . 
+                                 " WHERE " .
                                  "      (a.organizacao_id = ?) " .
                                  " ORDER BY a.sigla, a.descricao";
@@ -331 +331 @@
                                  "  LEFT OUTER JOIN substituicao s " .
                                  "  ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " .
-                                 " WHERE " . 
+                                 " WHERE " .
                                  "      (a.area_id = ?) " .
                                  " ORDER BY a.sigla, a.descricao";
@@ -374 +374 @@
                                  "  LEFT OUTER JOIN substituicao s " .
                                  "  ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " .
-                                 " WHERE " . 
+                                 " WHERE " .
                                  "      (UPPER(a.sigla) = UPPER(?)) " .
-                                 " AND " . 
+                                 " AND " .
                                  "      (a.organizacao_id = ?) " .
                                  " ORDER BY a.sigla, a.descricao";
@@ -420 +420 @@
                                  "  LEFT OUTER JOIN substituicao s " .
                                  "  ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " .
-                                 " WHERE " . 
+                                 " WHERE " .
                                  "      (a.area_status_id = ?) " .
                                  " ORDER BY a.sigla, a.descricao";
@@ -468 +468 @@
                                  "  LEFT OUTER JOIN substituicao s " .
                                  "  ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " .
-                                 " WHERE " . 
+                                 " WHERE " .
                                  "      (a.area_id IN ($areas)) " .
                                  " ORDER BY a.sigla, a.descricao";
@@ -542 +542 @@
                                  "  LEFT OUTER JOIN substituicao s " .
                                  "  ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) " .
-                                 " WHERE " . 
+                                 " WHERE " .
                                  "      (a.superior_area_id = ?) ";
 
@@ -1202 +1202 @@
                         return false;
 
-                return $employee['centro_custo_id'];
+                $costCenterID = $employee['centro_custo_id'];
+                if(!empty($costCenterID)){
+                        return $costCenterID;
+                } else {
+                        $employeeArea = $this->getArea($employee['area_id']);
+                        return $employeeArea['centro_custo_id'];
+                }
         }