diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Prestadores.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Prestadores.java index 6f957988..171fec39 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Prestadores.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Prestadores.java @@ -1,9 +1,47 @@ package siprp.database.cayenne.objects; +import com.evolute.utils.strings.UnicodeChecker; + import siprp.database.cayenne.objects.auto._Prestadores; public class Prestadores extends _Prestadores { + private String name = null; + + private String convertedName = null; + + @Override + public String getNome() + { + String currentName = super.getNome(); + if( name == null || !name.equals( currentName )) + { + name = currentName; + convertedName = null; + } + return convertName(); + } + + @Override + public void setNome( String nome ) + { + super.setNome( UnicodeChecker.parseToUnicode( name ) ); + getNome(); + } + + private String convertName() + { + if( name == null ) + { + convertedName = null; + } + else + { + convertedName = UnicodeChecker.parseFromUnicode( name ); + } + return convertedName; + } + } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Trabalhadores.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Trabalhadores.java index ec6f9d9d..84a8e9b3 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Trabalhadores.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Trabalhadores.java @@ -64,7 +64,7 @@ public class Trabalhadores extends _Trabalhadores @Override public void setNome( String nome ) { - super.setNome( nome ); + super.setNome( UnicodeChecker.parseToUnicode( name ) ); getNome(); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresConsultasDatas.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresConsultasDatas.java index 0f742bec..19347bc7 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresConsultasDatas.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresConsultasDatas.java @@ -7,7 +7,7 @@ import siprp.medicina.MedicinaConstants; public class TrabalhadoresConsultasDatas extends _TrabalhadoresConsultasDatas implements MedicinaConstants { - + private static final long serialVersionUID = 1L; public String getDataString() diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java index 9fdb9899..30f3290a 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java @@ -124,6 +124,7 @@ public class TrabalhadoresEcdsDatas extends _TrabalhadoresEcdsDatas implements M trabEcd.setToTrabalhadoresEcdsDatas( this ); addToTrabalhadoresEcdArray( trabEcd ); } + getToTrabalhadoresEcds().getGruposExamesForPerfil(); } public void setStateForGrupoProtocolo( PrtGruposProtocolo grupo, Integer estado ) @@ -194,5 +195,11 @@ public class TrabalhadoresEcdsDatas extends _TrabalhadoresEcdsDatas implements M super.setEstado( estado ); getToTrabalhadoresEcds().getGruposExamesForPerfil(); } + + @Override + public void setEstado( Integer estado ){ + super.setEstado( estado ); + getToTrabalhadoresEcds().getGruposExamesForPerfil(); + } } diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ConsultaMutableTreeNode.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ConsultaMutableTreeNode.java index 53608d92..6e1577c7 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ConsultaMutableTreeNode.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ConsultaMutableTreeNode.java @@ -9,6 +9,16 @@ package siprp.medicina.processo.estrutura; +import java.awt.Color; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; + +import siprp.database.cayenne.objects.TrabalhadoresConsultas; +import siprp.database.cayenne.objects.TrabalhadoresProcesso; +import siprp.medicina.MedicinaConstants; +import siprp.medicina.processo.ProcessoConstants; + /** * * @author Frederico @@ -19,11 +29,27 @@ public class ConsultaMutableTreeNode extends MarcacaoMutableTreeNode public static final String ICON_PATH = "siprp/medicina/processo/estrutura/icons/consulta.png"; /** Creates a new instance of ConsultaMutableTreeNode */ - public ConsultaMutableTreeNode( Object userObject ) + public ConsultaMutableTreeNode( TrabalhadoresConsultas userObject ) { super( userObject ); } + @Override + public Color getColor() + { + Integer[] markedEstados = new Integer[] + { + MedicinaConstants.ESTADO_POR_MARCAR, + MedicinaConstants.ESTADO_POR_REALIZAR, + MedicinaConstants.ESTADO_PARCIALMENTE_REALIZADO + }; + if(userObject != null && Arrays.asList( markedEstados ).contains( ((TrabalhadoresConsultas)userObject).getEstado())) + { + return Color.RED; + } + return Color.BLACK; + } + protected String getIconPath() { return ICON_PATH; diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ECDsMutableTreeNode.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ECDsMutableTreeNode.java index 0fabb2a5..40f84631 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ECDsMutableTreeNode.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ECDsMutableTreeNode.java @@ -9,6 +9,12 @@ package siprp.medicina.processo.estrutura; +import java.awt.Color; +import java.util.Arrays; + +import siprp.database.cayenne.objects.TrabalhadoresEcds; +import siprp.medicina.MedicinaConstants; + /** * * @author Frederico @@ -19,11 +25,27 @@ public class ECDsMutableTreeNode extends MarcacaoMutableTreeNode public static final String ICON_PATH = "siprp/medicina/processo/estrutura/icons/ecds.png"; /** Creates a new instance of ECDsMutableTreeNode */ - public ECDsMutableTreeNode( Object userObject ) + public ECDsMutableTreeNode( TrabalhadoresEcds userObject ) { super( userObject ); } + @Override + public Color getColor() + { + Integer[] markedEstados = new Integer[] + { + MedicinaConstants.ESTADO_POR_MARCAR, + MedicinaConstants.ESTADO_POR_REALIZAR, + MedicinaConstants.ESTADO_PARCIALMENTE_REALIZADO + }; + if(userObject != null && Arrays.asList( markedEstados ).contains( ((TrabalhadoresEcds)userObject).getEstado())) + { + return Color.RED; + } + return Color.BLACK; + } + protected String getIconPath() { return ICON_PATH; diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/EstruturaProcessoMutableTreeNode.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/EstruturaProcessoMutableTreeNode.java index fbfd54ed..72f950a3 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/EstruturaProcessoMutableTreeNode.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/EstruturaProcessoMutableTreeNode.java @@ -9,6 +9,8 @@ package siprp.medicina.processo.estrutura; +import java.awt.Color; + import javax.swing.Icon; import javax.swing.tree.DefaultMutableTreeNode; @@ -20,7 +22,8 @@ import com.evolute.utils.images.ImageIconLoader; */ abstract public class EstruturaProcessoMutableTreeNode extends DefaultMutableTreeNode { - protected Icon icon; + protected Icon icon = null; + protected Color color = null; /** Creates a new instance of EstruturaProcessoMutableTreeNode */ @@ -37,6 +40,11 @@ abstract public class EstruturaProcessoMutableTreeNode extends DefaultMutableTre return icon; } + public Color getColor() + { + return color; + } + protected void loadIcon() { if( icon == null && getIconPath() != null ) diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/EstruturaProcessoRenderer.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/EstruturaProcessoRenderer.java index fcd50509..7c9d16f8 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/EstruturaProcessoRenderer.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/EstruturaProcessoRenderer.java @@ -9,9 +9,12 @@ package siprp.medicina.processo.estrutura; +import java.awt.Color; import java.awt.Component; -import javax.swing.*; -import javax.swing.tree.*; + +import javax.swing.Icon; +import javax.swing.JTree; +import javax.swing.tree.DefaultTreeCellRenderer; /** * @@ -39,12 +42,16 @@ public class EstruturaProcessoRenderer extends DefaultTreeCellRenderer expanded, leaf, row, hasFocus); EstruturaProcessoMutableTreeNode node = ( EstruturaProcessoMutableTreeNode ) value; -//System.out.println( node.getICon() ); Icon icon = node.getIcon(); + Color color = node.getColor(); if( icon != null ) { setIcon( icon ); } + if(color != null) + { + setForeground( color ); + } return this; } diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ProcessoMutableTreeNode.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ProcessoMutableTreeNode.java index 827797cd..ddc22f2d 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ProcessoMutableTreeNode.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/estrutura/ProcessoMutableTreeNode.java @@ -9,6 +9,12 @@ package siprp.medicina.processo.estrutura; +import java.awt.Color; + +import siprp.database.cayenne.objects.TrabalhadoresProcesso; +import siprp.medicina.MedicinaConstants; +import siprp.medicina.processo.ProcessoConstants; + /** * * @author Frederico @@ -19,11 +25,21 @@ public class ProcessoMutableTreeNode extends EstruturaProcessoMutableTreeNode public static final String ICON_PATH = "siprp/medicina/processo/estrutura/icons/processo.png"; /** Creates a new instance of ProcessoMutableTreeNode */ - public ProcessoMutableTreeNode( Object userObject ) + public ProcessoMutableTreeNode( TrabalhadoresProcesso userObject ) { super( userObject ); } + @Override + public Color getColor() + { + if(userObject != null && ProcessoConstants.PROCESSO_ABERTO_CODE.equals( ((TrabalhadoresProcesso)userObject).getEstado())) + { + return Color.RED; + } + return Color.BLACK; + } + protected String getIconPath() { return ICON_PATH; diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java index 95f631e8..2760b740 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java @@ -60,6 +60,8 @@ public class LeafOptionDialog extends JDialog public LeafOptionDialog(Map map, String message) { super(); + this.mapEnabledForKey = new HashMap(); + this.mapChosenForKey = new HashMap(); this.message = message; cancelActive = false; for( KeyClass key : map.keySet() ) diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java index 49c7a7ee..a91233b2 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java @@ -72,6 +72,7 @@ public class ProcessoTreePanel extends JPanel try { provider = ProcessoDataProvider.getProvider(); + } catch( Exception e ) { provider = null; @@ -165,8 +166,6 @@ public class ProcessoTreePanel extends JPanel addAndRefresh( node, parentNode ); } } - - @LeafUIActionBinding(action = CREATE_CONSULTA_MARCACAO_EMAIL) public void createConsultaMarcacaoEmailNode( TrabalhadoresConsultasDatasEmails email ) @@ -214,8 +213,6 @@ public class ProcessoTreePanel extends JPanel addAndRefresh( node, parentNode ); } } - - @LeafUIActionBinding(action = CREATE_EXAME_MARCACAO_EMAIL) public void createExameMarcacaoEmailNode( TrabalhadoresEcdsDatasEmails email )