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

Browse Source
lxbfYeaa
Tiago Simão 16 years ago
parent 2a722c2ae5
commit ecffce6f44
11 changed files with 84 additions and 54 deletions
Show Stats Download Patch File Download Diff File

BIN
trunk/SIPRPSoft/lib/shst.jar
View File

Binary file not shown.

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

@ -29,7 +29,7 @@ import siprp.medicina.locais_analise.EnviarAnalisesWindow;
import siprp.medicina.locais_realizacao.LocaisRealizacaoWindow;
import siprp.medicina.presencas.RegistarPresencasWindow;
import siprp.medicina.prestadores.PrestadoresWindow;
import siprp.pesquisas.PesquisasWindow;
import siprp.pesquisas.RelatorioAnualWindow;
import com.evolute.utils.Singleton;
import com.evolute.utils.tracker.TrackableWindow;
@ -271,7 +271,7 @@ public class SIPRPTracker extends WindowTracker implements SHSTTrackerInterface
public TrackableWindow create()
throws Exception
{
return new PesquisasWindow();
return new RelatorioAnualWindow();
}
} );
}

30
trunk/SIPRPSoft/src/siprp/estatistica/EstatisticaWindow.java
Unescape View File

@ -6,6 +6,7 @@
package siprp.estatistica;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FileDialog;
import java.awt.FlowLayout;
@ -170,8 +171,6 @@ public class EstatisticaWindow extends SIPRPFrame
empresasTable.setNonResizableNorReordable();
empresasTable.getSelectionModel().addListSelectionListener( this );
JScrollPane empresasScroll = new JScrollPane();
empresasScroll.setBorder( BorderFactory.createTitledBorder(
BorderFactory.createEtchedBorder(), "Empresa" ) );
empresasScroll.setViewportView( empresasTable );
empresasScroll.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER );
empresasScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_ALWAYS );
@ -183,8 +182,6 @@ public class EstatisticaWindow extends SIPRPFrame
estabelecimentosTable.setNonResizableNorReordable();
estabelecimentosTable.getSelectionModel().addListSelectionListener( this );
JScrollPane estabelecimentosScroll = new JScrollPane();
estabelecimentosScroll.setBorder( BorderFactory.createTitledBorder(
BorderFactory.createEtchedBorder(), "Estabelecimento" ) );
estabelecimentosScroll.setViewportView( estabelecimentosTable );
estabelecimentosScroll.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER );
estabelecimentosScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_ALWAYS );
@ -245,11 +242,20 @@ public class EstatisticaWindow extends SIPRPFrame
constraints.gridheight = 2;
constraints.weightx = 0.3;
constraints.gridwidth = 3;
gridbag.setConstraints( empresasScroll, constraints );
getContentPane().add( empresasScroll );
gridbag.setConstraints( estabelecimentosScroll, constraints );
getContentPane().add( estabelecimentosScroll );
JPanel empresasPanel = new JPanel( new BorderLayout() );
empresasPanel.add( empresasScroll );
empresasPanel.setBorder( BorderFactory.createTitledBorder( "Empresa" ) );
gridbag.setConstraints( empresasPanel, constraints );
getContentPane().add( empresasPanel );
JPanel panel = new JPanel( new BorderLayout() );
panel.setBorder( BorderFactory.createTitledBorder( "Estabelecimento" ) );
panel.add( estabelecimentosScroll );
gridbag.setConstraints( panel, constraints );
getContentPane().add( panel );
constraints.weighty = 0;
constraints.gridheight = 1;
@ -284,8 +290,12 @@ public class EstatisticaWindow extends SIPRPFrame
constraints.gridheight = GridBagConstraints.REMAINDER;
constraints.weightx = 1;
constraints.gridwidth = GridBagConstraints.REMAINDER;
gridbag.setConstraints( resultadoScroll, constraints );
getContentPane().add( resultadoScroll );
JPanel resultadoPanel = new JPanel( new BorderLayout() );
resultadoPanel.add( resultadoScroll );
gridbag.setConstraints( resultadoPanel, constraints );
getContentPane().add( resultadoPanel );
processarEscolha();
}

8
trunk/SIPRPSoft/src/siprp/ficha/ExamePanel.java
Unescape View File

