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

0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Tiago Simão 17 years ago
parent c6c7c4f82b
commit 67bac141fe

@ -60,6 +60,9 @@ public class LeafLogic
@Action(isSave = false)
public static final String ACTION_STARTUP = "ACTION_STARTUP";
@Action(isSave = false)
public static final String ACTION_REFRESH = "ACTION_REFRESH";
@Action(isSave = false)
public static final String ACTION_CANCEL = "ACTION_CANCEL";

@ -274,6 +274,9 @@ public class LeafWindow extends JFrame implements TrackableWindow, ListSelection
}
}
/**
* Fires ACTION_STARTUP
*/
public void completeSetup()
{
try

@ -25,6 +25,11 @@ public class BaseObject extends CayenneDataObject
protected static final String isNewMessage = " ";
public boolean isTransient()
{
return getPersistenceState() == PersistenceState.TRANSIENT;
}
public boolean isNew()
{
return getPersistenceState() == PersistenceState.NEW;

@ -4,4 +4,12 @@ import siprp.database.cayenne.objects.auto._HsMedida;
public class HsMedida extends _HsMedida {
private static final long serialVersionUID = 1L;
@Override
public String toString()
{
return getDescription();
}
}

@ -4,4 +4,12 @@ import siprp.database.cayenne.objects.auto._HsPosto;
public class HsPosto extends _HsPosto {
private static final long serialVersionUID = 1L;
@Override
public String toString()
{
return getDescription();
}
}

@ -4,4 +4,6 @@ import siprp.database.cayenne.objects.auto._HsRelatorio;
public class HsRelatorio extends _HsRelatorio {
private static final long serialVersionUID = 1L;
}

@ -0,0 +1,7 @@
package siprp.database.cayenne.objects;
import siprp.database.cayenne.objects.auto._HsRelatorioMedidaArea;
public class HsRelatorioMedidaArea extends _HsRelatorioMedidaArea {
}

@ -0,0 +1,7 @@
package siprp.database.cayenne.objects;
import siprp.database.cayenne.objects.auto._HsRelatorioMedidaPosto;
public class HsRelatorioMedidaPosto extends _HsRelatorioMedidaPosto {
}

@ -0,0 +1,7 @@
package siprp.database.cayenne.objects;
import siprp.database.cayenne.objects.auto._HsRelatorioRiscoValorQualitativo;
public class HsRelatorioRiscoValorQualitativo extends _HsRelatorioRiscoValorQualitativo {
}

@ -4,4 +4,12 @@ import siprp.database.cayenne.objects.auto._HsRisco;
public class HsRisco extends _HsRisco {
private static final long serialVersionUID = 1L;
@Override
public String toString()
{
return getDescription();
}
}

@ -3,5 +3,12 @@ package siprp.database.cayenne.objects;
import siprp.database.cayenne.objects.auto._HsRiscoMedida;
public class HsRiscoMedida extends _HsRiscoMedida {
private static final long serialVersionUID = 1L;
@Override
public String toString()
{
String d = getToHsMedida().getDescription();
return d == null ? " " : d.substring( 0, Math.min( 20, d.length() ) ) + "...";
}
}

@ -4,4 +4,12 @@ import siprp.database.cayenne.objects.auto._HsRiscoTema;
public class HsRiscoTema extends _HsRiscoTema {
private static final long serialVersionUID = 1L;
@Override
public String toString()
{
return getDescription();
}
}

@ -4,6 +4,13 @@ import siprp.database.cayenne.objects.auto._MarcacoesEstabelecimento;
public class MarcacoesEstabelecimento extends _MarcacoesEstabelecimento {
private static final long serialVersionUID = 1L;
@Override
public String toString()
{
return sdf.format( getData() );
}
}

@ -1,5 +1,6 @@
package siprp.database.cayenne.objects.auto;
import java.util.Date;
import java.util.List;
import siprp.database.cayenne.objects.BaseObject;
@ -13,12 +14,20 @@ import siprp.database.cayenne.objects.HsPosto;
*/
public abstract class _HsArea extends BaseObject {
public static final String DELETED_DATE_PROPERTY = "deletedDate";
public static final String DESCRIPTION_PROPERTY = "description";
public static final String EMPRESA_ID_PROPERTY = "empresaId";
public static final String HS_POSTO_ARRAY_PROPERTY = "hsPostoArray";
public static final String ID_PK_COLUMN = "id";
public void setDeletedDate(Date deletedDate) {
writeProperty("deletedDate", deletedDate);
}
public Date getDeletedDate() {
return (Date)readProperty("deletedDate");
}
public void setDescription(String description) {
writeProperty("description", description);
}

@ -1,5 +1,7 @@
package siprp.database.cayenne.objects.auto;
import java.util.Date;
import siprp.database.cayenne.objects.BaseObject;
/**
@ -10,10 +12,18 @@ import siprp.database.cayenne.objects.BaseObject;
*/
public abstract class _HsEquipamentoMedicao extends BaseObject {
public static final String DELETED_DATE_PROPERTY = "deletedDate";
public static final String NOME_PROPERTY = "nome";
public static final String ID_PK_COLUMN = "id";
public void setDeletedDate(Date deletedDate) {
writeProperty("deletedDate", deletedDate);
}
public Date getDeletedDate() {
return (Date)readProperty("deletedDate");
}
public void setNome(String nome) {
writeProperty("nome", nome);
}

@ -1,5 +1,6 @@
package siprp.database.cayenne.objects.auto;
import java.util.Date;
import java.util.List;
import siprp.database.cayenne.objects.BaseObject;
@ -15,6 +16,7 @@ import siprp.database.cayenne.objects.HsLegislacaoEstabelecimento;
*/
public abstract class _HsLegislacao extends BaseObject {
public static final String DELETED_DATE_PROPERTY = "deletedDate";
public static final String DESCRIPTION_PROPERTY = "description";
public static final String HS_LEGISLACAO_EMPRESA_ARRAY_PROPERTY = "hsLegislacaoEmpresaArray";
public static final String HS_LEGISLACAO_ESTABELECIMENTO_ARRAY_PROPERTY = "hsLegislacaoEstabelecimentoArray";
@ -22,6 +24,13 @@ public abstract class _HsLegislacao extends BaseObject {
public static final String ID_PK_COLUMN = "id";
public void setDeletedDate(Date deletedDate) {
writeProperty("deletedDate", deletedDate);
}
public Date getDeletedDate() {
return (Date)readProperty("deletedDate");
}
public void setDescription(String description) {
writeProperty("description", description);
}

@ -1,5 +1,6 @@
package siprp.database.cayenne.objects.auto;
import java.util.Date;
import java.util.List;
import siprp.database.cayenne.objects.BaseObject;
@ -13,11 +14,19 @@ import siprp.database.cayenne.objects.HsLegislacao;
*/
public abstract class _HsLegislacaoCategoria extends BaseObject {
public static final String DELETED_DATE_PROPERTY = "deletedDate";
public static final String DESCRIPTION_PROPERTY = "description";
public static final String HS_LEGISLACAO_ARRAY_PROPERTY = "hsLegislacaoArray";
public static final String ID_PK_COLUMN = "id";
public void setDeletedDate(Date deletedDate) {
writeProperty("deletedDate", deletedDate);
}
public Date getDeletedDate() {
return (Date)readProperty("deletedDate");
}
public void setDescription(String description) {
writeProperty("description", description);
}

@ -1,5 +1,6 @@
package siprp.database.cayenne.objects.auto;
import java.util.Date;
import java.util.List;
import siprp.database.cayenne.objects.BaseObject;
@ -13,12 +14,20 @@ import siprp.database.cayenne.objects.HsRiscoMedida;
*/
public abstract class _HsMedida extends BaseObject {
public static final String DELETED_DATE_PROPERTY = "deletedDate";
public static final String DESCRIPTION_PROPERTY = "description";
public static final String REQUESITOS_LEGAIS_PROPERTY = "requesitosLegais";
public static final String HS_RISCO_MEDIDA_ARRAY_PROPERTY = "hsRiscoMedidaArray";
public static final String ID_PK_COLUMN = "id";
public void setDeletedDate(Date deletedDate) {
writeProperty("deletedDate", deletedDate);
}
public Date getDeletedDate() {
return (Date)readProperty("deletedDate");
}
public void setDescription(String description) {
writeProperty("description", description);
}

@ -1,5 +1,6 @@
package siprp.database.cayenne.objects.auto;
import java.util.Date;
import java.util.List;
import siprp.database.cayenne.objects.BaseObject;
@ -13,11 +14,19 @@ import siprp.database.cayenne.objects.HsRelatorioMedida;
*/
public abstract class _HsMedidaClassificacao extends BaseObject {
public static final String DELETED_DATE_PROPERTY = "deletedDate";
public static final String DESCRIPTION_PROPERTY = "description";
public static final String HS_RELATORIO_MEDIDA_ARRAY_PROPERTY = "hsRelatorioMedidaArray";
public static final String ID_PK_COLUMN = "id";
public void setDeletedDate(Date deletedDate) {
writeProperty("deletedDate", deletedDate);
}
public Date getDeletedDate() {
return (Date)readProperty("deletedDate");
}
public void setDescription(String description) {
writeProperty("description", description);
}

@ -1,5 +1,7 @@
package siprp.database.cayenne.objects.auto;
import java.util.Date;
import siprp.database.cayenne.objects.BaseObject;
/**
@ -11,6 +13,7 @@ import siprp.database.cayenne.objects.BaseObject;
public abstract class _HsNormalizacao extends BaseObject {
public static final String CODIGO_PROPERTY = "codigo";
public static final String DELETED_DATE_PROPERTY = "deletedDate";
public static final String DESCRICAO_PROPERTY = "descricao";
public static final String PORTUGUESA_PROPERTY = "portuguesa";
@ -23,6 +26,13 @@ public abstract class _HsNormalizacao extends BaseObject {
return (String)readProperty("codigo");
}
public void setDeletedDate(Date deletedDate) {
writeProperty("deletedDate", deletedDate);
}
public Date getDeletedDate() {
return (Date)readProperty("deletedDate");
}
public void setDescricao(String descricao) {
writeProperty("descricao", descricao);
}

@ -1,5 +1,7 @@
package siprp.database.cayenne.objects.auto;
import java.util.Date;
import siprp.database.cayenne.objects.BaseObject;
import siprp.database.cayenne.objects.HsArea;
@ -11,11 +13,19 @@ import siprp.database.cayenne.objects.HsArea;
*/
public abstract class _HsPosto extends BaseObject {
public static final String DELETED_DATE_PROPERTY = "deletedDate";
public static final String DESCRIPTION_PROPERTY = "description";
public static final String TO_HS_AREA_PROPERTY = "toHsArea";
public static final String ID_PK_COLUMN = "id";
public void setDeletedDate(Date deletedDate) {
writeProperty("deletedDate", deletedDate);
}
public Date getDeletedDate() {
return (Date)readProperty("deletedDate");
}
public void setDescription(String description) {
writeProperty("description", description);
}

@ -5,6 +5,7 @@ import java.util.List;
import siprp.database.cayenne.objects.BaseObject;
import siprp.database.cayenne.objects.HsRelatorioRisco;
import siprp.database.cayenne.objects.MarcacoesEstabelecimento;
/**
* Class _HsRelatorio was generated by Cayenne.
@ -16,7 +17,9 @@ public abstract class _HsRelatorio extends BaseObject {
public static final String DATA_PROPERTY = "data";
public static final String DELETED_DATE_PROPERTY = "deletedDate";
public static final String IS_SUBMETIDO_PROPERTY = "isSubmetido";
public static final String HS_RELATORIO_RISCO_ARRAY_PROPERTY = "hsRelatorioRiscoArray";
public static final String TO_HS_MARCACOES_ESTABELECIMENTO_PROPERTY = "toHsMarcacoesEstabelecimento";
public static final String ID_PK_COLUMN = "id";
@ -34,6 +37,13 @@ public abstract class _HsRelatorio extends BaseObject {
return (Date)readProperty("deletedDate");
}
public void setIsSubmetido(Date isSubmetido) {
writeProperty("isSubmetido", isSubmetido);
}
public Date getIsSubmetido() {
return (Date)readProperty("isSubmetido");
}
public void addToHsRelatorioRiscoArray(HsRelatorioRisco obj) {
addToManyTarget("hsRelatorioRiscoArray", obj, true);
}
@ -46,4 +56,13 @@ public abstract class _HsRelatorio extends BaseObject {
}
public void setToHsMarcacoesEstabelecimento(MarcacoesEstabelecimento toHsMarcacoesEstabelecimento) {
setToOneTarget("toHsMarcacoesEstabelecimento", toHsMarcacoesEstabelecimento, true);
}
public MarcacoesEstabelecimento getToHsMarcacoesEstabelecimento() {
return (MarcacoesEstabelecimento)readProperty("toHsMarcacoesEstabelecimento");
}
}

@ -1,7 +1,8 @@
package siprp.database.cayenne.objects.auto;
import java.util.Date;
import siprp.database.cayenne.objects.BaseObject;
import siprp.database.cayenne.objects.HsMedidaClassificacao;
import siprp.database.cayenne.objects.HsRelatorioRisco;
/**
@ -12,15 +13,20 @@ import siprp.database.cayenne.objects.HsRelatorioRisco;
*/
public abstract class _HsRelatorioMedida extends BaseObject {
public static final String DELETED_DATE_PROPERTY = "deletedDate";
public static final String DESCRIPTION_PROPERTY = "description";
public static final String PROBABILIDADE_PROPERTY = "probabilidade";
public static final String REQUESITOS_LEGAIS_PROPERTY = "requesitosLegais";
public static final String SEVERIDADE_PROPERTY = "severidade";
public static final String TO_HS_MEDIDA_CLASSIFICACAO_PROPERTY = "toHsMedidaClassificacao";
public static final String TO_HS_RELATORIO_RISCO_PROPERTY = "toHsRelatorioRisco";
public static final String ID_PK_COLUMN = "id";
public void setDeletedDate(Date deletedDate) {
writeProperty("deletedDate", deletedDate);
}
public Date getDeletedDate() {
return (Date)readProperty("deletedDate");
}
public void setDescription(String description) {
writeProperty("description", description);
}
@ -28,13 +34,6 @@ public abstract class _HsRelatorioMedida extends BaseObject {
return (String)readProperty("description");
}
public void setProbabilidade(Integer probabilidade) {
writeProperty("probabilidade", probabilidade);
}
public Integer getProbabilidade() {
return (Integer)readProperty("probabilidade");
}
public void setRequesitosLegais(String requesitosLegais) {
writeProperty("requesitosLegais", requesitosLegais);
}
@ -42,22 +41,6 @@ public abstract class _HsRelatorioMedida extends BaseObject {
return (String)readProperty("requesitosLegais");
}
public void setSeveridade(Integer severidade) {
writeProperty("severidade", severidade);
}
public Integer getSeveridade() {
return (Integer)readProperty("severidade");
}
public void setToHsMedidaClassificacao(HsMedidaClassificacao toHsMedidaClassificacao) {
setToOneTarget("toHsMedidaClassificacao", toHsMedidaClassificacao, true);
}
public HsMedidaClassificacao getToHsMedidaClassificacao() {
return (HsMedidaClassificacao)readProperty("toHsMedidaClassificacao");
}
public void setToHsRelatorioRisco(HsRelatorioRisco toHsRelatorioRisco) {
setToOneTarget("toHsRelatorioRisco", toHsRelatorioRisco, true);
}

@ -0,0 +1,40 @@
package siprp.database.cayenne.objects.auto;
import java.util.List;
import siprp.database.cayenne.objects.BaseObject;
import siprp.database.cayenne.objects.HsRelatorioMedidaPosto;
/**
* Class _HsRelatorioMedidaArea 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 _HsRelatorioMedidaArea extends BaseObject {
public static final String DESCRIPTION_PROPERTY = "description";
public static final String HS_RELATORIO_MEDIDA_POSTO_ARRAY_PROPERTY = "hsRelatorioMedidaPostoArray";
public static final String ID_PK_COLUMN = "id";
public void setDescription(String description) {
writeProperty("description", description);
}
public String getDescription() {
return (String)readProperty("description");
}
public void addToHsRelatorioMedidaPostoArray(HsRelatorioMedidaPosto obj) {
addToManyTarget("hsRelatorioMedidaPostoArray", obj, true);
}
public void removeFromHsRelatorioMedidaPostoArray(HsRelatorioMedidaPosto obj) {
removeToManyTarget("hsRelatorioMedidaPostoArray", obj, true);
}
@SuppressWarnings("unchecked")
public List<HsRelatorioMedidaPosto> getHsRelatorioMedidaPostoArray() {
return (List<HsRelatorioMedidaPosto>)readProperty("hsRelatorioMedidaPostoArray");
}
}

@ -0,0 +1,35 @@
package siprp.database.cayenne.objects.auto;
import siprp.database.cayenne.objects.BaseObject;
import siprp.database.cayenne.objects.HsRelatorioMedidaArea;
/**
* Class _HsRelatorioMedidaPosto 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 _HsRelatorioMedidaPosto extends BaseObject {
public static final String DESCRIPTION_PROPERTY = "description";
public static final String TO_HS_RELATORIO_MEDIDA_AREA_PROPERTY = "toHsRelatorioMedidaArea";
public static final String ID_PK_COLUMN = "id";
public void setDescription(String description) {
writeProperty("description", description);
}
public String getDescription() {
return (String)readProperty("description");
}
public void setToHsRelatorioMedidaArea(HsRelatorioMedidaArea toHsRelatorioMedidaArea) {
setToOneTarget("toHsRelatorioMedidaArea", toHsRelatorioMedidaArea, true);
}
public HsRelatorioMedidaArea getToHsRelatorioMedidaArea() {
return (HsRelatorioMedidaArea)readProperty("toHsRelatorioMedidaArea");
}
}

@ -1,10 +1,12 @@
package siprp.database.cayenne.objects.auto;
import java.util.Date;
import java.util.List;
import siprp.database.cayenne.objects.BaseObject;
import siprp.database.cayenne.objects.HsRelatorio;
import siprp.database.cayenne.objects.HsRelatorioMedida;
import siprp.database.cayenne.objects.HsRelatorioRiscoValorQualitativo;
/**
* Class _HsRelatorioRisco was generated by Cayenne.
@ -14,12 +16,24 @@ import siprp.database.cayenne.objects.HsRelatorioMedida;
*/
public abstract class _HsRelatorioRisco extends BaseObject {
public static final String DELETED_DATE_PROPERTY = "deletedDate";
public static final String DESCRIPTION_PROPERTY = "description";
public static final String IS_PLANO_ACTUACAO_PROPERTY = "isPlanoActuacao";
public static final String PROBABILIDADE_PROPERTY = "probabilidade";
public static final String SEVERIDADE_PROPERTY = "severidade";
public static final String HS_RELATORIO_MEDIDA_ARRAY_PROPERTY = "hsRelatorioMedidaArray";
public static final String TO_HS_RELATORIO_PROPERTY = "toHsRelatorio";
public static final String TO_HS_RELATORIO_RISCO_VALOR_QUALITATIVO_PROPERTY = "toHsRelatorioRiscoValorQualitativo";
public static final String ID_PK_COLUMN = "id";
public void setDeletedDate(Date deletedDate) {
writeProperty("deletedDate", deletedDate);
}
public Date getDeletedDate() {
return (Date)readProperty("deletedDate");
}
public void setDescription(String description) {
writeProperty("description", description);
}
@ -27,6 +41,27 @@ public abstract class _HsRelatorioRisco extends BaseObject {
return (String)readProperty("description");
}
public void setIsPlanoActuacao(String isPlanoActuacao) {
writeProperty("isPlanoActuacao", isPlanoActuacao);
}
public String getIsPlanoActuacao() {
return (String)readProperty("isPlanoActuacao");
}
public void setProbabilidade(Integer probabilidade) {
writeProperty("probabilidade", probabilidade);
}
public Integer getProbabilidade() {
return (Integer)readProperty("probabilidade");
}
public void setSeveridade(Integer severidade) {
writeProperty("severidade", severidade);
}
public Integer getSeveridade() {
return (Integer)readProperty("severidade");
}
public void addToHsRelatorioMedidaArray(HsRelatorioMedida obj) {
addToManyTarget("hsRelatorioMedidaArray", obj, true);
}
@ -48,4 +83,13 @@ public abstract class _HsRelatorioRisco extends BaseObject {
}
public void setToHsRelatorioRiscoValorQualitativo(HsRelatorioRiscoValorQualitativo toHsRelatorioRiscoValorQualitativo) {
setToOneTarget("toHsRelatorioRiscoValorQualitativo", toHsRelatorioRiscoValorQualitativo, true);
}
public HsRelatorioRiscoValorQualitativo getToHsRelatorioRiscoValorQualitativo() {
return (HsRelatorioRiscoValorQualitativo)readProperty("toHsRelatorioRiscoValorQualitativo");
}
}

@ -0,0 +1,40 @@
package siprp.database.cayenne.objects.auto;
import java.util.List;
import siprp.database.cayenne.objects.BaseObject;
import siprp.database.cayenne.objects.HsRelatorioRisco;
/**
* Class _HsRelatorioRiscoValorQualitativo 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 _HsRelatorioRiscoValorQualitativo extends BaseObject {
public static final String DESCRIPTION_PROPERTY = "description";
public static final String HS_RELATORIO_RISCO_ARRAY_PROPERTY = "hsRelatorioRiscoArray";
public static final String ID_PK_COLUMN = "id";
public void setDescription(String description) {
writeProperty("description", description);
}
public String getDescription() {
return (String)readProperty("description");
}
public void addToHsRelatorioRiscoArray(HsRelatorioRisco obj) {
addToManyTarget("hsRelatorioRiscoArray", obj, true);
}
public void removeFromHsRelatorioRiscoArray(HsRelatorioRisco obj) {
removeToManyTarget("hsRelatorioRiscoArray", obj, true);
}
@SuppressWarnings("unchecked")
public List<HsRelatorioRisco> getHsRelatorioRiscoArray() {
return (List<HsRelatorioRisco>)readProperty("hsRelatorioRiscoArray");
}
}

@ -1,5 +1,6 @@
package siprp.database.cayenne.objects.auto;
import java.util.Date;
import java.util.List;
import siprp.database.cayenne.objects.BaseObject;
@ -14,12 +15,20 @@ import siprp.database.cayenne.objects.HsRiscoTema;
*/
public abstract class _HsRisco extends BaseObject {
public static final String DELETED_DATE_PROPERTY = "deletedDate";
public static final String DESCRIPTION_PROPERTY = "description";
public static final String HS_RISCO_MEDIDA_ARRAY_PROPERTY = "hsRiscoMedidaArray";
public static final String TO_HS_RISCO_TEMA_PROPERTY = "toHsRiscoTema";
public static final String ID_PK_COLUMN = "id";
public void setDeletedDate(Date deletedDate) {
writeProperty("deletedDate", deletedDate);
}
public Date getDeletedDate() {
return (Date)readProperty("deletedDate");
}
public void setDescription(String description) {
writeProperty("description", description);
}

@ -1,5 +1,6 @@
package siprp.database.cayenne.objects.auto;
import java.util.Date;
import java.util.List;
import siprp.database.cayenne.objects.BaseObject;
@ -13,11 +14,19 @@ import siprp.database.cayenne.objects.HsRisco;
*/
public abstract class _HsRiscoTema extends BaseObject {
public static final String DELETED_DATE_PROPERTY = "deletedDate";
public static final String DESCRIPTION_PROPERTY = "description";
public static final String HS_RISCO_ARRAY_PROPERTY = "hsRiscoArray";
public static final String ID_PK_COLUMN = "id";
public void setDeletedDate(Date deletedDate) {
writeProperty("deletedDate", deletedDate);
}
public Date getDeletedDate() {
return (Date)readProperty("deletedDate");
}
public void setDescription(String description) {
writeProperty("description", description);
}

@ -5,6 +5,7 @@ import java.util.List;
import siprp.database.cayenne.objects.BaseObject;
import siprp.database.cayenne.objects.Estabelecimentos;
import siprp.database.cayenne.objects.HsRelatorio;
import siprp.database.cayenne.objects.Lembretes;
import siprp.database.cayenne.objects.MarcacoesTecnicosHst;
@ -23,6 +24,7 @@ public abstract class _MarcacoesEstabelecimento extends BaseObject {
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 HS_RELATORIO_ARRAY_PROPERTY = "hsRelatorioArray";
public static final String LEMBRETES_ARRAY_PROPERTY = "lembretesArray";
public static final String TO_ESTABELECIMENTOS_PROPERTY = "toEstabelecimentos";
public static final String TO_MARCACOES_TECNICOS_HST_PROPERTY = "toMarcacoesTecnicosHst";
@ -78,6 +80,18 @@ public abstract class _MarcacoesEstabelecimento extends BaseObject {
return (String)readProperty("realizada");
}
public void addToHsRelatorioArray(HsRelatorio obj) {
addToManyTarget("hsRelatorioArray", obj, true);
}
public void removeFromHsRelatorioArray(HsRelatorio obj) {
removeToManyTarget("hsRelatorioArray", obj, true);
}
@SuppressWarnings("unchecked")
public List<HsRelatorio> getHsRelatorioArray() {
return (List<HsRelatorio>)readProperty("hsRelatorioArray");
}
public void addToLembretesArray(Lembretes obj) {
addToManyTarget("lembretesArray", obj, true);
}

@ -1,14 +1,8 @@
package siprp.database.cayenne.providers;
import org.apache.cayenne.CayenneContext;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.access.QueryLogger;
import org.apache.cayenne.conf.Configuration;
import org.apache.cayenne.conf.DefaultConfiguration;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.impl.SimpleLog;
import common.log.SimpleLogger;
import siprp.database.cayenne.objects.BaseObject;
public class MainDAO
{
@ -18,12 +12,40 @@ public class MainDAO
{
if( context == null )
{
// DefaultConfiguration conf = new DefaultConfiguration();
// conf.addClassPath("");
// conf.getDomain().getProperties();
// Configuration.initializeSharedConfiguration();
// Configuration.getSharedConfiguration().getDomain().getNode( "SIPRPNode" ).getDataSource();
context = DataContext.createDataContext();
}
}
public void commit()
{
context.commitChanges();
}
public BaseObject saveObject( BaseObject object )
{
if( object != null )
{
if( object.isTransient() )
{
context.registerNewObject( object );
}
context.commitChanges();
}
return object;
}
public void deleteObject( BaseObject object )
{
if( object != null )
{
context.deleteObject( object );
context.commitChanges();
}
}
public void rollback()
{
context.rollbackChanges();
context.unregisterObjects( context.uncommittedObjects() );
}
}

@ -6,13 +6,11 @@ import java.util.List;
import java.util.Map;
import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.query.SelectQuery;
import siprp.MedicinaConstants;
import siprp.ProcessoConstants;
import siprp.database.cayenne.objects.BaseObject;
import siprp.database.cayenne.objects.Empresas;
import siprp.database.cayenne.objects.Exames;
import siprp.database.cayenne.objects.LembretesTipos;
@ -26,7 +24,7 @@ import siprp.database.cayenne.objects.TrabalhadoresProcesso;
public class MedicinaDAO extends MainDAO implements MedicinaConstants
{
// private static final String defaultPrestadorName = "SIPRP";
private Prestadores defaultPrestador = Prestadores.prestadorNulo;
public Trabalhadores getTrabalhadorByID( Integer id )
@ -81,36 +79,6 @@ public class MedicinaDAO extends MainDAO implements MedicinaConstants
return allPrtGruposProtocolo;
}
public BaseObject saveObject( BaseObject object )
{
if( object != null )
{
if( object.getPersistenceState() == PersistenceState.NEW )
{
context.registerNewObject( object );
}
context.commitChanges();
}
return object;
}
public void deleteObject( BaseObject object )
{
if( object != null )
{
context.deleteObject( object );
context.commitChanges();
}
}
public void rollback()
{
context.rollbackChanges();
context.unregisterObjects( context.uncommittedObjects() );
context.deleteObjects( context.newObjects() );
}
public void fecharProcesso( TrabalhadoresProcesso currentProcesso )
{
currentProcesso.setEstado( ProcessoConstants.PROCESSO_FECHADO_CODE );
@ -145,5 +113,4 @@ public class MedicinaDAO extends MainDAO implements MedicinaConstants
return resultMap.values();
}
}

@ -1,33 +1,23 @@
package siprp.database.cayenne.providers;
import org.apache.cayenne.CayenneDataObject;
import java.util.List;
import org.apache.cayenne.DataObjectUtils;
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.query.SelectQuery;
import siprp.MedicinaConstants;
import siprp.database.cayenne.objects.EmailPlanoDeActuacao;
import siprp.database.cayenne.objects.Estabelecimentos;
import siprp.database.cayenne.objects.HsRiscoTema;
public class PlanoActuacaoDAO extends MainDAO implements MedicinaConstants
public class PlanoActuacaoDAO extends MainDAO
{
public Estabelecimentos getEstabelecimentoByID( Integer id )
{
return (Estabelecimentos) DataObjectUtils.objectForPK( context, Estabelecimentos.class, id );
}
public void commit()
{
context.commitChanges();
}
public void delete( CayenneDataObject object )
{
if( object != null )
{
context.deleteObject( object );
context.commitChanges();
}
}
public void addEmailToEstabelecimento( String email, Estabelecimentos estabelecimento )
{
@ -37,6 +27,13 @@ public class PlanoActuacaoDAO extends MainDAO implements MedicinaConstants
context.commitChanges();
}
public List<HsRiscoTema> getAllRiscoTemas()
{
SelectQuery query = new SelectQuery( HsRiscoTema.class );
query.andQualifier( ExpressionFactory.matchExp( HsRiscoTema.DELETED_DATE_PROPERTY, null ) );
return context.performQuery( query );
}
// public Legislacao createNovaLegislacao( Legislacao parent )
// {
// Legislacao legislacaoObject = (Legislacao) context.newObject( Legislacao.class );

Loading…
Cancel
Save