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/UnitMeterReadingBiz.cs
View File

@@ -142,7 +142,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//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();
@@ -156,8 +156,7 @@ namespace AyaNova.Biz
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
foreach (UnitMeterReading w in orderedList)
{
if (DateTime.UtcNow > renderTimeOutExpiry)
throw new ReportRenderTimeOutException();
if (!ReportRenderManager.KeepGoing(jobId)) return null;
await PopulateVizFields(w);
var jo = JObject.FromObject(w);
ReportData.Add(jo);
@@ -180,11 +179,11 @@ namespace AyaNova.Biz
// 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);
}