diff --git a/trunk/SIPRPSoft/src/SIPRPNode.driver.xml b/trunk/SIPRPSoft/src/SIPRPNode.driver.xml
index 0ef0fa4e..897b3592 100644
--- a/trunk/SIPRPSoft/src/SIPRPNode.driver.xml
+++ b/trunk/SIPRPSoft/src/SIPRPNode.driver.xml
@@ -1,7 +1,8 @@
-
+
+
diff --git a/trunk/SIPRPSoft/src/leaf/LeafInputField.java b/trunk/SIPRPSoft/src/leaf/LeafInputField.java
index f0dae1c5..74739235 100644
--- a/trunk/SIPRPSoft/src/leaf/LeafInputField.java
+++ b/trunk/SIPRPSoft/src/leaf/LeafInputField.java
@@ -242,9 +242,15 @@ public class LeafInputField extends JPanel implements F
if( !editable )
{
setMouseOver( false );
+ removeBold();
}
repaint();
}
+
+ private void removeBold()
+ {
+
+ }
public boolean isEditable()
{
@@ -421,11 +427,11 @@ public class LeafInputField extends JPanel implements F
{
if( object instanceof Date )
{
- thiz = new JLabel( sdf.format( object ) );
+ thiz = new JTextArea( sdf.format( object ) );
}
else if( object instanceof Map )
{
- thiz = new JLabel( " " );
+ thiz = new JTextArea( " " );
setSelectedObject( selectedOption );
}
else if( object instanceof OrderedMap && collapseOptions )
@@ -456,7 +462,7 @@ public class LeafInputField extends JPanel implements F
{
toString = " ";
}
- thiz = new JLabel( toString );
+ thiz = new JTextArea( toString );
}
}
else
diff --git a/trunk/SIPRPSoft/src/leaf/LeafOptionDialog.java b/trunk/SIPRPSoft/src/leaf/LeafOptionDialog.java
index fd5def16..d2603a89 100644
--- a/trunk/SIPRPSoft/src/leaf/LeafOptionDialog.java
+++ b/trunk/SIPRPSoft/src/leaf/LeafOptionDialog.java
@@ -120,7 +120,7 @@ public class LeafOptionDialog extends JDialog
setupComponents( map == null ? orderedMap.iterator() : map.keySet().iterator(), map == null ? orderedMap.rows() : map.keySet().size(), map == null ? true : false );
setUndecorated( true );
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
- getRootPane().setWindowDecorationStyle(JRootPane.PLAIN_DIALOG);
+ getRootPane().setWindowDecorationStyle(JRootPane.NONE);
setSize( getLayout().minimumLayoutSize( getRootPane() ) );
setLocationRelativeTo( getParent() );
setModal( true );
diff --git a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
index f94fe917..9768aad5 100644
--- a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
+++ b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
@@ -112,7 +112,7 @@ public class SIPRPDataLoader implements CompanyDataLoader
// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
-
+//
// Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
// Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
// Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
diff --git a/trunk/SIPRPSoft/src/siprp/lembretes/LembretesDataProvider.java b/trunk/SIPRPSoft/src/siprp/lembretes/LembretesDataProvider.java
index 362c95b0..8feefe9c 100644
--- a/trunk/SIPRPSoft/src/siprp/lembretes/LembretesDataProvider.java
+++ b/trunk/SIPRPSoft/src/siprp/lembretes/LembretesDataProvider.java
@@ -396,7 +396,7 @@ public class LembretesDataProvider
Empresas empresa = estabelecimento.getToEmpresas();
criarLembreteConsulta( tipoID,
new Date(),
- MedicinaConstants.LEMBRETE_RENOVACAO_FICHA_APTIDAO_STRING ,
+ MedicinaConstants.LEMBRETE_RENOVACAO_FICHA_APTIDAO_STRING,
null,
empresa.getId(),
estabelecimento.getId(),
diff --git a/trunk/SIPRPSoft/src/siprp/lembretes/externos/actions/TratarExternoAction.java b/trunk/SIPRPSoft/src/siprp/lembretes/externos/actions/TratarExternoAction.java
index 0dfb296a..2247bea8 100755
--- a/trunk/SIPRPSoft/src/siprp/lembretes/externos/actions/TratarExternoAction.java
+++ b/trunk/SIPRPSoft/src/siprp/lembretes/externos/actions/TratarExternoAction.java
@@ -35,6 +35,7 @@ import com.evolute.utils.ui.DialogException;
*/
public class TratarExternoAction extends AbstractAction
{
+ private static final long serialVersionUID = 1L;
private LembretesDataProvider lembretesProvider;
private SIPRPTracker tracker;
@@ -64,17 +65,12 @@ public class TratarExternoAction extends AbstractAction
{
tracker = (SIPRPTracker) Singleton.getInstance( SingletonConstants.SIPRP_TRACKER );
Lembrete lembrete = lembretesProvider.getLembreteByID( lembreteID );
- boolean irParaProcessos = false;
if( lembrete == null )
{
JOptionPane.showMessageDialog( null, "Este lembrete j\u00e1 foi tratado.", "J\u00e1 tratado", JOptionPane.WARNING_MESSAGE );
return;
}
else
- {
- irParaProcessos = JOptionPane.showConfirmDialog( null, "Deseja visualizar os processos deste trabalhador?", "Abrir Processos", JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE ) == JOptionPane.OK_OPTION;
- }
- if( irParaProcessos )
{
Trabalhadores trabalhador = null;
Estabelecimentos estabelecimento = null;
diff --git a/trunk/SIPRPSoft/src/siprp/medicina/MedicinaConstants.java b/trunk/SIPRPSoft/src/siprp/medicina/MedicinaConstants.java
index 5d7e19f9..9edf41de 100644
--- a/trunk/SIPRPSoft/src/siprp/medicina/MedicinaConstants.java
+++ b/trunk/SIPRPSoft/src/siprp/medicina/MedicinaConstants.java
@@ -79,6 +79,6 @@ public interface MedicinaConstants
public static final String LEMBRETE_DESMARCOU_SIPRP_STRING = "SIPRP Desmarcou";
public static final String LEMBRETE_DESMARCOU_TRABALHADOR_STRING = "Trabalhador Desmarcou";
public static final String LEMBRETE_FALTOU_TRABALHADOR_STRING = "Trabalhador Faltou";
- public static final String LEMBRETE_RENOVACAO_FICHA_APTIDAO_STRING = "Renova" + ccedil + atilde + "o da Ficha";
+ public static final String LEMBRETE_RENOVACAO_FICHA_APTIDAO_STRING = "Marcar novos Exames";
}
diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java
index eb82f8c0..5dd2074c 100755
--- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java
+++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java
@@ -191,11 +191,19 @@ public class MedicinaProcessoWindow extends LeafWindow
if( date != null && date.getTime() != 0 )
{
String text = new LeafTextDialog( this, null, "", true ).getText();
- if( text != null )
+ if( text != null && !text.trim().equals( "" ) )
{
lembrete.setData( date );
lembrete.setDescricao( text );
}
+ else
+ {
+ abortAction( true );
+ }
+ }
+ else
+ {
+ abortAction( true );
}
}
}