@ -51,9 +51,11 @@ import com.evolute.utils.ui.text.CopyPasteHandler;
* @author fpalma
*/
public class ExamePanel extends JPanel
implements ChangeListener, ControllableComponent, ListSelectionListener
implements ChangeListener, ControllableComponent<Object>, ListSelectionListener
{
private static final long serialVersionUID = 1L;
private ProviderInterface JDO;
private JCalendarPanel dataExamePanel;
@ -240,9 +242,9 @@ public class ExamePanel extends JPanel
// JPanel recomendacoesOuterPanel = new JPanel();
// recomendacoesOuterPanel.setLayout( new GridLayout( 1, 1 ) );
// recomendacoesOuterPanel.add( recomendacoesScp );
JPanel recomendacoesPanel = new JPanel();
JPanel recomendacoesPanel = new JPanel( new BorderLayout() );
gridbag.setConstraints( recomendacoesPanel, constraints );
recomendacoesPanel.add( recomendacoesScp );
recomendacoesPanel.add( recomendacoesScp, BorderLayout.CENTER );
recomendacoesPanel.setBorder( BorderFactory.createTitledBorder( "Outras recomenda\u00e7\u00f5es" ) );
rightPanel.add( recomendacoesPanel );

8
trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java
Unescape View File

@ -57,9 +57,11 @@ import com.evolute.utils.ui.window.ProgressDialog;
*
* @author fpalma
*/
public class FichaWindow extends SIPRPTabbedWindow
implements ListAction, FichaAptidaoConstants
public class FichaWindow extends SIPRPTabbedWindow implements ListAction, FichaAptidaoConstants
{
private static final long serialVersionUID = 1L;
private ProviderInterface JDO;
private UpperPanel upperPanel;
@ -116,7 +118,7 @@ public class FichaWindow extends SIPRPTabbedWindow
private void setupComponents()
throws Exception
{
setSize( 700, 640 );
setSize( 800, 700 );
setResizable( false );
setTitle( "Ficha de Aptid\u00e3o" );

7
trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java
Unescape View File

@ -3,6 +3,7 @@ package siprp.higiene.marcacoes;
import info.clearthought.layout.TableLayout;
import info.clearthought.layout.TableLayoutConstraints;
import java.awt.BorderLayout;
import java.util.Hashtable;
import java.util.Map;
@ -95,7 +96,6 @@ public class MarcacaoVisitaHSTPanel
observacoesText.setWrapStyleWord( true );
observacoesText.setRows( 5 );
observacoesTextScroll.setBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), "Observa\u00e7\u00f5es" ) );
observacoesTextScroll.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER );
observacoesTextScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED );
observacoesTextScroll.setViewportView( observacoesText );
@ -123,7 +123,10 @@ public class MarcacaoVisitaHSTPanel
this.add( tecnicoSuperiorLabel, new TableLayoutConstraints(1,4) );
this.add( tecnicoSuperiorList, new TableLayoutConstraints(2,4) );
this.add( estadoList, new TableLayoutConstraints(1,5,2,5) );
this.add( observacoesTextScroll, new TableLayoutConstraints(1,6,2,6) );
JPanel panel = new JPanel( new BorderLayout() );
panel.setBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), "Observa\u00e7\u00f5es" ) );
panel.add( observacoesTextScroll );
this.add( panel, new TableLayoutConstraints(1,6,2,6) );
//
// JPanel MarcacaoVisitaHSTPanel = this;
// GridBagConstraints MarcacaoVisitaHSTPanelGBC = new GridBagConstraints();

26
trunk/SIPRPSoft/src/siprp/initializer/SIPRPUIInitializer.java
Unescape View File

@ -19,19 +19,19 @@ public class SIPRPUIInitializer extends EvoAbstractAppInitializer
@Override
public boolean doInit() throws Exception
{
// NimRODTheme nt = new NimRODTheme();
// nt.setPrimary1( new Color( 185,211,238 ) );
// nt.setPrimary2( new Color( 159,182,205 ) );
// nt.setPrimary3( new Color( 108,123,139 ) );
//
// nt.setSecondary( new Color( 230, 230, 230 ) );
//// nt.setSecondary1( new Color( 210, 210, 210 ) );
//// nt.setSecondary2( Color.pink );
//// nt.setSecondary3( Color.pink );
//
// NimRODLookAndFeel NimRODLF = new NimRODLookAndFeel();
// NimRODLookAndFeel.setCurrentTheme( nt);
// UIManager.setLookAndFeel( NimRODLF );
NimRODTheme nt = new NimRODTheme();
nt.setPrimary1( new Color( 185,211,238 ) );
nt.setPrimary2( new Color( 159,182,205 ) );
nt.setPrimary3( new Color( 108,123,139 ) );
nt.setSecondary( new Color( 230, 230, 230 ) );
// nt.setSecondary1( new Color( 210, 210, 210 ) );
// nt.setSecondary2( Color.pink );
// nt.setSecondary3( Color.pink );
NimRODLookAndFeel NimRODLF = new NimRODLookAndFeel();
NimRODLookAndFeel.setCurrentTheme( nt );
UIManager.setLookAndFeel( NimRODLF );
return true;
}

