diff --git a/trunk/SIPRPSoft/lib/evolute.jar b/trunk/SIPRPSoft/lib/evolute.jar index 5a05972c..5352f424 100644 Binary files a/trunk/SIPRPSoft/lib/evolute.jar and b/trunk/SIPRPSoft/lib/evolute.jar differ diff --git a/trunk/SIPRPSoft/properties/version.properties b/trunk/SIPRPSoft/properties/version.properties index 5341bc7a..aa22eea2 100644 --- a/trunk/SIPRPSoft/properties/version.properties +++ b/trunk/SIPRPSoft/properties/version.properties @@ -1,6 +1,6 @@ #siprpsoft versioning file -#Thu Aug 19 11:09:51 WEST 2010 +#Thu Aug 19 12:27:06 WEST 2010 major=12 name=siprpsoft minor=1 -build=13 +build=14 diff --git a/trunk/SIPRPSoft/src/siprp/logic/HigieneSegurancaLogic.java b/trunk/SIPRPSoft/src/siprp/logic/HigieneSegurancaLogic.java index 269a5f12..81bb9fd7 100644 --- a/trunk/SIPRPSoft/src/siprp/logic/HigieneSegurancaLogic.java +++ b/trunk/SIPRPSoft/src/siprp/logic/HigieneSegurancaLogic.java @@ -434,18 +434,6 @@ public class HigieneSegurancaLogic public static void reverterNormalizacao( HsRelatorioData relatorio, EstabelecimentosData estabelecimento, boolean delete ) throws Exception { -// System.out.println( "\nreverterNormalizacao( " + estabelecimento + " ) : " ); - -// List< HsRelatorioNormalizacaoData > normalizacoes = relatorio.fromHsRelatorioNormalizacao_hs_relatorio_id(); -// for ( HsRelatorioNormalizacaoData normalizacao : normalizacoes ) -// { -// normalizacao.delete(); -// } -// int normalizacaoSize = relatorio.fromHsRelatorioNormalizacao_hs_relatorio_id().size(); -// for(int i = 0; i < normalizacaoSize; ++i ) -// { -// relatorio.fromHsRelatorioNormalizacao_hs_relatorio_id().get( 0 ).delete(); -// } if( delete ) { for( HsRelatorioNormalizacaoData rn : relatorio.fromHsRelatorioNormalizacao_hs_relatorio_id() ) diff --git a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java index f9fbf2e8..264e521b 100644 --- a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java +++ b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java @@ -47,6 +47,7 @@ import siprp.update.updates.V13_2_To_V13_3; import siprp.update.updates.V13_3_To_V13_4; import siprp.update.updates.V13_7_To_V13_8; import siprp.update.updates.V14_1_To_V14_2; +import siprp.update.updates.V14_2_To_V14_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; @@ -129,7 +130,7 @@ public class UpdateList new V13_7_To_V13_8(), new SHSTUpdate8( 13.8, 13.9 ), new SHSTUpdate9( 13.9, 14.1 ), - new V14_1_To_V14_2(), + new V14_1_To_V14_2(), new V14_2_To_V14_3() }; // // protected static Executer EXECUTER; diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V14_2_To_V14_3.java b/trunk/SIPRPSoft/src/siprp/update/updates/V14_2_To_V14_3.java new file mode 100644 index 00000000..fa51338a --- /dev/null +++ b/trunk/SIPRPSoft/src/siprp/update/updates/V14_2_To_V14_3.java @@ -0,0 +1,26 @@ +package siprp.update.updates; + +import static com.evolute.utils.strings.UnicodeLatin1Map.atilde; +import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; +import static com.evolute.utils.strings.UnicodeLatin1Map.ecirc; +import static com.evolute.utils.strings.UnicodeLatin1Map.oacute; +import shst.data.HsRelatorioNormalizacaoData; + +import com.evolute.module.updater.AbstractUpdate; +import com.evolute.utils.db.PSQLSequenceUtils; + +public class V14_2_To_V14_3 extends AbstractUpdate +{ + + public V14_2_To_V14_3( ) + { + super( 14.2, 14.3, "Correc" + ccedil + atilde + "o de sequ" + ecirc + "ncias na normaliza" + ccedil + atilde + "o (Relat" + oacute + "rios de H&S)" ); + } + + @Override + public void doUpdate() throws Exception + { + PSQLSequenceUtils.fixSequence( HsRelatorioNormalizacaoData.TABLENAME, HsRelatorioNormalizacaoData.ID ); + } + +}