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

trunk/SIPRPSoft/src/siprp/higiene/gestao/AdicionarPanel.java

@@ -17,17 +17,22 @@ import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
 import leaf.ui.LeafButton;
+import leaf.ui.LeafIconButton;
 
 public abstract class AdicionarPanel extends JPanel
 {
 
 	private static final long serialVersionUID = 1L;
 	
-	public static final String SELECTION_CHANGED = "SELECTION_CHANGED";
+	private static final String ICON_NAME_SAVE = "siprp/higiene/gestao/add.png";
+
+	private static final String ICON_NAME_REVERT = "siprp/higiene/gestao/delete.png";
 	
-	protected final LeafButton buttonAdicionar = new LeafButton( "Adicionar" );
+	protected final LeafButton buttonAdicionar = LeafIconButton.createButton( ICON_NAME_SAVE );
 
-	protected final LeafButton buttonRemover = new LeafButton( "Remover" );
+	protected final LeafButton buttonRemover = LeafIconButton.createButton( ICON_NAME_REVERT );
+
+	public static final String SELECTION_CHANGED = "SELECTION_CHANGED";
 
 	protected final DefaultMutableTreeNode root = new DefaultMutableTreeNode();
 
@@ -69,7 +74,7 @@ public abstract class AdicionarPanel extends JPanel
 	{
 		JPanel panel = new JPanel();
 		TableLayout layout = new TableLayout( new double[] {
-				TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM
+				TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL
 		}, new double[] {
 			TableLayout.MINIMUM
 		} );
@@ -77,7 +82,7 @@ public abstract class AdicionarPanel extends JPanel
 		layout.setVGap( 5 );
 		panel.setLayout( layout );
 		panel.add( buttonAdicionar, new TableLayoutConstraints( 0, 0 ) );
-		panel.add( buttonRemover, new TableLayoutConstraints( 2, 0 ) );
+		panel.add( buttonRemover, new TableLayoutConstraints( 1, 0 ) );
 
 		add( panel, new TableLayoutConstraints( 0, 0 ) );
 		add( scroll, new TableLayoutConstraints( 0, 1 ) );

trunk/SIPRPSoft/src/siprp/higiene/gestao/EmpresaPanel.java

@@ -97,17 +97,14 @@ public class EmpresaPanel extends JPanel
 			@Override
 			public void itemStateChanged( ItemEvent e )
 			{
-				if( ItemEvent.SELECTED == e.getStateChange() )
+				try
 				{
-					try
-					{
-						empresa.setImprimirTabelaAlargada( checkImpressao.isSelected() );
-						empresa.save();
-					}
-					catch( Exception ex )
-					{
-						LeafError.error( ex );
-					}
+					empresa.setImprimirTabelaAlargada( checkImpressao.isSelected() );
+					empresa.save();
+				}
+				catch( Exception ex )
+				{
+					LeafError.error( ex );
 				}
 			}
 		} );

trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java

@@ -35,9 +35,9 @@ public class AdicionarEquipamentosPanel extends JPanel
 
 	public static final String SELECTION_CHANGED = "SELECTION_CHANGED";
 
-	private static final String ICON_NAME_SAVE = "siprp/higiene/gestao/equipamentos/add.png";
+	private static final String ICON_NAME_SAVE = "siprp/higiene/gestao/add.png";
 
-	private static final String ICON_NAME_REVERT = "siprp/higiene/gestao/equipamentos/delete.png";
+	private static final String ICON_NAME_REVERT = "siprp/higiene/gestao/delete.png";
 
 	private final LeafButton buttonAdicionar = LeafIconButton.createButton( ICON_NAME_SAVE );
 

trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/AdicionarAreasPanel.java

@@ -18,6 +18,7 @@ import javax.swing.tree.TreeSelectionModel;
 
 import leaf.ui.LeafButton;
 import leaf.ui.LeafError;
+import leaf.ui.LeafIconButton;
 import leaf.ui.TreeInserterDialog;
 import leaf.ui.TreeTools;
 import siprp.database.cayenne.objects.Estabelecimentos;
