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@1610 bb69d46d-e84e-40c8-a05a-06db0d633741

Browse Source
0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Diogo Neves 15 years ago
parent 9a33c137b9
commit ac69a62b01
6 changed files with 457 additions and 512 deletions
Show Stats Download Patch File Download Diff File

69
trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java
Unescape View File

@ -30,13 +30,9 @@ import global.Global;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.Statement; import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import utils.Utils; import utils.Utils;
@ -153,7 +149,6 @@ public class PlanosDataProvider extends GenericDataProvider
r.setVerificacao_siprp(""); r.setVerificacao_siprp("");
} }
Expression where = new Field( "id" ).isEqual( r.getId() ); Expression where = new Field( "id" ).isEqual( r.getId() );
Update upd = new Update( PlanoRiscosData.TABLENAME, new Assignment[] Update upd = new Update( PlanoRiscosData.TABLENAME, new Assignment[]
@ -222,8 +217,6 @@ public class PlanosDataProvider extends GenericDataProvider
return "SELECT * FROM " + tables + " WHERE " + whereExpression; return "SELECT * FROM " + tables + " WHERE " + whereExpression;
} }
private String getFaseActivos( Utilizador u ) private String getFaseActivos( Utilizador u )
{ {
String sql = ""; String sql = "";
@ -636,4 +629,66 @@ public class PlanosDataProvider extends GenericDataProvider
} }
return list; return list;
} }
private boolean isEmpty( String str )
{
return str == null || "".equals( str.trim() );
}
public boolean isRiscoTratado( Risco risco, Utilizador user )
{
boolean isTratado = false;
if ( risco != null && user != null )
{
int userType = user.getTipo() == null ? -1 : user.getTipo().intValue();
switch ( userType )
{
case Global.RESPONSAVEL_SEGURANCA :
{
String resp = risco.getResponsavel_execucao();
String por = risco.getPor();
String rec = risco.getRecursos_necessarios();
Date dataInicio = risco.getData_inicio();
Date dataFim = risco.getData_fim();
isTratado = ! isEmpty( resp ) && ! isEmpty( por ) && ! isEmpty( rec ) && dataInicio != null && dataFim != null;
break;
}
case Global.DIRECTOR_LOJA :
{
String parecer = risco.getParecer_dl();
isTratado = ! isEmpty( parecer );
break;
}
case Global.DIRECTOR_NACIONAL_SEGURANCA :
{
String parecer = risco.getParecer_dns();
isTratado = ! isEmpty( parecer );
break;
}
case Global.TECNICO_HS :
{
String verify = risco.getVerificacao_siprp();
isTratado = ! isEmpty( verify );
List< Medida > medidas = risco.getMedidas();
for ( int i = 0; i < medidas.size() && isTratado; i++ )
{
Medida m = medidas.get( i );
Integer estadoMedida = m.getValidarMedidaId();
isTratado &= estadoMedida != null;
}
break;
}
}
}
return isTratado;
}
} }

8
trunk/PlanosActuacao/src/java/global/Global.java
Unescape View File

