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

branches/SIPRP/web/src/siprp/pagina/GlobalConstants.java

@@ -13,19 +13,19 @@ package siprp.pagina;
 public interface GlobalConstants
 {
 	 // BD
-//    public static final String bdHost = "evolute.dyndns.tv";
+    public static final String bdHost = "www.evolute.pt";
-	public static final String bdHost = "127.0.0.1";
+//	public static final String bdHost = "127.0.0.1";
     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 = "evolute.dyndns.tv";
+	public static final String bdLocalHost = "www.evolute.pt";
-	public static final String bdLocalHost = "127.0.0.1";
+//	public static final String bdLocalHost = "127.0.0.1";
     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";
 	

branches/SIPRP/web/src/siprp/pagina/doGetListaTrabalhadoresTudo.java

@@ -77,7 +77,7 @@ 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 " );
                         stmt = con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
                         rs = new ResultSet2DArray( stmt.executeQuery( dbQuery.toString()) );
                         

branches/SIPRP/web/src/siprp/pagina/doPostLogin.java

@@ -17,7 +17,8 @@ public class doPostLogin extends siprpServlet
     /** Creates a new instance of doPostLogin */
     public doPostLogin(HttpServletRequest req, HttpServletResponse res) throws IOException
     {
-System.out.println( "doPostLogin()" );
+    	System.out.println( "doPostLogin()" );
+
         ServletOutputStream out = res.getOutputStream();
         StringBuffer dbQuery;
         ResultSet2DArray rs;
@@ -39,7 +40,7 @@ System.out.println( "doPostLogin()" );
                 }
                 else
                 {
-                    Class.forName(bdDriver);
+                    Class.forName( bdDriver );
                     con = DriverManager.getConnection( bdUrl, bdUsername, bdPassword );
                     dbQuery = new StringBuffer();
                     dbQuery.append( "SELECT password FROM users WHERE username = '"+user+"'");
@@ -47,7 +48,6 @@ System.out.println( "doPostLogin()" );
                     stmt = con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
                     rs = new ResultSet2DArray( stmt.executeQuery( dbQuery.toString()) );
 					
-					
                     if ( rs.columnLength() > 0 && password.equals((String)rs.get(0,0)))
                     {
                         // Obter Role