From f55846ac94df4d6937f1da3e12d1d4e73795c20b Mon Sep 17 00:00:00 2001 From: Frederico Palma Date: Tue, 20 Mar 2007 18:10:54 +0000 Subject: [PATCH] no message git-svn-id: https://svn.coded.pt/svn/SIPRP@337 bb69d46d-e84e-40c8-a05a-06db0d633741 --- trunk/jpox.bat | 5 - trunk/jpox.sh | 5 - trunk/siprp/Main.java | 2 +- trunk/siprp/ficha/ExamePDF.java | 3 +- .../processo/EstruturaProcessoPanel.java | 111 ++++++++++++++++++ .../processo/ProcessoDataProvider.java | 24 ++++ trunk/siprp/update/UpdateList.java | 2 +- .../{V7_0_To_V7_1.java => V7_0_To_V7_2.java} | 12 +- 8 files changed, 145 insertions(+), 19 deletions(-) delete mode 100644 trunk/jpox.bat delete mode 100644 trunk/jpox.sh create mode 100644 trunk/siprp/medicina/processo/EstruturaProcessoPanel.java rename trunk/siprp/update/updates/{V7_0_To_V7_1.java => V7_0_To_V7_2.java} (90%) diff --git a/trunk/jpox.bat b/trunk/jpox.bat deleted file mode 100644 index ee741b8b..00000000 --- a/trunk/jpox.bat +++ /dev/null @@ -1,5 +0,0 @@ -cd build -cd classes -java -cp .;../../evutils;../../jpox;../../jpox/jpox-1.0.4.jar;../../jpox/jpox-enhancer-1.0.4.jar;../../jars/log4j-1.2.8.jar;../../jdo/jdo.jar;../../jdo;../../jpox/bcel-5.1.jar org.jpox.enhancer.JPOXEnhancer siprp/data/package.jdo -cd .. -cd .. \ No newline at end of file diff --git a/trunk/jpox.sh b/trunk/jpox.sh deleted file mode 100644 index 9359f31e..00000000 --- a/trunk/jpox.sh +++ /dev/null @@ -1,5 +0,0 @@ -cd build -cd classes -java -cp .:../../evutils:../../jpox:../../jpox/jpox-1.0.4.jar:../../jpox/jpox-enhancer-1.0.4.jar:../../jars/log4j-1.2.8.jar:../../jdo/jdo.jar:../../jdo:../../jpox/bcel-5.1.jar org.jpox.enhancer.JPOXEnhancer siprp/data/package.jdo -cd .. -cd .. \ No newline at end of file diff --git a/trunk/siprp/Main.java b/trunk/siprp/Main.java index a5419297..f2615967 100644 --- a/trunk/siprp/Main.java +++ b/trunk/siprp/Main.java @@ -22,7 +22,7 @@ import siprp.update.UpdateWindow; public class Main implements com.evolute.utils.ui.window.Connector { - public final static String SHST_VERSION = "7.1"; + public final static String SHST_VERSION = "7.2"; private final static ClassLoader classLoader = new EVUtilsImageLib().getClass().getClassLoader(); diff --git a/trunk/siprp/ficha/ExamePDF.java b/trunk/siprp/ficha/ExamePDF.java index 133c9436..c2ea0993 100644 --- a/trunk/siprp/ficha/ExamePDF.java +++ b/trunk/siprp/ficha/ExamePDF.java @@ -219,7 +219,8 @@ public class ExamePDF { conteudo.add( new Chunk( "\n\nFICHA DE APTID\u00c3O\n", FontFactory.getFont( "Arial", 10, Font.BOLD ) ) ); - conteudo.add( new Chunk( "(Portaria n\u00ba1031/2002, de 10 de Agosto)", + conteudo.add( new Chunk( "(Portaria n.\u00ba 299/2007, de 16 de Mar\u00e7o)", +// conteudo.add( new Chunk( "(Portaria n\u00ba1031/2002, de 10 de Agosto)", FontFactory.getFont( "Arial", 7, Font.BOLD ) ) ); conteudo.setAlignment( Element.ALIGN_CENTER ); diff --git a/trunk/siprp/medicina/processo/EstruturaProcessoPanel.java b/trunk/siprp/medicina/processo/EstruturaProcessoPanel.java new file mode 100644 index 00000000..0b709e46 --- /dev/null +++ b/trunk/siprp/medicina/processo/EstruturaProcessoPanel.java @@ -0,0 +1,111 @@ +/* + * EstruturaProcessoPanel.java + * + * Created on March 20, 2007, 12:07 PM + * + * To change this template, choose Tools | Template Manager + * and open the template in the editor. + */ + +package siprp.medicina.processo; + +import com.evolute.utils.data.IDObject; +import com.evolute.utils.data.MappableObject; +import com.evolute.utils.ui.DialogException; +import java.awt.*; +import java.text.DateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Locale; +import javax.swing.*; +import javax.swing.tree.DefaultMutableTreeNode; +import siprp.medicina.processo.data.MarcacoesProcessoData; + +/** + * + * @author fpalma + */ +public class EstruturaProcessoPanel extends JPanel +{ + protected static final DateFormat D_F = DateFormat.getDateInstance( DateFormat.SHORT, new Locale( "pt", "PT" ) ); + + protected JScrollPane mainScroll; + protected DefaultMutableTreeNode rootNode; + protected JTree mainTree; + + protected ProcessoDataProvider provider; + + protected IDObject trabalhador; + protected final HashMap PROCESSOS_POR_ID = + new HashMap(); + + /** Creates a new instance of EstruturaProcessoPanel */ + public EstruturaProcessoPanel() + throws Exception + { + provider = ProcessoDataProvider.getProvider(); + setupComponents(); + setTrabalhador( new MappableObject( new Integer( 12 ), "Alexandre de Matos Monge" ) ); + } + + private void setupComponents() + { + mainScroll = new JScrollPane(); + mainScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED ); + mainScroll.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED ); + rootNode = new DefaultMutableTreeNode( new MappableObject( new Integer( 12 ), "Frederico Palma" ) ); + mainTree = new JTree( rootNode ); + mainScroll.setViewportView( mainTree ); + setLayout( new GridLayout( 1, 1 ) ); + add( mainScroll ); + + } + + public void setTrabalhador( IDObject trabalhador ) + { + this.trabalhador = trabalhador; + rootNode.removeAllChildren(); + PROCESSOS_POR_ID.clear(); + rootNode.setUserObject( trabalhador ); + DefaultMutableTreeNode nodes[] = + loadProcessos( trabalhador.getID() ); + for( int n = 0; n < nodes.length; n++ ) + { + rootNode.add( nodes[ n ] ); + } + repaint(); + } + + protected DefaultMutableTreeNode[] loadProcessos( Integer trabalhadorID ) + { + try + { + Integer ids[] = provider.getIDsProcessosByTrabalhador( trabalhadorID ); + DefaultMutableTreeNode nodes[] = new DefaultMutableTreeNode[ ids.length ]; + for( int n = 0; n < ids.length; n++ ) + { + MarcacoesProcessoData processo = provider.getProcessoByID( ids[ n ] ); + Date dataInicio = ( Date ) processo.get( MarcacoesProcessoData.DATA_INICIO ); + Date dataFim = ( Date ) processo.get( MarcacoesProcessoData.DATA_FIM ); + String codigoEstado = ( String ) processo.get( MarcacoesProcessoData.ESTADO ); + String estado = provider.getDescricaoEstadoProcessoByCodigo( codigoEstado ); + String desc = D_F.format( dataInicio ); + if( dataFim != null ) + { + desc += " - " + D_F.format( dataFim ); + } + desc += ": " + estado; + IDObject processoObject = + new MappableObject( ids[ n ], desc ); + nodes[ n ] = new DefaultMutableTreeNode( processoObject ); + PROCESSOS_POR_ID.put( ids[ n ], processo ); + } + return nodes; + } + catch( Exception ex ) + { + DialogException.showExceptionMessage( ex, "Erro a carregar dados", true ); + return new DefaultMutableTreeNode[ 0 ]; + } + } +} diff --git a/trunk/siprp/medicina/processo/ProcessoDataProvider.java b/trunk/siprp/medicina/processo/ProcessoDataProvider.java index a499a3d9..7a868057 100644 --- a/trunk/siprp/medicina/processo/ProcessoDataProvider.java +++ b/trunk/siprp/medicina/processo/ProcessoDataProvider.java @@ -18,6 +18,7 @@ import com.evolute.utils.sql.Expression; import com.evolute.utils.sql.Field; import com.evolute.utils.sql.Select; import com.evolute.utils.sql.Select2; +import java.util.HashMap; import siprp.medicina.processo.data.MarcacoesProcessoData; /** @@ -26,6 +27,24 @@ import siprp.medicina.processo.data.MarcacoesProcessoData; */ public class ProcessoDataProvider { + public static final String PROCESSO_ABERTO_CODE = "a"; + public static final String PROCESSO_FECHADO_CODE = "f"; + public static final String PROCESSO_CANCELADO_CODE = "c"; + + public static final String PROCESSO_ABERTO_DESCRIPTION = "Aberto"; + public static final String PROCESSO_FECHADO_DESCRIPTION = "Fechado"; + public static final String PROCESSO_CANCELADO_DESCRIPTION = "Cancelado"; + + public static final HashMap ESTADO_PROCESSO_BY_CODE = + new HashMap(); + + static + { + ESTADO_PROCESSO_BY_CODE.put( PROCESSO_ABERTO_CODE, PROCESSO_ABERTO_DESCRIPTION ); + ESTADO_PROCESSO_BY_CODE.put( PROCESSO_FECHADO_CODE, PROCESSO_FECHADO_DESCRIPTION ); + ESTADO_PROCESSO_BY_CODE.put( PROCESSO_CANCELADO_CODE, PROCESSO_CANCELADO_DESCRIPTION ); + } + private static final Object LOCK = new Object(); private static ProcessoDataProvider instance = null; private Executer EXECUTER; @@ -87,4 +106,9 @@ public class ProcessoDataProvider processo.save(); } + public String getDescricaoEstadoProcessoByCodigo( String codigo ) + throws Exception + { + return ESTADO_PROCESSO_BY_CODE.get( codigo ); + } } diff --git a/trunk/siprp/update/UpdateList.java b/trunk/siprp/update/UpdateList.java index 897429b5..a1de2cdc 100644 --- a/trunk/siprp/update/UpdateList.java +++ b/trunk/siprp/update/UpdateList.java @@ -24,7 +24,7 @@ import com.evolute.utils.sql.*; public class UpdateList { protected static final Update UPDATE_LIST[] = - new Update[]{ new siprp.update.updates.V6_1_To_V7_0(), new siprp.update.updates.V7_0_To_V7_1() }; + new Update[]{ new siprp.update.updates.V6_1_To_V7_0(), new siprp.update.updates.V7_0_To_V7_2() }; protected static Executer EXECUTER; protected static double version = -1; diff --git a/trunk/siprp/update/updates/V7_0_To_V7_1.java b/trunk/siprp/update/updates/V7_0_To_V7_2.java similarity index 90% rename from trunk/siprp/update/updates/V7_0_To_V7_1.java rename to trunk/siprp/update/updates/V7_0_To_V7_2.java index a403c820..19f7986a 100644 --- a/trunk/siprp/update/updates/V7_0_To_V7_1.java +++ b/trunk/siprp/update/updates/V7_0_To_V7_2.java @@ -1,5 +1,5 @@ /* - * V6_1_To_V7_0.java + * V7_0_To_V7_2.java * * Created on 26 de Setembro de 2006, 11:48 * @@ -19,14 +19,14 @@ import com.evolute.utils.sql.*; * * @author fpalma */ -public class V7_0_To_V7_1 +public class V7_0_To_V7_2 implements siprp.update.Update { /** - * Creates a new instance of V6_1_To_V7_0 + * Creates a new instance of V7_0_To_V7_2 */ - public V7_0_To_V7_1() + public V7_0_To_V7_2() { } @@ -42,7 +42,7 @@ public class V7_0_To_V7_1 public double getEndVersion() { - return 7.1; + return 7.2; } public void doUpdate() @@ -70,6 +70,6 @@ public class V7_0_To_V7_1 public String toString() { - return "v7.0 para v7.1"; + return "v7.0 para v7.2"; } }