From a0b465521e46af465c3030db956805d19e5a35d3 Mon Sep 17 00:00:00 2001 From: Koen Reefman Date: Wed, 16 Aug 2017 14:56:28 +0000 Subject: [PATCH] PCHA#41415 (indicatie) gereed tijd wordt nu ook aangepast bij het doorsturen (mits einddatum_std is aangepast) svn path=/Website/branches/v2017.1/; revision=34963 --- APPL/MLD/mld_forward_save.asp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/APPL/MLD/mld_forward_save.asp b/APPL/MLD/mld_forward_save.asp index 26afe4d4e4..afccc9b29d 100644 --- a/APPL/MLD/mld_forward_save.asp +++ b/APPL/MLD/mld_forward_save.asp @@ -53,6 +53,7 @@ var sql = "SELECT mm.mld_stdmelding_key" + " , mm.mld_melding_spoed" + " , msm.mld_ins_discipline_key" + " , mm.mld_melding_einddatum" + + " , mm.mld_melding_einddatum_std" + " FROM mld_melding mm, mld_stdmelding msm" + " WHERE mm.mld_stdmelding_key = msm.mld_stdmelding_key" + " AND mld_melding_key = " + mld_key; @@ -62,6 +63,7 @@ var old_disc = oRs("mld_ins_discipline_key").Value; var mld_opm = oRs("mld_melding_opmerking").Value || ""; var spoed = oRs("mld_melding_spoed").Value; var einddatum = new Date(oRs("mld_melding_einddatum").Value); +var einddatum_std = new Date(oRs("mld_melding_einddatum_std").Value); oRs.Close(); var this_stdm = mld.mld_stdmeldinginfo(stdm_key); @@ -131,6 +133,22 @@ else // Nu kan de definitieve mld_melding.mld_melding_einddatum_std en mld_melding.mld_melding_t_uitvoertijd bepaald en gezet worden. mld.finishmeldingiu(mld_key); + var sql = "SELECT m.mld_melding_einddatum_std" + + " FROM mld_melding m" + + " WHERE m.mld_melding_key = " + mld_key; + var oRs = Oracle.Execute(sql); + + var einddatum_std_new = new Date(oRs("mld_melding_einddatum_std").Value); + oRs.Close(); + + if (einddatum_std.getTime() != einddatum_std_new.getTime()) + { + sql = "UPDATE mld_melding" + + " SET mld_melding_einddatum = " + einddatum_std_new.toSQL(true) + + " WHERE mld_melding_key = " + mld_key; + Oracle.Execute(sql); + } + mld.keepFlexDocuments(mld_key, old_stdm, stdm_key); // mldUpd.oldjsvals bevat helaas niet old_disc dus die hebben we al eerder bepaald.