From 55222c1666dbfd4632dcfadab9776f0d7331aab5 Mon Sep 17 00:00:00 2001 From: Frederico Palma Date: Tue, 25 Jan 2005 17:53:34 +0000 Subject: [PATCH] no message git-svn-id: https://svn.coded.pt/svn/SIPRP@155 bb69d46d-e84e-40c8-a05a-06db0d633741 --- trunk/siprp/Main.java | 26 +++++++++++-------- trunk/siprp/SingletonConstants.java | 22 ++++++++++++++-- .../ClinicaAvenidaDataLoader.java | 23 ++++++++++++++-- .../companydataloaders/SIPRPDataLoader.java | 23 ++++++++++++++-- 4 files changed, 77 insertions(+), 17 deletions(-) diff --git a/trunk/siprp/Main.java b/trunk/siprp/Main.java index 8365ff6b..3274cf1a 100644 --- a/trunk/siprp/Main.java +++ b/trunk/siprp/Main.java @@ -1,5 +1,6 @@ package siprp; +import siprp.companydataloaders.*; import siprp.data.*; import siprp.ficha.*; import siprp.clientes.*; @@ -29,7 +30,7 @@ public class Main implements Connector { private final static ClassLoader classLoader = new EVUtilsImageLib().getClass().getClassLoader(); - private static String dbase = "siprp"; + private static String dbase; private SIPRPTracker siprpTracker; private static AvisosPanel avisos = null; @@ -42,12 +43,13 @@ public class Main implements Connector // Singleton.setInstance( SingletonConstants.WEB_AWARE, Boolean.FALSE ); // Singleton.setInstance( SingletonConstants.DB_NAME, "shst" ); - Singleton.setInstance( SingletonConstants.COMPANY_NAME, "SIPRP - Sociedade Ib\u00e9rica de Preven\u00e7\u00e3o de Riscos Profissionais" ); - Singleton.setInstance( SingletonConstants.COMPANY_LOGO, "logo_combo.jpg" ); - Singleton.setInstance( SingletonConstants.WEB_AWARE, Boolean.TRUE ); - Singleton.setInstance( SingletonConstants.DB_NAME, "siprp" ); +// Singleton.setInstance( SingletonConstants.COMPANY_NAME, "SIPRP - Sociedade Ib\u00e9rica de Preven\u00e7\u00e3o de Riscos Profissionais" ); +// Singleton.setInstance( SingletonConstants.COMPANY_LOGO, "logo_combo.jpg" ); +// Singleton.setInstance( SingletonConstants.WEB_AWARE, Boolean.TRUE ); +// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp" ); + new SIPRPDataLoader().load(); - dbase = (String)Singleton.getInstance( SingletonConstants.DB_NAME ); + dbase = (String)Singleton.getInstance( SingletonConstants.LOCAL_DB_NAME ); /* Calendar cal = Calendar.getInstance(); cal.set( 2004, 06, 14 ); if( cal.before( Calendar.getInstance() ) ) @@ -85,7 +87,8 @@ public class Main implements Connector LoginWindow loginWindow = new LoginWindow( new Main(), /*"logo"+File.separator +*/ logoFileName,//"logo"+File.separator + "logo_w400.jpg", new String[] { "SIPRPSoft" }, new String[] { "Vers\u00E3o 2.0", "(EVOLUTE 2004)" }, "", - "root", "UNIXLuvsU", avisos, false ); + (String)Singleton.getInstance( SingletonConstants.LOCAL_USER ), + (String)Singleton.getInstance( SingletonConstants.LOCAL_PASSWORD ), avisos, false ); loginWindow.setTitle( "SIPRPSoft" ); JPanel left = loginWindow.getLeftPanel(); left.setBackground( Color.white ); @@ -102,10 +105,11 @@ public class Main implements Connector if( server == null ) { //server = "192.168.1.191"; - server = "192.168.0.110"; + server = (String)Singleton.getInstance( SingletonConstants.LOCAL_URL ); // server = "ws_fpalma"; } - String url = "jdbc:mysql://" + server + "/" + dbase; + String prefix = (String)Singleton.getInstance( SingletonConstants.LOCAL_URL_PREFIX ); + String url = prefix + server + "/" + dbase; // System.out.println( "url: " + url + " user: " + user + " ps: " + passwd ); DBManager dbm = new JDBCManager( url, user, passwd , 10, 8, 8, null ); // UnicodeChecker.setUseDoubleSlash( true ); @@ -203,7 +207,7 @@ System.out.println( "INIT: " + d ); jpoxProps.setProperty( "javax.jdo.PersistenceManagerFactoryClass", "org.jpox.PersistenceManagerFactoryImpl" ); // Set the JDBC driver name. - jpoxProps.setProperty( "javax.jdo.option.ConnectionDriverName", "com.mysql.jdbc.Driver" ); + 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" ); @@ -232,7 +236,7 @@ System.out.println( "INIT: " + d ); // jpoxProps.setProperty( "org.jpox.identifier.defaultSchemaName", "informix" ); jpoxProps.setProperty( "org.jpox.rdbms.CheckExistTablesOrViews", "false" ); - System.setProperty( "org.jpox.catalogName", (String)Singleton.getInstance( SingletonConstants.DB_NAME ) ); + System.setProperty( "org.jpox.catalogName", (String)Singleton.getInstance( SingletonConstants.LOCAL_DB_NAME ) ); System.setProperty( "org.jpox.schemaName", "" ); PersistenceManagerFactory pmf = JDOHelper.getPersistenceManagerFactory( jpoxProps ); diff --git a/trunk/siprp/SingletonConstants.java b/trunk/siprp/SingletonConstants.java index 82a9d689..2e07c607 100644 --- a/trunk/siprp/SingletonConstants.java +++ b/trunk/siprp/SingletonConstants.java @@ -15,8 +15,7 @@ public class SingletonConstants public static final String PERSISTENCE_MANAGER = "PERSISTENCE_MANAGER"; public static final String COMPANY_NAME = "company_name"; public static final String COMPANY_LOGO = "company_logo"; - public static final String WEB_AWARE = "web_aware"; - public static final String DB_NAME = "db_name"; + public static final String COMPANY_ACRONYM = "company_acronym"; public static final String SUBJECT_CONSULTA = "subject_consulta"; public static final String LETTER_CONSULTA = "letter_consulta"; public static final String SUBJECT_EXAMES = "subject_exames"; @@ -24,6 +23,25 @@ public class SingletonConstants public static final String SUBJECT_VISITA = "subject_visita"; public static final String LETTER_VISITA = "letter_visita"; + public static final String MODULE_FICHA = "module_ficha"; + public static final String MODULE_CLIENTES = "module_clientes"; + public static final String WEB_AWARE = "web_aware"; + public static final String MODULE_RELATORIO = "module_relatorio"; + public static final String MODULE_LISTAGENS = "module_listagens"; + + public static final String WEB_USER = "web_user"; + public static final String WEB_PASSWORD = "web_password"; + public static final String WEB_URL_PREFIX = "web_url_prefix"; + public static final String WEB_URL = "web_url"; + public static final String WEB_DB_NAME = "web_db_name"; + public static final String WEB_DRIVER_NAME = "web_driver_name"; + + public static final String LOCAL_USER = "local_user"; + public static final String LOCAL_PASSWORD = "local_password"; + public static final String LOCAL_URL_PREFIX = "local_url_prefix"; + public static final String LOCAL_URL = "local_url"; + public static final String LOCAL_DB_NAME = "local_db_name"; + public static final String LOCAL_DRIVER_NAME = "local_driver_name"; /** Creates a new instance of SingletonConstants */ private SingletonConstants() diff --git a/trunk/siprp/companydataloaders/ClinicaAvenidaDataLoader.java b/trunk/siprp/companydataloaders/ClinicaAvenidaDataLoader.java index 4e7e6c1b..474bab7e 100644 --- a/trunk/siprp/companydataloaders/ClinicaAvenidaDataLoader.java +++ b/trunk/siprp/companydataloaders/ClinicaAvenidaDataLoader.java @@ -26,8 +26,7 @@ public class ClinicaAvenidaDataLoader implements CompanyDataLoader { Singleton.setInstance( SingletonConstants.COMPANY_NAME, "Centro Clínico Avenida" ); Singleton.setInstance( SingletonConstants.COMPANY_LOGO, "logo_evo.jpg" ); - Singleton.setInstance( SingletonConstants.WEB_AWARE, Boolean.FALSE ); - Singleton.setInstance( SingletonConstants.DB_NAME, "shst" ); + Singleton.setInstance( SingletonConstants.COMPANY_ACRONYM, "CCA" ); Singleton.setInstance( SingletonConstants.SUBJECT_CONSULTA, "Centro Cl\u00ednico da Avenida - Marca\u00e7\u00e3o de consulta m\u00e9dica" ); Singleton.setInstance( SingletonConstants.LETTER_CONSULTA, "Vimos por este meio informar que %NOME% " + "dever\u00e1 comparecer no Centro Cl\u00ednico da Avenida para a realiza\u00e7\u00e3o da " @@ -62,6 +61,26 @@ public class ClinicaAvenidaDataLoader implements CompanyDataLoader + "Av. General Humberto Delgado 128 – R/C D\n" + "2700-419 Amadora\n" + "Tel.: 214928612" ); + + Singleton.setInstance( SingletonConstants.MODULE_FICHA, Boolean.TRUE ); + Singleton.setInstance( SingletonConstants.MODULE_CLIENTES, Boolean.TRUE ); + Singleton.setInstance( SingletonConstants.WEB_AWARE, Boolean.FALSE ); + Singleton.setInstance( SingletonConstants.MODULE_RELATORIO, Boolean.TRUE ); + Singleton.setInstance( SingletonConstants.MODULE_LISTAGENS, Boolean.FALSE ); + + Singleton.setInstance( SingletonConstants.WEB_USER, "" ); + Singleton.setInstance( SingletonConstants.WEB_PASSWORD, "" ); + Singleton.setInstance( SingletonConstants.WEB_URL_PREFIX, "" ); + Singleton.setInstance( SingletonConstants.WEB_URL, "" ); + Singleton.setInstance( SingletonConstants.WEB_DB_NAME, "" ); + Singleton.setInstance( SingletonConstants.WEB_DRIVER_NAME, "" ); + + Singleton.setInstance( SingletonConstants.LOCAL_USER, "root" ); + Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "UNIXLuvsU" ); + Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); + Singleton.setInstance( SingletonConstants.LOCAL_URL, "localhost" ); + Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "shst" ); + Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "" ); } } diff --git a/trunk/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/siprp/companydataloaders/SIPRPDataLoader.java index c1a7644d..c2a4873d 100644 --- a/trunk/siprp/companydataloaders/SIPRPDataLoader.java +++ b/trunk/siprp/companydataloaders/SIPRPDataLoader.java @@ -26,8 +26,7 @@ public class SIPRPDataLoader implements CompanyDataLoader { Singleton.setInstance( SingletonConstants.COMPANY_NAME, "SIPRP - Sociedade Ib\u00e9rica de Preven\u00e7\u00e3o de Riscos Profissionais" ); Singleton.setInstance( SingletonConstants.COMPANY_LOGO, "logo_combo.jpg" ); - Singleton.setInstance( SingletonConstants.WEB_AWARE, Boolean.TRUE ); - Singleton.setInstance( SingletonConstants.DB_NAME, "siprp" ); + Singleton.setInstance( SingletonConstants.COMPANY_ACRONYM, "SIPRP" ); Singleton.setInstance( SingletonConstants.SUBJECT_CONSULTA, "SIPRP - Marca\u00E7\u00E3o de consulta"); Singleton.setInstance( SingletonConstants.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 " @@ -72,6 +71,26 @@ public class SIPRPDataLoader implements CompanyDataLoader + "(Catarina Leonardo) ou responda ao remetente desta mensagem." + "%0A%0A%0A" + "Cumprimentos,%0A%0ASIPRP" ); + + Singleton.setInstance( SingletonConstants.MODULE_FICHA, Boolean.TRUE ); + Singleton.setInstance( SingletonConstants.MODULE_CLIENTES, Boolean.TRUE ); + Singleton.setInstance( SingletonConstants.WEB_AWARE, Boolean.TRUE ); + Singleton.setInstance( SingletonConstants.MODULE_RELATORIO, Boolean.TRUE ); + Singleton.setInstance( SingletonConstants.MODULE_LISTAGENS, Boolean.TRUE ); + + Singleton.setInstance( SingletonConstants.WEB_USER, "siprp" ); + Singleton.setInstance( SingletonConstants.WEB_PASSWORD, "rg2h-opksiprp" ); + Singleton.setInstance( SingletonConstants.WEB_URL_PREFIX, "jdbc:postgresql://" ); + Singleton.setInstance( SingletonConstants.WEB_URL, "www.evolute.pt:5436" ); + Singleton.setInstance( SingletonConstants.WEB_DB_NAME, "siprp" ); + Singleton.setInstance( SingletonConstants.WEB_DRIVER_NAME, "" ); + + Singleton.setInstance( SingletonConstants.LOCAL_USER, "root" ); + Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "UNIXLuvsU" ); + Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:mysql://" ); + Singleton.setInstance( SingletonConstants.LOCAL_URL, "localhost" ); + Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp" ); + Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "com.mysql.jdbc.Driver" ); } }