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

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

Browse Source
0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Diogo Neves 14 years ago
parent b6027ed476
commit 23c4562862
4 changed files with 102 additions and 18 deletions
Show Stats Download Patch File Download Diff File

58
trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java
Unescape View File

@ -196,6 +196,20 @@ public class EditarPlano extends AbstractPageBean
{
this.gridValidar = hpg;
}
private StaticText labelCheckValidacao = new StaticText();
public StaticText getLabelCheckValidacao()
{
return labelCheckValidacao;
}
public void setLabelCheckValidacao( StaticText labelCheckValidacao )
{
this.labelCheckValidacao = labelCheckValidacao;
}
private Checkbox chkValidacao = new Checkbox();
public Checkbox getChkValidacao()
@ -468,6 +482,17 @@ public class EditarPlano extends AbstractPageBean
String errorMessage = getSessionBean1().getMsg();
lblMsg.setText( ( errorMessage != null && ! "".equals( errorMessage.trim() ) ? "<br>" : "" ) + errorMessage );
getSessionBean1().setMsg( "" );
if ( p != null )
{
if ( p.getFase() != null && p.getFase().intValue() == Global.FASE_CONCLUIDO )
{
butEnviar.setRendered( false );
chkDesactivar.setRendered( false );
chkValidacao.setRendered( false );
labelCheckValidacao.setRendered( false );
}
}
}
/**
@ -547,8 +572,8 @@ public class EditarPlano extends AbstractPageBean
gridValidar.setRendered( false );
}
int fase = p.getFase().intValue();
switch ( fase )
// int fase = p.getFase().intValue();
switch ( /*fase*/ getFasePlano() )
{
case Global.FASE_SEGURANCA_PREENCHIMENTO:
if ( p.getObservacoes_dl() != null )
@ -939,8 +964,7 @@ public class EditarPlano extends AbstractPageBean
showPostos( m );
Utilizador u = getSessionBean1().getCurrentUser();
PlanoActuacao planoActual = getSessionBean1().getPlanoActuacao();
if ( planoActual.getFase().intValue() == Global.FASE_SIPRP_CONCLUSAO )
if ( getFasePlano() == Global.FASE_SIPRP_CONCLUSAO )
{
List<EstadoMedida> opts = null;
try
@ -1403,6 +1427,22 @@ public class EditarPlano extends AbstractPageBean
gridPagination.getChildren().add( group );
}
private int getFasePlano()
{
int result = -1;
Utilizador user = getSessionBean1().getCurrentUser();
Integer tipo = user.getTipo();
int tipoUser = tipo == null ? -1 : tipo.intValue();
PlanoActuacao planoActuacao = getSessionBean1().getPlanoActuacao();
Integer fase = planoActuacao.getFase();
result = fase.equals( Global.FASE_CONCLUIDO ) && ( tipoUser == Global.TECNICO_HS || tipoUser == Global.DIRECTOR_SIPRP ) ?
Global.FASE_SIPRP_CONCLUSAO : fase.intValue();
return result;
}
public String butGravarPlano_action()
{
String page = null;
@ -1534,7 +1574,7 @@ public class EditarPlano extends AbstractPageBean
Risco r = valores.get( id );
pdp.updateRisco( r );
if ( fase == Global.FASE_SIPRP_CONCLUSAO )
if ( getFasePlano() == Global.FASE_SIPRP_CONCLUSAO )
{
pdp.updateMedidas( r );
}
@ -1608,6 +1648,7 @@ public class EditarPlano extends AbstractPageBean
p.setValidacao_hs( new Boolean( true ) );
}
}
break;
}
try
@ -1627,7 +1668,9 @@ public class EditarPlano extends AbstractPageBean
PlanosDataProvider pdp = PlanosDataProvider.getInstance();
pdp.updateRisco( r );
if ( fase == Global.FASE_SIPRP_CONCLUSAO )
// if ( fase == Global.FASE_SIPRP_CONCLUSAO )
if ( getFasePlano() == Global.FASE_SIPRP_CONCLUSAO )
{
pdp.updateMedidas( r );
}
@ -1783,8 +1826,7 @@ public class EditarPlano extends AbstractPageBean
}
}
PlanoActuacao planoActual = getSessionBean1().getPlanoActuacao();
if ( planoActual.getFase().intValue() == Global.FASE_SIPRP_CONCLUSAO )
if ( getFasePlano() == Global.FASE_SIPRP_CONCLUSAO )
{
for ( Medida m : r.getMedidas() )
{

50
trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
Unescape View File

@ -132,6 +132,8 @@ public class ListaPlanos extends AbstractPageBean
{
this.buttonDesactivar = b;
}
private TableColumn tableColumn56 = new TableColumn();
public TableColumn getTableColumn56()
@ -154,6 +156,34 @@ public class ListaPlanos extends AbstractPageBean
{
this.buttonDesactivarSeguimento = b;
}
private TableColumn tableColumnConcluidos6 = new TableColumn();
public TableColumn getTableColumnConcluidos6()
{
return tableColumnConcluidos6;
}
public void setTableColumnConcluidos6( TableColumn c )
{
this.tableColumnConcluidos6 = c;
}
private Button buttonPreencherVerificacao = new Button();
public Button getButtonPreencherVerificacao()
{
return buttonPreencherVerificacao;
}
public void setButtonPreencherVerificacao( Button buttonPreencherVerificacao )
{
this.buttonPreencherVerificacao = buttonPreencherVerificacao;
}
private HtmlPanelGrid gridPanelFilterActual = new HtmlPanelGrid();
public HtmlPanelGrid getGridPanelFilterActual()
@ -472,6 +502,7 @@ public class ListaPlanos extends AbstractPageBean
String estab_gestor = JSFUtils.getRequestParameter( fc, "estab_gestor" );
boolean renderOrNot = false;
boolean renderPreencherVerificacao = false;
if ( u != null )
{
@ -509,6 +540,7 @@ public class ListaPlanos extends AbstractPageBean
{
int uType = u.getTipo();
renderOrNot = uType == Global.DIRECTOR_SIPRP || uType == Global.TECNICO_HS;
renderPreencherVerificacao = uType == Global.DIRECTOR_SIPRP || uType == Global.TECNICO_HS;
}
initialize();
@ -522,6 +554,9 @@ public class ListaPlanos extends AbstractPageBean
buttonDesactivar.setRendered( renderOrNot );
tableColumn56.setRendered( renderOrNot );
buttonDesactivarSeguimento.setRendered( renderOrNot );
tableColumnConcluidos6.setRendered( renderPreencherVerificacao);
buttonPreencherVerificacao.setRendered( renderPreencherVerificacao);
}
/**
@ -592,6 +627,15 @@ public class ListaPlanos extends AbstractPageBean
return null;
}
public String goPreencherVerificacao_action()
{
PlanoActuacao p = getTableConcluidosRowData();
getSessionBean1().setPlanoActuacao( p );
// getSessionBean1().setFase( Global.FASE_SIPRP_CONCLUSAO );
return "editar_plano";
}
private void desactivarPlano( PlanoActuacao p )
{
Utilizador currentUser = getSessionBean1().getCurrentUser();
@ -614,15 +658,9 @@ public class ListaPlanos extends AbstractPageBean
public String goEditarPlano_action()
{
// TODO: Process the action. Return value is a navigation
// case name where null will return to the same page.
PlanoActuacao p = getTableActivosRowData();
getSessionBean1().setPlanoActuacao( p );
//showPlano(p);
//dummy
//getSessionBean1().setFase(2);
return "editar_plano";
}

2
trunk/PlanosActuacao/web/EditarPlano.jsp
Unescape View File

@ -207,7 +207,7 @@
<h:panelGrid binding="#{EditarPlano.gridValidar2}" columnClasses="gridColLeft" columns="1" id="gridValidar2" style="height: 24px; width: 100%">
<h:panelGrid binding="#{EditarPlano.gridObservacoes}" columnClasses="gridColLeft" columns="1" id="gridObservacoes" style="height: 24px; width: 100%"/>
<webuijsf:panelGroup id="groupPanel3">
<webuijsf:staticText id="staticText2" styleClass="label" text="Validar processo:"/>
<webuijsf:staticText binding="#{EditarPlano.labelCheckValidacao}" id="staticText2" styleClass="label" text="Validar processo:"/>
<webuijsf:checkbox binding="#{EditarPlano.chkValidacao}" id="chkValidacao" onClick="show(this)" valueChangeListenerExpression="#{EditarPlano.chkValidacao_processValueChange}"/>
</webuijsf:panelGroup>
</h:panelGrid>

4
trunk/PlanosActuacao/web/ListaPlanos.jsp
Unescape View File

@ -227,6 +227,10 @@
<webuijsf:tableColumn headerText="Loja" id="tableColumn15" sort="nome_estabelecimento">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromConcluidos_action}" id="hyperlink10" text="#{currentRow.value['nome_estabelecimento']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="" id="tableColumnConcluidos6" binding="#{ListaPlanos.tableColumnConcluidos6}">
<webuijsf:button id="btnPreencherVerificacao" text="Preencher Verificação"
actionExpression="#{ListaPlanos.goPreencherVerificacao_action}" binding="#{ListaPlanos.buttonPreencherVerificacao}" />
</webuijsf:tableColumn>
</webuijsf:tableRowGroup>
</webuijsf:table>
</webuijsf:form>

Write Preview
Loading…
Cancel
Save