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@1497 bb69d46d-e84e-40c8-a05a-06db0d633741

Browse Source
lxbfYeaa
Tiago Simão 15 years ago
parent ee01c57688
commit 0a2deb5719
2 changed files with 1 additions and 196 deletions
Show Stats Download Patch File Download Diff File

38
trunk/SIPRPSoft/src/siprp/SIPRPTracker.java
Unescape View File

@ -67,7 +67,6 @@ public class SIPRPTracker extends WindowTracker implements SHSTTrackerInterface
private shst.clientes.ClientesWindow clientesWindow;
private MedicinaWindowInterface medicinaWindow;
private MultiMarcacoesWindow multiMarcacoesWindow;
// private MedicinaProcessoWindow medicinaProcessoWindow;
private MarcacoesHigieneInterface higieneWindow;
/** Creates a new instance of SIPRPTracker */
@ -148,15 +147,6 @@ public class SIPRPTracker extends WindowTracker implements SHSTTrackerInterface
}
} );
// rootNode.add( new DefaultMutableTreeNode( LembretesWindow.TITLE ) );
// creators.put( LembretesWindow.TITLE, new WindowCreator() {
// public TrackableWindow create()
// throws Exception
// {
// return new LembretesWindow();
// }
// } );
rootNode.add( new DefaultMutableTreeNode( LembretesMultiWindow.TITLE ) );
creators.put( LembretesMultiWindow.TITLE, new WindowCreator() {
@Override
@ -167,19 +157,6 @@ public class SIPRPTracker extends WindowTracker implements SHSTTrackerInterface
});
DefaultMutableTreeNode medicinaNode = new DefaultMutableTreeNode( MEDICINA );
// medicinaNode.add( new DefaultMutableTreeNode( MedicinaProcessoWindow.TITLE ) );
// creators.put( MedicinaProcessoWindow.TITLE, new WindowCreator() {
// public TrackableWindow create()
// throws Exception
// {
// if( medicinaProcessoWindow == null )
// {
// medicinaProcessoWindow = new MedicinaProcessoWindow();
// }
// return medicinaProcessoWindow;
// }
// } );
medicinaNode.add( new DefaultMutableTreeNode( MEDICINA_MARCACOES ) );
creators.put( MEDICINA_MARCACOES, new WindowCreator() {
@ -376,21 +353,6 @@ public class SIPRPTracker extends WindowTracker implements SHSTTrackerInterface
return multiMarcacoesWindow;
}
// public MedicinaProcessoWindow getMedicinaProcessoWindow()
// {
// if( medicinaProcessoWindow == null )
// {
// try
// {
// medicinaProcessoWindow = new MedicinaProcessoWindow();
// } catch( Exception e )
// {
// e.printStackTrace();
// }
// }
// return medicinaProcessoWindow;
// }
public MarcacoesHigieneInterface getHigieneWindow() throws Exception
{
if( higieneWindow == null )

159
trunk/SIPRPSoft/src/siprp/clientes/AvisosPanel.java
Unescape View File

@ -57,11 +57,6 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
private JPanel estabelecimentosPanel;
private JPanel trabalhadoresPanel;
// private AvisosData avisos[];
// private AvisosData avisosEmpresa[];
// private AvisosData avisosEstabelecimento[];
// private AvisosData avisosTrabalhador[];
private Object avisosEmpresa[][];
private Object avisosEstabelecimento[][];
private Object avisosTrabalhador[][];
@ -72,17 +67,11 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
private Hashtable buttonTypeHash;
/** Creates a new instance of AvisosPanel */
public AvisosPanel(/* AvisosData avisosEmpresa[], AvisosData avisosEstabelecimento[], AvisosData avisosTrabalhador[]*/ )
throws Exception
public AvisosPanel() throws Exception
{
// this.avisosEmpresa = new AvisosData[ 0 ];
// this.avisosEstabelecimento = new AvisosData[ 0 ];
// this.avisosTrabalhador = new AvisosData[ 0 ];
// setupComponents();
buttonHash = new Hashtable();
buttonTypeHash = new Hashtable();
JDO = (ProviderInterface) Singleton.getInstance( Singleton.DEFAULT_EVO_DATA_PROVIDER );
// System.out.println( "public AvisosPanel() JDO: " + JDO );
}
private void setupComponents()
@ -101,7 +90,6 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
JPanel pan = new JPanel();
GridBagLayout gridbag = new GridBagLayout();
pan.setBorder( BorderFactory.createLineBorder( Color.black, 1 ) );
// EmpresasData empresa = (EmpresasData)avisosEmpresa[ n ].get( AvisosData.EMPRESA );
pan.setLayout( gridbag );
constraints.gridheight = GridBagConstraints.REMAINDER;
constraints.gridx = 0;
@ -110,9 +98,6 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
JButton tratarButton = new JButton( "Tratar" );
gridbag.setConstraints( tratarButton, constraints );
pan.add( tratarButton );
//buttonHash.put( tratarButton, avisosEmpresa[ n ] );
// buttonHash.put( tratarButton, new Integer( n ) );
// buttonHash.put( tratarButton, avisosEmpresa[ n ].get( AvisosData.ID ) );
buttonHash.put( tratarButton, avisosEmpresa[ n ][ 0 ] );
buttonTypeHash.put( tratarButton, new Integer( AvisoConstants.TIPO_EMPRESA ) );
tratarButton.addActionListener( this );
@ -121,7 +106,6 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
constraints.weightx = 1;
constraints.gridheight = 1;
constraints.gridwidth = GridBagConstraints.REMAINDER;
// JLabel empresaLabel = new JLabel( "" + empresa.get( EmpresasData.DESIGNACAO_SOCIAL ) );
JLabel empresaLabel = new JLabel( "" + avisosEmpresa[ n ][ 3 ] );
gridbag.setConstraints( empresaLabel, constraints );
pan.add( empresaLabel );
@ -129,7 +113,6 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
constraints.weightx = 1;
constraints.gridwidth = GridBagConstraints.REMAINDER;
//JLabel descricaoLabel = new JLabel( (String)avisosEmpresa[ n ].get( AvisosData.DESCRICAO ) );
JLabel descricaoLabel = criarDescricao( avisosEmpresa[ n ] );
gridbag.setConstraints( descricaoLabel, constraints );
pan.add( descricaoLabel );
@ -158,8 +141,6 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
JPanel pan = new JPanel();
GridBagLayout gridbag = new GridBagLayout();
pan.setBorder( BorderFactory.createLineBorder( Color.black, 1 ) );
// EstabelecimentosData estabelecimento = (EstabelecimentosData)avisosEstabelecimento[ n ].get( AvisosData.ESTABELECIMENTO );
// EmpresasData empresa = (EmpresasData)estabelecimento.get( EstabelecimentosData.EMPRESA );
pan.setLayout( gridbag );
constraints.gridheight = GridBagConstraints.REMAINDER;
constraints.gridx = 0;
@ -168,9 +149,6 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
JButton tratarButton = new JButton( mesmoDia ? "Confirmar" : "Marcar" );
gridbag.setConstraints( tratarButton, constraints );
pan.add( tratarButton );
//buttonHash.put( tratarButton, avisosEstabelecimento[ n ] );
// buttonHash.put( tratarButton, new Integer( n + avisosEmpresa.length ) );
// buttonHash.put( tratarButton, avisosEstabelecimento[ n ].get( AvisosData.ID ) );
buttonHash.put( tratarButton, avisosEstabelecimento[ n ][ 0 ] );
buttonTypeHash.put( tratarButton, new Integer( AvisoConstants.TIPO_ESTABELECIMENTO ) );
tratarButton.addActionListener( this );
@ -179,18 +157,15 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
constraints.weightx = 1;
constraints.gridheight = 1;
constraints.gridwidth = GridBagConstraints.REMAINDER;
// JLabel empresaLabel = new JLabel( "" + empresa.get( EmpresasData.DESIGNACAO_SOCIAL ) );
JLabel empresaLabel = new JLabel( "" + avisosEstabelecimento[ n ][ 3 ] );
gridbag.setConstraints( empresaLabel, constraints );
pan.add( empresaLabel );
// JLabel estabelecimentoLabel = new JLabel( "" + estabelecimento.get( EstabelecimentosData.NOME ) );
JLabel estabelecimentoLabel = new JLabel( "" + avisosEstabelecimento[ n ][ 4 ] );
gridbag.setConstraints( estabelecimentoLabel, constraints );
pan.add( estabelecimentoLabel );
constraints.gridwidth = GridBagConstraints.REMAINDER;
//JLabel descricaoLabel = new JLabel( (String)avisosEstabelecimento[ n ].get( AvisosData.DESCRICAO ) );
JLabel descricaoLabel = criarDescricao( avisosEstabelecimento[ n ] );
gridbag.setConstraints( descricaoLabel, constraints );
pan.add( descricaoLabel );
@ -219,9 +194,6 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
JPanel pan = new JPanel();
GridBagLayout gridbag = new GridBagLayout();
pan.setBorder( BorderFactory.createLineBorder( Color.black, 1 ) );
// TrabalhadoresData trabalhador = (TrabalhadoresData)avisosTrabalhador[ n ].get( AvisosData.TRABALHADOR );
// EstabelecimentosData estabelecimento = (EstabelecimentosData)trabalhador.get( TrabalhadoresData.ESTABELECIMENTO );
// EmpresasData empresa = (EmpresasData)estabelecimento.get( EstabelecimentosData.EMPRESA );
pan.setLayout( gridbag );
constraints.gridheight = GridBagConstraints.REMAINDER;
constraints.gridx = 0;
@ -230,9 +202,6 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
JButton tratarButton = new JButton( mesmoDia ? "Confirmar" : "Marcar" );
gridbag.setConstraints( tratarButton, constraints );
pan.add( tratarButton );
//buttonHash.put( tratarButton, avisosTrabalhador[ n ] );
// buttonHash.put( tratarButton, new Integer( n + avisosEmpresa.length + avisosEstabelecimento.length ) );
// buttonHash.put( tratarButton, avisosTrabalhador[ n ].get( AvisosData.ID ) );
buttonHash.put( tratarButton, avisosTrabalhador[ n ][ 0 ] );
buttonTypeHash.put( tratarButton, new Integer( AvisoConstants.TIPO_TRABALHADOR ) );
tratarButton.addActionListener( this );
@ -241,22 +210,18 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
constraints.weightx = 1;
constraints.gridheight = 1;
constraints.gridwidth = GridBagConstraints.REMAINDER;
// JLabel empresaLabel = new JLabel( "" + empresa.get( EmpresasData.DESIGNACAO_SOCIAL ) );
JLabel empresaLabel = new JLabel( "" + avisosTrabalhador[ n ][ 3 ] );
gridbag.setConstraints( empresaLabel, constraints );
pan.add( empresaLabel );
// JLabel estabelecimentoLabel = new JLabel( "" + estabelecimento.get( EstabelecimentosData.NOME ) );
JLabel estabelecimentoLabel = new JLabel( "" + avisosTrabalhador[ n ][ 4 ] );
gridbag.setConstraints( estabelecimentoLabel, constraints );
pan.add( estabelecimentoLabel );
// JLabel trabalhadorLabel = new JLabel( "" + trabalhador.get( TrabalhadoresData.NOME ) );
JLabel trabalhadorLabel = new JLabel( "" + avisosTrabalhador[ n ][ 5 ] );
gridbag.setConstraints( trabalhadorLabel, constraints );
pan.add( trabalhadorLabel );
constraints.gridwidth = GridBagConstraints.REMAINDER;
//JLabel descricaoLabel = new JLabel( (String)avisosTrabalhador[ n ].get( AvisosData.DESCRICAO ) );
JLabel descricaoLabel = criarDescricao( avisosTrabalhador[ n ] );
gridbag.setConstraints( descricaoLabel, constraints );
pan.add( descricaoLabel );
@ -264,18 +229,11 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
trabalhadoresPanel.add( pan );
}
// Vector v = new Vector( Arrays.asList( avisosEmpresa ) );
// v.addAll( Arrays.asList( avisosTrabalhador ) );
// v.addAll( Arrays.asList( avisosEstabelecimento ) );
// avisos = (AvisosData []) v.toArray( new AvisosData[0] );
JScrollPane scp = new JScrollPane();
setLayout( new GridLayout( 1, 1 ) );
add( scp );
JPanel contentPanel = new JPanel();
scp.setViewportView( contentPanel );
// contentPanel.setLayout( new BoxLayout( contentPanel, BoxLayout.Y_AXIS ) );
// contentPanel.setLayout( new FlowLayout() );
GridBagLayout gridbag = new GridBagLayout();
contentPanel.setLayout( gridbag );
constraints = new GridBagConstraints();
@ -292,13 +250,11 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
}
if( avisosTrabalhador.length > 0 )
{
// contentPanel.add( new JLabel( " " ) );
gridbag.setConstraints( trabalhadoresPanel, constraints );
contentPanel.add( trabalhadoresPanel );
}
if( avisosEstabelecimento.length > 0 )
{
// contentPanel.add( new JLabel( " " ) );
gridbag.setConstraints( estabelecimentosPanel, constraints );
contentPanel.add( estabelecimentosPanel );
}
@ -314,78 +270,6 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
try
{
provider = ( FichaDataProvider ) FichaDataProvider.getProvider();
// Collection c = AvisosData.load( AvisosData.class, " estabelecimento_id == \"null\" ",
// AvisosData.DATA_EVENTO + " ascending" );
// Collection c = AvisosData.load( AvisosData.class, "(tipo == " + AvisosData.TIPO_EMPRESA+")",// + ") && ( data_aviso <= CURRENT_DATE )",
// AvisosData.DATA_EVENTO + " ascending" );
// Collection c = AvisosData.load( AvisosData.class, new Object[]{ /*new Integer( AvisosData.TIPO_EMPRESA ), */new Date() },
// new String[]{ /*"tipo", */"data_aviso" },
// new String[]{ "=="/*, "==" */},
// new String[]{ AvisosData.DATA_EVENTO + " ascending" } );
// if( c == null )
// {
// avisosEmpresa = new AvisosData[ 0 ];
// }
// else
// {
//
// avisosEmpresa = ( AvisosData[] )c.toArray( new AvisosData[ c.size() ] );
// }
// Integer ids[] = provider.getAvisosIDByTipoAndDate( new Integer( AvisoConstants.TIPO_EMPRESA ), new Date() );
// avisosEmpresa = new AvisosData[ ids.length ];
// if( JDO == null )
// {
// JDO = ( JDOProvider ) Singleton.getInstance( Singleton.DEFAULT_EVO_DATA_PROVIDER );
// }
//// System.out.println( "JDO: " + JDO );
// for( int n = 0; n < avisosEmpresa.length; n++ )
// {
// avisosEmpresa[ n ] = (AvisosData) JDO.load( AvisosData.class, ids[ n ] );
// }
//
////System.out.println( "EmpresasData " + avisosEmpresa.length );
//// c = AvisosData.load( AvisosData.class, " tipo == " + AvisosData.TIPO_ESTABELECIMENTO,// + ") && ( data_aviso <= new Date() )",
//// AvisosData.DATA_EVENTO + " ascending" );
//// c = AvisosData.load( AvisosData.class, "estabelecimento_id != \"null\" "
//// + " && trabalhador_id == \"null\"", AvisosData.DATA_EVENTO + " ascending" );
//// if( c == null )
//// {
//// avisosEstabelecimento = new AvisosData[ 0 ];
//// }
//// else
//// {
//// avisosEstabelecimento = ( AvisosData[] )c.toArray( new AvisosData[ c.size() ] );
//// }
//
// ids = provider.getAvisosIDByTipoAndDate( new Integer( AvisoConstants.TIPO_ESTABELECIMENTO ), new Date() );
// avisosEstabelecimento = new AvisosData[ ids.length ];
// for( int n = 0; n < avisosEstabelecimento.length; n++ )
// {
// avisosEstabelecimento[ n ] = (AvisosData) JDO.load( AvisosData.class, new Object[]{ids[ n ]}, new String[]{ "id" } );
// }
////System.out.println( "EstabelecimentosData " + avisosEstabelecimento.length );
//// c = AvisosData.load( AvisosData.class, " tipo == " + AvisosData.TIPO_TRABALHADOR,// + ") && ( data_aviso <= new Date() )",
//// AvisosData.DATA_EVENTO + " ascending" );
//// c = AvisosData.load( AvisosData.class, "trabalhador_id != \"null\"", AvisosData.DATA_EVENTO + " ascending" );
//// if( c == null )
//// {
//// avisosTrabalhador = new AvisosData[ 0 ];
//// }
//// else
//// {
//// avisosTrabalhador = ( AvisosData[] )c.toArray( new AvisosData[ c.size() ] );
//// }
// ids = provider.getAvisosIDByTipoAndDate( new Integer( AvisoConstants.TIPO_TRABALHADOR ), new Date() );
//
// avisosTrabalhador = new AvisosData[ ids.length ];
// for( int n = 0; n < avisosTrabalhador.length; n++ )
// {
// avisosTrabalhador[ n ] = (AvisosData) JDO.load( AvisosData.class, ids[ n ] );
// }
//System.out.println( "trabalhador " + avisosTrabalhador.length );
avisosEmpresa = provider.getAvisosEmpresaByDate( new Date() );
avisosEstabelecimento = provider.getAvisosEstabelecimentoByDate( new Date() );
avisosTrabalhador = provider.getAvisosTrabalhadorByDate( new Date() );
@ -435,43 +319,6 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
return descricaoLabel;
}
// private JLabel criarDescricao( AvisosData aviso )
// {
// Date dataEvento = ( Date )aviso.get( AvisosData.DATA_EVENTO );
//
// String descricao = (String)aviso.get( AvisosData.DESCRICAO );
// String descricao2 = (String)aviso.get( AvisosData.DESCRICAO );
// Calendar cal = Calendar.getInstance();
// cal.setTime( dataEvento );
// cal.set( cal.get( Calendar.YEAR ), cal.get( Calendar.MONTH ), cal.get( Calendar.DAY_OF_MONTH ), 0, 0, 0 );
// cal.set( Calendar.MILLISECOND, 0 );
// dataEvento = cal.getTime();
//
// cal = Calendar.getInstance();
// cal.set( cal.get( Calendar.YEAR ), cal.get( Calendar.MONTH ), cal.get( Calendar.DAY_OF_MONTH ), 0, 0, 0 );
// cal.set( Calendar.MILLISECOND, 0 );
// Date hoje = cal.getTime();
//
// if( !hoje.after( dataEvento ) && !hoje.before( dataEvento ) )
// {
// descricao += " hoje";
// }
// else
// {
// descricao += " no dia " + DATE_FORMAT.format( dataEvento );
// }
// JLabel descricaoLabel = new JLabel( descricao );
// if( hoje.after( dataEvento ) )
// {
// descricaoLabel.setForeground( Color.red );
// }
// else if( hoje.equals( dataEvento ) )
// {
// descricaoLabel.setForeground( Color.green.darker() );
// }
// return descricaoLabel;
// }
public void actionPerformed( ActionEvent e )
{
if( JDO == null )
@ -481,7 +328,6 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
Object source = e.getSource();
if( source instanceof JButton )
{
// AvisosData aviso = (AvisosData) buttonHash.get( source );
try
{
( (JButton) source ).setEnabled( false );
@ -554,9 +400,6 @@ public class AvisosPanel extends JPanel implements ActionListener, ControllableC
break;
}
System.out.println( "delete aviso" );
// aviso.set( AvisosData.TRABALHADOR, null );
// aviso.set( AvisosData.ESTABELECIMENTO, null );
// aviso.set( AvisosData.EMPRESA, null );
}
catch( Exception ex )
{

Write Preview
Loading…
Cancel
Save