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@1294 bb69d46d-e84e-40c8-a05a-06db0d633741

Browse Source
lxbfYeaa
Tiago Simão 16 years ago
parent f1dee98c04
commit d2332cb506
19 changed files with 508 additions and 272 deletions
Show Stats Download Patch File Download Diff File

25
trunk/SIPRPSoft/jnlp/extensions/production/PDFRenderer.jnlp
Unescape View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/siprpsoft" href="siprpsoft.jnlp">
<information>
<title>SIPRPSoft</title>
<vendor>Evolute Lda</vendor>
<homepage href="http://www.evolute.pt/~software/siprpsoft" />
<description>Software de Gestão de Higiene e Segurança no Trabalho</description>
<description kind="short">SIPRPSoft</description>
<icon href="logo/icon.png" />
<offline-allowed />
<shortcut online="true">
<desktop />
</shortcut>
</information>
<security>
<all-permissions />
</security>
<update check="timeout" policy="always" />
<resources>
<j2se version="1.6.0+" />
<jar href="lib/PDFRenderer.jar" />
</resources>
<component-desc />
</jnlp>

25
trunk/SIPRPSoft/jnlp/extensions/production/iText-2.0.7.jnlp
Unescape View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/siprpsoft" href="siprpsoft.jnlp">
<information>
<title>SIPRPSoft</title>
<vendor>Evolute Lda</vendor>
<homepage href="http://www.evolute.pt/~software/siprpsoft" />
<description>Software de Gestão de Higiene e Segurança no Trabalho</description>
<description kind="short">SIPRPSoft</description>
<icon href="logo/icon.png" />
<offline-allowed />
<shortcut online="true">
<desktop />
</shortcut>
</information>
<security>
<all-permissions />
</security>
<update check="timeout" policy="always" />
<resources>
<j2se version="1.6.0+" />
<jar href="lib/iText-2.0.7.jar" />
</resources>
<component-desc />
</jnlp>

25
trunk/SIPRPSoft/jnlp/extensions/production/mail.jnlp
Unescape View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/siprpsoft" href="siprpsoft.jnlp">
<information>
<title>SIPRPSoft</title>
<vendor>Evolute Lda</vendor>
<homepage href="http://www.evolute.pt/~software/siprpsoft" />
<description>Software de Gestão de Higiene e Segurança no Trabalho</description>
<description kind="short">SIPRPSoft</description>
<icon href="logo/icon.png" />
<offline-allowed />
<shortcut online="true">
<desktop />
</shortcut>
</information>
<security>
<all-permissions />
</security>
<update check="timeout" policy="always" />
<resources>
<j2se version="1.6.0+" />
<jar href="lib/mail.jar" />
</resources>
<component-desc />
</jnlp>

25
trunk/SIPRPSoft/jnlp/extensions/production/smtp.jnlp
Unescape View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/siprpsoft" href="siprpsoft.jnlp">
<information>
<title>SIPRPSoft</title>
<vendor>Evolute Lda</vendor>
<homepage href="http://www.evolute.pt/~software/siprpsoft" />
<description>Software de Gestão de Higiene e Segurança no Trabalho</description>
<description kind="short">SIPRPSoft</description>
<icon href="logo/icon.png" />
<offline-allowed />
<shortcut online="true">
<desktop />
</shortcut>
</information>
<security>
<all-permissions />
</security>
<update check="timeout" policy="always" />
<resources>
<j2se version="1.6.0+" />
<jar href="lib/smtp.jar" />
</resources>
<component-desc />
</jnlp>

25
trunk/SIPRPSoft/jnlp/extensions/test/PDFRenderer.jnlp
Unescape View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/versoes_teste/siprpsoft" href="siprpsoft.jnlp">
<information>
<title>SIPRPSoft</title>
<vendor>Evolute Lda</vendor>
<homepage href="http://www.evolute.pt/~software/siprpsoft" />
<description>Software de Gestão de Higiene e Segurança no Trabalho</description>
<description kind="short">SIPRPSoft</description>
<icon href="logo/icon.png" />
<offline-allowed />
<shortcut online="true">
<desktop />
</shortcut>
</information>
<security>
<all-permissions />
</security>
<update check="timeout" policy="always" />
<resources>
<j2se version="1.6.0+" />
<jar href="lib/PDFRenderer.jar" />
</resources>
<component-desc />
</jnlp>

