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

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

Browse Source
lxbfYeaa
Tiago Simão 18 years ago
parent 5aad0876ff
commit 185e6b8460
10 changed files with 147 additions and 89 deletions
Show Stats Download Patch File Download Diff File

2
trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresConsultasDatas.java
Unescape View File

@ -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 );
}

8
trunk/SIPRPSoft/src/siprp/medicina/MedicinaConstants.java
Unescape View File

@ -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 };

32
trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java
Unescape View File

@ -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;
@ -164,6 +165,9 @@ public class MedicinaProcessoLogic extends SIPRPLogic
@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,7 +259,7 @@ public class MedicinaProcessoLogic extends SIPRPLogic
{
currentProcesso.setDataFim( new Date() );
currentProcesso.setEstado( ProcessoConstants.PROCESSO_FECHADO_CODE );
saveObject( currentProcesso );
runActionLater( SAVE_PROCESSO );
}
}
@ -265,7 +269,7 @@ public class MedicinaProcessoLogic extends SIPRPLogic
if( currentConsultaMarcacao != null )
{
currentConsultaMarcacao.setEstado( MedicinaConstants.ESTADO_DESMARCADO_EMPRESA );
saveObject( currentConsultaMarcacao );
runActionLater( SAVE_CONSULTA_MARCACAO );
}
}
@ -275,7 +279,7 @@ public class MedicinaProcessoLogic extends SIPRPLogic
if( currentConsultaMarcacao != null )
{
currentConsultaMarcacao.setEstado( MedicinaConstants.ESTADO_DESMARCADO_TRABALHADOR );
saveObject( currentConsultaMarcacao );
runActionLater( SAVE_CONSULTA_MARCACAO );
}
}
@ -285,7 +289,7 @@ public class MedicinaProcessoLogic extends SIPRPLogic
if( currentConsultaMarcacao != null )
{
currentConsultaMarcacao.setEstado( MedicinaConstants.ESTADO_FALTOU );
saveObject( currentConsultaMarcacao );
runActionLater( SAVE_CONSULTA_MARCACAO );
}
}
@ -295,7 +299,7 @@ public class MedicinaProcessoLogic extends SIPRPLogic
if( currentConsultaMarcacao != null )
{
currentConsultaMarcacao.setEstado( MedicinaConstants.ESTADO_REALIZADO );
saveObject( currentConsultaMarcacao );
runActionLater( SAVE_CONSULTA_MARCACAO );
}
}
@ -305,7 +309,7 @@ public class MedicinaProcessoLogic extends SIPRPLogic
if( currentExameMarcacao != null )
{
currentExameMarcacao.setEstado( MedicinaConstants.ESTADO_DESMARCADO_EMPRESA );
saveObject( currentExameMarcacao );
runActionLater( SAVE_EXAME_MARCACAO );
}
}
@ -315,7 +319,7 @@ public class MedicinaProcessoLogic extends SIPRPLogic
if( currentExameMarcacao != null )
{
currentExameMarcacao.setEstado( MedicinaConstants.ESTADO_DESMARCADO_TRABALHADOR );
saveObject( currentExameMarcacao );
runActionLater( SAVE_EXAME_MARCACAO );
}
}
@ -325,7 +329,17 @@ public class MedicinaProcessoLogic extends SIPRPLogic
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 );
}
}
@ -335,7 +349,7 @@ public class MedicinaProcessoLogic extends SIPRPLogic
if( currentExameMarcacao != null )
{
currentExameMarcacao.realizar();
saveObject( currentConsultaMarcacao );
runActionLater( SAVE_EXAME_MARCACAO );
}
}

3
trunk/SIPRPSoft/src/siprp/medicina/processo/mail/MailDialog.java
Unescape View File

@ -123,6 +123,9 @@ public class MailDialog extends CustomJDialog
{
center();
}
setModal( true );
setSize( 1024, 768 );
setVisible( true );
}
private void setupComponents()

2
trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafInputField.java
Unescape View File

@ -107,7 +107,7 @@ public class LeafInputField<ObjClass extends Object> 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();
}

38
trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java
Unescape View File

