admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DJIN#35086: Geen goede notificatietekst bij ORDUPD.

Browse Source 
svn path=/Website/trunk/; revision=27835
This commit is contained in:
Maykel Geerdink
2016-01-21 09:36:31 +00:00
parent 992c3bf9db
commit 4f6df70ec0
7 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
APPL/MLD/mld.inc
View File

@@ -4092,9 +4092,8 @@ mld = {setmeldingstatus:
if (mldUpd && mldUpd.trackarray.length)
{
Oracle.Execute(mldUpd.sql);
var mld_info = mld.mld_melding_info(mld_opdr.mld_key);
var stdm_info = mld.mld_stdmeldinginfo(mld_info.stdm);
var formattedID = stdm_info.ins_srtdiscipline_prefix + mld_opdr.mld_key + "/" + mld_opdr.volgnr;
var ins_srtdiscipline_prefix = mld.mld_prefix(mld_opdr.mld_key);
var formattedID = ins_srtdiscipline_prefix + mld_opdr.mld_key + "/" + mld_opdr.volgnr;
mld.trackopdrachtupdate(opdr_key, L("lcl_ord_is_ordupdtrack").format(formattedID) + "\n" + mldUpd.trackarray.join("\n"));
}
}

5
APPL/MLD/mld_change_opdrtype.asp
View File

