diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/ConfirmarDesactivar.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/ConfirmarDesactivar.java
index bffd73e9..3da91f5e 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/ConfirmarDesactivar.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/ConfirmarDesactivar.java
@@ -150,7 +150,7 @@ public class ConfirmarDesactivar extends AbstractPageBean
@Override
public void prerender()
{
- System.out.println( "=== CONFIRMAR_DESACTIVACAO ===" );
+ System.out.println( "\n=== CONFIRMAR_DESACTIVACAO ===" );
lblUser.setText( getSessionBean1().getCurrentUser().getLogin() );
@@ -158,10 +158,15 @@ public class ConfirmarDesactivar extends AbstractPageBean
if ( analise != null )
{
textAnalise.setText( "Análise nº " + analise.getAnalise_nr() );
+ System.out.println( "\nConfirmarDesactivar . prerender() : " +
+ "AnaliseID = " + analise.getId() +
+ " ; AnaliseNr = " + analise.getAnalise_nr() +
+ " ; AnaliseEstado = " + analise.getEstado() );
}
else
{
textAnalise.setText( "Análise inválida." );
+ System.out.println( "\nConfirmarDesactivar . prerender() : Analise = null !" );
}
}
@@ -184,8 +189,9 @@ public class ConfirmarDesactivar extends AbstractPageBean
*
* @return reference to the scoped data bean
*/
- protected SessionBean1 getSessionBean1() {
- return (SessionBean1) getBean("SessionBean1");
+ protected SessionBean1 getSessionBean1()
+ {
+ return ( SessionBean1 ) getBean( "SessionBean1" );
}
/**
@@ -193,8 +199,9 @@ public class ConfirmarDesactivar extends AbstractPageBean
*
* @return reference to the scoped data bean
*/
- protected RequestBean1 getRequestBean1() {
- return (RequestBean1) getBean("RequestBean1");
+ protected RequestBean1 getRequestBean1()
+ {
+ return ( RequestBean1 ) getBean( "RequestBean1" );
}
/**
@@ -202,8 +209,9 @@ public class ConfirmarDesactivar extends AbstractPageBean
*
* @return reference to the scoped data bean
*/
- protected ApplicationBean1 getApplicationBean1() {
- return (ApplicationBean1) getBean("ApplicationBean1");
+ protected ApplicationBean1 getApplicationBean1()
+ {
+ return ( ApplicationBean1 ) getBean( "ApplicationBean1" );
}
private boolean canAccess()
@@ -277,7 +285,7 @@ public class ConfirmarDesactivar extends AbstractPageBean
analise.setData_desactivacao( new Date() );
analise.setComentario_desactivacao( comentario );
- AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
+ AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
adp.updateAnalise( analise );
}
catch ( Exception e )
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java
index 79dd5116..4b514d91 100755
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java
@@ -925,6 +925,8 @@ public class FormDirSiprp extends AbstractPageBean
{
this.lblUser = st;
}
+
+
public TableColumn tableColumnDesactivarAnalise = new TableColumn();
public TableColumn getTableColumnDesactivarAnalise()
@@ -947,6 +949,33 @@ public class FormDirSiprp extends AbstractPageBean
{
this.buttonDesactivarAnalise = buttonDesactivarAnalise;
}
+
+
+ public TableColumn tableColumnDesactivarAnaliseConcluidos = new TableColumn();
+
+ public TableColumn getTableColumnDesactivarAnaliseConcluidos()
+ {
+ return tableColumnDesactivarAnaliseConcluidos;
+ }
+
+ public void setTableColumnDesactivarAnaliseConcluidos( TableColumn tableColumnDesactivarAnaliseConcluidos )
+ {
+ this.tableColumnDesactivarAnaliseConcluidos = tableColumnDesactivarAnaliseConcluidos;
+ }
+ public Button buttonDesactivarAnaliseConcluidos = new Button();
+
+ public Button getButtonDesactivarAnaliseConcluidos()
+ {
+ return buttonDesactivarAnaliseConcluidos;
+ }
+
+ public void setButtonDesactivarAnaliseConcluidos( Button buttonDesactivarAnaliseConcluidos )
+ {
+ this.buttonDesactivarAnaliseConcluidos = buttonDesactivarAnaliseConcluidos;
+ }
+
+
+
//
private HtmlPanelGrid gridPanelFilterSeg = new HtmlPanelGrid();
@@ -1176,13 +1205,13 @@ public class FormDirSiprp extends AbstractPageBean
}
//Column para desactivar plano - mostra se o utilizador for DIRECTOR SIPRP
-// System.out.println( "\n\nRendering 'desactivar' ... " + buttonDesactivarAnalise.isRendered() );
int uType = currentUser == null ? -1 : currentUser.getTipo().intValue();
-// System.out.println( "\tuserType : " + uType );
boolean renderOrNot = uType == Global.TIPO_UTILIZADOR_DIRECTOR_SIPRP;
-// System.out.println( "\trenderOrNot : " + renderOrNot + " ( " + Global.TIPO_UTILIZADOR_DIRECTOR_SIPRP + " )" );
+
tableColumnDesactivarAnalise.setRendered( renderOrNot );
buttonDesactivarAnalise.setRendered( renderOrNot );
+ tableColumnDesactivarAnaliseConcluidos.setRendered( renderOrNot );
+// buttonDesactivarAnaliseConcluidos.setRendered( renderOrNot );
}
@Override
@@ -1680,7 +1709,14 @@ public class FormDirSiprp extends AbstractPageBean
{
System.out.println( "\nbuttonDesactivarAnalise_action() : " );
AnaliseAcidente selectedAnalise = getTableSeguimentoRowData();
+ getSessionBean1().setCurrentAnalise( selectedAnalise );
+ return "confirmar_desactivar";
+ }
+ public String buttonDesactivarAnaliseConcluidos_action()
+ {
+ System.out.println( "\nbuttonDesactivarAnaliseConcluidos_action() : " );
+ AnaliseAcidente selectedAnalise = getTableConcluidasRowData();
getSessionBean1().setCurrentAnalise( selectedAnalise );
return "confirmar_desactivar";
}
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/app.properties b/trunk/AnaliseAcidentesTrabalho/src/java/app.properties
index 45a694c3..3fc72f86 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/app.properties
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/app.properties
@@ -13,43 +13,29 @@ username.siprp_local = postgres
#password.siprp_local =
-
# tests localhost
#server.siprp = localhost
#port.siprp = 5432
-#database.siprp = siprp
+#database.siprp = siprp_20110706
#username.siprp = postgres
#password.siprp = Typein
#
#server.siprp_local = localhost
#port.siprp_local = 5432
-#database.siprp_local = siprp_local_3
+#database.siprp_local = siprp_local_3_20110706
#username.siprp_local = postgres
#password.siprp_local = Typein
-# tests evoserver
-#server.siprp = evoserver
+# tests ws2
+#server.siprp = ws2
#port.siprp = 5432
-#database.siprp = siprp_20100813
-#username.siprp = postgres
-##password.siprp =
-#
-#server.siprp_local = evoserver
-#port.siprp_local = 5432
-#database.siprp_local = siprp_local_3_20100813
-#username.siprp_local = postgres
-##password.siprp_local =
-
-# tests
-#server.siprp = www.evolute.pt
-#port.siprp = 5436
#database.siprp = siprp
#username.siprp = postgres
-#password.siprp = -rg2hpgsql
+#password.siprp = Typein
#
-#server.siprp_local = www.evolute.pt
-#port.siprp_local = 5436
+#server.siprp_local = ws2
+#port.siprp_local = 5432
#database.siprp_local = siprp_local_3
#username.siprp_local = postgres
-#password.siprp_local = -rg2hpgsql
\ No newline at end of file
+#password.siprp_local = Typein
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/beans/AnaliseAcidente.java b/trunk/AnaliseAcidentesTrabalho/src/java/beans/AnaliseAcidente.java
index a15c55f5..4e0adf0b 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/beans/AnaliseAcidente.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/beans/AnaliseAcidente.java
@@ -1054,6 +1054,11 @@ public class AnaliseAcidente implements Serializable
this.rh_fase4 = rh_fase4;
}
+ public Boolean isConcluido_por_desactivacao()
+ {
+ return getConcluido_por_desactivacao();
+ }
+
public Boolean getConcluido_por_desactivacao() {
return concluido_por_desactivacao;
}
@@ -1078,4 +1083,9 @@ public class AnaliseAcidente implements Serializable
this.comentario_desactivacao = comentario_desactivacao;
}
+
+ public String getDesactivadoLabel()
+ {
+ return "Desactivado em " + getData_desactivacao();
+ }
}
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/AnalisesDataProvider.java b/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/AnalisesDataProvider.java
index 46d159f6..2512c009 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/AnalisesDataProvider.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/AnalisesDataProvider.java
@@ -317,25 +317,12 @@ public class AnalisesDataProvider extends GenericDataProvider
where = where.and( or );
Select2 query = new Select2(
- new String[]
- {
- "analises_acidentes"
- },
- new Integer[]
- {
- },
- new Expression[]
- {
- },
- new String[]
- {
- "*"
- },
+ new String[] { "analises_acidentes" },
+ new Integer[] { },
+ new Expression[] { },
+ new String[] { "*" },
where,
- new String[]
- {
- "analise_nr"
- },
+ new String[] { "analise_nr" },
null, null, null );
// String sql = "";
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp
index d960b0bf..47fe71cc 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp
@@ -228,6 +228,13 @@
+
+
+
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp
index 806574ff..7f17138b 100755
--- a/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp
@@ -238,6 +238,17 @@
+
+
+
+
+
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp
index 30d51ff8..e76650ba 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp
@@ -229,6 +229,13 @@
+
+
+
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp
index b95a5e69..4dfcbc0a 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp
@@ -287,6 +287,13 @@
+
+
+
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormMedico.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormMedico.jsp
index fe09438d..b0a73388 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormMedico.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormMedico.jsp
@@ -248,6 +248,13 @@
+
+
+
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp
index 808cf2fa..5dad3d44 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp
@@ -286,6 +286,13 @@
+
+
+
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp
index 8e01623a..4f83d4a5 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp
@@ -301,6 +301,13 @@
+
+
+