From 831535e389a9b32cb8f42cf6939d54044c3adf44 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 19 Aug 2021 22:49:55 +0000 Subject: [PATCH] --- server/AyaNova/biz/BizRoles.cs | 16 +++++++++++++--- server/AyaNova/biz/FormFieldReference.cs | 11 +++++++++-- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/server/AyaNova/biz/BizRoles.cs b/server/AyaNova/biz/BizRoles.cs index 94f661cf..e9be4b67 100644 --- a/server/AyaNova/biz/BizRoles.cs +++ b/server/AyaNova/biz/BizRoles.cs @@ -357,6 +357,16 @@ namespace AyaNova.Biz Select = AuthorizationRoles.All }); + //////////////////////////////////////////////////////////// + //UnitMeterReading - same as unit + // + roles.Add(AyaType.UnitMeterReading, new BizRoleSet() + { + Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Service | AuthorizationRoles.Sales | AuthorizationRoles.Tech | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.ServiceRestricted | AuthorizationRoles.SalesRestricted | AuthorizationRoles.TechRestricted, + Select = AuthorizationRoles.All + }); + //////////////////////////////////////////////////////////// //Vendor // @@ -862,9 +872,9 @@ namespace AyaNova.Biz //GENERATE CLIENT COMPATIBLE JSON FROM ROLES OUTPUT TO DEBUG LOG //And seperately, set the JSON variable so can copy from debug variable "value" property for lastRoles here to compare - // string json = Newtonsoft.Json.JsonConvert.SerializeObject(roles, Newtonsoft.Json.Formatting.None); - // System.Diagnostics.Debugger.Log(1, "JSONFRAGMENTFORCLIENT", "BizRoles.cs -> biz-role-rights.js Client roles JSON fragment:\n\n"); - // System.Diagnostics.Debugger.Log(1, "JSONFRAGMENTFORCLIENT", json + "\n\n"); + string json = Newtonsoft.Json.JsonConvert.SerializeObject(roles, Newtonsoft.Json.Formatting.None); + System.Diagnostics.Debugger.Log(1, "JSONFRAGMENTFORCLIENT", "BizRoles.cs -> biz-role-rights.js Client roles JSON fragment:\n\n"); + System.Diagnostics.Debugger.Log(1, "JSONFRAGMENTFORCLIENT", json + "\n\n"); //ONGOING VALIDATION TO CATCH MISMATCH WHEN NEW ROLES ADDED (wont' catch changes to existing unfortunately) diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index 08e5ee9d..f6c8adf2 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -39,6 +39,7 @@ namespace AyaNova.Biz _formFieldKeys.Add(AyaType.WorkOrderStatus.ToString()); _formFieldKeys.Add(AyaType.WorkOrderItemStatus.ToString()); _formFieldKeys.Add(AyaType.WorkOrderItemPriority.ToString()); + _formFieldKeys.Add(AyaType.UnitMeterReading.ToString()); } return _formFieldKeys; } @@ -1388,7 +1389,13 @@ namespace AyaNova.Biz _formFields.Add(AyaType.WorkOrderItemPriority.ToString(), l); } #endregion - + + #region UnitmeterReading + { + List l = new List(); + _formFields.Add(AyaType.UnitMeterReading.ToString(), l); + } + #endregion @@ -1400,7 +1407,7 @@ namespace AyaNova.Biz List l = new List(); //Several mandatory fields in PM header not listed here - + l.Add(new FormField { TKey = "CopyAttachments", FieldKey = "CopyAttachments" }); l.Add(new FormField { TKey = "CopyWiki", FieldKey = "CopyWiki" });