From 13c4f56dc2febb5c68900a653c232308b353bffd Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Sun, 27 Feb 2022 17:20:47 +0000 Subject: [PATCH] --- server/AyaNova/kpi/KPIFetcher.cs | 18 ++++++++++++------ .../kpi/WorkOrderItemLaborQuantitySummary.cs | 7 ++++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/server/AyaNova/kpi/KPIFetcher.cs b/server/AyaNova/kpi/KPIFetcher.cs index 1319dd1f..f9680119 100644 --- a/server/AyaNova/kpi/KPIFetcher.cs +++ b/server/AyaNova/kpi/KPIFetcher.cs @@ -52,7 +52,7 @@ namespace AyaNova.KPI JArray jData = new JArray(); - string sMeta = string.Empty; + string sMeta = null; #if (DEBUG && AYSHOWKPIQUERYINFO) System.Diagnostics.Stopwatch stopWatch = new System.Diagnostics.Stopwatch(); @@ -133,11 +133,17 @@ namespace AyaNova.KPI throw new System.Exception("KPIFetcher:GetResponseAsync - unexpected failure see log"); } - return JObject.FromObject(new - { - meta = JObject.Parse(sMeta), - data = jData - }); + if (!string.IsNullOrWhiteSpace(sMeta)) + return JObject.FromObject(new + { + meta = JObject.Parse(sMeta), + data = jData + }); + else + return JObject.FromObject(new + { + data = jData + }); } } diff --git a/server/AyaNova/kpi/WorkOrderItemLaborQuantitySummary.cs b/server/AyaNova/kpi/WorkOrderItemLaborQuantitySummary.cs index 8c406e54..17a3065f 100644 --- a/server/AyaNova/kpi/WorkOrderItemLaborQuantitySummary.cs +++ b/server/AyaNova/kpi/WorkOrderItemLaborQuantitySummary.cs @@ -48,9 +48,10 @@ namespace AyaNova.KPI GROUP BY x ORDER BY x ASC ) t"; - _metaQuery = @"SELECT row_to_json(t) as res from ( - select name from auser where id = 10 - ) t"; + _metaQuery = string.Empty; + // @"SELECT row_to_json(t) as res from ( + // select name from auser where id = 10 + // ) t"; }