diff --git a/trunk/PlanosActuacao/nbproject/private/private.properties b/trunk/PlanosActuacao/nbproject/private/private.properties index 2c21679d..cb57b180 100644 --- a/trunk/PlanosActuacao/nbproject/private/private.properties +++ b/trunk/PlanosActuacao/nbproject/private/private.properties @@ -4,8 +4,8 @@ auxiliary.org-netbeans-modules-web-client-tools-api.FIREFOX=true auxiliary.org-netbeans-modules-web-client-tools-api.INTERNET_5f_EXPLORER=false auxiliary.org-netbeans-modules-web-client-tools-api.serverdebug=true deploy.ant.properties.file=/home/dneves/.netbeans/6.7/tomcat60.properties -j2ee.platform.classpath=/home/dneves/Software/apache-tomcat-6.0.33/lib/jasper-el.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/ecj-3.3.1.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/el-api.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/tomcat-i18n-fr.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/tomcat-dbcp.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/tomcat-i18n-ja.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/catalina-ant.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/jsp-api.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/servlet-api.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/annotations-api.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/catalina-tribes.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/catalina-ha.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/tomcat-i18n-es.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/jasper.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/catalina.jar:/home/dneves/Software/apache-tomcat-6.0.33/lib/tomcat-coyote.jar:/home/dneves/Software/apache-tomcat-6.0.33/bin/tomcat-juli.jar -j2ee.server.instance=tomcat60:home=/home/dneves/Software/apache-tomcat-6.0.33 +j2ee.platform.classpath=/home/dneves/Software/apache-tomcat-6.0.18/lib/jasper.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/jsp-api.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/catalina-ant.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-i18n-es.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-i18n-ja.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/catalina-ha.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/servlet-api.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-i18n-fr.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/catalina.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-coyote.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/el-api.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/annotations-api.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-dbcp.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/jasper-el.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/catalina-tribes.jar:/home/dneves/Software/apache-tomcat-6.0.18/bin/tomcat-juli.jar +j2ee.server.instance=tomcat60:home=/home/dneves/Software/apache-tomcat-6.0.18:base=apache-tomcat-6.0.18_base javac.debug=true javadoc.preview=true jaxws.endorsed.dir=/home/dneves/Software/netbeans-6.7.1/java2/modules/ext/jaxws21/api:/home/dneves/Software/netbeans-6.7.1/ide11/modules/ext/jaxb/api diff --git a/trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporter.java b/trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporter.java index 7e8e5c25..cad6ce48 100644 --- a/trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporter.java +++ b/trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporter.java @@ -367,52 +367,57 @@ public class PlanosActuacaoImporter private void enviarMail( PlanoActuacao p ) { - MailNextPhase nextPhase = null; - - int fase = p.getFase().intValue(); - int tipo_utilizador = 0; - switch ( fase ) + Boolean isDebug = SIPRPPropertiesLoader.getInstance().findProperty( "debug", false ); + + if ( ! isDebug ) { - case Global.FASE_SEGURANCA_PREENCHIMENTO : // SIPRP para RS - tipo_utilizador = Global.RESPONSAVEL_SEGURANCA; - nextPhase = new SIPRP_TO_RESPONSAVEL_SEGURANCA( p ); - break; - } + MailNextPhase nextPhase = null; - if ( nextPhase != null ) - { - String responsavel_loja = "n"; - if ( tipo_utilizador == Global.RESPONSAVEL_SEGURANCA ) - { - responsavel_loja = "y"; - } - try - { - Mail mail = new Mail(); + int fase = p.getFase().intValue(); + int tipo_utilizador = 0; + switch ( fase ) + { + case Global.FASE_SEGURANCA_PREENCHIMENTO : // SIPRP para RS + tipo_utilizador = Global.RESPONSAVEL_SEGURANCA; + nextPhase = new SIPRP_TO_RESPONSAVEL_SEGURANCA( p ); + break; + } - UtilizadoresDataProvider udp = UtilizadoresDataProvider.getInstance(); - List< Utilizador > list = udp.getUtilizadoresListByTipo( tipo_utilizador, responsavel_loja, p.getEstabelecimento_id() ); - ListIterator iter = list.listIterator(); - while ( iter.hasNext() ) - { - Utilizador u = ( Utilizador ) iter.next(); - System.out.println( "\t\tUSER MAIL NEXT FASE : " + u.getLogin() + " ; " + u.getEmail() ); - try - { - mail.send( u.getEmail(), Mail.ENDERECO_ENVIO, nextPhase ); - System.out.println( "\t\t\tEMAIL ENVIADO !!" ); - } - catch ( Exception ex1 ) - { - ErrorLogger.logException( ex1 ); - System.out.println("\t\t\tMAIL ERROR : " + ex1.getMessage()); - } - } - } - catch ( Exception ex ) - { - ErrorLogger.logException( ex ); - } - } + if ( nextPhase != null ) + { + String responsavel_loja = "n"; + if ( tipo_utilizador == Global.RESPONSAVEL_SEGURANCA ) + { + responsavel_loja = "y"; + } + try + { + Mail mail = new Mail(); + + UtilizadoresDataProvider udp = UtilizadoresDataProvider.getInstance(); + List< Utilizador > list = udp.getUtilizadoresListByTipo( tipo_utilizador, responsavel_loja, p.getEstabelecimento_id() ); + ListIterator iter = list.listIterator(); + while ( iter.hasNext() ) + { + Utilizador u = ( Utilizador ) iter.next(); + System.out.println( "\t\tUSER MAIL NEXT FASE : " + u.getLogin() + " ; " + u.getEmail() ); + try + { + mail.send( u.getEmail(), Mail.ENDERECO_ENVIO, nextPhase ); + System.out.println( "\t\t\tEMAIL ENVIADO !!" ); + } + catch ( Exception ex1 ) + { + ErrorLogger.logException( ex1 ); + System.out.println("\t\t\tMAIL ERROR : " + ex1.getMessage()); + } + } + } + catch ( Exception ex ) + { + ErrorLogger.logException( ex ); + } + } + } } } diff --git a/trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporterProvider.java b/trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporterProvider.java index 581b5d54..c38eeaaf 100644 --- a/trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporterProvider.java +++ b/trunk/PlanosActuacao/src/java/importer/PlanosActuacaoImporterProvider.java @@ -507,7 +507,7 @@ public class PlanosActuacaoImporterProvider extends GenericDataProvider PlanoAreasData areaData = new PlanoAreasData(); areaData.setArea_id( a.getArea_id() ); areaData.setPlano_id( a.getPlano_id() ); - areaData.setDescricao( a.getDescricao() ); + areaData.setDescricao( Utils.parseToInsert( a.getDescricao() ) ); System.out.println( "\nCREATE AREA : " ); areaData.setProvider( EvoBaseProvider.getInstance().getProvider( DB.SIPRP ) ); @@ -523,7 +523,7 @@ public class PlanosActuacaoImporterProvider extends GenericDataProvider Integer newRiscoID = null; PlanoRiscosData riscoData = new PlanoRiscosData(); - riscoData.setDescricao( r.getDescricao() ); + riscoData.setDescricao( Utils.parseToInsert( r.getDescricao() ) ); riscoData.setActivo( r.getActivo() == null ? "y" : r.getActivo() ); riscoData.setArea_id( r.getArea_id() ); riscoData.setValor( r.getValorQuantitativo() ); @@ -547,7 +547,7 @@ public class PlanosActuacaoImporterProvider extends GenericDataProvider PlanoMedidasData medidaData = new PlanoMedidasData(); medidaData.setMedida_id( m.getMedida_id() ); medidaData.setRisco_id( m.getRisco_id() ); - medidaData.setDescricao( m.getDescricao() ); + medidaData.setDescricao( Utils.parseToInsert( m.getDescricao() ) ); System.out.println( "\nCREATE MEDIDA : " ); medidaData.setProvider( EvoBaseProvider.getInstance().getProvider( DB.SIPRP ) ); @@ -563,7 +563,7 @@ public class PlanosActuacaoImporterProvider extends GenericDataProvider PlanoPostosTrabalhoData postoData = new PlanoPostosTrabalhoData(); postoData.setPosto_id( p.getPosto_id() ); postoData.setMedida_id( p.getMedida_id() ); - postoData.setDescricao( p.getDescricao() ); + postoData.setDescricao( Utils.parseToInsert( p.getDescricao() ) ); System.out.println( "\nCREATE POSTO TRABALHO : " ); postoData.setProvider( EvoBaseProvider.getInstance().getProvider( DB.SIPRP ) ); diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java b/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java index 41515ca4..1cd48f91 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java @@ -3,7 +3,6 @@ * * Created on Oct 20, 2008, 10:39:31 AM */ - package planosactuacao; import com.evolute.utils.error.ErrorLogger; @@ -19,7 +18,6 @@ import db.entidades.PostoTrabalho; import db.entidades.Risco; import db.providers.RiscoLogic; import db.providers.UtilizadoresLogic; -import utils.Global; import java.text.SimpleDateFormat; import java.util.Collections; import java.util.Comparator; @@ -36,8 +34,7 @@ import javax.faces.component.html.HtmlPanelGrid; * * @author lluis */ -public class ViewPlano extends AbstractPageBean -{ +public class ViewPlano extends AbstractPageBean { // /** @@ -65,15 +62,14 @@ public class ViewPlano extends AbstractPageBean public void setGridLayout(HtmlPanelGrid hpg) { this.gridLayout = hpg; } - // HtmlPanelGrid gridPlano; - HtmlPanelGrid gridArea; - HtmlPanelGrid gridAreaContainer; + HtmlPanelGrid gridArea; + HtmlPanelGrid gridAreaContainer; HtmlPanelGrid gridRisco; - HtmlPanelGrid gridValor; - HtmlPanelGrid gridMedida; - HtmlPanelGrid gridPosto; + HtmlPanelGrid gridValor; + HtmlPanelGrid gridMedida; + HtmlPanelGrid gridPosto; HtmlPanelGrid gridResponsavel; PanelGroup pg; StaticText st; @@ -81,9 +77,7 @@ public class ViewPlano extends AbstractPageBean /** *

Construct a new Page bean instance.

*/ - public ViewPlano() - { - + public ViewPlano() { } /** @@ -99,25 +93,24 @@ public class ViewPlano extends AbstractPageBean * property values that were saved for this view when it was rendered.

*/ @Override - public void init() - { + public void init() { // Perform initializations inherited from our superclass super.init(); // Perform application initialization that must complete // *before* managed components are initialized // TODO - add your own initialiation code here - + // // Initialize automatically managed components // *Note* - this logic should NOT be modified try { _init(); } catch (Exception e) { - ErrorLogger.logException( e ); + ErrorLogger.logException(e); log("ViewPlano Initialization Failure", e); - throw e instanceof FacesException ? (FacesException) e: new FacesException(e); + throw e instanceof FacesException ? (FacesException) e : new FacesException(e); } - + // // Perform application initialization that must complete // *after* managed components are initialized @@ -132,9 +125,7 @@ public class ViewPlano extends AbstractPageBean * resources that will be required in your event handlers.

*/ @Override - public void preprocess() - { - + public void preprocess() { } /** @@ -146,10 +137,9 @@ public class ViewPlano extends AbstractPageBean * this page.

*/ @Override - public void prerender() - { + public void prerender() { PlanoActuacao p = getSessionBean1().getPlanoActuacao(); - showPlano( p ); + showPlano(p); } /** @@ -161,9 +151,7 @@ public class ViewPlano extends AbstractPageBean * acquired during execution of an event handler).

*/ @Override - public void destroy() - { - + public void destroy() { } /** @@ -171,8 +159,7 @@ public class ViewPlano extends AbstractPageBean * * @return reference to the scoped data bean */ - protected SessionBean1 getSessionBean1() - { + protected SessionBean1 getSessionBean1() { return (SessionBean1) getBean("SessionBean1"); } @@ -181,8 +168,7 @@ public class ViewPlano extends AbstractPageBean * * @return reference to the scoped data bean */ - protected ApplicationBean1 getApplicationBean1() - { + protected ApplicationBean1 getApplicationBean1() { return (ApplicationBean1) getBean("ApplicationBean1"); } @@ -191,336 +177,313 @@ public class ViewPlano extends AbstractPageBean * * @return reference to the scoped data bean */ - protected RequestBean1 getRequestBean1() - { + protected RequestBean1 getRequestBean1() { return (RequestBean1) getBean("RequestBean1"); } - - private void showPlano( PlanoActuacao p ) - { - System.out.println( "\nViewPlano . showPlano( " + p.getId() + " ) : \n" ); - + + private void showPlano(PlanoActuacao p) { + System.out.println("\nViewPlano . showPlano( " + p.getId() + " ) : \n"); + gridPlano = new HtmlPanelGrid(); - gridPlano.setId( "gridPlano" ); - gridPlano.setWidth( "100%" ); - gridPlano.setColumns( 1 ); - gridPlano.setStyle( "background-color: #f6f4e8; border: solid 1px #000000" ); - gridPlano.setColumnClasses( "gridColCenter" ); + gridPlano.setId("gridPlano"); + gridPlano.setWidth("100%"); + gridPlano.setColumns(1); + gridPlano.setStyle("background-color: #f6f4e8; border: solid 1px #000000"); + gridPlano.setColumnClasses("gridColCenter"); //lblTop.setText("Plano de actuação da auditoria " + p.getData_visita_str()); - if ( p.getConcluidoPorDesactivacao() ) - { - StaticText st = new StaticText(); - st.setText( "N\u00E3o realizado por falta de cumprimento do prazo." ); - st.setStyle( "color: #FF0000; font-weight: bold; font-size: 13px;" ); - gridPlano.getChildren().add( st ); - } - gridLayout.getChildren().add( gridPlano ); - showAreas( p.getAreas() ); - showValidacoes( gridPlano, p ); + if (p.getConcluidoPorDesactivacao()) { + StaticText st = new StaticText(); + st.setText("N\u00E3o realizado por falta de cumprimento do prazo."); + st.setStyle("color: #FF0000; font-weight: bold; font-size: 13px;"); + gridPlano.getChildren().add(st); + } + gridLayout.getChildren().add(gridPlano); + showAreas(p.getAreas()); + showValidacoes(gridPlano, p); } - - private void showAreas( List< Area > areas ) - { + + private void showAreas(List areas) { int i = 0; - for( Area area : areas ) - { + for (Area area : areas) { i++; gridArea = new HtmlPanelGrid(); - gridArea.setColumns( 1 ); - gridArea.setColumnClasses( "gridColCenter" ); - gridArea.setWidth( "100%" ); - - gridPlano.getChildren().add( gridArea ); - + gridArea.setColumns(1); + gridArea.setColumnClasses("gridColCenter"); + gridArea.setWidth("100%"); + + gridPlano.getChildren().add(gridArea); + pg = new PanelGroup(); st = new StaticText(); - st.setEscape( false ); - st.setStyleClass( "label" ); - st.setText( "Área: " ); - pg.getChildren().add( st ); + st.setEscape(false); + st.setStyleClass("label"); + st.setText("Área: "); + pg.getChildren().add(st); st = new StaticText(); - st.setId( "fakeLink" + i ); - st.setStyleClass( "fakeLink" ); - st.setOnMouseOver( "this.style.textDecoration = 'underline'" ); - st.setOnMouseOut( "this.style.textDecoration = 'none'" ); - st.setOnClick( "expand(this)" ); - st.setEscape( false ); + st.setId("fakeLink" + i); + st.setStyleClass("fakeLink"); + st.setOnMouseOver("this.style.textDecoration = 'underline'"); + st.setOnMouseOut("this.style.textDecoration = 'none'"); + st.setOnClick("expand(this)"); + st.setEscape(false); st.setText( area.getDescricao() ); - pg.getChildren().add( st ); - - gridArea.getChildren().add( pg ); - + pg.getChildren().add(st); + + gridArea.getChildren().add(pg); + gridAreaContainer = new HtmlPanelGrid(); - gridAreaContainer.setId( "area_container" + i ); + gridAreaContainer.setId("area_container" + i); ////gridAreaContainer.setStyle("border: solid 1px #000000; width: 100%;"); - gridAreaContainer.setStyleClass( "hidden" ); + gridAreaContainer.setStyleClass("hidden"); //gridAreaContainer.setStyleClass("visible"); - gridAreaContainer.setColumns( 1 ); - gridAreaContainer.setColumnClasses( "gridColLeft" ); - gridAreaContainer.setWidth( "100%" ); + gridAreaContainer.setColumns(1); + gridAreaContainer.setColumnClasses("gridColLeft"); + gridAreaContainer.setWidth("100%"); - gridArea.getChildren().add( gridAreaContainer ); - showRiscos( area.getRiscos() ); + gridArea.getChildren().add(gridAreaContainer); + showRiscos(area.getRiscos()); } } - - private void showRiscos( List< Risco > riscos ) - { + + private void showRiscos(List riscos) { int rCount = 0; - Collections.sort( riscos, new Comparator< Risco >() - { - public int compare( Risco o1, Risco o2 ) - { - // false first, true after - return o1.getIsPatrimonial().compareTo( o2.getIsPatrimonial() ); - } - } ); - - for ( Risco risco : riscos ) - { - boolean isPatrimonial = risco.getIsPatrimonial(); - String riscoTitle = "Risco" + ( isPatrimonial ? " Patrimonial" : "" ) + ": "; + Collections.sort(riscos, new Comparator() { + + @Override + public int compare(Risco o1, Risco o2) { + // false first, true after + return o1.getIsPatrimonial().compareTo(o2.getIsPatrimonial()); + } + }); + + for (Risco risco : riscos) { + boolean isPatrimonial = risco.getIsPatrimonial(); + String riscoTitle = "Risco" + (isPatrimonial ? " Patrimonial" : "") + ": "; HtmlPanelGrid grd = new HtmlPanelGrid(); - grd.setColumns( 1 ); - grd.setColumnClasses( "gridColLeft" ); + grd.setColumns(1); + grd.setColumnClasses("gridColLeft"); //grd.setStyle("border: solid 1px #0000FF; display: inline; width: 100%"); - grd.setStyle( "display: block; width: 100%" ); - grd.setWidth( "100%" ); + grd.setStyle("display: block; width: 100%"); + grd.setWidth("100%"); //grd.setStyleClass("centerBlock"); //gridArea.getChildren().add(grd); - gridAreaContainer.getChildren().add( grd ); + gridAreaContainer.getChildren().add(grd); gridRisco = new HtmlPanelGrid(); //gridRisco.setStyleClass("centerBlock"); - gridRisco.setStyle( "display: block; width: 98%" ); - gridRisco.setWidth( "98%" ); - gridRisco.setColumns( 1 ); - gridRisco.setColumnClasses( "gridColLeft" ); - grd.getChildren().add( gridRisco ); + gridRisco.setStyle("display: block; width: 98%"); + gridRisco.setWidth("98%"); + gridRisco.setColumns(1); + gridRisco.setColumnClasses("gridColLeft"); + grd.getChildren().add(gridRisco); pg = new PanelGroup(); st = new StaticText(); - st.setEscape( false ); - st.setStyleClass( "label" ); - st.setText( riscoTitle ); - pg.getChildren().add( st ); + st.setEscape(false); + st.setStyleClass("label"); + st.setText(riscoTitle); + pg.getChildren().add(st); st = new StaticText(); - st.setEscape( false ); + st.setEscape(false); st.setText( risco.getDescricao() ); - pg.getChildren().add( st ); - gridRisco.getChildren().add( pg ); + pg.getChildren().add(st); + gridRisco.getChildren().add(pg); //showValores(risco.getValores()); - showValor( risco ); + showValor(risco); //showMedidas(risco.getMedidas()); - if ( rCount < riscos.size() - 1 ) - { - showSeparator( ); + if (rCount < riscos.size() - 1) { + showSeparator(); } rCount++; - } + } } - - private void showValor( Risco r ) - { - HtmlPanelGrid grd = new HtmlPanelGrid(); - grd.setColumns( 1 ); - grd.setWidth( "100%" ); - grd.setStyleClass( "centerBlock" ); - grd.setStyle( "display: block" ); - //gridRisco.getChildren().add(grd); - - gridValor = new HtmlPanelGrid(); - gridRisco.getChildren().add( gridValor ); - //gridValor.setStyleClass("centerBlock"); - gridValor.setStyle( "display: block" ); - gridValor.setWidth( "100%" ); - gridValor.setColumns( 1 ); - gridValor.setColumnClasses( "gridColLeft" ); - //grd.getChildren().add(gridValor); - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape( false ); - st.setStyleClass( "label" ); - st.setText( "Valor: " ); - pg.getChildren().add( st ); - st = new StaticText(); - st.setEscape( false ); - st.setText( RiscoLogic.getInstance().getValor( r ) ); - - pg.getChildren().add( st ); - gridValor.getChildren().add( pg ); - - showMedidas( r.getMedidas() ); - - grd = new HtmlPanelGrid(); - grd.setColumns( 1 ); - grd.setWidth( "100%" ); - //grd.setStyleClass("centerBlock"); - gridValor.getChildren().add( grd ); - HtmlPanelGrid gridParecer = new HtmlPanelGrid(); - gridParecer.setStyleClass( "centerBlock" ); - gridParecer.setStyle( "display: block" ); - gridParecer.setWidth( "98%" ); - gridParecer.setColumns( 1 ); - gridParecer.setColumnClasses( "gridColLeft" ); - grd.getChildren().add( gridParecer ); - - if ( r.getResponsavel_execucao() != null ) - { - if ( r.getResponsavel_execucao().trim().length() > 0 ) - { - pg = new PanelGroup(); - - st = new StaticText(); - st.setEscape( false ); - st.setStyleClass( "label" ); - st.setText( "Responsável de execução: " ); - pg.getChildren().add( st ); - st = new StaticText(); - st.setEscape( false ); - st.setText( r.getResponsavel_execucao().toString() ); - pg.getChildren().add( st ); - - if ( r.getPor() != null ) - { - if ( r.getPor().trim().length() > 0 ) - { - st = new StaticText(); - st.setEscape( false ); - st.setText( " " ); - pg.getChildren().add( st ); - - st = new StaticText(); - st.setEscape( false ); - st.setStyleClass( "label" ); - st.setText( "POR:  " ); - pg.getChildren().add( st ); - st = new StaticText(); - st.setEscape( false ); - st.setText( r.getPor().toString() ); - pg.getChildren().add( st ); - } - } - - gridParecer.getChildren().add( pg ); - } - } - - if ( r.getRecursos_necessarios() != null ) - { - if ( r.getRecursos_necessarios().trim().length() > 0 ) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape( false ); - st.setStyleClass( "label" ); - st.setText( "Recursos necessários: " ); - pg.getChildren().add( st ); - st = new StaticText(); - st.setEscape( false ); - st.setText( r.getRecursos_necessarios().toString() ); - pg.getChildren().add( st ); - gridParecer.getChildren().add( pg ); - } - } - - if ( r.getData_inicio() != null ) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape( false ); - st.setStyleClass( "label" ); - st.setText( "Data início: " ); - pg.getChildren().add( st ); - st = new StaticText(); - st.setEscape( false ); - String data_str = ""; - SimpleDateFormat formatter = new SimpleDateFormat( "dd/MM/yyyy" ); - data_str = formatter.format( r.getData_inicio() ); - st.setText( data_str ); - pg.getChildren().add( st ); - gridParecer.getChildren().add( pg ); - } - - if ( r.getData_fim() != null ) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape( false ); - st.setStyleClass( "label" ); - st.setText( "Data fim: " ); - pg.getChildren().add( st ); - st = new StaticText(); - st.setEscape( false ); - String data_str = ""; - SimpleDateFormat formatter = new SimpleDateFormat( "dd/MM/yyyy" ); - data_str = formatter.format( r.getData_fim() ); - st.setText( data_str ); - pg.getChildren().add( st ); - gridParecer.getChildren().add( pg ); - } - - if ( r.getParecer_dl() != null ) - { - if ( r.getParecer_dl().trim().length() > 0 ) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape( false ); - st.setStyleClass( "label" ); - st.setText( "Parecer DL: " ); - pg.getChildren().add( st ); - st = new StaticText(); - st.setEscape( false ); - st.setText( r.getParecer_dl().toString() ); - pg.getChildren().add( st ); - gridParecer.getChildren().add( pg ); - } - } - - if ( r.getParecer_dns() != null ) - { - if ( r.getParecer_dns().trim().length() > 0 ) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape( false ); - st.setStyleClass( "label" ); - st.setText( "Parecer DNS: " ); - pg.getChildren().add( st ); - st = new StaticText(); - st.setEscape( false ); - st.setText( r.getParecer_dns().toString() ); - pg.getChildren().add( st ); - gridParecer.getChildren().add( pg ); - - } - } - - if ( r.getVerificacao_siprp() != null ) - { - if ( r.getVerificacao_siprp().trim().length() > 0 ) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape( false ); - st.setStyleClass( "label" ); - st.setText( "Verificação SIPRP: " ); - pg.getChildren().add( st ); - st = new StaticText(); - st.setEscape( false ); - st.setText( r.getVerificacao_siprp().toString() ); - pg.getChildren().add( st ); - gridParecer.getChildren().add( pg ); - } - } + + private void showValor(Risco r) { + HtmlPanelGrid grd = new HtmlPanelGrid(); + grd.setColumns(1); + grd.setWidth("100%"); + grd.setStyleClass("centerBlock"); + grd.setStyle("display: block"); + //gridRisco.getChildren().add(grd); + + gridValor = new HtmlPanelGrid(); + gridRisco.getChildren().add(gridValor); + //gridValor.setStyleClass("centerBlock"); + gridValor.setStyle("display: block"); + gridValor.setWidth("100%"); + gridValor.setColumns(1); + gridValor.setColumnClasses("gridColLeft"); + //grd.getChildren().add(gridValor); + pg = new PanelGroup(); + st = new StaticText(); + st.setEscape(false); + st.setStyleClass("label"); + st.setText("Valor: "); + pg.getChildren().add(st); + st = new StaticText(); + st.setEscape(false); + st.setText(RiscoLogic.getInstance().getValor(r)); + + pg.getChildren().add(st); + gridValor.getChildren().add(pg); + + showMedidas(r.getMedidas()); + + grd = new HtmlPanelGrid(); + grd.setColumns(1); + grd.setWidth("100%"); + //grd.setStyleClass("centerBlock"); + gridValor.getChildren().add(grd); + HtmlPanelGrid gridParecer = new HtmlPanelGrid(); + gridParecer.setStyleClass("centerBlock"); + gridParecer.setStyle("display: block"); + gridParecer.setWidth("98%"); + gridParecer.setColumns(1); + gridParecer.setColumnClasses("gridColLeft"); + grd.getChildren().add(gridParecer); + + if (r.getResponsavel_execucao() != null) { + if (r.getResponsavel_execucao().trim().length() > 0) { + pg = new PanelGroup(); + + st = new StaticText(); + st.setEscape(false); + st.setStyleClass("label"); + st.setText("Responsável de execução: "); + pg.getChildren().add(st); + st = new StaticText(); + st.setEscape(false); + st.setText(r.getResponsavel_execucao().toString()); + pg.getChildren().add(st); + + if (r.getPor() != null) { + if (r.getPor().trim().length() > 0) { + st = new StaticText(); + st.setEscape(false); + st.setText(" "); + pg.getChildren().add(st); + + st = new StaticText(); + st.setEscape(false); + st.setStyleClass("label"); + st.setText("POR:  "); + pg.getChildren().add(st); + st = new StaticText(); + st.setEscape(false); + st.setText(r.getPor().toString()); + pg.getChildren().add(st); + } + } + + gridParecer.getChildren().add(pg); + } + } + + if (r.getRecursos_necessarios() != null) { + if (r.getRecursos_necessarios().trim().length() > 0) { + pg = new PanelGroup(); + st = new StaticText(); + st.setEscape(false); + st.setStyleClass("label"); + st.setText("Recursos necessários: "); + pg.getChildren().add(st); + st = new StaticText(); + st.setEscape(false); + st.setText(r.getRecursos_necessarios().toString()); + pg.getChildren().add(st); + gridParecer.getChildren().add(pg); + } + } + + if (r.getData_inicio() != null) { + pg = new PanelGroup(); + st = new StaticText(); + st.setEscape(false); + st.setStyleClass("label"); + st.setText("Data início: "); + pg.getChildren().add(st); + st = new StaticText(); + st.setEscape(false); + String data_str = ""; + SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); + data_str = formatter.format(r.getData_inicio()); + st.setText(data_str); + pg.getChildren().add(st); + gridParecer.getChildren().add(pg); + } + + if (r.getData_fim() != null) { + pg = new PanelGroup(); + st = new StaticText(); + st.setEscape(false); + st.setStyleClass("label"); + st.setText("Data fim: "); + pg.getChildren().add(st); + st = new StaticText(); + st.setEscape(false); + String data_str = ""; + SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); + data_str = formatter.format(r.getData_fim()); + st.setText(data_str); + pg.getChildren().add(st); + gridParecer.getChildren().add(pg); + } + + if (r.getParecer_dl() != null) { + if (r.getParecer_dl().trim().length() > 0) { + pg = new PanelGroup(); + st = new StaticText(); + st.setEscape(false); + st.setStyleClass("label"); + st.setText("Parecer DL: "); + pg.getChildren().add(st); + st = new StaticText(); + st.setEscape(false); + st.setText(r.getParecer_dl().toString()); + pg.getChildren().add(st); + gridParecer.getChildren().add(pg); + } + } + + if (r.getParecer_dns() != null) { + if (r.getParecer_dns().trim().length() > 0) { + pg = new PanelGroup(); + st = new StaticText(); + st.setEscape(false); + st.setStyleClass("label"); + st.setText("Parecer DNS: "); + pg.getChildren().add(st); + st = new StaticText(); + st.setEscape(false); + st.setText(r.getParecer_dns().toString()); + pg.getChildren().add(st); + gridParecer.getChildren().add(pg); + + } + } + + if (r.getVerificacao_siprp() != null) { + if (r.getVerificacao_siprp().trim().length() > 0) { + pg = new PanelGroup(); + st = new StaticText(); + st.setEscape(false); + st.setStyleClass("label"); + st.setText("Verificação SIPRP: "); + pg.getChildren().add(st); + st = new StaticText(); + st.setEscape(false); + st.setText(r.getVerificacao_siprp().toString()); + pg.getChildren().add(st); + gridParecer.getChildren().add(pg); + } + } } - + // private void showValores( List< Valor > valores ) // { // for ( Valor valor : valores ) @@ -702,17 +665,14 @@ public class ViewPlano extends AbstractPageBean // // // } // } - - private void showMedidas( List< Medida > medidas ) - { - for( Medida medida : medidas ) - { + private void showMedidas(List medidas) { + for (Medida medida : medidas) { HtmlPanelGrid grd = new HtmlPanelGrid(); - grd.setColumns( 1 ); + grd.setColumns(1); grd.setWidth("100%"); ////grd.setStyleClass("centerBlock"); grd.setStyle("display: block"); - gridValor.getChildren().add( grd ); + gridValor.getChildren().add(grd); gridMedida = new HtmlPanelGrid(); ////gridMedida.setStyleClass("centerBlock"); @@ -720,161 +680,150 @@ public class ViewPlano extends AbstractPageBean gridMedida.setWidth("98%"); gridMedida.setColumns(1); gridMedida.setColumnClasses("gridColLeft"); - grd.getChildren().add( gridMedida ); + grd.getChildren().add(gridMedida); pg = new PanelGroup(); st = new StaticText(); st.setEscape(false); st.setStyleClass("label"); - st.setText("Medida: "); - pg.getChildren().add( st ); + st.setText("Medida: "); + pg.getChildren().add(st); st = new StaticText(); - st.setEscape( false ); + st.setEscape(false); st.setText( medida.getDescricao() ); - pg.getChildren().add( st ); - gridMedida.getChildren().add( pg ); + pg.getChildren().add(st); + gridMedida.getChildren().add(pg); - showPostos( medida.getPostos() ); + showPostos(medida.getPostos()); } } - - private void showPostos( List< PostoTrabalho > postos ) - { - for ( PostoTrabalho posto : postos ) - { + + private void showPostos(List postos) { + for (PostoTrabalho posto : postos) { HtmlPanelGrid grd = new HtmlPanelGrid(); - grd.setColumns( 1 ); - grd.setStyle( "display: block" ); - grd.setWidth( "100%" ); - gridMedida.getChildren().add( grd ); + grd.setColumns(1); + grd.setStyle("display: block"); + grd.setWidth("100%"); + gridMedida.getChildren().add(grd); gridPosto = new HtmlPanelGrid(); - gridPosto.setStyle( "display: block" ); - gridPosto.setWidth( "98%" ); - gridPosto.setColumns( 1 ); - gridPosto.setColumnClasses( "gridColLeft" ); - grd.getChildren().add( gridPosto ); + gridPosto.setStyle("display: block"); + gridPosto.setWidth("98%"); + gridPosto.setColumns(1); + gridPosto.setColumnClasses("gridColLeft"); + grd.getChildren().add(gridPosto); pg = new PanelGroup(); st = new StaticText(); - st.setEscape( false ); - st.setStyleClass( "label" ); - st.setText( "Posto de trabalho: " ); - pg.getChildren().add( st ); + st.setEscape(false); + st.setStyleClass("label"); + st.setText("Posto de trabalho: "); + pg.getChildren().add(st); st = new StaticText(); - st.setEscape( false ); + st.setEscape(false); st.setText( posto.getDescricao() ); - pg.getChildren().add( st ); - gridPosto.getChildren().add( pg ); + pg.getChildren().add(st); + gridPosto.getChildren().add(pg); } } - private void showValidacoes( HtmlPanelGrid grid, PlanoActuacao p ) - { - SimpleDateFormat DF = new SimpleDateFormat( "dd-MM-yyyy" ); - - HtmlPanelGrid gridValidacoes = new HtmlPanelGrid(); - gridValidacoes.setColumns( 1 ); - gridValidacoes.setColumnClasses( "gridColLeft" ); - gridValidacoes.setWidth( "100%" ); - - // 1 - System.out.println( "showValidacoes() : 1. (Auditoria) " + p.getData_visita() ); - if ( p.getData_visita() != null ) - { - StaticText visitaText = new StaticText(); - visitaText.setEscape( false ); - visitaText.setText( "Data da auditoria: " + ( p.getData_visita() == null ? "" : DF.format( p.getData_visita() ) ) ); - gridValidacoes.getChildren().add( visitaText ); - } - - // 2 - System.out.println( "showValidacoes() : 2. (Disponibilizacao) " + p.getData_disponibilizacao() ); - if ( p.getData_disponibilizacao() != null ) - { - StaticText dispText = new StaticText(); - dispText.setEscape( false ); - dispText.setText( "Data de disponibilizacao online: " + ( p.getData_disponibilizacao() == null ? "" : DF.format( p.getData_disponibilizacao() ) ) ); - gridValidacoes.getChildren().add( dispText ); - } - - // 3 - System.out.println( "showValidacoes() : 3. (Validacao Seg) " + p.getData_validacao_seg() ); - if ( p.getData_validacao_seg() != null ) - { - StaticText segText = new StaticText(); - segText.setEscape( false ); - String nome = UtilizadoresLogic.getInstance().getNomeUtilizadorByID( p.getUser_seg() ); - segText.setText( "Validado por " + nome + " (Segurança)" + ( p.getData_validacao_seg() == null ? "" : " a " + DF.format( p.getData_validacao_seg() ) ) ); - gridValidacoes.getChildren().add( segText ); - } - - // 4 - System.out.println( "showValidacoes() : 4. (Validacao DL) " + p.getValidacao_director_loja() ); - if ( p.getValidacao_director_loja() ) - { - StaticText valDirLojaText = new StaticText(); - valDirLojaText.setEscape( false ); - String nome = UtilizadoresLogic.getInstance().getNomeUtilizadorByID( p.getUser_dir_loja() ); - - - String validacaoText = "Validado por " + nome + " (Director de Loja)" + - ( p.getData_validacao_dir_loja() == null ? "" : " a " + DF.format( p.getData_validacao_dir_loja() ) ); - valDirLojaText.setText( validacaoText ); - gridValidacoes.getChildren().add( valDirLojaText ); - - if ( p.getObservacoes_dl() != null && ! "".equals( p.getObservacoes_dl().trim() ) ) - { - StaticText obsTitleText = new StaticText(); - obsTitleText.setEscape( false ); - obsTitleText.setText( "Observações gerais DL: " ); - - StaticText obsText = new StaticText(); - obsText.setEscape( false ); - obsText.setText( p.getObservacoes_dl() ); - - gridValidacoes.getChildren().add( obsTitleText ); - gridValidacoes.getChildren().add( obsText ); + private void showValidacoes(HtmlPanelGrid grid, PlanoActuacao p) { + SimpleDateFormat DF = new SimpleDateFormat("dd-MM-yyyy"); + + HtmlPanelGrid gridValidacoes = new HtmlPanelGrid(); + gridValidacoes.setColumns(1); + gridValidacoes.setColumnClasses("gridColLeft"); + gridValidacoes.setWidth("100%"); + + // 1 + System.out.println("showValidacoes() : 1. (Auditoria) " + p.getData_visita()); + if (p.getData_visita() != null) { + StaticText visitaText = new StaticText(); + visitaText.setEscape(false); + visitaText.setText("Data da auditoria: " + (p.getData_visita() == null ? "" : DF.format(p.getData_visita()))); + gridValidacoes.getChildren().add(visitaText); + } + + // 2 + System.out.println("showValidacoes() : 2. (Disponibilizacao) " + p.getData_disponibilizacao()); + if (p.getData_disponibilizacao() != null) { + StaticText dispText = new StaticText(); + dispText.setEscape(false); + dispText.setText("Data de disponibilizacao online: " + (p.getData_disponibilizacao() == null ? "" : DF.format(p.getData_disponibilizacao()))); + gridValidacoes.getChildren().add(dispText); + } + + // 3 + System.out.println("showValidacoes() : 3. (Validacao Seg) " + p.getData_validacao_seg()); + if (p.getData_validacao_seg() != null) { + StaticText segText = new StaticText(); + segText.setEscape(false); + String nome = UtilizadoresLogic.getInstance().getNomeUtilizadorByID(p.getUser_seg()); + segText.setText("Validado por " + nome + " (Segurança)" + (p.getData_validacao_seg() == null ? "" : " a " + DF.format(p.getData_validacao_seg()))); + gridValidacoes.getChildren().add(segText); + } + + // 4 + System.out.println("showValidacoes() : 4. (Validacao DL) " + p.getValidacao_director_loja()); + if (p.getValidacao_director_loja()) { + StaticText valDirLojaText = new StaticText(); + valDirLojaText.setEscape(false); + String nome = UtilizadoresLogic.getInstance().getNomeUtilizadorByID(p.getUser_dir_loja()); + + + String validacaoText = "Validado por " + nome + " (Director de Loja)" + + (p.getData_validacao_dir_loja() == null ? "" : " a " + DF.format(p.getData_validacao_dir_loja())); + valDirLojaText.setText(validacaoText); + gridValidacoes.getChildren().add(valDirLojaText); + + if (p.getObservacoes_dl() != null && !"".equals(p.getObservacoes_dl().trim())) { + StaticText obsTitleText = new StaticText(); + obsTitleText.setEscape(false); + obsTitleText.setText("Observações gerais DL: "); + + StaticText obsText = new StaticText(); + obsText.setEscape(false); + obsText.setText(p.getObservacoes_dl()); + + gridValidacoes.getChildren().add(obsTitleText); + gridValidacoes.getChildren().add(obsText); } - } - - // 5 - System.out.println( "showValidacoes() : 5. (Validacao DNS) " + p.getValidacao_dns() ); - if ( p.getValidacao_dns() ) - { - StaticText valDnsText = new StaticText(); - valDnsText.setEscape( false ); - String nome = UtilizadoresLogic.getInstance().getNomeUtilizadorByID( p.getUser_dns() ); - valDnsText.setText( "Validado por " + nome + " (Director Nacional de Segurança)" + ( p.getData_validacao_dns() == null ? "" : " a " + DF.format( p.getData_validacao_dns() ) ) ); - gridValidacoes.getChildren().add( valDnsText ); - - if ( p.getObservacoes_dns() != null && ! "".equals( p.getObservacoes_dns().trim() ) ) - { - StaticText obsTitleText = new StaticText(); - obsTitleText.setEscape( false ); - obsTitleText.setText( "Observações gerais DNS: " ); - - StaticText obsText = new StaticText(); - obsText.setEscape( false ); - obsText.setText( p.getObservacoes_dns() ); - - gridValidacoes.getChildren().add( obsTitleText ); - gridValidacoes.getChildren().add( obsText ); - } - } - - // 6 - System.out.println( "showValidacoes() : 6. (Validacao HS) " + p.getValidacao_hs() ); - if ( p.getValidacao_hs() ) - { - StaticText valHsText = new StaticText(); - valHsText.setEscape( false ); - String nome = UtilizadoresLogic.getInstance().getNomeUtilizadorByID( p.getUser_hs() ); - valHsText.setText( "Validado por " + nome + " (Técnico Superior de SHST)" + ( p.getData_validacao_hs() == null ? "" : " a " + DF.format( p.getData_validacao_hs() ) ) ); - gridValidacoes.getChildren().add( valHsText ); - } - - grid.getChildren().add( gridValidacoes ); - } + } + + // 5 + System.out.println("showValidacoes() : 5. (Validacao DNS) " + p.getValidacao_dns()); + if (p.getValidacao_dns()) { + StaticText valDnsText = new StaticText(); + valDnsText.setEscape(false); + String nome = UtilizadoresLogic.getInstance().getNomeUtilizadorByID(p.getUser_dns()); + valDnsText.setText("Validado por " + nome + " (Director Nacional de Segurança)" + (p.getData_validacao_dns() == null ? "" : " a " + DF.format(p.getData_validacao_dns()))); + gridValidacoes.getChildren().add(valDnsText); + + if (p.getObservacoes_dns() != null && !"".equals(p.getObservacoes_dns().trim())) { + StaticText obsTitleText = new StaticText(); + obsTitleText.setEscape(false); + obsTitleText.setText("Observações gerais DNS: "); + + StaticText obsText = new StaticText(); + obsText.setEscape(false); + obsText.setText(p.getObservacoes_dns()); + + gridValidacoes.getChildren().add(obsTitleText); + gridValidacoes.getChildren().add(obsText); + } + } + + // 6 + System.out.println("showValidacoes() : 6. (Validacao HS) " + p.getValidacao_hs()); + if (p.getValidacao_hs()) { + StaticText valHsText = new StaticText(); + valHsText.setEscape(false); + String nome = UtilizadoresLogic.getInstance().getNomeUtilizadorByID(p.getUser_hs()); + valHsText.setText("Validado por " + nome + " (Técnico Superior de SHST)" + (p.getData_validacao_hs() == null ? "" : " a " + DF.format(p.getData_validacao_hs()))); + gridValidacoes.getChildren().add(valHsText); + } + + grid.getChildren().add(gridValidacoes); + } // private void showValidacoes(HtmlPanelGrid grid, PlanoActuacao p) // { @@ -1002,19 +951,14 @@ public class ViewPlano extends AbstractPageBean // grid.getChildren().add(grd); // } // } - - - private void showSeparator() - { + private void showSeparator() { PageSeparator separator = new PageSeparator(); // separator.setStyle( "margin-bottom: 50px;" ); - gridAreaContainer.getChildren().add( separator ); + gridAreaContainer.getChildren().add(separator); } - public String butVoltar_action() - { + public String butVoltar_action() { return "lista_planos"; } - } diff --git a/trunk/PlanosActuacao/src/java/updates/PAUpdatesListProvider.java b/trunk/PlanosActuacao/src/java/updates/PAUpdatesListProvider.java index 74de8f44..b5d9c3cb 100644 --- a/trunk/PlanosActuacao/src/java/updates/PAUpdatesListProvider.java +++ b/trunk/PlanosActuacao/src/java/updates/PAUpdatesListProvider.java @@ -4,7 +4,7 @@ import com.evolute.module.updater.AbstractUpdate; import com.evolute.module.updater.UpdaterListProvider; import updates.updates.Update1; import updates.updates.Update2; -import updates.updates.Update3; +import updates.updates.FixPlanoImportedUnicode; /** * User: dneves @@ -15,8 +15,8 @@ public class PAUpdatesListProvider extends UpdaterListProvider private static final AbstractUpdate[] UPDATES_LIST = new AbstractUpdate[] { new Update1( 0, 1 ), // support for valor qualitativo (@ riscos) - new Update2( 1, 2 ), // update valor qualitativo -// new Update3( 2, 3 ), // corrigir enconde planos importados + new Update2( 1, 2 ), // update valor qualitativo + new FixPlanoImportedUnicode( 2, 3, new Integer( 81 ) ), // corrigir enconde planos importados }; diff --git a/trunk/PlanosActuacao/src/java/updates/updates/FixPlanoImportedUnicode.java b/trunk/PlanosActuacao/src/java/updates/updates/FixPlanoImportedUnicode.java new file mode 100644 index 00000000..344583bc --- /dev/null +++ b/trunk/PlanosActuacao/src/java/updates/updates/FixPlanoImportedUnicode.java @@ -0,0 +1,160 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package updates.updates; + +import com.evolute.entity.ProviderInterface; +import com.evolute.entity.evo.EvoDataException; +import com.evolute.entity.evo.EvoDataObject; +import com.evolute.module.updater.AbstractUpdate; +import com.evolute.utils.Singleton; +import db.DBConstants.DB; +import db.data.siprp.outer.PlanoAreasData; +import db.data.siprp.outer.PlanoMedidasData; +import db.data.siprp.outer.PlanoPostosTrabalhoData; +import db.data.siprp.outer.PlanoRiscosData; +import db.data.siprp.outer.PlanosActuacaoData; +import db.data.siprp_local.outer.HsRelatorioAreaData; +import db.data.siprp_local.outer.HsRelatorioMedidaData; +import db.data.siprp_local.outer.HsRelatorioPostoData; +import db.data.siprp_local.outer.HsRelatorioRiscoData; +import db.providers.EvoBaseProvider; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; +import java.util.Set; +import utils.Utils; + +/** + * + * @author dneves + */ +public class FixPlanoImportedUnicode extends AbstractUpdate +{ + + private ProviderInterface< EvoDataObject< ? >, EvoDataException > SIPRP = null; + + private ProviderInterface< EvoDataObject< ? >, EvoDataException > LOCAL = null; + + private final Integer planoID; + + + public FixPlanoImportedUnicode( double start, double end, Integer planoID ) + { + super( start, end, "Corrigir encoding de planos importados" ); + this.planoID = planoID; + } + + @Override + public void doUpdate() throws Exception + { + SIPRP = EvoBaseProvider.getInstance().getProvider( DB.SIPRP ); + LOCAL = EvoBaseProvider.getInstance().getProvider( DB.SIPRP_LOCAL ); + + PlanosActuacaoData planoActuacao = SIPRP.load( PlanosActuacaoData.class, planoID, PlanosActuacaoData.ID ); + System.out.println( "\nFixing planoActuacao ID : " + planoID + " = " + ( planoActuacao == null ? "null" : planoActuacao.getNome_estabelecimento() ) ); + fixAreas( planoActuacao ); + } + + private void fixAreas( PlanosActuacaoData planoActuacao ) throws Exception + { + if ( planoActuacao != null ) + { + List areas = planoActuacao.fromPlanoAreas_plano_id(); + for ( PlanoAreasData area : areas ) + { + Integer hsRelatorioAreaID = area.getArea_id(); + HsRelatorioAreaData relatorioArea = LOCAL.load( HsRelatorioAreaData.class, hsRelatorioAreaID ); + if ( relatorioArea != null ) + { + System.out.println( "\n\tAreaID : " + area.getId() + " = " + area.getDescricao() ); + System.out.println( "\tLocalAreaID : " + relatorioArea.getId() + " = " + relatorioArea.getDescription() ); + + area.setDescricao( Utils.parseToInsert( relatorioArea.getDescription() ) ); + area.save(); + } + fixRiscos(area); + } + } + } + + private void fixRiscos(PlanoAreasData area) throws Exception + { + List riscos = area.fromPlanoRiscos_area_id(); + for (PlanoRiscosData risco : riscos) + { + Integer hsRelatorioRiscoID = risco.getRisco_id(); + HsRelatorioRiscoData relatorioRisco = LOCAL.load( HsRelatorioRiscoData.class, hsRelatorioRiscoID ); + if ( relatorioRisco != null ) + { + System.out.println( "\n\t\tRiscoID : " + risco.getId() + " = " + risco.getDescricao() ); + System.out.println( "\t\tLocalRiscoID : " + relatorioRisco.getId() + " = " + relatorioRisco.getDescription() ); + + risco.setDescricao( Utils.parseToInsert( relatorioRisco.getDescription() ) ); + risco.save(); + } + fixMedidas(risco); + } + } + + private void fixMedidas(PlanoRiscosData risco) throws Exception + { + List medidas = risco.fromPlanoMedidas_risco_id(); + for (PlanoMedidasData medida : medidas) + { + Integer hsRelatorioMedidaID = medida.getMedida_id(); + HsRelatorioMedidaData relatorioMedida = LOCAL.load( HsRelatorioMedidaData.class, hsRelatorioMedidaID ); + if ( relatorioMedida != null ) + { + System.out.println( "\n\t\t\tMedidaID : " + medida.getId() + " = " + medida.getDescricao() ); + System.out.println( "\t\t\tLocalMedidaID : " + relatorioMedida.getId() + " = " + relatorioMedida.getDescription() ); + + medida.setDescricao( Utils.parseToInsert( relatorioMedida.getDescription() ) ); + medida.save(); + } + fixPostosTrabalho(medida); + } + } + + private void fixPostosTrabalho(PlanoMedidasData medida) throws Exception + { + List postosTrabalho = medida.fromPlanoPostosTrabalho_medida_id(); + for (PlanoPostosTrabalhoData posto : postosTrabalho) + { + Integer hsRelatorioPostoID = posto.getPosto_id(); + HsRelatorioPostoData relatorioPosto = LOCAL.load( HsRelatorioPostoData.class, hsRelatorioPostoID ); + if ( relatorioPosto != null ) + { + System.out.println( "\n\t\t\t\tPostoID : " + posto.getId() + " = " + posto.getDescricao() ); + System.out.println( "\t\t\t\tLocalPostoID : " + relatorioPosto.getId() + " = " + relatorioPosto.getDescription() ); + + posto.setDescricao( Utils.parseToInsert( relatorioPosto.getDescription() ) ); + posto.save(); + } + } + } + + public static void main( String ... args ) throws Exception + { + FixPlanoImportedUnicode update = new FixPlanoImportedUnicode( 0, 1, new Integer( 81 ) ); + + Properties props = new Properties(); + props.load( update.getClass().getClassLoader().getResourceAsStream( "app.properties" ) ); + + Set< Object > keySet = props.keySet(); + Iterator< Object > it = keySet.iterator(); + while ( it.hasNext() ) + { + Object key = it.next(); + Object value = props.getProperty( ( String ) key ); + + Singleton.setInstance( ( String ) key, value ); + } + + EvoBaseProvider.getInstance(); + + update.doUpdate(); + } + +} diff --git a/trunk/PlanosActuacao/src/java/updates/updates/Update3.java b/trunk/PlanosActuacao/src/java/updates/updates/Update3.java deleted file mode 100644 index fdc261a9..00000000 --- a/trunk/PlanosActuacao/src/java/updates/updates/Update3.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - -package updates.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author dneves - */ -public class Update3 extends AbstractUpdate -{ - - public Update3( double start, double end ) - { - super( start, end, "Corrigir encoding de planos importados" ); - } - - @Override - public void doUpdate() throws Exception - { - // TODO : fix db unicode - } - -} diff --git a/trunk/PlanosActuacao/src/java/utils/Utils.java b/trunk/PlanosActuacao/src/java/utils/Utils.java index 98c8e9d2..25baf5b3 100644 --- a/trunk/PlanosActuacao/src/java/utils/Utils.java +++ b/trunk/PlanosActuacao/src/java/utils/Utils.java @@ -7,6 +7,7 @@ package utils; import com.evolute.utils.Singleton; import com.evolute.utils.error.ErrorLogger; +import com.evolute.utils.strings.UnicodeChecker; import db.entidades.Utilizador; import java.util.Map; import javax.faces.context.ExternalContext; @@ -19,8 +20,19 @@ import planosactuacao.SessionBean1; * * @author lluis */ -public class Utils { - +public class Utils +{ + + public static String parseToInsert( String str ) + { + String result = str; + if ( result != null ) + { + result = UnicodeChecker.parseToUnicode( result, true, true ); + } + return result; + } + public static String unicodeToHTML( String text ) { if( text == null || text.length() < 6 )