From 8b55bbd32c709186e9cb4d3863ec2b2130562129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Sim=C3=A3o?= Date: Wed, 17 Dec 2008 19:45:42 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@852 bb69d46d-e84e-40c8-a05a-06db0d633741 --- trunk/SIPRPSoft/src/SIPRPNode.driver.xml | 2 +- .../src/siprp/clientes/ClientesWindow.java | 8 ++-- .../siprp/clientes/EstabelecimentoPanel.java | 8 ++-- .../companydataloaders/SIPRPDataLoader.java | 16 +++---- .../higiene/relatorio/PanelRelatorio.java | 13 +++++- .../higiene/relatorio/PlanoActuacaoPanel.java | 41 +++++++++++++++++- .../src/siprp/higiene/relatorio/revert.png | Bin 722 -> 1376 bytes 7 files changed, 70 insertions(+), 18 deletions(-) diff --git a/trunk/SIPRPSoft/src/SIPRPNode.driver.xml b/trunk/SIPRPSoft/src/SIPRPNode.driver.xml index 6691bb19..3c75ecb8 100644 --- a/trunk/SIPRPSoft/src/SIPRPNode.driver.xml +++ b/trunk/SIPRPSoft/src/SIPRPNode.driver.xml @@ -1,6 +1,6 @@ - + diff --git a/trunk/SIPRPSoft/src/siprp/clientes/ClientesWindow.java b/trunk/SIPRPSoft/src/siprp/clientes/ClientesWindow.java index 47c68cc5..0f1a58dc 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/ClientesWindow.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/ClientesWindow.java @@ -137,7 +137,7 @@ public class ClientesWindow extends EditorWindow protected boolean webAware; - private EstabelecimentoPlanoActuacaoPanel planoActuacaoPanel; +// private EstabelecimentoPlanoActuacaoPanel planoActuacaoPanel; // public static void main( String args[] ) // throws Exception @@ -187,7 +187,7 @@ public class ClientesWindow extends EditorWindow trabalhadorPanel = new TrabalhadorPanel( toolbarTrabalhador, empresaPanel.getEstabelecimentosTable() ); - planoActuacaoPanel = new EstabelecimentoPlanoActuacaoPanel(); +// planoActuacaoPanel = new EstabelecimentoPlanoActuacaoPanel(); GridBagLayout gridbag = new GridBagLayout(); getContentPane().setLayout( gridbag ); @@ -234,7 +234,7 @@ public class ClientesWindow extends EditorWindow tabbedPane.add( "Dados", estabelecimentoPanel ); tabbedPane.add( "Trabalhadores", trabalhadorPanel ); - tabbedPane.add( ESTABELECIMENTO_PLANO_ACTUACAO_TAB_NOME, planoActuacaoPanel ); +// tabbedPane.add( ESTABELECIMENTO_PLANO_ACTUACAO_TAB_NOME, planoActuacaoPanel ); panels[ INDEX_EMPRESA ] = empresaPanel; panels[ INDEX_ESTABELECIMENTO ] = estabelecimentoPanel; @@ -488,7 +488,7 @@ public class ClientesWindow extends EditorWindow // trabalhadorPanel.fill( null ); estabelecimentoPanel.fill( estabelecimento ); trabalhadorPanel.setEstabelecimento( estabelecimento ); - planoActuacaoPanel.fill( estabelecimento == null ? null : estabelecimento.get( EstabelecimentoData.ID ) ); +// planoActuacaoPanel.fill( estabelecimento == null ? null : estabelecimento.get( EstabelecimentoData.ID ) ); break; case INDEX_TRABALHADOR: trabalhadorPanel.fill( trabalhador ); diff --git a/trunk/SIPRPSoft/src/siprp/clientes/EstabelecimentoPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/EstabelecimentoPanel.java index 3d0a6ca5..c48c7bcb 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/EstabelecimentoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/EstabelecimentoPanel.java @@ -60,6 +60,8 @@ import com.evolute.utils.ui.text.CopyPasteHandler; public class EstabelecimentoPanel extends JPanel implements ControllableComponent, ListSelectionListener, ActionListener { + private static final long serialVersionUID = 1L; + public static int disables = 0; private JDOProvider JDO; @@ -111,7 +113,7 @@ public class EstabelecimentoPanel extends JPanel throws Exception { JPanel dadosEstabelecimentoPanel = new JPanel(); - JLabel designacaoLabel = new JLabel( "Designa\u00e7\u00e3o" ); +// JLabel designacaoLabel = new JLabel( "Designa\u00e7\u00e3o" ); //designacaoText = new JTextField(); JLabel moradaLabel = new JLabel( "Morada" ); moradaText = new JTextField(); @@ -264,7 +266,7 @@ public class EstabelecimentoPanel extends JPanel listaHistoricoPanel = new JPanel(); listaHistoricoPanel.setLayout( new GridLayout( 1, 1 ) ); - VectorTableModel marcacoesModel = new VectorTableModel( new String[]{ "Data", "Texto" } ); + VectorTableModel marcacoesModel = new VectorTableModel( new String[]{ "Data", "Texto" } ); historicoTable = new BaseTable( marcacoesModel ); historicoTable.setToolTipColumn( 1 ); historicoTable.fixColumnWidth( 0, 150 ); @@ -287,7 +289,7 @@ public class EstabelecimentoPanel extends JPanel { return; } - Object row = ( (VectorTableModel)historicoTable.getModel() ).getRowAt( selected ); + Object row = ( (VectorTableModel)historicoTable.getModel() ).getRowAt( selected ); historicoTable.clearSelection(); edicaoHistoricoPanel.setEstabelecimento( estabelecimento ); if( row != null && row instanceof HistoricoEstabelecimentoData ) diff --git a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java index 177bd6f9..cca918b6 100644 --- a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java +++ b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java @@ -98,20 +98,20 @@ public class SIPRPDataLoader implements CompanyDataLoader // Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" ); // Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); - Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); - Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); - Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); - Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" ); - Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); - Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); -// // Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); // Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); // Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); -// Singleton.setInstance( SingletonConstants.LOCAL_URL, "dbserver:5432" ); +// Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" ); // Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); // Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); + Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); + Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); + Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); + Singleton.setInstance( SingletonConstants.LOCAL_URL, "dbserver:5432" ); + Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); + Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); + // // Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); // Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java index ed12f577..2d45c949 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java @@ -196,7 +196,7 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe @Override public void actionPerformed( ActionEvent e ) { - if( JOptionPane.OK_OPTION == confirmSubmit() ) + if( isValidPlano() && JOptionPane.OK_OPTION == confirmSubmit() ) { submit(); } @@ -204,6 +204,17 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe } ); } + private boolean isValidPlano() + { + boolean result = false; + result = panelPlano.isValidPlano(); + if( !result ) + { + JOptionPane.showMessageDialog( this, "Todos os riscos devem ser preenchidos antes da submiss"+ atilde + "o do plano de actua" + ccedil + atilde+ "o!", "Erro", JOptionPane.ERROR_MESSAGE, null ); + } + return result; + } + private int confirmSubmit() { return JOptionPane.showConfirmDialog( this, "Ao submeter o Plano de Actua"+ccedil+atilde+"o n"+atilde+"o ser"+aacute+" mais poss"+iacute+"vel alter"+aacute+"-lo. Deseja continuar?" ); diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PlanoActuacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PlanoActuacaoPanel.java index b71a25a4..30382b8a 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PlanoActuacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PlanoActuacaoPanel.java @@ -1,6 +1,8 @@ package siprp.higiene.relatorio; -import static com.evolute.utils.strings.UnicodeLatin1Map.*; +import static com.evolute.utils.strings.UnicodeLatin1Map.atilde; +import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; +import static com.evolute.utils.strings.UnicodeLatin1Map.otilde; import info.clearthought.layout.TableLayout; import info.clearthought.layout.TableLayoutConstraints; @@ -17,6 +19,7 @@ import javax.swing.JPanel; import leaf.ui.LeafButton; import leaf.ui.LeafIconButton; import siprp.database.cayenne.objects.HsRelatorio; +import siprp.database.cayenne.objects.HsRelatorioArea; import siprp.database.cayenne.objects.HsRelatorioPosto; import siprp.database.cayenne.objects.HsRelatorioPostoMedida; import siprp.database.cayenne.objects.HsRelatorioPostoRisco; @@ -188,6 +191,42 @@ public class PlanoActuacaoPanel extends JPanel valoresMedida.setEnabled( relatorio != null && relatorio.getIsSubmetido() == null ); setEnabled( ); } + + public boolean isValidPlano() + { + boolean result = true; + if( relatorio != null ) + { + for( HsRelatorioArea area : relatorio.getHsRelatorioArea() ) + { + for( HsRelatorioPosto posto : area.getHsRelatorioPostoArray() ) + { + for( HsRelatorioPostoRisco relRisco : posto.getHsRelatorioPostoRiscoArray() ) + { + boolean preenchido = relRisco.getToHsRelatorioRiscoValorQualitativo() != null; + if( !preenchido ) + { + preenchido = HigieneSegurancaLogic.isProbabilidadeValida( relRisco.getProbabilidade() ) && HigieneSegurancaLogic.isSeveridadeValida( relRisco.getSeveridade() ); + } + if( !preenchido ) + { + result = false; + break; + } + } + if( !result ) + { + break; + } + } + if( !result ) + { + break; + } + } + } + return result; + } } diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/revert.png b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/revert.png index d655eba6c0b8e0dc45f7ecb42ace7666602d2bf2..72b49ea9647fa5ebc6deb2ff4d2f230137baab8e 100644 GIT binary patch delta 1373 zcmV-j1)}=W1>g!HiBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_>mzNe?)H} zF*G1fZ+0LuFfcM8GBY|eF*-CfAS*C2FffEr97q5F00(qQO+^RR1s4rEI0)`QZ~y=R z32;bRa{vGf5dZ)S5dnW>Uy%R+00d`2O+f$vv5yPvX4kXNH+!X723EoqPSy%x$d!gGPPwBwyy3`J?C&S2Zp(n``ZT+6f8#5=wr>$i z3)jS>-0}hAi%|@BkEy=V?iS3}*I}XFq$P@1B-}Ij%f_t`rKZC#KDqnN=Zbh<)MM-x zV6p&n65y8w=yGy6Lvck>;C6H$q{TjjEOzpY-aEl-T@^Zgpy{1g_vSxQqDR9dFyjIu zGQf)js$ZdV%B&ngfT5u5f4+dllLt#NT4%`2E8w{C)ZPcP zKBH7erJ&jYORpnd-nOIPzj3JY(H(^%u1zNjN-_}V;|uEbAHMCie_uY?=xIOQ=^6g1 z+cjsEkepMTx;~rZ*JN=1k#09!1LNdk6W67o=Dq3y?w5)DwD%YHeT1Gb>u{{0V&_9e z`=2Q@;QB08PgJBP0j-^r>d=QIn1FB54O@4rE99BgrMz`4rKAwZEGxw{ zN@#yfbi2Ki4j*zwf04tXy-z)Me(BvKYtmAle|=XjOtu6q$$Dz)j15EQKCY+WPI7D| zbTJ_jA_NiRXQmwa+xL`gF5Dz$ZOWxKZKVH`d4#>j32O)(5xcWIhs%2W;IV^MTXR%u zoHIbQP%~v&#m`qR4q)&LH#xNvS_n6_M*0a7qJf)=*Lf)_e?=gOj7+2vbUY%y8-r#S zs6PmWfx2fO;VO&MF-@*|l0Y&wwV`8JM$-p_P}Na#>L8exWw>h5yWACaI-n|%fTmE6 zho#3jVD?AWCMCFL67d8R&pJwKb%ik5cC{0NUP5_|6V<0T0Qs~7{*J36rcBF0KV;|p z@&ObPEvKB5f4h$NlZ-0`a$!_)#JkETB6z5*ho7#g((ON7#d92@F%|up1?{o3$7>NX zFOo@kC51tBgq?OM(##x_D4PRzl32ti87)$@GF`7jL`j@Ypx-Fr{taufnZTZ7EHQb6 zqwa$JiRfwhxvGEe{$%?sNDlSIkPGlJ#ny#xWvRV zx|WMz{XkCw3|bPkx7eBI|eFnU3P-{y(WKte^o-=2mv9%AeQWWPg85L~`Z#k5amd%rqR zv`r#Le~D&v%zDr`z7U#jyVj1rujgUzi;#+}WILq|8Kc3j&B5|w2hJlDu_0soqP7w9 zy1hT1>9su&p_{C^Z)8Mi`Fs!~mxGA-nf7P2psabfwFZW9=SPNB!w$iGm{ir(--8TP z*1m+ft`giDOVSLdw1Kk4hlxtog534%b+@%TGXbk6Q!9}*&Z(Wmr)l~x2mP}I&;skU fVDgIm{@3d_-IN&)&P7)G00000NkvXXu0mjfni+$| delta 714 zcmV;*0yX{M3ep83iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyge@$;7 zF*P7Tb!Q+lFfcVBF)=zbF*-3cAS*C2FfiHv8F~N!00(qQO+^RR1s4r5IO`gjy8r+H z32;bRa{vGe@Bjb`@Bu=sG?)MY00d`2O+f$vv5yPn-p!fwbG~;4?T!MTJ-Awf2F90cqrcLLGVxn55&y<5h+G`u)QfNMFmAq ziU^)WJrqHzvBZOIg@h22{mIVwW+oFuYKtFy`(}3E`{wQUhJi47_oa|A2x>CGH__M8 z^8@_)xpd*d?A1rKEfGUBLket$OE>O|@#&}H$k50YO7A5`Os$Q7fNCIHe+s!?OPos| zli?;8oV|HIKS%3TnPSm{nIr?o7?_HG-(}~Yp;WFQb?{_{wgbd?qXWt zc=c|%VQw?5=J`h~0gDl-ulCLex;p?aP(M?EH(Y6SpanSBpPWQYO&}y8^mPF{J4qmb zWijmOjVUp-OiT&5^(p+Gx{lBN4)za{N67@yL256yq!Utf6ZF!wTb2)bd615 zOU*~+(*kg&AE*mO<0yHYx)AFHs;;Lt+q>iFyEBXYs6g)F3j{7l^zblJ zQ!^;KAzYeitBq1XL}{X<*X|jEa6Ekx@tGBfxQ*he5o9xSs!*P8N7R|z+%w~*yZ~up w()h9oWO1JOn7C{NAlisM_4q$07*qoM6N<$f+BT2*8l(j