diff --git a/trunk/SIPRPSoft/src/SIPRPMap.map.xml b/trunk/SIPRPSoft/src/SIPRPMap.map.xml index 7b6bccdb..2fc1c09e 100644 --- a/trunk/SIPRPSoft/src/SIPRPMap.map.xml +++ b/trunk/SIPRPSoft/src/SIPRPMap.map.xml @@ -22,6 +22,9 @@ + + ORACLE + @@ -90,7 +93,8 @@ - + + @@ -100,6 +104,8 @@ + + @@ -400,9 +406,12 @@ - - + + ORACLE + trabalhadores_ecd_id_seq + 1 + @@ -475,26 +484,29 @@ 1 - + + - + + - + + @@ -540,16 +552,17 @@ - + + - + @@ -558,13 +571,14 @@ - + + @@ -573,9 +587,10 @@ - + + @@ -590,107 +605,123 @@ - + + - + + - + + - + - + + - + + - + + - + + - + - + + - + + - + + - + + - + + - + - + + - + + - + + - + + @@ -740,21 +771,26 @@ + + + + + @@ -776,6 +812,9 @@ + + + @@ -815,12 +854,21 @@ + + + + + + + + + @@ -908,6 +956,12 @@ + + + + + + @@ -926,9 +980,6 @@ - - - @@ -1013,15 +1064,9 @@ - - - - - - @@ -1031,9 +1076,6 @@ - - - @@ -1080,6 +1122,7 @@ + @@ -1093,8 +1136,11 @@ + + + @@ -1124,13 +1170,14 @@ + + - @@ -1159,13 +1206,10 @@ - - - diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Trabalhadores.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Trabalhadores.java index cf10ac89..f81974fb 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Trabalhadores.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Trabalhadores.java @@ -1,6 +1,8 @@ package siprp.database.cayenne.objects; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import siprp.database.cayenne.objects.auto._Trabalhadores; @@ -53,5 +55,31 @@ public class Trabalhadores extends _Trabalhadores { return getNomePlain(); } + + public List getAllEcdForGrupo( PrtGruposProtocolo grupo ) + { + List result = new ArrayList(); + Integer perfil = getPerfil(); + if( perfil != null ) + { + Empresas empresa = getToEstabelecimentos().getToEmpresas(); + List ecdsPerfil = (List) empresa.getPrtElementosProtocoloArray(); + for( PrtElementosProtocolo ecdPerfil : ecdsPerfil ) + { + if( perfil.equals( ecdPerfil.getNumeroPerfil() ) ) + { + PrtTiposElementosProtocolo ecd = ecdPerfil.getToPrtTiposElementosProtocolo(); + if( ecd != null ) + { + if( ecd.getToPrtGruposProtocolo().equals( grupo ) && !result.contains( ecd )) + { + result.add( ecd ); + } + } + } + } + } + return result; + } } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcds.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcds.java index c7342885..f998e5e3 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcds.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcds.java @@ -1,9 +1,11 @@ package siprp.database.cayenne.objects; import java.util.HashMap; +import java.util.List; import siprp.database.cayenne.objects.auto._TrabalhadoresEcds; import siprp.medicina.MedicinaConstants; +import siprp.medicina.processo.ui.OrderedMap; public class TrabalhadoresEcds extends _TrabalhadoresEcds implements MedicinaConstants { @@ -38,4 +40,38 @@ public class TrabalhadoresEcds extends _TrabalhadoresEcds implements MedicinaCon return getDataString() + ": " + getEstadoString(); } + public OrderedMap getGruposExamesForPerfil() + { + OrderedMap grupos = new OrderedMap(); + Trabalhadores trabalhador = this.getToTrabalhadores(); + Integer perfil = trabalhador.getPerfil(); + if( perfil != null ) + { + Empresas empresa = trabalhador.getToEstabelecimentos().getToEmpresas(); + List ecdsPerfil = (List) empresa.getPrtElementosProtocoloArray(); + for( PrtElementosProtocolo ecdPerfil : ecdsPerfil ) + { + 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.containsKey( grupoEcd ) ) + { + grupos.putLast( grupoEcd, descricao ); + // TODO: calcular estado + grupos.putLast( grupoEcd, MedicinaConstants.ESTADOS_EXAME_STR[MedicinaConstants.ESTADO_POR_REALIZAR] ); + } + } + } + } + } + } + return grupos; + } + } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java index 898ce892..f5e862d2 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java @@ -2,9 +2,12 @@ package siprp.database.cayenne.objects; import java.util.Date; import java.util.HashMap; +import java.util.List; import siprp.database.cayenne.objects.auto._TrabalhadoresEcdsDatas; +import siprp.database.cayenne.providers.MedicinaDAO; import siprp.medicina.MedicinaConstants; +import siprp.medicina.processo.ui.OrderedMap; public class TrabalhadoresEcdsDatas extends _TrabalhadoresEcdsDatas implements MedicinaConstants{ private static final long serialVersionUID = 1L; @@ -57,6 +60,40 @@ public class TrabalhadoresEcdsDatas extends _TrabalhadoresEcdsDatas implements M { return getDataString() + ": " + getEstadoString(); } + + public OrderedMap getGruposExames() + { + OrderedMap grupos = new OrderedMap(); + List exames = this.getTrabalhadoresEcdArray(); + if( exames != null ) + { + for(TrabalhadoresEcd exame : exames) + { + String estado = MedicinaConstants.ESTADOS_EXAME_STR[exame.getEstado()]; + PrtGruposProtocolo grupo = exame.getToPrtTiposElementosProtocolo().getToPrtGruposProtocolo(); + if( !grupos.containsKey( grupo )) + { + grupos.putLast( grupo, grupo.getDescricao() ); + grupos.putLast( grupo, estado ); + } + } + } + return grupos; + } + + public void marcarGrupoExames( PrtGruposProtocolo grupo ) + { + List allEcd = getToTrabalhadoresEcds().getToTrabalhadores().getAllEcdForGrupo( grupo ); + for(PrtTiposElementosProtocolo ecd : allEcd) + { + TrabalhadoresEcd trabEcd = new TrabalhadoresEcd(); + trabEcd.setEstado( MedicinaConstants.ESTADO_POR_REALIZAR ); + trabEcd.setToPrtTiposElementosProtocolo( ecd ); + trabEcd.setToTrabalhadoresEcdsDatas( this ); + addToTrabalhadoresEcdArray( trabEcd ); + } + } + } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Avisos.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Avisos.java index 4e5d112d..58c027d3 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Avisos.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Avisos.java @@ -5,12 +5,13 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _Avisos extends org.apache.cayenne.CayenneDataObject { +public abstract class _Avisos extends siprp.database.cayenne.objects.BaseObject { public static final String DATA_AVISO_PROPERTY = "dataAviso"; public static final String DATA_EVENTO_PROPERTY = "dataEvento"; public static final String DESCRICAO_PROPERTY = "descricao"; public static final String EVENTO_ID_PROPERTY = "eventoId"; + public static final String ID_PROPERTY = "id"; public static final String TIPO_PROPERTY = "tipo"; public static final String TRABALHADOR_ID_PROPERTY = "trabalhadorId"; public static final String TO_EMPRESAS_PROPERTY = "toEmpresas"; @@ -50,6 +51,14 @@ public abstract class _Avisos extends org.apache.cayenne.CayenneDataObject { } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setTipo(Integer tipo) { writeProperty("tipo", tipo); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Contactos.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Contactos.java index 6f3d0cb0..5f920350 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Contactos.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Contactos.java @@ -5,16 +5,18 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _Contactos extends org.apache.cayenne.CayenneDataObject { +public abstract class _Contactos extends siprp.database.cayenne.objects.BaseObject { public static final String CARGO_PROPERTY = "cargo"; public static final String EMAIL_PROPERTY = "email"; public static final String FAX_PROPERTY = "fax"; + public static final String ID_PROPERTY = "id"; public static final String NOME_PROPERTY = "nome"; public static final String TELEFONE_PROPERTY = "telefone"; public static final String TELEMOVEL_PROPERTY = "telemovel"; public static final String EMPRESAS_ARRAY_PROPERTY = "empresasArray"; public static final String EMPRESAS_ARRAY1_PROPERTY = "empresasArray1"; + public static final String ESTABELECIMENTOS_ARRAY_PROPERTY = "estabelecimentosArray"; public static final String PRESTADORES_ARRAY_PROPERTY = "prestadoresArray"; public static final String ID_PK_COLUMN = "id"; @@ -43,6 +45,14 @@ public abstract class _Contactos extends org.apache.cayenne.CayenneDataObject { } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setNome(String nome) { writeProperty("nome", nome); } @@ -89,6 +99,17 @@ public abstract class _Contactos extends org.apache.cayenne.CayenneDataObject { } + public void addToEstabelecimentosArray(siprp.database.cayenne.objects.Estabelecimentos obj) { + addToManyTarget("estabelecimentosArray", obj, true); + } + public void removeFromEstabelecimentosArray(siprp.database.cayenne.objects.Estabelecimentos obj) { + removeToManyTarget("estabelecimentosArray", obj, true); + } + public java.util.List getEstabelecimentosArray() { + return (java.util.List)readProperty("estabelecimentosArray"); + } + + public void addToPrestadoresArray(siprp.database.cayenne.objects.Prestadores obj) { addToManyTarget("prestadoresArray", obj, true); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_EcdOficial.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_EcdOficial.java index 009b5d6e..ee32ea7f 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_EcdOficial.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_EcdOficial.java @@ -5,11 +5,12 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _EcdOficial extends org.apache.cayenne.CayenneDataObject { +public abstract class _EcdOficial extends siprp.database.cayenne.objects.BaseObject { public static final String ACTIVO_PROPERTY = "activo"; public static final String DESCRICAO_PROPERTY = "descricao"; public static final String DESCRICAO_PLAIN_PROPERTY = "descricaoPlain"; + public static final String ID_PROPERTY = "id"; public static final String ORDEM_PROPERTY = "ordem"; public static final String TRABALHADORES_ECD_ARRAY_PROPERTY = "trabalhadoresEcdArray"; @@ -39,6 +40,14 @@ public abstract class _EcdOficial extends org.apache.cayenne.CayenneDataObject { } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setOrdem(Integer ordem) { writeProperty("ordem", ordem); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Errors.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Errors.java index d7c96957..1169da6c 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Errors.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Errors.java @@ -5,11 +5,12 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _Errors extends org.apache.cayenne.CayenneDataObject { +public abstract class _Errors extends siprp.database.cayenne.objects.BaseObject { public static final String DATE_PROPERTY = "date"; public static final String DESCRIPTION_PROPERTY = "description"; public static final String ENVIRONMENT_PROPERTY = "environment"; + public static final String ID_PROPERTY = "id"; public static final String TYPE_PROPERTY = "type"; public static final String ID_PK_COLUMN = "id"; @@ -38,6 +39,14 @@ public abstract class _Errors extends org.apache.cayenne.CayenneDataObject { } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setType(String type) { writeProperty("type", type); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Estabelecimentos.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Estabelecimentos.java index c4d23577..b7465a1f 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Estabelecimentos.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Estabelecimentos.java @@ -9,7 +9,7 @@ public abstract class _Estabelecimentos extends siprp.database.cayenne.objects.B public static final String ACTUALIZACAO_PROPERTY = "actualizacao"; public static final String CODIGO_POSTAL_PROPERTY = "codigoPostal"; - public static final String CONTACTO_PROPERTY = "contacto"; + public static final String CONTACTO_BACKUP_PROPERTY = "contactoBackup"; public static final String HISTORICO_PROPERTY = "historico"; public static final String ID_PROPERTY = "id"; public static final String INACTIVO_PROPERTY = "inactivo"; @@ -21,8 +21,11 @@ public abstract class _Estabelecimentos extends siprp.database.cayenne.objects.B public static final String HISTORICO_ESTABELECIMENTO_ARRAY_PROPERTY = "historicoEstabelecimentoArray"; public static final String LEMBRETES_ARRAY_PROPERTY = "lembretesArray"; public static final String MARCACOES_ESTABELECIMENTO_ARRAY_PROPERTY = "marcacoesEstabelecimentoArray"; + public static final String TO_CONTACTOS_PROPERTY = "toContactos"; public static final String TO_EMPRESAS_PROPERTY = "toEmpresas"; public static final String TO_MEDICOS_PROPERTY = "toMedicos"; + public static final String TO_PRESTADORES_PROPERTY = "toPrestadores"; + public static final String TO_PRESTADORES1_PROPERTY = "toPrestadores1"; public static final String TRABALHADORES_ARRAY_PROPERTY = "trabalhadoresArray"; public static final String ID_PK_COLUMN = "id"; @@ -43,11 +46,11 @@ public abstract class _Estabelecimentos extends siprp.database.cayenne.objects.B } - public void setContacto(String contacto) { - writeProperty("contacto", contacto); + public void setContactoBackup(String contactoBackup) { + writeProperty("contactoBackup", contactoBackup); } - public String getContacto() { - return (String)readProperty("contacto"); + public String getContactoBackup() { + return (String)readProperty("contactoBackup"); } @@ -151,6 +154,15 @@ public abstract class _Estabelecimentos extends siprp.database.cayenne.objects.B } + public void setToContactos(siprp.database.cayenne.objects.Contactos toContactos) { + setToOneTarget("toContactos", toContactos, true); + } + + public siprp.database.cayenne.objects.Contactos getToContactos() { + return (siprp.database.cayenne.objects.Contactos)readProperty("toContactos"); + } + + public void setToEmpresas(siprp.database.cayenne.objects.Empresas toEmpresas) { setToOneTarget("toEmpresas", toEmpresas, true); } @@ -169,6 +181,24 @@ public abstract class _Estabelecimentos extends siprp.database.cayenne.objects.B } + public void setToPrestadores(siprp.database.cayenne.objects.Prestadores toPrestadores) { + setToOneTarget("toPrestadores", toPrestadores, true); + } + + public siprp.database.cayenne.objects.Prestadores getToPrestadores() { + return (siprp.database.cayenne.objects.Prestadores)readProperty("toPrestadores"); + } + + + public void setToPrestadores1(siprp.database.cayenne.objects.Prestadores toPrestadores1) { + setToOneTarget("toPrestadores1", toPrestadores1, true); + } + + public siprp.database.cayenne.objects.Prestadores getToPrestadores1() { + return (siprp.database.cayenne.objects.Prestadores)readProperty("toPrestadores1"); + } + + public void addToTrabalhadoresArray(siprp.database.cayenne.objects.Trabalhadores obj) { addToManyTarget("trabalhadoresArray", obj, true); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Etiquetas.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Etiquetas.java index 0023f395..36fa48c2 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Etiquetas.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Etiquetas.java @@ -5,7 +5,7 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _Etiquetas extends org.apache.cayenne.CayenneDataObject { +public abstract class _Etiquetas extends siprp.database.cayenne.objects.BaseObject { public static final String ALTURA_PROPERTY = "altura"; public static final String ALTURA_FOLHA_PROPERTY = "alturaFolha"; @@ -13,6 +13,7 @@ public abstract class _Etiquetas extends org.apache.cayenne.CayenneDataObject { public static final String CONTINUA_PROPERTY = "continua"; public static final String DESCRICAO_PROPERTY = "descricao"; public static final String DESCRICAO_PLAIN_PROPERTY = "descricaoPlain"; + public static final String ID_PROPERTY = "id"; public static final String LARGURA_PROPERTY = "largura"; public static final String LARGURA_FOLHA_PROPERTY = "larguraFolha"; public static final String LINHAS_PROPERTY = "linhas"; @@ -71,6 +72,14 @@ public abstract class _Etiquetas extends org.apache.cayenne.CayenneDataObject { } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setLargura(Float largura) { writeProperty("largura", largura); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Exames.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Exames.java index 8896b218..ce026406 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Exames.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Exames.java @@ -5,10 +5,11 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _Exames extends org.apache.cayenne.CayenneDataObject { +public abstract class _Exames extends siprp.database.cayenne.objects.BaseObject { public static final String DATA_PROPERTY = "data"; public static final String FO_PROPERTY = "fo"; + public static final String ID_PROPERTY = "id"; public static final String INACTIVO_PROPERTY = "inactivo"; public static final String OCASIONAL_PROPERTY = "ocasional"; public static final String OUTRA_FUNCAO1_PROPERTY = "outraFuncao1"; @@ -43,6 +44,14 @@ public abstract class _Exames extends org.apache.cayenne.CayenneDataObject { } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setInactivo(String inactivo) { writeProperty("inactivo", inactivo); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_ExamesPerfis.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_ExamesPerfis.java index 1a5f84ab..1675ad0b 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_ExamesPerfis.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_ExamesPerfis.java @@ -5,14 +5,23 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _ExamesPerfis extends org.apache.cayenne.CayenneDataObject { +public abstract class _ExamesPerfis extends siprp.database.cayenne.objects.BaseObject { + public static final String ID_PROPERTY = "id"; public static final String MULTIPLICADOR_PROPERTY = "multiplicador"; public static final String PERFIL_PROPERTY = "perfil"; public static final String TO_TIPOS_EXAMES_COMP_PROPERTY = "toTiposExamesComp"; public static final String ID_PK_COLUMN = "id"; + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setMultiplicador(Integer multiplicador) { writeProperty("multiplicador", multiplicador); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_ExamesPortaria.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_ExamesPortaria.java index 21d49d57..03614ffa 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_ExamesPortaria.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_ExamesPortaria.java @@ -5,9 +5,10 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _ExamesPortaria extends org.apache.cayenne.CayenneDataObject { +public abstract class _ExamesPortaria extends siprp.database.cayenne.objects.BaseObject { public static final String DATA_ENTRADA_PROPERTY = "dataEntrada"; + public static final String ID_PROPERTY = "id"; public static final String PORTARIA_PROPERTY = "portaria"; public static final String ID_PK_COLUMN = "id"; @@ -20,6 +21,14 @@ public abstract class _ExamesPortaria extends org.apache.cayenne.CayenneDataObje } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setPortaria(String portaria) { writeProperty("portaria", portaria); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_HistoricoEstabelecimento.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_HistoricoEstabelecimento.java index 9906ef56..16b5a7c1 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_HistoricoEstabelecimento.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_HistoricoEstabelecimento.java @@ -5,9 +5,10 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _HistoricoEstabelecimento extends org.apache.cayenne.CayenneDataObject { +public abstract class _HistoricoEstabelecimento extends siprp.database.cayenne.objects.BaseObject { public static final String DATA_PROPERTY = "data"; + public static final String ID_PROPERTY = "id"; public static final String TEXTO_PROPERTY = "texto"; public static final String TO_ESTABELECIMENTOS_PROPERTY = "toEstabelecimentos"; @@ -21,6 +22,14 @@ public abstract class _HistoricoEstabelecimento extends org.apache.cayenne.Cayen } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setTexto(String texto) { writeProperty("texto", texto); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Ids.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Ids.java index 62b99349..64e86494 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Ids.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Ids.java @@ -5,7 +5,7 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _Ids extends org.apache.cayenne.CayenneDataObject { +public abstract class _Ids extends siprp.database.cayenne.objects.BaseObject { public static final String ID_PK_COLUMN = "id"; diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Lembretes.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Lembretes.java index 14b84393..9c09d01a 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Lembretes.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Lembretes.java @@ -5,11 +5,12 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _Lembretes extends org.apache.cayenne.CayenneDataObject { +public abstract class _Lembretes extends siprp.database.cayenne.objects.BaseObject { public static final String DATA_PROPERTY = "data"; public static final String DESCRICAO_PROPERTY = "descricao"; public static final String ENVIAR_EMAIL_PROPERTY = "enviarEmail"; + public static final String ID_PROPERTY = "id"; public static final String PERIODICIDADE_DIAS_PROPERTY = "periodicidadeDias"; public static final String PERIODICIDADE_MESES_PROPERTY = "periodicidadeMeses"; public static final String TEXTO_PROPERTY = "texto"; @@ -47,6 +48,14 @@ public abstract class _Lembretes extends org.apache.cayenne.CayenneDataObject { } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setPeriodicidadeDias(Integer periodicidadeDias) { writeProperty("periodicidadeDias", periodicidadeDias); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_LembretesTipos.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_LembretesTipos.java index 6989f990..5c0a1f75 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_LembretesTipos.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_LembretesTipos.java @@ -5,11 +5,12 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _LembretesTipos extends org.apache.cayenne.CayenneDataObject { +public abstract class _LembretesTipos extends siprp.database.cayenne.objects.BaseObject { public static final String ACTIVO_PROPERTY = "activo"; public static final String CODIGO_PROPERTY = "codigo"; public static final String DESCRICAO_PROPERTY = "descricao"; + public static final String ID_PROPERTY = "id"; public static final String ORDEM_PROPERTY = "ordem"; public static final String LEMBRETES_ARRAY_PROPERTY = "lembretesArray"; @@ -39,6 +40,14 @@ public abstract class _LembretesTipos extends org.apache.cayenne.CayenneDataObje } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setOrdem(Integer ordem) { writeProperty("ordem", ordem); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesEmpresa.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesEmpresa.java index 66a76716..0fd8e43f 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesEmpresa.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesEmpresa.java @@ -5,9 +5,10 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _MarcacoesEmpresa extends org.apache.cayenne.CayenneDataObject { +public abstract class _MarcacoesEmpresa extends siprp.database.cayenne.objects.BaseObject { public static final String DATA_PROPERTY = "data"; + public static final String ID_PROPERTY = "id"; public static final String REALIZADA_PROPERTY = "realizada"; public static final String TEXTO_PROPERTY = "texto"; public static final String TO_EMPRESAS_PROPERTY = "toEmpresas"; @@ -22,6 +23,14 @@ public abstract class _MarcacoesEmpresa extends org.apache.cayenne.CayenneDataOb } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setRealizada(String realizada) { writeProperty("realizada", realizada); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesEstabelecimento.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesEstabelecimento.java index bf4792c0..c8d7d688 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesEstabelecimento.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesEstabelecimento.java @@ -5,12 +5,13 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _MarcacoesEstabelecimento extends org.apache.cayenne.CayenneDataObject { +public abstract class _MarcacoesEstabelecimento extends siprp.database.cayenne.objects.BaseObject { public static final String DATA_PROPERTY = "data"; public static final String DATA_EMAIL_PROPERTY = "dataEmail"; public static final String DATA_RELATORIO_PROPERTY = "dataRelatorio"; public static final String ESTADO_PROPERTY = "estado"; + public static final String ID_PROPERTY = "id"; public static final String OBSERVACOES_PROPERTY = "observacoes"; public static final String REALIZADA_PROPERTY = "realizada"; public static final String LEMBRETES_ARRAY_PROPERTY = "lembretesArray"; @@ -51,6 +52,14 @@ public abstract class _MarcacoesEstabelecimento extends org.apache.cayenne.Cayen } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setObservacoes(String observacoes) { writeProperty("observacoes", observacoes); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesGruposRealizados.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesGruposRealizados.java index 5d31aff6..5c7f81db 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesGruposRealizados.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesGruposRealizados.java @@ -5,7 +5,7 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _MarcacoesGruposRealizados extends org.apache.cayenne.CayenneDataObject { +public abstract class _MarcacoesGruposRealizados extends siprp.database.cayenne.objects.BaseObject { public static final String TO_MARCACOES_TRABALHADOR_PROPERTY = "toMarcacoesTrabalhador"; public static final String TO_MARCACOES_TRABALHADOR_ESTADOS_PROPERTY = "toMarcacoesTrabalhadorEstados"; diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesTecnicosHst.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesTecnicosHst.java index 3fc5a9c4..d92f3aa3 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesTecnicosHst.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesTecnicosHst.java @@ -5,8 +5,9 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _MarcacoesTecnicosHst extends org.apache.cayenne.CayenneDataObject { +public abstract class _MarcacoesTecnicosHst extends siprp.database.cayenne.objects.BaseObject { + public static final String ID_PROPERTY = "id"; public static final String IDENTIFICADOR_PROPERTY = "identificador"; public static final String INACTIVO_PROPERTY = "inactivo"; public static final String INICIAIS_PROPERTY = "iniciais"; @@ -16,6 +17,14 @@ public abstract class _MarcacoesTecnicosHst extends org.apache.cayenne.CayenneDa public static final String ID_PK_COLUMN = "id"; + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setIdentificador(Integer identificador) { writeProperty("identificador", identificador); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesTrabalhador.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesTrabalhador.java index a38119ff..8b9ca2f8 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesTrabalhador.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesTrabalhador.java @@ -5,12 +5,13 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _MarcacoesTrabalhador extends org.apache.cayenne.CayenneDataObject { +public abstract class _MarcacoesTrabalhador extends siprp.database.cayenne.objects.BaseObject { public static final String DATA_PROPERTY = "data"; public static final String DATA_EMAIL_PROPERTY = "dataEmail"; public static final String DATA_RELATORIO_PROPERTY = "dataRelatorio"; public static final String ESTADO_PROPERTY = "estado"; + public static final String ID_PROPERTY = "id"; public static final String MOTIVO_PROPERTY = "motivo"; public static final String OBSERVACOES_PROPERTY = "observacoes"; public static final String REALIZADA_PROPERTY = "realizada"; @@ -55,6 +56,14 @@ public abstract class _MarcacoesTrabalhador extends org.apache.cayenne.CayenneDa } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setMotivo(Integer motivo) { writeProperty("motivo", motivo); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesTrabalhadorEstados.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesTrabalhadorEstados.java index 1072cd65..7035b61d 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesTrabalhadorEstados.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesTrabalhadorEstados.java @@ -5,10 +5,11 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _MarcacoesTrabalhadorEstados extends org.apache.cayenne.CayenneDataObject { +public abstract class _MarcacoesTrabalhadorEstados extends siprp.database.cayenne.objects.BaseObject { public static final String DATA_PROPERTY = "data"; public static final String ESTADO_PROPERTY = "estado"; + public static final String ID_PROPERTY = "id"; public static final String MARCACOES_GRUPOS_REALIZADOS_ARRAY_PROPERTY = "marcacoesGruposRealizadosArray"; public static final String TO_MARCACOES_TRABALHADOR_PROPERTY = "toMarcacoesTrabalhador"; public static final String TO_PRESTADORES_PROPERTY = "toPrestadores"; @@ -31,6 +32,14 @@ public abstract class _MarcacoesTrabalhadorEstados extends org.apache.cayenne.Ca } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void addToMarcacoesGruposRealizadosArray(siprp.database.cayenne.objects.MarcacoesGruposRealizados obj) { addToManyTarget("marcacoesGruposRealizadosArray", obj, true); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Medicos.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Medicos.java index 97ffedd9..db794068 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Medicos.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Medicos.java @@ -5,8 +5,9 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _Medicos extends org.apache.cayenne.CayenneDataObject { +public abstract class _Medicos extends siprp.database.cayenne.objects.BaseObject { + public static final String ID_PROPERTY = "id"; public static final String INACTIVO_PROPERTY = "inactivo"; public static final String NOME_PROPERTY = "nome"; public static final String NUMERO_CEDULA_PROPERTY = "numeroCedula"; @@ -15,6 +16,14 @@ public abstract class _Medicos extends org.apache.cayenne.CayenneDataObject { public static final String ID_PK_COLUMN = "id"; + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setInactivo(String inactivo) { writeProperty("inactivo", inactivo); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Prestadores.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Prestadores.java index cca4dc02..ffbe14a2 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Prestadores.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Prestadores.java @@ -5,25 +5,27 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _Prestadores extends org.apache.cayenne.CayenneDataObject { +public abstract class _Prestadores extends siprp.database.cayenne.objects.BaseObject { public static final String ACTIVO_PROPERTY = "activo"; public static final String CODIGO_POSTAL_PROPERTY = "codigoPostal"; public static final String CONTRIBUINTE_PROPERTY = "contribuinte"; public static final String FAZ_CONSULTAS_PROPERTY = "fazConsultas"; public static final String FAZ_ECDS_PROPERTY = "fazEcds"; + public static final String ID_PROPERTY = "id"; public static final String LOCALIDADE_PROPERTY = "localidade"; public static final String LOCALIDADE_CP_PROPERTY = "localidadeCp"; public static final String MORADA_PROPERTY = "morada"; public static final String NOME_PROPERTY = "nome"; public static final String NOME_PLAIN_PROPERTY = "nomePlain"; + public static final String ESTABELECIMENTOS_ARRAY_PROPERTY = "estabelecimentosArray"; + public static final String ESTABELECIMENTOS_ARRAY1_PROPERTY = "estabelecimentosArray1"; public static final String MARCACOES_TRABALHADOR_ARRAY_PROPERTY = "marcacoesTrabalhadorArray"; public static final String MARCACOES_TRABALHADOR_ESTADOS_ARRAY_PROPERTY = "marcacoesTrabalhadorEstadosArray"; public static final String PRESTADORES_GRUPOS_PROTOCOLO_ARRAY_PROPERTY = "prestadoresGruposProtocoloArray"; public static final String TO_CONTACTOS_PROPERTY = "toContactos"; public static final String TRABALHADORES_CONSULTAS_ARRAY_PROPERTY = "trabalhadoresConsultasArray"; public static final String TRABALHADORES_CONSULTAS_DATAS_ARRAY_PROPERTY = "trabalhadoresConsultasDatasArray"; - public static final String TRABALHADORES_ECD_ARRAY_PROPERTY = "trabalhadoresEcdArray"; public static final String TRABALHADORES_ECDS_DATAS_ARRAY_PROPERTY = "trabalhadoresEcdsDatasArray"; public static final String ID_PK_COLUMN = "id"; @@ -68,6 +70,14 @@ public abstract class _Prestadores extends org.apache.cayenne.CayenneDataObject } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setLocalidade(String localidade) { writeProperty("localidade", localidade); } @@ -108,6 +118,28 @@ public abstract class _Prestadores extends org.apache.cayenne.CayenneDataObject } + public void addToEstabelecimentosArray(siprp.database.cayenne.objects.Estabelecimentos obj) { + addToManyTarget("estabelecimentosArray", obj, true); + } + public void removeFromEstabelecimentosArray(siprp.database.cayenne.objects.Estabelecimentos obj) { + removeToManyTarget("estabelecimentosArray", obj, true); + } + public java.util.List getEstabelecimentosArray() { + return (java.util.List)readProperty("estabelecimentosArray"); + } + + + public void addToEstabelecimentosArray1(siprp.database.cayenne.objects.Estabelecimentos obj) { + addToManyTarget("estabelecimentosArray1", obj, true); + } + public void removeFromEstabelecimentosArray1(siprp.database.cayenne.objects.Estabelecimentos obj) { + removeToManyTarget("estabelecimentosArray1", obj, true); + } + public java.util.List getEstabelecimentosArray1() { + return (java.util.List)readProperty("estabelecimentosArray1"); + } + + public void addToMarcacoesTrabalhadorArray(siprp.database.cayenne.objects.MarcacoesTrabalhador obj) { addToManyTarget("marcacoesTrabalhadorArray", obj, true); } @@ -172,17 +204,6 @@ public abstract class _Prestadores extends org.apache.cayenne.CayenneDataObject } - public void addToTrabalhadoresEcdArray(siprp.database.cayenne.objects.TrabalhadoresEcd obj) { - addToManyTarget("trabalhadoresEcdArray", obj, true); - } - public void removeFromTrabalhadoresEcdArray(siprp.database.cayenne.objects.TrabalhadoresEcd obj) { - removeToManyTarget("trabalhadoresEcdArray", obj, true); - } - public java.util.List getTrabalhadoresEcdArray() { - return (java.util.List)readProperty("trabalhadoresEcdArray"); - } - - public void addToTrabalhadoresEcdsDatasArray(siprp.database.cayenne.objects.TrabalhadoresEcdsDatas obj) { addToManyTarget("trabalhadoresEcdsDatasArray", obj, true); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_PrestadoresGruposProtocolo.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_PrestadoresGruposProtocolo.java index 80ff5eb6..83cec41d 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_PrestadoresGruposProtocolo.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_PrestadoresGruposProtocolo.java @@ -5,7 +5,7 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _PrestadoresGruposProtocolo extends org.apache.cayenne.CayenneDataObject { +public abstract class _PrestadoresGruposProtocolo extends siprp.database.cayenne.objects.BaseObject { public static final String TO_PRESTADORES_PROPERTY = "toPrestadores"; public static final String TO_PRT_GRUPOS_PROTOCOLO_PROPERTY = "toPrtGruposProtocolo"; diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_PrtElementosProtocolo.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_PrtElementosProtocolo.java index 61f13ba7..b15b8bc2 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_PrtElementosProtocolo.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_PrtElementosProtocolo.java @@ -5,14 +5,23 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _PrtElementosProtocolo extends org.apache.cayenne.CayenneDataObject { +public abstract class _PrtElementosProtocolo extends siprp.database.cayenne.objects.BaseObject { + public static final String ID_PROPERTY = "id"; public static final String NUMERO_PERFIL_PROPERTY = "numeroPerfil"; public static final String TO_EMPRESAS_PROPERTY = "toEmpresas"; public static final String TO_PRT_TIPOS_ELEMENTOS_PROTOCOLO_PROPERTY = "toPrtTiposElementosProtocolo"; public static final String ID_PK_COLUMN = "id"; + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setNumeroPerfil(Integer numeroPerfil) { writeProperty("numeroPerfil", numeroPerfil); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_PrtGruposProtocolo.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_PrtGruposProtocolo.java index 5a4381b3..4ab1a386 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_PrtGruposProtocolo.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_PrtGruposProtocolo.java @@ -5,11 +5,12 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _PrtGruposProtocolo extends org.apache.cayenne.CayenneDataObject { +public abstract class _PrtGruposProtocolo extends siprp.database.cayenne.objects.BaseObject { public static final String DESCRICAO_PROPERTY = "descricao"; public static final String DESCRICAO_PLAIN_PROPERTY = "descricaoPlain"; public static final String GRUPO_REAL_PROPERTY = "grupoReal"; + public static final String ID_PROPERTY = "id"; public static final String ORDEM_PROPERTY = "ordem"; public static final String MARCACOES_GRUPOS_REALIZADOS_ARRAY_PROPERTY = "marcacoesGruposRealizadosArray"; public static final String PRESTADORES_GRUPOS_PROTOCOLO_ARRAY_PROPERTY = "prestadoresGruposProtocoloArray"; @@ -41,6 +42,14 @@ public abstract class _PrtGruposProtocolo extends org.apache.cayenne.CayenneData } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setOrdem(Integer ordem) { writeProperty("ordem", ordem); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_PrtTiposElementosProtocolo.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_PrtTiposElementosProtocolo.java index 92edc741..26802935 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_PrtTiposElementosProtocolo.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_PrtTiposElementosProtocolo.java @@ -5,10 +5,11 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _PrtTiposElementosProtocolo extends org.apache.cayenne.CayenneDataObject { +public abstract class _PrtTiposElementosProtocolo extends siprp.database.cayenne.objects.BaseObject { public static final String DESCRICAO_PROPERTY = "descricao"; public static final String DESCRICAO_PLAIN_PROPERTY = "descricaoPlain"; + public static final String ID_PROPERTY = "id"; public static final String ORDEM_PROPERTY = "ordem"; public static final String PRT_ELEMENTOS_PROTOCOLO_ARRAY_PROPERTY = "prtElementosProtocoloArray"; public static final String TO_PRT_GRUPOS_PROTOCOLO_PROPERTY = "toPrtGruposProtocolo"; @@ -32,6 +33,14 @@ public abstract class _PrtTiposElementosProtocolo extends org.apache.cayenne.Cay } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setOrdem(Integer ordem) { writeProperty("ordem", ordem); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TiposExamesComp.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TiposExamesComp.java index 4bcdb491..8dbd7a7e 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TiposExamesComp.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TiposExamesComp.java @@ -5,9 +5,10 @@ package siprp.database.cayenne.objects.auto; * since it may be overwritten next time code is regenerated. * If you need to make any customizations, please use subclass. */ -public abstract class _TiposExamesComp extends org.apache.cayenne.CayenneDataObject { +public abstract class _TiposExamesComp extends siprp.database.cayenne.objects.BaseObject { public static final String DESCRICAO_PROPERTY = "descricao"; + public static final String ID_PROPERTY = "id"; public static final String ORDEM_PROPERTY = "ordem"; public static final String EXAMES_PERFIS_ARRAY_PROPERTY = "examesPerfisArray"; @@ -21,6 +22,14 @@ public abstract class _TiposExamesComp extends org.apache.cayenne.CayenneDataObj } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setOrdem(Integer ordem) { writeProperty("ordem", ordem); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcd.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcd.java index 4c3d87fe..fabe1c36 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcd.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcd.java @@ -9,9 +9,7 @@ public abstract class _TrabalhadoresEcd extends siprp.database.cayenne.objects.B public static final String ESTADO_PROPERTY = "estado"; public static final String TO_ECD_OFICIAL_PROPERTY = "toEcdOficial"; - public static final String TO_PRESTADORES_PROPERTY = "toPrestadores"; public static final String TO_PRT_TIPOS_ELEMENTOS_PROTOCOLO_PROPERTY = "toPrtTiposElementosProtocolo"; - public static final String TO_TRABALHADORES_ECDS_PROPERTY = "toTrabalhadoresEcds"; public static final String TO_TRABALHADORES_ECDS_DATAS_PROPERTY = "toTrabalhadoresEcdsDatas"; public static final String ID_PK_COLUMN = "id"; @@ -33,15 +31,6 @@ public abstract class _TrabalhadoresEcd extends siprp.database.cayenne.objects.B } - public void setToPrestadores(siprp.database.cayenne.objects.Prestadores toPrestadores) { - setToOneTarget("toPrestadores", toPrestadores, true); - } - - public siprp.database.cayenne.objects.Prestadores getToPrestadores() { - return (siprp.database.cayenne.objects.Prestadores)readProperty("toPrestadores"); - } - - public void setToPrtTiposElementosProtocolo(siprp.database.cayenne.objects.PrtTiposElementosProtocolo toPrtTiposElementosProtocolo) { setToOneTarget("toPrtTiposElementosProtocolo", toPrtTiposElementosProtocolo, true); } @@ -51,15 +40,6 @@ public abstract class _TrabalhadoresEcd extends siprp.database.cayenne.objects.B } - public void setToTrabalhadoresEcds(siprp.database.cayenne.objects.TrabalhadoresEcds toTrabalhadoresEcds) { - setToOneTarget("toTrabalhadoresEcds", toTrabalhadoresEcds, true); - } - - public siprp.database.cayenne.objects.TrabalhadoresEcds getToTrabalhadoresEcds() { - return (siprp.database.cayenne.objects.TrabalhadoresEcds)readProperty("toTrabalhadoresEcds"); - } - - public void setToTrabalhadoresEcdsDatas(siprp.database.cayenne.objects.TrabalhadoresEcdsDatas toTrabalhadoresEcdsDatas) { setToOneTarget("toTrabalhadoresEcdsDatas", toTrabalhadoresEcdsDatas, true); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcds.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcds.java index 1247b033..b5a09b80 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcds.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcds.java @@ -9,9 +9,9 @@ public abstract class _TrabalhadoresEcds extends siprp.database.cayenne.objects. public static final String DATA_PROPERTY = "data"; public static final String ESTADO_PROPERTY = "estado"; + public static final String ID_PROPERTY = "id"; public static final String TO_TRABALHADORES_PROPERTY = "toTrabalhadores"; public static final String TO_TRABALHADORES_PROCESSO_PROPERTY = "toTrabalhadoresProcesso"; - public static final String TRABALHADORES_ECD_ARRAY_PROPERTY = "trabalhadoresEcdArray"; public static final String TRABALHADORES_ECDS_DATAS_ARRAY_PROPERTY = "trabalhadoresEcdsDatasArray"; public static final String ID_PK_COLUMN = "id"; @@ -32,6 +32,14 @@ public abstract class _TrabalhadoresEcds extends siprp.database.cayenne.objects. } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setToTrabalhadores(siprp.database.cayenne.objects.Trabalhadores toTrabalhadores) { setToOneTarget("toTrabalhadores", toTrabalhadores, true); } @@ -50,17 +58,6 @@ public abstract class _TrabalhadoresEcds extends siprp.database.cayenne.objects. } - public void addToTrabalhadoresEcdArray(siprp.database.cayenne.objects.TrabalhadoresEcd obj) { - addToManyTarget("trabalhadoresEcdArray", obj, true); - } - public void removeFromTrabalhadoresEcdArray(siprp.database.cayenne.objects.TrabalhadoresEcd obj) { - removeToManyTarget("trabalhadoresEcdArray", obj, true); - } - public java.util.List getTrabalhadoresEcdArray() { - return (java.util.List)readProperty("trabalhadoresEcdArray"); - } - - public void addToTrabalhadoresEcdsDatasArray(siprp.database.cayenne.objects.TrabalhadoresEcdsDatas obj) { addToManyTarget("trabalhadoresEcdsDatasArray", obj, true); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcdsDatas.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcdsDatas.java index 8c51fd34..32919841 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcdsDatas.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcdsDatas.java @@ -9,6 +9,7 @@ public abstract class _TrabalhadoresEcdsDatas extends siprp.database.cayenne.obj public static final String DATA_PROPERTY = "data"; public static final String ESTADO_PROPERTY = "estado"; + public static final String ID_PROPERTY = "id"; public static final String TO_PRESTADORES_PROPERTY = "toPrestadores"; public static final String TO_TRABALHADORES_ECDS_PROPERTY = "toTrabalhadoresEcds"; public static final String TRABALHADORES_ECD_ARRAY_PROPERTY = "trabalhadoresEcdArray"; @@ -33,6 +34,14 @@ public abstract class _TrabalhadoresEcdsDatas extends siprp.database.cayenne.obj } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setToPrestadores(siprp.database.cayenne.objects.Prestadores toPrestadores) { setToOneTarget("toPrestadores", toPrestadores, true); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcdsDatasEmails.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcdsDatasEmails.java index 4a2a9fcd..f57013dd 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcdsDatasEmails.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcdsDatasEmails.java @@ -10,6 +10,7 @@ public abstract class _TrabalhadoresEcdsDatasEmails extends siprp.database.cayen public static final String BODY_PROPERTY = "body"; public static final String DATA_PROPERTY = "data"; public static final String DESTINATION_PROPERTY = "destination"; + public static final String ID_PROPERTY = "id"; public static final String SUBJECT_PROPERTY = "subject"; public static final String TO_TRABALHADORES_ECDS_DATAS_PROPERTY = "toTrabalhadoresEcdsDatas"; @@ -39,6 +40,14 @@ public abstract class _TrabalhadoresEcdsDatasEmails extends siprp.database.cayen } + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setSubject(String subject) { writeProperty("subject", subject); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcdsDatasObservacoes.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcdsDatasObservacoes.java index da9fd2d2..add1bb37 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcdsDatasObservacoes.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresEcdsDatasObservacoes.java @@ -7,11 +7,20 @@ package siprp.database.cayenne.objects.auto; */ public abstract class _TrabalhadoresEcdsDatasObservacoes extends siprp.database.cayenne.objects.BaseObject { + public static final String ID_PROPERTY = "id"; public static final String OBSERVACAO_PROPERTY = "observacao"; public static final String TO_TRABALHADORES_ECDS_DATAS_PROPERTY = "toTrabalhadoresEcdsDatas"; public static final String ID_PK_COLUMN = "id"; + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setObservacao(String observacao) { writeProperty("observacao", observacao); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresFichasAptidao.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresFichasAptidao.java index 410af540..188769e3 100755 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresFichasAptidao.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_TrabalhadoresFichasAptidao.java @@ -7,11 +7,20 @@ package siprp.database.cayenne.objects.auto; */ public abstract class _TrabalhadoresFichasAptidao extends siprp.database.cayenne.objects.BaseObject { + public static final String ID_PROPERTY = "id"; public static final String TO_EXAMES_PROPERTY = "toExames"; public static final String TO_TRABALHADORES_PROCESSO_PROPERTY = "toTrabalhadoresProcesso"; public static final String ID_PK_COLUMN = "id"; + public void setId(Integer id) { + writeProperty("id", id); + } + public Integer getId() { + return (Integer)readProperty("id"); + } + + public void setToExames(siprp.database.cayenne.objects.Exames toExames) { setToOneTarget("toExames", toExames, true); } diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java index 2f8dee49..0ca6023a 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java @@ -1,6 +1,9 @@ package siprp.medicina.processo.logic; +import static siprp.medicina.processo.logic.MedicinaProcessoLogic.DESMARCAR_CONSULTA_MARCACAO; + import java.util.Date; +import java.util.HashMap; import java.util.Vector; import javax.swing.tree.DefaultMutableTreeNode; @@ -18,9 +21,11 @@ import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasObservacoes; import siprp.database.cayenne.objects.TrabalhadoresProcesso; import siprp.database.cayenne.providers.MedicinaDAO; import siprp.logic.SIPRPLogic; +import siprp.logic.SIPRPLogic.LeafUIActionBinding; import siprp.medicina.MedicinaConstants; import siprp.medicina.processo.ProcessoConstants; import siprp.medicina.processo.estrutura.FichaAptidaoMutableTreeNode; +import siprp.medicina.processo.ui.LeafOptionDialog; import siprp.ui.SIPRPWindow.LeafObject; import com.evolute.utils.tables.ColumnizedMappable; @@ -146,6 +151,15 @@ public class MedicinaProcessoLogic extends SIPRPLogic @Action(isSave = true) public static final String FALTOU_CONSULTA_MARCACAO = "FALTOU_CONSULTA_MARCACAO"; + + @Action(isSave = true) + public static final String DESMARCAR_EXAME_MARCACAO = "DESMARCAR_EXAME_MARCACAO"; + + @Action(isSave = true) + public static final String REALIZAR_EXAME_MARCACAO = "REALIZAR_EXAME_MARCACAO"; + + @Action(isSave = true) + public static final String FALTOU_EXAME_MARCACAO = "FALTOU_EXAME_MARCACAO"; private MedicinaDAO provider = null; @@ -247,8 +261,19 @@ public class MedicinaProcessoLogic extends SIPRPLogic { if( currentConsultaMarcacao != null ) { - currentConsultaMarcacao.setEstado( MedicinaConstants.ESTADO_DESMARCADO_EMPRESA ); - //TODO motivo + HashMap options = new HashMap(); + options.put( true, "SIPRP" ); + options.put( false, "Trabalhador" ); + LeafOptionDialog optionDialog = new LeafOptionDialog(options, "Desmarcado por:", false); + Boolean isDesmarcadoPorSIPRP = optionDialog.getOption(); + if(isDesmarcadoPorSIPRP) + { + currentConsultaMarcacao.setEstado( MedicinaConstants.ESTADO_DESMARCADO_EMPRESA ); + } + else + { + currentConsultaMarcacao.setEstado( MedicinaConstants.ESTADO_DESMARCADO_TRABALHADOR ); + } saveObject( currentConsultaMarcacao ); } } diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafGradientPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafGradientPanel.java index 86981fc4..e48b38c6 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafGradientPanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafGradientPanel.java @@ -1,9 +1,6 @@ package siprp.medicina.processo.ui; import java.awt.Color; -import java.awt.GradientPaint; -import java.awt.Graphics; -import java.awt.Graphics2D; import javax.swing.JPanel; @@ -13,7 +10,7 @@ public class LeafGradientPanel extends JPanel public LeafGradientPanel() { - setBackground( new Color(200,200,230) ); + setBackground( new Color(200,200,200) ); } // @Override diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafInputField.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafInputField.java index 49a2982c..bca0a9b2 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafInputField.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafInputField.java @@ -1,5 +1,8 @@ package siprp.medicina.processo.ui; +import info.clearthought.layout.TableLayout; +import info.clearthought.layout.TableLayoutConstraints; + import java.awt.Color; import java.awt.GradientPaint; import java.awt.Graphics; @@ -9,19 +12,26 @@ import java.awt.event.FocusListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.text.DateFormat; +import java.util.ArrayList; import java.util.Date; +import java.util.List; import java.util.Locale; import java.util.Map; import javax.swing.BorderFactory; +import javax.swing.JComponent; import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JSeparator; import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.SwingUtilities; -import siprp.ui.SIPRPWindow; - -public class LeafInputField extends JTextArea +public class LeafInputField extends JPanel implements FocusListener, MouseListener { public static final String PROPERTY_CHANGED_CONSTANT = "LEAF_INPUT_PROPERTY_CHANGED"; + public static final String PROPERTY_CHANGED_CLICK = "LEAF_PROPERTY_CHANGED_CLICK"; private static final long serialVersionUID = 1L; private static final DateFormat sdf = DateFormat.getDateInstance( DateFormat.SHORT, new Locale( "pt", "PT" ) ); @@ -35,6 +45,7 @@ public class LeafInputField extends JTextArea private Color background = null; private Color startColor = null; private Color endColor = null; + private Color highLightColor = Color.GREEN.brighter().brighter(); private Object selectedOption = null; @@ -42,6 +53,12 @@ public class LeafInputField extends JTextArea private boolean isEditable = false; + private boolean isClickable = false; + + private boolean highLighted = false; + + private boolean collapseOptions = true; + private ObjClass object = null; private GradientPaint outerContour = null; @@ -49,93 +66,34 @@ public class LeafInputField extends JTextArea private GradientPaint innerContour = null; private GradientPaint innerReversedContour = null; private GradientPaint gradient = null; + private TableLayout layout = null; + + private JComponent thiz = null; + + private List theeze = null; public LeafInputField() { super(); setOpaque( false ); - super.setEditable( false ); + // super.setEditable( false ); setBorder( BorderFactory.createEmptyBorder( 3, 10, 3, 10 ) ); setBackground( Color.WHITE ); hot = getBackground(); cold = new Color( hot.getRed() > colorDec ? hot.getRed() - colorDec : 0, hot.getGreen() > colorDec ? hot.getGreen() - colorDec : 0, hot.getBlue() > colorDec ? hot.getBlue() - colorDec : 0, hot.getAlpha() ); background = cold; + } - this.addFocusListener( new FocusListener() - { - @Override - public void focusLost( FocusEvent e ) - { - repaint(); - } - - @Override - public void focusGained( FocusEvent e ) - { - repaint(); - } - } ); - - this.addMouseListener( new MouseListener() - { - - @Override - public void mouseReleased( MouseEvent e ) - { - } - - @Override - public void mousePressed( MouseEvent e ) - { - } - - @Override - public void mouseExited( MouseEvent e ) - { - background = isEditable ? cold : background; - repaint(); - } - - @Override - public void mouseEntered( MouseEvent e ) - { - background = isEditable ? hot : background; - repaint(); - } - - @Override - public void mouseClicked( MouseEvent e ) - { - ObjClass obj = object; - if( obj != null && isEditable ) - { - if( obj instanceof Date ) - { - obj = (ObjClass) getDateFromUser(); - } - else if( obj instanceof Map ) - { - ObjClass out = (ObjClass) getOptionFromUser(); - selectedOption = out == null ? selectedOption : out; - obj = object; - } - else if( obj instanceof String ) - { - obj = (ObjClass) getStringFromUser(); - } - if( obj != null ) - { - firePropertyChange( PROPERTY_CHANGED_CONSTANT, object, obj); - setObject( obj ); - } - } - } - - } ); + public boolean isCollapseOptions() + { + return collapseOptions; + } + public void setCollapseOptions( boolean collapse ) + { + collapseOptions = collapse; } - @Override public void setText( String text ) { try @@ -155,8 +113,9 @@ public class LeafInputField extends JTextArea private Object getOptionFromUser() { - LeafOptionDialog optionDialog = new LeafOptionDialog( getParentFrame(), this, (Map) object ); + LeafOptionDialog optionDialog = new LeafOptionDialog( (Map) object ); return optionDialog.getOption(); + } private Date getDateFromUser() @@ -239,27 +198,141 @@ public class LeafInputField extends JTextArea return getParent() != null ? getParent().getBackground() : startColor; } - @Override public void setEditable( boolean editable ) { isEditable = editable; } - @Override public boolean isEditable() { return isEditable; } - public void setSelectedObject( Object key ) + public void setClickable( boolean clickable ) + { + isClickable = clickable; + } + + public boolean isClickable() + { + return isClickable; + } + + private void setupCollapsedPanel() + { + List values = ((OrderedMap) object).getValues( selectedOption ); + theeze = new ArrayList(); + if( values != null ) + { + double[] rows = new double[] { + TableLayout.MINIMUM + }; + double[] cols = new double[values.size() > 0 ? (values.size() * 2 - 1) : 0]; + for( int i = 0; i < cols.length; ++i ) + { + cols[i] = (i % 2 == 0) ? TableLayout.FILL : TableLayout.MINIMUM; + } + TableLayout layout = new TableLayout( cols, rows ); + layout.setHGap( 5 ); + thiz.setLayout( layout ); + for( int i = 0, a = 0; i < cols.length; ++i ) + { + JComponent comp = null; + if( i % 2 == 0 ) + { + Object value = values.get( a++ ); + comp = new JLabel( value == null ? " " : value.toString() ); + theeze.add( comp ); + } + else + { + comp = new JSeparator( JSeparator.VERTICAL ); + } + thiz.add( comp, new TableLayoutConstraints( i, 0 ) ); + } + } + } + + private void setupUncollapsedPanel() + { + theeze = new ArrayList(); + OrderedMap map = (OrderedMap) object; + double[] rows = new double[map.rows() > 0 ? (map.rows() * 2 - 1) : 0]; + double[] cols = new double[map.columns() > 0 ? (map.columns() * 2 - 1) : 0]; + for( int i = 0; i < rows.length; ++i ) + { + rows[i] = (i % 2 == 0) ? TableLayout.MINIMUM : TableLayout.MINIMUM; + } + for( int i = 0; i < cols.length; ++i ) + { + cols[i] = (i % 2 == 0) ? TableLayout.FILL : TableLayout.MINIMUM; + } + TableLayout layout = new TableLayout( cols, rows ); + layout.setHGap( 5 ); + thiz.setLayout( layout ); + + for( int i = 0, a = 0; i < rows.length; ++i ) + { + if( i % 2 == 0 ) + { + List values = map.getValuesAt( a++ ); + for( int j = 0, b = 0; j < cols.length; ++j ) + { + JComponent comp = null; + if( j % 2 == 0 ) + { + Object value = values.get( b++ ); + comp = new JLabel( value == null ? " " : value.toString() ); + theeze.add( comp ); + } + else + { + comp = new JSeparator( JSeparator.VERTICAL ); + } + thiz.add( comp, new TableLayoutConstraints( j, i ) ); + } + } + else + { + thiz.add( new JSeparator(), new TableLayoutConstraints( 0, i, cols.length - 1, i ) ); + } + } + } + + private void setSelectedObject( Object key ) { selectedOption = key; - Object value = null; - if( key != null && object instanceof Map ) + if( object != null && thiz != null && selectedOption != null ) { - value = ((Map) object).get( selectedOption ); + if( object instanceof Map ) + { + Object value = null; + value = ((Map) object).get( selectedOption ); + if( thiz instanceof JTextArea ) + { + ((JTextArea) thiz).setText( value == null ? " " : value.toString() ); + } + else if( thiz instanceof JTextField ) + { + ((JTextField) thiz).setText( value == null ? " " : value.toString() ); + } + else if( thiz instanceof JLabel ) + { + ((JLabel) thiz).setText( value == null ? " " : value.toString() ); + } + } + else if( object instanceof OrderedMap ) + { + if( thiz instanceof JPanel && collapseOptions ) + { + setupCollapsedPanel(); + } + else if( thiz instanceof JPanel && !collapseOptions ) + { + setupUncollapsedPanel(); + } + } } - super.setText( value == null ? " " : value.toString() ); } public Object getSelectedObject() @@ -267,6 +340,12 @@ public class LeafInputField extends JTextArea return selectedOption; } + public void setObject( ObjClass object, Object selected ) + { + this.selectedOption = selected; + setObject( object ); + } + public void setObject( ObjClass object ) { this.object = object; @@ -274,25 +353,154 @@ public class LeafInputField extends JTextArea { if( object instanceof Date ) { - super.setText( ((Date) object).getTime() <= 0 ? " " : sdf.format( object ) ); + thiz = new JLabel( ((Date) object).getTime() <= 0 ? " " : sdf.format( object ) ); } else if( object instanceof Map ) { + thiz = new JLabel( " " ); + setSelectedObject( selectedOption ); + } + else if( object instanceof OrderedMap && collapseOptions ) + { + thiz = new JPanel(); + setSelectedObject( selectedOption ); + } + else if( object instanceof OrderedMap && !collapseOptions ) + { + thiz = new JPanel(); setSelectedObject( selectedOption ); } else { - super.setText( object.toString() ); + thiz = new JLabel( object.toString() ); } } else { - super.setText( " " ); + thiz = new JLabel( " " ); } + reListen(); + reLayout(); } public ObjClass getObject() { return this.object; } + + private void reListen() + { + if( thiz != null ) + { + thiz.addFocusListener( this ); + thiz.addMouseListener( this ); + } + } + + private void reLayout() + { + if( thiz != null ) + { + SwingUtilities.invokeLater(new Runnable(){ + @Override + public void run() + { + if( layout == null ) + { + layout = new TableLayout(new double []{TableLayout.FILL}, new double[]{TableLayout.FILL}); + LeafInputField.this.setLayout( layout ); + }else + { + removeAll(); + } + LeafInputField.this.add( thiz, new TableLayoutConstraints( 0, 0 ) ); + revalidate(); + repaint(); + } + }); + } + } + + @Override + public void focusLost( FocusEvent e ) + { + repaint(); + } + + @Override + public void focusGained( FocusEvent e ) + { + repaint(); + } + + @Override + public void mouseReleased( MouseEvent e ) + { + } + + @Override + public void mousePressed( MouseEvent e ) + { + } + + @Override + public void mouseExited( MouseEvent e ) + { + background = (!highLighted && (isEditable || isClickable)) ? cold : background; + repaint(); + } + + @Override + public void mouseEntered( MouseEvent e ) + { + background = (!highLighted && (isEditable || isClickable)) ? hot : background; + repaint(); + } + + public boolean getSelected() + { + return highLighted; + } + + public void setSelected( boolean selected ) + { + highLighted = selected; + background = selected ? highLightColor : cold; + } + + @Override + public void mouseClicked( MouseEvent e ) + { + ObjClass obj = object; + if( obj != null && isEditable ) + { + if( obj instanceof Date ) + { + obj = (ObjClass) getDateFromUser(); + } + else if( obj instanceof Map && collapseOptions ) + { + ObjClass out = (ObjClass) getOptionFromUser(); + setSelectedObject( out ); + obj = object; + } + else if( obj instanceof OrderedMap ) + { + + } + else if( obj instanceof String ) + { + obj = (ObjClass) getStringFromUser(); + } + if( obj != null ) + { + firePropertyChange( PROPERTY_CHANGED_CONSTANT, object, obj ); + setObject( obj ); + } + } + if( isClickable ) + { + firePropertyChange( PROPERTY_CHANGED_CLICK, false, true ); + } + } } \ No newline at end of file diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java index 91d87e2d..2cb3c15a 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/LeafOptionDialog.java @@ -3,49 +3,78 @@ package siprp.medicina.processo.ui; import info.clearthought.layout.TableLayout; import info.clearthought.layout.TableLayoutConstraints; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Set; import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JDialog; -import javax.swing.JFrame; import javax.swing.JLabel; public class LeafOptionDialog extends JDialog { private static final long serialVersionUID = 1L; + private static final String OK_LABEL = "Ok"; + private static final String CANCEL_LABEL = "Cancelar"; private final JLabel labelMessage = new JLabel(); + private boolean cancelActive = true; + + private LeafInputField submitButton = new LeafInputField(); + private Map map = null; - private KeyClass selected = null; + private OrderedMap orderedMap = null; + + private List selected = new ArrayList(); private String message = null; + private boolean ordered = false; + + /** Creates a new instance of JCalendarDialog */ + public LeafOptionDialog(Map map) + { + super( ); + startup( map, null ); + } + + /** Creates a new instance of JCalendarDialog */ + public LeafOptionDialog( Map map, String message, boolean cancelActive) + { + super( ); + this.cancelActive = cancelActive; + this.message = message; + startup( map, null ); + } + /** Creates a new instance of JCalendarDialog */ - public LeafOptionDialog(JFrame parentFrame, JComponent parent, Map map) + public LeafOptionDialog(Map map, String message) { - super( parentFrame ); - startup( parent, map ); + super( ); + this.message = message; + startup( map, null ); } /** Creates a new instance of JCalendarDialog */ - public LeafOptionDialog(JFrame parentFrame, JComponent parent, Map map, String message) + public LeafOptionDialog(OrderedMap orderedMap, String message) { - super( parentFrame ); + super( ); + ordered = true; this.message = message; - startup( parent, map ); + startup( null, orderedMap ); } - private void startup( JComponent parent, Map map ) + private void startup( Map map, OrderedMap orderedMap ) { if( map == null ) { @@ -55,26 +84,32 @@ public class LeafOptionDialog extends JDialog { this.map = map; } + if( orderedMap == null ) + { + this.orderedMap = new OrderedMap(); + } + else + { + this.orderedMap = orderedMap; + } + setupComponents( map == null ? orderedMap.keySet() : map.keySet(), map == null ? true : false ); setModal( true ); - setupComponents(); setUndecorated( true ); - setLocationRelativeTo( parent ); setVisible( true ); } - private void setupComponents() + private void setupComponents( Set keySet, boolean ordered ) { - Set keySet = map.keySet(); Iterator iterator = keySet.iterator(); KeyClass current = null; double[] cols = new double[] { - TableLayout.MINIMUM + TableLayout.FILL }; - double[] rows = new double[message == null ? 0 : 1 + keySet.size() + 1]; + double[] rows = new double[(message == null ? 0 : 1) + keySet.size() + (cancelActive ? 1 : 0)]; for( int i = 0; i < rows.length; ++i ) { - rows[i] = TableLayout.MINIMUM; + rows[i] = TableLayout.FILL; } TableLayout layout = new TableLayout( cols, rows ); layout.setVGap( 3 ); @@ -91,16 +126,31 @@ public class LeafOptionDialog extends JDialog { current = iterator.next(); LeafInputField component = new LeafInputField(); - component.setObject( map.get( current ) ); + Object value; + if( ordered ) + { + List values = orderedMap.getValues( current ); + value = (values == null || values.size() == 0) ? null : values.get( 0 ); + } + else + { + value = map.get( current ); + } + component.setObject( value ); + component.setClickable( true ); getContentPane().add( component, new TableLayoutConstraints( 0, i + shift ) ); addListenerToComponent( component ); } - LeafInputField cancelButton = new LeafInputField(); - cancelButton.setObject( CANCEL_LABEL ); - getContentPane().add( cancelButton, new TableLayoutConstraints( 0, keySet.size() + shift ) ); - addListenerToComponent( cancelButton ); + if( cancelActive ) + { + submitButton.setObject( ordered ? OK_LABEL : CANCEL_LABEL ); + submitButton.setClickable( true ); + getContentPane().add( submitButton, new TableLayoutConstraints( 0, keySet.size() + shift ) ); + addListenerToComponent( submitButton ); + } ((JComponent) getContentPane()).setBorder( BorderFactory.createRaisedBevelBorder() ); setSize( layout.preferredLayoutSize( this.getContentPane() ) ); + setLocationRelativeTo( getParent() ); } private KeyClass getKeyForValue( Object value ) @@ -115,52 +165,58 @@ public class LeafOptionDialog extends JDialog } } } + else if( ordered ) + { + return orderedMap.getKeyForValue( value ); + } return null; } private void addListenerToComponent( JComponent component ) { - component.addMouseListener( new MouseListener() + component.addPropertyChangeListener( new PropertyChangeListener() { @Override - public void mouseReleased( MouseEvent e ) - { - } - - @Override - public void mousePressed( MouseEvent e ) - { - } - - @Override - public void mouseExited( MouseEvent e ) - { - } - - @Override - public void mouseEntered( MouseEvent e ) - { - } - - @Override - public void mouseClicked( MouseEvent e ) + public void propertyChange( PropertyChangeEvent e ) { if( e.getSource() instanceof LeafInputField ) { - Object value = ((LeafInputField) e.getSource()).getObject(); - if( value != null ) + LeafInputField source = (LeafInputField) e.getSource(); + if( LeafInputField.PROPERTY_CHANGED_CLICK.equals( e.getPropertyName() ) ) { - selected = getKeyForValue( value ); + Object value = source.getObject(); + if( value != null ) + { + KeyClass key = getKeyForValue( value ); + if( selected.contains( key ) ) + { + selected.remove( key ); + source.setSelected( false ); + } + else + { + selected.add( key ); + source.setSelected( true ); + } + } + if( !ordered || source.equals( submitButton ) ) + { + close(); + } } } - close(); } } ); } public KeyClass getOption() + { + return selected.isEmpty() ? null : selected.get( 0 ); + } + + public List getSelected() { return selected; } diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/OrderedMap.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/OrderedMap.java index 62033451..74c6b0dc 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/OrderedMap.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/OrderedMap.java @@ -3,55 +3,113 @@ package siprp.medicina.processo.ui; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Set; import java.util.Vector; -public class OrderedMap extends HashMap> +public class OrderedMap { private static final long serialVersionUID = 1L; - + private Vector order = new Vector(); - + + private HashMap> map = new HashMap>(); + public OrderedMap() { } - - public List getValuesAt(int row) + + public List getValuesAt( int row ) { - return this.get( order.get( row ) ); + return map.get( order.get( row ) ); } - - public Object getValueAt(int column, int row) + + public List getValues( KeyClass key ) { - return this.getValuesAt( row ).get( column ); + return map.get( key ); + } + + public int rows() + { + return order.size(); } - - public void putLast( KeyClass key, Object value) + + public KeyClass getKeyForValue( Object value ) { - if(this.containsKey( key )) + for( KeyClass key : map.keySet() ) { - this.remove( key ); + List values = map.get( key ); + if( value.equals( values )) + { + return key; + }else + { + for(Object currentValue : values) + { + if(currentValue.equals(value)) + { + return key; + } + } + } } - List list = new ArrayList(); - list.add( value ); - this.put( key, list ); - order.add( key ); + return null; } - - public void putLast( KeyClass key, List values) + + /** + * returns the length of the biggest column + * + * @return + */ + public int columns() { - if(this.containsKey( key )) + int result = 0; + for( KeyClass key : order ) { - this.remove( key ); + result = map.get( key ).size() > result ? map.get( key ).size() : result; } - this.put( key, values ); - order.add( key ); + return result; + } + + public KeyClass getFirst() + { + return order.isEmpty() ? null : order.get( 0 ); + } + + public Set keySet() + { + return map.keySet(); } - - @Override + + public boolean containsKey( KeyClass key ) + { + return map.containsKey( key ); + } + + public Object getValueAt( int column, int row ) + { + return this.getValuesAt( row ).get( column ); + } + + public void putLast( KeyClass key, Object value ) + { + List list; + if( map.containsKey( key ) ) + { + list = map.get( key ); + } + else + { + list = new ArrayList(); + order.add( key ); + } + list.add( value ); + map.put( key, list ); + } + public List remove( Object key ) { order.remove( key ); - return super.remove( key ); + return map.remove( key ); } - + } diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java index 3210854d..3f04498e 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java @@ -129,6 +129,15 @@ public class ProcessoAccoesPanel extends JPanel public final LeafButton buttonNovoExameMarcacaoEmail = new LeafButton( "Enviar e-Mail" ); @ActionActivation(onSelect = CREATE_EXAME_MARCACAO_OBSERVACOES, onChange = "") public final LeafButton buttonNovoExameMarcacaoObservacoes = new LeafButton( "Adicionar Observa" + ccedil + atilde + "o" ); + + @ActionActivation(onSelect = DESMARCAR_EXAME_MARCACAO, onChange = "") + public final LeafButton buttonExameMarcacaoDesmarcar = new LeafButton( "Desmarcar" ); + + @ActionActivation(onSelect = REALIZAR_EXAME_MARCACAO, onChange = "") + public final LeafButton buttonExameMarcacaoRealizar = new LeafButton( "Realizar" ); + + @ActionActivation(onSelect = FALTOU_EXAME_MARCACAO, onChange = "") + public final LeafButton buttonExameMarcacaoFaltou = new LeafButton( "Faltou" ); // email marcacao exame @@ -382,15 +391,23 @@ public class ProcessoAccoesPanel extends JPanel panelConsultaMarcacao.add( new JPanel(), new TableLayoutConstraints(0,1) ); panelConsultaMarcacao.add( consultaMarcacaoLowerPanel, new TableLayoutConstraints(0,2) ); } - - private void setupExamePanel() + + private void setupExameMarcacaoPanel() { - setupSimpleActionsPanel( panelExame, buttonNovoExameMarcacao, new JPanel() ); + JPanel exameMarcacaoUpperPanel = new JPanel(); + JPanel exameMarcacaoLowerPanel = new JPanel(); + setupSimpleActionsPanel( exameMarcacaoUpperPanel, buttonNovoExameMarcacaoEmail, buttonNovoExameMarcacaoObservacoes, new JPanel() ); + setupSimpleActionsPanel( exameMarcacaoLowerPanel, buttonExameMarcacaoRealizar, buttonExameMarcacaoDesmarcar, buttonExameMarcacaoFaltou); + TableLayout exameMarcacaoLayout = new TableLayout(new double[]{TableLayout.FILL}, new double[]{TableLayout.MINIMUM, TableLayout.FILL,TableLayout.MINIMUM}); + panelExameMarcacao.setLayout( exameMarcacaoLayout ); + panelExameMarcacao.add( exameMarcacaoUpperPanel, new TableLayoutConstraints(0,0) ); + panelExameMarcacao.add( new JPanel(), new TableLayoutConstraints(0,1) ); + panelExameMarcacao.add( exameMarcacaoLowerPanel, new TableLayoutConstraints(0,2) ); } - private void setupExameMarcacaoPanel() + private void setupExamePanel() { - setupSimpleActionsPanel( panelExameMarcacao, buttonNovoExameMarcacaoEmail, buttonNovoExameMarcacaoObservacoes, new JPanel() ); + setupSimpleActionsPanel( panelExame, buttonNovoExameMarcacao, new JPanel() ); } private void setupSimpleActionsPanel( JPanel panel, JComponent... field ) diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java index 63248bbd..245af696 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java @@ -26,9 +26,11 @@ import info.clearthought.layout.TableLayout; import info.clearthought.layout.TableLayoutConstraints; import java.awt.CardLayout; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; +import java.util.Vector; import javax.swing.BorderFactory; import javax.swing.JComponent; @@ -52,6 +54,7 @@ import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasEmails; import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasObservacoes; import siprp.database.cayenne.objects.TrabalhadoresProcesso; import siprp.logic.SIPRPLogic.LeafUIActionBinding; +import siprp.medicina.MedicinaConstants; import siprp.medicina.processo.ProcessoConstants; import siprp.ui.SIPRPWindow; import siprp.ui.SIPRPWindow.ActionActivation; @@ -154,15 +157,17 @@ public class ProcessoDadosPanel extends JPanel private final JLabel labelExameGruposEcds = new JLabel( "Ecds" ); public final LeafInputField> inputExameEstado = new LeafInputField>(); - public final LeafInputField> inputExameGruposEcds = new LeafInputField>(); + public final LeafInputField> inputExameGruposEcds = new LeafInputField>(); public final LeafInputField inputExameData = new LeafInputField(); // marcacao exame private final JLabel labelExameMarcacaoEstado = new JLabel( "Estado" ); private final JLabel labelExameMarcacaoData = new JLabel( "Data" ); + private final JLabel labelExameMarcacaoGruposEcds = new JLabel( "Ecds" ); public final LeafInputField> inputExameMarcacaoEstado = new LeafInputField>(); public final LeafInputField inputExameMarcacaoData = new LeafInputField(); + public final LeafInputField> inputExameMarcacaoGruposEcds = new LeafInputField>(); // email marcacao exame private final JLabel labelExameMarcacaoEmailData = new JLabel( "Data" ); @@ -227,8 +232,7 @@ public class ProcessoDadosPanel extends JPanel if( trabalhador != null ) { inputTrabalhadorDataNascimento.setObject( trabalhador.getDataNascimento() ); - inputTrabalhadorSexo.setObject( trabalhador.getSexos() ); - inputTrabalhadorSexo.setSelectedObject( trabalhador.getSexo() ); + inputTrabalhadorSexo.setObject( trabalhador.getSexos(), trabalhador.getSexo() ); inputTrabalhadorNome.setObject( trabalhador.getNome() ); inputTrabalhadorNacionalidade.setObject( trabalhador.getNacionalidade() ); inputTrabalhadorObservacoes.setObject( trabalhador.getObservacoes() ); @@ -248,10 +252,8 @@ public class ProcessoDadosPanel extends JPanel { inputProcessoDataFim.setObject( processo.getDataFim() ); inputProcessoDataInicio.setObject( processo.getDataInicio() ); - inputProcessoEstado.setObject( processo.getEstados() ); - inputProcessoEstado.setSelectedObject( processo.getEstado() ); - inputProcessoMotivo.setObject( processo.getMotivos() ); - inputProcessoMotivo.setSelectedObject( processo.getMotivo() ); + inputProcessoEstado.setObject( processo.getEstados(), processo.getEstado() ); + inputProcessoMotivo.setObject( processo.getMotivos(), processo.getMotivo() ); cardLayout.show( this, PANEL_PROCESSO_NAME ); } @@ -266,8 +268,7 @@ public class ProcessoDadosPanel extends JPanel { if( consulta != null ) { - inputConsultaEstado.setObject( consulta.getConsultaEstados() ); - inputConsultaEstado.setSelectedObject( consulta.getEstado() ); + inputConsultaEstado.setObject( consulta.getConsultaEstados(), consulta.getEstado() ); inputConsultaData.setObject( consulta.getData() == null ? new Date( 0 ) : consulta.getData() ); // inputConsultaData.setError( consulta.getData() == null || @@ -287,8 +288,7 @@ public class ProcessoDadosPanel extends JPanel if( marcacao != null ) { inputConsultaMarcacaoData.setObject( marcacao.getData() ); - inputConsultaMarcacaoEstado.setObject( marcacao.getConsultaEstados() ); - inputConsultaMarcacaoEstado.setSelectedObject( marcacao.getEstado() ); + inputConsultaMarcacaoEstado.setObject( marcacao.getConsultaEstados(), marcacao.getEstado() ); cardLayout.show( this, PANEL_CONSULTA_MARCACAO_NAME ); } else @@ -334,37 +334,10 @@ public class ProcessoDadosPanel extends JPanel if( exame != null ) { inputExameData.setObject( exame.getData() ); - inputExameEstado.setObject( exame.getEstados() ); - inputExameEstado.setSelectedObject( exame.getEstado() ); - HashMap grupos = new HashMap(); - Trabalhadores trabalhador = exame.getToTrabalhadores(); - Integer perfil = trabalhador.getPerfil(); - if( perfil != null ) - { - Empresas empresa = trabalhador.getToEstabelecimentos().getToEmpresas(); - List ecdsPerfil = (List) empresa.getPrtElementosProtocoloArray(); - for( PrtElementosProtocolo ecdPerfil : ecdsPerfil ) - { - 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 ); + inputExameEstado.setObject( exame.getEstados() , exame.getEstado()); + OrderedMap grupos = exame.getGruposExamesForPerfil(); + inputExameGruposEcds.setCollapseOptions( false ); + inputExameGruposEcds.setObject( grupos,grupos.getFirst() ); cardLayout.show( this, PANEL_EXAME_NAME ); } else @@ -379,15 +352,10 @@ public class ProcessoDadosPanel extends JPanel if( exameMarcacao != null ) { inputExameMarcacaoData.setObject( exameMarcacao.getData() ); - inputExameMarcacaoEstado.setObject( exameMarcacao.getEstados() ); - inputExameMarcacaoEstado.setSelectedObject( exameMarcacao.getEstado() ); - // TODO mostrar lista de exames disponiveis para a marcacao - List ecds = (List) exameMarcacao.getTrabalhadoresEcdArray(); - for( TrabalhadoresEcd ecd : ecds ) - { - Integer ecdEstado = ecd.getEstado(); - // ecd.get - } + inputExameMarcacaoEstado.setObject( exameMarcacao.getEstados(), exameMarcacao.getEstado() ); + OrderedMap grupos = exameMarcacao.getGruposExames(); + inputExameMarcacaoGruposEcds.setCollapseOptions( false ); + inputExameMarcacaoGruposEcds.setObject( grupos, grupos.getFirst() ); cardLayout.show( this, PANEL_EXAME_MARCACAO_NAME ); } else @@ -430,7 +398,7 @@ public class ProcessoDadosPanel extends JPanel public void setForNewProcesso( TrabalhadoresProcesso processo ) { HashMap tipos = processo.getMotivos(); - LeafOptionDialog option = new LeafOptionDialog(getParentFrame(), this, tipos, "Escolha o tipo de processo:"); + LeafOptionDialog option = new LeafOptionDialog(tipos, "Escolha o tipo de processo:"); Integer chosen = option.getOption(); if(chosen != null) { @@ -454,6 +422,7 @@ public class ProcessoDadosPanel extends JPanel @LeafUIActionBinding(action = CREATE_CONSULTA_MARCACAO_EMAIL) public void setForNewConsultaMarcacaoEmail( TrabalhadoresConsultasDatasEmails email ) { + } @LeafUIActionBinding(action = CREATE_CONSULTA_MARCACAO_OBSERVACOES) @@ -476,6 +445,13 @@ public class ProcessoDadosPanel extends JPanel LeafCalendarDialog calendar = new LeafCalendarDialog( getParentFrame(), this, false, false ); Date date = calendar.getDate(); marcacao.setData( date ); + + OrderedMap grupos = marcacao.getToTrabalhadoresEcds().getGruposExamesForPerfil(); + LeafOptionDialog gruposChosen = new LeafOptionDialog(grupos,"Escolha os ECDs a marcar"); + for(PrtGruposProtocolo grupo : gruposChosen.getSelected()) + { + marcacao.marcarGrupoExames(grupo); + } } @LeafUIActionBinding(action = CREATE_EXAME_MARCACAO_EMAIL) @@ -514,7 +490,7 @@ public class ProcessoDadosPanel extends JPanel @LeafUIActionBinding(action = SAVE_CONSULTA_MARCACAO_OBSERVACOES) public void updateToSaveConsultaMarcacaoObservacoes( TrabalhadoresConsultasDatasObservacoes observacoes ) { - observacoes.setObservacao( inputConsultaMarcacaoObsMensagem.getText() ); + observacoes.setObservacao( inputConsultaMarcacaoObsMensagem.getObject() ); } @LeafUIActionBinding(action = SAVE_EXAME) @@ -539,9 +515,10 @@ public class ProcessoDadosPanel extends JPanel @LeafUIActionBinding(action = SAVE_EXAME_MARCACAO_OBSERVACOES) public void updateToSaveExameMarcacaoObservacoes( TrabalhadoresEcdsDatasObservacoes observacoes ) { - observacoes.setObservacao( inputExameMarcacaoObsMensagem.getText() ); + observacoes.setObservacao( inputExameMarcacaoObsMensagem.getObject() ); } + private void setupStartPanel() { } @@ -552,7 +529,7 @@ public class ProcessoDadosPanel extends JPanel FILL }; double[] rows = new double[field.length]; - for( int i = 0; i < field.length; rows[i++] = MINIMUM ) + for( int i = 0; i < field.length; rows[i++] = TableLayout.PREFERRED ) ; rows[rows.length - 1] = FILL; TableLayout layout = new TableLayout( cols, rows ); @@ -572,11 +549,6 @@ public class ProcessoDadosPanel extends JPanel private void setupTrabalhadorPanel() { - // inputTrabalhadorNacionalidade.setEditable( false ); - // inputTrabalhadorDataNascimento.setEditable( false ); - // inputTrabalhadorNome.setEditable( false ); - // inputTrabalhadorSexo.setEditable( false ); - // inputTrabalhadorObservacoes.setEditable( false ); setupSimpleDataPanel( panelTrabalhador, "Trabalhador", labelTrabalhadorNome, inputTrabalhadorNome, labelTrabalhadorSexo, inputTrabalhadorSexo, labelTrabalhadorNacionalidade, inputTrabalhadorNacionalidade, labelTrabalhadorDataNascimento, inputTrabalhadorDataNascimento, labelTrabalhadorObservacoes, inputTrabalhadorObservacoes ); } @@ -588,8 +560,6 @@ public class ProcessoDadosPanel extends JPanel private void setupConsultaPanel() { setupSimpleDataPanel( panelConsulta, "Consulta", labelConsultaEstado, inputConsultaEstado, labelConsultaData, inputConsultaData, new JPanel() ); - // inputConsultaEstado.setEditable( true ); - // inputConsultaData.setEditable( true ); } private void setupConsultaMarcacaoPanel() @@ -604,7 +574,6 @@ public class ProcessoDadosPanel extends JPanel private void setupConsultaMarcacaoObservacoesPanel() { - // inputConsultaMarcacaoObsMensagem.setEditable( false ); setupSimpleDataPanel( panelConsultaMarcacaoObservacao, "Observa" + ccedil + otilde + "es", inputConsultaMarcacaoObsMensagem ); } @@ -615,7 +584,7 @@ public class ProcessoDadosPanel extends JPanel private void setupExameMarcacaoPanel() { - setupSimpleDataPanel( panelExameMarcacao, "Marca" + ccedil + atilde + "o de Exame", labelExameMarcacaoEstado, inputExameMarcacaoEstado, labelExameMarcacaoData, inputExameMarcacaoData, new JPanel() ); + setupSimpleDataPanel( panelExameMarcacao, "Marca" + ccedil + atilde + "o de Exame", labelExameMarcacaoEstado, inputExameMarcacaoEstado, labelExameMarcacaoData, inputExameMarcacaoData, labelExameMarcacaoGruposEcds, inputExameMarcacaoGruposEcds,new JPanel() ); } private void setupExameMarcacaoEmailPanel() @@ -625,7 +594,6 @@ public class ProcessoDadosPanel extends JPanel private void setupExameMarcacaoObservacoesPanel() { - // inputExameMarcacaoObsMensagem.setEditable( false ); setupSimpleDataPanel( panelExameMarcacaoObservacao, "Observa" + ccedil + otilde + "es", inputExameMarcacaoObsMensagem ); } diff --git a/trunk/SIPRPSoft/src/siprp/ui/SIPRPWindow.java b/trunk/SIPRPSoft/src/siprp/ui/SIPRPWindow.java index 46f20885..c377b4d1 100755 --- a/trunk/SIPRPSoft/src/siprp/ui/SIPRPWindow.java +++ b/trunk/SIPRPSoft/src/siprp/ui/SIPRPWindow.java @@ -2,6 +2,7 @@ package siprp.ui; import static siprp.logic.SIPRPLogic.ACTION_STARTUP; +import java.awt.Cursor; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; @@ -419,28 +420,34 @@ public class SIPRPWindow extends JFrame implements TrackableWindow, ListSelectio private void runGivenAction( String actionName, Object argument ) { System.out.println( "Running: " + actionName ); - if( actionName != null && mapActionByName.containsKey( actionName ) ) - { - Action action = mapActionByName.get( actionName ); - if( action.isSave() ) + try{ + this.setCursor( Cursor.getPredefinedCursor( Cursor.WAIT_CURSOR )); + if( actionName != null && mapActionByName.containsKey( actionName ) ) { - Object windowArgument = getObjectForAction( actionName ); - Object logicArgument = windowArgument; - for( Method currentWindowMethod : mapWindowMethodsByActionName.get( actionName ) ) + Action action = mapActionByName.get( actionName ); + if( action.isSave() ) { - Object currentLogicArgument = runWindowMethod( currentWindowMethod, windowArgument != null ? windowArgument : argument ); - logicArgument = logicArgument == null ? currentLogicArgument : logicArgument; + Object windowArgument = getObjectForAction( actionName ); + Object logicArgument = windowArgument; + for( Method currentWindowMethod : mapWindowMethodsByActionName.get( actionName ) ) + { + Object currentLogicArgument = runWindowMethod( currentWindowMethod, windowArgument != null ? windowArgument : argument ); + logicArgument = logicArgument == null ? currentLogicArgument : logicArgument; + } + runLogicMethod( mapLogicMethodByActionName.get( actionName ), logicArgument ); } - runLogicMethod( mapLogicMethodByActionName.get( actionName ), logicArgument ); - } - else - { - Object windowArgument = runLogicMethod( mapLogicMethodByActionName.get( actionName ), argument ); - for( Method currentWindowMethod : mapWindowMethodsByActionName.get( actionName ) ) + else { - runWindowMethod( currentWindowMethod, windowArgument != null ? windowArgument : argument ); + Object windowArgument = runLogicMethod( mapLogicMethodByActionName.get( actionName ), argument ); + for( Method currentWindowMethod : mapWindowMethodsByActionName.get( actionName ) ) + { + runWindowMethod( currentWindowMethod, windowArgument != null ? windowArgument : argument ); + } } } + }finally + { + this.setCursor( Cursor.getDefaultCursor()); } }