2
trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java
Unescape View File

@ -158,7 +158,7 @@ public class RemarcacoesDataProvider
String estabelecimento = ( String ) array.get( n, 5 );
String empresa = ( String ) array.get( n, 6 );
String str = "<html><body><font color=\"#00009f\">" + trabalhador + "</font>"
+ "<br>&nbsp;&nbsp;&nbsp;" + tipoMarcacaoStr + " de " + D_F.format( data )
+ "<br>&nbsp;&nbsp;&nbsp;" + tipoMarcacaoStr + " de " + (data == null ? "(data desconhecida)" : D_F.format( data ))
+ "<br>&nbsp;&nbsp;&nbsp;<font color=\"#009f00\">" + descricao + "</font>"
+ "<br>&nbsp;&nbsp;&nbsp;" + empresa.substring( 0, empresa.length() > 20 ? 20 : empresa.length() )
+ " / " + estabelecimento.substring( 0, estabelecimento.length() > 10 ? 10 : estabelecimento.length() )

16
trunk/SIPRPSoft/src/siprp/medicina/MarcacaoConsultaPanel.java
Unescape View File

@ -1,5 +1,6 @@
package siprp.medicina;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
@ -9,7 +10,6 @@ import java.util.Map;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
@ -34,6 +34,8 @@ public class MarcacaoConsultaPanel
extends JPanel
implements ControllableComponent, DataClassAware
{
private static final long serialVersionUID = 1L;
private MarcacoesTrabalhadorData marcacaoTrabalhadoresData;
private final ComponentsHashtable components = new ComponentsHashtable();
@ -69,7 +71,6 @@ public class MarcacaoConsultaPanel
public void setupComponents()
throws Exception
{
JComponent MarcacaoConsultaPanel = this;
dataPanel.setMinimumSize( new Dimension( 300, 20 ) );
dataPanel.setPreferredSize( new Dimension( 100, 20 ) );
@ -97,8 +98,7 @@ public class MarcacaoConsultaPanel
};
estadoList = new RadioButtonFixedPanel( estadoListOptions, 6, 1, RadioButtonFixedPanel.ORIENTATION_VERTICAL, false, null );
estadoList.setBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), "Estado" ) );
observacoesTextScroll.setBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), "Observa\u00e7\u00f5es" ) );
observacoesText.setLineWrap( true );
observacoesText.setWrapStyleWord( true );
observacoesText.setRows( 5 );
@ -192,8 +192,12 @@ public class MarcacaoConsultaPanel
observacoesTextScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED );
observacoesTextScroll.setViewportView( observacoesText );
MarcacaoConsultaPanelGBC.fill = GridBagConstraints.BOTH;
MarcacaoConsultaPanelLayout.setConstraints( observacoesTextScroll, MarcacaoConsultaPanelGBC );
MarcacaoConsultaPanel.add( observacoesTextScroll );
JPanel obsPanel = new JPanel( new BorderLayout() );
obsPanel.setBorder( BorderFactory.createTitledBorder( "Observa\u00e7\u00f5es" ) );
obsPanel.add( observacoesTextScroll, BorderLayout.CENTER );
MarcacaoConsultaPanelLayout.setConstraints( obsPanel, MarcacaoConsultaPanelGBC );
MarcacaoConsultaPanel.add( obsPanel );
}

12
trunk/SIPRPSoft/src/siprp/medicina/MarcacaoExamePanel.java
Unescape View File

