diff --git a/APPL/PDA/iface.inc b/APPL/PDA/iface.inc index 5c9056ef34..304749e73b 100644 --- a/APPL/PDA/iface.inc +++ b/APPL/PDA/iface.inc @@ -244,7 +244,7 @@ function ROFIELD(pclass, plabel, pvalue, params) params.disabled = true; if (!plabel) { // Heel simpel - Response.Write("
" + safe.html(pvalue )+ "
"); + Response.Write("
" + safe.fclthtml(pvalue )+ "
"); return; } @@ -271,11 +271,18 @@ function RWFIELD(pId, plabel, pvalue, params) vinputattr += (params.html ? " "+params.html : ""); vinput = (params.multi - ? "" + ? (params.disabled + ? safe.fclthtml(pvalue) + : "" + ) : "" ); - if (params.moreinfo && params.disabled) { - vinput = "" + vinput + ""; + if (params.moreinfo && params.disabled) + { + if (params.multi && plabel) + vlabel = "" + vlabel + ""; + else + vinput = "" + vinput + ""; } %><%=vcontain%>><%=vlabel%><%=vinput%><% } diff --git a/APPL/PDA/ins_inspect.asp b/APPL/PDA/ins_inspect.asp index 138e4e605d..9ddd877581 100644 --- a/APPL/PDA/ins_inspect.asp +++ b/APPL/PDA/ins_inspect.asp @@ -475,11 +475,13 @@ else { sql = "SELECT " + lcl.xsqla('isc.ins_srtcontrole_omschrijving', 'isc.ins_srtcontrole_key') + " , ins_srtcontrole_type" + + " , ins_srtcontrole_info" + " FROM ins_srtcontrole isc" + " WHERE ins_srtcontrole_key = " + srtcontrole_key; oRs = Oracle.Execute(sql); var srtcontrole_oms = oRs("ins_srtcontrole_omschrijving").Value; var srtcontrole_type = oRs("ins_srtcontrole_type").Value; + var srtcontrole_info = oRs("ins_srtcontrole_info").Value; ROFIELD("sel_srtcontrole_oms", L("lcl_ins_controle"), srtcontrole_oms, {}); sql = "SELECT cm.ins_controlemode_key" @@ -512,6 +514,8 @@ else } CONTROLGROUP_START(); + if (srtcontrole_info) + BUTTON(L("ins_srtcontrole_info"), {linkid: "#ins-2-"+ins_key, dataicon: "info", transition: "pop", datarel: "dialog"}); switch (ins_deelsrtcontrole_status) { case -1: @@ -560,6 +564,12 @@ else CONTENT_END(); FOOTER(); PAGE_END(); + PAGE_START({id: "ins-2-"+ins_key}) + HEADER({title: srtcontrole_oms, back: false, nohome: true}) ; + CONTENT_START(); + ROFIELD("fld", "", srtcontrole_info, {multi: true}); + CONTENT_END(); + PAGE_END(); %> diff --git a/APPL/SCF/scaffolding.inc b/APPL/SCF/scaffolding.inc index 91aeb4ff63..1eca3b73fc 100644 --- a/APPL/SCF/scaffolding.inc +++ b/APPL/SCF/scaffolding.inc @@ -226,8 +226,19 @@ function scf_ROFIELDTR(model, fld, val, key, params) else if (field.typ == "check" || field.typ == "check0") ROCHECKBOXTR("fldtxt", field.label, txt, params); else + { if (!field.hidden_fld) - ROFIELDTR("fldtxt", field.label, txt, params); + { + if (field.typ == "memo") + { + ROTEXTAREATR("fldtxt", field.label, txt, params); + } + else + { + ROFIELDTR("fldtxt", field.label, txt, params); + } + } + } } function scf_RWFIELDTR(model, fld, val, key, params)