git-svn-id: https://svn.coded.pt/svn/SIPRP@852 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/SIPRPSoft/src/SIPRPNode.driver.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <driver project-version="3.0" class="org.postgresql.Driver">
-	<url value="jdbc:postgresql://10.158.2.2:5432/siprp_local"/>
+	<url value="jdbc:postgresql://storage:5432/siprp_local"/>
 	<connectionPool min="1" max="1"/>
 	<login userName="postgres" password="Typein"/>
 </driver>

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 );

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<Object> marcacoesModel = new VectorTableModel<Object>( 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<Object>)historicoTable.getModel() ).getRowAt( selected );
 				historicoTable.clearSelection();
 				edicaoHistoricoPanel.setEstabelecimento( estabelecimento );
 				if( row != null && row instanceof HistoricoEstabelecimentoData )

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" );

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?" );

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;
@@ -189,5 +192,41 @@ public class PlanoActuacaoPanel extends JPanel
 		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;
+	}
+	
 }