@@ -34,9 +35,13 @@ public class AdicionarAreasPanel extends JPanel
 
 	public static final String SELECTION_CHANGED = "SELECTION_CHANGED";
 
-	private final LeafButton buttonAdicionar = new LeafButton( "Adicionar" );
+	private static final String ICON_NAME_SAVE = "siprp/higiene/gestao/add.png";
 
-	private final LeafButton buttonRemover = new LeafButton( "Remover" );
+	private static final String ICON_NAME_REVERT = "siprp/higiene/gestao/delete.png";
+	
+	protected final LeafButton buttonAdicionar = LeafIconButton.createButton( ICON_NAME_SAVE );
+
+	protected final LeafButton buttonRemover = LeafIconButton.createButton( ICON_NAME_REVERT );
 
 	private final DefaultMutableTreeNode root = new DefaultMutableTreeNode();
 
@@ -80,7 +85,7 @@ public class AdicionarAreasPanel extends JPanel
 	{
 		JPanel panel = new JPanel();
 		TableLayout layout = new TableLayout( new double[] {
-				TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM
+				TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL
 		}, new double[] {
 			TableLayout.MINIMUM
 		} );
@@ -88,7 +93,7 @@ public class AdicionarAreasPanel extends JPanel
 		layout.setVGap( 5 );
 		panel.setLayout( layout );
 		panel.add( buttonAdicionar, new TableLayoutConstraints( 0, 0 ) );
-		panel.add( buttonRemover, new TableLayoutConstraints( 2, 0 ) );
+		panel.add( buttonRemover, new TableLayoutConstraints( 1, 0 ) );
 
 		add( panel, new TableLayoutConstraints( 0, 0 ) );
 		add( scroll, new TableLayoutConstraints( 0, 1 ) );

trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/GerirAreasPanel.java

@@ -10,7 +10,9 @@ import java.awt.Dimension;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Collections;
 import java.util.Date;
+import java.util.List;
 
 import javax.swing.BorderFactory;
 import javax.swing.JOptionPane;
@@ -372,7 +374,9 @@ public class GerirAreasPanel extends JPanel
 		root.removeAllChildren();
 		if( empresa != null )
 		{
-			for( HsArea area : empresa.getHsAreaArray() )
+			List<HsArea> areas = empresa.getHsAreaArray();
+			Collections.sort( areas );
+			for( HsArea area : areas )
 			{
 				addArea( area );
 			}

trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/AdicionarRiscosPanel.java

@@ -5,6 +5,8 @@ import info.clearthought.layout.TableLayoutConstraints;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Collections;
+import java.util.List;
 
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -18,6 +20,7 @@ import javax.swing.tree.TreeSelectionModel;
 
 import leaf.ui.LeafButton;
 import leaf.ui.LeafError;
+import leaf.ui.LeafIconButton;
 import leaf.ui.TreeInserterDialog;
 import leaf.ui.TreeTools;
 import siprp.database.cayenne.objects.BaseObject;
@@ -36,9 +39,13 @@ public class AdicionarRiscosPanel extends JPanel
 
 	public static final String SELECTION_CHANGED = "RISCOS_SELECTION_CHANGED";
 
-	private final LeafButton buttonAdicionar = new LeafButton( "Adicionar" );
+	private static final String ICON_NAME_SAVE = "siprp/higiene/gestao/add.png";
 
-	private final LeafButton buttonRemover = new LeafButton( "Remover" );
+	private static final String ICON_NAME_REVERT = "siprp/higiene/gestao/delete.png";
+	
+	protected final LeafButton buttonAdicionar = LeafIconButton.createButton( ICON_NAME_SAVE );
+
+	protected final LeafButton buttonRemover = LeafIconButton.createButton( ICON_NAME_REVERT );
 
 	private final DefaultMutableTreeNode root = new DefaultMutableTreeNode();
 
@@ -84,7 +91,7 @@ public class AdicionarRiscosPanel extends JPanel
 	{
 		JPanel panel = new JPanel();
 		TableLayout layout = new TableLayout( new double[] {
-				TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM
+				TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL
 		}, new double[] {
 			TableLayout.MINIMUM
 		} );
@@ -92,7 +99,7 @@ public class AdicionarRiscosPanel extends JPanel
 		layout.setVGap( 5 );
 		panel.setLayout( layout );
 		panel.add( buttonAdicionar, new TableLayoutConstraints( 0, 0 ) );
-		panel.add( buttonRemover, new TableLayoutConstraints( 2, 0 ) );
+		panel.add( buttonRemover, new TableLayoutConstraints( 1, 0 ) );
 
 		add( panel, new TableLayoutConstraints( 0, 0 ) );
 		add( scroll, new TableLayoutConstraints( 0, 1 ) );
@@ -263,14 +270,18 @@ public class AdicionarRiscosPanel extends JPanel
 		root.removeAllChildren();
 		if( empresa != null )
 		{
-			for( HsRiscoEmpresa rel : empresa.getHsRiscoEmpresaArray() )
+			List<HsRiscoEmpresa> riscos = empresa.getHsRiscoEmpresaArray();
+			Collections.sort( riscos );
+			for( HsRiscoEmpresa rel : riscos )
 			{
 				root.add( new DefaultMutableTreeNode( rel ) );
 			}
 		}
 		else if( posto != null )
 		{
-			for( HsPostoRisco rel : posto.getHsPostoRiscoArray() )
+			List<HsPostoRisco> riscos = posto.getHsPostoRiscoArray();
+			Collections.sort( riscos );
+			for( HsPostoRisco rel : riscos )
 			{
 				root.add( new DefaultMutableTreeNode( rel ) );
 			}

trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java

@@ -7,6 +7,7 @@ import java.awt.Color;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Currency;
 
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -22,6 +23,7 @@ import javax.swing.tree.TreeSelectionModel;
 import leaf.ui.LeafButton;
 import leaf.ui.LeafError;
 import leaf.ui.TreeTools;
+import siprp.database.cayenne.objects.HsMedida;
 import siprp.database.cayenne.objects.HsRelatorioMedida;
 import siprp.database.cayenne.objects.HsRelatorioPosto;
 import siprp.database.cayenne.objects.HsRelatorioPostoMedida;
@@ -54,6 +56,8 @@ public class GerirMedidasRelatorioPanel extends JPanel
 
 	private HsRelatorioPosto posto = null;
 	
+	private HsRelatorioPostoMedida selectedMedida = null;
+
 	public GerirMedidasRelatorioPanel()
 	{
 		startupComponents();
@@ -167,6 +171,7 @@ public class GerirMedidasRelatorioPanel extends JPanel
 					else if( selection instanceof MedidaRelatorioNode )
 					{
 						object = selection == null ? null : ((MedidaRelatorioNode) selection).getUserObject();
+						selectedMedida = (HsRelatorioPostoMedida) object;
 					}
 				}
 				setEnabled();
@@ -191,7 +196,6 @@ public class GerirMedidasRelatorioPanel extends JPanel
 			public void actionPerformed( ActionEvent e )
 			{
 				rem();
-
 			}
 
 		} );
@@ -242,6 +246,7 @@ public class GerirMedidasRelatorioPanel extends JPanel
 				rel.setToHsRelatorioMedida( medida );
 				rel.setToHsRelatorioPosto( posto );
 				rel.save();
+				selectedMedida = rel;
 			}
 			refresh();
 			setEnabled();
@@ -311,11 +316,33 @@ public class GerirMedidasRelatorioPanel extends JPanel
 		}
 		setEnabled();
 		TreeTools.refreshTree( tree, root );
