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

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

Browse Source
lxbfYeaa
Diogo Neves 15 years ago
parent 3fe5f2883a
commit c1b0e3830f
3 changed files with 56 additions and 118 deletions
Show Stats Download Patch File Download Diff File

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

@ -20,19 +20,29 @@ import java.util.Vector;
public class Pagination implements Serializable public class Pagination implements Serializable
{ {
private int TOTAL_PAGINAS; private int TOTAL_PAGINAS;
//private HashMap<Integer, Risco> riscosHash = new HashMap();
private Vector<Risco> riscosVector = new Vector(); private Vector<Risco> riscosVector = new Vector();
private Vector<Valor> valoresVector = new Vector();
private int current_page = 1; private int current_page = 1;
public Pagination(PlanoActuacao p) public Pagination(PlanoActuacao p)
{ {
initialize(p); initialize(p);
} }
public Vector<Pagina> getPaginas() private void initialize( PlanoActuacao p )
{
for ( Area a : p.getAreas() )
{
for ( Risco r : a.getRiscos() )
{
riscosVector.add( r );
}
}
TOTAL_PAGINAS = riscosVector.size();
}
public Vector< Pagina > getPaginas()
{ {
Vector<Pagina> paginas = new Vector(); Vector< Pagina > paginas = new Vector< Pagina >();
Pagina pagina = null; Pagina pagina = null;
if ( current_page > 1 ) if ( current_page > 1 )
@ -44,18 +54,12 @@ public class Pagination implements Serializable
paginas.add( pagina ); paginas.add( pagina );
} }
int i = 0;
//Iterator<Valor> iter = valoresVector.iterator();
Iterator< Risco > iter = riscosVector.iterator(); Iterator< Risco > iter = riscosVector.iterator();
while ( iter.hasNext() ) for ( int i = 1; iter.hasNext(); i++ )
{ {
//Valor v = iter.next();
Risco r = iter.next(); Risco r = iter.next();
pagina = new Pagina(); pagina = new Pagina();
//pagina.setId("valor" + v.getId().toString());
pagina.setId( "valor" + r.getId().toString() ); pagina.setId( "valor" + r.getId().toString() );
//pagina.setRisco_id(r.getId());
i++;
pagina.setPage_nr( i ); pagina.setPage_nr( i );
if ( i == current_page ) if ( i == current_page )
{ {
@ -77,13 +81,13 @@ public class Pagination implements Serializable
return paginas; return paginas;
} }
public Risco getValor(Pagina p) public Risco getValor( Pagina p )
{ {
if(p.isNext()) if ( p.isNext() )
{ {
current_page++; current_page++;
} }
else if(p.isPrevious()) else if ( p.isPrevious() )
{ {
current_page--; current_page--;
} }
@ -92,21 +96,17 @@ public class Pagination implements Serializable
current_page = p.getPage_nr().intValue(); current_page = p.getPage_nr().intValue();
} }
//return valoresVector.get(current_page-1); return riscosVector.get( current_page - 1 );
return riscosVector.get(current_page-1);
} }
public Risco nextValor() public Risco nextValor()
{ {
//
//Valor v = null;
Risco r = null; Risco r = null;
if( current_page < TOTAL_PAGINAS) if ( current_page < TOTAL_PAGINAS )
{ {
current_page++; current_page++;
r = riscosVector.get(current_page-1); r = riscosVector.get( current_page - 1 );
//v = valoresVector.get(current_page-1);
} }
return r; return r;
@ -116,23 +116,5 @@ public class Pagination implements Serializable
{ {
return TOTAL_PAGINAS; return TOTAL_PAGINAS;
} }
private void initialize(PlanoActuacao p)
{
for(Area a : p.getAreas())
{
for(Risco r : a.getRiscos())
{
////for(Valor v : r.getValores())
////{
//r.setValor(v); to see later
riscosVector.add(r);
//valoresVector.add(v);
////}
}
}
TOTAL_PAGINAS = riscosVector.size();
//TOTAL_PAGINAS = valoresVector.size();
}
} }

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

@ -455,15 +455,10 @@ public class EditarPlano extends AbstractPageBean
return "lista_planos"; return "lista_planos";
} }
private void initialize( PlanoActuacao p )
{
Pagination pagination = new Pagination( p );
private void initialize(PlanoActuacao p) getSessionBean1().setPagination( pagination );
{
//Test.showPlanoTree(p);
//getSessionBean1().setPaginationPageNr(1);
Pagination pagination = new Pagination(p);
getSessionBean1().setPagination(pagination);
Utilizador u = getSessionBean1().getCurrentUser(); Utilizador u = getSessionBean1().getCurrentUser();
if(u.getTipo().intValue() == Global.DIRECTOR_NACIONAL_SEGURANCA) if(u.getTipo().intValue() == Global.DIRECTOR_NACIONAL_SEGURANCA)
{ {
@ -1722,7 +1717,6 @@ public class EditarPlano extends AbstractPageBean
public String butGravarRisco_action() public String butGravarRisco_action()
{ {
// PlanosDataProvider pdp = new PlanosDataProvider();
PlanoActuacao p = getSessionBean1().getPlanoActuacao(); PlanoActuacao p = getSessionBean1().getPlanoActuacao();
int fase = p.getFase().intValue(); int fase = p.getFase().intValue();
switch(fase) switch(fase)
@ -1801,14 +1795,8 @@ public class EditarPlano extends AbstractPageBean
try try
{ {
// Risco r = getSessionBean1().getCurrentRisco();
// r = fillRiscoFields(r);
// pdp.updateRisco(r);
//Valor v = getSessionBean1().getCurrentValor();
Risco r = getSessionBean1().getCurrentRisco(); Risco r = getSessionBean1().getCurrentRisco();
r = fillValorFields(r); r = fillValorFields( r );
//pdp.updateValor(r);
PlanosDataProvider pdp = PlanosDataProvider.getInstance(); PlanosDataProvider pdp = PlanosDataProvider.getInstance();
pdp.updateRisco( r ); pdp.updateRisco( r );
@ -1816,40 +1804,30 @@ public class EditarPlano extends AbstractPageBean
{ {
pdp.updateMedidas( r ); pdp.updateMedidas( r );
} }
// getSessionBean1().getValoresHash().remove(r.getId()); getSessionBean1().getRiscosHash().remove( r.getId() );
// getSessionBean1().getValoresHash().put(r.getId(), r); getSessionBean1().getRiscosHash().put( r.getId(), r );
getSessionBean1().getRiscosHash().remove(r.getId());
getSessionBean1().getRiscosHash().put(r.getId(), r);
Pagination pagination = getSessionBean1().getPagination(); Pagination pagination = getSessionBean1().getPagination();
////r = pagination.nextRisco();
r = pagination.nextValor(); r = pagination.nextValor();
//Risco r = getSessionBean1().getRiscosHash().get(r.getId()); Area a = getSessionBean1().getAreasHash().get( r.getArea_id() );
///////r = getSessionBean1().getRiscosHash().get(r.getId()); if ( r != null )
Area a = getSessionBean1().getAreasHash().get(r.getArea_id());
//if(v != null)
if(r != null)
{ {
//gridPlano = (HtmlPanelGrid) gridLayout.findComponent("form1:gridPlano"); gridArea = ( HtmlPanelGrid ) gridPlano.findComponent( "form1:gridArea" );
gridArea = (HtmlPanelGrid) gridPlano.findComponent("form1:gridArea"); if ( gridArea.getChildren() != null )
if(gridArea.getChildren() != null)
{ {
gridArea.getChildren().clear(); gridArea.getChildren().clear();
} }
showArea(a); showArea( a );
showRisco(r); showRisco( r );
showValor(r); showValor( r );
showResponsavel(r); showResponsavel( r );
} }
} }
catch(Exception ex) catch(Exception ex)
{ {
ErrorLogger.logException( ex ); ErrorLogger.logException( ex );
} }
//Risco r = getNextRisco(getSessionBean1().getPlanoId());
//fillRisco(r);
return null; return null;
} }
@ -2570,35 +2548,29 @@ public class EditarPlano extends AbstractPageBean
getSessionBean1().setRiscosHash(riscosHash); getSessionBean1().setRiscosHash(riscosHash);
} }
public void paginacao_actionListener(ActionEvent e) public void paginacao_actionListener( ActionEvent e )
{ {
Risco curValor = getSessionBean1().getCurrentRisco(); Risco curValor = getSessionBean1().getCurrentRisco();
curValor = fillValorFields(curValor); curValor = fillValorFields( curValor );
// getSessionBean1().getValoresHash().remove(curValor.getId()); getSessionBean1().getRiscosHash().remove( curValor.getId() );
// getSessionBean1().getValoresHash().put(curValor.getId(), curValor); getSessionBean1().getRiscosHash().put( curValor.getId(), curValor );
getSessionBean1().getRiscosHash().remove(curValor.getId());
getSessionBean1().getRiscosHash().put(curValor.getId(), curValor); gridArea = ( HtmlPanelGrid ) gridPlano.findComponent( "form1:gridArea" );
//gridPlano = (HtmlPanelGrid) gridLayout.findComponent("form1:gridPlano"); if ( gridArea.getChildren() != null )
gridArea = (HtmlPanelGrid) gridPlano.findComponent("form1:gridArea");
if(gridArea.getChildren() != null)
{ {
gridArea.getChildren().clear(); gridArea.getChildren().clear();
} }
Pagina pagina = (Pagina) e.getSource(); Pagina pagina = ( Pagina ) e.getSource();
Pagination pagination = getSessionBean1().getPagination(); Pagination pagination = getSessionBean1().getPagination();
// Valor v = pagination.getValor(pagina);
// v = getSessionBean1().getValoresHash().get(v.getId()); Risco r = pagination.getValor( pagina );
Risco r = pagination.getValor(pagina); r = getSessionBean1().getRiscosHash().get( r.getId() );
r = getSessionBean1().getRiscosHash().get(r.getId());
//Risco r = getSessionBean1().getRiscosHash().get(v.getRisco_id());
/////////Risco r = getSessionBean1().getRiscosHash().get(v.getRisco_id());
//Risco r = pagination.getRisco(pagina);
Area a = getSessionBean1().getAreasHash().get( r.getArea_id() ); Area a = getSessionBean1().getAreasHash().get( r.getArea_id() );
showArea(a); showArea( a );
showRisco(r); showRisco( r );
showValor(r); showValor( r );
showResponsavel(r); showResponsavel( r );
} }
public String butCancelar_action() { public String butCancelar_action() {

18
trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java
Unescape View File

@ -432,9 +432,6 @@ public class PlanosActuacao
Mail mail = new Mail(); Mail mail = new Mail();
// UtilizadoresDataProvider udp = new UtilizadoresDataProvider();
String responsavel_loja = "n"; String responsavel_loja = "n";
if(tipo_utilizador == Global.RESPONSAVEL_SEGURANCA) if(tipo_utilizador == Global.RESPONSAVEL_SEGURANCA)
{ {
@ -464,20 +461,7 @@ public class PlanosActuacao
} }
catch ( Exception ex ) catch ( Exception ex )
{ {
//ex.printStackTrace();
ErrorLogger.logException( ex ); ErrorLogger.logException( ex );
} }
// try
// {
// mail.send("lluis@evolute.pt", Mail.ENDERECO_ENVIO, assunto, mail_text);
// System.out.println("EMAIL ENVIADO !!");
// }
// catch(Exception ex)
// {
// ErrorLogger.logException( ex );
// System.out.println("ERRO NO ENVIO DO EMAIL !!");
// }
} }
} }

Write Preview
Loading…
Cancel
Save