Changeset 2048 for trunk/workflow

Timestamp:

02/23/10 10:08:15 (14 years ago)

Author:

pedroerp

Message:

Ticket #441 - Corrigindo consulta para buscar substituto na nova tabela.

File:

• trunk/workflow/inc/class.so_userinterface.inc.php (modified) (1 diff)

trunk/workflow/inc/class.so_userinterface.inc.php

@@ -234 +234 @@
 
                 /* gather some info from the area */
-                $areaInfo = $this->db->query('SELECT COALESCE(titular_funcionario_id, -1) AS titular_funcionario_id, COALESCE(substituto_funcionario_id, -1) AS substituto_funcionario_id FROM area WHERE (organizacao_id = ?) AND (area_id = ?)', array($organizationID, $areaID))->GetArray(-1);
+                $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 USING(area_id) WHERE (a.organizacao_id = ?) AND (a.area_id = ?) AND ((CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim) OR (s.substituicao_id IS NULL))', array($organizationID, $areaID))->GetArray(-1);
                 if (empty($areaInfo))
                         return false;