+		if( selectedMedida != null )
+		{
+			selectMedida();
+		}
+	}
+	
+	private void selectMedida( )
+	{
+		DefaultMutableTreeNode node = TreeTools.findNodeWithUserObject( selectedMedida, root );
+		if( node != null )
+		{
+			TreePath path = TreeTools.getPathFor( node );
+			if( path != null )
+			{
+				tree.setSelectionPath( path );
+			}
+		}
+		else
+		{
+			selectedMedida = null;
+		}
 	}
 
 	public void setPosto( HsRelatorioPosto posto )
 	{
 		this.posto = posto;
+		this.selectedMedida = null;
 		refresh();
 		setEnabled();
 	}

trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java

@@ -94,7 +94,6 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe
 	{
 		dataRelatorio.setPreferredSize( new Dimension( 150, 0 ) );
 		panelEquipamentos.setPreferredSize( new Dimension( 400, 0 ) );
-		fieldFuncao1.setPreferredSize( new Dimension( 100, 0 ) );
 		bg.add( radioInicial );
 		bg.add( radioPeriodica );
 		panelAcompanhantes.setBorder( BorderFactory.createTitledBorder( "Pessoas que acompanharam" ) );
@@ -115,7 +114,7 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe
 		setLayout( layout );
 
 		layout = new TableLayout( new double[] {
-				TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM, TableLayout.PREFERRED
+				TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM, TableLayout.FILL
 		}, new double[] {
 				TableLayout.MINIMUM, TableLayout.MINIMUM
 		} );

trunk/SIPRPSoft/src/siprp/higiene/relatorio/PlanoActuacaoPanel.java

@@ -128,7 +128,7 @@ public class PlanoActuacaoPanel extends JPanel
 			@Override
 			public void propertyChange( PropertyChangeEvent evt )
 			{
-				riscos.repaint();
+				riscos.refresh();
 			}
 		} );
 	}
