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

Browse Source
0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Tiago Simão 17 years ago
parent 67b3a90097
commit 9aaaf53f18
6 changed files with 202 additions and 73 deletions
Show Stats Download Patch File Download Diff File

7
trunk/SIPRPSoft/src/siprp/higiene/gestao/AdicionarEmailsPanel.java
Unescape View File

@ -14,6 +14,7 @@ import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeSelectionModel; import javax.swing.tree.TreeSelectionModel;
import siprp.database.cayenne.objects.Empresas; import siprp.database.cayenne.objects.Empresas;
import siprp.database.cayenne.objects.Estabelecimentos;
import com.evolute.utils.tables.VectorTableModel; import com.evolute.utils.tables.VectorTableModel;
@ -88,4 +89,10 @@ public class AdicionarEmailsPanel extends JPanel
} }
public void setEstabelecimento( Estabelecimentos estabelecimento )
{
// TODO Auto-generated method stub
}
} }

28
trunk/SIPRPSoft/src/siprp/higiene/gestao/GerirEstabelecimentosPanel.java
Unescape View File

@ -6,6 +6,7 @@ import info.clearthought.layout.TableLayout;
import info.clearthought.layout.TableLayoutConstraints; import info.clearthought.layout.TableLayoutConstraints;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.GridLayout;
import java.awt.event.ItemEvent; import java.awt.event.ItemEvent;
import java.awt.event.ItemListener; import java.awt.event.ItemListener;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
@ -19,6 +20,7 @@ import siprp.database.cayenne.objects.Empresas;
import siprp.database.cayenne.objects.Estabelecimentos; import siprp.database.cayenne.objects.Estabelecimentos;
import siprp.database.cayenne.objects.HsPosto; import siprp.database.cayenne.objects.HsPosto;
import siprp.higiene.gestao.legislacao.AdicionarLegislacaoPanel; import siprp.higiene.gestao.legislacao.AdicionarLegislacaoPanel;
import siprp.higiene.gestao.normalizacao.AdicionarNormalizacaoPanel;
import siprp.higiene.gestao.postos.AdicionarAreasPanel; import siprp.higiene.gestao.postos.AdicionarAreasPanel;
import siprp.higiene.gestao.riscos.AdicionarRiscosPanel; import siprp.higiene.gestao.riscos.AdicionarRiscosPanel;
@ -28,10 +30,12 @@ public class GerirEstabelecimentosPanel extends JPanel
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final JComboBox comboEstabelecimentos = new JComboBox(); private final JComboBox comboEstabelecimentos = new JComboBox();
private final JPanel panelAreasRiscos = new JPanel();
private final AdicionarAreasPanel panelAreas = new AdicionarAreasPanel(); private final AdicionarAreasPanel panelAreas = new AdicionarAreasPanel();
private final AdicionarRiscosPanel panelRiscos = new AdicionarRiscosPanel(); private final AdicionarRiscosPanel panelRiscos = new AdicionarRiscosPanel();
private final AdicionarEmailsPanel panelEmails = new AdicionarEmailsPanel(); private final AdicionarEmailsPanel panelEmails = new AdicionarEmailsPanel();
private final AdicionarLegislacaoPanel panelLegislacao = new AdicionarLegislacaoPanel(); private final AdicionarLegislacaoPanel panelLegislacao = new AdicionarLegislacaoPanel();
private final AdicionarNormalizacaoPanel panelNormalizacao = new AdicionarNormalizacaoPanel();
public GerirEstabelecimentosPanel() public GerirEstabelecimentosPanel()
{ {
@ -43,31 +47,35 @@ public class GerirEstabelecimentosPanel extends JPanel
private void startupComponents() private void startupComponents()
{ {
panelAreas.setBorder( BorderFactory.createTitledBorder( "Postos de trabalho" ) ); panelAreasRiscos.setBorder( BorderFactory.createTitledBorder( "Riscos por posto de trabalho" ) );
panelRiscos.setBorder( BorderFactory.createTitledBorder( "Riscos" ) ); panelRiscos.setBorder( BorderFactory.createTitledBorder( "Riscos" ) );
panelEmails.setBorder( BorderFactory.createTitledBorder( "Emails" ) ); panelEmails.setBorder( BorderFactory.createTitledBorder( "Emails" ) );
panelLegislacao.setBorder( BorderFactory.createTitledBorder( "Legisla" + ccedil + atilde + "o" ) ); panelLegislacao.setBorder( BorderFactory.createTitledBorder( "Legisla" + ccedil + atilde + "o" ) );
panelEmails.setPreferredSize( new Dimension(0,150) ); panelEmails.setPreferredSize( new Dimension(0,150) );
} }
private void setupLayout() private void setupLayout()
{ {
double [] cols = new double[]{ TableLayout.FILL, TableLayout.FILL, TableLayout.FILL, }; double [] cols = new double[]{ TableLayout.FILL, TableLayout.FILL, TableLayout.FILL, };
double [] rows = new double[]{ TableLayout.MINIMUM, TableLayout.FILL, TableLayout.PREFERRED }; double [] rows = new double[]{ TableLayout.MINIMUM, TableLayout.FILL,TableLayout.FILL, TableLayout.PREFERRED };
TableLayout layout = new TableLayout( cols, rows ); TableLayout layout = new TableLayout( cols, rows );
layout.setHGap( 5 ); layout.setHGap( 5 );
layout.setVGap( 5 ); layout.setVGap( 5 );
this.setLayout( layout ); this.setLayout( layout );
panelAreasRiscos.setLayout( new GridLayout( 1, 2 ) );
} }
private void placeComponents() private void placeComponents()
{ {
panelAreasRiscos.add( panelAreas );
panelAreasRiscos.add( panelRiscos );
this.add( comboEstabelecimentos, new TableLayoutConstraints( 0, 0, 2, 0 ) ); this.add( comboEstabelecimentos, new TableLayoutConstraints( 0, 0, 2, 0 ) );
this.add( panelAreas, new TableLayoutConstraints( 0, 1, 0, 2 ) ); this.add( panelAreasRiscos, new TableLayoutConstraints( 0, 1, 1, 3 ) );
this.add( panelRiscos, new TableLayoutConstraints( 1, 1, 1, 2 ) );
this.add( panelLegislacao, new TableLayoutConstraints( 2, 1 ) ); this.add( panelLegislacao, new TableLayoutConstraints( 2, 1 ) );
this.add( panelEmails, new TableLayoutConstraints( 2, 2 ) ); this.add( panelNormalizacao, new TableLayoutConstraints( 2, 2 ) );
this.add( panelEmails, new TableLayoutConstraints( 2, 3 ) );
} }
private void startupListeners() private void startupListeners()
@ -81,7 +89,11 @@ public class GerirEstabelecimentosPanel extends JPanel
{ {
if( e.getItem() instanceof Estabelecimentos ) if( e.getItem() instanceof Estabelecimentos )
{ {
panelAreas.setEstabelecimento( (Estabelecimentos) e.getItem() ); Estabelecimentos estabelecimento = (Estabelecimentos) e.getItem();
panelAreas.setEstabelecimento( estabelecimento );
panelEmails.setEstabelecimento( estabelecimento );
panelLegislacao.setEstabelecimento( estabelecimento );
panelNormalizacao.setEstabelecimento( estabelecimento );
} }
} }
} }
@ -118,8 +130,6 @@ public class GerirEstabelecimentosPanel extends JPanel
comboEstabelecimentos.setSelectedIndex( 0 ); comboEstabelecimentos.setSelectedIndex( 0 );
} }
} }
panelEmails.setEmpresa( empresa );
panelLegislacao.setEmpresa( empresa );
} }
} }