@ -21,10 +21,10 @@ public class LeafOptionDialog<KeyClass extends Object> 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();
private boolean cancelActive = true;
@ -41,14 +41,12 @@ public class LeafOptionDialog<KeyClass extends Object> extends JDialog
private boolean ordered = false;
/** Creates a new instance of JCalendarDialog */
public LeafOptionDialog(Map<KeyClass, ? extends Object> map)
{
super( );
startup( map, null );
}
/** Creates a new instance of JCalendarDialog */
public LeafOptionDialog( Map<KeyClass, ? extends Object> map, String message, boolean cancelActive)
{
super( );
@ -57,7 +55,15 @@ public class LeafOptionDialog<KeyClass extends Object> extends JDialog
startup( map, null );
}
/** Creates a new instance of JCalendarDialog */
public LeafOptionDialog( Map<KeyClass, ? extends Object> map, String message, String okButton, boolean cancelActive)
{
super( );
this.cancelActive = cancelActive;
this.message = message;
this.okLabel = okButton;
startup( map, null );
}
public LeafOptionDialog(Map<KeyClass, ? extends Object> map, String message)
{
super( );
@ -65,7 +71,6 @@ public class LeafOptionDialog<KeyClass extends Object> extends JDialog
startup( map, null );
}
/** Creates a new instance of JCalendarDialog */
public LeafOptionDialog(OrderedMap<KeyClass> orderedMap, String message)
{
super( );
@ -74,6 +79,25 @@ public class LeafOptionDialog<KeyClass extends Object> extends JDialog
startup( null, orderedMap );
}
/** Creates a new instance of JCalendarDialog */
public LeafOptionDialog(Map<KeyClass, ? extends Object> map, String message, String okButton)
{
super( );
this.message = message;
this.okLabel = okButton;
startup( map, null );
}
/** Creates a new instance of JCalendarDialog */
public LeafOptionDialog(OrderedMap<KeyClass> orderedMap, String message, String okButton)
{
super( );
ordered = true;
this.message = message;
this.okLabel = okButton;
startup( null, orderedMap );
}
private void startup( Map<KeyClass, ? extends Object> map, OrderedMap<KeyClass> orderedMap )
{
if( map == null )
@ -143,7 +167,7 @@ public class LeafOptionDialog<KeyClass extends Object> 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 );

5
trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafTextDialog.java
Unescape View File

@ -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)

6
trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java
Unescape View File

@ -147,6 +147,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
// observacoes 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) );

40
trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java
Unescape View File

@ -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<HashMap<Integer, String>> inputExameEstado = new LeafInputField<HashMap<Integer, String>>();
public final LeafInputField<OrderedMap<PrtGruposProtocolo>> inputExameGruposEcds = new LeafInputField<OrderedMap<PrtGruposProtocolo>>();
@ -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<HashMap<Integer, String>> inputExameMarcacaoEstado = new LeafInputField<HashMap<Integer, String>>();
public final LeafInputField<Date> inputExameMarcacaoData = new LeafInputField<Date>();
@ -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 );
@ -447,7 +456,7 @@ public class ProcessoDadosPanel extends JPanel
marcacao.setData( date );
OrderedMap<PrtGruposProtocolo> grupos = marcacao.getToTrabalhadoresEcds().getGruposExamesForPerfil();
LeafOptionDialog<PrtGruposProtocolo> gruposChosen = new LeafOptionDialog<PrtGruposProtocolo>(grupos,"Escolha os ECDs a marcar");
LeafOptionDialog<PrtGruposProtocolo> gruposChosen = new LeafOptionDialog<PrtGruposProtocolo>( grupos, "Escolha os ECDs para esta marca" +ccedil + atilde + "o" , "Marcar »" );
for( PrtGruposProtocolo grupo : gruposChosen.getSelected() )
{
marcacao.marcarGrupoExames( grupo );
@ -457,13 +466,21 @@ public class ProcessoDadosPanel extends JPanel
@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()
{
}

2
trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java
Unescape View File

@ -250,6 +250,8 @@ public class ProcessoTreePanel extends JPanel
{
mainTree.setSelectionPath( new TreePath( selected.getPath() ) );
}
revalidate();
repaint();
}

Write Preview
Loading…
Cancel
Save