lxbfYeaa9897955
/
SIPRP
forked from Coded/SIPRP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

desactivar analises concluidas

Browse Source 
git-svn-id: https://svn.coded.pt/svn/SIPRP@1690 bb69d46d-e84e-40c8-a05a-06db0d633741
lxbfYeaa
Diogo Neves 15 years ago
parent d032a4517b
commit 30f798c3ed
12 changed files with 131 additions and 51 deletions
Show Stats Download Patch File Download Diff File

24
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/ConfirmarDesactivar.java
Unescape View File

@ -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 )

42
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java
Unescape View File

@ -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;
}
// </editor-fold>
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";
}

30
trunk/AnaliseAcidentesTrabalho/src/java/app.properties
Unescape View File

@ -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
#password.siprp_local = Typein

10
trunk/AnaliseAcidentesTrabalho/src/java/beans/AnaliseAcidente.java
Unescape View File

@ -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();
}
}

23
trunk/AnaliseAcidentesTrabalho/src/java/db/providers/AnalisesDataProvider.java
Unescape View File

@ -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 = "";

7
trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp
Unescape View File

@ -228,6 +228,13 @@
<ui:hyperlink action="#{FormDirGerRh.lnkEstabConcluida_action}" binding="#{FormDirGerRh.lnkEstabConcluida}"
id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
</ui:tableColumn>
<ui:tableColumn headerText="Desactivação"
id="tableColumnDesactivarAnaliseConcluidos" >
<ui:hyperlink action="#{FormDirGerRh.lnkEstabConcluida_action}"
id="labelAnaliseDesactivada"
text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );"
rendered="#{currentRow.value['concluido_por_desactivacao']}" />
</ui:tableColumn>
</ui:tableRowGroup>
</ui:table>
<ui:staticText binding="#{FormDirGerRh.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px"/>

11
trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp
Unescape View File

@ -238,6 +238,17 @@
<ui:hyperlink action="#{FormDirSiprp.lnkEstabConcluida_action}" binding="#{FormDirSiprp.lnkEstabConcluida}"
id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
</ui:tableColumn>
<ui:tableColumn binding="#{FormDirSiprp.tableColumnDesactivarAnaliseConcluidos}" headerText="Desactivação"
id="tableColumnDesactivarAnaliseConcluidos" >
<ui:button binding="#{FormDirSiprp.buttonDesactivarAnaliseConcluidos}" id="buttonDesactivarAnaliseConcluidos"
action="#{FormDirSiprp.buttonDesactivarAnaliseConcluidos_action}" text="Desactivar"
rendered="#{! currentRow.value['concluido_por_desactivacao']}" />
<ui:hyperlink action="#{FormDirSiprp.lnkEstabConcluida_action}"
id="labelAnaliseDesactivada"
text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );"
rendered="#{currentRow.value['concluido_por_desactivacao']}" />
</ui:tableColumn>
</ui:tableRowGroup>
</ui:table>
<ui:staticText binding="#{FormDirSiprp.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px"/>

7
trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp
Unescape View File

@ -229,6 +229,13 @@
<ui:hyperlink action="#{FormGestor.lnkEstabConcluida_action}" binding="#{FormGestor.lnkEstabConcluida}"
id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
</ui:tableColumn>
<ui:tableColumn headerText="Desactivação"
id="tableColumnDesactivarAnaliseConcluidos" >
<ui:hyperlink action="#{FormGestor.lnkEstabConcluida_action}"
id="labelAnaliseDesactivada"
text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );"
rendered="#{currentRow.value['concluido_por_desactivacao']}" />
</ui:tableColumn>
</ui:tableRowGroup>
</ui:table>
<ui:staticText binding="#{FormGestor.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px"/>

7
trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp
Unescape View File

@ -287,6 +287,13 @@
<ui:hyperlink action="#{FormHS.lnkEstabConcluida_action}" binding="#{FormHS.lnkEstabConcluida}"
id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
</ui:tableColumn>
<ui:tableColumn headerText="Desactivação"
id="tableColumnDesactivarAnaliseConcluidos" >
<ui:hyperlink action="#{FormHS.lnkEstabConcluida_action}"
id="labelAnaliseDesactivada"
text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );"
rendered="#{currentRow.value['concluido_por_desactivacao']}" />
</ui:tableColumn>
</ui:tableRowGroup>
</ui:table>
<ui:staticText binding="#{FormHS.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px"/>

7
trunk/AnaliseAcidentesTrabalho/web/FormMedico.jsp
Unescape View File

@ -248,6 +248,13 @@
<ui:hyperlink action="#{FormMedico.lnkEstabConcluida_action}" binding="#{FormMedico.lnkEstabConcluida}"
id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
</ui:tableColumn>
<ui:tableColumn headerText="Desactivação"
id="tableColumnDesactivarAnaliseConcluidos" >
<ui:hyperlink action="#{FormMedico.lnkEstabConcluida_action}"
id="labelAnaliseDesactivada"
text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );"
rendered="#{currentRow.value['concluido_por_desactivacao']}" />
</ui:tableColumn>
</ui:tableRowGroup>
</ui:table>
<ui:staticText binding="#{FormMedico.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px"/>

7
trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp
Unescape View File

@ -286,6 +286,13 @@
<ui:hyperlink action="#{FormRH.lnkEstabConcluida_action}" binding="#{FormRH.lnkEstabConcluida}"
id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
</ui:tableColumn>
<ui:tableColumn headerText="Desactivação"
id="tableColumnDesactivarAnaliseConcluidos" >
<ui:hyperlink action="#{FormRH.lnkEstabConcluida_action}"
id="labelAnaliseDesactivada"
text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );"
rendered="#{currentRow.value['concluido_por_desactivacao']}" />
</ui:tableColumn>
</ui:tableRowGroup>
</ui:table>
<ui:staticText binding="#{FormRH.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px"/>

7
trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp
Unescape View File

@ -301,6 +301,13 @@
<ui:hyperlink action="#{FormSeguranca.lnkEstabConcluida_action}"
binding="#{FormSeguranca.lnkEstabConcluida}" id="lnkEstabConcluida" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
</ui:tableColumn>
<ui:tableColumn headerText="Desactivação"
id="tableColumnDesactivarAnaliseConcluidos" >
<ui:hyperlink action="#{FormSeguranca.lnkEstabConcluida_action}"
id="labelAnaliseDesactivada"
text="#{currentRow.value['desactivadoLabel']}" style="color: rgb( 255, 0, 0 );"
rendered="#{currentRow.value['concluido_por_desactivacao']}" />
</ui:tableColumn>
</ui:tableRowGroup>
</ui:table>
<ui:staticText binding="#{FormSeguranca.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px"/>

Write Preview
Loading…
Cancel
Save