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

Browse Source
lxbfYeaa
Diogo Neves 15 years ago
parent f298d61fb8
commit e5db6f8e53
3 changed files with 80 additions and 26 deletions
Show Stats Download Patch File Download Diff File

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

Binary file not shown.

13
trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioHigieneSegurancaWindow.java
Unescape View File

@ -166,15 +166,15 @@ public class RelatorioHigieneSegurancaWindow extends SIPRPFrame implements Track
{
setCursor( new Cursor( Cursor.WAIT_CURSOR ) );
boolean carregarDadosEstabelecimento = false;
panelRelatorio.setRelatorio( null, carregarDadosEstabelecimento );
// panelRelatorio.setRelatorio( null, carregarDadosEstabelecimento );
if( visita != null )
{
HsRelatorioData relatorio = null;
List<HsRelatorioData> relatorios = visita.fromHsRelatorio_marcacao_id();
List< HsRelatorioData > relatorios = visita.fromHsRelatorio_marcacao_id();
Date data = null;
for( HsRelatorioData current : relatorios )
{
boolean newest = data == null ? true : (data.before( current.getData() ) );
boolean newest = data == null ? true : ( data.before( current.getData() ) );
if( newest )
{
data = current.getData();
@ -191,7 +191,12 @@ public class RelatorioHigieneSegurancaWindow extends SIPRPFrame implements Track
}
panelRelatorio.setRelatorio( relatorio, carregarDadosEstabelecimento );;
}
} catch( Exception e )
else
{
panelRelatorio.setRelatorio( null, carregarDadosEstabelecimento );
}
}
catch( Exception e )
{
LeafDialog.error(e);
}

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