@@ -148,7 +148,7 @@ public class PlanoActuacaoPanel extends JPanel
 	
 	private void startupComponents()
 	{
-		riscos.setBorder( BorderFactory.createTitledBorder( "Medidas" ) );
+		riscos.setBorder( BorderFactory.createTitledBorder( "Riscos" ) );
 		areas.setBorder( BorderFactory.createTitledBorder( "Postos de trabalho" ) );
 		areas.setPreferredSize( new Dimension(250,0) );
 		buttonRevert.setToolTipText( "Carregar dados do estabelecimento" );

trunk/SIPRPSoft/src/siprp/lembretes/LembretesWindow.java

@@ -213,12 +213,7 @@ public class LembretesWindow extends JFrame
 	{
 		boolean filtrarEmpresas = checkEmpresas.isSelected();
 		checkEstabelecimentos.setEnabled( filtrarEmpresas );
-		comboEstabelecimentos.setEditable( filtrarEmpresas );
 		comboEstabelecimentos.setEnabled( filtrarEmpresas );
-		if( !filtrarEmpresas )
-		{
-			checkEstabelecimentos.setSelected( false );
-		}
 	}
 	
 	public void refresh()
@@ -356,7 +351,7 @@ public class LembretesWindow extends JFrame
 			reloadLembretes();
 			boolean selected = tiposTable.getSelectedRowCount() > 0;
 			comboEmpresas.setEnabled( selected );
-			comboEstabelecimentos.setEnabled( selected );
+			comboEstabelecimentos.setEnabled( checkEmpresas.isSelected() );
 		}
 	}
 }

trunk/common/src/leaf/ui/TreeTools.java

@@ -1,12 +1,48 @@
 package leaf.ui;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+
 import javax.swing.JTree;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreePath;
 
 public class TreeTools
 {
 
+	private static final Comparator<DefaultMutableTreeNode> comparator = new Comparator<DefaultMutableTreeNode>()
+	{
+		
+		private int compareObjects( Object o1, Object o2 )
+		{
+			if( o1 == null )
+			{
+				return o2 == null ? 0 : -1;
+			}
+			else
+			{
+				return o2 == null ? 1 : o1.toString().compareTo( o2.toString() );
+			}
+		}
+		
+		@Override
+		public int compare( DefaultMutableTreeNode o1, DefaultMutableTreeNode o2 )
+		{
+			if( o1 == null )
+			{
+				return o2 == null ? 0 : -1;
+			}
+			else
+			{
+				return o2 == null ? 1 : compareObjects( o1.getUserObject(), o2.getUserObject() );
+			}
+		}
+	};
+	
 	public static void refreshTree( JTree tree, DefaultMutableTreeNode node )
 	{
 		((DefaultTreeModel) tree.getModel()).nodeStructureChanged( node );
@@ -116,4 +152,43 @@ public class TreeTools
 		}
 	}
 
