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

0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Diogo Neves 16 years ago
parent 6d8c9df149
commit 7beb1d5742

@ -35,5 +35,6 @@
<classpathentry kind="lib" path="lib/swingx.jar"/>
<classpathentry kind="lib" path="lib/postgresql-8.4-701.jdbc4.jar"/>
<classpathentry kind="lib" path="lib/evologger.jar"/>
<classpathentry kind="lib" path="lib/shst.jar"/>
<classpathentry kind="output" path="build"/>
</classpath>

@ -1,4 +1,4 @@
<project name="evo-app-build-common" >
<project name="evo-app-build-common" basedir="../../">
<import file="evo-app-compile-common.xml" />

@ -1,5 +1,7 @@
<project name="evo-app-build-obfuscate-common">
<project name="evo-app-build-obfuscate-common" basedir="../../">
<path id="lib.tools.classpath"/>
<target name="obfuscate">
<taskdef resource="proguard/ant/task.properties" classpath="${app.dir}/lib.tools/proguard.jar" />
@ -47,7 +49,7 @@
<fileset dir="${app.lib.dir}" includes="*.jar"/>
</classpath>
</classloader>
<taskdef name="proguardtask" classpathref="lib.tools.classpath" classname="com.evolute.ant.ProguardTask" />
<taskdef name="proguardtask" classpathref="lib.tools.classpath" classname="com.evolute.ant.ProguardTask" onerror="ignore" />
<proguardtask filePath="${app.dir}/${app.name}.map" version="${version.major}.${version.minor}.${version.build}" fileName="${app.name}.map" projectName="${app.name}" />
</target>

@ -1,4 +1,4 @@
<project name="evo-app-compile-common" >
<project name="evo-app-compile-common" basedir="../../">
<import file="evo-app-load-properties.xml" />

@ -1,5 +1,5 @@
<project name="evo-app-deploy-common" >
<project name="evo-app-deploy-common" basedir="../../">
<!-- PROPERTIES -->
<property name="properties.key.name" value="name" />
<property name="properties.key.major" value="major" />
@ -22,7 +22,7 @@
<fileset dir="${lib.tools.dir}" includes="*.jar"/>
</classpath>
</classloader>
<taskdef name="generate-jnlp" classpathref="lib.tools.classpath" classname="com.evolute.ant.JNLPGeneratorTask" />
<taskdef name="generate-jnlp" classpathref="lib.tools.classpath" classname="com.evolute.ant.JNLPGeneratorTask" onerror="ignore"/>
<generate-jnlp propertiesDir="${properties.dir}" basedir="${app.dir}" />
</target>
@ -141,8 +141,41 @@
<fileset dir="${app.lib.dir}" includes="*.jar"/>
</classpath>
</classloader>
<taskdef name="createTask" classpathref="lib.tools.classpath" classname="com.evolute.ant.CreateSoftwareAntTask" />
<taskdef name="createTask" classpathref="lib.tools.classpath" classname="com.evolute.ant.CreateSoftwareAntTask" onerror="ignore"/>
<createTask projectVersion="${version.major}.${version.minor}.${version.build}" projectName="${app.name}" />
</target>
<!-- DOCUMENTATION -->
<target name="docs-generate-upload" description="Generates and uploads the project documentation" depends="load-properties,docs-generate,docs-upload"/>
<target name="docs-generate">
<mkdir dir="${docs.api.dir}"/>
<javadoc verbose="true" classpath="lib.docs.classpath" destdir="${docs.api.dir}" docencoding="UTF-8" doctitle="${app.name}" sourcepath="${app.src.dir}" />
</target>
<target name="docs-upload">
<input message="" addproperty="deploy.user">
<handler classpathref="lib.tools.classpath" classname="com.evolute.ant.UserInputHandler" />
</input>
<input message="password:>" addproperty="deploy.password">
<handler classpathref="lib.tools.classpath" classname="com.evolute.ant.PasswordInputHandler" />
</input>
<typedef classpathref="lib.tools.classpath" resource="net/jtools/classloadertask/antlib.xml">
<classpath>
<path refid="lib.tools.classpath"/>
</classpath>
</typedef>
<classloader loader="project">
<classpath>
<fileset dir="${lib.tools.dir}" includes="*.jar"/>
</classpath>
</classloader>
<sshexec trust="yes" host="${app.deploy.docs.server}" username="${deploy.user}" command="sh ${app.docs.prepare.script} ${app.name}" password="${deploy.password}" />
<scp verbose="yes" todir="${deploy.user}@${app.deploy.docs.server}:${app.deploy.docs.path}" password="${deploy.password}" sftp="true" trust="true" >
<fileset dir="${docs.dir}"/>
</scp>
</target>
</project>

