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

Browse Source
This commit is contained in:
John Cardinal
2021-01-30 16:24:13 +00:00
parent 0e8b90a778
commit b5ddfb211d
7 changed files with 103 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/AyaNova/biz/ReportBiz.cs
View File

@@ -344,9 +344,7 @@ namespace AyaNova.Biz
}
//Do we need to rehydrate the ID List from a DataList?
// if (dataListSelection.SelectedRowIds.Length == 0)
// dataListSelection.SelectedRowIds = await AyaNova.DataList.DataListFetcher.GetIdListResponseAsync(dataListSelection.DataListKey, dataListSelection.ListView, dataListSelection.MetaView, ct, effectiveRoles, log, UserId);
if(selectedRequest.SelectedRowIds.Length==0)
if (selectedRequest.SelectedRowIds.Length == 0)
selectedRequest.SelectedRowIds = await DataListSelectedProcessingOptions.RehydrateIdList(selectedRequest, ct, effectiveRoles, log, UserId, UserTranslationId);
@@ -405,7 +403,7 @@ namespace AyaNova.Biz
// ListView = reportParam.ListView,
// MetaView = reportParam.MetaView
// });
var ReportData= await GetReportData(reportParam);
var ReportData = await GetReportData(reportParam);
//initialization
log.LogDebug("Initializing report system");
@@ -557,8 +555,8 @@ namespace AyaNova.Biz
}
//Report meta data
// var reportMeta = $"{{Id:{report.Id},Name:`{report.Name}`,Notes:`{report.Notes}`,ObjectType:`{report.ObjectType}`,CustomFieldsDefinition:{CustomFieldsTemplate},DataListKey:`{reportParam.DataListKey}`,ListView:`{reportParam.ListView}`,SelectedRowIds: `{string.Join(",", reportParam.SelectedRowIds)}`}}";
//removed listview as it no longer exists and I don't think there's any useful purpose to it in the report javascript at this time
// var reportMeta = $"{{Id:{report.Id},Name:`{report.Name}`,Notes:`{report.Notes}`,ObjectType:`{report.ObjectType}`,CustomFieldsDefinition:{CustomFieldsTemplate},DataListKey:`{reportParam.DataListKey}`,ListView:`{reportParam.ListView}`,SelectedRowIds: `{string.Join(",", reportParam.SelectedRowIds)}`}}";
//removed listview as it no longer exists and I don't think there's any useful purpose to it in the report javascript at this time
var reportMeta = $"{{Id:{report.Id},Name:`{report.Name}`,Notes:`{report.Notes}`,ObjectType:`{report.ObjectType}`,CustomFieldsDefinition:{CustomFieldsTemplate},DataListKey:`{reportParam.DataListKey}`,SelectedRowIds: `{string.Join(",", reportParam.SelectedRowIds)}`}}";