@ -5,7 +5,6 @@ import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil;
import static com.evolute.utils.strings.UnicodeLatin1Map.iacute;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@ -208,6 +207,8 @@ public class HigieneSegurancaLogic
public static void reverterRelatorio( HsRelatorioData relatorio )
{
// System.out.println( "\nreverterRelatorio( " + relatorio + " ) : " );
try
{
if(relatorio != null)
@ -229,30 +230,45 @@ public class HigieneSegurancaLogic
private static void reverterAreas( HsRelatorioData relatorio, EstabelecimentosData estabelecimento ) throws Exception
{
List<HsRelatorioAreaData> areas = relatorio.fromHsRelatorioArea_relatorio_id();
areas = new LinkedList<HsRelatorioAreaData>(areas);
int areasSize = areas == null ? 0 : areas.size();
for( int i = 0; i < areasSize; ++i )
// System.out.println( "\nreverterAreas( " + estabelecimento + " ) : " );
List< HsRelatorioAreaData > areas = relatorio.fromHsRelatorioArea_relatorio_id();
for ( HsRelatorioAreaData area : areas )
{
HsRelatorioAreaData area = areas.get( i );
List<HsRelatorioPostoData> postos = area.fromHsRelatorioPosto_area_id();
postos = new LinkedList<HsRelatorioPostoData>(postos);
int postosSize = postos == null ? 0 : postos.size();
for( int j = 0; j < postosSize; ++j )
List< HsRelatorioPostoData > postos = area.fromHsRelatorioPosto_area_id();
for ( HsRelatorioPostoData posto : postos )
{
postos.get(j).delete();
posto.delete();
}
area.delete();
}
// List<HsRelatorioAreaData> areas = relatorio.fromHsRelatorioArea_relatorio_id();
// areas = new LinkedList<HsRelatorioAreaData>(areas);
// int areasSize = areas == null ? 0 : areas.size();
// for( int i = 0; i < areasSize; ++i )
// {
// HsRelatorioAreaData area = areas.get( i );
// List<HsRelatorioPostoData> postos = area.fromHsRelatorioPosto_area_id();
// postos = new LinkedList<HsRelatorioPostoData>(postos);
// int postosSize = postos == null ? 0 : postos.size();
// for( int j = 0; j < postosSize; ++j )
// {
// postos.get(j).delete();
// }
// area.delete();
// }
relatorio.save();
List<HsPostoEstabelecimentoData> postos = estabelecimento.fromHsPostoEstabelecimento_estabelecimento_id();
reverterPostos(relatorio,postos);
List< HsPostoEstabelecimentoData > postos = estabelecimento.fromHsPostoEstabelecimento_estabelecimento_id();
reverterPostos( relatorio, postos );
relatorio.save();
}
private static void reverterPostos( HsRelatorioData relatorio, List<HsPostoEstabelecimentoData> postos ) throws Exception
private static void reverterPostos( HsRelatorioData relatorio, List< HsPostoEstabelecimentoData > postos ) throws Exception
{
HashMap<HsAreaData,HsRelatorioAreaData> areasInserted = new HashMap<HsAreaData, HsRelatorioAreaData>();
// System.out.println( "\nreverterPostos( " + postos + " ) :" );
HashMap< HsAreaData, HsRelatorioAreaData > areasInserted = new HashMap< HsAreaData, HsRelatorioAreaData >();
for( HsPostoEstabelecimentoData rel : postos )
{
HsPostoData posto = rel.toPosto_id();
@ -262,8 +278,11 @@ public class HigieneSegurancaLogic
}
}
public static HsRelatorioPostoData createRelatorioPostoFromHsPosto( HsRelatorioData relatorio, HsRelatorioAreaData rArea, HsPostoData posto ) throws Exception
public static HsRelatorioPostoData createRelatorioPostoFromHsPosto( HsRelatorioData relatorio, HsRelatorioAreaData rArea, HsPostoData posto )
throws Exception
{
// System.out.println( "\ncreateRelatorioPostoFromHsPosto( " + rArea + ", " + posto + " ) : " );
HsRelatorioPostoData rPosto = new HsRelatorioPostoData();
HsAreaData area = posto.toArea_id();
@ -280,6 +299,8 @@ public class HigieneSegurancaLogic
public static void updateRelatorioAreaFromHsArea( HsRelatorioData relatorio, HsRelatorioAreaData rArea, HsAreaData area ) throws Exception
{
// System.out.println( "\nupdateRelatorioAreaFromHsArea( " + rArea + ", " + area + " ) : " );
rArea.setDescription( area.getDescription() );
rArea.setOrdem( area.getOrdem() );
rArea.setToRelatorio_id( relatorio );
@ -289,6 +310,8 @@ public class HigieneSegurancaLogic
public static void updateRelatorioPostoFromHsPosto( HsRelatorioPostoData rPosto, HsRelatorioAreaData rArea, HsPostoData posto ) throws Exception
{
// System.out.println( "\nupdateRelatorioPostoFromHsPosto( " + rPosto + ", " + rArea + ", " + posto + " ) : " );
rPosto.setDescription( posto.getDescription() );
rPosto.setIs_principal( posto.getIs_principal() );
rPosto.setHs_posto_id( posto.getId() );
@ -298,6 +321,8 @@ public class HigieneSegurancaLogic
public static void addRiscoToRelatorioPosto( HsRiscoData risco, Integer order, HsRelatorioPostoData rPosto ) throws Exception
{
// System.out.println( "\naddRiscoToRelatorioPosto( " + risco + ", " + order + ", " + rPosto + " ) : " );
HsRelatorioRiscoData rRelatorioRisco = new HsRelatorioRiscoData();
rRelatorioRisco.setToRelatorio_id( rPosto.toArea_id().toRelatorio_id() );
rRelatorioRisco.setDescription( risco.getDescription() );
@ -324,11 +349,15 @@ public class HigieneSegurancaLogic
private static void revertMedidasAndRiscos( HsPostoRiscoData postoRisco, HsRelatorioPostoData rPosto ) throws Exception
{
// System.out.println( "\nrevertMedidasAndRiscos( " + postoRisco + ", " + rPosto + " ) : " );
addRiscoToRelatorioPosto(postoRisco.toRisco_id(), postoRisco.getOrdem(), rPosto);
}
private static void revertMedidasAndRiscos( List<HsPostoRiscoData> postosRiscos, HsRelatorioPostoData rPosto ) throws Exception
{
// System.out.println( "\nrevertMedidasAndRiscos( " + postosRiscos + ", " + rPosto + " ) : " );
for( HsPostoRiscoData postoRisco : postosRiscos )
{
revertMedidasAndRiscos( postoRisco, rPosto );
@ -342,11 +371,19 @@ public class HigieneSegurancaLogic
public static void reverterLegislacao( HsRelatorioData relatorio, EstabelecimentosData estabelecimento ) throws Exception
{
int legislacaoSize = relatorio.fromHsRelatorioLegislacao_hs_relatorio_id().size();
for(int i = 0; i < legislacaoSize; ++i )
// System.out.println( "\nreverterLegislacao( " + estabelecimento + " ) : " );
List< HsRelatorioLegislacaoData > listLegislacao = relatorio.fromHsRelatorioLegislacao_hs_relatorio_id();
for ( HsRelatorioLegislacaoData legislacao : listLegislacao )
{
relatorio.fromHsRelatorioLegislacao_hs_relatorio_id().get( 0 ).delete();
legislacao.delete();
}
// int legislacaoSize = relatorio.fromHsRelatorioLegislacao_hs_relatorio_id().size();
// for(int i = 0; i < legislacaoSize; ++i )
// {
// relatorio.fromHsRelatorioLegislacao_hs_relatorio_id().get( 0 ).delete();
// }
for( HsLegislacaoEstabelecimentoData rel : estabelecimento.fromHsLegislacaoEstabelecimento_estabelecimento_id() )
{
HsLegislacaoData legislacao = rel.toLegislacao_id();
@ -358,6 +395,8 @@ public class HigieneSegurancaLogic
private static HsRelatorioLegislacaoData criarRelatorioLegislacao( HsRelatorioData relatorio, HsLegislacaoData legislacao )
{
// System.out.println( "\ncriarRelatorioLegislacao( " + legislacao + " ) : " );
HsRelatorioLegislacaoData result = null;
if( relatorio != null && legislacao != null )
{
@ -372,11 +411,19 @@ public class HigieneSegurancaLogic
public static void reverterNormalizacao( HsRelatorioData relatorio, EstabelecimentosData estabelecimento ) throws Exception
{
int normalizacaoSize = relatorio.fromHsRelatorioNormalizacao_hs_relatorio_id().size();
for(int i = 0; i < normalizacaoSize; ++i )
// System.out.println( "\nreverterNormalizacao( " + estabelecimento + " ) : " );
List< HsRelatorioNormalizacaoData > normalizacoes = relatorio.fromHsRelatorioNormalizacao_hs_relatorio_id();
for ( HsRelatorioNormalizacaoData normalizacao : normalizacoes )
{
relatorio.fromHsRelatorioNormalizacao_hs_relatorio_id().get( 0 ).delete();
normalizacao.delete();
}
// int normalizacaoSize = relatorio.fromHsRelatorioNormalizacao_hs_relatorio_id().size();
// for(int i = 0; i < normalizacaoSize; ++i )
// {
// relatorio.fromHsRelatorioNormalizacao_hs_relatorio_id().get( 0 ).delete();
// }
for( HsNormalizacaoEstabelecimentoData rel : estabelecimento.fromHsNormalizacaoEstabelecimento_estabelecimento_id() )
{
HsNormalizacaoData normalizacao = rel.toNormalizacao_id();
@ -387,6 +434,8 @@ public class HigieneSegurancaLogic
private static HsRelatorioNormalizacaoData criarRelatorioNormalizacao( HsRelatorioData relatorio, HsNormalizacaoData normalizacao )
{
// System.out.println( "\ncriarRelatorioNormalizacao( " + normalizacao + " ) : " );
HsRelatorioNormalizacaoData result = null;
if( relatorio != null && normalizacao != null )
{

Write Preview
Loading…
Cancel
Save