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-12-28 00:44:27 +00:00
parent 09538483d3
commit 075747b5b9
44 changed files with 197 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/AyaNova/biz/ContractBiz.cs
View File

@@ -480,7 +480,7 @@ MULTIPLE discount / markup ITEMS
////////////////////////////////////////////////////////////////////////////////////////////////
//REPORTING
//
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
var idList = dataListSelectedRequest.SelectedRowIds;
JArray ReportData = new JArray();
@@ -510,8 +510,7 @@ MULTIPLE discount / markup ITEMS
var PreTrans = await TranslationBiz.GetSubsetStaticAsync(new List<string> { "TimeSpanDays", "TimeSpanHours", "TimeSpanMinutes", "TimeSpanSeconds" }, UserTranslationId);
foreach (Contract w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w, ContractOverrideTypeEnumList, PreTrans);
var jo = JObject.FromObject(w);
if (!JsonUtil.JTokenIsNullOrEmpty(jo["CustomFields"]))
@@ -560,11 +559,11 @@ MULTIPLE discount / markup ITEMS
// IMPORT EXPORT
//
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, renderTimeOutExpiry);
return await GetReportData(dataListSelectedRequest, jobId);
}