@@ -135,9 +135,8 @@ user.anything_todo_or_abort(this_opdr.canOpdrTypeChange && S("mld_ord_change_typ
mld_opdr = mld.mld_opdr_info(opdr_key);
var new_omschr = mld_opdr.opdr_type_omschr;
var mld_info = mld.mld_melding_info(mld_opdr.mld_key);
var stdm_info = mld.mld_stdmeldinginfo(mld_info.stdm);
var formattedID = stdm_info.ins_srtdiscipline_prefix + mld_opdr.mld_key + "/" + mld_opdr.volgnr;
var ins_srtdiscipline_prefix = mld.mld_prefix(mld_opdr.mld_key);
var formattedID = ins_srtdiscipline_prefix + mld_opdr.mld_key + "/" + mld_opdr.volgnr;
mld.trackopdrachtupdate(opdr_key, L("lcl_ord_is_ordupdtrack").format(formattedID) + "\n"
+ L("lcl_mld_typeopdr") + ": " + old_omschr + L("lcl_trackto") + new_omschr);

7
APPL/MLD/mld_edit_opdr_save.asp
View File

@@ -52,7 +52,6 @@ if (!isNew)
var mld_opdr = mld.mld_opdr_info(opdr_key);
var mld_key = mld_opdr.mld_key;
var mld_info = mld.mld_melding_info(mld_key);
var stdm_info = mld.mld_stdmeldinginfo(mld_info.stdm);
var t_opdr = mld_opdr.opdr_type;
var StatusTV = mld_opdr.opdr_status == 6;
@@ -63,7 +62,6 @@ else
{
var mld_key = getFParamInt("mld_key");
var mld_info = mld.mld_melding_info(mld_key);
var stdm_info = mld.mld_stdmeldinginfo(mld_info.stdm);
if (autoorder)
{ // dan pakken we per definitie de default. We eisen dat die is ingevuld.
@@ -737,6 +735,7 @@ for (var u = 0; u < uitvkeyArray.length; u++)
+ " WHERE mld_melding_key = " + mld_key;
Oracle.Execute(sql);
// Wijzigen einddatum tracken.
var stdm_info = mld.mld_stdmeldinginfo(mld_info.stdm);
var formattedID = stdm_info.ins_srtdiscipline_prefix + mld_key + " (" + stdm_info.discipline_omschrijving + "/" + stdm_info.stdmelding_omschrijving + ")";
var mldtracking = L("lcl_mld_is_mldupdtrack").format(formattedID) + "\n"
+ L("lcl_mld_enddate") + ": " + buildTrackText("datetime", mld_opdr.mld_opdr_einddatum, new_einddatum);
@@ -818,6 +817,7 @@ for (var u = 0; u < uitvkeyArray.length; u++)
// Tracken van de objectwijzigingen.
if (objtrack != "")
{
var stdm_info = mld.mld_stdmeldinginfo(mld_info.stdm);
var formattedID = stdm_info.ins_srtdiscipline_prefix + mld_key + " (" + stdm_info.discipline_omschrijving + "/" + stdm_info.stdmelding_omschrijving + ")";
mld.trackmeldingupdate(mld_key, L("lcl_mld_is_mldupdtrack").format(formattedID) + "\n" + objtrack);
}
@@ -900,7 +900,8 @@ if (!isNew)
{
if ((mldUpd.trackarray.length || flextrack.length))
{
var formattedID = stdm_info.ins_srtdiscipline_prefix + mld_key + "/" + volgnr;
var ins_srtdiscipline_prefix = mld.mld_prefix(mld_key);
var formattedID = ins_srtdiscipline_prefix + mld_key + "/" + volgnr;
mld.trackopdrachtupdate(opdr_key, L("lcl_ord_is_ordupdtrack").format(formattedID) + "\n" + mldUpd.trackarray.concat(flextrack).join("\n"));
}
// Bij update van uitvoerende en als status 5 is, dan uitvoerende tracken (ORDMLI (intern) of ORDMLE (extern)

5
APPL/MLD/opdr_accept_offer_save.asp
View File

@@ -40,9 +40,8 @@ if (this_opdr.canOpmChange)
if (mldUpd && mldUpd.trackarray.length)
{
Oracle.Execute(mldUpd.sql);
var mld_info = mld.mld_melding_info(mld_opdr.mld_key);
var stdm_info = mld.mld_stdmeldinginfo(mld_info.stdm);
var formattedID = stdm_info.ins_srtdiscipline_prefix + mld_opdr.mld_key + "/" + mld_opdr.volgnr;
var ins_srtdiscipline_prefix = mld.mld_prefix(mld_opdr.mld_key);
var formattedID = ins_srtdiscipline_prefix + mld_opdr.mld_key + "/" + mld_opdr.volgnr;
mld.trackopdrachtupdate(opdr_key, L("lcl_ord_is_ordupdtrack").format(formattedID) + "\n" + mldUpd.trackarray.join("\n"));
}
}

5
APPL/MLD/opdr_cancel_save.asp
View File

@@ -48,9 +48,8 @@ if (this_opdr.canOpmChange)
var fields = [ { dbs: "mld_opdr_opmerking", typ: "varchar", val: opdr_opm, track: L("lcl_mld_inf_Opmerking") } ];
var mldUpd = buildTrackingUpdate("mld_opdr", "mld_opdr_key = " + opdr_key, fields);
Oracle.Execute(mldUpd.sql); // mldUpd && mldUpd.trackarray.length
var mld_info = mld.mld_melding_info(mld_opdr.mld_key);
var stdm_info = mld.mld_stdmeldinginfo(mld_info.stdm);
var formattedID = stdm_info.ins_srtdiscipline_prefix + mld_opdr.mld_key + "/" + mld_opdr.volgnr;
var ins_srtdiscipline_prefix = mld.mld_prefix(mld_opdr.mld_key);
var formattedID = ins_srtdiscipline_prefix + mld_opdr.mld_key + "/" + mld_opdr.volgnr;
mld.trackopdrachtupdate(opdr_key, L("lcl_ord_is_ordupdtrack").format(formattedID) + "\n" + mldUpd.trackarray.join("\n"));
}

5
APPL/MLD/opdr_close_save.asp
View File

@@ -177,9 +177,8 @@ for (var i = 0; i < ingesloten.length; i++)
if ((mldUpd && mldUpd.trackarray.length) ||
((mld_opdr.typeopdr_afmeldmarge > 0 && ingesloten.length == 1) && (afmelddatum.getTime() != orgdate.getTime())))
{
var mld_info = mld.mld_melding_info(mld_opdr.mld_key);
var stdm_info = mld.mld_stdmeldinginfo(mld_info.stdm);
formattedID = stdm_info.ins_srtdiscipline_prefix + mld_opdr.mld_key + "/" + mld_opdr.volgnr;
var ins_srtdiscipline_prefix = mld.mld_prefix(mld_opdr.mld_key);
formattedID = ins_srtdiscipline_prefix + mld_opdr.mld_key + "/" + mld_opdr.volgnr;
}
if (mldUpd && mldUpd.trackarray.length)

5
APPL/MLD/opdr_reject_save.asp
View File

@@ -75,9 +75,8 @@ var result = { opdr_key: ingesloten.join(","), message: "", success: false };
if (mldUpd.trackarray.length)
{
var mld_info = mld.mld_melding_info(mld_opdr.mld_key);
var stdm_info = mld.mld_stdmeldinginfo(mld_info.stdm);
var formattedID = stdm_info.ins_srtdiscipline_prefix + mld_opdr.mld_key + "/" + mld_opdr.volgnr;
var ins_srtdiscipline_prefix = mld_prefix(mld_opdr.mld_key);
var formattedID = ins_srtdiscipline_prefix + mld_opdr.mld_key + "/" + mld_opdr.volgnr;
mld.trackopdrachtupdate(ingesloten[i], L("lcl_ord_is_ordupdtrack").format(formattedID) + "\n" + mldUpd.trackarray.join("\n"));
}