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

trunk/SIPRPSoft/src/siprp/database/cayenne/objects/PrtGruposProtocolo.java

@@ -4,6 +4,14 @@ import siprp.database.cayenne.objects.auto._PrtGruposProtocolo;
 
 public class PrtGruposProtocolo extends _PrtGruposProtocolo {
 
+	private static final long serialVersionUID = 1L;
+
+	
+	@Override
+	public String toString()
+	{
+		return getDescricao() == null ? "" : getDescricao();
+	}
 }
 
 

trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java

@@ -51,9 +51,10 @@ public class LeafOptionDialog extends JDialog
 		setContentPane( new LeafGradientPanel() );
 		getContentPane().setLayout( layout );
 		Iterator<Object> iterator = keySet.iterator();
-		Object current = iterator.next();
-		for( int i = 0; i < keySet.size() && iterator.hasNext(); ++i, current = iterator.next() )
+		Object current = null;;
+		for( int i = 0; i < keySet.size() && iterator.hasNext(); ++i  )
 		{
+			current = iterator.next();
 			LeafInputField<Object> component = new LeafInputField<Object>();
 			component.setObject( map.get( current ) );
 			getContentPane().add( component, new TableLayoutConstraints( 0, i ) );

trunk/SIPRPSoft/src/siprp/medicina/processo/ui/OrderedMap.java

@@ -0,0 +1,57 @@
+package siprp.medicina.processo.ui;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Vector;
+
+public class OrderedMap<KeyClass extends Object> extends HashMap<KeyClass, List<Object>>
+{
+	private static final long serialVersionUID = 1L;
+	
+	private Vector<KeyClass> order = new Vector<KeyClass>();
+	
+	public OrderedMap()
+	{
+	}
+	
+	public List<Object> getValuesAt(int row)
+	{
+		return this.get( order.get( row ) );
+	}
+	
+	public Object getValueAt(int column, int row)
+	{
+		return this.getValuesAt( row ).get( column );
+	}
+	
+	public void putLast( KeyClass key, Object value)
+	{
+		if(this.containsKey( key ))
+		{
+			this.remove( key );
+		}
+		List<Object> list = new ArrayList<Object>();
+		list.add( value );
+		this.put( key, list );
+		order.add( key );
+	}
+	
+	public void putLast( KeyClass key, List<Object> values)
+	{
+		if(this.containsKey( key ))
+		{
+			this.remove( key );
+		}
+		this.put( key, values );
+		order.add( key );
+	}
+	
+	@Override
+	public List<Object> remove( Object key )
+	{
+		order.remove( key );
+		return super.remove( key );
+	}
+	
+}

trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java

@@ -38,6 +38,8 @@ import javax.swing.JPanel;
 
 import siprp.database.cayenne.objects.Empresas;
 import siprp.database.cayenne.objects.PrtElementosProtocolo;
+import siprp.database.cayenne.objects.PrtGruposProtocolo;
+import siprp.database.cayenne.objects.PrtTiposElementosProtocolo;
 import siprp.database.cayenne.objects.Trabalhadores;
 import siprp.database.cayenne.objects.TrabalhadoresConsultas;
 import siprp.database.cayenne.objects.TrabalhadoresConsultasDatas;
@@ -148,8 +150,10 @@ public class ProcessoDadosPanel extends JPanel
 	// exame
 	private final JLabel labelExameEstado = new JLabel( "Estado" );
 	private final JLabel labelExameData = new JLabel( "Data" );
+	private final JLabel labelExameGruposEcds = new JLabel( "Ecds" );
 
 	public final LeafInputField<HashMap<Integer, String>> inputExameEstado = new LeafInputField<HashMap<Integer, String>>();
+	public final LeafInputField<HashMap<PrtGruposProtocolo, String>> inputExameGruposEcds = new LeafInputField<HashMap<PrtGruposProtocolo, String>>();
 	public final LeafInputField<Date> inputExameData = new LeafInputField<Date>();
 
 	// marcacao exame
@@ -214,7 +218,9 @@ public class ProcessoDadosPanel extends JPanel
 		add( panelExameMarcacaoObservacao, PANEL_EXAME_MARCACAO_OBSERVACAO_NAME );
 	}
 
-	@LeafUIActionBinding(action = { LOAD_TRABALHADOR, SELECT_TRABALHADOR })
+	@LeafUIActionBinding(action = {
+			LOAD_TRABALHADOR, SELECT_TRABALHADOR
+	})
 	public void setForTrabalhador( Trabalhadores trabalhador )
 	{
 		if( trabalhador != null )
@@ -329,7 +335,7 @@ public class ProcessoDadosPanel extends JPanel
 			inputExameData.setObject( exame.getData() );
 			inputExameEstado.setObject( exame.getEstados() );
 			inputExameEstado.setSelectedObject( exame.getEstado() );
-			//TODO mostrar lista de exames disponiveis para o trabalhador
+			HashMap<PrtGruposProtocolo, String> grupos = new HashMap<PrtGruposProtocolo, String>();
 			Trabalhadores trabalhador = exame.getToTrabalhadores();
 			Integer perfil = trabalhador.getPerfil();
 			if( perfil != null )
@@ -340,10 +346,24 @@ public class ProcessoDadosPanel extends JPanel
 				{
 					if( perfil.equals( ecdPerfil.getNumeroPerfil() ) )
 					{
-						
+						PrtTiposElementosProtocolo ecd = ecdPerfil.getToPrtTiposElementosProtocolo();
+						if( ecd != null )
+						{
+							PrtGruposProtocolo grupoEcd = ecd.getToPrtGruposProtocolo();
+							if( grupoEcd != null )
+							{
+								String descricao = grupoEcd.getDescricao();
+								if( descricao != null )
+								{
+									grupos.put( grupoEcd, descricao );
+								}
+							}
+						}
 					}
 				}
 			}
+			inputExameGruposEcds.setObject(grupos);
+			inputExameGruposEcds.setEditable( true );
 			cardLayout.show( this, PANEL_EXAME_NAME );
 		}
 		else
@@ -433,7 +453,7 @@ public class ProcessoDadosPanel extends JPanel
 	}
 
 	@LeafUIActionBinding(action = CREATE_EXAME)
-	public void setForNewExame( TrabalhadoresEcdsDatas exame )
+	public void setForNewExame( TrabalhadoresEcds exame )
 	{
 	}
 
@@ -577,7 +597,7 @@ public class ProcessoDadosPanel extends JPanel
 
 	private void setupExamePanel()
 	{
-		setupSimpleDataPanel( panelExame, "Exame", labelExameEstado, inputExameEstado, labelExameData, inputExameData, new JPanel() );
+		setupSimpleDataPanel( panelExame, "Exame", labelExameEstado, inputExameEstado, labelExameData, inputExameData, labelExameGruposEcds, inputExameGruposEcds, new JPanel() );
 	}
 
 	private void setupExameMarcacaoPanel()