@ -1,4 +1,4 @@
<project name="evo-app-load-properties" >
<project name="evo-app-load-properties" basedir="../../">
<property name="properties.base.dir" value="${basedir}/properties" />
<property name="lib.tools.dir" value="${basedir}/lib.tools" />
@ -10,6 +10,8 @@
<property name="evolute.lib.tools.dir" value="${evolute.dir}/lib.tools" />
<property name="evolute.ant.dir" value="${evolute.dir}/ant" />
<property name="evolute.jar.name" value="evolute.jar" />
<property name="docs.dir" value="${app.dir}/docs" />
<property name="docs.api.dir" value="${docs.dir}/api" />
<property name="app.src.dir" value="${app.dir}/src" />
<property name="app.lib.dir" value="${app.dir}/lib" />
<property name="app.dist.dir" value="${app.dir}/dist" />
@ -36,6 +38,11 @@
<fileset dir="${lib.tools.dir}" />
</path>
<path id="lib.docs.classpath">
<path refid="lib.tools.classpath" />
<path refid="app.jar.classpath" />
</path>
<typedef resource="org/tigris/subversion/svnant/svnantlib.xml" classpathref="lib.tools.classpath" />
</target>
@ -47,7 +54,7 @@
<antcall target="load-static-properties"/>
</target>
<target name="load-properties" depends="load-properties-file,load-static-properties">
<target name="load-properties" depends="load-static-properties,load-properties-file">
<property name="app.name" value="${app.appName}" />
<property name="app.main" value="${app.main-class}" />
@ -62,6 +69,10 @@
<property name="app.deploy.production.script" value="/home/software/auto_deploy.sh ${app.name}" />
<property name="app.deploy.test.script" value="/home/software/auto_test_deploy.sh ${app.name}" />
<property name="deploy.prepare.script" value="/home/software/auto_prepare_deploy.sh ${app.name}" />
<property name="app.deploy.docs.server" value="${app.deploy.server}" />
<property name="app.deploy.docs.path" value="/home/software/public_html/docs/${app.name}" />
<property name="app.docs.prepare.script" value="/home/software/auto_prepare_docs_upload.sh" />
<property name="app.version.file" value="${properties.base.dir}/version.properties" />
<property name="app.version.comment" value="${app.name} versioning file" />
<property name="app.run.args" value="" />

@ -1,4 +1,4 @@
<project name="evo-app-multiple-client-common" >
<project name="evo-app-multiple-client-common" basedir="../../">
<target name="load-properties-file" >
<input defaultvalue="${properties.base.dir}" addproperty="properties.dir">

@ -1,4 +1,4 @@
<project name="evo-app-build-5" >
<project name="evo-app-build-5" basedir="../">
<import file="common/evo-app-load-properties.xml" />
<import file="common/evo-app-deploy-common.xml" />

@ -1,4 +1,4 @@
<project name="evo-app-build-jdo" >
<project name="evo-app-build-jdo" basedir="../">
<import file="common/evo-app-compile-common.xml" />
<import file="common/evo-app-deploy-common.xml" />

@ -1,4 +1,4 @@
<project name="evo-app-build-obfuscate-jdo">
<project name="evo-app-build-obfuscate-jdo" basedir="../">
<import file="common/evo-app-compile-common.xml" />
<import file="common/evo-app-deploy-common.xml" />