111
trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/AdicionarLegislacaoPanel.java
Unescape View File

@ -2,17 +2,13 @@ package siprp.higiene.gestao.legislacao;
import static com.evolute.utils.strings.UnicodeLatin1Map.atilde; import static com.evolute.utils.strings.UnicodeLatin1Map.atilde;
import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil;
import info.clearthought.layout.TableLayout;
import info.clearthought.layout.TableLayoutConstraints;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTree;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath; import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel;
import leaf.ui.LeafError;
import leaf.ui.TreeInserterDialog;
import leaf.ui.TreeTools;
import siprp.database.cayenne.objects.Empresas; import siprp.database.cayenne.objects.Empresas;
import siprp.database.cayenne.objects.Estabelecimentos; import siprp.database.cayenne.objects.Estabelecimentos;
import siprp.database.cayenne.objects.HsLegislacao; import siprp.database.cayenne.objects.HsLegislacao;
@ -21,11 +17,6 @@ import siprp.database.cayenne.objects.HsLegislacaoEstabelecimento;
import siprp.higiene.gestao.AdicionarPanel; import siprp.higiene.gestao.AdicionarPanel;
import siprp.logic.HigieneSegurancaLogic; import siprp.logic.HigieneSegurancaLogic;
import leaf.ui.LeafButton;
import leaf.ui.LeafError;
import leaf.ui.TreeInserterDialog;
import leaf.ui.TreeTools;
public class AdicionarLegislacaoPanel extends AdicionarPanel public class AdicionarLegislacaoPanel extends AdicionarPanel
{ {
@ -69,72 +60,76 @@ private static final long serialVersionUID = 1L;
DefaultMutableTreeNode result = new DefaultMutableTreeNode(); DefaultMutableTreeNode result = new DefaultMutableTreeNode();
if( empresa != null ) if( empresa != null )
{ {
result = HigieneSegurancaLogic.getLegislacaoTree( null ); result = HigieneSegurancaLogic.getLegislacaoTreeForEmpresa( null );
} }
else if( estabelecimento != null ) else if( estabelecimento != null )
{ {
result = HigieneSegurancaLogic.getLegislacaoTree( estabelecimento.getToEmpresas() ); result = HigieneSegurancaLogic.getLegislacaoTreeForEmpresa( estabelecimento.getToEmpresas() );
} }
return result; return result;
} }
private void removeCurrent( DefaultMutableTreeNode all ) private void removeCurrent( DefaultMutableTreeNode all )
{ {
// if( all != null && root.getChildCount() == 2 && all.getChildCount() == 2 ) if( all != null && root.getChildCount() == 2 && all.getChildCount() == 2 )
// { {
// DefaultMutableTreeNode portuguesaAll = (DefaultMutableTreeNode) all.getChildAt( 0 ); DefaultMutableTreeNode geralAll = (DefaultMutableTreeNode) all.getChildAt( 0 );
// DefaultMutableTreeNode internacionalAll = (DefaultMutableTreeNode) all.getChildAt( 1 ); DefaultMutableTreeNode especificaAll = (DefaultMutableTreeNode) all.getChildAt( 1 );
// DefaultMutableTreeNode portuguesaCurrent = (DefaultMutableTreeNode) root.getChildAt( 0 ); DefaultMutableTreeNode geralCurrent = (DefaultMutableTreeNode) root.getChildAt( 0 );
// DefaultMutableTreeNode internacionalCurrent = (DefaultMutableTreeNode) root.getChildAt( 1 ); DefaultMutableTreeNode especificaCurrent = (DefaultMutableTreeNode) root.getChildAt( 1 );
// TreeTools.remove( portuguesaAll, portuguesaCurrent ); TreeTools.remove( geralAll, geralCurrent );
// TreeTools.remove( internacionalAll, internacionalCurrent ); TreeTools.removeAllLeafs( especificaAll, especificaCurrent );
// } }
} }
private void addResult( DefaultMutableTreeNode root ) private void addResult( DefaultMutableTreeNode root )
{ {
// try try
// { {
// if( root != null ) if( root != null )
// { {
// Object userObject = root.getUserObject(); Object userObject = root.getUserObject();
// if( userObject instanceof HsNormalizacao ) if( userObject instanceof HsLegislacao )
// { {
// if( empresa != null ) if( empresa != null )
// { {
// HsNormalizacaoEmpresa rel = new HsNormalizacaoEmpresa(); HsLegislacaoEmpresa rel = new HsLegislacaoEmpresa();
// rel.setToEmpresa( empresa ); rel.setToHsEmpresa( empresa );
// rel.setToHsNormalizacao( ((HsNormalizacao) userObject ) ); rel.setToHsLegislacao( ((HsLegislacao) userObject ) );
// rel.save(); rel.save();
// } }
// else if( estabelecimento != null ) else if( estabelecimento != null )
// { {
// HsNormalizacaoEstabelecimento rel = new HsNormalizacaoEstabelecimento(); HsLegislacaoEstabelecimento rel = new HsLegislacaoEstabelecimento();
// rel.setToEstabelecimento( estabelecimento ); rel.setToHsEstabelecimento( estabelecimento );
// rel.setToHsNormalizacao( ((HsNormalizacao) userObject ) ); rel.setToHsLegislacao( ((HsLegislacao) userObject ) );
// rel.save(); rel.save();
// } }
// } }
// } }
// for( int i = 0; i < root.getChildCount(); ++i ) for( int i = 0; i < root.getChildCount(); ++i )
// { {
// DefaultMutableTreeNode child = (DefaultMutableTreeNode) root.getChildAt( i ); DefaultMutableTreeNode child = (DefaultMutableTreeNode) root.getChildAt( i );
// addResult( child ); addResult( child );
// } }
// } }
// catch( Exception e ) catch( Exception e )
// { {
// LeafError.error( e ); LeafError.error( e );
// } }
} }
@Override @Override
public void refresh() public void refresh()
{ {
root.removeAllChildren(); root.removeAllChildren();
if( empresa != null || estabelecimento != null ) if( empresa != null )
{
TreeTools.merge( root, HigieneSegurancaLogic.getLegislacaoTreeForEmpresa( empresa ) );
}
else if( estabelecimento != null )
{ {
TreeTools.merge( root, HigieneSegurancaLogic.getLegislacaoTree( empresa != null ? empresa : estabelecimento.getToEmpresas() ) ); TreeTools.merge( root, HigieneSegurancaLogic.getLegislacaoTreeForEstabelecimento( estabelecimento ) );
} }
setEnabled(); setEnabled();
TreeTools.refreshTree( tree, root ); TreeTools.refreshTree( tree, root );

12
trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/AdicionarNormalizacaoPanel.java
Unescape View File

@ -60,11 +60,11 @@ public class AdicionarNormalizacaoPanel extends AdicionarPanel
DefaultMutableTreeNode result = new DefaultMutableTreeNode(); DefaultMutableTreeNode result = new DefaultMutableTreeNode();
if( empresa != null ) if( empresa != null )
{ {
result = HigieneSegurancaLogic.getNormalizacaoTree( null ); result = HigieneSegurancaLogic.getNormalizacaoTreeForEmpresa( null );
} }
else if( estabelecimento != null ) else if( estabelecimento != null )
{ {
result = HigieneSegurancaLogic.getNormalizacaoTree( estabelecimento.getToEmpresas() ); result = HigieneSegurancaLogic.getNormalizacaoTreeForEmpresa( estabelecimento.getToEmpresas() );
} }
return result; return result;
} }
@ -123,9 +123,13 @@ public class AdicionarNormalizacaoPanel extends AdicionarPanel
public void refresh() public void refresh()
{ {
root.removeAllChildren(); root.removeAllChildren();
if( empresa != null || estabelecimento != null ) if( empresa != null)
{ {
TreeTools.merge( root, HigieneSegurancaLogic.getNormalizacaoTree( empresa != null ? empresa : estabelecimento.getToEmpresas() ) ); TreeTools.merge( root, HigieneSegurancaLogic.getNormalizacaoTreeForEmpresa( empresa ) );
}
if( estabelecimento != null )
{
TreeTools.merge( root, HigieneSegurancaLogic.getNormalizacaoTreeForEstabelecimento( estabelecimento ) );
} }
setEnabled(); setEnabled();
TreeTools.refreshTree( tree, root ); TreeTools.refreshTree( tree, root );

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

@ -99,4 +99,18 @@ public class TreeTools
} }
} }
public static void removeAllLeafs( DefaultMutableTreeNode from, DefaultMutableTreeNode what )
{
for( int i = 0; i < what.getChildCount(); ++i )
{
DefaultMutableTreeNode child = (DefaultMutableTreeNode) what.getChildAt( i );
removeAllLeafs( from, child );
}
DefaultMutableTreeNode exists = TreeTools.findNodeWithUserObject( what.getUserObject(), from );
if( exists != null && exists.getChildCount() == 0 )
{
exists.removeFromParent();
}
}
} }

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

