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

.tables format om de data in een prettig leesbaar formaat te tonen iets verbeterd

Browse Source 
svn path=/Website/trunk/; revision=33341
This commit is contained in:
Jos Groot Lipman
2017-03-30 12:59:05 +00:00
parent 8ecc8d071d
commit e6d63e2b86
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
APPL/API2/api2_rest.inc
View File

@@ -595,13 +595,20 @@ api2_rest = {
var tds = [];
for (var fld in data[0])
{
var val = data[0][fld];
if (val && typeof val == "object" && model.includes && fld in model.includes)
{ // dereference
var lbl = model.includes[fld].model.records_title;
}
else
var lbl = fld;
if (fld in model.fields)
lbl = model.fields[fld].label;
else
{
var val = data[0][fld];
if (val && typeof val == "object")
{
if (model.includes && fld in model.includes)
var lbl = model.includes[fld].model.records_title;
else
lbl = fld; // Attachments/flexfiles
}
}
tds.push("<th title='{0}'>{1}</th>".format(safe.htmlattr(lbl), fld));
}
trs.push(tds.join(""));
@@ -616,19 +623,20 @@ api2_rest = {
var safeval = Server.HTMLEncode(String(val));
if (val === null)
safeval = '&nbsp;';
if (typeof val == 'object' && val instanceof Date)
else if (typeof val == 'object' && val instanceof Date)
safeval = toISODateTimeString(val);
if (val && typeof val == "object" && "id" in val)
{ // dereference
else if (val && typeof val == "object" && "id" in val)
{
var naam = val.name||"???";
if (typeof naam == 'object' && naam instanceof Date) // Bij appointment
naam = toISODateTimeString(naam);
safeval = val.id + " (" + Server.HTMLEncode(naam) + ")";
}
else if (val && typeof val == "object" && model.includes && fld in model.includes)
{ // dereference
safeval = api2_rest.json2htmltable(val, model.includes[fld].model, single)
}
safeval = api2_rest.json2htmltable(val, model.includes[fld].model, single); // dereference
else if (val instanceof Array) // attachments array
safeval = api2_rest.json2htmltable(val, model, single);
tds.push(safeval);
}
trs.push("<td>" + tds.join("</td><td>") + "</td>");