server/AyaNova/biz/QuoteBiz.cs

@@ -790,7 +790,7 @@ namespace AyaNova.Biz
         ////////////////////////////////////////////////////////////////////////////////////////////////
         //REPORTING
         //
-        public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, DateTime renderTimeOutExpiry)
+        public async Task<JArray> GetReportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
         {
             //quote reports for entire quote or just sub parts all go through here
             //if the ayatype is a descendant of the quote then only the portion of the quote from that descendant directly up to the header will be populated and returned
@@ -809,8 +809,7 @@ namespace AyaNova.Biz
 
                 foreach (Quote w in batchResults)
                 {
-                    if (DateTime.UtcNow > renderTimeOutExpiry)
-                        throw new ReportRenderTimeOutException();
+                    if (!ReportRenderManager.KeepGoing(jobId)) return null;
                     var jo = JObject.FromObject(w);
 
                     //Quote header custom fields 
@@ -979,11 +978,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);
         }