From f0d448ce5e181a5acefd881214670848908675b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Sim=C3=A3o?= Date: Thu, 16 Jul 2009 13:41:34 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1062 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../relatorio/GerirMedidasRelatorioPanel.java | 28 +++++++++----- .../processo/logic/MedicinaProcessoLogic.java | 5 ++- .../siprp/update/updates/V11_2_To_V11_3.java | 37 ++++--------------- trunk/common/src/SIPRPMap.map.xml | 16 +++++++- trunk/common/src/leaf/ui/TreeTools.java | 19 ++++++++++ .../database/cayenne/objects/BaseObject.java | 19 +++++++++- .../objects/TrabalhadoresProcesso.java | 2 +- .../cayenne/objects/auto/_HsArea.java | 8 ++++ .../cayenne/objects/auto/_HsPosto.java | 8 ++++ .../cayenne/objects/auto/_HsPostoRisco.java | 18 +++++++++ .../objects/auto/_HsRelatorioArea.java | 8 ++++ .../objects/auto/_HsRelatorioPosto.java | 8 ++++ .../objects/auto/_HsRelatorioPostoRisco.java | 10 ++--- .../database/cayenne/providers/MainDAO.java | 7 ++++ 14 files changed, 143 insertions(+), 50 deletions(-) diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java index c958c64f..89c07677 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java @@ -344,14 +344,7 @@ public class GerirMedidasRelatorioPanel extends JPanel if( posto != null ) { List list = posto.getHsRelatorioPostoRiscoArray(); - Collections.sort( list, new Comparator() - { - @Override - public int compare( HsRelatorioPostoRisco o1, HsRelatorioPostoRisco o2 ) - { - return o1.getId().compareTo( o2.getId() ); - } - } ); + Collections.sort( list ); for( HsRelatorioPostoRisco rel : list ) { RiscoRelatorioNode node = new RiscoRelatorioNode( rel ); @@ -370,7 +363,24 @@ public class GerirMedidasRelatorioPanel extends JPanel } } setEnabled(); -// TreeTools.sort( root ); + TreeTools.sort( root, new Comparator() + { + @Override + public int compare( DefaultMutableTreeNode o1, DefaultMutableTreeNode o2 ) + { + Integer result = null; + if( (o1 instanceof RiscoRelatorioNode) && o2 instanceof RiscoRelatorioNode ) + { + HsRelatorioPostoRisco risco1 = (HsRelatorioPostoRisco) o1.getUserObject(); + HsRelatorioPostoRisco risco2 = (HsRelatorioPostoRisco) o2.getUserObject(); + if( risco1 != null ) + { + return risco1.compareTo( risco2 == null ? null : risco2 ); + } + } + return result == null ? o1.toString().compareTo( o2.toString() ) : result; + } + }); TreeTools.refreshTree( tree, root, false ); if( selectedMedida != null ) { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java b/trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java index dbcafc19..c84beb55 100755 --- a/trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java @@ -336,7 +336,7 @@ public class MedicinaProcessoLogic extends LeafLogic Integer tipoID = lembretesDataProvider.getTipoLembreteIDByCodigo( LembretesConstants.CODE_REMARCACOES ); try { - if( isConsulta ) + if( isConsulta && currentEmpresa != null && currentEstabelecimento != null && currentTrabalhador != null && currentConsultaMarcacao != null ) { lembretesDataProvider.criarLembreteConsulta( tipoID, new Date(), mensagem, null, currentEmpresa.getId(), currentEstabelecimento.getId(), currentTrabalhador.getId(), currentConsultaMarcacao.getId() ); } @@ -344,7 +344,8 @@ public class MedicinaProcessoLogic extends LeafLogic { lembretesDataProvider.criarLembreteExame( tipoID, new Date(), mensagem, null, currentEmpresa.getId(), currentEstabelecimento.getId(), currentTrabalhador.getId(), currentExameMarcacao.getId() ); } - } catch( Exception e ) + } + catch( Exception e ) { e.printStackTrace(); } diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V11_2_To_V11_3.java b/trunk/SIPRPSoft/src/siprp/update/updates/V11_2_To_V11_3.java index 814fd526..67ebdf9d 100644 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V11_2_To_V11_3.java +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V11_2_To_V11_3.java @@ -16,7 +16,7 @@ public class V11_2_To_V11_3 implements siprp.update.Update public String []listChanges() { return new String[]{ - "Higiene e seguranca: a repor datas de submissao dos relatorios" + "Higiene e seguranca: restruturacao" }; } @@ -36,35 +36,12 @@ public class V11_2_To_V11_3 implements siprp.update.Update Executer executer = dbm.getSharedExecuter(); com.evolute.utils.sql.Update update = new com.evolute.utils.sql.Update( - "alter table hs_relatorio_posto_risco add column id serial; " + - "create table hs_relatorio_posto_risco_temp( " + - "id serial, " + - " posto_id integer NOT NULL, " + - " risco_id integer NOT NULL, " + - " probabilidade integer, " + - " severidade integer, " + - " valor_qualitativo_id integer, " + - "CONSTRAINT hs_relatorio_posto_risco_temp_pkey PRIMARY KEY (posto_id, risco_id), " + - "CONSTRAINT hs_relatorio_posto_risco_posto_id_fkey FOREIGN KEY (posto_id) " + - "REFERENCES hs_relatorio_posto (id) MATCH SIMPLE " + - "ON UPDATE NO ACTION ON DELETE NO ACTION, " + - "CONSTRAINT hs_relatorio_posto_risco_risco_id_fkey FOREIGN KEY (risco_id) " + - "REFERENCES hs_relatorio_risco (id) MATCH SIMPLE " + - "ON UPDATE NO ACTION ON DELETE NO ACTION, " + - "CONSTRAINT hs_relatorio_posto_risco_valor_qualitativo_id_fkey FOREIGN KEY (valor_qualitativo_id) " + - "REFERENCES hs_relatorio_risco_valor_qualitativo (id) MATCH SIMPLE " + - "ON UPDATE NO ACTION ON DELETE NO ACTION " + - "); " + - "ALTER TABLE hs_relatorio_posto_risco OWNER TO postgres; " + - "insert into hs_relatorio_posto_risco_temp (posto_id,risco_id,probabilidade,severidade,valor_qualitativo_id) " + - " (select posto_id,risco_id,probabilidade,severidade,valor_qualitativo_id from hs_relatorio_posto_risco); " + - "update hs_relatorio_posto_risco set id = (select hs_relatorio_posto_risco_temp.id from hs_relatorio_posto_risco_temp " + - "where hs_relatorio_posto_risco_temp.posto_id = hs_relatorio_posto_risco.posto_id " + - "and hs_relatorio_posto_risco_temp.risco_id = hs_relatorio_posto_risco.risco_id); " + - "alter table hs_relatorio_posto_risco add constraint hs_relatorio_posto_risco_unique UNIQUE(posto_id,risco_id); " + - "alter table hs_relatorio_posto_risco drop constraint hs_relatorio_posto_risco_pkey; " + - "alter table hs_relatorio_posto_risco add constraint hs_relatorio_posto_risco_pkey PRIMARY KEY(id); " + - "drop table hs_relatorio_posto_risco_temp; " + "alter table hs_posto add column is_principal boolean; " + + "alter table hs_relatorio_posto add column is_principal boolean; " + + "alter table hs_relatorio_area add column ordem int4; " + + "alter table hs_area add column ordem int4; " + + "alter table hs_relatorio_posto_risco add column ordem int4; " + + "alter table hs_posto_risco add column ordem int4; " ); executer.executeQuery( update ); new Importador( executer ).importar(); diff --git a/trunk/common/src/SIPRPMap.map.xml b/trunk/common/src/SIPRPMap.map.xml index a73882fc..7a4359e5 100644 --- a/trunk/common/src/SIPRPMap.map.xml +++ b/trunk/common/src/SIPRPMap.map.xml @@ -6,6 +6,7 @@ + @@ -189,6 +190,7 @@ + ORACLE hs_area_id_seq @@ -289,6 +291,7 @@ + ORACLE hs_posto_id_seq @@ -305,6 +308,7 @@ + @@ -335,6 +339,7 @@ + ORACLE @@ -397,6 +402,7 @@ + ORACLE hs_relatorio_posto_id_seq @@ -409,7 +415,7 @@ - + @@ -951,6 +957,7 @@ + @@ -998,6 +1005,7 @@ + @@ -1005,6 +1013,7 @@ + @@ -1026,6 +1035,7 @@ + @@ -1053,12 +1063,13 @@ + - + @@ -1955,6 +1966,7 @@ + diff --git a/trunk/common/src/leaf/ui/TreeTools.java b/trunk/common/src/leaf/ui/TreeTools.java index 2f181489..6f944e94 100644 --- a/trunk/common/src/leaf/ui/TreeTools.java +++ b/trunk/common/src/leaf/ui/TreeTools.java @@ -175,6 +175,25 @@ public class TreeTools } } } + + public static void sort( DefaultMutableTreeNode result, Comparator comparator ) + { + if( result != null ) + { + List children = new ArrayList(result.getChildCount()); + for( int i = 0; i < result.getChildCount(); ++i ) + { + children.add( (DefaultMutableTreeNode) result.getChildAt( i ) ); + } + result.removeAllChildren(); + Collections.sort( children, comparator ); + for( DefaultMutableTreeNode child : children ) + { + sort( child ); + result.add( child ); + } + } + } public static TreePath getPathFor( DefaultMutableTreeNode node ) { diff --git a/trunk/common/src/siprp/database/cayenne/objects/BaseObject.java b/trunk/common/src/siprp/database/cayenne/objects/BaseObject.java index 46e005b2..1be56ffd 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/BaseObject.java +++ b/trunk/common/src/siprp/database/cayenne/objects/BaseObject.java @@ -85,7 +85,24 @@ public class BaseObject extends CayenneDataObject implements Comparable getEstados() diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsArea.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsArea.java index 114ed464..29ccabf8 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsArea.java +++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsArea.java @@ -18,6 +18,7 @@ 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 ORDER_PROPERTY = "order"; public static final String HS_POSTO_ARRAY_PROPERTY = "hsPostoArray"; public static final String TO_EMPRESAS_PROPERTY = "toEmpresas"; @@ -44,6 +45,13 @@ public abstract class _HsArea extends BaseObject { return (Integer)readProperty("empresaId"); } + public void setOrder(Integer order) { + writeProperty("order", order); + } + public Integer getOrder() { + return (Integer)readProperty("order"); + } + public void addToHsPostoArray(HsPosto obj) { addToManyTarget("hsPostoArray", obj, true); } diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsPosto.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsPosto.java index d9e911ba..724f970e 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsPosto.java +++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsPosto.java @@ -19,6 +19,7 @@ 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 IS_PRINCIPAL_PROPERTY = "isPrincipal"; public static final String HS_POSTO_ESTABELECIMENTO_ARRAY_PROPERTY = "hsPostoEstabelecimentoArray"; public static final String HS_POSTO_MEDIDA_ARRAY_PROPERTY = "hsPostoMedidaArray"; public static final String HS_POSTO_RISCO_ARRAY_PROPERTY = "hsPostoRiscoArray"; @@ -40,6 +41,13 @@ public abstract class _HsPosto extends BaseObject { return (String)readProperty("description"); } + public void setIsPrincipal(Boolean isPrincipal) { + writeProperty("isPrincipal", isPrincipal); + } + public Boolean getIsPrincipal() { + return (Boolean)readProperty("isPrincipal"); + } + public void addToHsPostoEstabelecimentoArray(HsPostoEstabelecimento obj) { addToManyTarget("hsPostoEstabelecimentoArray", obj, true); } diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsPostoRisco.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsPostoRisco.java index 1bfe584c..31ccbc49 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsPostoRisco.java +++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsPostoRisco.java @@ -14,11 +14,13 @@ import siprp.database.cayenne.objects.HsRisco; public abstract class _HsPostoRisco extends BaseObject { public static final String IS_PLANO_ACTUACAO_PROPERTY = "isPlanoActuacao"; + public static final String ORDER_PROPERTY = "order"; public static final String PROBABILIDADE_PROPERTY = "probabilidade"; public static final String SEVERIDADE_PROPERTY = "severidade"; public static final String VALOR_QUALITATIVO_PROPERTY = "valorQualitativo"; public static final String TO_HS_POSTO_PROPERTY = "toHsPosto"; public static final String TO_HS_RELATORIO_RISCO_VALOR_QUALITATIVO_PROPERTY = "toHsRelatorioRiscoValorQualitativo"; + public static final String TO_HS_RELATORIO_RISCO_VALOR_QUALITATIVO1_PROPERTY = "toHsRelatorioRiscoValorQualitativo1"; public static final String TO_HS_RISCO_PROPERTY = "toHsRisco"; public static final String POSTO_ID_PK_COLUMN = "posto_id"; @@ -31,6 +33,13 @@ public abstract class _HsPostoRisco extends BaseObject { return (String)readProperty("isPlanoActuacao"); } + public void setOrder(Integer order) { + writeProperty("order", order); + } + public Integer getOrder() { + return (Integer)readProperty("order"); + } + public void setProbabilidade(Integer probabilidade) { writeProperty("probabilidade", probabilidade); } @@ -70,6 +79,15 @@ public abstract class _HsPostoRisco extends BaseObject { } + public void setToHsRelatorioRiscoValorQualitativo1(HsRelatorioRiscoValorQualitativo toHsRelatorioRiscoValorQualitativo1) { + setToOneTarget("toHsRelatorioRiscoValorQualitativo1", toHsRelatorioRiscoValorQualitativo1, true); + } + + public HsRelatorioRiscoValorQualitativo getToHsRelatorioRiscoValorQualitativo1() { + return (HsRelatorioRiscoValorQualitativo)readProperty("toHsRelatorioRiscoValorQualitativo1"); + } + + public void setToHsRisco(HsRisco toHsRisco) { setToOneTarget("toHsRisco", toHsRisco, true); } diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioArea.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioArea.java index 034a201e..681c1ab2 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioArea.java +++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioArea.java @@ -17,6 +17,7 @@ public abstract class _HsRelatorioArea extends BaseObject { public static final String DELETED_DATE_PROPERTY = "deletedDate"; public static final String DESCRIPTION_PROPERTY = "description"; + public static final String ORDER_PROPERTY = "order"; public static final String HS_RELATORIO_POSTO_ARRAY_PROPERTY = "hsRelatorioPostoArray"; public static final String TO_HS_RELATORIO_PROPERTY = "toHsRelatorio"; @@ -36,6 +37,13 @@ public abstract class _HsRelatorioArea extends BaseObject { return (String)readProperty("description"); } + public void setOrder(Integer order) { + writeProperty("order", order); + } + public Integer getOrder() { + return (Integer)readProperty("order"); + } + public void addToHsRelatorioPostoArray(HsRelatorioPosto obj) { addToManyTarget("hsRelatorioPostoArray", obj, true); } diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioPosto.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioPosto.java index 11136904..1c1c47a8 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioPosto.java +++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioPosto.java @@ -18,6 +18,7 @@ public abstract class _HsRelatorioPosto extends BaseObject { public static final String DELETED_DATE_PROPERTY = "deletedDate"; public static final String DESCRIPTION_PROPERTY = "description"; + public static final String IS_PRINCIPAL_PROPERTY = "isPrincipal"; public static final String HS_RELATORIO_POSTO_MEDIDA_ARRAY_PROPERTY = "hsRelatorioPostoMedidaArray"; public static final String HS_RELATORIO_POSTO_RISCO_ARRAY_PROPERTY = "hsRelatorioPostoRiscoArray"; public static final String TO_HS_RELATORIO_AREA_PROPERTY = "toHsRelatorioArea"; @@ -38,6 +39,13 @@ public abstract class _HsRelatorioPosto extends BaseObject { return (String)readProperty("description"); } + public void setIsPrincipal(Boolean isPrincipal) { + writeProperty("isPrincipal", isPrincipal); + } + public Boolean getIsPrincipal() { + return (Boolean)readProperty("isPrincipal"); + } + public void addToHsRelatorioPostoMedidaArray(HsRelatorioPostoMedida obj) { addToManyTarget("hsRelatorioPostoMedidaArray", obj, true); } diff --git a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioPostoRisco.java b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioPostoRisco.java index 6aebdd79..5122ec01 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioPostoRisco.java +++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioPostoRisco.java @@ -13,7 +13,7 @@ import siprp.database.cayenne.objects.HsRelatorioRiscoValorQualitativo; */ public abstract class _HsRelatorioPostoRisco extends BaseObject { - public static final String ID_PROPERTY = "id"; + public static final String ORDER_PROPERTY = "order"; public static final String PROBABILIDADE_PROPERTY = "probabilidade"; public static final String SEVERIDADE_PROPERTY = "severidade"; public static final String TO_HS_RELATORIO_POSTO_PROPERTY = "toHsRelatorioPosto"; @@ -23,11 +23,11 @@ public abstract class _HsRelatorioPostoRisco extends BaseObject { public static final String POSTO_ID_PK_COLUMN = "posto_id"; public static final String RISCO_ID_PK_COLUMN = "risco_id"; - public void setId(Integer id) { - writeProperty("id", id); + public void setOrder(Integer order) { + writeProperty("order", order); } - public Integer getId() { - return (Integer)readProperty("id"); + public Integer getOrder() { + return (Integer)readProperty("order"); } public void setProbabilidade(Integer probabilidade) { diff --git a/trunk/common/src/siprp/database/cayenne/providers/MainDAO.java b/trunk/common/src/siprp/database/cayenne/providers/MainDAO.java index adb5dcc7..b35f02b8 100755 --- a/trunk/common/src/siprp/database/cayenne/providers/MainDAO.java +++ b/trunk/common/src/siprp/database/cayenne/providers/MainDAO.java @@ -2,6 +2,8 @@ package siprp.database.cayenne.providers; import org.apache.cayenne.access.DataContext; +import siprp.database.cayenne.objects.BaseObject; + public class MainDAO { protected static DataContext context = null; @@ -29,5 +31,10 @@ public class MainDAO { return context; } + + public boolean hasOrder( BaseObject baseObject ) + { + return baseObject == null ? false : (null != baseObject.getObjEntity().getAttribute( "ordem" ) ); + } }