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

Browse Source
lxbfYeaa
Tiago Simão 15 years ago
parent a3356d1071
commit 6cf67ac1c9
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File

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

@ -18,8 +18,8 @@
<update check="timeout" policy="always" />
<resources>
<j2se version="1.6.0+" initial-heap-size="256m" max-heap-size="512m" />
<property name="server.port" value="5436" />
<property name="server.address" value="www.evolute.pt" />
<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" />

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

@ -18,8 +18,8 @@
<update check="timeout" policy="always" />
<resources>
<j2se version="1.6.0+" initial-heap-size="256m" max-heap-size="512m" />
<property name="server.port" value="5436" />
<property name="server.address" value="www.evolute.pt" />
<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" />

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

Binary file not shown.

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

@ -1,6 +1,6 @@
#siprpsoft versioning file
#Tue Jul 20 10:33:05 WEST 2010
#Tue Jul 20 19:53:26 WEST 2010
major=12
name=siprpsoft
minor=1
build=1
build=4

17
trunk/SIPRPSoft/src/siprp/data/provider/PlanoActuacaoDataProvider.java
Unescape View File

@ -278,11 +278,18 @@ public class PlanoActuacaoDataProvider
List< HsLegislacaoData > result = null;
try
{
Expression where = new Field( HsLegislacaoData.DELETED_DATE_FULL ).isEqual( null );
where = where.and( new Field( HsLegislacaoEmpresaData.EMPRESA_ID_FULL ).isEqual( empresa.getId() ) );
List<ForeignKey> fks = new LinkedList<ForeignKey>();
fks.add( new ForeignKey( HsLegislacaoData.class, HsLegislacaoData.ID_FULL, HsLegislacaoEmpresaData.class, HsLegislacaoEmpresaData.LEGISLACAO_ID_FULL ) );
result = ENTITY_PROVIDER.listLoad( HsLegislacaoData.class, fks, where, new String[] { HsLegislacaoData.DESCRIPTION_FULL } );
if( empresa != null )
{
Expression where = new Field( HsLegislacaoData.DELETED_DATE_FULL ).isEqual( null );
where = where.and( new Field( HsLegislacaoEmpresaData.EMPRESA_ID_FULL ).isEqual( empresa.getId() ) );
List<ForeignKey> fks = new LinkedList<ForeignKey>();
fks.add( new ForeignKey( HsLegislacaoData.class, HsLegislacaoData.ID_FULL, HsLegislacaoEmpresaData.class, HsLegislacaoEmpresaData.LEGISLACAO_ID_FULL ) );
result = ENTITY_PROVIDER.listLoad( HsLegislacaoData.class, fks, where, new String[] { HsLegislacaoData.DESCRIPTION_FULL } );
}
else
{
result = ENTITY_PROVIDER.listLoad( HsLegislacaoData.class, new Object[]{ null }, new String[] { HsLegislacaoData.DELETED_DATE_FULL }, new String[]{ HsLegislacaoData.DESCRIPTION_FULL } );
}
}
catch ( Exception e )
{

Write Preview
Loading…
Cancel
Save