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

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

Browse Source
lxbfYeaa
Diogo Neves 15 years ago
parent 9bf2edc644
commit ad78b8bc54
8 changed files with 93 additions and 168 deletions
Show Stats Download Patch File Download Diff File

BIN
trunk/SIPRPSoft/lib/cursos.jar
View File

Binary file not shown.

BIN
trunk/SIPRPSoft/lib/evolute.jar
View File

Binary file not shown.

BIN
trunk/SIPRPSoft/lib/shst.jar
View File

Binary file not shown.

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

@ -22,7 +22,6 @@ import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.MutableTreeNode;
import siprp.clientes.AvisosPanel;
import siprp.companydataloaders.SIPRPDataLoader;
import siprp.companydataloaders.SIPRPPropertiesLoader;
import siprp.initializer.SIPRPLoggerInit;
import siprp.initializer.SIPRPUIInitializer;
@ -82,8 +81,6 @@ public class Main implements com.evolute.utils.ui.window.Connector
SIPRPPropertiesLoader.getInstance().load();
new SIPRPDataLoader().load();
dbase = (String) Singleton.getInstance( SingletonConstants.LOCAL_DB_NAME );
Insert.setDefaultKeyRetriever( JDBCAutoKeyRetriever.DEFAULT );

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

@ -12,11 +12,15 @@ import java.util.Map;
import javax.swing.tree.DefaultMutableTreeNode;
import shst.SHSTPropertiesConstants;
import shst.SHSTTrackerInterface;
import shst.cursos.CursosInit;
import shst.cursos.CursosWindowAdapter;
import shst.higiene.marcacoes.MarcacoesHigieneInterface;
import shst.medicina.MedicinaWindowInterface;
import shst.medicina.multi.MultiMarcacoesWindow;
import siprp.clientes.AvisosPanel;
import siprp.companydataloaders.SIPRPPropertiesLoader;
import siprp.estatistica.EstatisticaWindow;
import siprp.ficha.FichaWindow;
import siprp.higiene.gestao.GestaoRelatorioWindow;
@ -40,8 +44,6 @@ import com.evolute.utils.tracker.TrackableWindow;
import com.evolute.utils.tracker.WindowCreator;
import com.evolute.utils.tracker.WindowTracker;
import com.evolute.utils.ui.window.LoginWindow;
import shst.cursos.CursosInit;
import shst.cursos.CursosWindowAdapter;
/**
*
* @author fpalma
@ -83,8 +85,7 @@ public class SIPRPTracker extends WindowTracker implements SHSTTrackerInterface
boolean hasGestao = ( (Boolean)Singleton.getInstance( SingletonConstants.MODULE_CLIENTES ) ).booleanValue();
boolean hasRelatorio = ( (Boolean)Singleton.getInstance( SingletonConstants.MODULE_RELATORIO ) ).booleanValue();
boolean hasListagens = ( (Boolean)Singleton.getInstance( SingletonConstants.MODULE_LISTAGENS ) ).booleanValue();
// TODO use property !!!!
boolean hasCursos = false;//true; //( (Boolean)Singleton.getInstance( SingletonConstants.MODULE_CURSOS ) ).booleanValue();
boolean hasCursos = SIPRPPropertiesLoader.getInstance().findProperty( SHSTPropertiesConstants.MODULE_CURSOS, true );
if( hasGestao )
{

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

@ -1,159 +0,0 @@
package siprp.companydataloaders;
import siprp.CompanyDataLoader;
import siprp.SingletonConstants;
import com.evolute.properties.EvoPropertyKey;
import com.evolute.utils.Singleton;
/**
*
* @author fpalma
*/
public class SIPRPDataLoader implements CompanyDataLoader
{
/** Creates a new instance of SIPRPDataLoader */
public SIPRPDataLoader()
{
}
public void load()
{
Singleton.setInstance( SingletonConstants.SOFTWARE_NAME, "SIPRPSoft" );
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.COMPANY_ACRONYM, "SIPRP" );
Singleton.setInstance( SingletonConstants.SUBJECT_CONSULTA, "SIPRP - Marca\u00E7\u00E3o de consulta de '" + NOME + "'");
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 "
+ "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 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( SingletonConstants.SUBJECT_EXAMES, "SIPRP - Marca\u00E7\u00E3o de exame de '" + NOME + "'");
Singleton.setInstance( SingletonConstants.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 350 45 40 "
+ "ou respondendo ao remetente desta mensagem."
+ "%0A%0A%0A"
+ "Cumprimentos,%0A%0ASIPRP" );
Singleton.setInstance( SingletonConstants.SUBJECT_VISITA, "SIPRP - Marca\u00E7\u00E3o de visita de higiene e seguran\u00E7a a '" + NOME + "'" );
Singleton.setInstance( SingletonConstants.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 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( SingletonConstants.USES_HOUR, Boolean.FALSE );
Singleton.setInstance( SingletonConstants.CODIGO_EMPRESA_FORMAT, "2 6 / 2" );
Singleton.setInstance( SingletonConstants.FICHA_MARCA_EXAMES, Boolean.TRUE );
Singleton.setInstance( SingletonConstants.EXCEL_FORMAT, new int[]{ 0, 2, 3, 1, -1, 4, 5, 7, 6, -1 } );
Singleton.setInstance( SingletonConstants.EXCEL_FORMAT_DEMISSAO, new int[]{ 0, 1 } );
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, "org.postgresql.Driver" );
Singleton.setInstance( SingletonConstants.LOCAL_USER, Singleton.getInstance( EvoPropertyKey.DB.USER ) );
Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, Singleton.getInstance( EvoPropertyKey.DB.PASSWORD ) );
Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, Singleton.getInstance( EvoPropertyKey.DB.CONNECTION.PREFIX ) );
Singleton.setInstance( SingletonConstants.LOCAL_URL,
Singleton.getInstance( EvoPropertyKey.DB.CONNECTION.HOSTNAME ) + ":" + Singleton.getInstance( EvoPropertyKey.DB.CONNECTION.PORT )
);
Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, Singleton.getInstance( EvoPropertyKey.DB.NAME ) );
Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, Singleton.getInstance( EvoPropertyKey.DB.CONNECTION.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, "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" );
// 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" );
// 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" );
// 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" );
// Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
// Singleton.setInstance( SingletonConstants.LOCAL_URL, "storage: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_PASSWORD, "Typein" );
// Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
// Singleton.setInstance( SingletonConstants.LOCAL_URL, "ws-fpalma.redeapdp: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, "192.168.1.1:5432" );
// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
}
}

