lxbfYeaa
/
SIPRP
forked from Coded/SIPRP
0
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Tiago Simão 17 years ago
parent 4aefdb48d6
commit 97c1e62c00
16 changed files with 251 additions and 61 deletions
Show Stats Download Patch File Download Diff File

43
trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/GerirAreasPanel.java
Unescape View File

@ -3,6 +3,7 @@ package siprp.higiene.gestao.postos;
import static com.evolute.utils.strings.UnicodeLatin1Map.aacute;
import static com.evolute.utils.strings.UnicodeLatin1Map.atilde;
import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil;
import static com.evolute.utils.strings.UnicodeLatin1Map.eacute;
import info.clearthought.layout.TableLayout;
import info.clearthought.layout.TableLayoutConstraints;
@ -10,11 +11,14 @@ import java.awt.Dimension;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import javax.swing.BorderFactory;
import javax.swing.JCheckBox;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
@ -58,6 +62,8 @@ public class GerirAreasPanel extends JPanel implements LeafUIConstants
public final LeafButton buttonPostoEditar = LeafIconButton.createDefaultEditButton();
public final LeafButton buttonPostoRemover = LeafIconButton.createDefaultRemoveButton();
private final JCheckBox checkGenerico = new JCheckBox( "Gen"+eacute+"rico" );
private final DefaultMutableTreeNode root = new DefaultMutableTreeNode();
@ -97,7 +103,7 @@ public class GerirAreasPanel extends JPanel implements LeafUIConstants
setLayout( layout );
layout = new TableLayout( new double[] {
TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL
TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL
}, new double[] {
TableLayout.MINIMUM
} );
@ -133,6 +139,8 @@ public class GerirAreasPanel extends JPanel implements LeafUIConstants
panel.add( buttonPostoRemover );
panelButtons.add( panel, new TableLayoutConstraints( 1, 0 ) );
panelButtons.add( checkGenerico, new TableLayoutConstraints(2,0));
panelTree.add( scroll, new TableLayoutConstraints( 0, 0 ) );
add( panelButtons, new TableLayoutConstraints( 0, 0 ) );
@ -146,7 +154,7 @@ public class GerirAreasPanel extends JPanel implements LeafUIConstants
@Override
public void valueChanged( TreeSelectionEvent e )
{
setEnabled();
setSelected();
}
} );
buttonAreaCriar.addActionListener( new ActionListener()
@ -197,6 +205,25 @@ public class GerirAreasPanel extends JPanel implements LeafUIConstants
removerPosto();
}
} );
checkGenerico.addItemListener( new ItemListener()
{
@Override
public void itemStateChanged( ItemEvent e )
{
HsPosto posto = getSelectedPosto();
if( posto != null )
{
posto.setIsPrincipal( checkGenerico.isSelected() );
try
{
posto.save();
} catch( Exception e1 )
{
e1.printStackTrace();
}
}
}
} );
}
private void criarArea()
@ -357,7 +384,7 @@ public class GerirAreasPanel extends JPanel implements LeafUIConstants
return result;
}
private void setEnabled()
private void setSelected()
{
TreePath path = tree.getSelectionPath();
TreeNode node = path == null ? null : (TreeNode) path.getLastPathComponent();
@ -369,6 +396,14 @@ public class GerirAreasPanel extends JPanel implements LeafUIConstants
buttonAreaRemover.setEnabled( areaSelected );
buttonAreaCriar.setEnabled( empresa != null );
buttonAreaEditar.setEnabled( areaSelected );
checkGenerico.setEnabled( postoSelected );
boolean generico = false;
if( postoSelected && node != null)
{
HsPosto posto = (HsPosto) ((PostoNode) node).getUserObject();
generico = posto != null && (posto.getIsPrincipal() ==null ? false : posto.getIsPrincipal() );
}
checkGenerico.setSelected(generico);
}
public void refresh()
@ -383,7 +418,7 @@ public class GerirAreasPanel extends JPanel implements LeafUIConstants
addArea( area );
}
}
setEnabled();
setSelected();
TreeTools.refreshTree( tree, root, false );
}

