FCLT#55581 Het 'Melder notificeren'-vinkje wordt nu getoond conditioneel aan of er uberhaupt iets zal worden gestuurd

svn path=/Website/branches/v2018.2/; revision=40112
This commit is contained in:
2018-12-05 10:38:06 +00:00
parent 33ae674404
commit b5471dae9f

View File

@@ -295,19 +295,30 @@ for (var i = 2; i >= 0; i--)
var req = false;
var stdmld_arr = [];
var disc_arr = [];
var canNoti = false;
sql = "SELECT ''"
+ " FROM fac_srtnotificatie"
+ " WHERE fac_srtnotificatie_code = 'MLDAFM' AND fac_srtnotificatie_mode > 0";
oRs = Oracle.Execute(sql);
var canSrtNoti = !oRs.eof;
sql = "SELECT DISTINCT mld_stdmelding_afmeldtext"
+ " , mld_melding_opmerking"
+ " , ins_srtdiscipline_prefix"
+ " , std.mld_stdmelding_key"
+ " , std.mld_stdmelding_notify"
+ " , md.ins_discipline_key"
+ " , mdp.mld_disc_params_notify"
+ " FROM mld_melding mm"
+ " , mld_stdmelding std"
+ " , mld_discipline md"
+ " , mld_disc_params mdp"
+ " , ins_srtdiscipline sd"
+ " WHERE mld_melding_key IN (" + ingesloten.join(",") + ")"
+ " AND mm.mld_stdmelding_key = std.mld_stdmelding_key"
+ " AND std.mld_ins_discipline_key = md.ins_discipline_key"
+ " AND md.ins_discipline_key = mdp.mld_ins_discipline_key"
+ " AND md.ins_srtdiscipline_key = sd.ins_srtdiscipline_key";
oRs = Oracle.Execute(sql);
while (!oRs.eof)
@@ -317,6 +328,11 @@ for (var i = 2; i >= 0; i--)
req = req || ((S("mld_afhandeling_required_for_close") || oRs("mld_stdmelding_afmeldtext").value == 2) && (oldRemark == null));
stdmld_arr[stdmld_arr.length] = oRs("mld_stdmelding_key").Value;
disc_arr[disc_arr.length] = oRs("ins_discipline_key").Value;
if (canSrtNoti && !canNoti)
{
canNoti = oRs("mld_disc_params_notify").Value == 1 ||
(oRs("mld_disc_params_notify").Value == 2 && oRs("mld_stdmelding_notify").Value == 1);
}
oRs.MoveNext();
}
@@ -394,7 +410,8 @@ for (var i = 2; i >= 0; i--)
}
RWTEXTAREATR("opmerk", "fldremark" + (req?" required":""), "", "", { tdhtml_ta: "colspan='2'", html: "rows='8'" });
RWCHECKBOXTR("noti_caller", "fld_noti_caller", L("lcl_mld_noti_caller"), 1, { boxfirst: true });
if (canNoti)
RWCHECKBOXTR("noti_caller", "fld_noti_caller", L("lcl_mld_noti_caller"), 1, { boxfirst: true });
if (canCloseOpdr.length)
{ %>