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

FSN#36580 Vervolg op FSN#35474. Codes in show mode zichtbaar en ondersteuning op mobiel

Browse Source 
svn path=/Website/trunk/; revision=30346
This commit is contained in:
Erik Groener
2016-08-18 09:50:07 +00:00
parent 74c3f549a9
commit e86690ab27
3 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
APPL/PDA/iface.inc
View File

@@ -244,7 +244,7 @@ function ROFIELD(pclass, plabel, pvalue, params)
params.disabled = true;
if (!plabel)
{ // Heel simpel
Response.Write("<div class='" + pclass + "' style='margin-bottom:5px;'>" + safe.html(pvalue )+ "</div>");
Response.Write("<div class='" + pclass + "' style='margin-bottom:5px;'>" + safe.fclthtml(pvalue )+ "</div>");
return;
}
@@ -271,11 +271,18 @@ function RWFIELD(pId, plabel, pvalue, params)
vinputattr += (params.html ? " "+params.html : "");
vinput = (params.multi
? "<textarea " + (plabel ? "placeholder='"+plabel+"'" : "") + vinputattr + ">" + safe.textarea(pvalue) + "</textarea>"
? (params.disabled
? safe.fclthtml(pvalue)
: "<textarea " + (plabel ? "placeholder='"+plabel+"'" : "") + vinputattr + ">" + safe.textarea(pvalue) + "</textarea>"
)
: "<input " + (plabel ? "placeholder='"+plabel+"'" : "") + vinputattr + " value='" + safe.htmlattr(pvalue) + "' />"
);
if (params.moreinfo && params.disabled) {
vinput = "<a class='moreinfo' data-ajax='false' href='" + params.moreinfo + "'>" + vinput + "</a>";
if (params.moreinfo && params.disabled)
{
if (params.multi && plabel)
vlabel = "<a class='moreinfo' data-ajax='false' href='" + params.moreinfo + "'>" + vlabel + "</a>";
else
vinput = "<a class='moreinfo' data-ajax='false' href='" + params.moreinfo + "'>" + vinput + "</a>";
}
%><div<%=vdatarole%><%=vcontain%>><%=vlabel%><%=vinput%></div><%
}

10
APPL/PDA/ins_inspect.asp
View File

@@ -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();
%>
</body>
</html>

13
APPL/SCF/scaffolding.inc
View File

@@ -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)