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

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

Browse Source
0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Tiago Simão 17 years ago
parent 81c3b2712c
commit 7c3734d0cb
7 changed files with 51 additions and 63 deletions
Show Stats Download Patch File Download Diff File

2
trunk/.classpath
Unescape View File

@ -24,7 +24,7 @@
<classpathentry kind="lib" path="lib.netbeans/jsf-impl.jar"/> <classpathentry kind="lib" path="lib.netbeans/jsf-impl.jar"/>
<classpathentry kind="lib" path="lib.netbeans/dataprovider.jar"/> <classpathentry kind="lib" path="lib.netbeans/dataprovider.jar"/>
<classpathentry kind="lib" path="lib.netbeans/appbase.jar"/> <classpathentry kind="lib" path="lib.netbeans/appbase.jar"/>
<classpathentry kind="lib" path="common/lib/evolute.jar"/> <classpathentry kind="lib" path="common/lib/evolute.jar" sourcepath="/evolute/src"/>
<classpathentry kind="lib" path="common/lib/log4j-1.2.8.jar"/> <classpathentry kind="lib" path="common/lib/log4j-1.2.8.jar"/>
<classpathentry kind="lib" path="common/lib/mail.jar"/> <classpathentry kind="lib" path="common/lib/mail.jar"/>
<classpathentry kind="lib" path="common/lib/TableLayout.jar"/> <classpathentry kind="lib" path="common/lib/TableLayout.jar"/>

6
trunk/SIPRPSoft/src/siprp/Main.java
Unescape View File

@ -9,7 +9,6 @@ import static siprp.ProcessoConstants.PROCESSO_FECHADO_CODE;
import static siprp.ProcessoConstants.PROCESSO_FECHADO_DESCRIPTION; import static siprp.ProcessoConstants.PROCESSO_FECHADO_DESCRIPTION;
import java.awt.Color; import java.awt.Color;
import java.awt.GraphicsEnvironment;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.InputStream; 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 ) ); loginWindow.setTitle( (String) Singleton.getInstance( SingletonConstants.SOFTWARE_NAME ) );
JPanel left = loginWindow.getLeftPanel(); JPanel left = loginWindow.getLeftPanel();
left.setBackground( Color.white ); left.setBackground( Color.white );
GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment(); // GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
loginWindow.setExtendedState(loginWindow.getExtendedState() | loginWindow.MAXIMIZED_BOTH); loginWindow.setExtendedState(loginWindow.getExtendedState() | LoginWindow.MAXIMIZED_BOTH);
loginWindow.setVisible( true ); loginWindow.setVisible( true );
SwingUtilities.invokeLater( new Runnable(){ SwingUtilities.invokeLater( new Runnable(){
public void run() public void run()
@ -305,6 +304,7 @@ public class Main implements com.evolute.utils.ui.window.Connector
{ {
DialogException.showException( ex ); DialogException.showException( ex );
} }
} }
public void exit() public void exit()

4
trunk/SIPRPSoft/src/siprp/SIPRPTracker.java
Unescape View File

@ -15,8 +15,6 @@ import siprp.clientes.ClientesWindow;
import siprp.estatistica.EstatisticaWindow; import siprp.estatistica.EstatisticaWindow;
import siprp.ficha.FichaWindow; import siprp.ficha.FichaWindow;
import siprp.higiene.gestao.GestaoRelatorioWindow; import siprp.higiene.gestao.GestaoRelatorioWindow;
import siprp.higiene.gestao.riscos.GerirRiscosPanel;
import siprp.higiene.legislacoes.GestaoLegislacoesWindow;
import siprp.higiene.mapa.MapaHigieneWindow; import siprp.higiene.mapa.MapaHigieneWindow;
import siprp.higiene.marcacoes.MarcacoesHigieneWindow; import siprp.higiene.marcacoes.MarcacoesHigieneWindow;
import siprp.higiene.relatorio.RelatorioHigieneSegurancaWindow; import siprp.higiene.relatorio.RelatorioHigieneSegurancaWindow;
@ -65,7 +63,7 @@ public class SIPRPTracker extends WindowTracker
Singleton.setInstance( SingletonConstants.SIPRP_TRACKER, this ); Singleton.setInstance( SingletonConstants.SIPRP_TRACKER, this );
this.avisos = avisosP; this.avisos = avisosP;
avisos.setTracker( this ); avisos.setTracker( this );
Hashtable creators = new Hashtable(); Hashtable<String, WindowCreator> creators = new Hashtable<String, WindowCreator>();
DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode( DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(
Singleton.getInstance( SingletonConstants.COMPANY_ACRONYM ) ); Singleton.getInstance( SingletonConstants.COMPANY_ACRONYM ) );

29
trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
Unescape View File

@ -1,16 +1,9 @@
/*
* SIPRPDataLoader.java
*
* Created on 25 de Janeiro de 2005, 13:19
*/
package siprp.companydataloaders; package siprp.companydataloaders;
import javax.swing.JCheckBox; import siprp.CompanyDataLoader;
import siprp.SingletonConstants;
import com.evolute.utils.*;
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_URL, "www.evolute.pt:5436" );
// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" ); // Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" );
// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); // 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_USER, "postgres" );
// Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); // Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
// Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); // 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_DB_NAME, "siprp_local" );
// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); // 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" ); // Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );

54
trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java
Unescape View File

@ -368,6 +368,7 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe
catch( Exception e ) catch( Exception e )
{ {
LeafDialog.error(e); LeafDialog.error(e);
refresh();
} }
finally finally
{ {
@ -546,43 +547,36 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe
return result; return result;
} }
private Vector<File> getRelatoriosTemp(HsRelatorio relatorio) private Vector<File> getRelatoriosTemp(HsRelatorio relatorio) throws Exception
{ {
Vector<File> result = new Vector<File>(); Vector<File> result = new Vector<File>();
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() ); String data = relatorio.getToHsMarcacoesEstabelecimento().getDataRelatorio() == null ? "" : HsRelatorio.DATE_FORMAT.format( relatorio.getData() );
byte[] planoPDF = new PlanoActuacaoPDFCreator().createPDF( relatorio.getId(), false ); String estabelecimento = getShortNameForEstabelecimento(relatorio.getToHsMarcacoesEstabelecimento().getToEstabelecimentos());
if( relatorioPDF != null ) File relat = File.createTempFile("Relatorio - " + estabelecimento + " - " + data, ".pdf");
if( relat != null )
{ {
String data = relatorio.getToHsMarcacoesEstabelecimento().getDataRelatorio() == null ? "" : HsRelatorio.DATE_FORMAT.format( relatorio.getData().toString() ); FileOutputStream fos = new FileOutputStream(relat);
String estabelecimento = getShortNameForEstabelecimento(relatorio.getToHsMarcacoesEstabelecimento().getToEstabelecimentos()); fos.write(relatorioPDF);
File relat = File.createTempFile("Relatorio - " + estabelecimento + " - " + data, ".pdf"); fos.close();
if( relat != null ) result.add( relat );
{
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 );
}
} }
} }
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; return result;
} }

