From 5a1628caeb4aca6685718bb8efb371491c7217ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Sim=C3=A3o?= Date: Fri, 10 Jul 2009 17:19:38 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1059 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../companydataloaders/SIPRPDataLoader.java | 18 ++--- .../relatorio/GerirMedidasRelatorioPanel.java | 15 +++- .../relatorio/VerAreasRelatorioPanel.java | 2 +- .../src/siprp/update/UpdateList.java | 3 +- .../siprp/update/updates/V11_2_To_V11_3.java | 78 +++++++++++++++++++ trunk/common/src/SIPRPMap.map.xml | 12 ++- .../objects/auto/_HsRelatorioPostoRisco.java | 8 ++ 7 files changed, 122 insertions(+), 14 deletions(-) create mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V11_2_To_V11_3.java diff --git a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java index 50e51da4..ccb81d8b 100644 --- a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java +++ b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java @@ -92,20 +92,20 @@ public class SIPRPDataLoader implements CompanyDataLoader // Singleton.setInstance( SingletonConstants.LOCAL_URL, "www.evolute.pt:5436" ); // Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" ); // Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); -// - Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); - Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); - Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); - Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" ); - Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); - Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); // // Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); // Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); // Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); -// Singleton.setInstance( SingletonConstants.LOCAL_URL, "dbserver:5432" ); -// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local3" ); +// Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" ); +// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); // Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); +// + Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); + Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); + Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); + Singleton.setInstance( SingletonConstants.LOCAL_URL, "dbserver:5432" ); + Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local3" ); + Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); // // Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java index 52800382..c958c64f 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java @@ -9,6 +9,8 @@ import java.awt.Color; import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.List; @@ -341,7 +343,16 @@ public class GerirMedidasRelatorioPanel extends JPanel root.removeAllChildren(); if( posto != null ) { - for( HsRelatorioPostoRisco rel : posto.getHsRelatorioPostoRiscoArray() ) + List list = posto.getHsRelatorioPostoRiscoArray(); + Collections.sort( list, new Comparator() + { + @Override + public int compare( HsRelatorioPostoRisco o1, HsRelatorioPostoRisco o2 ) + { + return o1.getId().compareTo( o2.getId() ); + } + } ); + for( HsRelatorioPostoRisco rel : list ) { RiscoRelatorioNode node = new RiscoRelatorioNode( rel ); HsRelatorioRisco risco = rel.getToHsRelatorioRisco(); @@ -359,7 +370,7 @@ public class GerirMedidasRelatorioPanel extends JPanel } } setEnabled(); - TreeTools.sort( root ); +// TreeTools.sort( root ); TreeTools.refreshTree( tree, root, false ); if( selectedMedida != null ) { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java index cd20c8c0..c3b69382 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java @@ -141,7 +141,7 @@ public class VerAreasRelatorioPanel extends JPanel { TreeTools.merge( root, HigieneSegurancaLogic.getAreasRelatorioTree( relatorio ) ); } - TreeTools.sort( root ); +// TreeTools.sort( root ); TreeTools.refreshTree( tree, root, false ); } diff --git a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java index f8cb2ded..e0dbe07e 100644 --- a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java +++ b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java @@ -23,6 +23,7 @@ import siprp.update.updates.V10_8_To_V10_9; import siprp.update.updates.V10_9_To_V11_0; import siprp.update.updates.V11_0_To_V11_1; import siprp.update.updates.V11_1_To_V11_2; +import siprp.update.updates.V11_2_To_V11_3; import siprp.update.updates.V6_1_To_V7_0; import siprp.update.updates.V7_0_To_V7_2; import siprp.update.updates.V7_2_To_V7_4; @@ -91,7 +92,7 @@ public class UpdateList new V10_5_To_V10_6(), new V10_6_To_V10_7(), new V10_7_To_V10_8(), new V10_8_To_V10_9(), new V10_9_To_V11_0(), new V11_0_To_V11_1(), - new V11_1_To_V11_2() + new V11_1_To_V11_2(), new V11_2_To_V11_3() }; protected static Executer EXECUTER; 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 new file mode 100644 index 00000000..814fd526 --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V11_2_To_V11_3.java @@ -0,0 +1,78 @@ +package siprp.update.updates; + +import siprp.higiene.gestao.importacao.Importador; + +import com.evolute.utils.Singleton; +import com.evolute.utils.db.DBManager; +import com.evolute.utils.db.Executer; + +public class V11_2_To_V11_3 implements siprp.update.Update +{ + + public V11_2_To_V11_3() + { + } + + public String []listChanges() + { + return new String[]{ + "Higiene e seguranca: a repor datas de submissao dos relatorios" + }; + } + + public double getStartVersion() + { + return 11.2; + } + + public double getEndVersion() + { + return 11.3; + } + + public void doUpdate() throws Exception + { + DBManager dbm = ( DBManager ) Singleton.getInstance( Singleton.DEFAULT_DBMANAGER ); + 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; " + ); + executer.executeQuery( update ); + new Importador( executer ).importar(); + } + + public String toString() + { + return "v" + getStartVersion() + " para v" + getEndVersion(); + } + +} diff --git a/trunk/common/src/SIPRPMap.map.xml b/trunk/common/src/SIPRPMap.map.xml index 49297bc6..a73882fc 100644 --- a/trunk/common/src/SIPRPMap.map.xml +++ b/trunk/common/src/SIPRPMap.map.xml @@ -1,5 +1,8 @@ - + @@ -406,11 +409,17 @@ + + + ORACLE + hs_relatorio_posto_risco_id_seq + 1 + @@ -1049,6 +1058,7 @@ + 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 ab185c51..6aebdd79 100644 --- a/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioPostoRisco.java +++ b/trunk/common/src/siprp/database/cayenne/objects/auto/_HsRelatorioPostoRisco.java @@ -13,6 +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 PROBABILIDADE_PROPERTY = "probabilidade"; public static final String SEVERIDADE_PROPERTY = "severidade"; public static final String TO_HS_RELATORIO_POSTO_PROPERTY = "toHsRelatorioPosto"; @@ -22,6 +23,13 @@ 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 Integer getId() { + return (Integer)readProperty("id"); + } + public void setProbabilidade(Integer probabilidade) { writeProperty("probabilidade", probabilidade); }