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

PLAT#39567: Van MJOB naar MJOP/R.

Browse Source 
svn path=/Website/branches/v2017.2/; revision=35568
This commit is contained in:
Maykel Geerdink
2017-10-05 08:20:31 +00:00
parent be6598bbec
commit 874a389798
5 changed files with 368 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/API2/model_ins_srtcontrole.inc
View File

@@ -43,7 +43,8 @@ function model_ins_srtcontrole()
"typ": "varchar",
"hidden_fld": true,
"LOV": fill_niveau_LOV(),
"track": true
"track": true,
"insertonly": true
},
"objectkey": {
"dbs": "ins_srtinstallatie_key",

160
APPL/MLD/mld_close_confirm.asp
View File

@@ -22,6 +22,7 @@ if (mld_key_arr.length)
<!-- #include file="../Shared/iface.inc" -->
<!-- #include file="../Shared/json2.js" -->
<!-- #include file="../Shared/selector.inc" -->
<!-- #include file="../ins/ins.inc" -->
<!-- #include file="mld.inc" -->
<%
// LET OP: Het eerste stuk komt (nog) letterlijk ook zo terug bij mld_close_save.asp
@@ -109,9 +110,50 @@ user.anything_todo_or_abort(!reqStatusEmptyMelding.length, reqStatusEmptyMelding
user.auth_required_or_abort(!(mld_key_arr.length == 1 && futureOpdr), L("lcl_mld_einddatum_to_late_mld")); // Bij enkele melding met toekomstige opdrachten een aparte melding geven
user.anything_todo_or_abort(tobeclosed > 0); // We klagen niet over enkele wel en enkele niet
var mld_melding = mld.mld_melding_info(ingesloten[0]); // Neem voor informatie de eerste melding.
lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
var canCloseCtr = [];
var srtContKeyArray = [];
var controleModeArray = [-1, -1, -1]; // De drie controlemoden zijn niet aanwezig (-1);
for (var i = 0; i < ingesloten.length; i++)
{
var mld_melding = mld.mld_melding_info(ingesloten[i]);
if (i == 0) lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY"); // Neem voor informatie de eerste melding.
if (mld_melding.kto_key > 0)
{
var sql = "SELECT dsc.ins_deel_key"
+ " , dsc.ins_srtcontrole_key"
+ " , ctr_disc_params_controle_type"
+ " FROM ins_deelsrtcontrole dsc"
+ " , ins_srtcontrole isc"
+ " , ctr_disc_params cdp"
+ " WHERE dsc.ins_srtcontrole_key = isc.ins_srtcontrole_key"
+ " AND isc.ctr_discipline_key = cdp.ctr_ins_discipline_key"
+ " AND dsc.ins_deelsrtcontrole_key = " + mld_melding.kto_key;
var oRs = Oracle.Execute(sql);
// De controle moet aanwezig zijn.
var this_ins = ins.func_enabled_deel(oRs("ins_deel_key").Value,
{srtcont_key: oRs("ins_srtcontrole_key").Value,
deelsrtcont_key: mld_melding.kto_key,
scen_key: 1
});
if (this_ins.canInspClose)
{
canCloseCtr.push({ ins_key: oRs("ins_deel_key").Value,
srtcont_key: oRs("ins_srtcontrole_key").Value,
deelsrtcont_key: mld_melding.kto_key,
controlemode: oRs("ctr_disc_params_controle_type").Value
});
srtContKeyArray.push(oRs("ins_srtcontrole_key").Value);
controleModeArray[oRs("ctr_disc_params_controle_type").Value - 1] = oRs("ctr_disc_params_controle_type").Value; // Controlemode 2 op de 2de plek van de Array invullen [-1, 2, -1].
}
}
}
// De -1 waarden in de controlemode Array verwijderen
for (var i = 2; i >= 0; i--)
{
if (controleModeArray[i] == -1) controleModeArray.splice(i, 1);
}
%>
<html>
<head>
@@ -129,12 +171,43 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
FcltMgr.closeDetail(window, { cancel: true } );
}
function mld_close_callback(json, textStatus)
{
if (json.success)
{
if ($("#ctr_close").is(":checked"))
{
<% for (var i = 0; i < canCloseCtr.length; i++)
{ %>
var data = { savemode: 'C',
ins_keys: <%=canCloseCtr[i].ins_key%>,
srtcont_key_arr: <%=canCloseCtr[i].srtcont_key%>,
//deelsrtcont_key wordt niet gebruikt door ins_inspect_save.asp
finish: 0,
deelsrtcontrole_datum: (new Date()).getTime(),
sel_controlemode: $("#sel_controlemode" + <%=canCloseCtr[i].controlemode%>).val()
};
protectRequest.dataToken(data);
$.ajax({ type: "POST",
url: "../ins/ins_inspect_save.asp",
data: data,
//success: FcltCallbackClose,
datatype: "json",
async: false
});
<% } %>
}
FcltCallbackClose(json);
}
}
function mld_close(close)
{
if (!validateForm("u2"))
return false;
$.post($("form[name=closeform]")[0].action, $("[name=closeform]").serialize(), FcltCallbackClose, "json");
$.post($("form[name=closeform]")[0].action, $("[name=closeform]").serialize(), mld_close_callback, "json");
return true; // disable button
}
@@ -155,6 +228,28 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
}
}
function ctrcloseToggler(deze)
{
var ctrclose = $(deze).prop('checked');
if (ctrclose)
{
<% for (var i = 0; i < controleModeArray.length; i++)
{ %>
$("#sel_controlemode" + <%=controleModeArray[i]%>).addClass("required");
<% } %>
$("#inscontrolemode").show();
FcltMgr.resized(window);
}
else
{
$("#inscontrolemode").hide();
<% for (var i = 0; i < controleModeArray.length; i++)
{ %>
$("#sel_controlemode" + <%=controleModeArray[i]%>).removeClass("required");
<% } %>
}
}
FcltMgr.fixActiveelementError();
$(document).ready(function() {
$("#opmerk").focus();
@@ -271,13 +366,58 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
RWTEXTAREATR("opmerk", "fldremark" + (req?" required":""), "", "", { tdhtml_ta: "colspan='2'", html: "rows='8'" });
if (canCloseOpdr.length)
{
%><tr><td colspan="2">
<% CHECKBOX("fldopdrclose", "opdr_close", S("mld_close_opdr_default")); %>
<label for="opdr_close"><%=canCloseOpdr.length + L("lcl_mld_ord_close_all")%></label>
</td></tr>
<%
}
{ %>
<tr>
<td colspan="2">
<% CHECKBOX("fldopdrclose", "opdr_close", S("mld_close_opdr_default")); %>
<label for="opdr_close"><%=canCloseOpdr.length + L("lcl_mld_ord_close_all")%></label>
</td>
</tr>
<% }
if (canCloseCtr.length)
{ %>
<tr>
<td colspan="2">
<% CHECKBOX("fldctrclose", "ctr_close", 0, { html: "onChange='ctrcloseToggler(this)'" }); %>
<label for="ctr_close"><%=canCloseCtr.length + L("lcl_mld_ctr_close_all")%></label>
</td>
</tr>
<tr>
<td colspan="2">
<div id="inscontrolemode" style="display: none">
<table>
<% for (var i = 0; i < controleModeArray.length; i++)
{ // Maximaal 3 types.
var sctype;
switch (controleModeArray[i])
{
case 1: sctype = L("lcl_ins_srtcontrole_insp"); break;
case 2: sctype = L("lcl_ins_srtcontrole_repl"); break;
case 3: sctype = L("lcl_ins_srtcontrole_cert"); break;
}
sql = "SELECT ins_controlemode_key"
+ " , " + lcl.xsqla('ins_controlemode_oms', 'ins_controlemode_key')
+ " FROM ins_controlemode"
+ " WHERE ins_srtcontrole_type = " + controleModeArray[i]
+ " AND ins_controlemode_success = 1"
+ " ORDER BY 2";
// Methode is voor de status Afgemeld(5) en Historie/Verwerkt(6) altijd ingevuld.
// Required wordt gezet als de selectbox zichtbaar wordt.
FCLTselector("sel_controlemode" + controleModeArray[i],
sql,
{ label: L("lcl_ins_controle_mode") + " " + sctype,
initKey: -1,
emptyOption: L("lcl_select_controlemode"),
selectjustone: true
});
}
%> </table>
</div>
</td>
</tr>
<% }
BLOCK_END();
buttons = [];
if (has_opdr_opm)

20
APPL/MLD/mld_edit_melding.asp
View File

@@ -997,6 +997,16 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
ROFIELDTR("fld", L("lcl_mld_meldbron"), oRs("mld_meldbron_omschrijving").Value);
oRs.close();
if (mld_melding.meldbron_key == 10 && mld_melding.kto_type == 'T')
{
sql = "SELECT dsc.ins_deelsrtcontrole_freezecost"
+ " FROM ins_deelsrtcontrole dsc"
+ " WHERE dsc.ins_deelsrtcontrole_key = " + mld_melding.kto_key;
oRs = Oracle.Execute(sql);
// De controle moet aanwezig zijn.
ROFIELDTR("fld", L("lcl_mld_frozen_costs") + "&nbsp;" + L("lcl_valutasign"), oRs("ins_deelsrtcontrole_freezecost").Value, {suppressEmpty: true});
oRs.close();
}
}
ROFIELDTR("fld", L("lcl_mld_meldbron_nr"), mld_melding.meldbron_nr, {suppressEmpty: true});
@@ -1119,25 +1129,25 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
gen_flex(2); // dan hier....
var buttons = [];
if (S("mld_edit_search_similar") && (backo || fronto))
{
var goegel = "FcltMgr.openDetail('/appl/mld/mld_search.asp?urole=" + urole + "&chkSelf=1&chkBusy=1&autosearch=1&opl=1";
if (S("mld_edit_search_similar") & 1) // Omschrijving
goegel += "&searchtekst='+escape($('#melding_omschrijving').val())+'";
if (S("mld_edit_search_similar") & 2) // Locatie
goegel += "&locatie_key='" + "+($('#locatiekey').val()||-1)+" + "'";
/* Future additions:
if (S("mld_edit_search_similar") & 3) // XXX1
goegel += "&XXX1=" + mld_melding.XXX1;
if (S("mld_edit_search_similar") & 4) // XXX2
goegel += "&XXX2=" + mld_melding.XXX2;
*/
goegel += "&disc=-1', '', '" + L("lcl_mld_similarcalls") + "') ";
if (lBestaandeMelding && (this_mld.canBOwrite || this_mld.canFOwrite))
buttons.push({ icon: "lightbulb.png", title: L("lcl_mld_similarcalls"), action: goegel});
}

240
APPL/MLD/mld_reject.asp
View File

@@ -16,6 +16,7 @@
<!-- #include file="../Shared/selector.inc" -->
<!-- #include file="../Shared/stdmeldingselector.inc" -->
<!-- #include file="../Shared/save2db.inc" -->
<!-- #include file="../ins/ins.inc" -->
<!-- #include file="mld.inc" -->
<%
@@ -27,7 +28,7 @@ var opmerk = getFParam("opmerk", "");
var result = {};
var toberejected = 0;
var ingesloten = [];
var ingesloten = []; // mld_key.
var reqStatusEmptyMelding = [];
// Bepaal de meldingen in de selectie die
// ook echt afgewezen kunnen of mogen worden.
@@ -38,7 +39,7 @@ for (var i = 0; i < mld_key_arr.length; i++)
lcl.set_dialect(mld_info.srtdisc, "MLD_SRTDISCIPLINE_KEY");
if (this_mld.canReject && !mld_info.parent_key) // Geen child melding
{
ingesloten.push(mld_key_arr[i]);
ingesloten.push({ mld_key: mld_key_arr[i] });
toberejected++;
}
// Zijn er nog kenmerken die nu wel verplicht zijn?
@@ -52,6 +53,57 @@ for (var i = 0; i < mld_key_arr.length; i++)
// De laatst gebruikte set_dialect uit de for-lus geldt nu voor de onderstaande code.
user.anything_todo_or_abort(!reqStatusEmptyMelding.length, reqStatusEmptyMelding.join("<br />"));
user.anything_todo_or_abort(toberejected > 0); // We klagen niet over enkele wel en enkele niet
var mldKeyArray = "";
for (var i = 0; i < ingesloten.length; i++)
{
mldKeyArray += (i > 0? "," : "") + ingesloten[i].mld_key;
}
var canCloseCtr = 0;
var srtContKeyArray = [];
var controleModeArray = [-1, -1, -1]; // De drie controlemoden zijn niet aanwezig (-1);
for (var i = 0; i < ingesloten.length; i++)
{
var mld_melding = mld.mld_melding_info(ingesloten[i].mld_key);
ingesloten[i].canInspClose = false;
if (mld_melding.kto_key > 0)
{
var sql = "SELECT dsc.ins_deel_key"
+ " , dsc.ins_srtcontrole_key"
+ " , ctr_disc_params_controle_type"
+ " FROM ins_deelsrtcontrole dsc"
+ " , ins_srtcontrole isc"
+ " , ctr_disc_params cdp"
+ " WHERE dsc.ins_srtcontrole_key = isc.ins_srtcontrole_key"
+ " AND isc.ctr_discipline_key = cdp.ctr_ins_discipline_key"
+ " AND dsc.ins_deelsrtcontrole_key = " + mld_melding.kto_key;
var oRs = Oracle.Execute(sql);
// De controle moet aanwezig zijn.
var this_ins = ins.func_enabled_deel(oRs("ins_deel_key").Value,
{srtcont_key: oRs("ins_srtcontrole_key").Value,
deelsrtcont_key: mld_melding.kto_key,
scen_key: 1
});
if (this_ins.canInspClose)
{
ingesloten[i].canInspClose = true;
ingesloten[i].controlemode = oRs("ctr_disc_params_controle_type").Value;
ingesloten[i].ins_key = oRs("ins_deel_key").Value;
ingesloten[i].srtcont_key = oRs("ins_srtcontrole_key").Value;
canCloseCtr++;
srtContKeyArray.push(oRs("ins_srtcontrole_key").Value);
controleModeArray[oRs("ctr_disc_params_controle_type").Value - 1] = oRs("ctr_disc_params_controle_type").Value; // Controlemode 2 op de 2de plek van de Array invullen [-1, 2, -1].
}
}
}
// De -1 waarden in de controlemode Array verwijderen
for (var i = 2; i >= 0; i--)
{
if (controleModeArray[i] == -1) controleModeArray.splice(i, 1);
}
%>
<html>
@@ -60,52 +112,76 @@ user.anything_todo_or_abort(toberejected > 0); // We klagen niet over enkele wel
<% if (submitting && opmerk != "")
{ // Handle workflow actions for rejection:
var notaccepted = 0;
for (var i = 0; i < ingesloten.length; i++)
{
mld.nextworkflowstep(ingesloten[i], 0); // 0 = rejected
sql = "SELECT mm.mld_melding_opmerking"
+ " FROM mld_melding mm"
+ " WHERE mld_melding_key = " + ingesloten[i];
oRs = Oracle.Execute(sql);
var new_opm = (oRs("mld_melding_opmerking").value||""); // + "\n" + opmerk;
new_opm = new_opm + ((new_opm + opmerk) != "" ? "\n" : "") + opmerk; // alleen een CR als er al iets staat EN er iets wordt toegevoegd.
oRs.Close();
var fields = [ { dbs: "mld_melding_opmerking", typ: "varchar", val: new_opm, track: L("lcl_mld_inf_Opmerking"), len: 4000 }
];
var mldUpd = buildTrackingUpdate("mld_melding", " mld_melding_key = " + ingesloten[i], fields);
oRs = Oracle.Execute(mldUpd.sql);
if (mldUpd.trackarray.length)
mld.trackmeldingupdate(ingesloten[i], L("lcl_mld_is_mldupd") + "\n" + mldUpd.trackarray.join("\n"));
// Zetten van de status op afgewezen en afhandelen van de tracking.
mld.setmeldingstatus(ingesloten[i], 1); // afgewezen
// check (zat er al in)
// TODO: Het afwijzen gaat niet altijd goed. Wat is de reden daartoe? Status wordt in enkele gevallen niet op 1 gezet door mld.setmeldingstatus?
sql = "SELECT ''"
+ " FROM mld_melding"
+ " WHERE mld_melding_key = " + ingesloten[i]
+ " AND mld_melding_status = 1";
oRs = Oracle.Execute(sql);
if (oRs.eof)
{
notaccepted++;
}
}
var success = true;
var warning = ""
if (notaccepted == ingesloten.length)
var warning = L("lcl_mld_reject_failed");
%>
<script type="text/javascript">
<% var notaccepted = 0;
for (var i = 0; i < ingesloten.length; i++)
{
mld.nextworkflowstep(ingesloten[i].mld_key, 0); // 0 = rejected
sql = "SELECT mm.mld_melding_opmerking"
+ " FROM mld_melding mm"
+ " WHERE mld_melding_key = " + ingesloten[i].mld_key;
oRs = Oracle.Execute(sql);
var new_opm = (oRs("mld_melding_opmerking").value||""); // + "\n" + opmerk;
new_opm = new_opm + ((new_opm + opmerk) != "" ? "\n" : "") + opmerk; // alleen een CR als er al iets staat EN er iets wordt toegevoegd.
oRs.Close();
var fields = [ { dbs: "mld_melding_opmerking", typ: "varchar", val: new_opm, track: L("lcl_mld_inf_Opmerking"), len: 4000 }
];
var mldUpd = buildTrackingUpdate("mld_melding", " mld_melding_key = " + ingesloten[i].mld_key, fields);
oRs = Oracle.Execute(mldUpd.sql);
if (mldUpd.trackarray.length)
mld.trackmeldingupdate(ingesloten[i].mld_key, L("lcl_mld_is_mldupd") + "\n" + mldUpd.trackarray.join("\n"));
// Zetten van de status op afgewezen en afhandelen van de tracking.
mld.setmeldingstatus(ingesloten[i].mld_key, 1); // afgewezen
// check (zat er al in)
// TODO: Het afwijzen gaat niet altijd goed. Wat is de reden daartoe? Status wordt in enkele gevallen niet op 1 gezet door mld.setmeldingstatus?
sql = "SELECT ''"
+ " FROM mld_melding"
+ " WHERE mld_melding_key = " + ingesloten[i].mld_key
+ " AND mld_melding_status = 1";
oRs = Oracle.Execute(sql);
if (oRs.eof)
{
notaccepted++;
}
var ctr_close = getFParam("ctr_close", "off") == "on";
if (ctr_close && ingesloten[i].canInspClose)
{ %>
var data = { savemode: 'C',
ins_keys: <%=ingesloten[i].ins_key%>,
srtcont_key_arr: <%=ingesloten[i].srtcont_key%>,
//deelsrtcont_key wordt niet gebruikt door ins_inspect_save.asp
finish: 0,
deelsrtcontrole_datum: (new Date()).getTime(),
sel_controlemode: <%=getFParamInt("sel_controlemode" + ingesloten[i].controlemode)%>
};
protectRequest.dataToken(data);
$.ajax({ type: "POST",
url: "../ins/ins_inspect_save.asp",
data: data,
//success: FcltCallbackClose,
datatype: "json",
async: false
});
<% }
}
var success = true;
var warning = "";
if (notaccepted == ingesloten.length)
warning = L("lcl_mld_reject_failed");
%> </script>
<script type="text/javascript">
FcltMgr.closeDetail( window,
{
key: "<%=ingesloten.join(",")%>",
key: "<%=mldKeyArray%>",
warning: "<%=safe.jsstring(warning)%>",
success: "<%=success? 1 : 0%>"
});
@@ -144,6 +220,28 @@ user.anything_todo_or_abort(toberejected > 0); // We klagen niet over enkele wel
$("#opmerk").val($("#opmerk").val() + ($("#opmerk").val() != ""? "\n" : "") + PastedText);
}
}
function ctrcloseToggler(deze)
{
var ctrclose = $(deze).prop('checked');
if (ctrclose)
{
<% for (var i = 0; i < controleModeArray.length; i++)
{ %>
$("#sel_controlemode" + <%=controleModeArray[i]%>).addClass("required");
<% } %>
$("#inscontrolemode").show();
FcltMgr.resized(window);
}
else
{
$("#inscontrolemode").hide();
<% for (var i = 0; i < controleModeArray.length; i++)
{ %>
$("#sel_controlemode" + <%=controleModeArray[i]%>).removeClass("required");
<% } %>
}
}
</script>
<% } %>
</head>
@@ -162,7 +260,7 @@ user.anything_todo_or_abort(toberejected > 0); // We klagen niet over enkele wel
+ " , mld_stdmelding sm"
+ " , mld_discipline md"
+ " , ins_srtdiscipline sd"
+ " WHERE mld_melding_key = " + ingesloten[0]
+ " WHERE mld_melding_key = " + ingesloten[0].mld_key
+ " AND mm.mld_stdmelding_key = sm.mld_stdmelding_key"
+ " AND sm.mld_ins_discipline_key = md.ins_discipline_key"
+ " AND md.ins_srtdiscipline_key = sd.ins_srtdiscipline_key";
@@ -176,9 +274,9 @@ user.anything_todo_or_abort(toberejected > 0); // We klagen niet over enkele wel
}
%>
<form id="rejectform" name="rejectform" action="mld_reject.asp?submit=1&mld_key=<%=ingesloten.join(",")%>" method="post">
<form id="rejectform" name="rejectform" action="mld_reject.asp?submit=1&mld_key=<%=mldKeyArray%>" method="post">
<%
BLOCK_START("mldReject", L("lcl_forward_mld_1") + ingesloten.join(","));
BLOCK_START("mldReject", L("lcl_forward_mld_1") + mldKeyArray);
// <!-- Meldingen (Discipline) -->
FCLTstdmeldingselector("stdm", "sgStdm", {label: L("lcl_complain"),
perslidKey: user_key,
@@ -203,7 +301,7 @@ user.anything_todo_or_abort(toberejected > 0); // We klagen niet over enkele wel
+ " , mld_stdmelding std"
+ " , mld_discipline md"
+ " , ins_srtdiscipline sd"
+ " WHERE mld_melding_key IN (" + ingesloten.join(",") + ")"
+ " WHERE mld_melding_key IN (" + mldKeyArray + ")"
+ " AND mm.mld_stdmelding_key = std.mld_stdmelding_key"
+ " AND std.mld_ins_discipline_key = md.ins_discipline_key"
+ " AND md.ins_srtdiscipline_key = sd.ins_srtdiscipline_key";
@@ -222,7 +320,7 @@ user.anything_todo_or_abort(toberejected > 0); // We klagen niet over enkele wel
+ " AND BITAND(mld_afmeldtekst_usefor, 2) = 2";
var sql_from_o = " FROM mld_opdr mo"
+ " WHERE mo.mld_melding_key = " + ingesloten[0]
+ " WHERE mo.mld_melding_key = " + ingesloten[0].mld_key
+ " AND mo.mld_statusopdr_key = 6" // status=afgemeld
+ " AND mo.mld_opdr_opmerking IS NOT NULL";
@@ -270,6 +368,50 @@ user.anything_todo_or_abort(toberejected > 0); // We klagen niet over enkele wel
L("lcl_mld_inf_Opmerking"),
"",
{html: "rows='8'"});
if (canCloseCtr > 0)
{ %>
<tr>
<td colspan="2">
<% CHECKBOX("fldctrclose", "ctr_close", 0, { html: "onChange='ctrcloseToggler(this)'" }); %>
<label for="ctr_close"><%=canCloseCtr + L("lcl_mld_ctr_close_all")%></label>
</td>
</tr>
<tr>
<td colspan="2">
<div id="inscontrolemode" style="display: none">
<table>
<% for (var i = 0; i < controleModeArray.length; i++)
{ // Maximaal 3 types.
var sctype;
switch (controleModeArray[i])
{
case 1: sctype = L("lcl_ins_srtcontrole_insp"); break;
case 2: sctype = L("lcl_ins_srtcontrole_repl"); break;
case 3: sctype = L("lcl_ins_srtcontrole_cert"); break;
}
sql = "SELECT ins_controlemode_key"
+ " , " + lcl.xsqla('ins_controlemode_oms', 'ins_controlemode_key')
+ " FROM ins_controlemode"
+ " WHERE ins_srtcontrole_type = " + controleModeArray[i]
+ " AND (ins_controlemode_success IS NULL OR ins_controlemode_success = 0)"
+ " ORDER BY 2";
// Methode is voor de status Afgemeld(5) en Historie/Verwerkt(6) altijd ingevuld.
// Required wordt gezet als de selectbox zichtbaar wordt.
FCLTselector("sel_controlemode" + controleModeArray[i],
sql,
{ label: L("lcl_ins_controle_mode") + " " + sctype,
initKey: -1,
emptyOption: L("lcl_select_controlemode"),
selectjustone: true
});
}
%> </table>
</div>
</td>
</tr>
<% }
BLOCK_END();
var buttons = [ {title: L("lcl_reject"), icon: "opslaan.png", action: "mld_reject()", singlepress: true, id: "btn_reject_submit" },

10
APPL/MLD/mld_show_melding.asp
View File

@@ -442,6 +442,16 @@ function parentButton()
ROFIELDTR("fld", L("lcl_mld_meldbron"), oRs("mld_meldbron_omschrijving").value);
oRs.close();
if (mld_melding.meldbron_key == 10 && mld_melding.kto_type == 'T')
{
sql = "SELECT dsc.ins_deelsrtcontrole_freezecost"
+ " FROM ins_deelsrtcontrole dsc"
+ " WHERE dsc.ins_deelsrtcontrole_key = " + mld_melding.kto_key;
oRs = Oracle.Execute(sql);
// De controle moet aanwezig zijn.
ROFIELDTR("fld", L("lcl_mld_frozen_costs") + "&nbsp;" + L("lcl_valutasign"), oRs("ins_deelsrtcontrole_freezecost").Value, {suppressEmpty: true, datatype: "currency"});
oRs.close();
}
}
ROFIELDTR("fld", L("lcl_mld_meldbron_nr"), mld_melding.meldbron_nr, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_mld_externr"), mld_melding.externnr, {suppressEmpty: true});