@ -1,4 +1,4 @@
<project name="evo-app-build-obfuscate">
<project name="evo-app-build-obfuscate" basedir="../">
<import file="common/evo-app-build-common.xml" />
<import file="common/evo-app-build-obfuscate-common.xml" />

@ -1,4 +1,4 @@
<project name="evo-app-build" >
<project name="evo-app-build" basedir="../">
<import file="common/evo-app-build-common.xml" />
<import file="common/evo-app-deploy-common.xml" />

@ -1,4 +1,4 @@
<project name="evo-app-multiple-client-build" >
<project name="evo-app-multiple-client-build" basedir="../">
<import file="common/evo-app-multiple-client-common.xml" />
<import file="common/evo-app-build-common.xml" />

@ -1,4 +1,4 @@
<project name="evo-app-multiple-client-build" >
<project name="evo-app-multiple-client-build" basedir="../">
<import file="common/evo-app-multiple-client-common.xml" />
<import file="evo-app-build-obfuscate.xml" />

@ -1,4 +1,5 @@
<project name="evo-app-ws-client-build" >
<project name="evo-app-ws-client-build" basedir="../">
<import file="common/evo-app-build-common.xml" />
@ -8,7 +9,7 @@
</path>
<target name="receitas-gen-client" depends="app-build" description="generates client">
<taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">
<taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport" onerror="ignore">
<classpath refid="lib.tools.classpath" />
</taskdef>
<java fork="false" classname="com.evolute.ssl.InstallCert" classpathref="app.build.classpath">

@ -1,4 +1,4 @@
<project name="evo-library-build" default="library-deploy">
<project name="evo-library-build" default="library-deploy" basedir="../">
<import file="common/evo-app-build-common.xml" />

@ -1,4 +1,4 @@
<project name="evo-tool-build" default="tool-deploy">
<project name="evo-tool-build" default="tool-deploy" basedir="../">
<import file="common/evo-app-build-common.xml" />

@ -1,5 +1,5 @@
<project name="SIPRPSoft" basedir="." default="app-run">
<import file="ant/evo-app-build.xml" />
<import file="ant/evo-app-multiple-client-build.xml" />
</project>

Binary file not shown.

Binary file not shown.

@ -0,0 +1,75 @@
#APP level
app.appName = SIPRPSoft
app.main-class = siprp.Main
app.main = siprp.Main
db.url.prefix = jdbc:postgresql://
db.user = postgres
db.password = Typein
#rg2h-opksiprp
db.name = siprp_local_3
db.connection.driver = org.postgresql.Driver
jnlp.resources.property.server.address = evoserver
jnlp.resources.property.server.port = 5432
#app.max.mem=512M
#app.run.args=test 1 2 3
#app.resources.j2se.version = 1.0+
#app.resources.j2se.initial-heap-size = 4m
#app.resources.j2se.max-heap-size = 8m
#app.ws.dest.package=com.evolute.test-project.stubs
#app.ws.wsdl.url=https://www.evolute.pt/test-project/test-endpoint?wsdl
#app.ws.wsdl.url.protocol=https
#app.ws.wsdl.url.host=www.evolute.pt
#app.ws.wsdl.url.port=443
#app.ws.wsdl.url.path=/test-project/test-endpoint?wsdl
#app.ssl.truststore.file=jssecacerts
#app.ssl.truststore.pass=changeit
#JNLP level
#jnlp.app.appName = test-project
#jnlp.information.title = jnlp-Test Project
#jnlp.resources.j2se.version = 1.1+
#jnlp.test.url=http://www.evolute.pt/~software/test-project
#JNLP + PRODUCTION level
#jnlp.production.app.main-class = !com.evolute.test-project.TestProject2
#jnlp.production.app.appName = test-project
#jnlp.production.url=http://www.evolute.pt/~software/test-project
#jnlp.production.information.title = prod-Test Project
#jnlp.production.information.vendor = prod-Evolute Lda
#jnlp.production.information.description = prod-Tester Project for JNLP Generator
#jnlp.production.information.description.short = prod-JNLP Tester
#jnlp.production.information.icon = prod-logo.png
#jnlp.production.resources.j2se.version = 1.6.0+
#jnlp.production.resources.j2se.initial-heap-size = 64m
#jnlp.production.resources.j2se.max-heap-size = 512m
#jnlp.production.resources.property.jnlp.packEnabled = true
#jnlp.production.resources.property.apple.laf.useScreenMenuBar = true
#jnlp.production.resources.property.swing.defaultlaf = org.jvnet.substance.skin.SubstanceRavenGraphiteGlassLookAndFeel
#jnlp.production.resources.property.evolute.ui.overridePaint = false
#JNLP + TEST level
#jnlp.test.app.main-class = com.evolute.test-project.TestProject3
#jnlp.test.app.appName = project-test
#jnlp.test.url=http://www.evolute.pt/~software/versoes_teste/test-project
#jnlp.test.information.title = test-Test Project
#jnlp.test.information.vendor = test-Evolute Lda
#jnlp.test.information.description = test-Tester Project for JNLP Generator
#jnlp.test.information.description.short = test-JNLP Tester
#jnlp.test.information.icon = test-logo.png
#jnlp.test.resources.j2se.version = 1.6.0+
#jnlp.test.resources.j2se.initial-heap-size = 64m
#jnlp.test.resources.j2se.max-heap-size = 512m