11
trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java
Unescape View File

@ -315,6 +315,17 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe
if( JOptionPane.YES_OPTION == ret )
{
HigieneSegurancaLogic.reverterRelatorio(relatorio);
if( relatorio != null )
{
try
{
relatorio.save();
}
catch( Exception e )
{
e.printStackTrace();
}
}
setRelatorio( relatorio, false );
}
}

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

@ -141,7 +141,6 @@ public class VerAreasRelatorioPanel extends JPanel
{
TreeTools.merge( root, HigieneSegurancaLogic.getAreasRelatorioTree( relatorio ) );
}
// TreeTools.sort( root );
TreeTools.refreshTree( tree, root, false );
}

4
trunk/SIPRPSoft/src/siprp/update/UpdateList.java
Unescape View File

@ -24,6 +24,7 @@ import siprp.update.updates.V10_9_To_V11_0;
import siprp.update.updates.V11_0_To_V11_1;
import siprp.update.updates.V11_1_To_V11_2;
import siprp.update.updates.V11_2_To_V11_3;
import siprp.update.updates.V11_3_To_V11_4;
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;
@ -92,7 +93,8 @@ public class UpdateList
new V10_5_To_V10_6(), new V10_6_To_V10_7(),
new V10_7_To_V10_8(), new V10_8_To_V10_9(),
new V10_9_To_V11_0(), new V11_0_To_V11_1(),
new V11_1_To_V11_2(), new V11_2_To_V11_3()
new V11_1_To_V11_2(), new V11_2_To_V11_3(),
new V11_3_To_V11_4()
};
protected static Executer EXECUTER;

2
trunk/SIPRPSoft/src/siprp/update/updates/V11_2_To_V11_3.java
Unescape View File

@ -41,7 +41,7 @@ public class V11_2_To_V11_3 implements siprp.update.Update
"alter table hs_relatorio_area add column ordem int4; " +
"alter table hs_area add column ordem int4; " +
"alter table hs_relatorio_posto_risco add column ordem int4; " +
"alter table hs_posto_risco add column ordem int4; "
"alter table hs_posto_risco add column ordem int4; "
);
executer.executeQuery( update );
new Importador( executer ).importar();

51
trunk/SIPRPSoft/src/siprp/update/updates/V11_3_To_V11_4.java
Unescape View File

@ -0,0 +1,51 @@
package siprp.update.updates;
import siprp.higiene.gestao.importacao.Importador;
import com.evolute.utils.Singleton;
import com.evolute.utils.db.DBManager;
import com.evolute.utils.db.Executer;
public class V11_3_To_V11_4 implements siprp.update.Update
{
public V11_3_To_V11_4()
{
}
public String []listChanges()
{
return new String[]{
"Higiene e seguranca: restruturacao"
};
}
public double getStartVersion()
{
return 11.3;
}
public double getEndVersion()
{
return 11.4;
}
public void doUpdate() throws Exception
{
DBManager dbm = ( DBManager ) Singleton.getInstance( Singleton.DEFAULT_DBMANAGER );
Executer executer = dbm.getSharedExecuter();
com.evolute.utils.sql.Update update =
new com.evolute.utils.sql.Update(
"alter table hs_legislacao_estabelecimento add column ordem int4; " +
"alter table hs_relatorio_legislacao add column ordem int4; "
);
executer.executeQuery( update );
new Importador( executer ).importar();
}
public String toString()
{
return "v" + getStartVersion() + " para v" + getEndVersion();
}
}

12
trunk/common/src/SIPRPMap.map.xml
Unescape View File

