diff --git a/trunk/.classpath b/trunk/.classpath index 5aa0bae1..77a3b804 100644 --- a/trunk/.classpath +++ b/trunk/.classpath @@ -24,7 +24,7 @@ - + diff --git a/trunk/SIPRPSoft/src/siprp/Main.java b/trunk/SIPRPSoft/src/siprp/Main.java index a539973f..6ffdcdc6 100644 --- a/trunk/SIPRPSoft/src/siprp/Main.java +++ b/trunk/SIPRPSoft/src/siprp/Main.java @@ -9,7 +9,6 @@ import static siprp.ProcessoConstants.PROCESSO_FECHADO_CODE; import static siprp.ProcessoConstants.PROCESSO_FECHADO_DESCRIPTION; import java.awt.Color; -import java.awt.GraphicsEnvironment; import java.io.File; import java.io.FileOutputStream; import java.io.InputStream; @@ -164,8 +163,8 @@ public class Main implements com.evolute.utils.ui.window.Connector loginWindow.setTitle( (String) Singleton.getInstance( SingletonConstants.SOFTWARE_NAME ) ); JPanel left = loginWindow.getLeftPanel(); left.setBackground( Color.white ); - GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment(); - loginWindow.setExtendedState(loginWindow.getExtendedState() | loginWindow.MAXIMIZED_BOTH); +// GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment(); + loginWindow.setExtendedState(loginWindow.getExtendedState() | LoginWindow.MAXIMIZED_BOTH); loginWindow.setVisible( true ); SwingUtilities.invokeLater( new Runnable(){ public void run() @@ -305,6 +304,7 @@ public class Main implements com.evolute.utils.ui.window.Connector { DialogException.showException( ex ); } + } public void exit() diff --git a/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java b/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java index 37cba700..94e6a1e7 100644 --- a/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java +++ b/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java @@ -15,8 +15,6 @@ import siprp.clientes.ClientesWindow; import siprp.estatistica.EstatisticaWindow; import siprp.ficha.FichaWindow; import siprp.higiene.gestao.GestaoRelatorioWindow; -import siprp.higiene.gestao.riscos.GerirRiscosPanel; -import siprp.higiene.legislacoes.GestaoLegislacoesWindow; import siprp.higiene.mapa.MapaHigieneWindow; import siprp.higiene.marcacoes.MarcacoesHigieneWindow; import siprp.higiene.relatorio.RelatorioHigieneSegurancaWindow; @@ -65,7 +63,7 @@ public class SIPRPTracker extends WindowTracker Singleton.setInstance( SingletonConstants.SIPRP_TRACKER, this ); this.avisos = avisosP; avisos.setTracker( this ); - Hashtable creators = new Hashtable(); + Hashtable creators = new Hashtable(); DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode( Singleton.getInstance( SingletonConstants.COMPANY_ACRONYM ) ); diff --git a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java index 9f8361a8..ccb81d8b 100644 --- a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java +++ b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java @@ -1,16 +1,9 @@ -/* - * SIPRPDataLoader.java - * - * Created on 25 de Janeiro de 2005, 13:19 - */ - package siprp.companydataloaders; -import javax.swing.JCheckBox; - -import com.evolute.utils.*; +import siprp.CompanyDataLoader; +import siprp.SingletonConstants; -import siprp.*; +import com.evolute.utils.Singleton; /** * @@ -99,20 +92,20 @@ public class SIPRPDataLoader implements CompanyDataLoader // Singleton.setInstance( SingletonConstants.LOCAL_URL, "www.evolute.pt:5436" ); // 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_local3" ); + Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); // // Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java index 74aed5e1..4856baa6 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java @@ -368,6 +368,7 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe catch( Exception e ) { LeafDialog.error(e); + refresh(); } finally { @@ -546,43 +547,36 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe return result; } - private Vector getRelatoriosTemp(HsRelatorio relatorio) + private Vector getRelatoriosTemp(HsRelatorio relatorio) throws Exception { Vector result = new Vector(); - try + byte[] relatorioPDF = new RelatorioPDFCreator().createPDF( relatorio.getId() ); + byte[] planoPDF = new PlanoActuacaoPDFCreator().createPDF( relatorio.getId(), false ); + if( relatorioPDF != null ) { - byte[] relatorioPDF = new RelatorioPDFCreator().createPDF( relatorio.getId() ); - byte[] planoPDF = new PlanoActuacaoPDFCreator().createPDF( relatorio.getId(), false ); - if( relatorioPDF != null ) + String data = relatorio.getToHsMarcacoesEstabelecimento().getDataRelatorio() == null ? "" : HsRelatorio.DATE_FORMAT.format( relatorio.getData() ); + String estabelecimento = getShortNameForEstabelecimento(relatorio.getToHsMarcacoesEstabelecimento().getToEstabelecimentos()); + File relat = File.createTempFile("Relatorio - " + estabelecimento + " - " + data, ".pdf"); + if( relat != null ) { - String data = relatorio.getToHsMarcacoesEstabelecimento().getDataRelatorio() == null ? "" : HsRelatorio.DATE_FORMAT.format( relatorio.getData().toString() ); - String estabelecimento = getShortNameForEstabelecimento(relatorio.getToHsMarcacoesEstabelecimento().getToEstabelecimentos()); - File relat = File.createTempFile("Relatorio - " + estabelecimento + " - " + data, ".pdf"); - if( relat != null ) - { - FileOutputStream fos = new FileOutputStream(relat); - fos.write(relatorioPDF); - fos.close(); - result.add( relat ); - } - } - if( planoPDF != null ) - { - String data = relatorio.getToHsMarcacoesEstabelecimento().getDataRelatorio() == null ? "" : relatorio.getData().toString(); - String estabelecimento = relatorio.getToHsMarcacoesEstabelecimento().getToEstabelecimentos().getNomePlain(); - File plan = File.createTempFile("Plano de actuacao - " + estabelecimento + " - " + data, ".pdf"); - if( plan != null ) - { - FileOutputStream fos = new FileOutputStream(plan); - fos.write(planoPDF); - fos.close(); - result.add( plan ); - } + FileOutputStream fos = new FileOutputStream(relat); + fos.write(relatorioPDF); + fos.close(); + result.add( relat ); } } - catch ( Exception e ) + if( planoPDF != null ) { - LeafDialog.error( e ); + String data = relatorio.getToHsMarcacoesEstabelecimento().getDataRelatorio() == null ? "" : HsRelatorio.DATE_FORMAT.format( relatorio.getData() ); + String estabelecimento = relatorio.getToHsMarcacoesEstabelecimento().getToEstabelecimentos().getNomePlain(); + File plan = File.createTempFile("Plano de actuacao - " + estabelecimento + " - " + data, ".pdf"); + if( plan != null ) + { + FileOutputStream fos = new FileOutputStream(plan); + fos.write(planoPDF); + fos.close(); + result.add( plan ); + } } return result; } diff --git a/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java index 7387c03d..1bc1896d 100644 --- a/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java @@ -139,15 +139,17 @@ public class RemarcacoesDataProvider } } String tipoMarcacaoStr = ""; - switch( tipoMarcacao.intValue() ) + if( tipoMarcacao != null ) { - case Marcacao.TIPO_MARCACAO_TRABALHADOR_EXAMES: - tipoMarcacaoStr = "ECDs"; - break; - - case Marcacao.TIPO_MARCACAO_TRABALHADOR_CONSULTA: - tipoMarcacaoStr = "Consulta"; - break; + switch( tipoMarcacao.intValue() ) + { + case Marcacao.TIPO_MARCACAO_TRABALHADOR_EXAMES: + tipoMarcacaoStr = "ECDs"; + break; + case Marcacao.TIPO_MARCACAO_TRABALHADOR_CONSULTA: + tipoMarcacaoStr = "Consulta"; + break; + } } String trabalhador = ( String ) array.get( n, 4 ); String split[] = trabalhador.split( " " ); diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/mail/MailDialog.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/mail/MailDialog.java index c98c0504..c678bf8f 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/mail/MailDialog.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/mail/MailDialog.java @@ -122,6 +122,7 @@ public class MailDialog extends CustomJDialog attach( files ); setModal( true ); setSize( 1024, 768 ); + setLocationRelativeTo( null ); setVisible( true ); }