@ -0,0 +1,74 @@
#APP level
app.appName = SIPRPSoft
app.main-class = siprp.Main
app.main = siprp.Main
db.url.prefix = jdbc:postgresql://
db.user = siprp
db.password = rg2h-opksiprp
db.name = siprp_local_3
db.connection.driver = org.postgresql.Driver
jnlp.resources.property.server.address = www.evolute.pt
jnlp.resources.property.server.port = 5436
#app.max.mem=512M
#app.run.args=test 1 2 3
#app.resources.j2se.version = 1.0+
#app.resources.j2se.initial-heap-size = 4m
#app.resources.j2se.max-heap-size = 8m
#app.ws.dest.package=com.evolute.test-project.stubs
#app.ws.wsdl.url=https://www.evolute.pt/test-project/test-endpoint?wsdl
#app.ws.wsdl.url.protocol=https
#app.ws.wsdl.url.host=www.evolute.pt
#app.ws.wsdl.url.port=443
#app.ws.wsdl.url.path=/test-project/test-endpoint?wsdl
#app.ssl.truststore.file=jssecacerts
#app.ssl.truststore.pass=changeit
#JNLP level
#jnlp.app.appName = test-project
#jnlp.information.title = jnlp-Test Project
#jnlp.resources.j2se.version = 1.1+
#jnlp.test.url=http://www.evolute.pt/~software/test-project
#JNLP + PRODUCTION level
#jnlp.production.app.main-class = !com.evolute.test-project.TestProject2
#jnlp.production.app.appName = test-project
#jnlp.production.url=http://www.evolute.pt/~software/test-project
#jnlp.production.information.title = prod-Test Project
#jnlp.production.information.vendor = prod-Evolute Lda
#jnlp.production.information.description = prod-Tester Project for JNLP Generator
#jnlp.production.information.description.short = prod-JNLP Tester
#jnlp.production.information.icon = prod-logo.png
#jnlp.production.resources.j2se.version = 1.6.0+
#jnlp.production.resources.j2se.initial-heap-size = 64m
#jnlp.production.resources.j2se.max-heap-size = 512m
#jnlp.production.resources.property.jnlp.packEnabled = true
#jnlp.production.resources.property.apple.laf.useScreenMenuBar = true
#jnlp.production.resources.property.swing.defaultlaf = org.jvnet.substance.skin.SubstanceRavenGraphiteGlassLookAndFeel
#jnlp.production.resources.property.evolute.ui.overridePaint = false
#JNLP + TEST level
#jnlp.test.app.main-class = com.evolute.test-project.TestProject3
#jnlp.test.app.appName = project-test
#jnlp.test.url=http://www.evolute.pt/~software/versoes_teste/test-project
#jnlp.test.information.title = test-Test Project
#jnlp.test.information.vendor = test-Evolute Lda
#jnlp.test.information.description = test-Tester Project for JNLP Generator
#jnlp.test.information.description.short = test-JNLP Tester
#jnlp.test.information.icon = test-logo.png
#jnlp.test.resources.j2se.version = 1.6.0+
#jnlp.test.resources.j2se.initial-heap-size = 64m
#jnlp.test.resources.j2se.max-heap-size = 512m

