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

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

@@ -3,7 +3,14 @@ package siprp.database.cayenne.objects;
 import siprp.database.cayenne.objects.auto._PrtTiposElementosProtocolo;
 
 public class PrtTiposElementosProtocolo extends _PrtTiposElementosProtocolo {
+	
+	private static final long serialVersionUID = 1L;
 
+	@Override
+	public String toString()
+	{
+		return getDescricao();
+	}
 }
 
 

trunk/SIPRPSoft/src/siprp/medicina/exames/ui/RecepcaoExamesWindow.java

@@ -93,13 +93,14 @@ public class RecepcaoExamesWindow extends LeafWindow
 	{
 		setContentPane( pane );
 		examesModel = new LeafTableModel( new String[] {
-		                                      			"Empresa", "Estabelecimento", "Trabalhador", "Exame (tipo)"
+		                                      			"Empresa", "Estabelecimento", "Trabalhador", "Exame (tipo)", "Exame"
 		                                      		} );
 		examesTable = new BaseTable( examesModel );
 		examesTable.setSelectionMode( ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-		examesTable.setNonResizableNorReordable();
+//		examesTable.setNonResizableNorReordable();
+		examesTable.getTableHeader().setResizingAllowed( true );
+		examesTable.getTableHeader().setReorderingAllowed( false );
 		examesScroll = new JScrollPane( examesTable, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER );
-		examesTable.setAutoCreateRowSorter(true);
 		
 		OrderedMap<String> orderOptions = new OrderedMap<String>();
 		orderOptions.putLast( EMPRESA, EMPRESA );
@@ -164,9 +165,9 @@ public class RecepcaoExamesWindow extends LeafWindow
 						}
 					}
 				}
-				orderedMap.putLast( current, empresa, estabelecimento, trabalhador, current);
+				orderedMap.putLast( current, empresa, estabelecimento, trabalhador, current.getToPrtTiposElementosProtocolo().getToPrtGruposProtocolo(), current );
 			}
-			orderedMap.order( new int[]{ 0, 1, 2 } );
+			orderedMap.order( new int[]{ 0, 1, 2, 3, 4 } );
 			examesModel.setValues( orderedMap );
 		}
 	}
@@ -179,10 +180,10 @@ public class RecepcaoExamesWindow extends LeafWindow
 		{
 			if(selected.toString().equals( TRABALHADOR ))
 			{
-				examesModel.order( 2, 3 );	
+				examesModel.order( 2, 3, 4 );	
 			}else
 			{
-				examesModel.order( 0, 1, 2, 3 );
+				examesModel.order( 0, 1, 2, 3, 4 );
 			}
 		}
 	}

trunk/SIPRPSoft/src/siprp/medicina/processo/mail/MailSender.java

@@ -14,10 +14,10 @@ import javax.mail.internet.MimeMessage;
 
 public class MailSender
 {
-	protected String from = "";
+	protected String from = "siprp@siprp.pt";
 	protected String mailServer = "mail2.evolute.pt";
-	protected String userName = "";
-	protected String password = "";
+	protected String userName = "auto@siprp.pt";
+	protected String password = "sdfoyias78e";
 	
 	public MailSender()
 	{