85
trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPPropertiesLoader.java
Unescape View File

@ -1,13 +1,21 @@
package siprp.companydataloaders;
import siprp.SingletonConstants;
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;
public static final String DATA = "XDATAX";
public static final String NOME = "XNOMEX";
public static final String MORADA = "XMORADAX";
public static final String HORA = "XHORAX";
private SIPRPPropertiesLoader()
{
this(null,null,null,null);
@ -34,5 +42,80 @@ public class SIPRPPropertiesLoader extends EvoAbstractPropertiesLoader
@Override
protected void postLoad() throws PropertiesException
{
Singleton.setInstance( SingletonConstants.SOFTWARE_NAME, "SIPRPSoft" );
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.COMPANY_ACRONYM, "SIPRP" );
Singleton.setInstance( SingletonConstants.SUBJECT_CONSULTA, "SIPRP - Marca\u00E7\u00E3o de consulta de '" + NOME + "'");
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 "
+ "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 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( SingletonConstants.SUBJECT_EXAMES, "SIPRP - Marca\u00E7\u00E3o de exame de '" + NOME + "'");
Singleton.setInstance( SingletonConstants.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 350 45 40 "
+ "ou respondendo ao remetente desta mensagem."
+ "%0A%0A%0A"
+ "Cumprimentos,%0A%0ASIPRP" );
Singleton.setInstance( SingletonConstants.SUBJECT_VISITA, "SIPRP - Marca\u00E7\u00E3o de visita de higiene e seguran\u00E7a a '" + NOME + "'" );
Singleton.setInstance( SingletonConstants.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 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( SingletonConstants.USES_HOUR, Boolean.FALSE );
Singleton.setInstance( SingletonConstants.CODIGO_EMPRESA_FORMAT, "2 6 / 2" );
Singleton.setInstance( SingletonConstants.FICHA_MARCA_EXAMES, Boolean.TRUE );
Singleton.setInstance( SingletonConstants.EXCEL_FORMAT, new int[]{ 0, 2, 3, 1, -1, 4, 5, 7, 6, -1 } );
Singleton.setInstance( SingletonConstants.EXCEL_FORMAT_DEMISSAO, new int[]{ 0, 1 } );
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, "org.postgresql.Driver" );
Singleton.setInstance( SingletonConstants.LOCAL_USER, Singleton.getInstance( EvoPropertyKey.DB.USER ) );
Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, Singleton.getInstance( EvoPropertyKey.DB.PASSWORD ) );
Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, Singleton.getInstance( EvoPropertyKey.DB.CONNECTION.PREFIX ) );
Singleton.setInstance( SingletonConstants.LOCAL_URL,
Singleton.getInstance( EvoPropertyKey.DB.CONNECTION.HOSTNAME ) + ":" + Singleton.getInstance( EvoPropertyKey.DB.CONNECTION.PORT )
);
Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, Singleton.getInstance( EvoPropertyKey.DB.NAME ) );
Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, Singleton.getInstance( EvoPropertyKey.DB.CONNECTION.DRIVER_NAME ) );
}
}

5
trunk/SIPRPSoft/src/siprp/update/UpdateList.java
Unescape View File

@ -9,6 +9,8 @@
package siprp.update;
import shst.update.updates.SHSTUpdate11;
import shst.update.updates.SHSTUpdate12;
import shst.update.updates.SHSTUpdate8;
import shst.update.updates.SHSTUpdate9;
import siprp.update.updates.V10_0_To_V10_1;
@ -130,7 +132,8 @@ public class UpdateList
new V13_7_To_V13_8(),
new SHSTUpdate8( 13.8, 13.9 ),
new SHSTUpdate9( 13.9, 14.1 ),
new V14_1_To_V14_2(), new V14_2_To_V14_3()
new V14_1_To_V14_2(), new V14_2_To_V14_3(),
new SHSTUpdate11( 14.3, 14.4 ), new SHSTUpdate12( 14.4, 14.5 ),
};
//
// protected static Executer EXECUTER;

Write Preview
Loading…
Cancel
Save