From 185e6b84601c0c5f61768101489d115723b32128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Sim=C3=A3o?= Date: Wed, 26 Dec 2007 16:28:23 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@625 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../objects/TrabalhadoresConsultasDatas.java | 2 +- .../src/siprp/medicina/MedicinaConstants.java | 8 +- .../processo/logic/MedicinaProcessoLogic.java | 110 ++++++++++-------- .../medicina/processo/mail/MailDialog.java | 3 + .../medicina/processo/ui/LeafInputField.java | 2 +- .../processo/ui/LeafOptionDialog.java | 38 ++++-- .../medicina/processo/ui/LeafTextDialog.java | 5 +- .../processo/ui/ProcessoAccoesPanel.java | 6 +- .../processo/ui/ProcessoDadosPanel.java | 60 +++++----- .../processo/ui/ProcessoTreePanel.java | 2 + 10 files changed, 147 insertions(+), 89 deletions(-) diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresConsultasDatas.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresConsultasDatas.java index 6f4fba4a..0f742bec 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresConsultasDatas.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresConsultasDatas.java @@ -41,7 +41,7 @@ public class TrabalhadoresConsultasDatas extends _TrabalhadoresConsultasDatas im { if( estado != null && this.getToTrabalhadoresConsultas() != null && (new Integer(ESTADO_POR_REALIZAR).equals( this.getEstado() ) || new Integer(ESTADO_POR_REALIZAR).equals( estado ))) { - this.getToTrabalhadoresConsultas().setEstado( estado ); + this.getToTrabalhadoresConsultas().setEstado( !(estado.equals( ESTADO_POR_REALIZAR ) || estado.equals( ESTADO_REALIZADO )) ? ESTADO_POR_MARCAR : estado ); } super.setEstado( estado ); } diff --git a/trunk/SIPRPSoft/src/siprp/medicina/MedicinaConstants.java b/trunk/SIPRPSoft/src/siprp/medicina/MedicinaConstants.java index a09a59f8..f999bfe7 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/MedicinaConstants.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/MedicinaConstants.java @@ -59,16 +59,18 @@ public interface MedicinaConstants public static final int ESTADO_DESMARCADO_TRABALHADOR = 3; public static final int ESTADO_DESMARCADO_EMPRESA = 4; public static final int ESTADO_FALTOU = 5; + public static final int ESTADO_ANULADO = 6; + public static final int ESTADO_POR_MARCAR = 7; public static final String ESTADOS_CONSULTA_STR[] = - new String[]{ "Por Realizar", null, "Realizada", + new String[]{ "Por Realizar", "Parcialmente Realizada", "Realizada", "Desmarcada pelo Trabalhador", "Desmarcada pela " + Singleton.getInstance( SingletonConstants.COMPANY_ACRONYM ), - "Trabalhador Faltou" }; + "Trabalhador Faltou", "Anulada", "Por Marcar" }; public static final String ESTADOS_EXAME_STR[] = new String[]{ "Por Realizar", "Parcialmente Realizados", "Realizados", "Desmarcados pelo Trabalhador", "Desmarcados pela " + Singleton.getInstance( SingletonConstants.COMPANY_ACRONYM ), - "Trabalhador Faltou" }; + "Trabalhador Faltou", "Anulado", "Por Marcar" }; public static final String ESTADOS_STR[][] = new String[][]{ ESTADOS_EXAME_STR, ESTADOS_CONSULTA_STR }; diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java index 5a32ee74..bf7eb610 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java @@ -22,6 +22,7 @@ import siprp.database.cayenne.providers.MedicinaDAO; import siprp.logic.SIPRPLogic; import siprp.medicina.MedicinaConstants; import siprp.medicina.processo.ProcessoConstants; +import siprp.medicina.processo.detalhes.EstadoChooser; import siprp.medicina.processo.estrutura.FichaAptidaoMutableTreeNode; import siprp.ui.SIPRPWindow.LeafObject; @@ -37,7 +38,7 @@ public class MedicinaProcessoLogic extends SIPRPLogic @Action(isSave = false) public static final String LOAD_TRABALHADOR = "LOAD_TRABALHADOR"; - + @Action(isSave = false) public static final String SELECT_TRABALHADOR = "SELECT_TRABALHADOR"; @@ -103,7 +104,7 @@ public class MedicinaProcessoLogic extends SIPRPLogic @Action(isSave = true) public static final String SAVE_PROCESSO = "SAVE_PROCESSO"; - + @Action(isSave = true) public static final String SAVE_CONSULTA = "SAVE_CONSULTA"; @@ -118,7 +119,7 @@ public class MedicinaProcessoLogic extends SIPRPLogic @Action(isSave = true) public static final String SAVE_FICHA = "SAVE_FICHA"; - + @Action(isSave = true) public static final String SAVE_EXAME = "SAVE_EXAME"; @@ -139,31 +140,34 @@ public class MedicinaProcessoLogic extends SIPRPLogic @Action(isSave = false) public static final String CLOSE = "CLOSE"; - + @Action(isSave = true) public static final String DESMARCAR_SIPRP_CONSULTA_MARCACAO = "DESMARCAR_SIPRP_CONSULTA_MARCACAO"; - + @Action(isSave = true) public static final String DESMARCAR_TRABALHADOR_CONSULTA_MARCACAO = "DESMARCAR_TRABALHADOR_CONSULTA_MARCACAO"; - + @Action(isSave = true) - public static final String REALIZAR_CONSULTA_MARCACAO = "REALIZAR_CONSULTA_MARCACAO"; - + public static final String REALIZAR_CONSULTA_MARCACAO = "REALIZAR_CONSULTA_MARCACAO"; + @Action(isSave = true) public static final String FALTOU_CONSULTA_MARCACAO = "FALTOU_CONSULTA_MARCACAO"; - + @Action(isSave = true) public static final String DESMARCAR_SIPRP_EXAME_MARCACAO = "DESMARCAR_SIPRP_EXAME_MARCACAO"; - + @Action(isSave = true) public static final String DESMARCAR_TRABALHADOR_EXAME_MARCACAO = "DESMARCAR_TRABALHADOR_EXAME_MARCACAO"; - + @Action(isSave = true) - public static final String REALIZAR_EXAME_MARCACAO = "REALIZAR_EXAME_MARCACAO"; - + public static final String REALIZAR_EXAME_MARCACAO = "REALIZAR_EXAME_MARCACAO"; + @Action(isSave = true) public static final String FALTOU_EXAME_MARCACAO = "FALTOU_EXAME_MARCACAO"; + @Action(isSave = true) + public static final String ANULAR_EXAME_MARCACAO = "ANULAR_EXAME_MARCACAO"; + private MedicinaDAO provider = null; private Trabalhadores currentTrabalhador = null; @@ -255,87 +259,97 @@ public class MedicinaProcessoLogic extends SIPRPLogic { currentProcesso.setDataFim( new Date() ); currentProcesso.setEstado( ProcessoConstants.PROCESSO_FECHADO_CODE ); - saveObject( currentProcesso ); + runActionLater( SAVE_PROCESSO ); } } - + @LeafLogicActionBinding(actions = DESMARCAR_SIPRP_CONSULTA_MARCACAO) public void desmarcarConsultaSiprp() { if( currentConsultaMarcacao != null ) { currentConsultaMarcacao.setEstado( MedicinaConstants.ESTADO_DESMARCADO_EMPRESA ); - saveObject( currentConsultaMarcacao ); + runActionLater( SAVE_CONSULTA_MARCACAO ); } } - + @LeafLogicActionBinding(actions = DESMARCAR_TRABALHADOR_CONSULTA_MARCACAO) public void desmarcarConsultaTrabalhador() { if( currentConsultaMarcacao != null ) { currentConsultaMarcacao.setEstado( MedicinaConstants.ESTADO_DESMARCADO_TRABALHADOR ); - saveObject( currentConsultaMarcacao ); + runActionLater( SAVE_CONSULTA_MARCACAO ); } } - + @LeafLogicActionBinding(actions = FALTOU_CONSULTA_MARCACAO) public void faltouConsulta() { if( currentConsultaMarcacao != null ) { currentConsultaMarcacao.setEstado( MedicinaConstants.ESTADO_FALTOU ); - saveObject( currentConsultaMarcacao ); + runActionLater( SAVE_CONSULTA_MARCACAO ); } } - + @LeafLogicActionBinding(actions = REALIZAR_CONSULTA_MARCACAO) public void realizarConsulta() { if( currentConsultaMarcacao != null ) { currentConsultaMarcacao.setEstado( MedicinaConstants.ESTADO_REALIZADO ); - saveObject( currentConsultaMarcacao ); + runActionLater( SAVE_CONSULTA_MARCACAO ); } } - + @LeafLogicActionBinding(actions = DESMARCAR_SIPRP_EXAME_MARCACAO) public void desmarcarExameSiprp() { if( currentExameMarcacao != null ) { currentExameMarcacao.setEstado( MedicinaConstants.ESTADO_DESMARCADO_EMPRESA ); - saveObject( currentExameMarcacao ); + runActionLater( SAVE_EXAME_MARCACAO ); } } - + @LeafLogicActionBinding(actions = DESMARCAR_TRABALHADOR_EXAME_MARCACAO) public void desmarcarExameTrabalhador() { if( currentExameMarcacao != null ) { currentExameMarcacao.setEstado( MedicinaConstants.ESTADO_DESMARCADO_TRABALHADOR ); - saveObject( currentExameMarcacao ); + runActionLater( SAVE_EXAME_MARCACAO ); } } - + @LeafLogicActionBinding(actions = FALTOU_EXAME_MARCACAO) public void faltouExame() { if( currentExameMarcacao != null ) { currentExameMarcacao.setEstado( MedicinaConstants.ESTADO_FALTOU ); - saveObject( currentExameMarcacao ); + runActionLater( SAVE_EXAME_MARCACAO ); } } - + + @LeafLogicActionBinding(actions = ANULAR_EXAME_MARCACAO) + public void anularExame() + { + if( currentExameMarcacao != null ) + { + currentExameMarcacao.setEstado( MedicinaConstants.ESTADO_ANULADO ); + runActionLater( SAVE_EXAME_MARCACAO ); + } + } + @LeafLogicActionBinding(actions = REALIZAR_EXAME_MARCACAO) public void realizarExame() { if( currentExameMarcacao != null ) { currentExameMarcacao.realizar(); - saveObject( currentConsultaMarcacao ); + runActionLater( SAVE_EXAME_MARCACAO ); } } @@ -427,7 +441,7 @@ public class MedicinaProcessoLogic extends SIPRPLogic currentConsultaMarcacao = new TrabalhadoresConsultasDatas(); currentConsultaMarcacao.setToTrabalhadoresConsultas( currentConsulta ); currentConsultaMarcacao.setEstado( MedicinaConstants.ESTADO_POR_REALIZAR ); - runActionLater(SAVE_CONSULTA_MARCACAO); + runActionLater( SAVE_CONSULTA_MARCACAO ); return currentConsultaMarcacao; } @@ -438,7 +452,7 @@ public class MedicinaProcessoLogic extends SIPRPLogic { currentConsultaMarcacaoEmail = new TrabalhadoresConsultasDatasEmails(); currentConsultaMarcacaoEmail.setToTrabalhadoresConsultasDatas( currentConsultaMarcacao ); - runActionLater(SAVE_CONSULTA_MARCACAO_EMAIL); + runActionLater( SAVE_CONSULTA_MARCACAO_EMAIL ); return currentConsultaMarcacaoEmail; } @@ -449,57 +463,57 @@ public class MedicinaProcessoLogic extends SIPRPLogic { currentConsultaMarcacaoObservacao = new TrabalhadoresConsultasDatasObservacoes(); currentConsultaMarcacaoObservacao.setToTrabalhadoresConsultasDatas( currentConsultaMarcacao ); - runActionLater(SAVE_CONSULTA_MARCACAO_OBSERVACOES); + runActionLater( SAVE_CONSULTA_MARCACAO_OBSERVACOES ); return currentConsultaMarcacaoObservacao; } - @LeafLogicActionBinding(actions = CREATE_EXAME ) + @LeafLogicActionBinding(actions = CREATE_EXAME) public TrabalhadoresEcds createExame() { currentExame = new TrabalhadoresEcds(); currentExame.setToTrabalhadores( currentTrabalhador ); currentExame.setToTrabalhadoresProcesso( currentProcesso ); currentExame.setEstado( MedicinaConstants.ESTADO_POR_REALIZAR ); - runActionLater(SAVE_EXAME); + runActionLater( SAVE_EXAME ); return currentExame; } - - @LeafLogicActionBinding(actions = CREATE_EXAME_MARCACAO ) + + @LeafLogicActionBinding(actions = CREATE_EXAME_MARCACAO) public TrabalhadoresEcdsDatas createExameMarcacao() { currentExameMarcacao = new TrabalhadoresEcdsDatas(); currentExameMarcacao.setEstado( MedicinaConstants.ESTADO_POR_REALIZAR ); currentExameMarcacao.setToTrabalhadoresEcds( currentExame ); - runActionLater(SAVE_EXAME_MARCACAO); + runActionLater( SAVE_EXAME_MARCACAO ); return currentExameMarcacao; } - - @LeafLogicActionBinding(actions = CREATE_EXAME_MARCACAO_OBSERVACOES ) + + @LeafLogicActionBinding(actions = CREATE_EXAME_MARCACAO_OBSERVACOES) public TrabalhadoresEcdsDatasObservacoes createExameMarcacaoObservacao() { currentExameMarcacaoObservacao = new TrabalhadoresEcdsDatasObservacoes(); currentExameMarcacaoObservacao.setToTrabalhadoresEcdsDatas( currentExameMarcacao ); - runActionLater(SAVE_EXAME_MARCACAO_OBSERVACOES); + runActionLater( SAVE_EXAME_MARCACAO_OBSERVACOES ); return currentExameMarcacaoObservacao; } - - @LeafLogicActionBinding(actions = CREATE_EXAME_MARCACAO_EMAIL ) + + @LeafLogicActionBinding(actions = CREATE_EXAME_MARCACAO_EMAIL) public TrabalhadoresEcdsDatasEmails createExameMarcacaoEmail() { currentExameMarcacaoEmail = new TrabalhadoresEcdsDatasEmails(); currentExameMarcacaoEmail.setToTrabalhadoresEcdsDatas( currentExameMarcacao ); - runActionLater(SAVE_EXAME_MARCACAO_EMAIL); + runActionLater( SAVE_EXAME_MARCACAO_EMAIL ); return currentExameMarcacaoEmail; } - @LeafLogicActionBinding(actions = CREATE_PROCESSO ) + @LeafLogicActionBinding(actions = CREATE_PROCESSO) public TrabalhadoresProcesso createProcesso() { currentProcesso = new TrabalhadoresProcesso(); currentProcesso.setDataInicio( new Date() ); currentProcesso.setEstado( ProcessoConstants.PROCESSO_ABERTO_CODE ); currentProcesso.setToTrabalhadores( currentTrabalhador ); - runActionLater(SAVE_PROCESSO); + runActionLater( SAVE_PROCESSO ); return currentProcesso; } @@ -511,14 +525,14 @@ public class MedicinaProcessoLogic extends SIPRPLogic provider.saveObject( object ); runAction( REFRESH ); } - + private void clearAll() { currentConsulta = null; currentConsultaMarcacao = null; currentConsultaMarcacaoEmail = null; currentConsultaMarcacaoObservacao = null; - currentExame= null; + currentExame = null; currentExameMarcacao = null; currentExameMarcacaoEmail = null; currentExameMarcacaoObservacao = null; diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/mail/MailDialog.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/mail/MailDialog.java index 5ed55a45..6832f55b 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/mail/MailDialog.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/mail/MailDialog.java @@ -123,6 +123,9 @@ public class MailDialog extends CustomJDialog { center(); } + setModal( true ); + setSize( 1024, 768 ); + setVisible( true ); } private void setupComponents() diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafInputField.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafInputField.java index ee353ebc..139ca92c 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafInputField.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafInputField.java @@ -107,7 +107,7 @@ public class LeafInputField extends JPanel implements F private String getStringFromUser() { - LeafTextDialog textDialog = new LeafTextDialog( getParentFrame(), this, (String) object ); + LeafTextDialog textDialog = new LeafTextDialog( getParentFrame(), this, (String) object, false); return textDialog.getText(); } diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java index 2cb3c15a..11ff0283 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java @@ -21,9 +21,9 @@ public class LeafOptionDialog extends JDialog { private static final long serialVersionUID = 1L; - private static final String OK_LABEL = "Ok"; - private static final String CANCEL_LABEL = "Cancelar"; + + private static String okLabel = "Ok"; private final JLabel labelMessage = new JLabel(); @@ -41,14 +41,12 @@ public class LeafOptionDialog extends JDialog private boolean ordered = false; - /** Creates a new instance of JCalendarDialog */ public LeafOptionDialog(Map map) { super( ); startup( map, null ); } - /** Creates a new instance of JCalendarDialog */ public LeafOptionDialog( Map map, String message, boolean cancelActive) { super( ); @@ -57,7 +55,15 @@ public class LeafOptionDialog extends JDialog startup( map, null ); } - /** Creates a new instance of JCalendarDialog */ + public LeafOptionDialog( Map map, String message, String okButton, boolean cancelActive) + { + super( ); + this.cancelActive = cancelActive; + this.message = message; + this.okLabel = okButton; + startup( map, null ); + } + public LeafOptionDialog(Map map, String message) { super( ); @@ -65,7 +71,6 @@ public class LeafOptionDialog extends JDialog startup( map, null ); } - /** Creates a new instance of JCalendarDialog */ public LeafOptionDialog(OrderedMap orderedMap, String message) { super( ); @@ -73,6 +78,25 @@ public class LeafOptionDialog extends JDialog this.message = message; startup( null, orderedMap ); } + + /** Creates a new instance of JCalendarDialog */ + public LeafOptionDialog(Map map, String message, String okButton) + { + super( ); + this.message = message; + this.okLabel = okButton; + startup( map, null ); + } + + /** Creates a new instance of JCalendarDialog */ + public LeafOptionDialog(OrderedMap orderedMap, String message, String okButton) + { + super( ); + ordered = true; + this.message = message; + this.okLabel = okButton; + startup( null, orderedMap ); + } private void startup( Map map, OrderedMap orderedMap ) { @@ -143,7 +167,7 @@ public class LeafOptionDialog extends JDialog } if( cancelActive ) { - submitButton.setObject( ordered ? OK_LABEL : CANCEL_LABEL ); + submitButton.setObject( ordered ? okLabel : CANCEL_LABEL ); submitButton.setClickable( true ); getContentPane().add( submitButton, new TableLayoutConstraints( 0, keySet.size() + shift ) ); addListenerToComponent( submitButton ); diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafTextDialog.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafTextDialog.java index c7b6d643..f42f64bb 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafTextDialog.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafTextDialog.java @@ -46,7 +46,7 @@ public class LeafTextDialog extends JDialog private TableLayout expandedLayout = null; /** Creates a new instance of JCalendarDialog */ - public LeafTextDialog(JFrame parentFrame, JComponent parent, String defaultText) + public LeafTextDialog(JFrame parentFrame, JComponent parent, String defaultText, boolean expanded) { super( parentFrame ); this.defaultText = defaultText == null ? "" : defaultText; @@ -60,6 +60,7 @@ public class LeafTextDialog extends JDialog setupLayout(); setUndecorated( true ); setLocationRelativeTo( parent ); + this.expanded = expanded; expand( expanded ); addListeners(); setVisible( true ); @@ -105,7 +106,7 @@ public class LeafTextDialog extends JDialog ((JComponent) getContentPane()).setBorder( BorderFactory.createRaisedBevelBorder() ); - setSize( layout.preferredLayoutSize( this.getContentPane() ) ); + setSize( expand ? expandedLayout.preferredLayoutSize( this.getContentPane() ) : layout.preferredLayoutSize( this.getContentPane() ) ); } private void setupComponents(boolean expand) diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java index 36ffb3a4..3199d100 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java @@ -146,6 +146,9 @@ public class ProcessoAccoesPanel extends JPanel @ActionActivation(onSelect = FALTOU_EXAME_MARCACAO, onChange = "") public final LeafButton buttonExameMarcacaoFaltou = new LeafButton( "Faltou" ); + + @ActionActivation(onSelect = ANULAR_EXAME_MARCACAO, onChange = "") + public final LeafButton buttonExameMarcacaoAnular = new LeafButton( "Anular" ); // email marcacao exame @@ -341,6 +344,7 @@ public class ProcessoAccoesPanel extends JPanel buttonExameMarcacaoDesmarcarTrabalhador.setEnabled( porRealizar ); buttonExameMarcacaoFaltou.setEnabled( porRealizar ); buttonExameMarcacaoRealizar.setEnabled( porRealizar ); + buttonExameMarcacaoAnular.setEnabled( porRealizar ); buttonNovoExameMarcacaoObservacoes.setEnabled( noObservacoes ); cardLayout.show( cardPanel, PANEL_EXAME_MARCACAO_NAME ); } @@ -413,7 +417,7 @@ public class ProcessoAccoesPanel extends JPanel JPanel exameMarcacaoUpperPanel = new JPanel(); JPanel exameMarcacaoLowerPanel = new JPanel(); setupSimpleActionsPanel( exameMarcacaoUpperPanel, buttonNovoExameMarcacaoEmail, buttonNovoExameMarcacaoObservacoes, new JPanel() ); - setupSimpleActionsPanel( exameMarcacaoLowerPanel, buttonExameMarcacaoRealizar, buttonExameMarcacaoDesmarcarSiprp, buttonExameMarcacaoDesmarcarTrabalhador, buttonExameMarcacaoFaltou); + setupSimpleActionsPanel( exameMarcacaoLowerPanel, buttonExameMarcacaoRealizar, buttonExameMarcacaoAnular, buttonExameMarcacaoDesmarcarSiprp, buttonExameMarcacaoDesmarcarTrabalhador, buttonExameMarcacaoFaltou ); TableLayout exameMarcacaoLayout = new TableLayout(new double[]{TableLayout.FILL}, new double[]{TableLayout.MINIMUM, TableLayout.FILL,TableLayout.MINIMUM}); panelExameMarcacao.setLayout( exameMarcacaoLayout ); panelExameMarcacao.add( exameMarcacaoUpperPanel, new TableLayoutConstraints(0,0) ); diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java index fe8b4891..349c1be1 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java @@ -56,6 +56,7 @@ import siprp.database.cayenne.objects.TrabalhadoresProcesso; import siprp.logic.SIPRPLogic.LeafUIActionBinding; import siprp.medicina.MedicinaConstants; import siprp.medicina.processo.ProcessoConstants; +import siprp.medicina.processo.mail.MailDialog; import siprp.ui.SIPRPWindow; import siprp.ui.SIPRPWindow.ActionActivation; @@ -154,7 +155,7 @@ public class ProcessoDadosPanel extends JPanel // exame private final JLabel labelExameEstado = new JLabel( "Estado" ); private final JLabel labelExameData = new JLabel( "Data" ); - private final JLabel labelExameGruposEcds = new JLabel( "Ecds" ); + private final JLabel labelExameGruposEcds = new JLabel( "ECDs" ); public final LeafInputField> inputExameEstado = new LeafInputField>(); public final LeafInputField> inputExameGruposEcds = new LeafInputField>(); @@ -163,7 +164,7 @@ public class ProcessoDadosPanel extends JPanel // marcacao exame private final JLabel labelExameMarcacaoEstado = new JLabel( "Estado" ); private final JLabel labelExameMarcacaoData = new JLabel( "Data" ); - private final JLabel labelExameMarcacaoGruposEcds = new JLabel( "Ecds" ); + private final JLabel labelExameMarcacaoGruposEcds = new JLabel( "ECDs" ); public final LeafInputField> inputExameMarcacaoEstado = new LeafInputField>(); public final LeafInputField inputExameMarcacaoData = new LeafInputField(); @@ -334,10 +335,10 @@ public class ProcessoDadosPanel extends JPanel if( exame != null ) { inputExameData.setObject( exame.getData() ); - inputExameEstado.setObject( exame.getEstados() , exame.getEstado()); + inputExameEstado.setObject( exame.getEstados(), exame.getEstado() ); OrderedMap grupos = exame.getGruposExamesForPerfil(); inputExameGruposEcds.setCollapseOptions( false ); - inputExameGruposEcds.setObject( grupos,grupos.getFirst() ); + inputExameGruposEcds.setObject( grupos, grupos.getFirst() ); cardLayout.show( this, PANEL_EXAME_NAME ); } else @@ -393,19 +394,19 @@ public class ProcessoDadosPanel extends JPanel cardLayout.show( this, PANEL_TRABALHADOR_NAME ); } } - + @LeafUIActionBinding(action = CREATE_PROCESSO) public void setForNewProcesso( TrabalhadoresProcesso processo ) { HashMap tipos = processo.getMotivos(); - LeafOptionDialog option = new LeafOptionDialog(tipos, "Escolha o tipo de processo:"); + LeafOptionDialog option = new LeafOptionDialog( tipos, "Escolha o tipo de processo:" ); Integer chosen = option.getOption(); - if(chosen != null) + if( chosen != null ) { processo.setMotivo( chosen ); } } - + @LeafUIActionBinding(action = CREATE_CONSULTA) public void setForNewConsulta( TrabalhadoresConsultas consulta ) { @@ -422,13 +423,21 @@ public class ProcessoDadosPanel extends JPanel @LeafUIActionBinding(action = CREATE_CONSULTA_MARCACAO_EMAIL) public void setForNewConsultaMarcacaoEmail( TrabalhadoresConsultasDatasEmails email ) { - + try + { + MailDialog mailDialog = new MailDialog( getParentFrame() ); + email.setSubject( mailDialog.getSubject() ); + email.setBody( mailDialog.getMessage() ); + } catch( Exception e ) + { + e.printStackTrace(System.out); + } } @LeafUIActionBinding(action = CREATE_CONSULTA_MARCACAO_OBSERVACOES) public void setForNewConsultaMarcacaoObservacoes( TrabalhadoresConsultasDatasObservacoes observacoes ) { - LeafTextDialog textDialog = new LeafTextDialog( getParentFrame(), this, "" ); + LeafTextDialog textDialog = new LeafTextDialog( getParentFrame(), this, "", true); String text = textDialog.getText(); observacoes.setObservacao( text ); inputConsultaMarcacaoObsMensagem.setEditable( true ); @@ -445,25 +454,33 @@ public class ProcessoDadosPanel extends JPanel LeafCalendarDialog calendar = new LeafCalendarDialog( getParentFrame(), this, false, false ); Date date = calendar.getDate(); marcacao.setData( date ); - + OrderedMap grupos = marcacao.getToTrabalhadoresEcds().getGruposExamesForPerfil(); - LeafOptionDialog gruposChosen = new LeafOptionDialog(grupos,"Escolha os ECDs a marcar"); - for(PrtGruposProtocolo grupo : gruposChosen.getSelected()) + LeafOptionDialog gruposChosen = new LeafOptionDialog( grupos, "Escolha os ECDs para esta marca" +ccedil + atilde + "o" , "Marcar ยป" ); + for( PrtGruposProtocolo grupo : gruposChosen.getSelected() ) { - marcacao.marcarGrupoExames(grupo); + marcacao.marcarGrupoExames( grupo ); } } @LeafUIActionBinding(action = CREATE_EXAME_MARCACAO_EMAIL) public void setForNewExameMarcacaoEmail( TrabalhadoresEcdsDatasEmails email ) { - + try + { + MailDialog mailDialog = new MailDialog( getParentFrame() ); + email.setSubject( mailDialog.getSubject() ); + email.setBody( mailDialog.getMessage() ); + } catch( Exception e ) + { + e.printStackTrace(); + } } @LeafUIActionBinding(action = CREATE_EXAME_MARCACAO_OBSERVACOES) public void setForNewExameMarcacaoObservacoes( TrabalhadoresEcdsDatasObservacoes observacoes ) { - LeafTextDialog textDialog = new LeafTextDialog( getParentFrame(), this, "" ); + LeafTextDialog textDialog = new LeafTextDialog( getParentFrame(), this, "", true ); String text = textDialog.getText(); observacoes.setObservacao( text ); inputExameMarcacaoObsMensagem.setEditable( true ); @@ -472,15 +489,11 @@ public class ProcessoDadosPanel extends JPanel @LeafUIActionBinding(action = SAVE_CONSULTA) public void updateToSaveConsulta( TrabalhadoresConsultas consulta ) { - consulta.setData( inputConsultaData.getObject() ); - consulta.setEstado( (Integer) inputConsultaEstado.getSelectedObject() ); } @LeafUIActionBinding(action = SAVE_CONSULTA_MARCACAO) public void updateToSaveConsultaMarcacao( TrabalhadoresConsultasDatas marcacao ) { - marcacao.setData( inputConsultaMarcacaoData.getObject() ); - marcacao.setEstado( (Integer) inputConsultaMarcacaoEstado.getSelectedObject() ); } @LeafUIActionBinding(action = SAVE_CONSULTA_MARCACAO_EMAIL) @@ -497,15 +510,11 @@ public class ProcessoDadosPanel extends JPanel @LeafUIActionBinding(action = SAVE_EXAME) public void updateToSaveExame( TrabalhadoresEcds exame ) { - exame.setData( inputExameData.getObject() ); - exame.setEstado( (Integer) inputExameEstado.getSelectedObject() ); } @LeafUIActionBinding(action = SAVE_EXAME_MARCACAO) public void updateToSaveExameMarcacao( TrabalhadoresEcdsDatas marcacao ) { - marcacao.setData( inputExameMarcacaoData.getObject() ); - marcacao.setEstado( (Integer) inputExameMarcacaoEstado.getSelectedObject() ); } @LeafUIActionBinding(action = SAVE_EXAME_MARCACAO_EMAIL) @@ -519,7 +528,6 @@ public class ProcessoDadosPanel extends JPanel observacoes.setObservacao( inputExameMarcacaoObsMensagem.getObject() ); } - private void setupStartPanel() { } @@ -585,7 +593,7 @@ public class ProcessoDadosPanel extends JPanel private void setupExameMarcacaoPanel() { - setupSimpleDataPanel( panelExameMarcacao, "Marca" + ccedil + atilde + "o de Exame", labelExameMarcacaoEstado, inputExameMarcacaoEstado, labelExameMarcacaoData, inputExameMarcacaoData, labelExameMarcacaoGruposEcds, inputExameMarcacaoGruposEcds,new JPanel() ); + setupSimpleDataPanel( panelExameMarcacao, "Marca" + ccedil + atilde + "o de Exame", labelExameMarcacaoEstado, inputExameMarcacaoEstado, labelExameMarcacaoData, inputExameMarcacaoData, labelExameMarcacaoGruposEcds, inputExameMarcacaoGruposEcds, new JPanel() ); } private void setupExameMarcacaoEmailPanel() diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java index 7902d10e..49c7a7ee 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java @@ -250,6 +250,8 @@ public class ProcessoTreePanel extends JPanel { mainTree.setSelectionPath( new TreePath( selected.getPath() ) ); } + revalidate(); + repaint(); }