diff --git a/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimento.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimento.java index 16f5fca4..0081b6c4 100644 --- a/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimento.java +++ b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimento.java @@ -17,6 +17,7 @@ public final class MarcacaoEstabelecimento implements JDOInnerObject private String realizada; private Integer estado; private Integer tecnico_hst; + private Integer tecnico_superior_hst; private Date data_email; private Date data_relatorio; private Estabelecimento estabelecimento; @@ -64,6 +65,10 @@ public final class MarcacaoEstabelecimento implements JDOInnerObject { return observacoes; } + else if( fieldName == MarcacaoEstabelecimentoData.TECNICO_SUPERIOR_HST ) + { + return tecnico_superior_hst; + } else if( fieldName.equals( MarcacaoEstabelecimentoData.ID ) ) { return id; @@ -100,6 +105,10 @@ public final class MarcacaoEstabelecimento implements JDOInnerObject { return observacoes; } + else if( fieldName.equals( MarcacaoEstabelecimentoData.TECNICO_SUPERIOR_HST ) ) + { + return tecnico_superior_hst; + } return null; } @@ -125,6 +134,10 @@ public final class MarcacaoEstabelecimento implements JDOInnerObject { tecnico_hst = ( Integer ) value; } + else if( fieldName == MarcacaoEstabelecimentoData.TECNICO_SUPERIOR_HST ) + { + tecnico_superior_hst = ( Integer ) value; + } else if( fieldName == MarcacaoEstabelecimentoData.DATA_EMAIL ) { data_email = ( Date ) value; @@ -161,6 +174,10 @@ public final class MarcacaoEstabelecimento implements JDOInnerObject { tecnico_hst = ( Integer ) value; } + else if( fieldName.equals( MarcacaoEstabelecimentoData.TECNICO_SUPERIOR_HST ) ) + { + tecnico_superior_hst = ( Integer ) value; + } else if( fieldName.equals( MarcacaoEstabelecimentoData.DATA_EMAIL ) ) { data_email = ( Date ) value; diff --git a/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimentoData.java b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimentoData.java index 4c8551ca..1f490d33 100644 --- a/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimentoData.java +++ b/trunk/SIPRPSoft/src/siprp/data/MarcacaoEstabelecimentoData.java @@ -17,18 +17,19 @@ public final class MarcacaoEstabelecimentoData extends Marcacao public static final String REALIZADA = "realizada"; public static final String ESTADO = "estado"; public static final String TECNICO_HST = "tecnico_hst"; + public static final String TECNICO_SUPERIOR_HST = "tecnico_superior_hst"; public static final String DATA_EMAIL = "data_email"; public static final String DATA_RELATORIO = "data_relatorio"; public static final String ESTABELECIMENTO = "estabelecimento"; public static final String OBSERVACOES = "observacoes"; public static final String FIELD_NAMES[] = new String[]{ - DATA, REALIZADA, ESTADO, TECNICO_HST, DATA_EMAIL, DATA_RELATORIO, ESTABELECIMENTO, + DATA, REALIZADA, ESTADO, TECNICO_HST, TECNICO_SUPERIOR_HST, DATA_EMAIL, DATA_RELATORIO, ESTABELECIMENTO, OBSERVACOES, }; protected static final String ALL_FIELD_NAMES[] = new String[]{ - ID, DATA, REALIZADA, ESTADO, TECNICO_HST, DATA_EMAIL, DATA_RELATORIO, + ID, DATA, REALIZADA, ESTADO, TECNICO_HST, TECNICO_SUPERIOR_HST, DATA_EMAIL, DATA_RELATORIO, ESTABELECIMENTO, OBSERVACOES, }; private HashMap dataHash; diff --git a/trunk/SIPRPSoft/src/siprp/data/TecnicoHST.java b/trunk/SIPRPSoft/src/siprp/data/TecnicoHST.java index 352d6096..6ed0a97c 100644 --- a/trunk/SIPRPSoft/src/siprp/data/TecnicoHST.java +++ b/trunk/SIPRPSoft/src/siprp/data/TecnicoHST.java @@ -17,6 +17,7 @@ public final class TecnicoHST implements JDOInnerObject private String iniciais; private Integer identificador; private String inactivo; + private String is_superior; public TecnicoHST() { @@ -48,6 +49,10 @@ public final class TecnicoHST implements JDOInnerObject { return inactivo; } + else if( fieldName == TecnicoHSTData.IS_SUPERIOR ) + { + return is_superior; + } else if( fieldName.equals( TecnicoHSTData.ID ) ) { return id; @@ -72,6 +77,10 @@ public final class TecnicoHST implements JDOInnerObject { return inactivo; } + else if( fieldName.equals( TecnicoHSTData.IS_SUPERIOR ) ) + { + return is_superior; + } return null; } @@ -101,6 +110,10 @@ public final class TecnicoHST implements JDOInnerObject { inactivo = ( String ) value; } + else if( fieldName == TecnicoHSTData.IS_SUPERIOR ) + { + is_superior = ( String ) value; + } else if( fieldName.equals( TecnicoHSTData.ID ) ) { id = ( Integer ) value; @@ -125,6 +138,10 @@ public final class TecnicoHST implements JDOInnerObject { inactivo = ( String ) value; } + else if( fieldName.equals( TecnicoHSTData.IS_SUPERIOR ) ) + { + is_superior = ( String ) value; + } } public Class getOuterClass() diff --git a/trunk/SIPRPSoft/src/siprp/data/TecnicoHSTData.java b/trunk/SIPRPSoft/src/siprp/data/TecnicoHSTData.java index 1d70e935..28f3cb19 100644 --- a/trunk/SIPRPSoft/src/siprp/data/TecnicoHSTData.java +++ b/trunk/SIPRPSoft/src/siprp/data/TecnicoHSTData.java @@ -19,13 +19,14 @@ public final class TecnicoHSTData extends JDOObject public static final String INICIAIS = "iniciais"; public static final String IDENTIFICADOR = "identificador"; public static final String INACTIVO = "inactivo"; + public static final String IS_SUPERIOR = "is_superior"; public static final String FIELD_NAMES[] = new String[]{ - NOME, NOME_PLAIN, INICIAIS, IDENTIFICADOR, }; + NOME, NOME_PLAIN, INICIAIS, IDENTIFICADOR, IS_SUPERIOR, }; protected static final String ALL_FIELD_NAMES[] = new String[]{ - ID, NOME, NOME_PLAIN, INICIAIS, IDENTIFICADOR, INACTIVO, }; + ID, NOME, NOME_PLAIN, INICIAIS, IDENTIFICADOR, INACTIVO, IS_SUPERIOR }; private HashMap dataHash; diff --git a/trunk/SIPRPSoft/src/siprp/data/package.jdo b/trunk/SIPRPSoft/src/siprp/data/package.jdo index f915ec94..f8600ea7 100644 --- a/trunk/SIPRPSoft/src/siprp/data/package.jdo +++ b/trunk/SIPRPSoft/src/siprp/data/package.jdo @@ -683,6 +683,12 @@ + + + + + + @@ -933,6 +939,14 @@ + + + + + + + + diff --git a/trunk/SIPRPSoft/src/siprp/higiene/HigieneDataProvider.java b/trunk/SIPRPSoft/src/siprp/higiene/HigieneDataProvider.java index 60b2074b..0ae206d0 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/HigieneDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/HigieneDataProvider.java @@ -9,20 +9,22 @@ package siprp.higiene; -import java.awt.*; -import java.util.*; +import java.awt.Color; +import java.util.Calendar; +import java.util.Date; +import java.util.Hashtable; +import java.util.Vector; -import com.evolute.utils.*; -import com.evolute.utils.arrays.*; -import com.evolute.utils.data.*; -import com.evolute.utils.db.*; -import com.evolute.utils.metadb.*; -import com.evolute.utils.sql.*; -import com.evolute.utils.strings.*; -import com.evolute.utils.tables.*; +import siprp.SingletonConstants; -import siprp.*; -import siprp.data.*; +import com.evolute.utils.Singleton; +import com.evolute.utils.arrays.Virtual2DArray; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; +import com.evolute.utils.metadb.MetaProvider; +import com.evolute.utils.sql.Field; +import com.evolute.utils.sql.Select; +import com.evolute.utils.tables.ColumnizedMappable; /** * @@ -72,12 +74,25 @@ public class HigieneDataProvider extends MetaProvider return instance; } - public Object[][] getAllTecnicosHST() + public Object[][] getTecnicosHST( boolean superiores ) throws Exception { Select select = new Select( new String[]{ "marcacoes_tecnicos_hst" }, new String[]{ "id", "nome", "iniciais", "identificador", "nome_plain" }, + new Field( "inactivo" ).isDifferent( "y" ).and(new Field( "is_superior" ).isEqual( superiores ? "y" : "n" )), + new String[]{ "nome_plain" }, + null ); + Virtual2DArray array = executer.executeQuery( select ); + return array.getObjects(); + } + + public Object[][] getAllTecnicosHST( ) + throws Exception + { + Select select = + new Select( new String[]{ "marcacoes_tecnicos_hst" }, + new String[]{ "id", "nome", "iniciais", "identificador", "is_superior", "nome_plain" }, new Field( "inactivo" ).isDifferent( "y" ), new String[]{ "nome_plain" }, null ); @@ -163,7 +178,7 @@ public class HigieneDataProvider extends MetaProvider Select select = new Select( new String[]{ "marcacoes_tecnicos_hst" }, new String[]{ "id", "nome", "iniciais", "identificador", "nome_plain" }, - new Field( "inactivo" ).isDifferent( "y" ), + new Field( "inactivo" ).isDifferent( "y" ).and(new Field( "is_superior" ).isDifferent( "y" )), new String[]{ "nome_plain" }, null ); Virtual2DArray array = executer.executeQuery( select ); diff --git a/trunk/SIPRPSoft/src/siprp/higiene/mapa/TecnicosPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/mapa/TecnicosPanel.java index c098e430..602bc045 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/mapa/TecnicosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/mapa/TecnicosPanel.java @@ -40,7 +40,7 @@ public class TecnicosPanel extends JPanel private void setupComponents() throws Exception { - Object tecnicos[][] = provider.getAllTecnicosHST(); + Object tecnicos[][] = provider.getTecnicosHST( false ); GridBagLayout gridbag = new GridBagLayout(); setLayout( gridbag ); GridBagConstraints constraints = new GridBagConstraints(); diff --git a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java index 9c7f0862..20158384 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java @@ -1,25 +1,43 @@ package siprp.higiene.marcacoes; -import com.evolute.utils.*; -import com.evolute.utils.arrays.*; -import com.evolute.utils.data.*; -import com.evolute.utils.dataui.*; -import com.evolute.utils.db.*; -import com.evolute.utils.documents.*; -import com.evolute.utils.sql.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.calendar.*; -import com.evolute.utils.ui.panel.*; -import com.evolute.utils.ui.text.*; -import java.awt.*; -import java.util.*; -import javax.swing.*; -import siprp.data.*; +import info.clearthought.layout.TableLayout; +import info.clearthought.layout.TableLayoutConstraints; + +import java.awt.Dimension; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.util.Hashtable; + +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; + +import siprp.data.MarcacaoEstabelecimentoData; + +import com.evolute.utils.Singleton; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.data.MappableObject; +import com.evolute.utils.data.PropertyObject; +import com.evolute.utils.dataui.ComponentController; +import com.evolute.utils.dataui.ComponentsHashtable; +import com.evolute.utils.dataui.ControllableComponent; +import com.evolute.utils.dataui.DataClassAware; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.SQLExecuter; +import com.evolute.utils.ui.calendar.JCalendarPanel; +import com.evolute.utils.ui.panel.RadioButtonFixedPanel; +import com.evolute.utils.ui.text.StateTextArea; public class MarcacaoVisitaHSTPanel extends JPanel implements ControllableComponent, DataClassAware { + + private static final long serialVersionUID = 1L; private siprp.data.MarcacaoEstabelecimentoData marcacaoEstabelecimentoData; private final ComponentsHashtable components = new ComponentsHashtable(); @@ -31,7 +49,9 @@ public class MarcacaoVisitaHSTPanel private final JLabel dataFichaLabel = new JLabel( "Data do Relat\u00f3rio(externo)", JLabel.RIGHT ); private final JCalendarPanel dataFichaPanel = new JCalendarPanel( null ); private final JLabel tecnicoLabel = new JLabel( "T\u00e9cnico", JLabel.RIGHT ); + private final JLabel tecnicoSuperiorLabel = new JLabel( "T\u00e9cnico Superior", JLabel.RIGHT ); private final JComboBox tecnicoList = new JComboBox(); + private final JComboBox tecnicoSuperiorList = new JComboBox(); private RadioButtonFixedPanel estadoList; private final JScrollPane observacoesTextScroll = new JScrollPane(); private final StateTextArea observacoesText = new StateTextArea(); @@ -56,12 +76,14 @@ public class MarcacaoVisitaHSTPanel public void setupComponents() throws Exception { - JComponent MarcacaoVisitaHSTPanel = this; - emailButton.setMinimumSize( new Dimension( 300, 20 ) ); - emailButton.setPreferredSize( new Dimension( 200, 20 ) ); +// emailButton.setMinimumSize( new Dimension( 300, 20 ) ); +// emailButton.setPreferredSize( new Dimension( 200, 20 ) ); tecnicoList.addItem( new MappableObject( new Integer( -1 ), "" ) ); tecnicoList.setSelectedIndex( 0 ); + + tecnicoSuperiorList.addItem( new MappableObject( new Integer( -1 ), "" ) ); + tecnicoSuperiorList.setSelectedIndex( 0 ); IDObject estadoListOptions[] = new IDObject[]{ new MappableObject( new Integer( 0 ), "Por realizar" ), @@ -72,113 +94,135 @@ public class MarcacaoVisitaHSTPanel 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 ); + + 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 ); } public void place() { - JPanel MarcacaoVisitaHSTPanel = this; - GridBagConstraints MarcacaoVisitaHSTPanelGBC = new GridBagConstraints(); - MarcacaoVisitaHSTPanelGBC.insets = new Insets( 1, 1, 1, 1 ); - GridBagLayout MarcacaoVisitaHSTPanelLayout = new GridBagLayout(); - MarcacaoVisitaHSTPanel.setLayout( MarcacaoVisitaHSTPanelLayout ); - MarcacaoVisitaHSTPanelGBC.gridx = 0; - MarcacaoVisitaHSTPanelGBC.gridy = 0; - MarcacaoVisitaHSTPanelGBC.gridwidth = 1; - MarcacaoVisitaHSTPanelGBC.gridheight = 1; - MarcacaoVisitaHSTPanelGBC.weightx = 0.0; - MarcacaoVisitaHSTPanelGBC.weighty = 0.0; - MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.HORIZONTAL; - MarcacaoVisitaHSTPanelLayout.setConstraints( dataLabel, MarcacaoVisitaHSTPanelGBC ); - MarcacaoVisitaHSTPanel.add( dataLabel ); - - MarcacaoVisitaHSTPanelGBC.gridx = 1; - MarcacaoVisitaHSTPanelGBC.gridy = 0; - MarcacaoVisitaHSTPanelGBC.gridwidth = 1; - MarcacaoVisitaHSTPanelGBC.gridheight = 1; - MarcacaoVisitaHSTPanelGBC.weightx = 0.5; - MarcacaoVisitaHSTPanelGBC.weighty = 0.0; - MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.HORIZONTAL; - MarcacaoVisitaHSTPanelLayout.setConstraints( dataPanel, MarcacaoVisitaHSTPanelGBC ); - MarcacaoVisitaHSTPanel.add( dataPanel ); - - MarcacaoVisitaHSTPanelGBC.gridx = 2; - MarcacaoVisitaHSTPanelGBC.gridy = 0; - MarcacaoVisitaHSTPanelGBC.gridwidth = 1; - MarcacaoVisitaHSTPanelGBC.gridheight = 1; - MarcacaoVisitaHSTPanelGBC.weightx = 0.5; - MarcacaoVisitaHSTPanelGBC.weighty = 0.0; - MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.NONE; - MarcacaoVisitaHSTPanelLayout.setConstraints( emailButton, MarcacaoVisitaHSTPanelGBC ); - MarcacaoVisitaHSTPanel.add( emailButton ); - - MarcacaoVisitaHSTPanelGBC.gridx = 0; - MarcacaoVisitaHSTPanelGBC.gridy = 1; - MarcacaoVisitaHSTPanelGBC.gridwidth = 1; - MarcacaoVisitaHSTPanelGBC.gridheight = 1; - MarcacaoVisitaHSTPanelGBC.weightx = 0.0; - MarcacaoVisitaHSTPanelGBC.weighty = 0.0; - MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.HORIZONTAL; - MarcacaoVisitaHSTPanelLayout.setConstraints( dataFichaLabel, MarcacaoVisitaHSTPanelGBC ); - MarcacaoVisitaHSTPanel.add( dataFichaLabel ); - - MarcacaoVisitaHSTPanelGBC.gridx = 1; - MarcacaoVisitaHSTPanelGBC.gridy = 1; - MarcacaoVisitaHSTPanelGBC.gridwidth = 1; - MarcacaoVisitaHSTPanelGBC.gridheight = 1; - MarcacaoVisitaHSTPanelGBC.weightx = 0.5; - MarcacaoVisitaHSTPanelGBC.weighty = 0.0; - MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.HORIZONTAL; - MarcacaoVisitaHSTPanelLayout.setConstraints( dataFichaPanel, MarcacaoVisitaHSTPanelGBC ); - MarcacaoVisitaHSTPanel.add( dataFichaPanel ); - - MarcacaoVisitaHSTPanelGBC.gridx = 0; - MarcacaoVisitaHSTPanelGBC.gridy = 2; - MarcacaoVisitaHSTPanelGBC.gridwidth = 1; - MarcacaoVisitaHSTPanelGBC.gridheight = 1; - MarcacaoVisitaHSTPanelGBC.weightx = 0.0; - MarcacaoVisitaHSTPanelGBC.weighty = 0.0; - MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.HORIZONTAL; - MarcacaoVisitaHSTPanelLayout.setConstraints( tecnicoLabel, MarcacaoVisitaHSTPanelGBC ); - MarcacaoVisitaHSTPanel.add( tecnicoLabel ); - - MarcacaoVisitaHSTPanelGBC.gridx = 1; - MarcacaoVisitaHSTPanelGBC.gridy = 2; - MarcacaoVisitaHSTPanelGBC.gridwidth = 1; - MarcacaoVisitaHSTPanelGBC.gridheight = 1; - MarcacaoVisitaHSTPanelGBC.weightx = 0.5; - MarcacaoVisitaHSTPanelGBC.weighty = 0.0; - MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.HORIZONTAL; - MarcacaoVisitaHSTPanelLayout.setConstraints( tecnicoList, MarcacaoVisitaHSTPanelGBC ); - MarcacaoVisitaHSTPanel.add( tecnicoList ); - - MarcacaoVisitaHSTPanelGBC.gridx = 0; - MarcacaoVisitaHSTPanelGBC.gridy = 3; - MarcacaoVisitaHSTPanelGBC.gridwidth = 3; - MarcacaoVisitaHSTPanelGBC.gridheight = 1; - MarcacaoVisitaHSTPanelGBC.weightx = 1.0; - MarcacaoVisitaHSTPanelGBC.weighty = 0.5; - MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.BOTH; - MarcacaoVisitaHSTPanelLayout.setConstraints( estadoList, MarcacaoVisitaHSTPanelGBC ); - MarcacaoVisitaHSTPanel.add( estadoList ); - - MarcacaoVisitaHSTPanelGBC.gridx = 0; - MarcacaoVisitaHSTPanelGBC.gridy = 4; - MarcacaoVisitaHSTPanelGBC.gridwidth = 3; - MarcacaoVisitaHSTPanelGBC.gridheight = 1; - MarcacaoVisitaHSTPanelGBC.weightx = 1.0; - MarcacaoVisitaHSTPanelGBC.weighty = 0.5; - observacoesTextScroll.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER ); - observacoesTextScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED ); - observacoesTextScroll.setViewportView( observacoesText ); - MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.BOTH; - MarcacaoVisitaHSTPanelLayout.setConstraints( observacoesTextScroll, MarcacaoVisitaHSTPanelGBC ); - MarcacaoVisitaHSTPanel.add( observacoesTextScroll ); - + TableLayout layout = new TableLayout( + new double[]{ TableLayout.FILL, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL }, + new double[]{ TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, + TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, + TableLayout.PREFERRED} + ); + layout.setHGap(5); + layout.setVGap(5); + this.setLayout( layout ); + this.add( dataLabel, new TableLayoutConstraints(1,0) ); + this.add( dataPanel, new TableLayoutConstraints(2,0) ); + this.add( emailButton, new TableLayoutConstraints(2,1) ); + this.add( dataFichaLabel, new TableLayoutConstraints(1,2) ); + this.add( dataFichaPanel, new TableLayoutConstraints(2,2) ); + this.add( tecnicoLabel, new TableLayoutConstraints(1,3) ); + this.add( tecnicoList, new TableLayoutConstraints(2,3) ); + 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 MarcacaoVisitaHSTPanel = this; +// GridBagConstraints MarcacaoVisitaHSTPanelGBC = new GridBagConstraints(); +// MarcacaoVisitaHSTPanelGBC.insets = new Insets( 1, 1, 1, 1 ); +// GridBagLayout MarcacaoVisitaHSTPanelLayout = new GridBagLayout(); +// MarcacaoVisitaHSTPanel.setLayout( MarcacaoVisitaHSTPanelLayout ); +// MarcacaoVisitaHSTPanelGBC.gridx = 0; +// MarcacaoVisitaHSTPanelGBC.gridy = 0; +// MarcacaoVisitaHSTPanelGBC.gridwidth = 1; +// MarcacaoVisitaHSTPanelGBC.gridheight = 1; +// MarcacaoVisitaHSTPanelGBC.weightx = 0.0; +// MarcacaoVisitaHSTPanelGBC.weighty = 0.0; +// MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.HORIZONTAL; +// MarcacaoVisitaHSTPanelLayout.setConstraints( dataLabel, MarcacaoVisitaHSTPanelGBC ); +// MarcacaoVisitaHSTPanel.add( dataLabel ); +// +// MarcacaoVisitaHSTPanelGBC.gridx = 1; +// MarcacaoVisitaHSTPanelGBC.gridy = 0; +// MarcacaoVisitaHSTPanelGBC.gridwidth = 1; +// MarcacaoVisitaHSTPanelGBC.gridheight = 1; +// MarcacaoVisitaHSTPanelGBC.weightx = 0.5; +// MarcacaoVisitaHSTPanelGBC.weighty = 0.0; +// MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.HORIZONTAL; +// MarcacaoVisitaHSTPanelLayout.setConstraints( dataPanel, MarcacaoVisitaHSTPanelGBC ); +// MarcacaoVisitaHSTPanel.add( dataPanel ); +// +// MarcacaoVisitaHSTPanelGBC.gridx = 2; +// MarcacaoVisitaHSTPanelGBC.gridy = 0; +// MarcacaoVisitaHSTPanelGBC.gridwidth = 1; +// MarcacaoVisitaHSTPanelGBC.gridheight = 1; +// MarcacaoVisitaHSTPanelGBC.weightx = 0.5; +// MarcacaoVisitaHSTPanelGBC.weighty = 0.0; +// MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.NONE; +// MarcacaoVisitaHSTPanelLayout.setConstraints( emailButton, MarcacaoVisitaHSTPanelGBC ); +// MarcacaoVisitaHSTPanel.add( emailButton ); +// +// MarcacaoVisitaHSTPanelGBC.gridx = 0; +// MarcacaoVisitaHSTPanelGBC.gridy = 1; +// MarcacaoVisitaHSTPanelGBC.gridwidth = 1; +// MarcacaoVisitaHSTPanelGBC.gridheight = 1; +// MarcacaoVisitaHSTPanelGBC.weightx = 0.0; +// MarcacaoVisitaHSTPanelGBC.weighty = 0.0; +// MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.HORIZONTAL; +// MarcacaoVisitaHSTPanelLayout.setConstraints( dataFichaLabel, MarcacaoVisitaHSTPanelGBC ); +// MarcacaoVisitaHSTPanel.add( dataFichaLabel ); +// +// MarcacaoVisitaHSTPanelGBC.gridx = 1; +// MarcacaoVisitaHSTPanelGBC.gridy = 1; +// MarcacaoVisitaHSTPanelGBC.gridwidth = 1; +// MarcacaoVisitaHSTPanelGBC.gridheight = 1; +// MarcacaoVisitaHSTPanelGBC.weightx = 0.5; +// MarcacaoVisitaHSTPanelGBC.weighty = 0.0; +// MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.HORIZONTAL; +// MarcacaoVisitaHSTPanelLayout.setConstraints( dataFichaPanel, MarcacaoVisitaHSTPanelGBC ); +// MarcacaoVisitaHSTPanel.add( dataFichaPanel ); +// +// MarcacaoVisitaHSTPanelGBC.gridx = 0; +// MarcacaoVisitaHSTPanelGBC.gridy = 2; +// MarcacaoVisitaHSTPanelGBC.gridwidth = 1; +// MarcacaoVisitaHSTPanelGBC.gridheight = 1; +// MarcacaoVisitaHSTPanelGBC.weightx = 0.0; +// MarcacaoVisitaHSTPanelGBC.weighty = 0.0; +// MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.HORIZONTAL; +// MarcacaoVisitaHSTPanelLayout.setConstraints( tecnicoLabel, MarcacaoVisitaHSTPanelGBC ); +// MarcacaoVisitaHSTPanel.add( tecnicoLabel ); +// +// MarcacaoVisitaHSTPanelGBC.gridx = 1; +// MarcacaoVisitaHSTPanelGBC.gridy = 2; +// MarcacaoVisitaHSTPanelGBC.gridwidth = 1; +// MarcacaoVisitaHSTPanelGBC.gridheight = 1; +// MarcacaoVisitaHSTPanelGBC.weightx = 0.5; +// MarcacaoVisitaHSTPanelGBC.weighty = 0.0; +// MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.HORIZONTAL; +// MarcacaoVisitaHSTPanelLayout.setConstraints( tecnicoList, MarcacaoVisitaHSTPanelGBC ); +// MarcacaoVisitaHSTPanel.add( tecnicoList ); +// +// MarcacaoVisitaHSTPanelGBC.gridx = 0; +// MarcacaoVisitaHSTPanelGBC.gridy = 3; +// MarcacaoVisitaHSTPanelGBC.gridwidth = 3; +// MarcacaoVisitaHSTPanelGBC.gridheight = 1; +// MarcacaoVisitaHSTPanelGBC.weightx = 1.0; +// MarcacaoVisitaHSTPanelGBC.weighty = 0.5; +// MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.BOTH; +// MarcacaoVisitaHSTPanelLayout.setConstraints( estadoList, MarcacaoVisitaHSTPanelGBC ); +// MarcacaoVisitaHSTPanel.add( estadoList ); +// +// MarcacaoVisitaHSTPanelGBC.gridx = 0; +// MarcacaoVisitaHSTPanelGBC.gridy = 4; +// MarcacaoVisitaHSTPanelGBC.gridwidth = 3; +// MarcacaoVisitaHSTPanelGBC.gridheight = 1; +// MarcacaoVisitaHSTPanelGBC.weightx = 1.0; +// MarcacaoVisitaHSTPanelGBC.weighty = 0.5; +// +// MarcacaoVisitaHSTPanelGBC.fill = GridBagConstraints.BOTH; +// MarcacaoVisitaHSTPanelLayout.setConstraints( observacoesTextScroll, MarcacaoVisitaHSTPanelGBC ); +// MarcacaoVisitaHSTPanel.add( observacoesTextScroll ); } private void setupComponentsHashtable() @@ -186,6 +230,7 @@ public class MarcacaoVisitaHSTPanel components.putComponent( siprp.data.MarcacaoEstabelecimentoData.DATA, dataPanel ); components.putComponent( siprp.data.MarcacaoEstabelecimentoData.DATA_RELATORIO, dataFichaPanel ); components.putComponent( siprp.data.MarcacaoEstabelecimentoData.TECNICO_HST, tecnicoList ); + components.putComponent( siprp.data.MarcacaoEstabelecimentoData.TECNICO_SUPERIOR_HST, tecnicoSuperiorList ); components.putComponent( siprp.data.MarcacaoEstabelecimentoData.ESTADO, estadoList ); components.putComponent( siprp.data.MarcacaoEstabelecimentoData.OBSERVACOES, observacoesText ); } @@ -254,7 +299,7 @@ public class MarcacaoVisitaHSTPanel ComponentController.setEnabled( properties, enable, components ); } - public Class getDataClass() + public Class getDataClass() { return siprp.data.MarcacaoEstabelecimentoData.class; } @@ -303,5 +348,10 @@ public class MarcacaoVisitaHSTPanel { return tecnicoList; } + + public JComboBox getTecnicoSuperiorList() + { + return tecnicoSuperiorList; + } } diff --git a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java index b8643956..1b3a87e2 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java @@ -9,26 +9,43 @@ package siprp.higiene.marcacoes; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.event.*; -import java.text.*; -import java.util.*; +import java.awt.Dimension; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.text.DateFormat; +import java.util.Date; +import java.util.Hashtable; +import java.util.Locale; -import com.evolute.utils.*; -import com.evolute.utils.arrays.*; -import com.evolute.utils.data.*; -import com.evolute.utils.jdo.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.panel.*; -import com.evolute.utils.ui.search.*; -import com.evolute.utils.ui.text.*; -import com.evolute.utils.ui.window.*; +import javax.swing.JComboBox; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; -import siprp.*; -import siprp.data.*; -import siprp.higiene.*; +import siprp.CompanyDataLoader; +import siprp.SIPRPTracker; +import siprp.SingletonConstants; +import siprp.data.AvisoConstants; +import siprp.data.ContactoData; +import siprp.data.EstabelecimentoData; +import siprp.data.Marcacao; +import siprp.data.MarcacaoEstabelecimentoData; +import siprp.higiene.HigieneDataProvider; + +import com.evolute.utils.Singleton; +import com.evolute.utils.arrays.Object2DArray; +import com.evolute.utils.data.MappableObject; +import com.evolute.utils.jdo.JDOProvider; +import com.evolute.utils.ui.DialogException; +import com.evolute.utils.ui.panel.TableEditorPanel; +import com.evolute.utils.ui.text.CopyPasteHandler; +import com.evolute.utils.ui.window.EditorWindow; /** * @@ -37,6 +54,9 @@ import siprp.higiene.*; public class MarcacoesHigieneWindow extends EditorWindow implements ItemListener, ActionListener, ListSelectionListener { + + private static final long serialVersionUID = 1L; + public final static String TITLE = "Marca\u00e7\u00f5es de Higiene e Seguran\u00e7a"; private final static int iPermissionArray[][] = @@ -56,7 +76,7 @@ public class MarcacoesHigieneWindow extends EditorWindow protected JDOProvider JDO; protected SIPRPTracker tracker; - private Hashtable tecnicosHash; + private Hashtable tecnicosHash; protected Integer empresaID; protected String empresa; @@ -70,11 +90,13 @@ public class MarcacoesHigieneWindow extends EditorWindow throws Exception { super( iPermissionArray ); - provider = ( HigieneDataProvider ) HigieneDataProvider.getProvider(); - JDO = ( JDOProvider ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER ); - tecnicosHash = new Hashtable(); - setupComponents(); - setExtendedState(getExtendedState() | MAXIMIZED_BOTH); + this.provider = ( HigieneDataProvider ) HigieneDataProvider.getProvider(); + this.JDO = ( JDOProvider ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER ); + this.tecnicosHash = new Hashtable(); + this.setupComponents(); + this.setSize( 800, 700 ); + this.setLocationRelativeTo(null); + this.setExtendedState( getExtendedState() | MAXIMIZED_BOTH ); } private void setupComponents() @@ -93,10 +115,10 @@ public class MarcacoesHigieneWindow extends EditorWindow constraints.weightx = 1; constraints.gridheight = 1; - constraints.weighty = 0.2; + constraints.weighty = 1; gridbag.setConstraints( upperPanel, constraints ); - constraints.weighty = 0.8; + constraints.weighty = 0; gridbag.setConstraints( panel, constraints ); getContentPane().add( upperPanel ); @@ -120,7 +142,7 @@ public class MarcacoesHigieneWindow extends EditorWindow panel.add( toolbar ); constraints.gridheight = 1; - constraints.weighty = 1.0; + constraints.weighty = 0; try { marcacaoEditorPanel = @@ -156,18 +178,29 @@ public class MarcacoesHigieneWindow extends EditorWindow panel.add( marcacaoEditorPanel ); marcacaoPanel.getEmailButton().addActionListener( this ); - fillCombo(); + fillCombos(); upperPanel.addListSelectionListener( this ); } - public void fillCombo() + public void fillCombos() throws Exception { - marcacaoPanel.getTecnicoList().removeItemListener( this ); - marcacaoPanel.getTecnicoList().removeAllItems(); + JComboBox tecnicosList = marcacaoPanel.getTecnicoList(); + JComboBox tecnicosSuperioresList = marcacaoPanel.getTecnicoSuperiorList(); tecnicosHash.clear(); - Object tecnicos[][] = provider.getAllTecnicosHST(); - marcacaoPanel.getTecnicoList().addItem( new MappableObject( new Integer( -2 ), " " ) ); + tecnicosList.removeItemListener( this ); + tecnicosSuperioresList.removeItemListener( this ); + fillTecnicos(tecnicosList,false); + fillTecnicos(tecnicosSuperioresList,true); + tecnicosList.addItemListener( this ); + tecnicosSuperioresList.addItemListener( this ); + } + + private void fillTecnicos( JComboBox tecnicosList, boolean superiores ) throws Exception + { + tecnicosList.removeAllItems(); + Object tecnicos[][] = provider.getTecnicosHST( superiores ); + tecnicosList.addItem( new MappableObject( new Integer( -2 ), " " ) ); for( int n = 0; n < tecnicos.length; n++ ) { Object tecnico[] = new Object[ 4 ]; @@ -176,57 +209,57 @@ public class MarcacoesHigieneWindow extends EditorWindow tecnico[ 2 ] = tecnicos[ n ][ 2 ]; tecnico[ 3 ] = new Integer( n ); tecnicosHash.put( tecnicos[ n ][ 0 ], tecnico ); - marcacaoPanel.getTecnicoList().addItem( new MappableObject( (Integer) tecnico[ 0 ], tecnico[ 1 ] ) ); + tecnicosList.addItem( new MappableObject( (Integer) tecnico[ 0 ], tecnico[ 1 ] ) ); } - marcacaoPanel.getTecnicoList().setSelectedIndex( 0 ); + tecnicosList.setSelectedIndex( 0 ); - marcacaoPanel.getTecnicoList().addItem( new MappableObject( new Integer( -1 ), "Novo/Editar" ) ); - marcacaoPanel.getTecnicoList().addItemListener( this ); + tecnicosList.addItem( new MappableObject( new Integer( -1 ), "Novo/Editar" ) ); } - public void itemStateChanged(java.awt.event.ItemEvent itemEvent) + public void itemStateChanged( ItemEvent itemEvent ) { - int index = marcacaoPanel.getTecnicoList().getSelectedIndex(); - if( index == marcacaoPanel.getTecnicoList().getItemCount() - 1 ) + JComboBox tecnicos = null; + if( itemEvent.getSource().equals( marcacaoPanel.getTecnicoList() ) ) + { + tecnicos = marcacaoPanel.getTecnicoList(); + } + else if( itemEvent.getSource().equals( marcacaoPanel.getTecnicoSuperiorList() ) ) { - try + tecnicos = marcacaoPanel.getTecnicoSuperiorList(); + } + if( tecnicos != null && itemEvent.getStateChange() == ItemEvent.SELECTED ) + { + int index = tecnicos.getSelectedIndex(); + if( index == tecnicos.getItemCount() - 1 ) { -// marcacaoPanel.getTecnicoList().removeItemListener( this ); - TecnicoEditor te = new TecnicoEditor( this ); - te.setVisible( true ); -// boolean isNew = me.getIsNew(); - Integer id = te.getID(); - if( id == null ) - { - marcacaoPanel.getTecnicoList().setSelectedIndex( 0 ); - } - else + try { - fillCombo(); - if( id != null ) + TecnicoEditor te = new TecnicoEditor( this ); + te.setVisible( true ); + Integer id = te.getID(); + if( id == null ) + { + tecnicos.setSelectedIndex( 0 ); + } + else { - Object[] tecnico = (Object[])tecnicosHash.get( id ); - marcacaoPanel.getTecnicoList().setSelectedIndex( ((Integer)tecnico[ 3 ] ).intValue() ); + fillCombos(); + if( id != null ) + { + Object[] tecnico = tecnicosHash.get( id ); + tecnicos.setSelectedIndex( ( (Integer)tecnico[ 3 ] ).intValue() + 1 ); + } } + + } + catch( Exception ex ) + { + DialogException.showExceptionMessage( ex, "Erro na janela de edi\u00e7\u00e3o...", true ); + ex.printStackTrace(); + tecnicos.setSelectedIndex( 0 ); + return; } - - } - catch( Exception ex ) - { - DialogException.showExceptionMessage( ex, "Erro na janela de edi\u00e7\u00e3o...", true ); - ex.printStackTrace(); - marcacaoPanel.getTecnicoList().setSelectedIndex( 0 ); - return; } -// finally -// { -// marcacaoPanel.getTecnicoList().addItemListener( this ); -// } - } - else - { - IDObject selected = (IDObject)marcacaoPanel.getTecnicoList().getItemAt( index ); - Integer id = selected.getID(); } } @@ -248,7 +281,7 @@ public class MarcacoesHigieneWindow extends EditorWindow { visita.set( MarcacaoEstabelecimentoData.REALIZADA, ( ( Integer )visita.get( MarcacaoEstabelecimentoData.ESTADO ) ).intValue() == - provider.ESTADO_REALIZADO ? "y" : "n" ); + HigieneDataProvider.ESTADO_REALIZADO ? "y" : "n" ); System.out.println( "DATA " + visita.get( MarcacaoEstabelecimentoData.DATA ) ); Integer tecnico = ( Integer ) visita.get( MarcacaoEstabelecimentoData.TECNICO_HST ); if( tecnico != null && tecnico.intValue() < 0 ) diff --git a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/TecnicoEditor.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/TecnicoEditor.java index 007c119d..89c0b1f0 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/TecnicoEditor.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/TecnicoEditor.java @@ -1,31 +1,44 @@ -/* - * TecnicoEditor.java - * - * Created on February 1, 2006, 10:55 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - package siprp.higiene.marcacoes; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.event.*; -import java.util.*; +import static com.evolute.utils.strings.UnicodeLatin1Map.eacute; -import com.evolute.utils.*; -import com.evolute.utils.jdo.*; -import com.evolute.utils.tables.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.button.*; -import com.evolute.utils.ui.text.*; +import java.awt.Dimension; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.Vector; -import siprp.*; -import siprp.data.*; -import siprp.higiene.*; +import javax.swing.BoxLayout; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JScrollPane; +import javax.swing.JTextField; +import javax.swing.ListSelectionModel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; + +import siprp.data.DisableDeleteHandler; +import siprp.data.TecnicoHSTData; +import siprp.higiene.HigieneDataProvider; + +import com.evolute.utils.Singleton; +import com.evolute.utils.jdo.JDOProvider; +import com.evolute.utils.tables.BaseTable; +import com.evolute.utils.tables.ColumnizedObjectArray; +import com.evolute.utils.tables.VectorTableModel; +import com.evolute.utils.ui.CustomJDialog; +import com.evolute.utils.ui.DialogException; +import com.evolute.utils.ui.button.BetterButtonGroup; +import com.evolute.utils.ui.text.CopyPasteHandler; /** * @@ -33,8 +46,10 @@ import siprp.higiene.*; */ public class TecnicoEditor extends CustomJDialog implements ActionListener, ListSelectionListener -// , ItemListener { + + private static final long serialVersionUID = 1L; + static { TecnicoHSTData.registerOperationHandlerForClass( DisableDeleteHandler.INSTANCE, TecnicoHSTData.class ); @@ -43,13 +58,13 @@ public class TecnicoEditor extends CustomJDialog private JDOProvider JDO; private HigieneDataProvider provider; private BaseTable table; - private VectorTableModel model; + private VectorTableModel model; private JButton okButton; private JButton cancelarButton; private JButton novoButton; private JTextField nomeText; private JTextField iniciaisText; -// private JComboBox corCombo; + private JCheckBox checkSuperior; private Integer id; private boolean isNew = false; private BetterButtonGroup corGroup; @@ -73,7 +88,7 @@ public class TecnicoEditor extends CustomJDialog setTitle( "Criar/Editar T\u00e9cnico" ); centerSuper(); - model = new VectorTableModel( new String[]{ "Nome", "Iniciais", "Cor" } ); + model = new VectorTableModel( new String[]{ "Nome", "Iniciais", "Cor", "Superior" } ); table = new BaseTable( model ); table.setSelectionMode( ListSelectionModel.SINGLE_SELECTION ); table.setTableCellRenderer( new TecnicoRenderer() ); @@ -89,7 +104,7 @@ public class TecnicoEditor extends CustomJDialog table.setNonResizableNorReordable(); table.getSelectionModel().addListSelectionListener( this ); Object obj[][] = provider.getAllTecnicosHST(); - Vector tecnicosHST = new Vector(); + Vector tecnicosHST = new Vector(); for( int n = 0; n < obj.length; n++ ) { tecnicosHST.add( new ColumnizedObjectArray( obj[ n ], true ) ); @@ -107,9 +122,10 @@ public class TecnicoEditor extends CustomJDialog nomeText.setEnabled( false ); iniciaisText = new JTextField(); iniciaisText.setEnabled( false ); + checkSuperior = new JCheckBox( "T" + eacute + "cnico Superior" ); + checkSuperior.setEnabled( false ); JPanel corPanel = new JPanel(); corPanel.setLayout( new BoxLayout( corPanel, BoxLayout.Y_AXIS ) ); -// corCombo = new JComboBox(); corGroup = new BetterButtonGroup( false ); cores = new JRadioButton[ HigieneDataProvider.CORES_TECNICOS.length ]; for( int n = 0; n < HigieneDataProvider.CORES_TECNICOS.length; n++ ) @@ -118,13 +134,10 @@ public class TecnicoEditor extends CustomJDialog cores[ n ].setBackground( HigieneDataProvider.CORES_TECNICOS[ n ] ); corPanel.add( cores[ n ] ); corGroup.add( cores[ n ] ); -// corCombo.addItem( new Integer( n ) ); } JScrollPane corScroll = new JScrollPane( corPanel, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER ); -// corCombo.setRenderer( new CorTecnicoCellRenderer() ); -// corCombo.setEnabled( false ); GridBagLayout gridbag = new GridBagLayout(); getContentPane().setLayout( gridbag ); @@ -181,27 +194,25 @@ public class TecnicoEditor extends CustomJDialog gridbag.setConstraints( iniciaisText, constraints ); textPanel.add( iniciaisText ); + gridbag.setConstraints( checkSuperior, constraints ); + textPanel.add( checkSuperior ); + JLabel corLabel = new JLabel( "Cor" ); gridbag.setConstraints( corLabel, constraints ); textPanel.add( corLabel ); - -// gridbag.setConstraints( corCombo, constraints ); -// textPanel.add( corCombo ); -// + constraints.weighty = 1; constraints.gridheight = GridBagConstraints.REMAINDER; constraints.fill = GridBagConstraints.BOTH; -// JPanel pad = new JPanel(); -// gridbag.setConstraints( pad, constraints ); -// textPanel.add( pad ); + gridbag.setConstraints( corScroll, constraints ); textPanel.add( corScroll ); new CopyPasteHandler( nomeText ); new CopyPasteHandler( iniciaisText ); -// corCombo.addItemListener( this ); } + @Override public void actionPerformed( ActionEvent e ) { if( e.getSource().equals( okButton ) ) @@ -213,6 +224,7 @@ public class TecnicoEditor extends CustomJDialog } else if( e.getSource().equals( cancelarButton ) ) { + id = null; close(); } if( e.getSource().equals( novoButton ) ) @@ -220,36 +232,39 @@ public class TecnicoEditor extends CustomJDialog table.getSelectionModel().removeListSelectionListener( this ); nomeText.setText( "" ); iniciaisText.setText( "" ); -// corCombo.setSelectedIndex( 0 ); corGroup.setIntSelected( 0 ); nomeText.setEnabled( true ); iniciaisText.setEnabled( true ); corGroup.setEnabled( true ); + checkSuperior.setSelected( false ); + checkSuperior.setEnabled( true ); id = null; isNew = true; } } - public void valueChanged(javax.swing.event.ListSelectionEvent listSelectionEvent) + @Override + public void valueChanged( ListSelectionEvent listSelectionEvent ) { int selected = table.getSelectedRow(); if( selected == -1 ) { return; } - ColumnizedObjectArray row = (ColumnizedObjectArray)model.getRowAt( selected ); + ColumnizedObjectArray row = model.getRowAt( selected ); id = row.getID(); String nome = (String) row.getValue( 0 ); String iniciais = (String) row.getValue( 1 ); Integer cor = ( Integer ) row.getValue( 2 ); + String superior = ( String) row.getValue( 3 ); nomeText.setText( nome ); iniciaisText.setText( iniciais ); -// corCombo.setSelectedIndex( cor.intValue() ); corGroup.setIntSelected( cor.intValue() ); nomeText.setEnabled( true ); iniciaisText.setEnabled( true ); -// corCombo.setEnabled( true ); corGroup.setEnabled( true ); + checkSuperior.setEnabled( true ); + checkSuperior.setSelected( superior != null && "y".equals(superior) ); } private void close() @@ -291,6 +306,7 @@ public class TecnicoEditor extends CustomJDialog { tecnico = new TecnicoHSTData(); } + tecnico.set( TecnicoHSTData.IS_SUPERIOR, checkSuperior.isSelected() ? "y" : "n" ); tecnico.set( TecnicoHSTData.NOME, nome ); tecnico.set( TecnicoHSTData.NOME_PLAIN, nomePlain ); tecnico.set( TecnicoHSTData.INICIAIS, iniciais ); @@ -309,9 +325,5 @@ public class TecnicoEditor extends CustomJDialog return true; } - -// public void itemStateChanged( ItemEvent e ) -// { -// corCombo.getEditor().getEditorComponent().setBackground( HigieneDataProvider.CORES_TECNICOS[ corCombo.getSelectedIndex() ] ); -// } + } diff --git a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/TecnicoRenderer.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/TecnicoRenderer.java index 7ad36ac8..6fad3170 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/TecnicoRenderer.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/TecnicoRenderer.java @@ -28,8 +28,8 @@ public class TecnicoRenderer /** Creates a new instance of DiaRenderer */ public TecnicoRenderer() { - labels = new JLabel[ 3 ]; - for( int n = 0; n < 3; n++ ) + labels = new JLabel[ 4 ]; + for( int n = 0; n < 4; n++ ) { labels[ n ] = new JLabel(); } diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirValoresRiscoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirValoresRiscoPanel.java index 121d4078..306f7190 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirValoresRiscoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirValoresRiscoPanel.java @@ -259,6 +259,8 @@ public class GerirValoresRiscoPanel extends JPanel implements ActionListener, Ca if( radioValorQualitativo.isSelected() ) { valoresRisco.setToHsRelatorioRiscoValorQualitativo( (HsRelatorioRiscoValorQualitativo) comboValorQualitativo.getSelectedItem() ); + valoresRisco.setProbabilidade( null ); + valoresRisco.setSeveridade( null ); } else { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java index dcf1491c..d5a14ff4 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java @@ -71,9 +71,9 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe private static final String ICON_NAME_SAVE = "siprp/higiene/gestao/riscos/save.png"; public static final String ICON_NAME_REVERT = "siprp/higiene/gestao/riscos/revert.png"; - private static final String ICON_NAME_SUBMIT = "siprp/higiene/relatorio/submit.png"; - private static final String ICON_NAME_PDF = "siprp/higiene/relatorio/adobe_reader.png"; - private static final String ICON_NAME_UNDO = "siprp/higiene/relatorio/revert.png"; + public static final String ICON_NAME_SUBMIT = "siprp/higiene/relatorio/submit.png"; + public static final String ICON_NAME_PDF = "siprp/higiene/relatorio/adobe_reader.png"; + public static final String ICON_NAME_UNDO = "siprp/higiene/relatorio/revert.png"; private final JCalendarPanel dataRelatorio = new JCalendarPanel( null ); @@ -81,6 +81,8 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe private final JRadioButton radioPeriodica = new JRadioButton( "Peri" + oacute + "dica" ); private final JTextField fieldTecnico = new JTextField(); + + private final JTextField fieldTecnicoSuperior = new JTextField(); private final JPanel panelAcompanhantes = new JPanel(); @@ -152,7 +154,7 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe TableLayout layout = new TableLayout( new double[] { TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.PREFERRED, TableLayout.FILL, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.PREFERRED }, new double[] { - TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL + TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL } ); layout.setVGap( 5 ); layout.setHGap( 5 ); @@ -180,7 +182,9 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe panelAcompanhantes.add( fieldFuncao2, new TableLayoutConstraints( 3, 1 ) ); TableLayout layout = new TableLayout( new double[] { - TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM + TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL, + TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, + TableLayout.MINIMUM, TableLayout.MINIMUM }, new double[] { TableLayout.MINIMUM } ); @@ -204,11 +208,13 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe add( labelAvaliacao , new TableLayoutConstraints( 4, 1 ) ); add( radioInicial, new TableLayoutConstraints( 5, 1 ) ); add( radioPeriodica, new TableLayoutConstraints( 6, 1 ) ); - add( new JLabel( "T" + eacute + "cnico Superior de H.S." ), new TableLayoutConstraints( 0, 2, 2, 2 ) ); + add( new JLabel( "T" + eacute + "cnico de H.S." ), new TableLayoutConstraints( 0, 2, 2, 2 ) ); add( fieldTecnico, new TableLayoutConstraints( 3, 2, 6, 2 ) ); - add( tabsRelatorio, new TableLayoutConstraints( 7, 1, 7, 3 ) ); - add( panelAcompanhantes, new TableLayoutConstraints( 0, 3, 6, 3 ) ); - add( tabsPlanoActuacao, new TableLayoutConstraints( 0, 4, 7, 4 ) ); + add( new JLabel( "T" + eacute + "cnico Superior de H.S." ), new TableLayoutConstraints( 0, 3, 2, 3 ) ); + add( fieldTecnicoSuperior, new TableLayoutConstraints( 3, 3, 6, 3 ) ); + add( tabsRelatorio, new TableLayoutConstraints( 7, 1, 7, 4 ) ); + add( panelAcompanhantes, new TableLayoutConstraints( 0, 4, 6, 4 ) ); + add( tabsPlanoActuacao, new TableLayoutConstraints( 0, 5, 7, 5 ) ); } private void setupListeners() @@ -666,6 +672,20 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe } } fieldTecnico.setText( tecnicoName ); + String tecnicoSuperiorName = null; + if( relatorio != null ) + { + MarcacoesEstabelecimento marcacao = relatorio.getToHsMarcacoesEstabelecimento(); + if( marcacao != null ) + { + MarcacoesTecnicosHst tecnico = marcacao.getToMarcacoesTecnicosSuperioresHst(); + if( tecnico != null ) + { + tecnicoSuperiorName = tecnico.getNome(); + } + } + } + fieldTecnicoSuperior.setText( tecnicoSuperiorName ); fieldNome1.setText( relatorio == null ? null : relatorio.getAcompanhante1() ); fieldNome2.setText( relatorio == null ? null : relatorio.getAcompanhante2() ); fieldFuncao1.setText( relatorio == null ? null : relatorio.getFuncaoAcompanhante1() ); @@ -679,6 +699,7 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe radioInicial.setEnabled( enabled );; radioPeriodica.setEnabled( enabled ); fieldTecnico.setEnabled( false ); + fieldTecnicoSuperior.setEnabled( false ); fieldNome1.setEnabled( enabled ); fieldNome2.setEnabled( enabled ); fieldFuncao1.setEnabled( enabled ); diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PlanoActuacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PlanoActuacaoPanel.java index 7c017486..5c6e7b39 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PlanoActuacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PlanoActuacaoPanel.java @@ -1,5 +1,6 @@ package siprp.higiene.relatorio; +import static com.evolute.utils.strings.UnicodeLatin1Map.aacute; import info.clearthought.layout.TableLayout; import info.clearthought.layout.TableLayoutConstraints; @@ -13,8 +14,6 @@ import java.beans.PropertyChangeListener; import javax.swing.BorderFactory; import javax.swing.JPanel; -import com.evolute.utils.error.ErrorLogger; - import leaf.ui.LeafButton; import leaf.ui.LeafIconButton; import siprp.database.cayenne.objects.Estabelecimentos; @@ -29,6 +28,8 @@ import siprp.database.cayenne.objects.HsRelatorioPostoRisco; import siprp.database.cayenne.objects.MarcacoesEstabelecimento; import siprp.logic.HigieneSegurancaLogic; +import com.evolute.utils.error.ErrorLogger; + public class PlanoActuacaoPanel extends JPanel { @@ -48,7 +49,7 @@ public class PlanoActuacaoPanel extends JPanel private final GerirMedidaRelatorioPanel valoresMedida = new GerirMedidaRelatorioPanel(); - private final LeafButton refreshAreasButton = LeafIconButton.createButton( "Actualizar nomes", PanelRelatorio.ICON_NAME_REVERT ); + private final LeafButton refreshAreasButton = LeafIconButton.createButton( "Actualizar nomes de " + aacute + "reas/postos", PanelRelatorio.ICON_NAME_UNDO ); private final JPanel emptyPanel = new JPanel(); @@ -257,6 +258,7 @@ public class PlanoActuacaoPanel extends JPanel valoresPanel.add( valoresRisco, RISCO_PANEL ); valoresPanel.add( valoresMedida, MEDIDA_PANEL ); valoresPanel.add( emptyPanel, EMPTY_PANEL ); + add( refreshAreasButton, new TableLayoutConstraints( 0, 0, 1, 0 ) ); add( areas, new TableLayoutConstraints( 0, 1, 1, 1 ) ); add( riscos, new TableLayoutConstraints( 2, 1 ) ); add( valoresPanel, new TableLayoutConstraints( 3, 1 ) ); diff --git a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java index 7c36b703..f9ddad64 100644 --- a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java +++ b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java @@ -27,6 +27,8 @@ import siprp.update.updates.V11_2_To_V11_3; import siprp.update.updates.V11_3_To_V11_4; import siprp.update.updates.V11_4_To_V11_5; import siprp.update.updates.V11_5_To_V11_6; +import siprp.update.updates.V11_6_To_V11_7; +import siprp.update.updates.V11_7_To_V11_8; import siprp.update.updates.V6_1_To_V7_0; import siprp.update.updates.V7_0_To_V7_2; import siprp.update.updates.V7_2_To_V7_4; @@ -97,7 +99,8 @@ public class UpdateList new V10_9_To_V11_0(), new V11_0_To_V11_1(), new V11_1_To_V11_2(), new V11_2_To_V11_3(), new V11_3_To_V11_4(), new V11_4_To_V11_5(), - new V11_5_To_V11_6() + new V11_5_To_V11_6(), new V11_6_To_V11_7(), + new V11_7_To_V11_8() }; protected static Executer EXECUTER; diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V11_6_To_V11_7.java b/trunk/SIPRPSoft/src/siprp/update/updates/V11_6_To_V11_7.java new file mode 100644 index 00000000..2376f980 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V11_6_To_V11_7.java @@ -0,0 +1,54 @@ +package siprp.update.updates; + +import siprp.higiene.gestao.importacao.Importador; + +import com.evolute.utils.Singleton; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; + +public class V11_6_To_V11_7 implements siprp.update.Update +{ + + public V11_6_To_V11_7() + { + } + + public String []listChanges() + { + return new String[]{ + "Adicionado suporte para tecnicos superiores de higiene e seguranca" + }; + } + + public double getStartVersion() + { + return 11.6; + } + + public double getEndVersion() + { + return 11.7; + } + + public void doUpdate() throws Exception + { + DBManager dbm = ( DBManager ) Singleton.getInstance( Singleton.DEFAULT_DBMANAGER ); + Executer executer = dbm.getSharedExecuter(); + com.evolute.utils.sql.Update update = + new com.evolute.utils.sql.Update( + "alter table marcacoes_tecnicos_hst add column is_superior char(1); " + + "update marcacoes_tecnicos_hst set is_superior = 'n'; " + + "alter table marcacoes_tecnicos_hst alter column is_superior set not null; " + + "alter table marcacoes_tecnicos_hst add constraint check_is_superior check( is_superior = 'y' or is_superior = 'n' ); " + + "alter table marcacoes_tecnicos_hst alter column is_superior set default 'y'; " + ); + executer.executeQuery( update ); + new Importador( executer ).importar(); + } + + public String toString() + { + return "v" + getStartVersion() + " para v" + getEndVersion(); + } + +} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V11_7_To_V11_8.java b/trunk/SIPRPSoft/src/siprp/update/updates/V11_7_To_V11_8.java new file mode 100644 index 00000000..8221ed93 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V11_7_To_V11_8.java @@ -0,0 +1,51 @@ +package siprp.update.updates; + +import siprp.higiene.gestao.importacao.Importador; + +import com.evolute.utils.Singleton; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; + +public class V11_7_To_V11_8 implements siprp.update.Update +{ + + public V11_7_To_V11_8() + { + } + + public String []listChanges() + { + return new String[]{ + "Adicionado suporte adicional para tecnicos superiores de higiene e seguranca" + }; + } + + public double getStartVersion() + { + return 11.7; + } + + public double getEndVersion() + { + return 11.8; + } + + public void doUpdate() throws Exception + { + DBManager dbm = ( DBManager ) Singleton.getInstance( Singleton.DEFAULT_DBMANAGER ); + Executer executer = dbm.getSharedExecuter(); + com.evolute.utils.sql.Update update = + new com.evolute.utils.sql.Update( + "alter table marcacoes_estabelecimento add column tecnico_superior_hst int4 " + + "references marcacoes_tecnicos_hst(id); " + ); + executer.executeQuery( update ); + new Importador( executer ).importar(); + } + + public String toString() + { + return "v" + getStartVersion() + " para v" + getEndVersion(); + } + +} diff --git a/trunk/common/src/SIPRPMap.map.xml b/trunk/common/src/SIPRPMap.map.xml index 8976150d..af99153b 100644 --- a/trunk/common/src/SIPRPMap.map.xml +++ b/trunk/common/src/SIPRPMap.map.xml @@ -538,6 +538,7 @@ + @@ -1680,6 +1681,9 @@ + + + @@ -1692,6 +1696,9 @@ + + + @@ -2032,6 +2039,7 @@ + diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_MarcacoesEstabelecimento.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_MarcacoesEstabelecimento.java index 4b268a0f..3d6d76bc 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_MarcacoesEstabelecimento.java +++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_MarcacoesEstabelecimento.java @@ -29,6 +29,7 @@ public abstract class _MarcacoesEstabelecimento extends BaseObject { public static final String LEMBRETES_ARRAY_PROPERTY = "lembretesArray"; public static final String TO_ESTABELECIMENTOS_PROPERTY = "toEstabelecimentos"; public static final String TO_MARCACOES_TECNICOS_HST_PROPERTY = "toMarcacoesTecnicosHst"; + public static final String TO_MARCACOES_TECNICOS_SUPERIORES_HST_PROPERTY = "toMarcacoesTecnicosSuperioresHst"; public static final String ID_PK_COLUMN = "id"; @@ -130,4 +131,13 @@ public abstract class _MarcacoesEstabelecimento extends BaseObject { } + public void setToMarcacoesTecnicosSuperioresHst(MarcacoesTecnicosHst toMarcacoesTecnicosSuperioresHst) { + setToOneTarget("toMarcacoesTecnicosSuperioresHst", toMarcacoesTecnicosSuperioresHst, true); + } + + public MarcacoesTecnicosHst getToMarcacoesTecnicosSuperioresHst() { + return (MarcacoesTecnicosHst)readProperty("toMarcacoesTecnicosSuperioresHst"); + } + + }