From 3a8d5cca308c5274c1cfc97f9aeaec3b8d1aef24 Mon Sep 17 00:00:00 2001 From: Diogo Neves Date: Fri, 17 Dec 2010 13:15:50 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1600 bb69d46d-e84e-40c8-a05a-06db0d633741 --- trunk/web/src/siprp/pagina/GlobalConstants.java | 8 ++++---- .../web/src/siprp/pagina/doGetListaTrabalhadoresTudo.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/trunk/web/src/siprp/pagina/GlobalConstants.java b/trunk/web/src/siprp/pagina/GlobalConstants.java index 508af152..09ad89c3 100644 --- a/trunk/web/src/siprp/pagina/GlobalConstants.java +++ b/trunk/web/src/siprp/pagina/GlobalConstants.java @@ -13,17 +13,17 @@ package siprp.pagina; public interface GlobalConstants { // BD - public static final String bdHost = "127.0.0.1"; + public static final String bdHost = "www.evolute.pt"; public static final String bdPort = "5436"; public static final String bdUsername = "siprp"; - public static final String bdPassword = ""; + public static final String bdPassword = "rg2h-opksiprp"; public static final String bdDriver = "org.postgresql.Driver"; public static final String bdUrl = "jdbc:postgresql://" + bdHost + ":" + bdPort + "/siprp"; - public static final String bdLocalHost = "127.0.0.1"; + public static final String bdLocalHost = "www.evolute.pt"; public static final String bdLocalPort = "5436"; public static final String bdLocalUsername = "siprp"; - public static final String bdLocalPassword = ""; + public static final String bdLocalPassword = "rg2h-opksiprp"; public static final String bdLocalDriver = "org.postgresql.Driver"; public static final String bdLocalUrl = "jdbc:postgresql://" + bdHost + ":" + bdPort + "/siprp_local_3"; diff --git a/trunk/web/src/siprp/pagina/doGetListaTrabalhadoresTudo.java b/trunk/web/src/siprp/pagina/doGetListaTrabalhadoresTudo.java index 1d4ed6cd..1a501aa3 100644 --- a/trunk/web/src/siprp/pagina/doGetListaTrabalhadoresTudo.java +++ b/trunk/web/src/siprp/pagina/doGetListaTrabalhadoresTudo.java @@ -77,9 +77,9 @@ public class doGetListaTrabalhadoresTudo + "WHERE estabelecimento_id = " + estabelecimentoId + " AND marcacoes_trabalhador.trabalhador_id = trabalhadores.id " + " AND trabalhadores.inactivo <> 'y' AND data_demissao IS NULL " - + "ORDER BY 6, 3, 4 DESC " ); + + "ORDER BY 5, 3, 4 DESC " ); - System.out.println( "\nSQL : " + dbQuery.toString() ); +// System.out.println( "\nSQL : " + dbQuery.toString() ); stmt = con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); rs = new ResultSet2DArray( stmt.executeQuery( dbQuery.toString()) );