From fe851a78c970d0464daed7943fa102a677a6cb3a Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 28 Dec 2021 16:24:36 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/ReportBiz.cs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/server/AyaNova/biz/ReportBiz.cs b/server/AyaNova/biz/ReportBiz.cs
index c680d000..b5c5ff5b 100644
--- a/server/AyaNova/biz/ReportBiz.cs
+++ b/server/AyaNova/biz/ReportBiz.cs
@@ -285,7 +285,7 @@ namespace AyaNova.Biz
         //REPORT DATA
         //Data fetched to return to report render or for designer for Client report design usage
 
- public async Task<Newtonsoft.Json.Linq.JArray> GetReportDataForReportDesigner(DataListSelectedRequest selectedRequest)
+        public async Task<Newtonsoft.Json.Linq.JArray> GetReportDataForReportDesigner(DataListSelectedRequest selectedRequest)
         {
             var log = AyaNova.Util.ApplicationLogging.CreateLogger("ReportBiz::GetReportDataForReportDesigner");
             AuthorizationRoles effectiveRoles = CurrentUserRoles;
@@ -295,12 +295,12 @@ namespace AyaNova.Biz
                 AddError(ApiErrorCode.VALIDATION_REQUIRED, null, $"AType is required");
                 return null;
             }
-         
+
             //Do we need to rehydrate the ID List from a DataList?
             if (selectedRequest.SelectedRowIds.Length == 0)
                 selectedRequest.SelectedRowIds = await DataListSelectedProcessingOptions.RehydrateIdList(selectedRequest, ct, effectiveRoles, log, UserId, UserTranslationId);
 
-         
+
             log.LogDebug($"Instantiating biz object handler for {selectedRequest.AType}");
             var biz = BizObjectFactory.GetBizObject(selectedRequest.AType, ct, UserId, CurrentUserRoles, UserTranslationId);
             log.LogDebug($"Fetching data for {selectedRequest.SelectedRowIds.Length} {selectedRequest.AType} items");
@@ -815,10 +815,13 @@ namespace AyaNova.Biz
                     {
                         log.LogInformation($"Exception caught while rendering report \"{report.Name}\", report Page console log:");
                         log.LogInformation(PageLog.ToString());
-                        await JobsBiz.LogJobAsync(job.GId, $"rendererror:exception,\"{PageLog.ToString()}\"");//parseable for print client
+                        await JobsBiz.LogJobAsync(job.GId, $"{{\"rendererror\":{{\"pagelog\":\"{PageLog.ToString()}\",\"exception\":\"{ExceptionUtil.ExtractAllExceptionMessages(ex)}\"}}}}");
                     }
-
-                    await JobsBiz.LogJobAsync(job.GId, $"rendererror:exception,\"{ExceptionUtil.ExtractAllExceptionMessages(ex)}\"");//parseable for print client
+                    else
+                    {
+                        await JobsBiz.LogJobAsync(job.GId, $"{{\"rendererror\":{{\"pagelog\":null,\"exception\":\"{ExceptionUtil.ExtractAllExceptionMessages(ex)}\"}}}}");                       
+                    }
+                    
                     await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Failed);
 
                     // var v=await page.GetContentAsync();//for debugging purposes
@@ -845,7 +848,7 @@ namespace AyaNova.Biz
             static async Task HandleTimeOut(OpsJob job, ILogger log, DataListReportRequest reportRequest, string userName)
             {
                 log.LogDebug($"Report render cancelled by user OR exceeded timeout setting of {ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT} minutes, report id: {reportRequest.ReportId}, record count:{reportRequest.SelectedRowIds.LongLength}, user:{userName}");
-                await JobsBiz.LogJobAsync(job.GId, $"rendererror:timeout,{ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT}");//parseable for print client
+                await JobsBiz.LogJobAsync(job.GId, $"{{\"rendererror\":{{\"timeout\":\"true\",\"timeoutsetting\":\"{ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT}\"}}}}");                   
                 await JobsBiz.UpdateJobStatusAsync(job.GId, JobStatus.Failed);
             }
         }