@ -254,6 +254,7 @@
<db-entity name="hs_legislacao_estabelecimento" schema="public">
<db-attribute name="estabelecimento_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
<db-attribute name="legislacao_id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
<db-attribute name="ordem" type="INTEGER" length="10"/>
</db-entity>
<db-entity name="hs_medida" schema="public">
<db-attribute name="deleted_date" type="TIMESTAMP"/>
@ -366,6 +367,7 @@
<db-attribute name="hs_legislacao_id" type="INTEGER" isMandatory="true" length="10"/>
<db-attribute name="hs_relatorio_id" type="INTEGER" isMandatory="true" length="10"/>
<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
<db-attribute name="ordem" type="INTEGER" length="10"/>
<db-key-generator>
<db-generator-type>ORACLE</db-generator-type>
<db-generator-name>hs_relatorio_legislacao_id_seq</db-generator-name>
@ -985,6 +987,7 @@
<obj-entity name="HsLegislacaoEmpresa" className="siprp.database.cayenne.objects.HsLegislacaoEmpresa" dbEntityName="hs_legislacao_empresa" superClassName="siprp.database.cayenne.objects.BaseObject">
</obj-entity>
<obj-entity name="HsLegislacaoEstabelecimento" className="siprp.database.cayenne.objects.HsLegislacaoEstabelecimento" dbEntityName="hs_legislacao_estabelecimento" superClassName="siprp.database.cayenne.objects.BaseObject">
<obj-attribute name="ordem" type="java.lang.Integer" db-attribute-path="ordem"/>
</obj-entity>
<obj-entity name="HsMedida" className="siprp.database.cayenne.objects.HsMedida" dbEntityName="hs_medida" superClassName="siprp.database.cayenne.objects.BaseObject">
<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
@ -1048,6 +1051,7 @@
<obj-attribute name="categoria" type="java.lang.String" db-attribute-path="categoria"/>
<obj-attribute name="descricao" type="java.lang.String" db-attribute-path="descricao"/>
<obj-attribute name="hsLegislacaoId" type="java.lang.Integer" db-attribute-path="hs_legislacao_id"/>
<obj-attribute name="ordem" type="java.lang.Integer" db-attribute-path="ordem"/>
</obj-entity>
<obj-entity name="HsRelatorioMedida" className="siprp.database.cayenne.objects.HsRelatorioMedida" dbEntityName="hs_relatorio_medida" superClassName="siprp.database.cayenne.objects.BaseObject">
<obj-attribute name="deletedDate" type="java.util.Date" db-attribute-path="deleted_date"/>
@ -1970,17 +1974,17 @@
<obj-relationship name="toHsRisco" source="HsPostoRisco" target="HsRisco" deleteRule="Nullify" db-relationship-path="toHsRisco"/>
<obj-relationship name="hsRelatorioArea" source="HsRelatorio" target="HsRelatorioArea" deleteRule="Cascade" db-relationship-path="hsRelatorioArea"/>
<obj-relationship name="hsRelatorioEquipamentoArray" source="HsRelatorio" target="HsRelatorioEquipamento" db-relationship-path="hsRelatorioEquipamentoArray"/>
<obj-relationship name="hsRelatorioLegislacaoArray" source="HsRelatorio" target="HsRelatorioLegislacao" db-relationship-path="hsRelatorioLegislacaoArray"/>
<obj-relationship name="hsRelatorioNormalizacaoArray" source="HsRelatorio" target="HsRelatorioNormalizacao" db-relationship-path="hsRelatorioNormalizacaoArray"/>
<obj-relationship name="hsRelatorioLegislacaoArray" source="HsRelatorio" target="HsRelatorioLegislacao" deleteRule="Cascade" db-relationship-path="hsRelatorioLegislacaoArray"/>
<obj-relationship name="hsRelatorioNormalizacaoArray" source="HsRelatorio" target="HsRelatorioNormalizacao" deleteRule="Cascade" db-relationship-path="hsRelatorioNormalizacaoArray"/>
<obj-relationship name="hsRelatorioRiscoArray" source="HsRelatorio" target="HsRelatorioRisco" deleteRule="Cascade" db-relationship-path="hsRelatorioRiscoArray"/>
<obj-relationship name="toHsMarcacoesEstabelecimento" source="HsRelatorio" target="MarcacoesEstabelecimento" db-relationship-path="toHsMarcacoesEstabelecimento"/>
<obj-relationship name="hsRelatorioPostoArray" source="HsRelatorioArea" target="HsRelatorioPosto" deleteRule="Cascade" db-relationship-path="hsRelatorioPostoArray"/>
<obj-relationship name="toHsRelatorio" source="HsRelatorioArea" target="HsRelatorio" deleteRule="Nullify" db-relationship-path="toHsRelatorio"/>
<obj-relationship name="toHsRelatorio" source="HsRelatorioEquipamento" target="HsRelatorio" deleteRule="Nullify" db-relationship-path="toHsRelatorio"/>
<obj-relationship name="toHsRelatorio" source="HsRelatorioLegislacao" target="HsRelatorio" db-relationship-path="toHsRelatorio"/>
<obj-relationship name="toHsRelatorio" source="HsRelatorioLegislacao" target="HsRelatorio" deleteRule="Nullify" db-relationship-path="toHsRelatorio"/>
<obj-relationship name="hsRelatorioPostoMedidaArray" source="HsRelatorioMedida" target="HsRelatorioPostoMedida" deleteRule="Cascade" db-relationship-path="hsRelatorioPostoMedidaArray"/>
<obj-relationship name="toHsRelatorioRisco" source="HsRelatorioMedida" target="HsRelatorioRisco" deleteRule="Nullify" db-relationship-path="toHsRelatorioRisco"/>
<obj-relationship name="toHsRelatorio" source="HsRelatorioNormalizacao" target="HsRelatorio" db-relationship-path="toHsRelatorio"/>
<obj-relationship name="toHsRelatorio" source="HsRelatorioNormalizacao" target="HsRelatorio" deleteRule="Nullify" db-relationship-path="toHsRelatorio"/>
<obj-relationship name="hsRelatorioPostoMedidaArray" source="HsRelatorioPosto" target="HsRelatorioPostoMedida" deleteRule="Cascade" db-relationship-path="hsRelatorioPostoMedidaArray"/>
<obj-relationship name="hsRelatorioPostoRiscoArray" source="HsRelatorioPosto" target="HsRelatorioPostoRisco" deleteRule="Cascade" db-relationship-path="hsRelatorioPostoRiscoArray"/>
<obj-relationship name="toHsRelatorioArea" source="HsRelatorioPosto" target="HsRelatorioArea" deleteRule="Nullify" db-relationship-path="toHsRelatorioArea"/>