25
trunk/SIPRPSoft/jnlp/extensions/test/iText-2.0.7.jnlp
Unescape View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/versoes_teste/siprpsoft" href="siprpsoft.jnlp">
<information>
<title>SIPRPSoft</title>
<vendor>Evolute Lda</vendor>
<homepage href="http://www.evolute.pt/~software/siprpsoft" />
<description>Software de Gestão de Higiene e Segurança no Trabalho</description>
<description kind="short">SIPRPSoft</description>
<icon href="logo/icon.png" />
<offline-allowed />
<shortcut online="true">
<desktop />
</shortcut>
</information>
<security>
<all-permissions />
</security>
<update check="timeout" policy="always" />
<resources>
<j2se version="1.6.0+" />
<jar href="lib/iText-2.0.7.jar" />
</resources>
<component-desc />
</jnlp>

25
trunk/SIPRPSoft/jnlp/extensions/test/mail.jnlp
Unescape View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/versoes_teste/siprpsoft" href="siprpsoft.jnlp">
<information>
<title>SIPRPSoft</title>
<vendor>Evolute Lda</vendor>
<homepage href="http://www.evolute.pt/~software/siprpsoft" />
<description>Software de Gestão de Higiene e Segurança no Trabalho</description>
<description kind="short">SIPRPSoft</description>
<icon href="logo/icon.png" />
<offline-allowed />
<shortcut online="true">
<desktop />
</shortcut>
</information>
<security>
<all-permissions />
</security>
<update check="timeout" policy="always" />
<resources>
<j2se version="1.6.0+" />
<jar href="lib/mail.jar" />
</resources>
<component-desc />
</jnlp>

25
trunk/SIPRPSoft/jnlp/extensions/test/smtp.jnlp
Unescape View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/versoes_teste/siprpsoft" href="siprpsoft.jnlp">
<information>
<title>SIPRPSoft</title>
<vendor>Evolute Lda</vendor>
<homepage href="http://www.evolute.pt/~software/siprpsoft" />
<description>Software de Gestão de Higiene e Segurança no Trabalho</description>
<description kind="short">SIPRPSoft</description>
<icon href="logo/icon.png" />
<offline-allowed />
<shortcut online="true">
<desktop />
</shortcut>
</information>
<security>
<all-permissions />
</security>
<update check="timeout" policy="always" />
<resources>
<j2se version="1.6.0+" />
<jar href="lib/smtp.jar" />
</resources>
<component-desc />
</jnlp>

119
trunk/SIPRPSoft/jnlp/production/siprpsoft.jnlp
Unescape View File