18
trunk/SIPRPSoft/src/siprp/lembretes/remarcacoes/RemarcacoesDataProvider.java
Unescape View File

@ -139,15 +139,17 @@ public class RemarcacoesDataProvider
} }
} }
String tipoMarcacaoStr = ""; String tipoMarcacaoStr = "";
switch( tipoMarcacao.intValue() ) if( tipoMarcacao != null )
{ {
case Marcacao.TIPO_MARCACAO_TRABALHADOR_EXAMES: switch( tipoMarcacao.intValue() )
tipoMarcacaoStr = "ECDs"; {
break; case Marcacao.TIPO_MARCACAO_TRABALHADOR_EXAMES:
tipoMarcacaoStr = "ECDs";
case Marcacao.TIPO_MARCACAO_TRABALHADOR_CONSULTA: break;
tipoMarcacaoStr = "Consulta"; case Marcacao.TIPO_MARCACAO_TRABALHADOR_CONSULTA:
break; tipoMarcacaoStr = "Consulta";
break;
}
} }
String trabalhador = ( String ) array.get( n, 4 ); String trabalhador = ( String ) array.get( n, 4 );
String split[] = trabalhador.split( " " ); String split[] = trabalhador.split( " " );

1
trunk/SIPRPSoft/src/siprp/medicina/processo/mail/MailDialog.java
Unescape View File

@ -122,6 +122,7 @@ public class MailDialog extends CustomJDialog
attach( files ); attach( files );
setModal( true ); setModal( true );
setSize( 1024, 768 ); setSize( 1024, 768 );
setLocationRelativeTo( null );
setVisible( true ); setVisible( true );
} }

Write Preview
Loading…
Cancel
Save