diff --git a/trunk/SIPRPSoft/src/siprp/lembretes/marcacoes/MarcacoesDataProvider.java b/trunk/SIPRPSoft/src/siprp/lembretes/marcacoes/MarcacoesDataProvider.java index 71d512e7..8bb98340 100755 --- a/trunk/SIPRPSoft/src/siprp/lembretes/marcacoes/MarcacoesDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/lembretes/marcacoes/MarcacoesDataProvider.java @@ -9,6 +9,16 @@ package siprp.lembretes.marcacoes; +import static com.evolute.utils.strings.UnicodeLatin1Map.atilde; + +import java.text.DateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.Locale; + +import siprp.lembretes.LembretesConstants; +import siprp.lembretes.LembretesDataProvider; + import com.evolute.utils.Singleton; import com.evolute.utils.arrays.Virtual2DArray; import com.evolute.utils.data.IDObject; @@ -19,15 +29,6 @@ import com.evolute.utils.sql.Expression; import com.evolute.utils.sql.Field; import com.evolute.utils.sql.Select; import com.evolute.utils.sql.Select2; -import java.text.DateFormat; -import java.util.Date; -import java.util.Locale; -import siprp.data.Marcacao; -import siprp.database.cayenne.providers.MedicinaDAO; -import siprp.lembretes.LembretesConstants; -import siprp.lembretes.LembretesDataProvider; -import siprp.medicina.MedicinaConstants; -import siprp.medicina.processo.database.MedicinaProcessoDAO; /** * @@ -123,6 +124,9 @@ public class MarcacoesDataProvider Integer id = ( Integer ) array.get( n, 0 ); String descricao = ( String ) array.get( n, 1 ); Date data = ( Date ) array.get( n, 3 ); + Calendar c = Calendar.getInstance(); + c.setTime( data ); + c.add( Calendar.MONTH, 2 ); String trabalhador = ( String ) array.get( n, 4 ); String split[] = trabalhador.split( " " ); @@ -131,7 +135,7 @@ public class MarcacoesDataProvider String estabelecimento = ( String ) array.get( n, 5 ); String empresa = ( String ) array.get( n, 6 ); String str = "" + trabalhador + "" - + "
   " + MedicinaConstants.LEMBRETE_RENOVACAO_FICHA_APTIDAO_STRING + " de " + D_F.format( data ) + + "
   " + "Ficha de aptid" + atilde + "o caduca a " + D_F.format( c.getTime() ) + "
   " + descricao + "" + "
   " + empresa.substring( 0, empresa.length() > 20 ? 20 : empresa.length() ) + " / " + estabelecimento.substring( 0, estabelecimento.length() > 10 ? 10 : estabelecimento.length() ) diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java index 3b9b6755..237501d8 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java @@ -5,24 +5,20 @@ import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; import static com.evolute.utils.strings.UnicodeLatin1Map.iacute; import static com.evolute.utils.strings.UnicodeLatin1Map.otilde; import static info.clearthought.layout.TableLayoutConstants.FILL; -import static siprp.medicina.processo.logic.MedicinaProcessoLogic.*; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.CREATE_CONSULTA_MARCACAO; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.CREATE_CONSULTA_MARCACAO_EMAIL; +import static siprp.medicina.processo.logic.MedicinaProcessoLogic.CREATE_CONSULTA_MARCACAO_EMAIL_VACINAS; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.CREATE_CONSULTA_MARCACAO_OBSERVACOES; -import static siprp.medicina.processo.logic.MedicinaProcessoLogic.CREATE_EXAME; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.CREATE_EXAME_MARCACAO; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.CREATE_EXAME_MARCACAO_EMAIL; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.CREATE_EXAME_MARCACAO_OBSERVACOES; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.CREATE_PROCESSO; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.LOAD_TRABALHADOR; -import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SAVE_CONSULTA; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SAVE_CONSULTA_MARCACAO; -import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SAVE_CONSULTA_MARCACAO_EMAIL; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SAVE_CONSULTA_MARCACAO_OBSERVACOES; -import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SAVE_EXAME; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SAVE_EXAME_MARCACAO; -import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SAVE_EXAME_MARCACAO_EMAIL; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SAVE_EXAME_MARCACAO_OBSERVACOES; +import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SAVE_PROCESSO; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SELECT_CONSULTA; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SELECT_CONSULTA_MARCACAO; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SELECT_CONSULTA_MARCACAO_EMAIL; @@ -31,13 +27,13 @@ import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SELECT_EXAME; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SELECT_EXAME_MARCACAO; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SELECT_EXAME_MARCACAO_EMAIL; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SELECT_EXAME_MARCACAO_OBSERVACAO; +import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SELECT_FICHA; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SELECT_PROCESSO; import static siprp.medicina.processo.logic.MedicinaProcessoLogic.SELECT_TRABALHADOR; import info.clearthought.layout.TableLayout; import info.clearthought.layout.TableLayoutConstraints; import java.awt.CardLayout; -import java.text.DateFormat; import java.util.Calendar; import java.util.Date; import java.util.HashMap; @@ -50,8 +46,6 @@ import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; -import com.evolute.utils.Singleton; - import leaf.LeafCalendarDialog; import leaf.LeafInputField; import leaf.LeafOptionDialog; @@ -60,11 +54,8 @@ import leaf.LeafWindow; import leaf.OrderedMap; import leaf.LeafLogic.LeafUIActionBinding; import leaf.LeafWindow.ActionActivation; - import siprp.CompanyDataLoader; import siprp.SingletonConstants; -import siprp.data.EstabelecimentoData; -import siprp.data.MarcacaoEstabelecimentoData; import siprp.database.cayenne.objects.Contactos; import siprp.database.cayenne.objects.Estabelecimentos; import siprp.database.cayenne.objects.Prestadores; @@ -84,6 +75,8 @@ import siprp.database.cayenne.objects.TrabalhadoresProcesso; import siprp.medicina.MedicinaConstants; import siprp.medicina.processo.mail.MailDialog; +import com.evolute.utils.Singleton; + public class ProcessoDadosPanel extends JPanel { private static final long serialVersionUID = 1L; @@ -547,6 +540,10 @@ public class ProcessoDadosPanel extends JPanel { processo.setMotivo( chosen ); } + inputProcessoMotivo.setObject( tipos, chosen ); + inputProcessoDataInicio.setObject( processo.getDataInicio() ); + inputProcessoDataFim.setObject( processo.getDataFim() ); + inputProcessoEstado.setObject( processo.getEstados(), processo.getEstado() ); } @LeafUIActionBinding(action = CREATE_CONSULTA_MARCACAO)