@ -1,57 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/siprpsoft" href="siprpsoft.jnlp">
<information>
<title>SIPRP</title>
<vendor>EVOLUTE 2010</vendor>
<homepage href="http://www.siprp.pt/"/>
<description>SIPRP, v11</description>
<description kind="short">SIPRP</description>
<icon href="images/logo_combo.jpg"/>
<icon kind="splash" href="images/logo_combo.jpg"/>
<offline-allowed/>
<shortcut online="true">
<desktop/>
</shortcut>
</information>
<security>
<all-permissions/>
</security>
<resources>
<property name="server.address" value="10.158.2.2" />
<property name="server.port" value="5432" />
<property name="server.databse" value="siprp_local_3" />
<j2se version="1.5+"/>
<jar href="lib/sSIPRP.jar"/>
<jar href="lib/sTableLayout.jar"/>
<jar href="lib/sashwood-1.1.jar"/>
<jar href="lib/savalon-framework-4.2.0.jar" download="lazy"/>
<jar href="lib/sbatik-all-1.7.jar"/>
<jar href="lib/scayenne-server-3.0M2.jar"/>
<jar href="lib/scommons-collections-3.1.jar"/>
<jar href="lib/scommons-io-1.4.jar"/>
<jar href="lib/scommons-lang-2.1.jar"/>
<jar href="lib/scommons-logging-1.0.4.jar"/>
<jar href="lib/scommons-logging-1.1.jar"/>
<jar href="lib/sevolute.jar"/>
<jar href="lib/sfop.jar"/>
<extension name="itext" href="siprp_itext.jnlp"/>
<jar href="lib/sjai_imageio.jar"/>
<jar href="lib/sjcalendar-1.3.2.jar"/>
<jar href="lib/sjdo.jar"/>
<jar href="lib/sjdom.jar"/>
<jar href="lib/sjpox-1.0.4.jar"/>
<jar href="lib/sjxl-2.6.jar"/>
<extension name="mail" href="siprp_mail.jnlp"/>
<jar href="lib/snlog4j-1.2.25.jar"/>
<extension name="pdfrenderer" href="siprp_pdfrenderer.jnlp"/>
<jar href="lib/spostgresql-8.0-317.jdbc3.jar"/>
<jar href="lib/sserializer-2.7.0.jar"/>
<jar href="lib/sxalan-2.7.0.jar"/>
<jar href="lib/sxercesImpl-2.7.1.jar"/>
<jar href="lib/sxmlgraphics-commons-1.3.1.jar"/>
<jar href="lib/sevospellchecker.jar"/>
<jar href="lib/sjazzy-core.jar"/>
</resources>
<application-desc main-class="siprp.Main"/>
</jnlp>
<?xml version="1.0" encoding="UTF-8"?>
<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/siprpsoft" href="siprpsoft.jnlp">
<information>
<title>SIPRPSoft</title>
<vendor>Evolute Lda</vendor>
<homepage href="http://www.evolute.pt/~software/siprpsoft" />
<description>Software de Gestão de Higiene e Segurança no Trabalho</description>
<description kind="short">SIPRPSoft</description>
<icon href="logo/icon.png" />
<offline-allowed />
<shortcut online="true">
<desktop />
</shortcut>
</information>
<security>
<all-permissions />
</security>
<update check="timeout" policy="always" />
<resources>
<j2se version="1.6.0+" initial-heap-size="256m" max-heap-size="512m" />
<property name="server.port" value="5432" />
<property name="server.address" value="10.158.2.2" />
<jar href="siprpsoft.jar" />
<extension name="PDFRenderer" href="PDFRenderer.jnlp" />
<jar href="lib/TableLayout.jar" />
<jar href="lib/ashwood-2.0.jar" />
<jar href="lib/avalon-framework-4.2.0.jar" />
<jar href="lib/batik-all-1.7.jar" />
<jar href="lib/cayenne-server-3.0.jar" />
<jar href="lib/commons-collections-3.1.jar" />
<jar href="lib/commons-io-1.4.jar" />
<jar href="lib/commons-lang-2.1.jar" />
<jar href="lib/commons-logging-1.0.4.jar" />
<jar href="lib/commons-logging-1.1.jar" />
<jar href="lib/evologger.jar" />
<jar href="lib/evolute.jar" />
<jar href="lib/evospellchecker.jar" />
<jar href="lib/fop.jar" />
<extension name="iText-2.0.7" href="iText-2.0.7.jnlp" />
<jar href="lib/jai_imageio.jar" />
<jar href="lib/jazzy-core.jar" />
<jar href="lib/jcalendar-1.3.2.jar" />
<jar href="lib/jdo.jar" />
<jar href="lib/jdom.jar" />
<jar href="lib/jpox-1.0.4.jar" />
<jar href="lib/jxl-2.6.jar" />
<jar href="lib/log4j-1.2.8.jar" />
<extension name="mail" href="mail.jnlp" />
<jar href="lib/nimrodlf.jar" />
<jar href="lib/nlog4j-1.2.25.jar" />
<jar href="lib/postgresql-8.4-701.jdbc4.jar" />
<jar href="lib/serializer-2.7.0.jar" />
<jar href="lib/shst.jar" />
<extension name="smtp" href="smtp.jnlp" />
<jar href="lib/swingx.jar" />
<jar href="lib/xalan-2.7.0.jar" />
<jar href="lib/xercesImpl-2.7.1.jar" />
<jar href="lib/xmlgraphics-commons-1.3.1.jar" />
</resources>
<application-desc main-class="siprp.Main" />
</jnlp>

62
trunk/SIPRPSoft/jnlp/test/siprpsoft.jnlp
Unescape View File

