no message

git-svn-id: https://svn.coded.pt/svn/SIPRP@529 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresPendentes.java

@@ -6,16 +6,19 @@
 
 package siprp.pagina;
 
-import com.evolute.utils.arrays.*;
-import com.evolute.utils.strings.*;
 import java.io.*;
-import java.util.*;
-import java.sql.*;
 import java.lang.reflect.Array;
 import javax.servlet.*;
 import javax.servlet.http.*;
+import java.sql.*;
+import java.util.*;
+
 import org.apache.velocity.*;
 import org.apache.velocity.app.*;
+
+import com.evolute.utils.arrays.*;
+import com.evolute.utils.strings.*;
+
 /**
  *
  * @author  fpalma
@@ -64,17 +67,17 @@ public class doGetListaTrabalhadoresPendentes
 					+ "WHERE estabelecimento_id = " + estabelecimentoId
 					+ " AND trabalhadores.inactivo <> 'y' AND data_demissao IS NULL "
 					+ "ORDER BY 6, 3, 4 DESC " );
-//                        dbQuery.append( "SELECT id, nome, ( ultima_consulta IS NOT NULL AND realizada = 'y' ),"
-//										+ " ( ultimo_exame IS NOT NULL AND realizado = 'y' ),"
-//										+ " proxima_consulta IS NOT NULL, proximo_exame IS NOT NULL, "
-//										+ " ( proxima_consulta IS NOT NULL AND proxima_consulta - current_date <= 14 ), "
-//										+ " ( proximo_exame IS NOT NULL AND proximo_exame - current_date <= 14 )"
-//										+ " FROM trabalhadores "
-//										+ " WHERE estabelecimento_id = '"+estabelecimentoId+"'"
-//										+ " AND ( ultima_consulta IS NULL OR realizada = 'n' OR"
-//										+ " ( proxima_consulta IS NOT NULL AND proxima_consulta - current_date <= 14 )"
-//										+ " OR ( proximo_exame IS NOT NULL AND proximo_exame - current_date <= 14 ) )"
-//										+ " ORDER BY nome" );
+					//                        dbQuery.append( "SELECT id, nome, ( ultima_consulta IS NOT NULL AND realizada = 'y' ),"
+					//										+ " ( ultimo_exame IS NOT NULL AND realizado = 'y' ),"
+					//										+ " proxima_consulta IS NOT NULL, proximo_exame IS NOT NULL, "
+					//										+ " ( proxima_consulta IS NOT NULL AND proxima_consulta - current_date <= 14 ), "
+					//										+ " ( proximo_exame IS NOT NULL AND proximo_exame - current_date <= 14 )"
+					//										+ " FROM trabalhadores "
+					//										+ " WHERE estabelecimento_id = '"+estabelecimentoId+"'"
+					//										+ " AND ( ultima_consulta IS NULL OR realizada = 'n' OR"
+					//										+ " ( proxima_consulta IS NOT NULL AND proxima_consulta - current_date <= 14 )"
+					//										+ " OR ( proximo_exame IS NOT NULL AND proximo_exame - current_date <= 14 ) )"
+					//										+ " ORDER BY nome" );
 					stmt = con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
 					rs = new ResultSet2DArray( stmt.executeQuery( dbQuery.toString()) );
 
@@ -184,8 +187,8 @@ public class doGetListaTrabalhadoresPendentes
 		}
 	}
 
-	protected boolean verificarTrabalhador( Object consultas[][], Object exames[][] )
-	{
+protected boolean verificarTrabalhador( Object consultas[][], Object exames[][] )
+{
 	boolean estadoConsultas = false;
 	boolean estadoExames = ( exames.length == 0 ) || ( ( java.util.Date )exames[ 0 ][ 0 ] ).before(today) ||
 	( ( ( ( java.util.Date )exames[ 0 ][ 0 ] ).getTime() - todayMillis ) / 86400000 > 14 );
@@ -214,7 +217,7 @@ public class doGetListaTrabalhadoresPendentes
 		( proxima == -1 || ( ( ( java.util.Date )consultas[ proxima ][ 0 ] ).getTime() - todayMillis ) / 86400000 > 14 );
 	}
 	return !(estadoConsultas && estadoExames);
-	}
+}
 
 	protected HashMap criarDadosTrabalhador( Connection con, Integer id, String nome, 
 												Object consultas[][], Object exames[][] )