+	public static void sort( DefaultMutableTreeNode result )
+	{
+		if( result != null )
+		{
+			List<DefaultMutableTreeNode> children = new ArrayList<DefaultMutableTreeNode>(result.getChildCount());
+			for( int i = 0; i < result.getChildCount(); ++i )
+			{
+				children.add( (DefaultMutableTreeNode) result.getChildAt( i ) );
+			}
+			result.removeAllChildren();
+			Collections.sort( children, comparator );
+			for( DefaultMutableTreeNode child : children )
+			{
+				sort( child );
+				result.add( child );
+			}
+		}
+	}
+
+	public static TreePath getPathFor( DefaultMutableTreeNode node )
+	{
+		List<Object> path = getObjectPathFor( node );
+		return new TreePath( path.toArray( new Object[path.size()] ) );
+	}
+	
+	private static List<Object> getObjectPathFor( DefaultMutableTreeNode node )
+	{
+		LinkedList<Object> path = new LinkedList<Object>();
+		if( node != null )
+		{
+			if( node.getParent() != null )
+			{
+				path.addAll( getObjectPathFor( (DefaultMutableTreeNode) node.getParent() ) );
+			}
+			path.add( node );
+		}
+		return path;
+	}
+	
 }

trunk/common/src/siprp/database/cayenne/objects/BaseObject.java

@@ -8,9 +8,10 @@ import org.apache.cayenne.PersistenceState;
 
 import siprp.database.cayenne.providers.MainDAO;
 
+import com.evolute.utils.strings.StringPlainer;
 import com.evolute.utils.strings.UnicodeChecker;
 
-public class BaseObject extends CayenneDataObject
+public class BaseObject extends CayenneDataObject implements Comparable<BaseObject>
 {
 
 	static {
@@ -81,4 +82,10 @@ public class BaseObject extends CayenneDataObject
 		return string == null ? null : UnicodeChecker.parseFromUnicode( string );
 	}
 
+	@Override
+	public int compareTo( BaseObject object )
+	{
+		return StringPlainer.convertString( this.toString() ).compareTo( object == null ? null : StringPlainer.convertString( object.toString() ) );
+	}
+	
 }

trunk/common/src/siprp/database/cayenne/objects/Estabelecimentos.java

@@ -1,12 +1,11 @@
 package siprp.database.cayenne.objects;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 import siprp.database.cayenne.objects.auto._Estabelecimentos;
 
-public class Estabelecimentos extends _Estabelecimentos implements Comparable<Estabelecimentos>
+public class Estabelecimentos extends _Estabelecimentos
 {
 
 	private static final long serialVersionUID = 1L;
@@ -81,18 +80,4 @@ public class Estabelecimentos extends _Estabelecimentos implements Comparable<Es
 		return result;
 	}
 
-	@Override
-	public int compareTo( Estabelecimentos estabelecimento )
-	{
-		if( estabelecimento == null)
-		{
-			return 1;
-		}
-		if( this.getNomePlain() == null )
-		{
-			return (estabelecimento.getNomePlain() != null) ? -1 : 0;
-		}
-		return (-1) * estabelecimento.getNomePlain().compareTo( getNomePlain() );
-	}
-
 }

trunk/common/src/siprp/database/cayenne/objects/MarcacoesEstabelecimento.java

@@ -2,7 +2,8 @@ package siprp.database.cayenne.objects;
 
 import siprp.database.cayenne.objects.auto._MarcacoesEstabelecimento;
 
