This commit is contained in:
@@ -294,7 +294,7 @@ namespace AyaNova.Biz
|
||||
//REMEMBER: there is a name display format system and it should honour that so that the report
|
||||
//displays a user the same as it would display in the UI in an input form, no surprises
|
||||
|
||||
JArray j = new JArray();
|
||||
JArray ReportData = new JArray();
|
||||
while (idList.Any())
|
||||
{
|
||||
var batch = idList.Take(IReportAbleObject.REPORT_DATA_BATCH_SIZE);
|
||||
@@ -305,10 +305,12 @@ namespace AyaNova.Biz
|
||||
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
|
||||
foreach (Widget w in orderedList)
|
||||
{
|
||||
j.Add(JObject.FromObject(w));
|
||||
var jo=JObject.FromObject(w);
|
||||
jo["CustomFields"]=JObject.Parse((string)jo["CustomFields"]);
|
||||
ReportData.Add(jo);
|
||||
}
|
||||
}
|
||||
return j;
|
||||
return ReportData;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -9,14 +9,7 @@ async function ayPreRender(ayAllData) {
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
"AYMETA": {
|
||||
"ayReportMetaData": { "Id": 1, "Name": "report translation test", "Notes": "", "ObjectType": "Widget", "DataListKey": "", "ListView":"", "SelectedRowIds": "90" },
|
||||
"ayClientMetaData": {
|
||||
"UserName": "AyaNova SuperUser",
|
||||
"Authorization": "BearereyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOiIxNjAwMjYzOTEzIiwiaXNzIjoiYXlhbm92YS5jb20iLCJpZCI6IjEifQ.NGpDgg8mf54oTU8fyExBf1yXnsaIaHedGFmKLKlNCZ4",
|
||||
"TimeZoneName": "America/Los_Angeles", "LanguageName": "en-US", "Hour12": true, "CurrencyName": "USD", "DefaultLocale": "en" }
|
||||
*/
|
||||
|
||||
|
||||
///////////////////////////////////////
|
||||
// Set our stock handlebars helpers
|
||||
|
||||
Reference in New Issue
Block a user