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

Browse Source
lxbfYeaa
Tiago Simão 15 years ago
parent 6da2db3521
commit 574ef2c531
6 changed files with 62 additions and 40 deletions
Show Stats Download Patch File Download Diff File

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

Binary file not shown.

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

Binary file not shown.

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

@ -1,6 +1,6 @@
#siprpsoft versioning file
#Mon Aug 16 09:51:42 WEST 2010
#Thu Aug 19 09:59:31 WEST 2010
major=12
name=siprpsoft
minor=1
build=11
build=12

35
trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioLegislacaoPanel.java
Unescape View File

@ -12,7 +12,6 @@ import java.util.List;
import java.util.Vector;
import javax.swing.JButton;
import javax.swing.JPanel;
import leaf.ui.SimpleTable;
import siprp.data.outer.EstabelecimentosData;
@ -21,10 +20,11 @@ import siprp.data.outer.HsRelatorioLegislacaoData;
import siprp.data.outer.MarcacoesEstabelecimentoData;
import siprp.logic.HigieneSegurancaLogic;
import com.evolute.swing.panel.EvoPanel;
import com.evolute.utils.error.ErrorLogger;
import com.evolute.utils.tables.ColumnizedObjectArray;
public class RelatorioLegislacaoPanel extends JPanel
public class RelatorioLegislacaoPanel extends EvoPanel
{
private static final long serialVersionUID = 1L;
@ -51,25 +51,32 @@ public class RelatorioLegislacaoPanel extends JPanel
@Override
public void actionPerformed( ActionEvent e )
{
if( relatorio != null )
runAsynchronously( new Runnable()
{
MarcacoesEstabelecimentoData marcacao = relatorio.toMarcacao_id();
if( marcacao != null )
@Override
public void run()
{
EstabelecimentosData estabelecimento = marcacao.toEstabelecimento_id();
if( estabelecimento != null )
if( relatorio != null )
{
try
MarcacoesEstabelecimentoData marcacao = relatorio.toMarcacao_id();
if( marcacao != null )
{
HigieneSegurancaLogic.reverterLegislacao( relatorio, estabelecimento );
} catch( Exception e1 )
{
ErrorLogger.logException( e1 );
EstabelecimentosData estabelecimento = marcacao.toEstabelecimento_id();
if( estabelecimento != null )
{
try
{
HigieneSegurancaLogic.reverterLegislacao( relatorio, estabelecimento, true );
} catch( Exception e1 )
{
ErrorLogger.logException( e1 );
}
}
}
refresh();
}
}
refresh();
}
} );
}
} );
}

35
trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioNormalizacaoPanel.java
Unescape View File

@ -13,7 +13,6 @@ import java.util.List;
import java.util.Vector;
import javax.swing.JButton;
import javax.swing.JPanel;
import leaf.ui.SimpleTable;
import siprp.data.outer.EstabelecimentosData;
@ -22,10 +21,11 @@ import siprp.data.outer.HsRelatorioNormalizacaoData;
import siprp.data.outer.MarcacoesEstabelecimentoData;
import siprp.logic.HigieneSegurancaLogic;
import com.evolute.swing.panel.EvoPanel;
import com.evolute.utils.error.ErrorLogger;
import com.evolute.utils.tables.ColumnizedObjectArray;
public class RelatorioNormalizacaoPanel extends JPanel
public class RelatorioNormalizacaoPanel extends EvoPanel
{
private static final long serialVersionUID = 1L;
@ -53,25 +53,32 @@ public class RelatorioNormalizacaoPanel extends JPanel
@Override
public void actionPerformed( ActionEvent e )
{
if( relatorio != null )
runAsynchronously( new Runnable()
{
MarcacoesEstabelecimentoData marcacao = relatorio.toMarcacao_id();
if( marcacao != null )
@Override
public void run()
{
EstabelecimentosData estabelecimento = marcacao.toEstabelecimento_id();
if( estabelecimento != null )
if( relatorio != null )
{
try
MarcacoesEstabelecimentoData marcacao = relatorio.toMarcacao_id();
if( marcacao != null )
{
HigieneSegurancaLogic.reverterNormalizacao( relatorio, estabelecimento );
} catch( Exception e1 )
{
ErrorLogger.logException( e1 );
EstabelecimentosData estabelecimento = marcacao.toEstabelecimento_id();
if( estabelecimento != null )
{
try
{
HigieneSegurancaLogic.reverterNormalizacao( relatorio, estabelecimento, true );
} catch( Exception e1 )
{
ErrorLogger.logException( e1 );
}
}
}
refresh();
}
}
refresh();
}
} );
}
} );
}

28
trunk/SIPRPSoft/src/siprp/logic/HigieneSegurancaLogic.java
Unescape View File

@ -216,14 +216,10 @@ public class HigieneSegurancaLogic
EstabelecimentosData estabelecimento = relatorio.toMarcacao_id() == null ? null : relatorio.toMarcacao_id().toEstabelecimento_id();
if( estabelecimento != null )
{
System.out.println("delete");
deleteRelatorioContents( relatorio );
System.out.println("are");
reverterAreas( relatorio, estabelecimento );
System.out.println("leg");
reverterLegislacao( relatorio, estabelecimento );
System.out.println("norm");
reverterNormalizacao( relatorio, estabelecimento );
reverterLegislacao( relatorio, estabelecimento, false );
reverterNormalizacao( relatorio, estabelecimento, false );
}
}
}
@ -390,7 +386,7 @@ public class HigieneSegurancaLogic
}
}
public static void reverterLegislacao( HsRelatorioData relatorio, EstabelecimentosData estabelecimento ) throws Exception
public static void reverterLegislacao( HsRelatorioData relatorio, EstabelecimentosData estabelecimento, boolean delete ) throws Exception
{
// System.out.println( "\nreverterLegislacao( " + estabelecimento + " ) : " );
@ -404,7 +400,13 @@ public class HigieneSegurancaLogic
// {
// relatorio.fromHsRelatorioLegislacao_hs_relatorio_id().get( 0 ).delete();
// }
if( delete )
{
for( HsRelatorioLegislacaoData rl : relatorio.fromHsRelatorioLegislacao_hs_relatorio_id() )
{
rl.delete();
}
}
for( HsLegislacaoEstabelecimentoData rel : estabelecimento.fromHsLegislacaoEstabelecimento_estabelecimento_id() )
{
HsLegislacaoData legislacao = rel.toLegislacao_id();
@ -430,7 +432,7 @@ public class HigieneSegurancaLogic
return result;
}
public static void reverterNormalizacao( HsRelatorioData relatorio, EstabelecimentosData estabelecimento ) throws Exception
public static void reverterNormalizacao( HsRelatorioData relatorio, EstabelecimentosData estabelecimento, boolean delete ) throws Exception
{
// System.out.println( "\nreverterNormalizacao( " + estabelecimento + " ) : " );
@ -444,7 +446,13 @@ public class HigieneSegurancaLogic
// {
// relatorio.fromHsRelatorioNormalizacao_hs_relatorio_id().get( 0 ).delete();
// }
if( delete )
{
for( HsRelatorioNormalizacaoData rn : relatorio.fromHsRelatorioNormalizacao_hs_relatorio_id() )
{
rn.delete();
}
}
for( HsNormalizacaoEstabelecimentoData rel : estabelecimento.fromHsNormalizacaoEstabelecimento_estabelecimento_id() )
{
HsNormalizacaoData normalizacao = rel.toNormalizacao_id();

Write Preview
Loading…
Cancel
Save