@ -0,0 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<jnlp spec="1.0+" codebase="http://www.evolute.pt/~software/versoes_teste/siprpsoft" href="siprpsoft.jnlp">
<information>
<title>SIPRPSoft</title>
<vendor>Evolute Lda</vendor>
<homepage href="http://www.evolute.pt/~software/versoes_teste/siprpsoft" />
<description>Software de Gestão de Higiene e Segurança no Trabalho</description>
<description kind="short">SIPRPSoft</description>
<icon href="logo/icon.png" />
<offline-allowed />
<shortcut online="true">
<desktop />
</shortcut>
</information>
<security>
<all-permissions />
</security>
<update check="timeout" policy="always" />
<resources>
<j2se version="1.6.0+" initial-heap-size="256m" max-heap-size="512m" />
<property name="server.port" value="5432" />
<property name="server.address" value="10.158.2.2" />
<jar href="siprpsoft.jar" />
<extension name="PDFRenderer" href="PDFRenderer.jnlp" />
<jar href="lib/TableLayout.jar" />
<jar href="lib/ashwood-2.0.jar" />
<jar href="lib/avalon-framework-4.2.0.jar" />
<jar href="lib/batik-all-1.7.jar" />
<jar href="lib/cayenne-server-3.0.jar" />
<jar href="lib/commons-collections-3.1.jar" />
<jar href="lib/commons-io-1.4.jar" />
<jar href="lib/commons-lang-2.1.jar" />
<jar href="lib/commons-logging-1.0.4.jar" />
<jar href="lib/commons-logging-1.1.jar" />
<jar href="lib/evologger.jar" />
<jar href="lib/evolute.jar" />
<jar href="lib/evospellchecker.jar" />
<jar href="lib/fop.jar" />
<extension name="iText-2.0.7" href="iText-2.0.7.jnlp" />
<jar href="lib/jai_imageio.jar" />
<jar href="lib/jazzy-core.jar" />
<jar href="lib/jcalendar-1.3.2.jar" />
<jar href="lib/jdo.jar" />
<jar href="lib/jdom.jar" />
<jar href="lib/jpox-1.0.4.jar" />
<jar href="lib/jxl-2.6.jar" />
<jar href="lib/log4j-1.2.8.jar" />
<extension name="mail" href="mail.jnlp" />
<jar href="lib/nimrodlf.jar" />
<jar href="lib/nlog4j-1.2.25.jar" />
<jar href="lib/postgresql-8.4-701.jdbc4.jar" />
<jar href="lib/serializer-2.7.0.jar" />
<jar href="lib/shst.jar" />
<extension name="smtp" href="smtp.jnlp" />
<jar href="lib/swingx.jar" />
<jar href="lib/xalan-2.7.0.jar" />
<jar href="lib/xercesImpl-2.7.1.jar" />
<jar href="lib/xmlgraphics-commons-1.3.1.jar" />
</resources>
<application-desc main-class="siprp.Main" />
</jnlp>

8
trunk/SIPRPSoft/properties/1-development/app.properties
Unescape View File

@ -1,5 +1,5 @@
#APP level
app.appName = SIPRPSoft
app.appName = siprpsoft
app.main-class = siprp.Main
app.main = siprp.Main
@ -17,9 +17,9 @@ 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.resources.j2se.max-heap-size=512m
app.resources.j2se.initial-heap-size=256m
app.resources.j2se.version=1.6.0+
#app.ws.dest.package=com.evolute.test-project.stubs
#app.ws.wsdl.url=https://www.evolute.pt/test-project/test-endpoint?wsdl

14
trunk/SIPRPSoft/properties/2-testing/app.properties
Unescape View File

@ -1,5 +1,5 @@
#APP level
app.appName = SIPRPSoft
app.appName = siprpsoft
app.main-class = siprp.Main
app.main = siprp.Main
@ -16,9 +16,15 @@ 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.resources.j2se.max-heap-size=512m
app.resources.j2se.initial-heap-size=256m
app.resources.j2se.version=1.6.0+
jnlp.information.description.short=SIPRPSoft
jnlp.information.description=Software de Gestão de Higiene e Segurança no Trabalho
jnlp.information.icon=logo/icon.png
jnlp.information.vendor=Evolute Lda
jnlp.information.title=SIPRPSoft
#app.ws.dest.package=com.evolute.test-project.stubs
#app.ws.wsdl.url=https://www.evolute.pt/test-project/test-endpoint?wsdl

18
trunk/SIPRPSoft/properties/3-production/app.properties
Unescape View File

@ -1,5 +1,5 @@
#APP level
app.appName = SIPRPSoft
app.appName = siprpsoft
app.main-class = siprp.Main
app.main = siprp.Main
@ -9,15 +9,21 @@ 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
jnlp.resources.property.server.address=10.158.2.2
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.resources.j2se.max-heap-size=512m
app.resources.j2se.initial-heap-size=256m
app.resources.j2se.version=1.6.0+
jnlp.information.description.short=SIPRPSoft
jnlp.information.description=Software de Gestão de Higiene e Segurança no Trabalho
jnlp.information.icon=logo/icon.png
jnlp.information.vendor=Evolute Lda
jnlp.information.title=SIPRPSoft
#app.ws.dest.package=com.evolute.test-project.stubs
#app.ws.wsdl.url=https://www.evolute.pt/test-project/test-endpoint?wsdl

8
trunk/SIPRPSoft/properties/version.properties
Unescape View File

@ -1,6 +1,6 @@
#SIPRPSoft versioning file
#Fri Jun 25 17:32:18 WEST 2010
#siprpsoft versioning file
#Wed Jul 14 15:49:54 WEST 2010
major=12
name=SIPRPSoft
name=siprpsoft
minor=0
build=1
build=9

125
trunk/SIPRPSoft/src/siprp/data/Marcacao.java
Unescape View File