@ -13,8 +13,10 @@ import siprp.database.cayenne.objects.HsArea;
import siprp.database.cayenne.objects.HsLegislacao; import siprp.database.cayenne.objects.HsLegislacao;
import siprp.database.cayenne.objects.HsLegislacaoCategoria; import siprp.database.cayenne.objects.HsLegislacaoCategoria;
import siprp.database.cayenne.objects.HsLegislacaoEmpresa; import siprp.database.cayenne.objects.HsLegislacaoEmpresa;
import siprp.database.cayenne.objects.HsLegislacaoEstabelecimento;
import siprp.database.cayenne.objects.HsNormalizacao; import siprp.database.cayenne.objects.HsNormalizacao;
import siprp.database.cayenne.objects.HsNormalizacaoEmpresa; import siprp.database.cayenne.objects.HsNormalizacaoEmpresa;
import siprp.database.cayenne.objects.HsNormalizacaoEstabelecimento;
import siprp.database.cayenne.objects.HsPosto; import siprp.database.cayenne.objects.HsPosto;
import siprp.database.cayenne.objects.HsPostoEstabelecimento; import siprp.database.cayenne.objects.HsPostoEstabelecimento;
import siprp.database.cayenne.objects.HsPostoRisco; import siprp.database.cayenne.objects.HsPostoRisco;
@ -306,7 +308,7 @@ public class HigieneSegurancaLogic
return result; return result;
} }
public static DefaultMutableTreeNode getNormalizacaoTree( Empresas empresa ) public static DefaultMutableTreeNode getNormalizacaoTreeForEmpresa( Empresas empresa )
{ {
DefaultMutableTreeNode result = new DefaultMutableTreeNode(); DefaultMutableTreeNode result = new DefaultMutableTreeNode();
DefaultMutableTreeNode portuguesa = new DefaultMutableTreeNode("Normaliza" + ccedil + atilde + "o Portuguesa" ); DefaultMutableTreeNode portuguesa = new DefaultMutableTreeNode("Normaliza" + ccedil + atilde + "o Portuguesa" );
@ -349,7 +351,50 @@ public class HigieneSegurancaLogic
return result; return result;
} }
public static DefaultMutableTreeNode getLegislacaoTree( Empresas empresa ) public static DefaultMutableTreeNode getNormalizacaoTreeForEstabelecimento( Estabelecimentos estabelecimento )
{
DefaultMutableTreeNode result = new DefaultMutableTreeNode();
DefaultMutableTreeNode portuguesa = new DefaultMutableTreeNode("Normaliza" + ccedil + atilde + "o Portuguesa" );
DefaultMutableTreeNode internacional = new DefaultMutableTreeNode("Normaliza" + ccedil + atilde + "o Internacional" );
for( HsNormalizacao normalizacao : planoProvider.getNormalizacao( true ) )
{
if( estabelecimento == null || hasEstabelecimento( normalizacao, estabelecimento ) )
{
DefaultMutableTreeNode normalizacaoNode = new DefaultMutableTreeNode( normalizacao );
portuguesa.add( normalizacaoNode );
}
}
for( HsNormalizacao normalizacao : planoProvider.getNormalizacao( false ) )
{
if( estabelecimento == null || hasEstabelecimento( normalizacao, estabelecimento ) )
{
DefaultMutableTreeNode normalizacaoNode = new DefaultMutableTreeNode( normalizacao );
internacional.add( normalizacaoNode );
}
}
result.add( portuguesa );
result.add( internacional );
return result;
}
private static boolean hasEstabelecimento( HsNormalizacao normalizacao, Estabelecimentos estabelecimento )
{
boolean result = false;
if( normalizacao != null && estabelecimento != null )
{
for( HsNormalizacaoEstabelecimento rel : normalizacao.getHsNormalizacaoEstabelecimentoArray())
{
result = estabelecimento.equals( rel.getToEstabelecimento() );
if( result )
{
break;
}
}
}
return result;
}
public static DefaultMutableTreeNode getLegislacaoTreeForEmpresa( Empresas empresa )
{ {
DefaultMutableTreeNode result = new DefaultMutableTreeNode(); DefaultMutableTreeNode result = new DefaultMutableTreeNode();
DefaultMutableTreeNode geral = new DefaultMutableTreeNode( "Legisla" + ccedil + atilde + "o de aplica" + ccedil + atilde + "o geral" ); DefaultMutableTreeNode geral = new DefaultMutableTreeNode( "Legisla" + ccedil + atilde + "o de aplica" + ccedil + atilde + "o geral" );
@ -403,4 +448,58 @@ public class HigieneSegurancaLogic
return result; return result;
} }
public static DefaultMutableTreeNode getLegislacaoTreeForEstabelecimento( Estabelecimentos estabelecimento )
{
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 || hasEstabelecimento( legislacao, estabelecimento ) )
{
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 ) )
{
DefaultMutableTreeNode legislacaoNode = new DefaultMutableTreeNode( legislacao );
categoriaNode.add( legislacaoNode );
addCategory = true;
}
}
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;
}
} }

Write Preview
Loading…
Cancel
Save