-public class MarcacoesEstabelecimento extends _MarcacoesEstabelecimento implements Comparable<MarcacoesEstabelecimento>{
+public class MarcacoesEstabelecimento extends _MarcacoesEstabelecimento
+{
 
 	private static final long serialVersionUID = 1L;
 
@@ -13,18 +14,18 @@ public class MarcacoesEstabelecimento extends _MarcacoesEstabelecimento implemen
 	}
 	
 	@Override
-	public int compareTo( MarcacoesEstabelecimento marcacao )
+	public int compareTo( BaseObject marcacao )
 	{
-		if( marcacao != null && marcacao.getData() != null )
+		if( marcacao instanceof MarcacoesEstabelecimento )
 		{
-			return marcacao.getData().compareTo( this.getData() );
+			return this.getData().compareTo( ( ( MarcacoesEstabelecimento) marcacao ).getData() );
 		}
 		else
 		{
-			return -1;
+			return super.compareTo( marcacao );
 		}
-		
 	}
+	
 }
 
 

trunk/common/src/siprp/database/cayenne/objects/Trabalhadores.java

@@ -6,9 +6,7 @@ import java.util.List;
 
 import siprp.database.cayenne.objects.auto._Trabalhadores;
 
-import com.evolute.utils.strings.UnicodeChecker;
-
-public class Trabalhadores extends _Trabalhadores implements Comparable<Trabalhadores>
+public class Trabalhadores extends _Trabalhadores
 {
 	private static final long serialVersionUID = 1L;
 	
@@ -82,18 +80,4 @@ public class Trabalhadores extends _Trabalhadores implements Comparable<Trabalha
 		return getNome();
 	}
 
-	@Override
-	public int compareTo( Trabalhadores trabalhador )
-	{
-		if( trabalhador == null)
-		{
-			return 1;
-		}
-		if( this.getNomePlain() == null )
-		{
-			return (trabalhador.getNomePlain() != null) ? -1 : 0;
-		}
-		return (-1) * trabalhador.getNomePlain().compareTo( getNomePlain() );
-	}
-
 }

trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java

@@ -317,6 +317,7 @@ public class PlanoActuacaoDAO extends MainDAO
 		SelectQuery query = new SelectQuery( HsLegislacao.class );
 		query.andQualifier( ExpressionFactory.matchExp( HsLegislacao.DELETED_DATE_PROPERTY, null ) );
 		query.andQualifier( ExpressionFactory.matchExp( HsLegislacao.TO_HS_LEGISLACAO_CATEGORIA_PROPERTY, null ) );
+		query.addOrdering( HsLegislacao.DESCRIPTION_PROPERTY, true );
 		return context.performQuery( query );
 	}
 	
@@ -324,6 +325,7 @@ public class PlanoActuacaoDAO extends MainDAO
 	{
 		SelectQuery query = new SelectQuery( HsLegislacaoCategoria.class );
 		query.andQualifier( ExpressionFactory.matchExp( HsLegislacaoCategoria.DELETED_DATE_PROPERTY, null ) );
+		query.addOrdering( HsLegislacao.DESCRIPTION_PROPERTY, true );
 		return context.performQuery( query );
 	}
 

trunk/common/src/siprp/logic/HigieneSegurancaLogic.java

@@ -1,5 +1,9 @@
 package siprp.logic;
 
+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.HashMap;
 import java.util.List;
 
@@ -46,8 +50,6 @@ import siprp.logic.node.NodeRiscoTema;
 import siprp.logic.node.PostoNode;
 import siprp.logic.node.PostoRelatorioNode;
 
-import static com.evolute.utils.strings.UnicodeLatin1Map.*;
-
 public class HigieneSegurancaLogic
 {
 
@@ -133,6 +135,7 @@ public class HigieneSegurancaLogic
 				}
 				areaNode.add( new PostoNode( posto ) );
 			}
+			TreeTools.sort( result );
 		}
 		return result;
 	}