15
trunk/common/src/leaf/ui/TreeTools.java
Unescape View File

@ -25,6 +25,10 @@ public class TreeTools
{
return o2 == null ? 0 : -1;
}
else if( (o1 instanceof Comparable ) && (o2 instanceof Comparable))
{
return ((Comparable)o1).compareTo( (Comparable) o2 );
}
else
{
return o2 == null ? 1 : StringPlainer.convertString( o1.toString() ).compareTo( StringPlainer.convertString( o2.toString() ) );
@ -157,7 +161,7 @@ public class TreeTools
}
}
public static void sort( DefaultMutableTreeNode result )
public static void sort( DefaultMutableTreeNode result, boolean useDefaultComparator )
{
if( result != null )
{
@ -167,7 +171,10 @@ public class TreeTools
children.add( (DefaultMutableTreeNode) result.getChildAt( i ) );
}
result.removeAllChildren();
Collections.sort( children, comparator );
if( useDefaultComparator )
{
Collections.sort( children, comparator );
}
for( DefaultMutableTreeNode child : children )
{
sort( child );
@ -175,6 +182,10 @@ public class TreeTools
}
}
}
public static void sort( DefaultMutableTreeNode result )
{
sort( result, true );
}
public static void sort( DefaultMutableTreeNode result, Comparator<DefaultMutableTreeNode> comparator )
{

8
trunk/common/src/siprp/database/cayenne/objects/BaseObject.java
Unescape View File

@ -89,18 +89,20 @@ public class BaseObject extends CayenneDataObject implements Comparable<BaseObje
if( dao.hasOrder( this ) && dao.hasOrder( object ) )
{
Object o1 = this.readProperty( "ordem" );
o1 = o1 != null ? o1 : this.readProperty( "order" );
if( o1 != null && (o1 instanceof Integer) )
{
Object o2 = this.readProperty( "ordem" );
Object o2 = object.readProperty( "ordem" );
o2 = o2 != null ? o2 : object.readProperty( "order" );
if( o2 != null && (o2 instanceof Integer) )
{
result = ((Integer)o1).compareTo( (Integer)o2 );
}
}
}
else
if( result == 0 )
{
StringPlainer.convertString( this.toString() ).compareTo( object == null ? null : StringPlainer.convertString( object.toString() ) );
result = StringPlainer.convertString( this.toString() ).compareTo( object == null ? null : StringPlainer.convertString( object.toString() ) );
}
return result;
}