@ -2,6 +2,16 @@
app.appName = SIPRPSoft
app.main-class = siprp.Main
app.main = siprp.Main
db.url.prefix = jdbc:postgresql://
db.user = postgres
db.password = Typein
db.name = siprp_local
db.connection.driver = org.postgresql.Driver
jnlp.resources.property.server.address = 10.158.2.2:5432
jnlp.resources.property.server.port = 5432
#app.max.mem=512M
#app.run.args=test 1 2 3

@ -31,10 +31,13 @@ import org.apache.cayenne.map.DataMap;
import siprp.clientes.AvisosPanel;
import siprp.companydataloaders.SIPRPDataLoader;
import siprp.companydataloaders.SIPRPPropertiesLoader;
import siprp.lembretes.LembretesDemon;
import siprp.update.UpdateList;
import com.evolute.module.updater.Updater;
import com.evolute.properties.EvoDefaultPropertiesLoader;
import com.evolute.properties.PropertiesException;
import com.evolute.utils.Singleton;
import com.evolute.utils.db.DBException;
import com.evolute.utils.db.DBManager;
@ -83,6 +86,8 @@ public class Main implements com.evolute.utils.ui.window.Connector
UIManager.put( "FormattedTextField.inactiveForeground", ColorUIResource.BLACK );
UIManager.put( "FormattedTextField.foreground", ColorUIResource.RED.darker() );
SIPRPPropertiesLoader.getInstance().load();
// Singleton.setInstance( SingletonConstants.COMPANY_NAME, "Centro Cl\u00ednico Avenida" );
// Singleton.setInstance( SingletonConstants.COMPANY_LOGO, "logo_evo.jpg" );
// Singleton.setInstance( SingletonConstants.WEB_AWARE, Boolean.FALSE );

