diff --git a/trunk/SIPRPSoft/.classpath b/trunk/SIPRPSoft/.classpath index 95301e50..5789f842 100644 --- a/trunk/SIPRPSoft/.classpath +++ b/trunk/SIPRPSoft/.classpath @@ -5,7 +5,6 @@ - @@ -36,5 +35,6 @@ + diff --git a/trunk/SIPRPSoft/lib/cayenne-server-3.0M6.jar b/trunk/SIPRPSoft/lib/cayenne-server-3.0.jar similarity index 63% rename from trunk/SIPRPSoft/lib/cayenne-server-3.0M6.jar rename to trunk/SIPRPSoft/lib/cayenne-server-3.0.jar index fdf0d056..7637a746 100644 Binary files a/trunk/SIPRPSoft/lib/cayenne-server-3.0M6.jar and b/trunk/SIPRPSoft/lib/cayenne-server-3.0.jar differ diff --git a/trunk/SIPRPSoft/src/SIPRPMap.map.xml b/trunk/SIPRPSoft/src/SIPRPMap.map.xml index af99153b..7db0122f 100644 --- a/trunk/SIPRPSoft/src/SIPRPMap.map.xml +++ b/trunk/SIPRPSoft/src/SIPRPMap.map.xml @@ -1,8 +1,8 @@ + xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd" + project-version="3.0.0.1"> @@ -20,6 +20,7 @@ + @@ -52,6 +53,24 @@ 1 + + + + + + + + + + + + + + + + + + @@ -64,6 +83,7 @@ + @@ -90,8 +110,6 @@ - - @@ -148,6 +166,7 @@ + @@ -568,6 +587,8 @@ + + @@ -668,9 +689,11 @@ + + @@ -832,6 +855,7 @@ + @@ -849,6 +873,18 @@ + + + + + + + + + + + + @@ -861,6 +897,7 @@ + @@ -884,8 +921,6 @@ - - @@ -932,6 +967,7 @@ + @@ -1165,6 +1201,8 @@ + + @@ -1233,9 +1271,11 @@ + + @@ -1309,6 +1349,9 @@ + + + @@ -1330,36 +1373,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1402,6 +1493,9 @@ + + + @@ -1432,6 +1526,9 @@ + + + @@ -1441,6 +1538,9 @@ + + + @@ -1462,6 +1562,9 @@ + + + @@ -1489,6 +1592,9 @@ + + + @@ -1630,6 +1736,9 @@ + + + @@ -1648,6 +1757,9 @@ + + + @@ -1669,6 +1781,9 @@ + + + @@ -1771,6 +1886,9 @@ + + + @@ -1923,16 +2041,32 @@ + + + + + + + + + + + + + + + + diff --git a/trunk/SIPRPSoft/src/cayenne.xml b/trunk/SIPRPSoft/src/cayenne.xml index 2b962b58..577924fb 100644 --- a/trunk/SIPRPSoft/src/cayenne.xml +++ b/trunk/SIPRPSoft/src/cayenne.xml @@ -1,5 +1,5 @@ - + diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/EmpresaPrecoPeriodicidadeTipo.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/EmpresaPrecoPeriodicidadeTipo.java new file mode 100644 index 00000000..cd3d99d0 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/EmpresaPrecoPeriodicidadeTipo.java @@ -0,0 +1,7 @@ +package siprp.database.cayenne.objects; + +import siprp.database.cayenne.objects.auto._EmpresaPrecoPeriodicidadeTipo; + +public class EmpresaPrecoPeriodicidadeTipo extends _EmpresaPrecoPeriodicidadeTipo { + +} diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/EmpresaPrecoServico.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/EmpresaPrecoServico.java new file mode 100644 index 00000000..f32727b8 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/EmpresaPrecoServico.java @@ -0,0 +1,7 @@ +package siprp.database.cayenne.objects; + +import siprp.database.cayenne.objects.auto._EmpresaPrecoServico; + +public class EmpresaPrecoServico extends _EmpresaPrecoServico { + +} diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/EmpresaPrecoServicoTipo.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/EmpresaPrecoServicoTipo.java new file mode 100644 index 00000000..c0f56120 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/EmpresaPrecoServicoTipo.java @@ -0,0 +1,7 @@ +package siprp.database.cayenne.objects; + +import siprp.database.cayenne.objects.auto._EmpresaPrecoServicoTipo; + +public class EmpresaPrecoServicoTipo extends _EmpresaPrecoServicoTipo { + +} 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 a1e6aab7..36d697cc 100644 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Contactos.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Contactos.java @@ -16,6 +16,7 @@ import siprp.database.cayenne.objects.Prestadores; public abstract class _Contactos extends BaseObject { public static final String CARGO_PROPERTY = "cargo"; + public static final String DEPARTAMENTO_PROPERTY = "departamento"; public static final String EMAIL_PROPERTY = "email"; public static final String FAX_PROPERTY = "fax"; public static final String ID_PROPERTY = "id"; @@ -36,6 +37,13 @@ public abstract class _Contactos extends BaseObject { return (String)readProperty("cargo"); } + public void setDepartamento(String departamento) { + writeProperty("departamento", departamento); + } + public String getDepartamento() { + return (String)readProperty("departamento"); + } + public void setEmail(String email) { writeProperty("email", email); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_EmpresaPrecoPeriodicidadeTipo.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_EmpresaPrecoPeriodicidadeTipo.java new file mode 100644 index 00000000..868c3bee --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_EmpresaPrecoPeriodicidadeTipo.java @@ -0,0 +1,41 @@ +package siprp.database.cayenne.objects.auto; + +import java.util.List; + +import org.apache.cayenne.CayenneDataObject; + +import siprp.database.cayenne.objects.EmpresaPrecoServico; + +/** + * Class _EmpresaPrecoPeriodicidadeTipo was generated by Cayenne. + * It is probably a good idea to avoid changing this class manually, + * since it may be overwritten next time code is regenerated. + * If you need to make any customizations, please use subclass. + */ +public abstract class _EmpresaPrecoPeriodicidadeTipo extends CayenneDataObject { + + public static final String NOME_PROPERTY = "nome"; + public static final String EMPRESA_PRECO_SERVICO_ARRAY_PROPERTY = "empresaPrecoServicoArray"; + + public static final String ID_PK_COLUMN = "id"; + + public void setNome(String nome) { + writeProperty("nome", nome); + } + public String getNome() { + return (String)readProperty("nome"); + } + + public void addToEmpresaPrecoServicoArray(EmpresaPrecoServico obj) { + addToManyTarget("empresaPrecoServicoArray", obj, true); + } + public void removeFromEmpresaPrecoServicoArray(EmpresaPrecoServico obj) { + removeToManyTarget("empresaPrecoServicoArray", obj, true); + } + @SuppressWarnings("unchecked") + public List getEmpresaPrecoServicoArray() { + return (List)readProperty("empresaPrecoServicoArray"); + } + + +} diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_EmpresaPrecoServico.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_EmpresaPrecoServico.java new file mode 100644 index 00000000..81a94ef8 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_EmpresaPrecoServico.java @@ -0,0 +1,84 @@ +package siprp.database.cayenne.objects.auto; + +import java.util.Date; + +import org.apache.cayenne.CayenneDataObject; + +import siprp.database.cayenne.objects.EmpresaPrecoPeriodicidadeTipo; +import siprp.database.cayenne.objects.EmpresaPrecoServicoTipo; +import siprp.database.cayenne.objects.Empresas; + +/** + * Class _EmpresaPrecoServico was generated by Cayenne. + * It is probably a good idea to avoid changing this class manually, + * since it may be overwritten next time code is regenerated. + * If you need to make any customizations, please use subclass. + */ +public abstract class _EmpresaPrecoServico extends CayenneDataObject { + + public static final String ACTIVO_PROPERTY = "activo"; + public static final String INICIADO_PROPERTY = "iniciado"; + public static final String TIPO_OUTRO_PROPERTY = "tipoOutro"; + public static final String VALOR_PROPERTY = "valor"; + public static final String TO_EMPRESA_PRECO_PERIODICIDADE_TIPO_PROPERTY = "toEmpresaPrecoPeriodicidadeTipo"; + public static final String TO_EMPRESA_PRECO_SERVICO_TIPO_PROPERTY = "toEmpresaPrecoServicoTipo"; + public static final String TO_EMPRESAS_PROPERTY = "toEmpresas"; + + public static final String ID_PK_COLUMN = "id"; + + public void setActivo(Boolean activo) { + writeProperty("activo", activo); + } + public Boolean getActivo() { + return (Boolean)readProperty("activo"); + } + + public void setIniciado(Date iniciado) { + writeProperty("iniciado", iniciado); + } + public Date getIniciado() { + return (Date)readProperty("iniciado"); + } + + public void setTipoOutro(String tipoOutro) { + writeProperty("tipoOutro", tipoOutro); + } + public String getTipoOutro() { + return (String)readProperty("tipoOutro"); + } + + public void setValor(Double valor) { + writeProperty("valor", valor); + } + public Double getValor() { + return (Double)readProperty("valor"); + } + + public void setToEmpresaPrecoPeriodicidadeTipo(EmpresaPrecoPeriodicidadeTipo toEmpresaPrecoPeriodicidadeTipo) { + setToOneTarget("toEmpresaPrecoPeriodicidadeTipo", toEmpresaPrecoPeriodicidadeTipo, true); + } + + public EmpresaPrecoPeriodicidadeTipo getToEmpresaPrecoPeriodicidadeTipo() { + return (EmpresaPrecoPeriodicidadeTipo)readProperty("toEmpresaPrecoPeriodicidadeTipo"); + } + + + public void setToEmpresaPrecoServicoTipo(EmpresaPrecoServicoTipo toEmpresaPrecoServicoTipo) { + setToOneTarget("toEmpresaPrecoServicoTipo", toEmpresaPrecoServicoTipo, true); + } + + public EmpresaPrecoServicoTipo getToEmpresaPrecoServicoTipo() { + return (EmpresaPrecoServicoTipo)readProperty("toEmpresaPrecoServicoTipo"); + } + + + public void setToEmpresas(Empresas toEmpresas) { + setToOneTarget("toEmpresas", toEmpresas, true); + } + + public Empresas getToEmpresas() { + return (Empresas)readProperty("toEmpresas"); + } + + +} diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_EmpresaPrecoServicoTipo.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_EmpresaPrecoServicoTipo.java new file mode 100644 index 00000000..f61203c5 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_EmpresaPrecoServicoTipo.java @@ -0,0 +1,41 @@ +package siprp.database.cayenne.objects.auto; + +import java.util.List; + +import org.apache.cayenne.CayenneDataObject; + +import siprp.database.cayenne.objects.EmpresaPrecoServico; + +/** + * Class _EmpresaPrecoServicoTipo was generated by Cayenne. + * It is probably a good idea to avoid changing this class manually, + * since it may be overwritten next time code is regenerated. + * If you need to make any customizations, please use subclass. + */ +public abstract class _EmpresaPrecoServicoTipo extends CayenneDataObject { + + public static final String NOME_PROPERTY = "nome"; + public static final String EMPRESA_PRECO_SERVICO_ARRAY_PROPERTY = "empresaPrecoServicoArray"; + + public static final String ID_PK_COLUMN = "id"; + + public void setNome(String nome) { + writeProperty("nome", nome); + } + public String getNome() { + return (String)readProperty("nome"); + } + + public void addToEmpresaPrecoServicoArray(EmpresaPrecoServico obj) { + addToManyTarget("empresaPrecoServicoArray", obj, true); + } + public void removeFromEmpresaPrecoServicoArray(EmpresaPrecoServico obj) { + removeToManyTarget("empresaPrecoServicoArray", obj, true); + } + @SuppressWarnings("unchecked") + public List getEmpresaPrecoServicoArray() { + return (List)readProperty("empresaPrecoServicoArray"); + } + + +} diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Empresas.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Empresas.java index f3074752..4c7efe60 100644 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Empresas.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Empresas.java @@ -6,6 +6,7 @@ import java.util.List; import siprp.database.cayenne.objects.Avisos; import siprp.database.cayenne.objects.BaseObject; import siprp.database.cayenne.objects.Contactos; +import siprp.database.cayenne.objects.EmpresaPrecoServico; import siprp.database.cayenne.objects.Estabelecimentos; import siprp.database.cayenne.objects.HsArea; import siprp.database.cayenne.objects.HsEmailEmpresa; @@ -36,6 +37,7 @@ public abstract class _Empresas extends BaseObject { public static final String CODIGO2_PROPERTY = "codigo2"; public static final String CODIGO3_PROPERTY = "codigo3"; public static final String CODIGO_POSTAL_PROPERTY = "codigoPostal"; + public static final String CODIGO_RELATORIO_UNICO_PROPERTY = "codigoRelatorioUnico"; public static final String CONCELHO_PROPERTY = "concelho"; public static final String CONTRIBUINTE_PROPERTY = "contribuinte"; public static final String DATA_ACEITACAO_PROPERTY = "dataAceitacao"; @@ -59,8 +61,6 @@ public abstract class _Empresas extends BaseObject { public static final String PERFIL1_PROPERTY = "perfil1"; public static final String PERFIL2_PROPERTY = "perfil2"; public static final String PERIODICIDADE_PROPERTY = "periodicidade"; - public static final String PRECO_HIGIENE_PROPERTY = "precoHigiene"; - public static final String PRECO_MEDICINA_PROPERTY = "precoMedicina"; public static final String SEGURANCA_SOCIAL_PROPERTY = "segurancaSocial"; public static final String SERVICO_HIGIENE_DESIGNACAO_PROPERTY = "servicoHigieneDesignacao"; public static final String SERVICO_HIGIENE_TIPO_PROPERTY = "servicoHigieneTipo"; @@ -68,15 +68,26 @@ public abstract class _Empresas extends BaseObject { public static final String SERVICO_SAUDE_TIPO_PROPERTY = "servicoSaudeTipo"; public static final String SERVICOS_PROPERTY = "servicos"; public static final String AVISOS_ARRAY_PROPERTY = "avisosArray"; + public static final String AVISOS_ARRAY1_PROPERTY = "avisosArray1"; + public static final String EMPRESA_PRECO_SERVICO_ARRAY_PROPERTY = "empresaPrecoServicoArray"; public static final String ESTABELECIMENTOS_ARRAY_PROPERTY = "estabelecimentosArray"; + public static final String ESTABELECIMENTOS_ARRAY1_PROPERTY = "estabelecimentosArray1"; public static final String HS_AREA_ARRAY_PROPERTY = "hsAreaArray"; + public static final String HS_AREA_ARRAY1_PROPERTY = "hsAreaArray1"; public static final String HS_EMAIL_EMPRESA_PROPERTY = "hsEmailEmpresa"; + public static final String HS_EMAIL_EMPRESA_ARRAY_PROPERTY = "hsEmailEmpresaArray"; public static final String HS_LEGISLACAO_EMPRESA_ARRAY_PROPERTY = "hsLegislacaoEmpresaArray"; + public static final String HS_LEGISLACAO_EMPRESA_ARRAY1_PROPERTY = "hsLegislacaoEmpresaArray1"; public static final String HS_NORMALIZACAO_EMPRESA_ARRAY_PROPERTY = "hsNormalizacaoEmpresaArray"; + public static final String HS_NORMALIZACAO_EMPRESA_ARRAY1_PROPERTY = "hsNormalizacaoEmpresaArray1"; public static final String HS_RISCO_EMPRESA_ARRAY_PROPERTY = "hsRiscoEmpresaArray"; + public static final String HS_RISCO_EMPRESA_ARRAY1_PROPERTY = "hsRiscoEmpresaArray1"; public static final String LEMBRETES_ARRAY_PROPERTY = "lembretesArray"; + public static final String LEMBRETES_ARRAY1_PROPERTY = "lembretesArray1"; public static final String MARCACOES_EMPRESA_ARRAY_PROPERTY = "marcacoesEmpresaArray"; + public static final String MARCACOES_EMPRESA_ARRAY1_PROPERTY = "marcacoesEmpresaArray1"; public static final String PRT_ELEMENTOS_PROTOCOLO_ARRAY_PROPERTY = "prtElementosProtocoloArray"; + public static final String PRT_ELEMENTOS_PROTOCOLO_ARRAY1_PROPERTY = "prtElementosProtocoloArray1"; public static final String TO_CONTACTOS_PROPERTY = "toContactos"; public static final String TO_CONTACTOS1_PROPERTY = "toContactos1"; public static final String TO_LOGOTIPO_PROPERTY = "toLogotipo"; @@ -160,6 +171,13 @@ public abstract class _Empresas extends BaseObject { return (String)readProperty("codigoPostal"); } + public void setCodigoRelatorioUnico(String codigoRelatorioUnico) { + writeProperty("codigoRelatorioUnico", codigoRelatorioUnico); + } + public String getCodigoRelatorioUnico() { + return (String)readProperty("codigoRelatorioUnico"); + } + public void setConcelho(String concelho) { writeProperty("concelho", concelho); } @@ -321,20 +339,6 @@ public abstract class _Empresas extends BaseObject { return (String)readProperty("periodicidade"); } - public void setPrecoHigiene(Double precoHigiene) { - writeProperty("precoHigiene", precoHigiene); - } - public Double getPrecoHigiene() { - return (Double)readProperty("precoHigiene"); - } - - public void setPrecoMedicina(Double precoMedicina) { - writeProperty("precoMedicina", precoMedicina); - } - public Double getPrecoMedicina() { - return (Double)readProperty("precoMedicina"); - } - public void setSegurancaSocial(String segurancaSocial) { writeProperty("segurancaSocial", segurancaSocial); } @@ -389,6 +393,30 @@ public abstract class _Empresas extends BaseObject { } + public void addToAvisosArray1(Avisos obj) { + addToManyTarget("avisosArray1", obj, true); + } + public void removeFromAvisosArray1(Avisos obj) { + removeToManyTarget("avisosArray1", obj, true); + } + @SuppressWarnings("unchecked") + public List getAvisosArray1() { + return (List)readProperty("avisosArray1"); + } + + + public void addToEmpresaPrecoServicoArray(EmpresaPrecoServico obj) { + addToManyTarget("empresaPrecoServicoArray", obj, true); + } + public void removeFromEmpresaPrecoServicoArray(EmpresaPrecoServico obj) { + removeToManyTarget("empresaPrecoServicoArray", obj, true); + } + @SuppressWarnings("unchecked") + public List getEmpresaPrecoServicoArray() { + return (List)readProperty("empresaPrecoServicoArray"); + } + + public void addToEstabelecimentosArray(Estabelecimentos obj) { addToManyTarget("estabelecimentosArray", obj, true); } @@ -401,6 +429,18 @@ public abstract class _Empresas extends BaseObject { } + public void addToEstabelecimentosArray1(Estabelecimentos obj) { + addToManyTarget("estabelecimentosArray1", obj, true); + } + public void removeFromEstabelecimentosArray1(Estabelecimentos obj) { + removeToManyTarget("estabelecimentosArray1", obj, true); + } + @SuppressWarnings("unchecked") + public List getEstabelecimentosArray1() { + return (List)readProperty("estabelecimentosArray1"); + } + + public void addToHsAreaArray(HsArea obj) { addToManyTarget("hsAreaArray", obj, true); } @@ -413,6 +453,18 @@ public abstract class _Empresas extends BaseObject { } + public void addToHsAreaArray1(HsArea obj) { + addToManyTarget("hsAreaArray1", obj, true); + } + public void removeFromHsAreaArray1(HsArea obj) { + removeToManyTarget("hsAreaArray1", obj, true); + } + @SuppressWarnings("unchecked") + public List getHsAreaArray1() { + return (List)readProperty("hsAreaArray1"); + } + + public void addToHsEmailEmpresa(HsEmailEmpresa obj) { addToManyTarget("hsEmailEmpresa", obj, true); } @@ -425,6 +477,18 @@ public abstract class _Empresas extends BaseObject { } + public void addToHsEmailEmpresaArray(HsEmailEmpresa obj) { + addToManyTarget("hsEmailEmpresaArray", obj, true); + } + public void removeFromHsEmailEmpresaArray(HsEmailEmpresa obj) { + removeToManyTarget("hsEmailEmpresaArray", obj, true); + } + @SuppressWarnings("unchecked") + public List getHsEmailEmpresaArray() { + return (List)readProperty("hsEmailEmpresaArray"); + } + + public void addToHsLegislacaoEmpresaArray(HsLegislacaoEmpresa obj) { addToManyTarget("hsLegislacaoEmpresaArray", obj, true); } @@ -437,6 +501,18 @@ public abstract class _Empresas extends BaseObject { } + public void addToHsLegislacaoEmpresaArray1(HsLegislacaoEmpresa obj) { + addToManyTarget("hsLegislacaoEmpresaArray1", obj, true); + } + public void removeFromHsLegislacaoEmpresaArray1(HsLegislacaoEmpresa obj) { + removeToManyTarget("hsLegislacaoEmpresaArray1", obj, true); + } + @SuppressWarnings("unchecked") + public List getHsLegislacaoEmpresaArray1() { + return (List)readProperty("hsLegislacaoEmpresaArray1"); + } + + public void addToHsNormalizacaoEmpresaArray(HsNormalizacaoEmpresa obj) { addToManyTarget("hsNormalizacaoEmpresaArray", obj, true); } @@ -449,6 +525,18 @@ public abstract class _Empresas extends BaseObject { } + public void addToHsNormalizacaoEmpresaArray1(HsNormalizacaoEmpresa obj) { + addToManyTarget("hsNormalizacaoEmpresaArray1", obj, true); + } + public void removeFromHsNormalizacaoEmpresaArray1(HsNormalizacaoEmpresa obj) { + removeToManyTarget("hsNormalizacaoEmpresaArray1", obj, true); + } + @SuppressWarnings("unchecked") + public List getHsNormalizacaoEmpresaArray1() { + return (List)readProperty("hsNormalizacaoEmpresaArray1"); + } + + public void addToHsRiscoEmpresaArray(HsRiscoEmpresa obj) { addToManyTarget("hsRiscoEmpresaArray", obj, true); } @@ -461,6 +549,18 @@ public abstract class _Empresas extends BaseObject { } + public void addToHsRiscoEmpresaArray1(HsRiscoEmpresa obj) { + addToManyTarget("hsRiscoEmpresaArray1", obj, true); + } + public void removeFromHsRiscoEmpresaArray1(HsRiscoEmpresa obj) { + removeToManyTarget("hsRiscoEmpresaArray1", obj, true); + } + @SuppressWarnings("unchecked") + public List getHsRiscoEmpresaArray1() { + return (List)readProperty("hsRiscoEmpresaArray1"); + } + + public void addToLembretesArray(Lembretes obj) { addToManyTarget("lembretesArray", obj, true); } @@ -473,6 +573,18 @@ public abstract class _Empresas extends BaseObject { } + public void addToLembretesArray1(Lembretes obj) { + addToManyTarget("lembretesArray1", obj, true); + } + public void removeFromLembretesArray1(Lembretes obj) { + removeToManyTarget("lembretesArray1", obj, true); + } + @SuppressWarnings("unchecked") + public List getLembretesArray1() { + return (List)readProperty("lembretesArray1"); + } + + public void addToMarcacoesEmpresaArray(MarcacoesEmpresa obj) { addToManyTarget("marcacoesEmpresaArray", obj, true); } @@ -485,6 +597,18 @@ public abstract class _Empresas extends BaseObject { } + public void addToMarcacoesEmpresaArray1(MarcacoesEmpresa obj) { + addToManyTarget("marcacoesEmpresaArray1", obj, true); + } + public void removeFromMarcacoesEmpresaArray1(MarcacoesEmpresa obj) { + removeToManyTarget("marcacoesEmpresaArray1", obj, true); + } + @SuppressWarnings("unchecked") + public List getMarcacoesEmpresaArray1() { + return (List)readProperty("marcacoesEmpresaArray1"); + } + + public void addToPrtElementosProtocoloArray(PrtElementosProtocolo obj) { addToManyTarget("prtElementosProtocoloArray", obj, true); } @@ -497,6 +621,18 @@ public abstract class _Empresas extends BaseObject { } + public void addToPrtElementosProtocoloArray1(PrtElementosProtocolo obj) { + addToManyTarget("prtElementosProtocoloArray1", obj, true); + } + public void removeFromPrtElementosProtocoloArray1(PrtElementosProtocolo obj) { + removeToManyTarget("prtElementosProtocoloArray1", obj, true); + } + @SuppressWarnings("unchecked") + public List getPrtElementosProtocoloArray1() { + return (List)readProperty("prtElementosProtocoloArray1"); + } + + public void setToContactos(Contactos toContactos) { setToOneTarget("toContactos", toContactos, true); } 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 fa6daaef..8baeebf0 100644 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Exames.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Exames.java @@ -18,6 +18,7 @@ public abstract class _Exames extends 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 IMPRESSO_STAMP_PROPERTY = "impressoStamp"; public static final String INACTIVO_PROPERTY = "inactivo"; public static final String OCASIONAL_PROPERTY = "ocasional"; public static final String OUTRA_FUNCAO1_PROPERTY = "outraFuncao1"; @@ -57,6 +58,13 @@ public abstract class _Exames extends BaseObject { return (Integer)readProperty("id"); } + public void setImpressoStamp(Date impressoStamp) { + writeProperty("impressoStamp", impressoStamp); + } + public Date getImpressoStamp() { + return (Date)readProperty("impressoStamp"); + } + public void setInactivo(String inactivo) { writeProperty("inactivo", inactivo); } 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 50fed840..04d7ae42 100644 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesTrabalhador.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_MarcacoesTrabalhador.java @@ -22,6 +22,8 @@ public abstract class _MarcacoesTrabalhador extends BaseObject { 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 INSERTED_STAMP_PROPERTY = "insertedStamp"; + public static final String MEDICO_ID_PROPERTY = "medicoId"; public static final String MOTIVO_PROPERTY = "motivo"; public static final String OBSERVACOES_PROPERTY = "observacoes"; public static final String REALIZADA_PROPERTY = "realizada"; @@ -69,6 +71,20 @@ public abstract class _MarcacoesTrabalhador extends BaseObject { return (Integer)readProperty("id"); } + public void setInsertedStamp(Date insertedStamp) { + writeProperty("insertedStamp", insertedStamp); + } + public Date getInsertedStamp() { + return (Date)readProperty("insertedStamp"); + } + + public void setMedicoId(Integer medicoId) { + writeProperty("medicoId", medicoId); + } + public Integer getMedicoId() { + return (Integer)readProperty("medicoId"); + } + public void setMotivo(Integer motivo) { writeProperty("motivo", motivo); } diff --git a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Trabalhadores.java b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Trabalhadores.java index 7c7ed8dd..7e7e77bb 100644 --- a/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Trabalhadores.java +++ b/trunk/SIPRPSoft/src/siprp/database/cayenne/objects/auto/_Trabalhadores.java @@ -30,9 +30,11 @@ public abstract class _Trabalhadores extends BaseObject { public static final String INACTIVO_PROPERTY = "inactivo"; public static final String LOCAL_TRABALHO_PROPERTY = "localTrabalho"; public static final String NACIONALIDADE_PROPERTY = "nacionalidade"; + public static final String NIF_PROPERTY = "nif"; public static final String NOME_PROPERTY = "nome"; public static final String NOME_PLAIN_PROPERTY = "nomePlain"; public static final String NUMERO_MECANOGRAFICO_PROPERTY = "numeroMecanografico"; + public static final String NUMERO_UTENTE_PROPERTY = "numeroUtente"; public static final String OBSERVACOES_PROPERTY = "observacoes"; public static final String OBSERVACOES_GESTAO_PROPERTY = "observacoesGestao"; public static final String PERFIL_PROPERTY = "perfil"; @@ -129,6 +131,13 @@ public abstract class _Trabalhadores extends BaseObject { return (String)readProperty("nacionalidade"); } + public void setNif(String nif) { + writeProperty("nif", nif); + } + public String getNif() { + return (String)readProperty("nif"); + } + public void setNome(String nome) { writeProperty("nome", nome); } @@ -150,6 +159,13 @@ public abstract class _Trabalhadores extends BaseObject { return (String)readProperty("numeroMecanografico"); } + public void setNumeroUtente(String numeroUtente) { + writeProperty("numeroUtente", numeroUtente); + } + public String getNumeroUtente() { + return (String)readProperty("numeroUtente"); + } + public void setObservacoes(String observacoes) { writeProperty("observacoes", observacoes); }