20
trunk/common/src/siprp/database/cayenne/objects/HsArea.java
Unescape View File

@ -18,6 +18,26 @@ public class HsArea extends _HsArea {
super.setDescription( parseToUnicode( nome ) );
}
@Override
public void save() throws Exception
{
Empresas empresa = getToEmpresas();
if( empresa != null )
{
Integer maxOrder = 0;
for( HsArea area : empresa.getHsAreaArray() )
{
Integer currentOrder = area.getOrder();
if( currentOrder != null )
{
maxOrder = Math.max( currentOrder, maxOrder );
}
}
this.setOrder( maxOrder + 1 );
}
super.save();
}
@Override
public String toString()
{

22
trunk/common/src/siprp/database/cayenne/objects/HsLegislacaoEstabelecimento.java
Unescape View File

@ -4,4 +4,26 @@ import siprp.database.cayenne.objects.auto._HsLegislacaoEstabelecimento;
public class HsLegislacaoEstabelecimento extends _HsLegislacaoEstabelecimento {
private static final long serialVersionUID = 1L;
@Override
public void save() throws Exception
{
Estabelecimentos estabelecimento = getToHsEstabelecimento();
if( estabelecimento != null )
{
Integer maxOrder = 0;
for( HsLegislacaoEstabelecimento rel : estabelecimento.getHsLegislacaoEstabelecimentoArray() )
{
Integer currentOrder = rel.getOrdem();
if( currentOrder != null )
{
maxOrder = Math.max( currentOrder, maxOrder );
}
}
this.setOrdem( maxOrder + 1 );
}
super.save();
}
}

19
trunk/common/src/siprp/database/cayenne/objects/HsPostoRisco.java
Unescape View File

@ -11,5 +11,24 @@ public class HsPostoRisco extends _HsPostoRisco {
{
return super.getToHsRisco().getDescription();
}
@Override
public void save() throws Exception
{
HsPosto posto = getToHsPosto();
if( posto != null )
{
Integer maxOrder = 0;
for( HsPostoRisco rel : posto.getHsPostoRiscoArray() )
{
Integer currentOrder = rel.getOrder();
if( currentOrder != null )
{
maxOrder = Math.max( currentOrder, maxOrder );
}
}
this.setOrder( maxOrder + 1 );
}
super.save();
}
}

8
trunk/common/src/siprp/database/cayenne/objects/auto/_HsLegislacaoEstabelecimento.java
Unescape View File

@ -12,12 +12,20 @@ import siprp.database.cayenne.objects.HsLegislacao;
*/
public abstract class _HsLegislacaoEstabelecimento extends BaseObject {
public static final String ORDEM_PROPERTY = "ordem";
public static final String TO_HS_ESTABELECIMENTO_PROPERTY = "toHsEstabelecimento";
public static final String TO_HS_LEGISLACAO_PROPERTY = "toHsLegislacao";
public static final String ESTABELECIMENTO_ID_PK_COLUMN = "estabelecimento_id";
public static final String LEGISLACAO_ID_PK_COLUMN = "legislacao_id";
public void setOrdem(Integer ordem) {
writeProperty("ordem", ordem);
}
public Integer getOrdem() {
return (Integer)readProperty("ordem");
}
public void setToHsEstabelecimento(Estabelecimentos toHsEstabelecimento) {
setToOneTarget("toHsEstabelecimento", toHsEstabelecimento, true);
}

8
trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioLegislacao.java
Unescape View File

@ -14,6 +14,7 @@ public abstract class _HsRelatorioLegislacao extends BaseObject {
public static final String CATEGORIA_PROPERTY = "categoria";
public static final String DESCRICAO_PROPERTY = "descricao";
public static final String HS_LEGISLACAO_ID_PROPERTY = "hsLegislacaoId";
public static final String ORDEM_PROPERTY = "ordem";
public static final String TO_HS_RELATORIO_PROPERTY = "toHsRelatorio";
public static final String ID_PK_COLUMN = "id";
@ -39,6 +40,13 @@ public abstract class _HsRelatorioLegislacao extends BaseObject {
return (Integer)readProperty("hsLegislacaoId");
}
public void setOrdem(Integer ordem) {
writeProperty("ordem", ordem);
}
public Integer getOrdem() {
return (Integer)readProperty("ordem");
}
public void setToHsRelatorio(HsRelatorio toHsRelatorio) {
setToOneTarget("toHsRelatorio", toHsRelatorio, true);
}

9
trunk/common/src/siprp/database/cayenne/providers/MainDAO.java
Unescape View File

@ -34,7 +34,14 @@ public class MainDAO
public boolean hasOrder( BaseObject baseObject )
{
return baseObject == null ? false : (null != baseObject.getObjEntity().getAttribute( "ordem" ) );
if( baseObject == null || baseObject.getObjEntity() == null )
{
return false;
}
else
{
return baseObject == null ? false : ( null != baseObject.getObjEntity().getAttribute( "ordem" ) || null != baseObject.getObjEntity().getAttribute( "order" ));
}
}
}

79
trunk/common/src/siprp/logic/HigieneSegurancaLogic.java
Unescape View File

@ -4,6 +4,7 @@ import static com.evolute.utils.strings.UnicodeLatin1Map.atilde;
import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil;
import static com.evolute.utils.strings.UnicodeLatin1Map.iacute;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@ -169,7 +170,8 @@ public class HigieneSegurancaLogic
DefaultMutableTreeNode result = new DefaultMutableTreeNode();
if( relatorio != null )
{
for( HsRelatorioArea area : relatorio.getHsRelatorioArea() )
List<HsRelatorioArea> areas = relatorio.getHsRelatorioArea();
for( HsRelatorioArea area : areas )
{
AreaRelatorioNode areaNode = new AreaRelatorioNode(area);
for( HsRelatorioPosto posto : area.getHsRelatorioPostoArray() )
@ -196,7 +198,8 @@ public class HigieneSegurancaLogic
reverterNormalizacao( relatorio, estabelecimento );
}
}
} catch( Exception e )
}
catch( Exception e )
{
LeafDialog.error(e);
}
@ -230,6 +233,7 @@ public class HigieneSegurancaLogic
{
rArea = new HsRelatorioArea();
rArea.setDescription( area.getDescription() );
rArea.setOrder( area.getOrder() );
rArea.setToHsRelatorio( relatorio );
areasInserted.put(area,rArea);
}
@ -248,6 +252,7 @@ public class HigieneSegurancaLogic
HsRelatorioPostoRisco rPostoRisco = new HsRelatorioPostoRisco();
rPostoRisco.setToHsRelatorioPosto( rPosto );
rPostoRisco.setToHsRelatorioRisco( rRelatorioRisco );
rPostoRisco.setOrder( postoRisco.getOrder() );
for( HsRiscoMedida riscoMedida : postoRisco.getToHsRisco().getHsRiscoMedidaArray() )
{
HsRelatorioMedida rMedida = new HsRelatorioMedida();
@ -264,14 +269,16 @@ public class HigieneSegurancaLogic
private static void reverterLegislacao( HsRelatorio relatorio, Estabelecimentos estabelecimento ) throws Exception
{
for(HsRelatorioLegislacao legislacao : relatorio.getHsRelatorioLegislacaoArray())
int legislacaoSize = relatorio.getHsRelatorioLegislacaoArray().size();
for(int i = 0; i < legislacaoSize; ++i )
{
legislacao.delete();
relatorio.getHsRelatorioLegislacaoArray().get( 0 ).delete();
}
for( HsLegislacaoEstabelecimento rel : estabelecimento.getHsLegislacaoEstabelecimentoArray() )
{
HsLegislacao legislacao = rel.getToHsLegislacao();
HsRelatorioLegislacao relatorioLegislacao = criarRelatorioLegislacao( relatorio, legislacao );
relatorioLegislacao.setOrdem( rel.getOrdem() );
relatorioLegislacao.save();
}
}
@ -292,9 +299,10 @@ public class HigieneSegurancaLogic
private static void reverterNormalizacao( HsRelatorio relatorio, Estabelecimentos estabelecimento ) throws Exception
{
for(HsRelatorioNormalizacao normalizacao : relatorio.getHsRelatorioNormalizacaoArray() )
int normalizacaoSize = relatorio.getHsRelatorioNormalizacaoArray().size();
for(int i = 0; i < normalizacaoSize; ++i )
{
normalizacao.delete();
relatorio.getHsRelatorioNormalizacaoArray().get( 0 ).delete();
}
for( HsNormalizacaoEstabelecimento rel : estabelecimento.getHsNormalizacaoEstabelecimentoArray() )
{
@ -527,54 +535,37 @@ public class HigieneSegurancaLogic
DefaultMutableTreeNode result = new DefaultMutableTreeNode();
DefaultMutableTreeNode geral = new DefaultMutableTreeNode( "Legisla" + ccedil + atilde + "o de aplica" + ccedil + atilde + "o geral" );
DefaultMutableTreeNode especifica = new DefaultMutableTreeNode( "Legisla" + ccedil + atilde + "o espec" + iacute + "fica" );
for( HsLegislacao legislacao : planoProvider.getAllLegislacaoGeral() )
if( estabelecimento != null )
{
if( estabelecimento == null || hasEstabelecimento( legislacao, estabelecimento ) )
for( HsLegislacaoEstabelecimento rel : estabelecimento.getHsLegislacaoEstabelecimentoArray() )
{
DefaultMutableTreeNode legislacaoNode = new DefaultMutableTreeNode( legislacao );
geral.add( legislacaoNode );
}
}
for( HsLegislacaoCategoria categoria : planoProvider.getAllLegislacaoCategorias( ) )
{
boolean addCategory = false;
DefaultMutableTreeNode categoriaNode = new DefaultMutableTreeNode( categoria );
for( HsLegislacao legislacao : categoria.getHsLegislacaoArray() )
{
if( estabelecimento == null || hasEstabelecimento( legislacao, estabelecimento ) )
HsLegislacao legislacao = rel.getToHsLegislacao();
if( legislacao != null )
{
DefaultMutableTreeNode legislacaoNode = new DefaultMutableTreeNode( legislacao );
categoriaNode.add( legislacaoNode );
addCategory = true;
HsLegislacaoCategoria categoria = legislacao.getToHsLegislacaoCategoria();
if( categoria == null )
{
DefaultMutableTreeNode legislacaoNode = new DefaultMutableTreeNode( rel.getToHsLegislacao() );
geral.add( legislacaoNode );
}
else
{
DefaultMutableTreeNode categoriaNode = TreeTools.findNodeWithUserObject( categoria, especifica );
if( categoriaNode == null )
{
categoriaNode = new DefaultMutableTreeNode(categoria);
especifica.add(categoriaNode);
}
DefaultMutableTreeNode legislacaoNode = new DefaultMutableTreeNode( rel.getToHsLegislacao() );
categoriaNode.add( legislacaoNode );
}
}
}
if( addCategory)
{
especifica.add( categoriaNode );
}
}
result.add( geral );
result.add( especifica );
return result;
}
private static boolean hasEstabelecimento( HsLegislacao legislacao, Estabelecimentos estabelecimento )
{
boolean result = false;
if( legislacao != null && estabelecimento != null )
{
for( HsLegislacaoEstabelecimento rel : legislacao.getHsLegislacaoEstabelecimentoArray() )
{
result = estabelecimento.equals( rel.getToHsEstabelecimento());
if( result )
{
break;
}
}
}
return result;
}
public static DefaultMutableTreeNode getEquipamentosTree()
{

Write Preview
Loading…
Cancel
Save