@ -9,7 +9,8 @@ package global;
* *
* @author lluis * @author lluis
*/ */
public class Global { public class Global
{
//tipos utilizadores //tipos utilizadores
public static final int RESPONSAVEL_SEGURANCA = 1; public static final int RESPONSAVEL_SEGURANCA = 1;
@ -52,4 +53,9 @@ public class Global {
public static final String LOGOS_FOLDER = "/resources/images"; public static final String LOGOS_FOLDER = "/resources/images";
public static final String PDF_FOLDER_URL = "/resources/pdf"; public static final String PDF_FOLDER_URL = "/resources/pdf";
public static final int ESTADO_MEDIDA_IMPLEMENTADA = 1;
public static final int ESTADO_MEDIDA_NAO_IMPLEMENTADA = 2;
public static final int ESTADO_MEDIDA_EM_IMPLEMENTACAO = 3;
} }

64
trunk/PlanosActuacao/src/java/pagination/Pagination.java
Unescape View File

@ -5,8 +5,11 @@
package pagination; package pagination;
import com.evolute.utils.error.ErrorLogger;
import db.entidades.PlanoActuacao; import db.entidades.PlanoActuacao;
import db.entidades.Risco; import db.entidades.Risco;
import db.entidades.Utilizador;
import db.providers.PlanosDataProvider;
import java.io.Serializable; import java.io.Serializable;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
@ -19,8 +22,12 @@ import planosactuacao.SessionBean1.PAGINATION_ENUM;
*/ */
public abstract class Pagination implements Serializable public abstract class Pagination implements Serializable
{ {
private static final String COLOR_TRATADO = "#0000FF";
private static final String COLOR_NAO_TRATADO = "#FF0000";
private final PAGINATION_ENUM pagination; private final PAGINATION_ENUM pagination;
private final PlanoActuacao planoActuacao; private final PlanoActuacao planoActuacao;
private final Utilizador user;
private List< Risco > riscos = new LinkedList< Risco >(); private List< Risco > riscos = new LinkedList< Risco >();
private List< Pagina > pages = new LinkedList< Pagina >(); private List< Pagina > pages = new LinkedList< Pagina >();
@ -28,10 +35,11 @@ public abstract class Pagination implements Serializable
private int currentPageNumber = 1; private int currentPageNumber = 1;
public Pagination( PAGINATION_ENUM pagination, PlanoActuacao p ) public Pagination( PAGINATION_ENUM pagination, PlanoActuacao p, Utilizador user )
{ {
this.pagination = pagination; this.pagination = pagination;
this.planoActuacao = p; this.planoActuacao = p;
this.user = user;
setup(); setup();
} }
@ -94,8 +102,15 @@ public abstract class Pagination implements Serializable
page.setId( "valor" + risco.getId() ); page.setId( "valor" + risco.getId() );
page.setPageNumber( pageNumber ); page.setPageNumber( pageNumber );
page.setText( pageNumber ); page.setText( pageNumber );
setColor( page, risco, riscoActual );
setDisabled( page, risco, riscoActual ); if ( isCurrentPage( page, risco, riscoActual ) )
{
setDisabled( page );
}
else
{
setColor( page, risco );
}
addPage( page ); addPage( page );
pageNumber++; pageNumber++;
@ -113,40 +128,43 @@ public abstract class Pagination implements Serializable
return pages; return pages;
} }
private void setColor( Pagina page, Risco risco, Risco riscoActual ) private boolean isCurrentPage( Pagina page, Risco risco, Risco riscoActual )
{ {
if ( page.getPageNumber() != getCurrentPageNumber() ) return ( page.getPageNumber() == getCurrentPageNumber() ) && ( ( riscoActual.getIsPatrimonial() && risco.getIsPatrimonial() && getPagination().equals( PAGINATION_ENUM.PATRIMONIAIS ) )
|| ( ! riscoActual.getIsPatrimonial() && ! risco.getIsPatrimonial() && getPagination().equals( PAGINATION_ENUM.NORMAL ) ) );
}
private void setColor( Pagina page, Risco risco )
{ {
String color = getColor( risco ); String color = getColor( risco );
if ( color != null ) if ( color != null )
{ {
page.setStyle( "color: " + color + ";" ); String style = page.getStyle();
} style = (style == null ? "" : style) + "; color: " + color + ";";
page.setStyle( style );
} }
} }
private void setDisabled( Pagina page, Risco risco, Risco riscoActual ) private void setDisabled( Pagina page )
{
if ( page.getPageNumber() == getCurrentPageNumber() )
{
if ( ( riscoActual.getIsPatrimonial() && risco.getIsPatrimonial() && getPagination().equals( PAGINATION_ENUM.PATRIMONIAIS ) )
|| ( ! riscoActual.getIsPatrimonial() && ! risco.getIsPatrimonial() && getPagination().equals( PAGINATION_ENUM.NORMAL ) ) )
{ {
page.setStyle( "background: #FFFFFF; border: 1px solid #000000; padding-left: 5px; padding-right: 5px;" ); String style = page.getStyle();
style = ( style == null ? "" : style ) + "background: #FFFFFF; border: 1px solid #000000; padding-left: 5px; padding-right: 5px;";
page.setStyle( style );
page.setDisabled( true ); page.setDisabled( true );
} }
}
}
private String getColor( Risco risco ) private String getColor( Risco risco )
{ {
String result = null; String result = null;
// try
// TODO : return appropriate color for this risco // {
// azul : actual // boolean isRiscoTratado = PlanosDataProvider.getInstance().isRiscoTratado( risco, user );
// verde : preenchido // result = isRiscoTratado ? COLOR_TRATADO : COLOR_NAO_TRATADO;
// amarelo : por preencher // }
// catch ( Exception e )
// {
// ErrorLogger.logException( e );
// }
return result; return result;
} }
@ -183,7 +201,7 @@ public abstract class Pagination implements Serializable
public int getTotalPages() public int getTotalPages()
{ {
return pages == null ? 0 : pages.size(); return pages == null ? 0 : pages.size() - 1;
} }
public int getCurrentPageNumber() public int getCurrentPageNumber()

5
trunk/PlanosActuacao/src/java/pagination/PaginationNormais.java
Unescape View File

@ -8,6 +8,7 @@ package pagination;
import db.entidades.Area; import db.entidades.Area;
import db.entidades.PlanoActuacao; import db.entidades.PlanoActuacao;
import db.entidades.Risco; import db.entidades.Risco;
import db.entidades.Utilizador;
import planosactuacao.SessionBean1.PAGINATION_ENUM; import planosactuacao.SessionBean1.PAGINATION_ENUM;
/** /**
@ -16,9 +17,9 @@ import planosactuacao.SessionBean1.PAGINATION_ENUM;
*/ */
public class PaginationNormais extends Pagination public class PaginationNormais extends Pagination
{ {
public PaginationNormais( PlanoActuacao plano ) public PaginationNormais( PlanoActuacao plano, Utilizador user )
{ {
super( PAGINATION_ENUM.NORMAL, plano ); super( PAGINATION_ENUM.NORMAL, plano, user );
} }
@Override @Override

5
trunk/PlanosActuacao/src/java/pagination/PaginationPatrimoniais.java
Unescape View File

@ -8,6 +8,7 @@ package pagination;
import db.entidades.Area; import db.entidades.Area;
import db.entidades.PlanoActuacao; import db.entidades.PlanoActuacao;
import db.entidades.Risco; import db.entidades.Risco;
import db.entidades.Utilizador;
import planosactuacao.SessionBean1.PAGINATION_ENUM; import planosactuacao.SessionBean1.PAGINATION_ENUM;
/** /**
@ -16,9 +17,9 @@ import planosactuacao.SessionBean1.PAGINATION_ENUM;
*/ */
public class PaginationPatrimoniais extends Pagination public class PaginationPatrimoniais extends Pagination
{ {
public PaginationPatrimoniais( PlanoActuacao plano ) public PaginationPatrimoniais( PlanoActuacao plano, Utilizador user )
{ {
super( PAGINATION_ENUM.PATRIMONIAIS, plano ); super( PAGINATION_ENUM.PATRIMONIAIS, plano, user );
} }
@Override @Override

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

@ -317,7 +317,8 @@ public class EditarPlano extends AbstractPageBean
* property values that were saved for this view when it was rendered.</p> * property values that were saved for this view when it was rendered.</p>
*/ */
@Override @Override
public void init() { public void init()
{
// Perform initializations inherited from our superclass // Perform initializations inherited from our superclass
super.init(); super.init();
// Perform application initialization that must complete // Perform application initialization that must complete
@ -327,9 +328,12 @@ public class EditarPlano extends AbstractPageBean
// <editor-fold defaultstate="collapsed" desc="Managed Component Initialization"> // <editor-fold defaultstate="collapsed" desc="Managed Component Initialization">
// Initialize automatically managed components // Initialize automatically managed components
// *Note* - this logic should NOT be modified // *Note* - this logic should NOT be modified
try { try
{
_init(); _init();
} catch (Exception e) { }
catch ( Exception e )
{
ErrorLogger.logException( e ); ErrorLogger.logException( e );
log("PlanoActuacao Initialization Failure", e); log("PlanoActuacao Initialization Failure", e);
throw e instanceof FacesException ? (FacesException) e: new FacesException(e); throw e instanceof FacesException ? (FacesException) e: new FacesException(e);
@ -355,7 +359,9 @@ public class EditarPlano extends AbstractPageBean
* resources that will be required in your event handlers.</p> * resources that will be required in your event handlers.</p>
*/ */
@Override @Override
public void preprocess() { public void preprocess()
{
} }
/** /**
@ -399,20 +405,16 @@ public class EditarPlano extends AbstractPageBean
} }
else else
{ {
// gridParecer.setStyleClass("hidden");
butEnviarCorrecao.setDisabled( false ); butEnviarCorrecao.setDisabled( false );
butEnviar.setDisabled( true ); butEnviar.setDisabled( true );
} }
} }
} }
if ( gridPagination.getChildCount() > 0 ) if ( gridPagination.getChildCount() > 0 )
{ {
gridPagination.getChildren().clear(); gridPagination.getChildren().clear();
} }
setPagination( PAGINATION_ENUM.NORMAL ); setPagination( PAGINATION_ENUM.NORMAL );
setPagination( PAGINATION_ENUM.PATRIMONIAIS ); setPagination( PAGINATION_ENUM.PATRIMONIAIS );
@ -459,11 +461,13 @@ public class EditarPlano extends AbstractPageBean
* *
* @return reference to the scoped data bean * @return reference to the scoped data bean
*/ */
protected ApplicationBean1 getApplicationBean1() { protected ApplicationBean1 getApplicationBean1()
{
return (ApplicationBean1) getBean("ApplicationBean1"); return (ApplicationBean1) getBean("ApplicationBean1");
} }
public String hyperlink1_action() { public String hyperlink1_action()
{
// TODO: Process the action. Return value is a navigation // TODO: Process the action. Return value is a navigation
// case name where null will return to the same page. // case name where null will return to the same page.
return "lista_planos"; return "lista_planos";
@ -471,15 +475,13 @@ public class EditarPlano extends AbstractPageBean
private void initialize( PlanoActuacao p ) private void initialize( PlanoActuacao p )
{ {
Pagination paginationNormal = new PaginationNormais( p ); Utilizador u = getSessionBean1().getCurrentUser();
Pagination paginationPatrimoniais = new PaginationPatrimoniais( p );
Pagination paginationNormal = new PaginationNormais( p, u );
Pagination paginationPatrimoniais = new PaginationPatrimoniais( p, u );
getSessionBean1().addPagination( PAGINATION_ENUM.NORMAL, paginationNormal ); getSessionBean1().addPagination( PAGINATION_ENUM.NORMAL, paginationNormal );
getSessionBean1().addPagination( PAGINATION_ENUM.PATRIMONIAIS, paginationPatrimoniais ); getSessionBean1().addPagination( PAGINATION_ENUM.PATRIMONIAIS, paginationPatrimoniais );
// Pagination pagination = new Pagination( p );
// getSessionBean1().setPagination( pagination );
Utilizador u = getSessionBean1().getCurrentUser();
if ( u.getTipo().intValue() == Global.DIRECTOR_NACIONAL_SEGURANCA ) if ( u.getTipo().intValue() == Global.DIRECTOR_NACIONAL_SEGURANCA )
{ {
hidValidacao.setValue( "dns" ); hidValidacao.setValue( "dns" );
@ -493,32 +495,19 @@ public class EditarPlano extends AbstractPageBean
hidValidacao.setValue( "hs" ); hidValidacao.setValue( "hs" );
} }
//gridValidar.setStyleClass("hidden");
if ( u.getTipo().intValue() != Global.DIRECTOR_LOJA && u.getTipo().intValue() != Global.DIRECTOR_NACIONAL_SEGURANCA && u.getTipo().intValue() != Global.TECNICO_HS ) if ( u.getTipo().intValue() != Global.DIRECTOR_LOJA && u.getTipo().intValue() != Global.DIRECTOR_NACIONAL_SEGURANCA && u.getTipo().intValue() != Global.TECNICO_HS )
{ {
//gridValidar.setStyleClass("visible");
gridValidar.setRendered( false ); gridValidar.setRendered( false );
//txtParecer.setStyleClass("hidden");
}
else
{
//txtParecer.setRendered(false);
if(u.getTipo().intValue() == Global.DIRECTOR_NACIONAL_SEGURANCA)
{
// gridParecer.setStyleClass("");
}
else if(u.getTipo().intValue() == Global.DIRECTOR_LOJA || u.getTipo().intValue() == Global.TECNICO_HS)
{
// gridParecer.setStyleClass("hidden");
}
} }
// else // else
// { // {
// if(u.getTipo().intValue() != Global.DIRECTOR_NACIONAL_SEGURANCA) // if ( u.getTipo().intValue() == Global.DIRECTOR_NACIONAL_SEGURANCA )
// { // {
// //txtParecer.setStyleClass("visible"); //
// txtParecer.setRendered(false); // }
// else if ( u.getTipo().intValue() == Global.DIRECTOR_LOJA || u.getTipo().intValue() == Global.TECNICO_HS )
// {
//
// } // }
// } // }
@ -544,7 +533,6 @@ public class EditarPlano extends AbstractPageBean
} }
} }
if ( p.getObservacoes_dns() != null ) if ( p.getObservacoes_dns() != null )
{ {
if ( p.getObservacoes_dns().trim().length() > 0 ) if ( p.getObservacoes_dns().trim().length() > 0 )
@ -563,8 +551,6 @@ public class EditarPlano extends AbstractPageBean
} }
} }
if ( p.getCorrecao().matches( "n" ) ) if ( p.getCorrecao().matches( "n" ) )
{ {
butEnviar.setText( "Enviar a Director de Loja>>" ); butEnviar.setText( "Enviar a Director de Loja>>" );
@ -614,42 +600,27 @@ public class EditarPlano extends AbstractPageBean
st.setEscape( false ); st.setEscape( false );
st.setText( p.getObservacoes_dns() ); st.setText( p.getObservacoes_dns() );
pg.getChildren().add( st ); pg.getChildren().add( st );
} }
} }
if ( p.getValidacao_director_loja().booleanValue() == true ) if ( p.getValidacao_director_loja().booleanValue() == true )
{ {
chkValidacao.setSelected( new Boolean( true ) ); chkValidacao.setSelected( new Boolean( true ) );
// gridParecer.setStyleClass("");
butEnviarCorrecao.setDisabled( true ); butEnviarCorrecao.setDisabled( true );
butEnviar.setDisabled( false ); butEnviar.setDisabled( false );
} }
else else
{ {
// gridParecer.setStyleClass("hidden");
butEnviarCorrecao.setDisabled( false ); butEnviarCorrecao.setDisabled( false );
butEnviar.setDisabled( true ); butEnviar.setDisabled( true );
} }
butEnviar.setText( "Enviar a Director Nacional Segurança>>" ); butEnviar.setText( "Enviar a Director Nacional Segurança>>" );
// if(p.getValidacao_director_loja().booleanValue() == true)
// {
// chkValidacao.setSelected(new Boolean(true));
// butEnviar.setText("Enviar a Director Nacional Segurança>>");
// }
// else
// {
// butEnviar.setText("Enviar para Responsável de Segurança>>");
// }
if ( p.getCorrecao().matches( "y" ) ) if ( p.getCorrecao().matches( "y" ) )
{ {
butEnviar.setText( "Enviar a Director Nacional Segurança>>" ); butEnviar.setText( "Enviar a Director Nacional Segurança>>" );
} }
// else
// {
// butEnviar.setText("Enviar a Director Nacional Segurança>>");
// }
break; break;
case Global.FASE_DNS_PARECER: case Global.FASE_DNS_PARECER:
@ -672,7 +643,6 @@ public class EditarPlano extends AbstractPageBean
} }
} }
pg = new PanelGroup(); pg = new PanelGroup();
pg.setId( "pgObsDns" ); pg.setId( "pgObsDns" );
gridObservacoes.getChildren().add( pg ); gridObservacoes.getChildren().add( pg );
@ -689,23 +659,15 @@ public class EditarPlano extends AbstractPageBean
if ( p.getValidacao_dns().booleanValue() == true ) if ( p.getValidacao_dns().booleanValue() == true )
{ {
chkValidacao.setSelected( new Boolean( true ) ); chkValidacao.setSelected( new Boolean( true ) );
// gridParecer.setStyleClass("");
butEnviarCorrecao.setDisabled( true ); butEnviarCorrecao.setDisabled( true );
butEnviar.setDisabled( false ); butEnviar.setDisabled( false );
} }
else else
{ {
// gridParecer.setStyleClass("hidden");
butEnviarCorrecao.setDisabled( false ); butEnviarCorrecao.setDisabled( false );
butEnviar.setDisabled( true ); butEnviar.setDisabled( true );
} }
// com.sun.webui.jsf.model.Option[] listOptions = new com.sun.webui.jsf.model.Option[2];
//
// listOptions[0] = new Option(new Integer(Global.FASE_SEGURANCA_PREENCHIMENTO), "Responsável de segurança");
// listOptions[1] = new Option(new Integer(Global.FASE_DIR_LOJA_VALIDACAO), "Director de loja");
// drpIrPara.setItems(listOptions);
// drpIrPara.setSelected(new Integer( Global.FASE_SEGURANCA_PREENCHIMENTO ));
butEnviar.setText( "Enviar para Técnico de HS>>" ); butEnviar.setText( "Enviar para Técnico de HS>>" );
break; break;
@ -747,21 +709,6 @@ public class EditarPlano extends AbstractPageBean
} }
} }
// pg = new PanelGroup();
// pg.setId("pgVerSiprp");
// gridObservacoes.getChildren().add(pg);
// st = new StaticText();
// st.setEscape(false);
// st.setStyleClass("label");
// st.setText("Verifica&ccedil;&atilde;o SIPRP: ");
// pg.getChildren().add(st);
// TextArea txtVerificacaoSiprp = new TextArea();
// txtVerificacaoSiprp.setId("txtVerificacaoSiprp");
// txtVerificacaoSiprp.setColumns(200);
// txtVerificacaoSiprp.setText(p.getVerificacao_siprp());
// pg.getChildren().add(txtVerificacaoSiprp);
if ( p.getValidacao_hs().booleanValue() == true ) if ( p.getValidacao_hs().booleanValue() == true )
{ {
chkValidacao.setSelected( new Boolean( true ) ); chkValidacao.setSelected( new Boolean( true ) );
@ -776,20 +723,11 @@ public class EditarPlano extends AbstractPageBean
} }
chkDesactivar.setSelected( Boolean.FALSE ); chkDesactivar.setSelected( Boolean.FALSE );
// gridPlano.setId("gridPlano");
// gridPlano.setWidth("100%");
// gridPlano.setColumns(1);
// gridPlano.setColumnClasses("gridColCenter");
//plano
//lblTop.setText("Plano de actua&ccedil;&atilde;o da auditoria " + p.getData_visita_str());
gridLayout.getChildren().add( gridPlano ); gridLayout.getChildren().add( gridPlano );
} }
private void showPlano( PlanoActuacao p ) private void showPlano( PlanoActuacao p )
{ {
//stNomeEmpresa.setText(p.getNome_empresa());
gridArea = new HtmlPanelGrid(); gridArea = new HtmlPanelGrid();
gridArea.setId( "gridArea" ); gridArea.setId( "gridArea" );
gridArea.setColumns( 1 ); gridArea.setColumns( 1 );
@ -807,15 +745,8 @@ public class EditarPlano extends AbstractPageBean
{ {
Risco r = a.getRiscos().get( 0 ); Risco r = a.getRiscos().get( 0 );
showRisco( r ); showRisco( r );
//showValores(r);
////if(r.getValores().size() > 0)
////{
// showValor(r.getValores().get(0));
showValor( r ); showValor( r );
// showResponsavel(r.getValores().get(0));
showResponsavel( r ); showResponsavel( r );
////}
} }
} }
showPreviousValidacoes( p ); showPreviousValidacoes( p );
@ -858,22 +789,17 @@ public class EditarPlano extends AbstractPageBean
HtmlPanelGrid grd = new HtmlPanelGrid(); HtmlPanelGrid grd = new HtmlPanelGrid();
grd.setColumns( 1 ); grd.setColumns( 1 );
grd.setWidth( "100%" ); grd.setWidth( "100%" );
//grd.setStyleClass("centerBlock");
// gridArea.getChildren().add(grd);
gridRisco = new HtmlPanelGrid(); gridRisco = new HtmlPanelGrid();
//gridRisco.setStyleClass("centerBlock");
gridRisco.setWidth( "98%" ); gridRisco.setWidth( "98%" );
gridRisco.setColumns( 1 ); gridRisco.setColumns( 1 );
gridRisco.setColumnClasses( "gridColLeft" ); gridRisco.setColumnClasses( "gridColLeft" );
//grd.getChildren().add(gridRisco);
gridArea.getChildren().add( gridRisco ); gridArea.getChildren().add( gridRisco );
pg = new PanelGroup(); pg = new PanelGroup();
st = new StaticText(); st = new StaticText();
st.setEscape( false ); st.setEscape( false );
st.setStyleClass( "label" ); st.setStyleClass( "label" );
// st.setText( "Risco:&nbsp;" );
st.setText( riscoText ); st.setText( riscoText );
pg.getChildren().add( st ); pg.getChildren().add( st );
st = new StaticText(); st = new StaticText();
@ -893,16 +819,12 @@ public class EditarPlano extends AbstractPageBean
grd.setColumns(1); grd.setColumns(1);
grd.setColumnClasses("gridColLeft"); grd.setColumnClasses("gridColLeft");
grd.setWidth("100%"); grd.setWidth("100%");
//grd.setStyleClass("centerBlock");
////gridRisco.getChildren().add(grd);
gridValor = new HtmlPanelGrid(); gridValor = new HtmlPanelGrid();
gridRisco.getChildren().add(gridValor); gridRisco.getChildren().add(gridValor);
//gridValor.setStyleClass("centerBlock");
gridValor.setWidth("100%"); gridValor.setWidth("100%");
gridValor.setColumns(1); gridValor.setColumns(1);
gridValor.setColumnClasses("gridColLeft"); gridValor.setColumnClasses("gridColLeft");
//grd.getChildren().add(gridValor);
pg = new PanelGroup(); pg = new PanelGroup();
st = new StaticText(); st = new StaticText();
st.setEscape(false); st.setEscape(false);
@ -919,26 +841,20 @@ public class EditarPlano extends AbstractPageBean
} }
} }
// private void showValor(Valor v)
private void showValor(Risco r) private void showValor(Risco r)
{ {
//Valor v = r.getValores().get(0);
// getSessionBean1().setCurrentValor(v);
getSessionBean1().setCurrentRisco(r); getSessionBean1().setCurrentRisco(r);
HtmlPanelGrid grd = new HtmlPanelGrid(); HtmlPanelGrid grd = new HtmlPanelGrid();
grd.setColumns(1); grd.setColumns(1);
grd.setColumnClasses("gridColLeft"); grd.setColumnClasses("gridColLeft");
grd.setWidth("100%"); grd.setWidth("100%");
//grd.setStyleClass("centerBlock");
////gridRisco.getChildren().add(grd);
gridValor = new HtmlPanelGrid(); gridValor = new HtmlPanelGrid();
gridRisco.getChildren().add(gridValor); gridRisco.getChildren().add(gridValor);
//gridValor.setStyleClass("centerBlock");
gridValor.setWidth("100%"); gridValor.setWidth("100%");
gridValor.setColumns(1); gridValor.setColumns(1);
gridValor.setColumnClasses("gridColLeft"); gridValor.setColumnClasses("gridColLeft");
//grd.getChildren().add(gridValor);
pg = new PanelGroup(); pg = new PanelGroup();
st = new StaticText(); st = new StaticText();
st.setEscape(false); st.setEscape(false);
@ -965,7 +881,6 @@ public class EditarPlano extends AbstractPageBean
private void showMedidas( Risco r ) private void showMedidas( Risco r )
{ {
List< Medida > medidas = r.getMedidas(); List< Medida > medidas = r.getMedidas();
for ( Medida m : medidas ) for ( Medida m : medidas )
{ {
HtmlPanelGrid grd = new HtmlPanelGrid(); HtmlPanelGrid grd = new HtmlPanelGrid();
@ -1048,7 +963,6 @@ public class EditarPlano extends AbstractPageBean
private void showPostos( Medida m ) private void showPostos( Medida m )
{ {
List< PostoTrabalho > postos = m.getPostos(); List< PostoTrabalho > postos = m.getPostos();
for ( PostoTrabalho p : postos ) for ( PostoTrabalho p : postos )
{ {
HtmlPanelGrid grd = new HtmlPanelGrid(); HtmlPanelGrid grd = new HtmlPanelGrid();
@ -1074,14 +988,13 @@ public class EditarPlano extends AbstractPageBean
st.setText(p.getDescricao()); st.setText(p.getDescricao());
pg.getChildren().add( st ); pg.getChildren().add( st );
gridPosto.getChildren().add( pg ); gridPosto.getChildren().add( pg );
} }
} }
// private void showResponsavel(Valor v)
private void showResponsavel( Risco r ) private void showResponsavel( Risco r )
{ {
System.out.println( "RISCO : " + r.getDescricao() + " RESPONSAVEL : " + r.getResponsavel_execucao() ); System.out.println( "RISCO : " + r.getDescricao() + " RESPONSAVEL : " + r.getResponsavel_execucao() );
Utilizador u = getSessionBean1().getCurrentUser(); Utilizador u = getSessionBean1().getCurrentUser();
gridResponsavel = new HtmlPanelGrid(); gridResponsavel = new HtmlPanelGrid();
gridResponsavel.setId( "gridResponsavel" ); gridResponsavel.setId( "gridResponsavel" );
@ -1140,9 +1053,6 @@ public class EditarPlano extends AbstractPageBean
pg.getChildren().add( st ); pg.getChildren().add( st );
} }
gridResponsavel.getChildren().add( pg ); gridResponsavel.getChildren().add( pg );
pg = new PanelGroup(); pg = new PanelGroup();
st = new StaticText(); st = new StaticText();
@ -1164,13 +1074,9 @@ public class EditarPlano extends AbstractPageBean
st = new StaticText(); st = new StaticText();
st.setEscape( false ); st.setEscape( false );
st.setText( r.getRecursos_necessarios() ); st.setText( r.getRecursos_necessarios() );
//gridResponsavel.getChildren().add(st);
pg.getChildren().add( st ); pg.getChildren().add( st );
} }
// Anchor ancora = new Anchor();
// ancora.setId("calendario");
// gridResponsavel.getChildren().add(ancora);
HtmlPanelGrid grd = new HtmlPanelGrid(); HtmlPanelGrid grd = new HtmlPanelGrid();
grd.setColumns(2); grd.setColumns(2);
grd.setColumnClasses( "gridCol15, gridCol85" ); grd.setColumnClasses( "gridCol15, gridCol85" );
@ -1208,7 +1114,6 @@ public class EditarPlano extends AbstractPageBean
gridResponsavel.getChildren().add( grd ); gridResponsavel.getChildren().add( grd );
grd = new HtmlPanelGrid(); grd = new HtmlPanelGrid();
grd.setColumns( 2 ); grd.setColumns( 2 );
grd.setColumnClasses( "gridCol15, gridCol85" ); grd.setColumnClasses( "gridCol15, gridCol85" );
@ -1259,22 +1164,10 @@ public class EditarPlano extends AbstractPageBean
pg.getChildren().add( st ); pg.getChildren().add( st );
gridResponsavel.getChildren().add( pg ); gridResponsavel.getChildren().add( pg );
// if(u.getTipo().intValue() == Global.DIRECTOR_LOJA)
// {
// txtParecerDl = new TextArea();
// txtParecerDl.setId("txtParecerDl");
// txtParecerDl.setColumns(200);
// txtParecerDl.setText(v.getParecer_dl());
// gridResponsavel.getChildren().add(txtParecerDl);
// }
// else
// {
st = new StaticText(); st = new StaticText();
st.setEscape( false ); st.setEscape( false );
st.setText( r.getParecer_dl() ); st.setText( r.getParecer_dl() );
//gridResponsavel.getChildren().add(st);
pg.getChildren().add( st ); pg.getChildren().add( st );
// }
} }
} }
} }
@ -1296,7 +1189,6 @@ public class EditarPlano extends AbstractPageBean
} }
if(u.getTipo().intValue() != Global.DIRECTOR_NACIONAL_SEGURANCA) if(u.getTipo().intValue() != Global.DIRECTOR_NACIONAL_SEGURANCA)
{ {
if(r.getParecer_dns() != null) if(r.getParecer_dns() != null)
@ -1311,25 +1203,12 @@ public class EditarPlano extends AbstractPageBean
pg.getChildren().add( st ); pg.getChildren().add( st );
gridResponsavel.getChildren().add( pg ); gridResponsavel.getChildren().add( pg );
// if(u.getTipo().intValue() == Global.DIRECTOR_NACIONAL_SEGURANCA)
// {
// txtParecerDns = new TextArea();
// txtParecerDns.setId("txtParecerDns");
// txtParecerDns.setColumns(200);
// txtParecerDns.setText(v.getParecer_dns());
// gridResponsavel.getChildren().add(txtParecerDns);
// }
// else
// {
st = new StaticText(); st = new StaticText();
st.setEscape( false ); st.setEscape( false );
st.setText( r.getParecer_dns() ); st.setText( r.getParecer_dns() );
//gridResponsavel.getChildren().add(st);
pg.getChildren().add( st ); pg.getChildren().add( st );
// }
} }
} }
} }
else else
{ {
@ -1346,7 +1225,6 @@ public class EditarPlano extends AbstractPageBean
txtParecerDns.setColumns( 200 ); txtParecerDns.setColumns( 200 );
txtParecerDns.setText( r.getParecer_dns() ); txtParecerDns.setText( r.getParecer_dns() );
gridResponsavel.getChildren().add( txtParecerDns ); gridResponsavel.getChildren().add( txtParecerDns );
} }
//Verificacao SIPRP //Verificacao SIPRP
@ -1364,25 +1242,12 @@ public class EditarPlano extends AbstractPageBean
pg.getChildren().add( st ); pg.getChildren().add( st );
gridResponsavel.getChildren().add( pg ); gridResponsavel.getChildren().add( pg );
// if(u.getTipo().intValue() == Global.TECNICO_HS)
// {
// txtVerificacaoSiprp = new TextArea();
// txtVerificacaoSiprp.setId("txtVerificacaoSiprp");
// txtVerificacaoSiprp.setColumns(200);
// txtVerificacaoSiprp.setText(v.getVerificacao_siprp());
// gridResponsavel.getChildren().add(txtVerificacaoSiprp);
// }
// else
// {
st = new StaticText(); st = new StaticText();
st.setEscape( false ); st.setEscape( false );
st.setText( r.getVerificacao_siprp() ); st.setText( r.getVerificacao_siprp() );
//gridResponsavel.getChildren().add(st);
pg.getChildren().add( st ); pg.getChildren().add( st );
// }
} }
} }
} }
else else
{ {
@ -1401,7 +1266,6 @@ public class EditarPlano extends AbstractPageBean
gridResponsavel.getChildren().add( txtVerificacaoSiprp ); gridResponsavel.getChildren().add( txtVerificacaoSiprp );
} }
} }
private void showPreviousValidacoes( PlanoActuacao p ) private void showPreviousValidacoes( PlanoActuacao p )

Write Preview
Loading…
Cancel
Save