@ -10,7 +10,6 @@ import java.text.DateFormat;
import java.util.Calendar;
import java.util.Date;
import siprp.FichaDataProvider;
import siprp.data.outer.AvisosData;
import siprp.data.outer.EmpresasData;
import siprp.data.outer.EstabelecimentosData;
@ -20,16 +19,13 @@ import siprp.data.outer.MarcacoesTrabalhadorData;
import siprp.data.outer.TrabalhadoresData;
import siprp.medicina.MedicinaDataProvider;
import com.evolute.entity.ProviderInterface;
import com.evolute.entity.evo.EvoDataException;
import com.evolute.utils.Singleton;
import com.evolute.utils.tables.ColumnizedObject;
/**
*
* @author fpalma
*/
public abstract class Marcacao extends BaseObject
implements ColumnizedObject
public abstract class Marcacao extends BaseObject implements ColumnizedObject
//, JDOOperationHandlerInterface
{
public static final int TIPO_MARCACAO_TRABALHADOR_EXAMES = 0;
@ -51,8 +47,7 @@ public abstract class Marcacao extends BaseObject
public static final String ANTECEDENCIA_AVISO = "antecedencia_aviso";
protected static final DateFormat DATE_FORMAT = DateFormat.getDateInstance( DateFormat.SHORT );
protected static ProviderInterface JDO;
// protected static ProviderInterface JDO;
public static Marcacao getMarcacao( int tipo )
{
@ -122,58 +117,58 @@ public abstract class Marcacao extends BaseObject
}
}
public static void saveMarcacaoConsultaForTrabalhadorID( Integer trabalhadorID, Date date )
throws Exception
{
if( date != null )
{
date = (Date)date.clone();
}
FichaDataProvider provider = (FichaDataProvider) FichaDataProvider.getProvider();
if( trabalhadorID == null )
{
return;
}
Integer marcacaoID = provider.getMarcacaoIDByTrabalhador( trabalhadorID );
MarcacoesTrabalhadorData marcacao;
if( marcacaoID == null )
{
marcacao = null;
}
else
{
if( JDO == null )
{
JDO = ( ProviderInterface ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER );
}
marcacao = ( MarcacoesTrabalhadorData ) JDO.load( MarcacoesTrabalhadorData.class, marcacaoID );
}
if( date == null && marcacao != null )
{
marcacao.delete();
}
else if( date != null && marcacao != null )
{
marcacao.set( Marcacao.DATA, date );
marcacao.save();
}
else if( date != null && marcacao == null )
{
marcacao = new MarcacoesTrabalhadorData();
if( JDO == null )
{
JDO = ( ProviderInterface ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER );
}
TrabalhadoresData trab = (TrabalhadoresData)JDO.load( TrabalhadoresData.class, trabalhadorID );
marcacao.set( MarcacoesTrabalhadorData.TO_TRABALHADOR_ID, trab );
marcacao.set( MarcacoesTrabalhadorData.TIPO, new Integer( MarcacoesTrabalhadorData.TIPO_CONSULTA ) );
marcacao.set( Marcacao.DATA, date );
marcacao.set( Marcacao.REALIZADA, "n" );
marcacao.set( MarcacoesTrabalhadorData.ESTADO, new Integer( siprp.medicina.MedicinaDataProvider.ESTADO_POR_REALIZAR ) );
marcacao.set( MarcacoesTrabalhadorData.MOTIVO, new Integer( 2 ) );
marcacao.save();
}
}
// public static void saveMarcacaoConsultaForTrabalhadorID( Integer trabalhadorID, Date date )
// throws Exception
// {
// if( date != null )
// {
// date = (Date)date.clone();
// }
// FichaDataProvider provider = (FichaDataProvider) FichaDataProvider.getProvider();
// if( trabalhadorID == null )
// {
// return;
// }
// Integer marcacaoID = provider.getMarcacaoIDByTrabalhador( trabalhadorID );
// MarcacoesTrabalhadorData marcacao;
// if( marcacaoID == null )
// {
// marcacao = null;
// }
// else
// {
// if( JDO == null )
// {
// JDO = ( ProviderInterface ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER );
// }
// marcacao = ( MarcacoesTrabalhadorData ) JDO.load( MarcacoesTrabalhadorData.class, marcacaoID );
// }
// if( date == null && marcacao != null )
// {
// marcacao.delete();
// }
// else if( date != null && marcacao != null )
// {
// marcacao.set( Marcacao.DATA, date );
// marcacao.save();
// }
// else if( date != null && marcacao == null )
// {
// marcacao = new MarcacoesTrabalhadorData();
// if( JDO == null )
// {
// JDO = ( ProviderInterface ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER );
// }
// TrabalhadoresData trab = (TrabalhadoresData)JDO.load( TrabalhadoresData.class, trabalhadorID );
// marcacao.set( MarcacoesTrabalhadorData.TO_TRABALHADOR_ID, trab );
// marcacao.set( MarcacoesTrabalhadorData.TIPO, new Integer( MarcacoesTrabalhadorData.TIPO_CONSULTA ) );
// marcacao.set( Marcacao.DATA, date );
// marcacao.set( Marcacao.REALIZADA, "n" );
// marcacao.set( MarcacoesTrabalhadorData.ESTADO, new Integer( siprp.medicina.MedicinaDataProvider.ESTADO_POR_REALIZAR ) );
// marcacao.set( MarcacoesTrabalhadorData.MOTIVO, new Integer( 2 ) );
// marcacao.save();
// }
// }
@Override
public void save() throws EvoDataException
@ -200,7 +195,7 @@ public abstract class Marcacao extends BaseObject
{
if( object instanceof MarcacoesEmpresaData )
{
AvisosData aviso = (AvisosData) JDO.load( AvisosData.class,
AvisosData aviso = getProvider().load( AvisosData.class,
new Object[]{ object.get( MarcacoesEmpresaData.ID ), new Integer( AvisosData.TIPO_EMPRESA ) },
new String[]{ AvisosData.EVENTO_ID, AvisosData.TIPO } );
if( aviso == null )
@ -222,7 +217,7 @@ public abstract class Marcacao extends BaseObject
}
else if( object instanceof MarcacoesEstabelecimentoData )
{
AvisosData aviso = (AvisosData) JDO.load( AvisosData.class,
AvisosData aviso = getProvider().load( AvisosData.class,
new Object[]{ object.get( MarcacoesEstabelecimentoData.ID ), new Integer( AvisosData.TIPO_ESTABELECIMENTO ) },
new String[]{ AvisosData.EVENTO_ID, AvisosData.TIPO } );
if( aviso == null )
@ -264,7 +259,7 @@ public abstract class Marcacao extends BaseObject
}
if( object instanceof MarcacoesTrabalhadorData )
{
AvisosData aviso = (AvisosData) JDO.load( AvisosData.class,
AvisosData aviso = getProvider().load( AvisosData.class,
new Object[]{ object.get( MarcacoesTrabalhadorData.ID ), new Integer( AvisosData.TIPO_TRABALHADOR ) },
new String[]{ AvisosData.EVENTO_ID, AvisosData.TIPO } );
if( aviso == null )
@ -280,7 +275,7 @@ public abstract class Marcacao extends BaseObject
aviso.setToEmpresa_id( empresa );
aviso.set( AvisosData.EVENTO_ID, object.get( MarcacoesTrabalhadorData.ID ) );
Date dataEvento = (Date) object.get( Marcacao.DATA );
Date dataAviso = new Date( dataEvento.getTime() );
Date dataAviso = new Date( dataEvento == null ? System.currentTimeMillis() : dataEvento.getTime() );
Calendar cal = Calendar.getInstance();
cal.setTime( dataAviso );
cal.add( Calendar.DAY_OF_MONTH, -14 );
@ -327,7 +322,7 @@ public abstract class Marcacao extends BaseObject
}
result = true;
}
catch (Exception e)
catch ( Exception e )
{
throw new EvoDataException( e );
}
@ -375,7 +370,7 @@ public abstract class Marcacao extends BaseObject
{
return false;
}
AvisosData aviso = (AvisosData) JDO.load( AvisosData.class,
AvisosData aviso = getProvider().load( AvisosData.class,
new Object[]{ object.get( "id" ), tipo },
new String[]{ AvisosData.EVENTO_ID, AvisosData.TIPO } );
if( aviso != null )

23
trunk/SIPRPSoft/src/siprp/ficha/ExamePanel.java
Unescape View File

@ -427,27 +427,10 @@ public class ExamePanel extends JPanel
}
recomendacoesText.setText( recomendacoes.trim() );
// exame = provider.createObject( FichaDataProvider.EXAMES );
exame = new ExamesData();
// DBField fields[] = FichaDataProvider.EXAMES.getInsertFields();
// String exameFields[] = new String[ fields.length ];
// for( int i = 0; i < exameFields.length; ++i )
// {
// exameFields[ i ] = fields[ i ].FULL_NAME;
// }
// Hashtable hash = new Hashtable();
// ComponentController.save( exameFields, hash, components );
// hash.put( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.INACTIVO, "n" );
// Enumeration enum = hash.keys();
// while( enum.hasMoreElements() )
// {
// String name = ( String )enum.nextElement();
// exame.setProperty( name, hash.get( name ) );
// }
String names[] = exame.getFieldNames();
Hashtable hash = new Hashtable();
ComponentController.save( names, hash, components );
exame.setHashData( hash );
exame.setHashData( ComponentController.save( components ) );
int tipo = 0;
if( admissaoRadio.isSelected() )

23
trunk/SIPRPSoft/src/siprp/ficha/TrabalhadorPanel.java
Unescape View File

@ -329,8 +329,8 @@ public class TrabalhadorPanel extends JPanel
try
{
trabalhador = ( TrabalhadoresData ) JDO.load( TrabalhadoresData.class, trabalhadorID );
String names[] = trabalhador.getFieldNames();
ComponentController.fill( names, trabalhador.getHashData(), components );
// String names[] = trabalhador.getFieldNames();
ComponentController.fill( trabalhador.getHashData(), components );
// trabalhador = provider.load( FichaDataProvider.TRABALHADORES, new DBKey( trabalhadorID ) );
// DBField fields[] = FichaDataProvider.TRABALHADORES.getInsertFields();
// String trabalhadorFields[] = new String[ fields.length ];
@ -367,24 +367,7 @@ public class TrabalhadorPanel extends JPanel
trabalhador = new TrabalhadoresData();
trabalhador.set( TrabalhadoresData.PERFIL, new Integer( 1 ) );
}
// DBField fields[] = FichaDataProvider.TRABALHADORES.getInsertFields();
// String trabalhadorFields[] = new String[ fields.length ];
// for( int i = 0; i < trabalhadorFields.length; ++i )
// {
// trabalhadorFields[ i ] = fields[ i ].FULL_NAME;
// }
// Hashtable hash = new Hashtable();
// ComponentController.save( trabalhadorFields, hash, components );
// Enumeration enum = hash.keys();
// while( enum.hasMoreElements() )
// {
// String name = ( String )enum.nextElement();
// trabalhador.setProperty( name, hash.get( name ) );
// }
String names[] = trabalhador.getFieldNames();
Map<String,Object> hash = trabalhador.getHashData();
ComponentController.save( names, hash, components );
trabalhador.setHashData( hash );
trabalhador.setHashData( ComponentController.save( components ) );
// if( ((String)trabalhador.getProperty( FichaDataProvider.NOME )).trim().length() == 0 )
if( ((String)trabalhador.get( TrabalhadoresData.NOME )).trim().length() == 0 )
{

1
trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java
Unescape View File

@ -86,6 +86,7 @@ public class GerirMedidasRelatorioPanel extends JPanel
{
buttonAdicionar.setEnabled( false );
buttonRemover.setEnabled( false );
TreeTools.registerTreeKeepExpandState( tree );
tree.setRootVisible( false );
tree.getSelectionModel().setSelectionMode( TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION );
tree.setCellRenderer( new DefaultTreeCellRenderer()

179
trunk/SIPRPSoft/src/siprp/higiene/relatorio/PlanoActuacaoPanel.java
Unescape View File

@ -11,16 +11,11 @@ import java.beans.PropertyChangeListener;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import siprp.database.cayenne.objects.Estabelecimentos;
import siprp.database.cayenne.objects.HsArea;
import siprp.database.cayenne.objects.HsPosto;
import siprp.database.cayenne.objects.HsPostoEstabelecimento;
import siprp.database.cayenne.objects.HsRelatorio;
import siprp.database.cayenne.objects.HsRelatorioArea;
import siprp.database.cayenne.objects.HsRelatorioPosto;
import siprp.database.cayenne.objects.HsRelatorioPostoMedida;
import siprp.database.cayenne.objects.HsRelatorioPostoRisco;
import siprp.database.cayenne.objects.MarcacoesEstabelecimento;
import siprp.logic.HigieneSegurancaLogic;
public class PlanoActuacaoPanel extends JPanel
@ -135,93 +130,93 @@ public class PlanoActuacaoPanel extends JPanel
// } );
}
private void refreshAreas() throws Exception
{
if( relatorio != null )
{
MarcacoesEstabelecimento marcacao = relatorio.getToHsMarcacoesEstabelecimento();
if( marcacao != null )
{
Estabelecimentos estabelecimento = marcacao.getToEstabelecimentos();
if( estabelecimento != null )
{
for( HsPostoEstabelecimento postoEstabelecimento : estabelecimento.getHsPostoEstabelecimentoArray() )
{
refreshPostoEstabelecimento( postoEstabelecimento );
}
areas.refresh();
}
}
}
}
private void refreshPostoEstabelecimento( HsPostoEstabelecimento postoEstabelecimento ) throws Exception
{
if( postoEstabelecimento != null )
{
HsPosto posto = postoEstabelecimento.getToHsPosto();
if( posto != null )
{
HsArea area = posto.getToHsArea();
HsRelatorioArea relatorioArea = null;
if( area != null )
{
relatorioArea = getAreaInRelatorio( relatorio, area.getId() );
if( relatorioArea == null )
{
relatorioArea = new HsRelatorioArea();
}
HigieneSegurancaLogic.updateRelatorioAreaFromHsArea( relatorio, relatorioArea, area );
}
HsRelatorioPosto relatorioPosto = getPostoInRelatorio( relatorio, posto.getId() );
if( relatorioPosto == null )
{
relatorioPosto = HigieneSegurancaLogic.createRelatorioPostoFromHsPosto( relatorio , relatorioArea, posto );
}
else
{
HigieneSegurancaLogic.updateRelatorioPostoFromHsPosto( relatorioPosto, relatorioArea, posto );
}
}
}
}
private HsRelatorioArea getAreaInRelatorio( HsRelatorio relatorio, Integer softRefId )
{
HsRelatorioArea result = null;
if( relatorio != null && softRefId != null )
{
for( HsRelatorioArea relatArea : relatorio.getHsRelatorioArea() )
{
if( softRefId.equals( relatArea.getHsAreaId() ) )
{
result = relatArea;
break;
}
}
}
return result;
}
private HsRelatorioPosto getPostoInRelatorio( HsRelatorio relatorio, Integer softRefId )
{
HsRelatorioPosto result = null;
if( relatorio != null && softRefId != null )
{
for( HsRelatorioArea relatArea : relatorio.getHsRelatorioArea() )
{
for( HsRelatorioPosto relatPosto : relatArea.getHsRelatorioPostoArray() )
{
if( softRefId.equals( relatPosto.getHsPostoId() ) )
{
result = relatPosto;
break;
}
}
}
}
return result;
}
// private void refreshAreas() throws Exception
// {
// if( relatorio != null )
// {
// MarcacoesEstabelecimento marcacao = relatorio.getToHsMarcacoesEstabelecimento();
// if( marcacao != null )
// {
// Estabelecimentos estabelecimento = marcacao.getToEstabelecimentos();
// if( estabelecimento != null )
// {
// for( HsPostoEstabelecimento postoEstabelecimento : estabelecimento.getHsPostoEstabelecimentoArray() )
// {
// refreshPostoEstabelecimento( postoEstabelecimento );
// }
// areas.refresh();
// }
// }
// }
// }
//
// private void refreshPostoEstabelecimento( HsPostoEstabelecimento postoEstabelecimento ) throws Exception
// {
// if( postoEstabelecimento != null )
// {
// HsPosto posto = postoEstabelecimento.getToHsPosto();
// if( posto != null )
// {
// HsArea area = posto.getToHsArea();
// HsRelatorioArea relatorioArea = null;
// if( area != null )
// {
// relatorioArea = getAreaInRelatorio( relatorio, area.getId() );
// if( relatorioArea == null )
// {
// relatorioArea = new HsRelatorioArea();
// }
// HigieneSegurancaLogic.updateRelatorioAreaFromHsArea( relatorio, relatorioArea, area );
// }
// HsRelatorioPosto relatorioPosto = getPostoInRelatorio( relatorio, posto.getId() );
// if( relatorioPosto == null )
// {
// relatorioPosto = HigieneSegurancaLogic.createRelatorioPostoFromHsPosto( relatorio , relatorioArea, posto );
// }
// else
// {
// HigieneSegurancaLogic.updateRelatorioPostoFromHsPosto( relatorioPosto, relatorioArea, posto );
// }
// }
// }
// }
//
// private HsRelatorioArea getAreaInRelatorio( HsRelatorio relatorio, Integer softRefId )
// {
// HsRelatorioArea result = null;
// if( relatorio != null && softRefId != null )
// {
// for( HsRelatorioArea relatArea : relatorio.getHsRelatorioArea() )
// {
// if( softRefId.equals( relatArea.getHsAreaId() ) )
// {
// result = relatArea;
// break;
// }
// }
// }
// return result;
// }
//
// private HsRelatorioPosto getPostoInRelatorio( HsRelatorio relatorio, Integer softRefId )
// {
// HsRelatorioPosto result = null;
// if( relatorio != null && softRefId != null )
// {
// for( HsRelatorioArea relatArea : relatorio.getHsRelatorioArea() )
// {
// for( HsRelatorioPosto relatPosto : relatArea.getHsRelatorioPostoArray() )
// {
// if( softRefId.equals( relatPosto.getHsPostoId() ) )
// {
// result = relatPosto;
// break;
// }
// }
// }
// }
// return result;
// }
private void startupComponents()
{

Write Preview
Loading…
Cancel
Save