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

no message

Browse Source 
git-svn-id: https://svn.coded.pt/svn/SIPRP@328 bb69d46d-e84e-40c8-a05a-06db0d633741
Frederico Palma 19 years ago
parent 63616e92c0
commit 3aabc3e183
4 changed files with 46 additions and 165 deletions
Show Stats Download Patch File Download Diff File

2
trunk/siprp/Main.java
Unescape View File

@ -22,7 +22,7 @@ import siprp.update.UpdateWindow;
public class Main implements com.evolute.utils.ui.window.Connector
{
public final static String SHST_VERSION = "7.0";
public final static String SHST_VERSION = "7.1";
private final static ClassLoader classLoader = new EVUtilsImageLib().getClass().getClassLoader();

123
trunk/siprp/medicina/MarcacaoExamePanel.java
Unescape View File

@ -27,15 +27,11 @@ public class MarcacaoExamePanel
private final JLabel dataLabel = new JLabel( "Data dos Exames", JLabel.RIGHT );
private final JCalendarPanel dataPanel = new JCalendarPanel( null );
private final JButton novaDataButton = new JButton( "Nova data" );
private final JLabel estadoLabel = new JLabel( "Estado", JLabel.RIGHT );
private final JComboBox estadoList = new JComboBox();
private final JPanelControllable detalhesPanel = new JPanelControllable();
private final JButton emailButton = new JButton( "Enviar Email" );
private final JPanelControllable historicoPanel = new JPanelControllable();
private final JPanelControllable detalhesPanel = new JPanelControllable();
private RadioButtonFixedPanel estadoList;
private final JScrollPane observacoesTextScroll = new JScrollPane();
private final StateTextArea observacoesText = new StateTextArea();
private final JButton historicoButton = new JButton( "Ver Hist\u00f3rico desta Marca\u00e7\u00e3o" );
public MarcacaoExamePanel()
throws Exception
@ -58,29 +54,26 @@ public class MarcacaoExamePanel
throws Exception
{
JComponent MarcacaoExamePanel = this;
novaDataButton.setMinimumSize( new Dimension( 300, 20 ) );
novaDataButton.setPreferredSize( new Dimension( 200, 20 ) );
estadoList.addItem( new MappableObject( new Integer( 0 ), "Por realizar" ) );
estadoList.addItem( new MappableObject( new Integer( 1 ), "Parcialmente realizados" ) );
estadoList.addItem( new MappableObject( new Integer( 2 ), "Realizados" ) );
estadoList.addItem( new MappableObject( new Integer( 3 ), "Desmarcados pelo trabalhador" ) );
estadoList.addItem( new MappableObject( new Integer( 4 ), "Desmarcados pela SIPRP" ) );
estadoList.addItem( new MappableObject( new Integer( 5 ), "Faltou" ) );
estadoList.setSelectedIndex( 0 );
emailButton.setMinimumSize( new Dimension( 300, 20 ) );
emailButton.setPreferredSize( new Dimension( 200, 20 ) );
detalhesPanel.setBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), "Detalhes" ) );
emailButton.setMinimumSize( new Dimension( 300, 20 ) );
emailButton.setPreferredSize( new Dimension( 300, 20 ) );
IDObject estadoListOptions[] = new IDObject[]{
new MappableObject( new Integer( 0 ), "Por realizar" ),
new MappableObject( new Integer( 1 ), "Parcialmente realizados" ),
new MappableObject( new Integer( 2 ), "Realizados" ),
new MappableObject( new Integer( 3 ), "Desmarcados pelo trabalhador" ),
new MappableObject( new Integer( 4 ), "Desmarcados pela SIPRP" ),
new MappableObject( new Integer( 5 ), "Faltou" ),
};
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( 3 );
historicoButton.setMinimumSize( new Dimension( 300, 20 ) );
historicoButton.setPreferredSize( new Dimension( 400, 20 ) );
observacoesText.setRows( 5 );
}
@ -91,10 +84,6 @@ public class MarcacaoExamePanel
detalhesPanelGBC.insets = new Insets( 1, 1, 1, 1 );
GridBagLayout detalhesPanelLayout = new GridBagLayout();
detalhesPanel.setLayout( detalhesPanelLayout );
GridBagConstraints historicoPanelGBC = new GridBagConstraints();
historicoPanelGBC.insets = new Insets( 1, 1, 1, 1 );
GridBagLayout historicoPanelLayout = new GridBagLayout();
historicoPanel.setLayout( historicoPanelLayout );
GridBagConstraints MarcacaoExamePanelGBC = new GridBagConstraints();
MarcacaoExamePanelGBC.insets = new Insets( 1, 1, 1, 1 );
GridBagLayout MarcacaoExamePanelLayout = new GridBagLayout();
@ -126,65 +115,35 @@ public class MarcacaoExamePanel
MarcacaoExamePanelGBC.weightx = 0.5;
MarcacaoExamePanelGBC.weighty = 0.0;
MarcacaoExamePanelGBC.fill = GridBagConstraints.NONE;
MarcacaoExamePanelLayout.setConstraints( novaDataButton, MarcacaoExamePanelGBC );
MarcacaoExamePanel.add( novaDataButton );
MarcacaoExamePanelLayout.setConstraints( emailButton, MarcacaoExamePanelGBC );
MarcacaoExamePanel.add( emailButton );
MarcacaoExamePanelGBC.gridx = 0;
MarcacaoExamePanelGBC.gridy = 1;
MarcacaoExamePanelGBC.gridwidth = 1;
MarcacaoExamePanelGBC.gridheight = 1;
MarcacaoExamePanelGBC.weightx = 0.0;
MarcacaoExamePanelGBC.weighty = 0.0;
MarcacaoExamePanelGBC.fill = GridBagConstraints.HORIZONTAL;
MarcacaoExamePanelLayout.setConstraints( estadoLabel, MarcacaoExamePanelGBC );
MarcacaoExamePanel.add( estadoLabel );
MarcacaoExamePanelGBC.gridx = 1;
MarcacaoExamePanelGBC.gridy = 1;
MarcacaoExamePanelGBC.gridwidth = 1;
MarcacaoExamePanelGBC.gridwidth = 2;
MarcacaoExamePanelGBC.gridheight = 1;
MarcacaoExamePanelGBC.weightx = 0.5;
MarcacaoExamePanelGBC.weighty = 0.0;
MarcacaoExamePanelGBC.fill = GridBagConstraints.HORIZONTAL;
MarcacaoExamePanelLayout.setConstraints( estadoList, MarcacaoExamePanelGBC );
MarcacaoExamePanel.add( estadoList );
MarcacaoExamePanelGBC.gridx = 2;
MarcacaoExamePanelGBC.gridy = 1;
MarcacaoExamePanelGBC.gridwidth = 1;
MarcacaoExamePanelGBC.gridheight = 3;
MarcacaoExamePanelGBC.weightx = 0.5;
MarcacaoExamePanelGBC.weighty = 0.8;
MarcacaoExamePanelGBC.fill = GridBagConstraints.BOTH;
MarcacaoExamePanelLayout.setConstraints( detalhesPanel, MarcacaoExamePanelGBC );
MarcacaoExamePanel.add( detalhesPanel );
MarcacaoExamePanelGBC.gridx = 0;
MarcacaoExamePanelGBC.gridy = 2;
MarcacaoExamePanelGBC.gridwidth = 2;
MarcacaoExamePanelGBC.gridx = 2;
MarcacaoExamePanelGBC.gridy = 1;
MarcacaoExamePanelGBC.gridwidth = 1;
MarcacaoExamePanelGBC.gridheight = 1;
MarcacaoExamePanelGBC.weightx = 0.5;
MarcacaoExamePanelGBC.weighty = 0.0;
MarcacaoExamePanelGBC.fill = GridBagConstraints.NONE;
MarcacaoExamePanelLayout.setConstraints( emailButton, MarcacaoExamePanelGBC );
MarcacaoExamePanel.add( emailButton );
MarcacaoExamePanelGBC.gridx = 0;
MarcacaoExamePanelGBC.gridy = 3;
MarcacaoExamePanelGBC.gridwidth = 2;
MarcacaoExamePanelGBC.gridheight = 1;
MarcacaoExamePanelGBC.weightx = 0.5;
MarcacaoExamePanelGBC.weighty = 0.8;
MarcacaoExamePanelGBC.fill = GridBagConstraints.BOTH;
MarcacaoExamePanelLayout.setConstraints( historicoPanel, MarcacaoExamePanelGBC );
MarcacaoExamePanel.add( historicoPanel );
MarcacaoExamePanelLayout.setConstraints( estadoList, MarcacaoExamePanelGBC );
MarcacaoExamePanel.add( estadoList );
MarcacaoExamePanelGBC.gridx = 0;
MarcacaoExamePanelGBC.gridy = 4;
MarcacaoExamePanelGBC.gridy = 2;
MarcacaoExamePanelGBC.gridwidth = 3;
MarcacaoExamePanelGBC.gridheight = 1;
MarcacaoExamePanelGBC.weightx = 1.0;
MarcacaoExamePanelGBC.weighty = 0.2;
MarcacaoExamePanelGBC.weighty = 1.0;
observacoesTextScroll.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER );
observacoesTextScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED );
observacoesTextScroll.setViewportView( observacoesText );
@ -192,16 +151,6 @@ public class MarcacaoExamePanel
MarcacaoExamePanelLayout.setConstraints( observacoesTextScroll, MarcacaoExamePanelGBC );
MarcacaoExamePanel.add( observacoesTextScroll );
MarcacaoExamePanelGBC.gridx = 0;
MarcacaoExamePanelGBC.gridy = 5;
MarcacaoExamePanelGBC.gridwidth = 3;
MarcacaoExamePanelGBC.gridheight = 1;
MarcacaoExamePanelGBC.weightx = 1.0;
MarcacaoExamePanelGBC.weighty = 0.0;
MarcacaoExamePanelGBC.fill = GridBagConstraints.NONE;
MarcacaoExamePanelLayout.setConstraints( historicoButton, MarcacaoExamePanelGBC );
MarcacaoExamePanel.add( historicoButton );
}
private void setupComponentsHashtable()
@ -300,31 +249,11 @@ public class MarcacaoExamePanel
return emailButton;
}
public JLabel getEstadoLabel()
{
return estadoLabel;
}
public JComboBox getEstadoList()
public RadioButtonFixedPanel getEstadoList()
{
return estadoList;
}
public JButton getHistoricoButton()
{
return historicoButton;
}
public JPanelControllable getHistoricoPanel()
{
return historicoPanel;
}
public JButton getNovaDataButton()
{
return novaDataButton;
}
public StateTextArea getObservacoesText()
{
return observacoesText;

73
trunk/siprp/medicina/MarcacaoExamePanel.xml
Unescape View File

@ -15,10 +15,7 @@
<GRID>
<ROW TYPE="MIN"/> <!--R0-->
<ROW TYPE="MIN"/> <!--R1-->
<ROW TYPE="MIN"/> <!--R2-->
<ROW TYPE="PERCENTAGE" VALUE="80" /> <!--R3-->
<ROW TYPE="PERCENTAGE" VALUE="20" /> <!--R4-->
<ROW TYPE="MIN"/> <!--R5-->
<ROW TYPE="MAX"/> <!--R2-->
<COL TYPE="MIN" /> <!--C0-->
<COL TYPE="MAX" /> <!--C1-->
@ -34,9 +31,9 @@
<EDITOR NAME="dataPanel" ROW="0" COLUMN="1" DATA_FIELD="data">
<CONTENT TYPE="DATE" />
</EDITOR>
<BUTTON NAME="novaDataButton" ROW="0" COLUMN="2">
<BUTTON NAME="emailButton" ROW="0" COLUMN="2">
<CAPTION>
Nova data
Enviar Email
</CAPTION>
<SIZE>
<WIDTH PREFERRED="200" MIN="300" />
@ -45,15 +42,19 @@
</BUTTON>
<!-- ROW 1 -->
<LABEL NAME="estadoLabel" ROW="1" COLUMN="0">
<CAPTION>
Estado
</CAPTION>
</LABEL>
<EDITOR NAME="estadoList" ROW="1" COLUMN="1" EDITABLE="FALSE" DATA_FIELD="estado">
<!--<BORDER TYPE="ETCHED">Estado</BORDER>-->
<PANEL NAME="detalhesPanel" ROW="1" COLUMN="0" COLSPAN="2">
<BORDER TYPE="ETCHED">Detalhes</BORDER>
<GRID>
<ROW TYPE="MAX"/> <!--R0-->
<COL TYPE="MAX" /> <!--C0-->
</GRID>
</PANEL>
<EDITOR NAME="estadoList" ROW="1" COLUMN="2" EDITABLE="FALSE" DATA_FIELD="estado">
<BORDER TYPE="ETCHED">Estado</BORDER>
<CONTENT TYPE="INTEGER" ISLIST="TRUE">
<ROWS>1</ROWS>
<ROWS>6</ROWS>
</CONTENT>
<LIST_CONTENT HAS_IDS="TRUE" SELECTABLE="TRUE" DISPLAY_COLUMNS="1">
<LIST_OPTION OPTION_ID="0" DEFAULT="TRUE">Por realizar</LIST_OPTION>
@ -64,54 +65,14 @@
<LIST_OPTION OPTION_ID="5">Faltou</LIST_OPTION>
</LIST_CONTENT>
</EDITOR>
<PANEL NAME="detalhesPanel" ROW="1" COLUMN="2" ROWSPAN="3">
<BORDER TYPE="ETCHED">Detalhes</BORDER>
<GRID>
<ROW TYPE="MAX"/> <!--R0-->
<COL TYPE="MAX" /> <!--C0-->
</GRID>
</PANEL>
<!-- ROW 2 -->
<BUTTON NAME="emailButton" ROW="2" COLUMN="0" COLSPAN="2" >
<CAPTION>
Enviar Email
</CAPTION>
<SIZE>
<WIDTH PREFERRED="300" MIN="300" />
<HEIGHT PREFERRED="20" MIN="20" />
</SIZE>
</BUTTON>
<!-- ROW 3 -->
<PANEL NAME="historicoPanel" ROW="3" COLUMN="0" COLSPAN="2">
<GRID>
<ROW TYPE="MAX"/> <!--R0-->
<COL TYPE="MAX" /> <!--C0-->
</GRID>
</PANEL>
<!-- ROW 4 -->
<EDITOR NAME="observacoesText" ROW="4" COLUMN="0" COLSPAN="3" DATA_FIELD="observacoes">
<EDITOR NAME="observacoesText" ROW="2" COLUMN="0" COLSPAN="3" DATA_FIELD="observacoes">
<BORDER TYPE="ETCHED">Observa\u00e7\u00f5es</BORDER>
<SCROLL/>
<CONTENT TYPE="CHAR" ACCEPTS_NEGATIVE="FALSE">
<ROWS>3</ROWS>
<ROWS>5</ROWS>
</CONTENT>
</EDITOR>
<!-- ROW 5 -->
<BUTTON NAME="historicoButton" ROW="5" COLUMN="0" COLSPAN="3">
<CAPTION>
Ver Hist\u00f3rico desta Marca\u00e7\u00e3o
</CAPTION>
<SIZE>
<WIDTH PREFERRED="400" MIN="300" />
<HEIGHT PREFERRED="20" MIN="20" />
</SIZE>
</BUTTON>
</PANEL>
</UICOMPONENT>

13
trunk/siprp/medicina/MedicinaWindow.java
Unescape View File

@ -75,9 +75,6 @@ public class MedicinaWindow extends TabbedWindow
protected TrabalhadorData trabalhador;
protected boolean estado[] = new boolean[]{ false, false };
private boolean consultaDateChanged = false;
private boolean ecdDateChanged = false;
/** Creates a new instance of MedicinaWindow */
public MedicinaWindow()
throws Exception
@ -88,13 +85,12 @@ public class MedicinaWindow extends TabbedWindow
fichaProvider = ( FichaDataProvider ) FichaDataProvider.getProvider();
JDO = ( JDOProvider ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER );
setupComponents();
// maximizeOnNextActivate();
maximizeOnNextActivate();
}
private void setupComponents()
throws Exception
{
setSize( 1024, 700 );
setTitle( "Medicina" );
setupConsultaComponents();
setupExameComponents();
@ -221,8 +217,6 @@ public class MedicinaWindow extends TabbedWindow
gridbag.setConstraints( marcacaoExameEditorPanel, constraints );
panel.add( marcacaoExameEditorPanel );
marcacaoExamePanel.getEmailButton().addActionListener( this );
marcacaoExamePanel.getNovaDataButton().addActionListener( null );
}
public boolean save(int index)
@ -377,13 +371,10 @@ public class MedicinaWindow extends TabbedWindow
marcacaoExamePanel.getEmailButton().setEnabled( enable );
if( detalhesExamePanel != null )
{
// detalhesExamePanel.setEnabled( enable );
detalhesExamePanel.setEnabled( false );
detalhesExamePanel.setEnabled( enable );
}
marcacaoExamePanel.getEstadoList().setEnabled( false );
upperPanel.setEnabled( !enable );
estado[ 0 ] = enable;
ecdDateChanged = false;
break;
case INDEX_CONSULTA:

Write Preview
Loading…
Cancel
Save