diff --git a/trunk/SIPRPSoft/lib/shst.jar b/trunk/SIPRPSoft/lib/shst.jar index 1d8fe57b..0d7c8b4c 100644 Binary files a/trunk/SIPRPSoft/lib/shst.jar and b/trunk/SIPRPSoft/lib/shst.jar differ diff --git a/trunk/SIPRPSoft/src/siprp/Main.java b/trunk/SIPRPSoft/src/siprp/Main.java index 312097e1..d66c71d1 100644 --- a/trunk/SIPRPSoft/src/siprp/Main.java +++ b/trunk/SIPRPSoft/src/siprp/Main.java @@ -23,9 +23,10 @@ import javax.swing.tree.MutableTreeNode; import shst.SHSTPropertiesConstants; import shst.SHSTShutdownHook; +import shst.companydataloaders.SIPRPPropertiesLoader; +import shst.initializer.SHSTORMInitializer; import shst.lembretes.LembretesDaemon; import siprp.clientes.AvisosPanel; -import siprp.companydataloaders.SIPRPPropertiesLoader; import siprp.initializer.SIPRPLoggerInit; import siprp.initializer.SIPRPUIInitializer; import siprp.update.UpdateList; @@ -179,7 +180,7 @@ public class Main implements com.evolute.utils.ui.window.Connector Updater.getInstance().executeUpdates( UpdateList.getUpdates() ); - new ORMInitializer().initializeORM( url, user, passwd ); + new SHSTORMInitializer().doInit(); Singleton.setInstance( Singleton.TODAY, new Date() ); } diff --git a/trunk/SIPRPSoft/src/siprp/ORMInitializer.java b/trunk/SIPRPSoft/src/siprp/ORMInitializer.java deleted file mode 100644 index 84bd15d5..00000000 --- a/trunk/SIPRPSoft/src/siprp/ORMInitializer.java +++ /dev/null @@ -1,82 +0,0 @@ -package siprp; - -import com.evolute.entity.ProviderInterface; -import com.evolute.entity.ProviderRegistry; -import com.evolute.entity.evo.EvoDataProviderFactory; -import com.evolute.entity.utils.ConnectionIdentity; -import com.evolute.utils.Singleton; -import com.evolute.utils.db.keyretrievers.PostgresqlAutoKeyRetriever; -import com.evolute.utils.sql.Insert; - -public class ORMInitializer -{ - - public void initializeORM(String url, String user, String password) - { -// Date d = new Date(); -// System.out.println( "INIT: " + d ); -// -// -// Properties jpoxProps; -// jpoxProps = System.getProperties();//new Properties(); - // Set the PersistenceManagerFactoryClass to the TJDO class. -// jpoxProps.setProperty( "javax.jdo.PersistenceManagerFactoryClass", -// "org.jpox.PersistenceManagerFactoryImpl" ); - // Set the JDBC driver name. -// jpoxProps.setProperty( "javax.jdo.option.ConnectionDriverName", (String) Singleton.getInstance( SingletonConstants.LOCAL_DRIVER_NAME ) ); -// jpoxProps.setProperty( "org.jpox.identifier.fullyQualifiedNames", "false" ); - // props.setProperty("com.triactive.jdo.transactionIsolation", - // "read-uncommitted" ); - - // Set the connection URL -// jpoxProps.setProperty( "javax.jdo.option.ConnectionURL", "jdbc:informix-sqli://192.168.0.3:6666" -// + "/apdp_db:informixserver=server" ); -// jpoxProps.setProperty( "javax.jdo.option.ConnectionURL", url ); -// jpoxProps.setProperty( "javax.jdo.option.ConnectionUserName", user ); -// jpoxProps.setProperty( "javax.jdo.option.ConnectionPassword", password ); -// jpoxProps.setProperty( "javax.jdo.option.IgnoreCache", "true" ); -// jpoxProps.setProperty( "javax.jdo.option.NonTransactionalRead", "true" ); -// jpoxProps.setProperty( "javax.jdo.option.RetainValues", "true" ); -// -// jpoxProps.setProperty( "org.jpox.autoCreateTables", "false" ); -// jpoxProps.setProperty( "org.jpox.autoCreateSchema", "false" ); -// jpoxProps.setProperty( "org.jpox.autoCreateConstraints", "false" ); -// jpoxProps.setProperty( "org.jpox.validateTables", "false" ); -// jpoxProps.setProperty( "org.jpox.validateConstraints", "false" ); -// jpoxProps.setProperty( "org.jpox.autoStartMechanismMode", "Ignored" ); -// jpoxProps.setProperty( "org.jpox.autoStartMechanism", "None" ); - -// jpoxProps.setProperty( "javax.jdo.option.RetainValues", "true" ); -// jpoxProps.setProperty( "javax.jdo.option.Optimistic", "true" ); - -// jpoxProps.setProperty( "org.jpox.identifier.defaultSchemaName", "informix" ); -// jpoxProps.setProperty( "org.jpox.rdbms.CheckExistTablesOrViews", "false" ); -// -// System.setProperty( "org.jpox.catalogName", (String)Singleton.getInstance( SingletonConstants.LOCAL_DB_NAME ) ); -// System.setProperty( "org.jpox.schemaName", "" ); - -// PersistenceManagerFactory pmf = JDOHelper.getPersistenceManagerFactory( jpoxProps ); -//// pmf.setOptimistic( true ); -//System.out.print( "Loading PM: " + new Date() ); -// // ( ( PersistenceManagerFactoryImpl )pmf ).setTransactionIsolation( Connection.TRANSACTION_READ_UNCOMMITTED ); -// // Retrieve a PersistenceManager from the PersistenceManagerFactory. -// PersistenceManager pm = pmf.getPersistenceManager(); -// JDOObject.setPersistentManager( pm ); -// Singleton.setInstance( Singleton.DEFAULT_PERSISTENCE_MANAGER_FACTORY, pmf ); -// Singleton.setInstance( SingletonConstants.PERSISTENCE_MANAGER, pm ); -// JDOProvider jdoProvider = new JDOProvider( jpoxProps ); -// Singleton.setInstance( Singleton.DEFAULT_JDO_PROVIDER, jdoProvider ); -//System.out.println( "PM done " + new Date() + "JDO: " + jdoProvider ); - - Insert.setDefaultKeyRetriever( PostgresqlAutoKeyRetriever.RETRIEVER ); - ProviderRegistry.registerDefaultProviderFactory( new EvoDataProviderFactory() ); - ConnectionIdentity conn = new ConnectionIdentity( url, user ); - conn.setPassword( password ); - ProviderRegistry.registerDefaultConnection( conn ); - ProviderInterface< ?, ? > provider = ProviderRegistry.getDefaultProvider( conn ); - - Singleton.setInstance( Singleton.DEFAULT_OBJECT_PROVIDER, provider ); - Singleton.setInstance( Singleton.DEFAULT_EVO_DATA_PROVIDER, provider ); - - } -} diff --git a/trunk/SIPRPSoft/src/siprp/SIPRPSpellChecker.java b/trunk/SIPRPSoft/src/siprp/SIPRPSpellChecker.java deleted file mode 100644 index c52b7e12..00000000 --- a/trunk/SIPRPSoft/src/siprp/SIPRPSpellChecker.java +++ /dev/null @@ -1,35 +0,0 @@ -package siprp; - -import javax.swing.text.JTextComponent; - -import com.evolute.modules.spellchecker.EvoSpellChecker; -import com.evolute.modules.spellchecker.EvoSpellChecker.Dictionary; - - -public class SIPRPSpellChecker -{ - - private static SIPRPSpellChecker instance = null; - - private final EvoSpellChecker spellChecker; - - private SIPRPSpellChecker() - { - this.spellChecker = new EvoSpellChecker( Dictionary.PT_PT ); - } - - public static SIPRPSpellChecker getInstance() - { - if( instance == null ) - { - instance = new SIPRPSpellChecker(); - } - return instance; - } - - public void attachSpellCheckToComponent( JTextComponent fieldText ) - { - spellChecker.attachSpellCheckToComponent( fieldText ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java b/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java index 0985514a..f7d288b3 100644 --- a/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java +++ b/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java @@ -14,6 +14,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import shst.SHSTPropertiesConstants; import shst.SHSTTrackerInterface; +import shst.companydataloaders.SIPRPPropertiesLoader; import shst.cursos.CursosWindowAdapter; import shst.higiene.gestao.GestaoRelatorioWindow; import shst.higiene.mapa.MapaHigieneWindow; @@ -31,7 +32,6 @@ import shst.medicina.multi.MultiMarcacoesWindow; import shst.medicina.presencas.RegistarPresencasWindow; import shst.medicina.prestadores.PrestadoresWindow; import siprp.clientes.AvisosPanel; -import siprp.companydataloaders.SIPRPPropertiesLoader; import siprp.cursos.SIPRPCursosInit; import siprp.estatistica.EstatisticaWindow; import siprp.ficha.FichaWindow; diff --git a/trunk/SIPRPSoft/src/siprp/companydataloaders/ClinicaAvenidaDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/ClinicaAvenidaDataLoader.java deleted file mode 100644 index 9e00b775..00000000 --- a/trunk/SIPRPSoft/src/siprp/companydataloaders/ClinicaAvenidaDataLoader.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * ClinicaAvenidaDtaLoader.java - * - * Created on 25 de Janeiro de 2005, 13:27 - */ - -package siprp.companydataloaders; - -import shst.SHSTPropertiesConstants; - -import com.evolute.utils.Singleton; - -/** - * - * @author fpalma - */ -public class ClinicaAvenidaDataLoader implements CompanyDataLoader -{ - - /** Creates a new instance of ClinicaAvenidaDtaLoader */ - public ClinicaAvenidaDataLoader() - { - } - - public void load() - { - Singleton.setInstance( SHSTPropertiesConstants.SOFTWARE_NAME, "SHSTSoft" ); - Singleton.setInstance( SHSTPropertiesConstants.COMPANY_NAME, "Centro Cl\u00ednico Avenida" ); - Singleton.setInstance( SHSTPropertiesConstants.COMPANY_LOGO, "logo_evo.jpg" ); - Singleton.setInstance( SHSTPropertiesConstants.COMPANY_ACRONYM, "CCA" ); - Singleton.setInstance( SHSTPropertiesConstants.SUBJECT_CONSULTA_VACINAS, "" ); - Singleton.setInstance( SHSTPropertiesConstants.LETTER_CONSULTA_VACINAS, "" ); - Singleton.setInstance( SHSTPropertiesConstants.SUBJECT_CONSULTA, "Centro Cl\u00ednico da Avenida - Marca\u00e7\u00e3o de consulta m\u00e9dica" ); - Singleton.setInstance( SHSTPropertiesConstants.LETTER_CONSULTA, "Vimos por este meio informar que " + NOME + " " - + "dever\u00e1 comparecer no Centro Cl\u00ednico da Avenida para a realiza\u00e7\u00e3o da " - + "consulta de Medicina do Trabalho, no dia " + DATA + ".\n" - + "Caso n\u00e3o seja poss\u00edvel a compar\u00eancia do referido colaborador na " - + "data indicada, agradecemos que nos informem atrav\u00e9s do telefone 214928612 " - + "ou respondendo a esta mensagem.\n\n" - + "Departamento de Seguran\u00e7a e Higiene do Trabalho\n" - + "Centro Cl\u00ednico da Avenida\n" - + "Av. General Humberto Delgado 128 R/C D\n" - + "2700-419 Amadora" ); - Singleton.setInstance( SHSTPropertiesConstants.SUBJECT_EXAMES, "Centro Cl\u00ednico da Avenida - Marca\u00e7\u00e3o de exames de Medicina do Trabalho" ); - Singleton.setInstance( SHSTPropertiesConstants.LETTER_EXAMES, "Vimos por este meio informar que " + NOME + " " - + "dever\u00e1 comparecer no Centro Cl\u00ednico da Avenida para a realiza\u00e7\u00e3o " - + "de exames relativos \u00e0 Medicina do Trabalho, no dia " + DATA + ".\n" - + "Caso n\u00e3o seja poss\u00edvel a compar\u00eancia do referido colaborador na " - + "data indicada, agradecemos que nos informem atrav\u00e9s do telefone 214928612 " - + "ou respondendo a esta mensagem.\n\n" - + "Departamento de Seguran\u00e7a e Higiene do Trabalho\n" - + "Centro Cl\u00ednico da Avenida\n" - + "Av. General Humberto Delgado 128 R/C D\n" - + "2700-419 Amadora" ); - Singleton.setInstance( SHSTPropertiesConstants.SUBJECT_VISITA, "Centro Cl\u00ednico da Avenida - Marca\u00e7\u00e3�o da Auditoria de Seguran\u00e7a e Higiene do Trabalho" ); - Singleton.setInstance( SHSTPropertiesConstants.LETTER_VISITA, "Vimos por este meio informar que pretendemos " - + "realizar a auditoria de Seguran\u00e7a e Higiene do Trabalho \u00e0s vossas " - + "instala��es em " + MORADA + ", no dia " + DATA + ".\n" - + "Agradecemos que confirmem a vossa disponibilidade para a realiza\u00e7\u00e3o " - + "da visita na data indicada, atrav\u00e9s do telefone 214928612 ou " - + "respondendo a esta mensagem.\n\n" - + "Departamento de Seguran\u00e7a e Higiene do Trabalho\n" - + "Centro Cl\u00ednico da Avenida\n" - + "Av. General Humberto Delgado 128 R/C D\n" - + "2700-419 Amadora\n" - + "Tel.: 214928612" ); - Singleton.setInstance( SHSTPropertiesConstants.USES_HOUR, Boolean.TRUE ); - Singleton.setInstance( SHSTPropertiesConstants.CODIGO_EMPRESA_FORMAT, "15" ); - Singleton.setInstance( SHSTPropertiesConstants.FICHA_MARCA_EXAMES, Boolean.FALSE ); - Singleton.setInstance( SHSTPropertiesConstants.EXCEL_FORMAT, new int[]{ 0, 2, 3, 1, 4, 5, 6, 9, 7, 8 } ); - - Singleton.setInstance( SHSTPropertiesConstants.MODULE_FICHA, Boolean.TRUE ); - Singleton.setInstance( SHSTPropertiesConstants.MODULE_CLIENTES, Boolean.TRUE ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_AWARE, Boolean.FALSE ); - Singleton.setInstance( SHSTPropertiesConstants.MODULE_RELATORIO, Boolean.TRUE ); - Singleton.setInstance( SHSTPropertiesConstants.MODULE_LISTAGENS, Boolean.FALSE ); - - Singleton.setInstance( SHSTPropertiesConstants.WEB_USER, "" ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_PASSWORD, "" ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_URL_PREFIX, "" ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_URL, "" ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_DB_NAME, "" ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_DRIVER_NAME, "" ); - - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_USER, "postgres" ); - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_PASSWORD, "Typein" ); - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_URL, "localhost" ); - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_DB_NAME, "shst" ); - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/companydataloaders/CompanyDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/CompanyDataLoader.java deleted file mode 100644 index 195a568c..00000000 --- a/trunk/SIPRPSoft/src/siprp/companydataloaders/CompanyDataLoader.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * CompanyDataLoader.java - * - * Created on 25 de Janeiro de 2005, 13:18 - */ - -package siprp.companydataloaders; - -/** - * - * @author fpalma - */ -public interface CompanyDataLoader -{ - public static final String DATA = "XDATAX"; - public static final String NOME = "XNOMEX"; - public static final String MORADA = "XMORADAX"; - public static final String HORA = "XHORAX"; - public void load(); -} diff --git a/trunk/SIPRPSoft/src/siprp/companydataloaders/IBookDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/IBookDataLoader.java deleted file mode 100644 index f6b67425..00000000 --- a/trunk/SIPRPSoft/src/siprp/companydataloaders/IBookDataLoader.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * SIPRPDataLoader.java - * - * Created on 25 de Janeiro de 2005, 13:19 - */ - -package siprp.companydataloaders; - -import shst.SHSTPropertiesConstants; - -import com.evolute.utils.Singleton; - -/** - * - * @author fpalma - */ -public class IBookDataLoader implements CompanyDataLoader -{ - - /** Creates a new instance of SIPRPDataLoader */ - public IBookDataLoader() - { - } - - public void load() - { - Singleton.setInstance( SHSTPropertiesConstants.SOFTWARE_NAME, "SHSTSoft" ); - Singleton.setInstance( SHSTPropertiesConstants.COMPANY_NAME, "SHST" ); - Singleton.setInstance( SHSTPropertiesConstants.COMPANY_LOGO, "logo_evo.jpg" ); - Singleton.setInstance( SHSTPropertiesConstants.COMPANY_ACRONYM, "SHST" ); - Singleton.setInstance( SHSTPropertiesConstants.SUBJECT_CONSULTA, "SHST - Marca\u00E7\u00E3o de consulta"); - Singleton.setInstance( SHSTPropertiesConstants.LETTER_CONSULTA, "Vimos pelo presente informar que '" + NOME + "' dever\u00E1 comparecer " - + "nas nossas instala\u00E7\u00F5es para a realiza\u00E7\u00E3o da consulta de Medicina " - + "do Trabalho, no dia '" + DATA + "', pelas 08H30." - + "%0A%0A" - + "%0A%0A" - + "Solicitamos, tamb\u00E9m, que o colaborador seja portador do Boletim de Vacinas e " - + "dos \u00FAltimos exames complementares realizados." - + "%0A%0A" - + "%0A%0A" - + "Caso n\u00E3o seja poss\u00EDvel a compar\u00EAncia deste colaborador na data " - + "indicada, contacte-nos, por favor, atrav\u00E9s do telefone 21 212 12 12 " - + "ou respondendo ao remetente desta mensagem." - + "%0A%0A%0A" - + "Cumprimentos," - + "%0A%0ASHST" ); - Singleton.setInstance( SHSTPropertiesConstants.SUBJECT_EXAMES, "SHST - Marca\u00E7\u00E3o de exame"); - Singleton.setInstance( SHSTPropertiesConstants.LETTER_EXAMES, "Vimos pelo presente informar que '" + NOME + "' dever\u00E1 comparecer " - + "nas nossas instala\u00E7\u00F5es para a realiza\u00E7\u00E3o dos exames de Medicina " - + "do Trabalho, no dia '" + DATA + "', pelas 08H30." - + "%0A%0A" - + "Relembramos que o colaborador dever\u00E1 comparecer em jejum." - + "%0A%0A" - + "Caso n\u00E3o seja poss\u00EDvel a compar\u00EAncia deste colaborador na data " - + "indicada, contacte-nos, por favor, atrav\u00E9s do telefone 21 212 12 12 " - + "ou respondendo ao remetente desta mensagem." - + "%0A%0A%0A" - + "Cumprimentos,%0A%0ASHST" ); - Singleton.setInstance( SHSTPropertiesConstants.SUBJECT_VISITA, "SHST - Marca\u00E7\u00E3o de visita de higiene e seguran\u00E7a"); - Singleton.setInstance( SHSTPropertiesConstants.LETTER_VISITA, "Vimos pelo presente informar que iremos efectuar a auditoria de Higiene e " - + "Seguran\u00E7a \u00E0s vossas instala\u00E7\u00F5es de '" + NOME + "', no dia '" + DATA + "'." - + "%0A%0A" - + "Agradecemos que nos confirme, pela mesma via, o nome do representante " - + "da empresa que nos ir\u00E1 acompanhar e a vossa disponibilidade para a " - + "realiza\u00E7\u00E3o da visita na data indicada." - + "%0A%0A" - + "Caso necessite de qualquer esclarecimento, contacte-nos, por favor, " - + "atrav\u00E9s do telefone 21 212 12 12 " - + "ou responda ao remetente desta mensagem." - + "%0A%0A%0A" - + "Cumprimentos,%0A%0ASHST" ); - Singleton.setInstance( SHSTPropertiesConstants.USES_HOUR, Boolean.FALSE ); - Singleton.setInstance( SHSTPropertiesConstants.CODIGO_EMPRESA_FORMAT, "2 6 / 2" ); - Singleton.setInstance( SHSTPropertiesConstants.FICHA_MARCA_EXAMES, Boolean.TRUE ); - Singleton.setInstance( SHSTPropertiesConstants.EXCEL_FORMAT, new int[]{ 0, 2, 3, 1, -1, 4, 5, 7, 6, -1 } ); - - Singleton.setInstance( SHSTPropertiesConstants.MODULE_FICHA, Boolean.TRUE ); - Singleton.setInstance( SHSTPropertiesConstants.MODULE_CLIENTES, Boolean.TRUE ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_AWARE, Boolean.FALSE ); - Singleton.setInstance( SHSTPropertiesConstants.MODULE_RELATORIO, Boolean.TRUE ); - Singleton.setInstance( SHSTPropertiesConstants.MODULE_LISTAGENS, Boolean.TRUE ); - - Singleton.setInstance( SHSTPropertiesConstants.WEB_USER, "" ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_PASSWORD, "" ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_URL_PREFIX, "" ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_URL, "" ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_DB_NAME, "" ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_DRIVER_NAME, "" ); - -// 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, "192.168.1.1:5432" ); -// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); -// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); - - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_USER, "postgres" ); - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_PASSWORD, "Typein" ); - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_URL, "localhost:5432" ); - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_DB_NAME, "siprp_local" ); - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPPropertiesLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPPropertiesLoader.java deleted file mode 100644 index e516a0c7..00000000 --- a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPPropertiesLoader.java +++ /dev/null @@ -1,116 +0,0 @@ -package siprp.companydataloaders; - -import shst.SHSTPropertiesConstants; - -import com.evolute.properties.EvoAbstractPropertiesLoader; -import com.evolute.properties.EvoPropertyKey; -import com.evolute.properties.PropertiesException; -import com.evolute.utils.Singleton; - -public class SIPRPPropertiesLoader extends EvoAbstractPropertiesLoader -{ - private static SIPRPPropertiesLoader instance; - - private SIPRPPropertiesLoader() - { - this(null,null,null,null); - } - - public synchronized static SIPRPPropertiesLoader getInstance() - { - if (instance == null) - { - instance = new SIPRPPropertiesLoader(); - } - return instance; - } - - public SIPRPPropertiesLoader( - String[] mandatorySystemProperties, - String[] mandatorySingletonProperties, - String[] mandatoryJNLPProperties, - String[] mandatoryAPPProperties) - { - super(mandatorySystemProperties, mandatorySingletonProperties, mandatoryJNLPProperties, mandatoryAPPProperties); - } - - @Override - protected void postLoad() throws PropertiesException - { - Singleton.setInstance( SHSTPropertiesConstants.SOFTWARE_NAME, "SIPRPSoft" ); - Singleton.setInstance( SHSTPropertiesConstants.COMPANY_NAME, "SIPRP - Sociedade Ib\u00e9rica de Preven\u00e7\u00e3o de Riscos Profissionais" ); - Singleton.setInstance( SHSTPropertiesConstants.COMPANY_LOGO, "logo_combo.jpg" ); - Singleton.setInstance( SHSTPropertiesConstants.COMPANY_ACRONYM, "SIPRP" ); - Singleton.setInstance( SHSTPropertiesConstants.SUBJECT_CONSULTA, "SIPRP - Marca\u00E7\u00E3o de consulta de '" + CompanyDataLoader.NOME + "'"); - Singleton.setInstance( SHSTPropertiesConstants.LETTER_CONSULTA, "Vimos pelo presente informar que '" + CompanyDataLoader.NOME + "' dever\u00E1 comparecer " - + "nas nossas instala\u00E7\u00F5es para a realiza\u00E7\u00E3o da consulta de Medicina " - + "do Trabalho, no dia '" + CompanyDataLoader.DATA + "', pelas 08H30." - + "%0A%0A" - + "%0A%0A" - + "Solicitamos, tamb\u00E9m, que o colaborador seja portador do Boletim de Vacinas e " - + "dos \u00FAltimos exames complementares realizados." - + "%0A%0A" - + "%0A%0A" - + "Caso n\u00E3o seja poss\u00EDvel a compar\u00EAncia deste colaborador na data " - + "indicada, contacte-nos, por favor, atrav\u00E9s do telefone 21 350 45 40 " - + "ou respondendo ao remetente desta mensagem." - + "%0A%0A%0A" - + "Cumprimentos," - + "%0A%0ASIPRP" - + "%0A%0AATRIUM SALDANHA" - + "%0A%0APra\u00e7a Duque de Saldanha, 1 - 9\u00BAG" - + "%0A%0A1050-094 Lisboa" ); - Singleton.setInstance( SHSTPropertiesConstants.SUBJECT_EXAMES, "SIPRP - Marca\u00E7\u00E3o de exame de '" + CompanyDataLoader.NOME + "'"); - Singleton.setInstance( SHSTPropertiesConstants.LETTER_EXAMES, "Vimos pelo presente informar que '" + CompanyDataLoader.NOME + "' dever\u00E1 comparecer " - + "nas nossas instala\u00E7\u00F5es para a realiza\u00E7\u00E3o dos exames de Medicina " - + "do Trabalho, no dia '" + CompanyDataLoader.DATA + "', pelas 08H30." - + "%0A%0A" - + "Relembramos que o colaborador dever\u00E1 comparecer em jejum." - + "%0A%0A" - + "Caso n\u00E3o seja poss\u00EDvel a compar\u00EAncia deste colaborador na data " - + "indicada, contacte-nos, por favor, atrav\u00E9s do telefone 21 350 45 40 " - + "ou respondendo ao remetente desta mensagem." - + "%0A%0A%0A" - + "Cumprimentos,%0A%0ASIPRP" ); - Singleton.setInstance( SHSTPropertiesConstants.SUBJECT_VISITA, "SIPRP - Marca\u00E7\u00E3o de visita de higiene e seguran\u00E7a a '" + CompanyDataLoader.NOME + "'" ); - Singleton.setInstance( SHSTPropertiesConstants.LETTER_VISITA, "Vimos pelo presente informar que iremos efectuar a auditoria de Higiene e " - + "Seguran\u00E7a \u00E0s vossas instala\u00E7\u00F5es de '" + CompanyDataLoader.NOME + "', no dia '" + CompanyDataLoader.DATA + "'." - + "%0A%0A" - + "Agradecemos que nos confirme, pela mesma via, o nome do representante " - + "da empresa que nos ir\u00E1 acompanhar e a vossa disponibilidade para a " - + "realiza\u00E7\u00E3o da visita na data indicada." - + "%0A%0A" - + "Caso necessite de qualquer esclarecimento, contacte-nos, por favor, " - + "atrav\u00E9s dos telefones 21 350 45 43 (Pedro Vieira), 21 350 45 44 " - + "(Catarina Leonardo) ou responda ao remetente desta mensagem." - + "%0A%0A%0A" - + "Cumprimentos,%0A%0ASIPRP" ); - Singleton.setInstance( SHSTPropertiesConstants.USES_HOUR, Boolean.FALSE ); - Singleton.setInstance( SHSTPropertiesConstants.CODIGO_EMPRESA_FORMAT, "2 6 / 2" ); - Singleton.setInstance( SHSTPropertiesConstants.FICHA_MARCA_EXAMES, Boolean.TRUE ); - Singleton.setInstance( SHSTPropertiesConstants.EXCEL_FORMAT, new int[]{ 0, 2, 3, 1, -1, 4, 5, 7, 6, -1 } ); - Singleton.setInstance( SHSTPropertiesConstants.EXCEL_FORMAT_DEMISSAO, new int[]{ 0, 1 } ); - - Singleton.setInstance( SHSTPropertiesConstants.MODULE_FICHA, Boolean.TRUE ); - Singleton.setInstance( SHSTPropertiesConstants.MODULE_CLIENTES, Boolean.TRUE ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_AWARE, Boolean.TRUE ); - Singleton.setInstance( SHSTPropertiesConstants.MODULE_RELATORIO, Boolean.TRUE ); - Singleton.setInstance( SHSTPropertiesConstants.MODULE_LISTAGENS, Boolean.TRUE ); - - Singleton.setInstance( SHSTPropertiesConstants.WEB_USER, "siprp" ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_PASSWORD, "rg2h-opksiprp" ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_URL_PREFIX, "jdbc:postgresql://" ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_URL, "www.evolute.pt:5436" ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_DB_NAME, "siprp" ); - Singleton.setInstance( SHSTPropertiesConstants.WEB_DRIVER_NAME, "org.postgresql.Driver" ); - - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_USER, Singleton.getInstance( EvoPropertyKey.DB.USER ) ); - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_PASSWORD, Singleton.getInstance( EvoPropertyKey.DB.PASSWORD ) ); - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_URL_PREFIX, Singleton.getInstance( EvoPropertyKey.DB.CONNECTION.PREFIX ) ); - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_URL, - Singleton.getInstance( EvoPropertyKey.DB.CONNECTION.HOSTNAME ) + ":" + Singleton.getInstance( EvoPropertyKey.DB.CONNECTION.PORT ) - ); - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_DB_NAME, Singleton.getInstance( EvoPropertyKey.DB.NAME ) ); - Singleton.setInstance( SHSTPropertiesConstants.LOCAL_DRIVER_NAME, Singleton.getInstance( EvoPropertyKey.DB.CONNECTION.DRIVER_NAME ) ); - } -} diff --git a/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java b/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java index b27d036e..7ef858e6 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java @@ -37,9 +37,9 @@ import shst.data.outer.MedicosData; import shst.data.outer.TrabalhadoresData; import shst.importer.Importer; import shst.medicina.MarcacoesMedicinaHandler; +import shst.printer.Printer; import siprp.FichaDataProvider; import siprp.lembretes.LembretesDataProvider; -import siprp.printer.Printer; import siprp.ui.SIPRPTabbedWindow; import com.evolute.entity.ProviderInterface; diff --git a/trunk/SIPRPSoft/src/siprp/printer/Printer.java b/trunk/SIPRPSoft/src/siprp/printer/Printer.java deleted file mode 100644 index 788cd162..00000000 --- a/trunk/SIPRPSoft/src/siprp/printer/Printer.java +++ /dev/null @@ -1,61 +0,0 @@ -package siprp.printer; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; - -import siprp.ficha.ExamePDF; -import siprp.ficha.FichaAptidaoCreator; -import siprp.ficha.PDFFilePrinter; - -public class Printer -{ - public static void printFO( byte fo[] ) throws Exception - { - if( fo != null ) - { - byte pdf[] = FichaAptidaoCreator.getCreator().createPDF( fo ); - new PDFFilePrinter( pdf, true ); - } - } - - public static void printPDF( byte[] pdf, String tempFileName, String printerName ) throws Exception - { - ExamePDF ePDF = new ExamePDF(); - ePDF.printSilent( pdf, tempFileName, printerName ); - } - - public static void printFoToFile( byte[] fo, String fileName, boolean deleteIfExists ) throws Exception - { - if( fo != null ) - { - byte pdf[] = FichaAptidaoCreator.getCreator().createPDF( fo ); - printToFile( pdf, fileName, deleteIfExists ); - } - } - - public static void printPDFToFile( byte[] pdf, String fileName, boolean deleteIfExists ) throws Exception - { - if( pdf != null ) - { - printToFile( pdf, fileName, deleteIfExists ); - } - } - - private static void printToFile( byte[] array, String fileName, boolean deleteIfExists ) throws IOException - { - File outFile = new File( fileName ); - if(outFile.exists() && deleteIfExists) - { - outFile.delete(); - } - if( !outFile.exists() ) - { - outFile.createNewFile(); - FileOutputStream fos = new FileOutputStream( outFile ); - fos.write( array ); - fos.close(); - } - } - -}