Changeset 2042 for trunk/workflow/inc/class.so_userinterface.inc.php

Timestamp:

02/22/10 16:23:36 (14 years ago)

Author:

pedroerp

Message:

Ticket #441 - Suporte a cadastro de substituições de chefia por períodos determinados.

File:

• trunk/workflow/inc/class.so_userinterface.inc.php (modified) (2 diffs)

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

@@ -509 +509 @@
         function getAreaWithSubtituteBoss( $organizationID )
         {
-                $result = $this -> db -> query( "SELECT sigla as area, titular_funcionario_id as titular, substituto_funcionario_id as substituto FROM area WHERE (organizacao_id = ?) and substituto_funcionario_id is not null ORDER BY area", array( $organizationID ) );
+                $result = $this -> db -> query( "SELECT a.sigla as area, a.titular_funcionario_id as titular, s.funcionario_id as substituto, s.data_inicio, s.data_fim FROM area a INNER JOIN substituicao s USING (area_id) WHERE (organizacao_id = ?) and CURRENT_DATE BETWEEN data_inicio AND data_fim ORDER BY area", array( $organizationID ) );
 
                 $cachedLDAP = $GLOBALS[ 'workflow' ][ 'factory' ] -> newInstance( 'CachedLDAP' );
@@ -527 +527 @@
                         if ( $entry && ( ! is_null( $entry[ 'cn' ] ) ) )
                                 $output[ $i ][ 'substituto' ] = $entry[ 'cn' ];
+
+                        $output[$i]['data_inicio'] = implode('/', array_reverse(explode('-', $output[$i]['data_inicio'])));
+                        $output[$i]['data_fim'] = implode('/', array_reverse(explode('-', $output[$i]['data_fim'])));
                 }