diff --git a/server/AyaNova/kpi/KPIFetcher.cs b/server/AyaNova/kpi/KPIFetcher.cs index b14c4ffe..dbdc6b77 100644 --- a/server/AyaNova/kpi/KPIFetcher.cs +++ b/server/AyaNova/kpi/KPIFetcher.cs @@ -51,7 +51,7 @@ namespace AyaNova.KPI } - System.Text.StringBuilder sbData = new System.Text.StringBuilder(); + JArray jData = new JArray(); string sMeta = string.Empty; #if (DEBUG && AYSHOWKPIQUERYINFO) @@ -82,7 +82,7 @@ namespace AyaNova.KPI { //only one column and it's the zeroth json string column if (!dr.IsDBNull(0)) - sbData.Append(dr.GetString(0)); + jData.Add(JObject.Parse(dr.GetString(0))); } } @@ -135,8 +135,8 @@ namespace AyaNova.KPI return JObject.FromObject(new { - meta = sMeta, - data = sbData + meta = JObject.Parse(sMeta), + data = jData }); } } diff --git a/server/AyaNova/kpi/WorkOrderItemLaborQuantitySummary.cs b/server/AyaNova/kpi/WorkOrderItemLaborQuantitySummary.cs index 45ad620b..a83de5ce 100644 --- a/server/AyaNova/kpi/WorkOrderItemLaborQuantitySummary.cs +++ b/server/AyaNova/kpi/WorkOrderItemLaborQuantitySummary.cs @@ -1,8 +1,4 @@ -using System.Collections.Generic; -using Newtonsoft.Json.Linq; using AyaNova.Biz; -using System.Linq; -using System; namespace AyaNova.KPI { @@ -12,7 +8,7 @@ namespace AyaNova.KPI private string _dataQuery = null; private string _errorMessage = null; - public AuthorizationRoles AllowedRoles { get => BizRoles.GetRoleSet(AyaType.WorkOrderItemLabor).ReadFullRecord; } + public AuthorizationRoles AllowedRoles { get => AuthorizationRoles.Tech | AuthorizationRoles.TechRestricted; } public string MetaQuery => _metaQuery; public string DataQuery => _dataQuery;