From f618aaed4986e5aecc59f747b20a65064736ce5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=20Lu=C3=ADs=20=3D?= <deactivated@coded.pt>
Date: Tue, 9 Dec 2008 09:17:28 +0000
Subject: [PATCH] 09/12/2008

git-svn-id: https://svn.coded.pt/svn/SIPRP@816 bb69d46d-e84e-40c8-a05a-06db0d633741
---
 .../db/providers/RelatoriosDataProvider.java     | 16 +++++++++++++---
 .../src/java/planosactuacao/ListaPlanos.java     |  2 +-
 .../src/java/planosactuacao/PlanosActuacao.java  |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/trunk/PlanosActuacao/src/java/db/providers/RelatoriosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/RelatoriosDataProvider.java
index 8c84be2d..7dc3d13d 100644
--- a/trunk/PlanosActuacao/src/java/db/providers/RelatoriosDataProvider.java
+++ b/trunk/PlanosActuacao/src/java/db/providers/RelatoriosDataProvider.java
@@ -140,8 +140,17 @@ public class RelatoriosDataProvider extends GenericDataProvider {
             do
             {
                 Valor v = new Valor();
-                int valor = rs.getInt("valor");
-                v.setValor(new Integer(valor));
+                Object oValor = rs.getObject("valor");
+                if(oValor == null)
+                {
+                    v.setValor(null);
+                }
+                else
+                {
+                    v.setValor((Integer) oValor);
+                }
+                //int valor = rs.getInt("valor");
+                //v.setValor(new Integer(valor));
                 v.setMedidas(getMedidasByValor(v, r, a));
                 valores.add(v);
             }while(rs.next());
@@ -164,7 +173,8 @@ public class RelatoriosDataProvider extends GenericDataProvider {
         sql += "inner join hs_relatorio_posto_risco on (hs_relatorio_posto_risco.posto_id = hs_relatorio_posto.id and hs_relatorio_posto_risco.risco_id = hs_relatorio_risco.id) ";
         sql += "inner join hs_relatorio on hs_relatorio.id = hs_relatorio_risco.relatorio_id ";
         sql += "inner join hs_relatorio_area on hs_relatorio_area.id = area_id ";
-        sql += "where hs_relatorio_posto_risco.risco_id = " + r.getId() + " and area_id = " + a.getId() + " and hs_relatorio_posto_medida.is_plano_actuacao = true" + ") subquery ";
+//        sql += "where hs_relatorio_posto_risco.risco_id = " + r.getId() + " and area_id = " + a.getId() + " and hs_relatorio_posto_medida.is_plano_actuacao = true" + ") subquery ";
+        sql += "where hs_relatorio_posto_risco.risco_id = " + r.getId() + " and area_id = " + a.getId() + ") subquery ";        
         sql += "where valor = " + v.getValor() + " ";
         sql += "order by subquery.medida_id, valor";
         System.out.println("MEDIDAS BY VALOR SQL : " + sql);        
diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
index c1ec27dd..f9c91b7e 100644
--- a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
+++ b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
@@ -335,7 +335,7 @@ public class ListaPlanos extends AbstractPageBean {
         List listPlanosConcluidos = planos.getPlanosConcluidos();
         getSessionBean1().getPlanosConcluidosDataProvider().setList(listPlanosConcluidos);                
         
-        checkPlanosDelayed();
+        //checkPlanosDelayed();
     }
     
     
diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java b/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java
index b67c87c0..862f8c79 100644
--- a/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java
+++ b/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java
@@ -86,7 +86,7 @@ public class PlanosActuacao {
         while(iter.hasNext())
         {
             HsRelatorio relatorio = iter.next();
-            
+            System.out.println("RELATORIO ID : " + relatorio.getId().toString());
             try
             {
                 PlanoActuacao p = createPlano(relatorio);