@ -6,8 +6,6 @@
package siprp;
import org.apache.log4j.Level;
import com.evolute.utils.Singleton;
import com.evolute.utils.db.DBManager;
import com.evolute.utils.db.Executer;
@ -118,17 +116,19 @@ public class SHSTLogger implements Logger
}
@Override
public void log(String arg0, Level arg1)
{
public void close() {
}
@Override
public void logException(Throwable arg0, Level arg1)
{
public void log(String str, java.util.logging.Level level) {
// TODO Auto-generated method stub
}
@Override
public void close() {
public void logException(Throwable ex, java.util.logging.Level level) {
// TODO Auto-generated method stub
}

@ -10,6 +10,9 @@ import java.util.Hashtable;
import javax.swing.tree.DefaultMutableTreeNode;
import shst.MedicinaTrackerInterface;
import shst.medicina.MedicinaWindowInterface;
import shst.medicina.multi.MultiMarcacoesWindow;
import siprp.clientes.AvisosPanel;
import siprp.clientes.ClientesWindow;
import siprp.estatistica.EstatisticaWindow;
@ -37,13 +40,14 @@ import com.evolute.utils.tracker.WindowTracker;
*
* @author fpalma
*/
public class SIPRPTracker extends WindowTracker
public class SIPRPTracker extends WindowTracker implements MedicinaTrackerInterface
{
public static final String FICHA_APTIDAO = "Ficha de Aptid\u00e3o";
public static final String CRIACAO_FICHA_APTIDAO = "Cria\u00e7\u00e3o de Fichas de Aptid\u00e3o";
public static final String GESTAO_CLIENTES = "Gest\u00e3o de Clientes";
public static final String MEDICINA = "Medicina";
public static final String MEDICINA_MARCACOES = "Marca\u00e7\u00f5es";
public static final String MEDICINA_MULTI_MARCACOES = MultiMarcacoesWindow.TITLE;
public static final String MEDICINA_LOCAIS = "Locais de Realiza\u00e7\u00e3o";
public static final String MEDICINA_ENVIO_ANALISES= EnviarAnalisesWindow.TITLE;
public static final String MEDICINA_PRESENCAS = "Presen\u00e7as";
@ -53,7 +57,8 @@ public class SIPRPTracker extends WindowTracker
private final AvisosPanel avisos;
private ClientesWindow clientesWindow;
private MedicinaWindow medicinaWindow;
private MedicinaWindowInterface medicinaWindow;
private MultiMarcacoesWindow multiMarcacoesWindow;
private MedicinaProcessoWindow medicinaProcessoWindow;
private MarcacoesHigieneWindow higieneWindow;
@ -166,6 +171,15 @@ public class SIPRPTracker extends WindowTracker
}
} );
medicinaNode.add( new DefaultMutableTreeNode( MEDICINA_MULTI_MARCACOES ) );
creators.put( MEDICINA_MULTI_MARCACOES, new WindowCreator() {
public TrackableWindow create()
throws Exception
{
return getMultiMarcacoesWindow();
}
});
medicinaNode.add( new DefaultMutableTreeNode( MEDICINA_LOCAIS ) );
creators.put( MEDICINA_LOCAIS, new WindowCreator() {
public TrackableWindow create()
@ -288,7 +302,7 @@ public class SIPRPTracker extends WindowTracker
return clientesWindow;
}
public MedicinaWindow getMedicinaWindow() throws Exception
public MedicinaWindowInterface getMedicinaWindow() throws Exception
{
if( medicinaWindow == null )
{
@ -298,6 +312,16 @@ public class SIPRPTracker extends WindowTracker
return medicinaWindow;
}
public MultiMarcacoesWindow getMultiMarcacoesWindow() throws Exception
{
if( multiMarcacoesWindow == null )
{
multiMarcacoesWindow = new MultiMarcacoesWindow();
multiMarcacoesWindow.setTracker( SIPRPTracker.this );
}
return multiMarcacoesWindow;
}
public MedicinaProcessoWindow getMedicinaProcessoWindow()
{
if( medicinaProcessoWindow == null )

@ -3,6 +3,7 @@ package siprp.companydataloaders;
import siprp.CompanyDataLoader;
import siprp.SingletonConstants;
import com.evolute.properties.EvoPropertyKey;
import com.evolute.utils.Singleton;
/**
@ -86,12 +87,16 @@ public class SIPRPDataLoader implements CompanyDataLoader
Singleton.setInstance( SingletonConstants.WEB_DB_NAME, "siprp" );
Singleton.setInstance( SingletonConstants.WEB_DRIVER_NAME, "org.postgresql.Driver" );
Singleton.setInstance( SingletonConstants.LOCAL_USER, "siprp" );
Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "rg2h-opksiprp" );
Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
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, 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" );

@ -0,0 +1,38 @@
package siprp.companydataloaders;
import com.evolute.properties.EvoAbstractPropertiesLoader;
import com.evolute.properties.PropertiesException;
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
{
}
}

@ -27,10 +27,12 @@ import javax.swing.JPanel;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import shst.MedicinaTrackerInterface;
import shst.medicina.MedicinaWindowInterface;
import siprp.CompanyDataLoader;
import siprp.FichaDataProvider;
import siprp.SIPRPTracker;
import siprp.SingletonConstants;
import siprp.clientes.AvisosPanel;
import siprp.data.AvisoConstants;
import siprp.data.Marcacao;
import siprp.data.outer.ContactosData;
@ -52,7 +54,7 @@ import com.evolute.utils.ui.window.TabbedWindow;
* @author fpalma
*/
public class MedicinaWindow extends TabbedWindow
implements ActionListener, ListSelectionListener
implements ActionListener, ListSelectionListener, MedicinaWindowInterface
{
private static int iPermissionArray[][] =
new int[][]{ {},
@ -75,7 +77,7 @@ public class MedicinaWindow extends TabbedWindow
protected MedicinaDataProvider provider;
protected FichaDataProvider fichaProvider;
protected ProviderInterface JDO;
protected SIPRPTracker tracker;
protected MedicinaTrackerInterface tracker;
protected MedicinaUpperPanel upperPanel;
protected MarcacaoConsultaPanel marcacaoConsultaPanel;
@ -403,7 +405,7 @@ public class MedicinaWindow extends TabbedWindow
}
if( tracker != null )
{
tracker.getAvisosPanel().setEnabled( (!estado[ 0 ]) && (!estado[1]),
(( AvisosPanel )tracker.getAvisosPanel()).setEnabled( (!estado[ 0 ]) && (!estado[1]),
AvisoConstants.TIPO_TRABALHADOR );
}
}
@ -696,8 +698,9 @@ public class MedicinaWindow extends TabbedWindow
}
}
public void setTracker( SIPRPTracker tracker )
public void setTracker( MedicinaTrackerInterface tracker )
{
this.tracker = tracker;
}
}

@ -32,6 +32,10 @@ import siprp.update.updates.V11_9_To_V12_0;
import siprp.update.updates.V12_0_To_V12_1;
import siprp.update.updates.V12_1_To_V12_2;
import siprp.update.updates.V12_2_To_V12_3;
import siprp.update.updates.V12_3_To_V12_4;
import siprp.update.updates.V12_4_To_V12_5;
import siprp.update.updates.V12_5_To_V12_6;
import siprp.update.updates.V12_6_To_V12_7;
import siprp.update.updates.V6_1_To_V7_0;
import siprp.update.updates.V7_0_To_V7_2;
import siprp.update.updates.V7_2_To_V7_4;
@ -98,7 +102,9 @@ public class UpdateList
new V11_5_To_V11_6(), new V11_6_To_V11_7(),
new V11_7_To_V11_8(), new V11_8_To_V11_9(),
new V11_9_To_V12_0(), new V12_0_To_V12_1(),
new V12_1_To_V12_2(),new V12_2_To_V12_3()
new V12_1_To_V12_2(), new V12_2_To_V12_3(),
new V12_3_To_V12_4(), new V12_4_To_V12_5(),
new V12_5_To_V12_6(), new V12_6_To_V12_7()
};
//
// protected static Executer EXECUTER;

@ -0,0 +1,36 @@
package siprp.update.updates;
import com.evolute.module.updater.AbstractUpdate;
import com.evolute.utils.sql.Update;
public class V12_3_To_V12_4 extends AbstractUpdate
{
public V12_3_To_V12_4( )
{
super( 12.3, 12.4, "Adicionar campos em algumas tabelas." );
}
@Override
public void doUpdate() throws Exception
{
Update update = new Update(
"ALTER TABLE trabalhadores ADD COLUMN nif CHARACTER VARYING( 255 );" +
"ALTER TABLE trabalhadores ADD COLUMN numero_utente CHARACTER VARYING( 255 );"
);
executeQuery( update );
update = new Update(
"ALTER TABLE marcacoes_trabalhador ADD COLUMN medico_id INTEGER;" +
"ALTER TABLE marcacoes_trabalhador ADD COLUMN inserted_stamp TIMESTAMP WITHOUT TIME ZONE DEFAULT now();"
);
executeQuery( update );
update = new Update(
"ALTER TABLE empresas ADD COLUMN codigo_relatorio_unico CHARACTER VARYING( 64 );"
);
executeQuery( update );
}
}

@ -0,0 +1,57 @@
package siprp.update.updates;
import com.evolute.module.updater.AbstractUpdate;
import com.evolute.utils.db.PSQLSequenceUtils;
import com.evolute.utils.sql.Update;
public class V12_4_To_V12_5 extends AbstractUpdate
{
public V12_4_To_V12_5()
{
super( 12.4, 12.5, "A adicionar novos pagamentos por empresa" );
}
@Override
public void doUpdate() throws Exception
{
Update update = new Update(
"begin; " +
"create table empresa_preco_periodicidade_tipo( " +
" id serial primary key, " +
" nome varchar(64) not null " +
"); " +
"insert into empresa_preco_periodicidade_tipo(id,nome) values(1,'Anual'); " +
"insert into empresa_preco_periodicidade_tipo(id,nome) values(2,'Semestral'); " +
"insert into empresa_preco_periodicidade_tipo(id,nome) values(3,'Trimestral'); " +
"insert into empresa_preco_periodicidade_tipo(id,nome) values(4,'Mensal'); " +
"insert into empresa_preco_periodicidade_tipo(id,nome) values(5,'Pontual'); " +
"create table empresa_preco_servico_tipo( " +
" id serial primary key, " +
" nome varchar(64) not null " +
"); " +
"insert into empresa_preco_servico_tipo(id,nome) values(1,'Medicina'); " +
"insert into empresa_preco_servico_tipo(id,nome) values(2,'Higiene e Seguran\\\\u00e7a'); " +
"insert into empresa_preco_servico_tipo(id,nome) values(3,'Forma\\\\u00e7\\\\u00e3o'); " +
"insert into empresa_preco_servico_tipo(id,nome) values(4,'Planos de Emergencia'); " +
"insert into empresa_preco_servico_tipo(id,nome) values(5,'Avalia\\\\u00e7\\\\u00f5es de Risco'); " +
"insert into empresa_preco_servico_tipo(id,nome) values(6,'Avalia\\\\u00e7\\\\u00f5es de Qualidade de Ar'); " +
"insert into empresa_preco_servico_tipo(id,nome) values(7,'Ru\\\\u00eddo Laboral'); " +
"insert into empresa_preco_servico_tipo(id,nome) values(8,'Outro'); " +
"create table empresa_preco_servico( " +
" id serial primary key, " +
" empresa_preco_servico_tipo_id int4 not null references empresa_preco_servico_tipo(id), " +
" empresa_preco_periodicidade_tipo_id int4 references empresa_preco_periodicidade_tipo(id), " +
" tipo_outro varchar(64), " +
" empresa_id int4 not null references empresas(id), " +
" valor double precision, " +
" iniciado timestamp, " +
" activo boolean not null " +
"); " +
"commit; " );
getExecuter().executeQuery( update );
PSQLSequenceUtils.fixSequence("empresa_preco_periodicidade_tipo", "id");
PSQLSequenceUtils.fixSequence("empresa_preco_servico_tipo", "id");
}
}

@ -0,0 +1,23 @@
package siprp.update.updates;
import com.evolute.module.updater.AbstractUpdate;
import com.evolute.utils.sql.Update;
public class V12_5_To_V12_6 extends AbstractUpdate
{
public V12_5_To_V12_6()
{
super( 12.5, 12.6, "Adicionar campos em algumas tabelas." );
}
@Override
public void doUpdate() throws Exception
{
Update update = new Update(
"ALTER TABLE exames ADD COLUMN impresso_stamp timestamp without time zone;"
);
executeQuery( update );
}
}

@ -0,0 +1,22 @@
package siprp.update.updates;
import com.evolute.module.updater.AbstractUpdate;
import com.evolute.sql.CreateFunctionPlainUpdate;
public class V12_6_To_V12_7 extends AbstractUpdate
{
public V12_6_To_V12_7()
{
super( 12.6, 12.7, "Adicionar funcao plain()." );
}
@Override
public void doUpdate() throws Exception
{
CreateFunctionPlainUpdate update = new CreateFunctionPlainUpdate( 12.6, 12.7 );
update.doUpdate();
}
}
Loading…
Cancel
Save