@ -1,5 +1,6 @@
package siprp.medicina;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
@ -84,8 +85,7 @@ public class MarcacaoExamePanel
};
estadoList = new RadioButtonFixedPanel( estadoListOptions, 6, 1, RadioButtonFixedPanel.ORIENTATION_VERTICAL, false, null );
estadoList.setBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), "Estado" ) );
observacoesTextScroll.setBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), "Observa\u00e7\u00f5es" ) );
observacoesText.setLineWrap( true );
observacoesText.setWrapStyleWord( true );
observacoesText.setRows( 5 );
@ -163,8 +163,12 @@ public class MarcacaoExamePanel
observacoesTextScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED );
observacoesTextScroll.setViewportView( observacoesText );
MarcacaoExamePanelGBC.fill = GridBagConstraints.BOTH;
MarcacaoExamePanelLayout.setConstraints( observacoesTextScroll, MarcacaoExamePanelGBC );
MarcacaoExamePanel.add( observacoesTextScroll );
JPanel obsPanel = new JPanel( new BorderLayout() );
obsPanel.add( observacoesTextScroll, BorderLayout.CENTER );
obsPanel.setBorder( BorderFactory.createTitledBorder( "Observa\u00e7\u00f5es" ) );
MarcacaoExamePanelLayout.setConstraints( obsPanel, MarcacaoExamePanelGBC );
MarcacaoExamePanel.add( obsPanel );
}

25
trunk/SIPRPSoft/src/siprp/pesquisas/PesquisasWindow.java → trunk/SIPRPSoft/src/siprp/pesquisas/RelatorioAnualWindow.java
Unescape View File

@ -6,6 +6,7 @@
package siprp.pesquisas;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FileDialog;
import java.awt.FlowLayout;
@ -54,7 +55,7 @@ import com.evolute.utils.ui.text.CopyPasteHandler;
*
* @author fpalma
*/
public class PesquisasWindow extends SIPRPFrame
public class RelatorioAnualWindow extends SIPRPFrame
implements TrackableWindow, ListSelectionListener, ActionListener
{
private ProviderInterface JDO;
@ -76,7 +77,7 @@ public class PesquisasWindow extends SIPRPFrame
// }
/** Creates a new instance of PesquisasWindow */
public PesquisasWindow()
public RelatorioAnualWindow()
throws Exception
{
provider = (PesquisasProvider)PesquisasProvider.getProvider();
@ -101,8 +102,6 @@ public class PesquisasWindow extends SIPRPFrame
empresasTable.setNonResizableNorReordable();
empresasTable.getSelectionModel().addListSelectionListener( this );
JScrollPane empresasScroll = new JScrollPane();
empresasScroll.setBorder( BorderFactory.createTitledBorder(
BorderFactory.createEtchedBorder(), "Empresa" ) );
empresasScroll.setViewportView( empresasTable );
empresasScroll.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER );
empresasScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_ALWAYS );
@ -114,8 +113,6 @@ public class PesquisasWindow extends SIPRPFrame
estabelecimentosTable.setNonResizableNorReordable();
estabelecimentosTable.getSelectionModel().addListSelectionListener( this );
JScrollPane estabelecimentosScroll = new JScrollPane();
estabelecimentosScroll.setBorder( BorderFactory.createTitledBorder(
BorderFactory.createEtchedBorder(), "Estabelecimento" ) );
estabelecimentosScroll.setViewportView( estabelecimentosTable );
estabelecimentosScroll.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER );
estabelecimentosScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_ALWAYS );
@ -159,11 +156,19 @@ public class PesquisasWindow extends SIPRPFrame
constraints.gridheight = 2;
constraints.weightx = 0.3;
constraints.gridwidth = 3;
gridbag.setConstraints( empresasScroll, constraints );
getContentPane().add( empresasScroll );
gridbag.setConstraints( estabelecimentosScroll, constraints );
getContentPane().add( estabelecimentosScroll );
JPanel empresasPanel = new JPanel( new BorderLayout() );
JPanel estabelecimentosPanel = new JPanel( new BorderLayout() );
empresasPanel.setBorder( BorderFactory.createTitledBorder( "Empresa" ) );
estabelecimentosPanel.setBorder( BorderFactory.createTitledBorder( "Estabelecimento" ) );
empresasPanel.add( empresasScroll, BorderLayout.CENTER );
estabelecimentosPanel.add( estabelecimentosScroll, BorderLayout.CENTER );
gridbag.setConstraints( empresasPanel, constraints );
getContentPane().add( empresasPanel );
gridbag.setConstraints( estabelecimentosPanel, constraints );
getContentPane().add( estabelecimentosPanel );
constraints.weighty = 0;
constraints.gridheight = 1;
Write Preview
Loading…
Cancel
Save