diff --git a/server/AyaNova/Controllers/FormSettingController.cs b/server/AyaNova/Controllers/FormUserOptionsController.cs similarity index 71% rename from server/AyaNova/Controllers/FormSettingController.cs rename to server/AyaNova/Controllers/FormUserOptionsController.cs index efeaacac..d1977d43 100644 --- a/server/AyaNova/Controllers/FormSettingController.cs +++ b/server/AyaNova/Controllers/FormUserOptionsController.cs @@ -14,13 +14,13 @@ namespace AyaNova.Api.Controllers { [ApiController] [ApiVersion("8.0")] - [Route("api/v{version:apiVersion}/form-setting")] + [Route("api/v{version:apiVersion}/form-user-options")] [Produces("application/json")] [Authorize] - public class FormSettingController : ControllerBase + public class FormUserOptionsController : ControllerBase { private readonly AyContext ct; - private readonly ILogger log; + private readonly ILogger log; private readonly ApiServerState serverState; /// @@ -29,7 +29,7 @@ namespace AyaNova.Api.Controllers /// /// /// - public FormSettingController(AyContext dbcontext, ILogger logger, ApiServerState apiServerState) + public FormUserOptionsController(AyContext dbcontext, ILogger logger, ApiServerState apiServerState) { ct = dbcontext; log = logger; @@ -37,40 +37,40 @@ namespace AyaNova.Api.Controllers } /// - /// Create FormSetting + /// Create FormUserOptions /// /// /// From route path /// [HttpPost] - public async Task PostFormSetting([FromBody] FormSetting newObject, ApiVersion apiVersion) + public async Task PostFormUserOptions([FromBody] FormUserOptions newObject, ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); - FormSettingBiz biz = FormSettingBiz.GetBiz(ct, HttpContext); + FormUserOptionsBiz biz = FormUserOptionsBiz.GetBiz(ct, HttpContext); if (!Authorized.HasCreateRole(HttpContext.Items, biz.BizType)) return StatusCode(403, new ApiNotAuthorizedResponse()); if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); - FormSetting o = await biz.CreateAsync(newObject); + FormUserOptions o = await biz.CreateAsync(newObject); if (o == null) return BadRequest(new ApiErrorResponse(biz.Errors)); else - return CreatedAtAction(nameof(FormSettingController.GetFormSetting), new { id = o.Id, version = apiVersion.ToString() }, new ApiCreatedResponse(o)); + return CreatedAtAction(nameof(FormUserOptionsController.GetFormUserOptions), new { id = o.Id, version = apiVersion.ToString() }, new ApiCreatedResponse(o)); } /// - /// Get FormSetting + /// Get FormUserOptions /// /// - /// FormSetting + /// FormUserOptions [HttpGet("{formKey}")] - public async Task GetFormSetting([FromRoute] string formKey) + public async Task GetFormUserOptions([FromRoute] string formKey) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); - FormSettingBiz biz = FormSettingBiz.GetBiz(ct, HttpContext); + FormUserOptionsBiz biz = FormUserOptionsBiz.GetBiz(ct, HttpContext); if (!Authorized.HasReadFullRole(HttpContext.Items, biz.BizType)) return StatusCode(403, new ApiNotAuthorizedResponse()); if (!ModelState.IsValid) @@ -81,18 +81,18 @@ namespace AyaNova.Api.Controllers } /// - /// Update FormSetting + /// Update FormUserOptions /// /// /// [HttpPut] - public async Task PutFormSetting([FromBody] FormSetting updatedObject) + public async Task PutFormUserOptions([FromBody] FormUserOptions updatedObject) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); - FormSettingBiz biz = FormSettingBiz.GetBiz(ct, HttpContext); + FormUserOptionsBiz biz = FormUserOptionsBiz.GetBiz(ct, HttpContext); if (!Authorized.HasModifyRole(HttpContext.Items, biz.BizType)) return StatusCode(403, new ApiNotAuthorizedResponse()); var o = await biz.PutAsync(updatedObject); @@ -107,18 +107,18 @@ namespace AyaNova.Api.Controllers } /// - /// Delete FormSetting + /// Delete FormUserOptions /// /// /// NoContent [HttpDelete("{formKey}")] - public async Task DeleteFormSetting([FromRoute] string formKey) + public async Task DeleteFormUserOptions([FromRoute] string formKey) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); - FormSettingBiz biz = FormSettingBiz.GetBiz(ct, HttpContext); + FormUserOptionsBiz biz = FormUserOptionsBiz.GetBiz(ct, HttpContext); if (!Authorized.HasDeleteRole(HttpContext.Items, biz.BizType)) return StatusCode(403, new ApiNotAuthorizedResponse()); if (!await biz.DeleteAsync(formKey)) diff --git a/server/AyaNova/biz/AyaType.cs b/server/AyaNova/biz/AyaType.cs index faac7afd..6a9e5453 100644 --- a/server/AyaNova/biz/AyaType.cs +++ b/server/AyaNova/biz/AyaType.cs @@ -23,7 +23,7 @@ namespace AyaNova.Biz NoType = 0, Global = 1, - FormSetting = 2, + FormUserOptions = 2, [CoreBizObject,ReportableBizObject] User = 3, ServerState = 4, diff --git a/server/AyaNova/biz/BizRoles.cs b/server/AyaNova/biz/BizRoles.cs index 7063854f..376038ac 100644 --- a/server/AyaNova/biz/BizRoles.cs +++ b/server/AyaNova/biz/BizRoles.cs @@ -776,11 +776,11 @@ namespace AyaNova.Biz }); //////////////////////////////////////////////////////////// - //FORMSETTING + //FORMUSEROPTIONS // Note: this is only ever modified by user personally // so it is accessible by all and biz rules //restrict to own userid - roles.Add(AyaType.FormSetting, new BizRoleSet() + roles.Add(AyaType.FormUserOptions, new BizRoleSet() { Change = AuthorizationRoles.All, ReadFullRecord = AuthorizationRoles.All @@ -910,7 +910,7 @@ namespace AyaNova.Biz //ONGOING VALIDATION TO CATCH MISMATCH WHEN NEW ROLES ADDED (wont' catch changes to existing unfortunately) - var lastRoles = "{\"Customer\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"CustomerNote\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Contract\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"HeadOffice\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"LoanUnit\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Part\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartInventory\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartWarehouse\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartAssembly\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PurchaseOrder\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartInventoryRequest\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartInventoryRestock\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartInventoryDataList\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartInventoryRequestDataList\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"Project\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"ServiceRate\":{\"Change\":74,\"ReadFullRecord\":33037,\"Select\":131071},\"TravelRate\":{\"Change\":74,\"ReadFullRecord\":33037,\"Select\":131071},\"TaxCode\":{\"Change\":66,\"ReadFullRecord\":98701,\"Select\":131071},\"Unit\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"UnitModel\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"UnitMeterReading\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Vendor\":{\"Change\":33130,\"ReadFullRecord\":65669,\"Select\":131071},\"TaskGroup\":{\"Change\":10,\"ReadFullRecord\":131071,\"Select\":131071},\"WorkOrderStatus\":{\"Change\":10,\"ReadFullRecord\":131071,\"Select\":131071},\"WorkOrderItemStatus\":{\"Change\":1354,\"ReadFullRecord\":105093,\"Select\":131071},\"WorkOrderItemPriority\":{\"Change\":1354,\"ReadFullRecord\":105093,\"Select\":131071},\"WorkOrder\":{\"Change\":1994,\"ReadFullRecord\":105093,\"Select\":131071},\"WorkOrderItem\":{\"Change\":330,\"ReadFullRecord\":105093,\"Select\":131071},\"WorkOrderItemExpense\":{\"Change\":458,\"ReadFullRecord\":98949,\"Select\":131071},\"WorkOrderItemLabor\":{\"Change\":1994,\"ReadFullRecord\":98949,\"Select\":131071},\"WorkOrderItemLoan\":{\"Change\":330,\"ReadFullRecord\":99461,\"Select\":131071},\"WorkOrderItemPart\":{\"Change\":330,\"ReadFullRecord\":99461,\"Select\":131071},\"WorkOrderItemPartRequest\":{\"Change\":330,\"ReadFullRecord\":99461,\"Select\":131071},\"WorkOrderItemScheduledUser\":{\"Change\":330,\"ReadFullRecord\":99973,\"Select\":131071},\"WorkOrderItemTask\":{\"Change\":1994,\"ReadFullRecord\":98949,\"Select\":131071},\"WorkOrderItemTravel\":{\"Change\":1994,\"ReadFullRecord\":98949,\"Select\":131071},\"WorkOrderItemUnit\":{\"Change\":330,\"ReadFullRecord\":99461,\"Select\":131071},\"WorkOrderItemOutsideService\":{\"Change\":330,\"ReadFullRecord\":98437,\"Select\":131071},\"Quote\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItem\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemExpense\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemLabor\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemLoan\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemPart\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemScheduledUser\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemTask\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemTravel\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemUnit\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemOutsideService\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteStatus\":{\"Change\":32778,\"ReadFullRecord\":131071,\"Select\":131071},\"PM\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItem\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemExpense\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemLabor\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemLoan\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemPart\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemScheduledUser\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemTask\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemTravel\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemUnit\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemOutsideService\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"Global\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":0},\"GlobalOps\":{\"Change\":16384,\"ReadFullRecord\":8192,\"Select\":0},\"User\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":131071},\"UserOptions\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":0},\"ServerState\":{\"Change\":16384,\"ReadFullRecord\":131071,\"Select\":0},\"License\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":0},\"TrialSeeder\":{\"Change\":16386,\"ReadFullRecord\":8193,\"Select\":0},\"LogFile\":{\"Change\":0,\"ReadFullRecord\":24576,\"Select\":0},\"Backup\":{\"Change\":16384,\"ReadFullRecord\":8195,\"Select\":0},\"FileAttachment\":{\"Change\":2,\"ReadFullRecord\":3,\"Select\":0},\"ServerJob\":{\"Change\":16384,\"ReadFullRecord\":8195,\"Select\":0},\"OpsNotificationSettings\":{\"Change\":16384,\"ReadFullRecord\":8195,\"Select\":0},\"ServerMetrics\":{\"Change\":16384,\"ReadFullRecord\":24576,\"Select\":0},\"Translation\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":131071},\"DataListSavedFilter\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"FormSetting\":{\"Change\":131071,\"ReadFullRecord\":131071,\"Select\":0},\"FormCustom\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"PickListTemplate\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"BizMetrics\":{\"Change\":2,\"ReadFullRecord\":98369,\"Select\":0},\"Notification\":{\"Change\":131071,\"ReadFullRecord\":131071,\"Select\":0},\"NotifySubscription\":{\"Change\":131071,\"ReadFullRecord\":131071,\"Select\":0},\"Report\":{\"Change\":3,\"ReadFullRecord\":131071,\"Select\":131071},\"CustomerServiceRequest\":{\"Change\":4106,\"ReadFullRecord\":2437,\"Select\":131071},\"Memo\":{\"Change\":124927,\"ReadFullRecord\":124927,\"Select\":124927},\"Reminder\":{\"Change\":124927,\"ReadFullRecord\":124927,\"Select\":124927},\"Review\":{\"Change\":124927,\"ReadFullRecord\":124927,\"Select\":124927}}"; + var lastRoles = "{\"Customer\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"CustomerNote\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Contract\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"HeadOffice\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"LoanUnit\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Part\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartInventory\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartWarehouse\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartAssembly\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PurchaseOrder\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartInventoryRequest\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartInventoryRestock\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartInventoryDataList\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"PartInventoryRequestDataList\":{\"Change\":98,\"ReadFullRecord\":29,\"Select\":131071},\"Project\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"ServiceRate\":{\"Change\":74,\"ReadFullRecord\":33037,\"Select\":131071},\"TravelRate\":{\"Change\":74,\"ReadFullRecord\":33037,\"Select\":131071},\"TaxCode\":{\"Change\":66,\"ReadFullRecord\":98701,\"Select\":131071},\"Unit\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"UnitModel\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"UnitMeterReading\":{\"Change\":33098,\"ReadFullRecord\":65669,\"Select\":131071},\"Vendor\":{\"Change\":33130,\"ReadFullRecord\":65669,\"Select\":131071},\"TaskGroup\":{\"Change\":10,\"ReadFullRecord\":131071,\"Select\":131071},\"WorkOrderStatus\":{\"Change\":10,\"ReadFullRecord\":131071,\"Select\":131071},\"WorkOrderItemStatus\":{\"Change\":1354,\"ReadFullRecord\":105093,\"Select\":131071},\"WorkOrderItemPriority\":{\"Change\":1354,\"ReadFullRecord\":105093,\"Select\":131071},\"WorkOrder\":{\"Change\":1994,\"ReadFullRecord\":105093,\"Select\":131071},\"WorkOrderItem\":{\"Change\":330,\"ReadFullRecord\":105093,\"Select\":131071},\"WorkOrderItemExpense\":{\"Change\":458,\"ReadFullRecord\":98949,\"Select\":131071},\"WorkOrderItemLabor\":{\"Change\":1994,\"ReadFullRecord\":98949,\"Select\":131071},\"WorkOrderItemLoan\":{\"Change\":330,\"ReadFullRecord\":99461,\"Select\":131071},\"WorkOrderItemPart\":{\"Change\":330,\"ReadFullRecord\":99461,\"Select\":131071},\"WorkOrderItemPartRequest\":{\"Change\":330,\"ReadFullRecord\":99461,\"Select\":131071},\"WorkOrderItemScheduledUser\":{\"Change\":330,\"ReadFullRecord\":99973,\"Select\":131071},\"WorkOrderItemTask\":{\"Change\":1994,\"ReadFullRecord\":98949,\"Select\":131071},\"WorkOrderItemTravel\":{\"Change\":1994,\"ReadFullRecord\":98949,\"Select\":131071},\"WorkOrderItemUnit\":{\"Change\":330,\"ReadFullRecord\":99461,\"Select\":131071},\"WorkOrderItemOutsideService\":{\"Change\":330,\"ReadFullRecord\":98437,\"Select\":131071},\"Quote\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItem\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemExpense\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemLabor\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemLoan\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemPart\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemScheduledUser\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemTask\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemTravel\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemUnit\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteItemOutsideService\":{\"Change\":32842,\"ReadFullRecord\":65541,\"Select\":131071},\"QuoteStatus\":{\"Change\":32778,\"ReadFullRecord\":131071,\"Select\":131071},\"PM\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItem\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemExpense\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemLabor\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemLoan\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemPart\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemScheduledUser\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemTask\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemTravel\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemUnit\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"PMItemOutsideService\":{\"Change\":10,\"ReadFullRecord\":65541,\"Select\":131071},\"Global\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":0},\"GlobalOps\":{\"Change\":16384,\"ReadFullRecord\":8192,\"Select\":0},\"User\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":131071},\"UserOptions\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":0},\"ServerState\":{\"Change\":16384,\"ReadFullRecord\":131071,\"Select\":0},\"License\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":0},\"TrialSeeder\":{\"Change\":16386,\"ReadFullRecord\":8193,\"Select\":0},\"LogFile\":{\"Change\":0,\"ReadFullRecord\":24576,\"Select\":0},\"Backup\":{\"Change\":16384,\"ReadFullRecord\":8195,\"Select\":0},\"FileAttachment\":{\"Change\":2,\"ReadFullRecord\":3,\"Select\":0},\"ServerJob\":{\"Change\":16384,\"ReadFullRecord\":8195,\"Select\":0},\"OpsNotificationSettings\":{\"Change\":16384,\"ReadFullRecord\":8195,\"Select\":0},\"ServerMetrics\":{\"Change\":16384,\"ReadFullRecord\":24576,\"Select\":0},\"Translation\":{\"Change\":2,\"ReadFullRecord\":1,\"Select\":131071},\"DataListSavedFilter\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"FormUserOptions\":{\"Change\":131071,\"ReadFullRecord\":131071,\"Select\":0},\"FormCustom\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"PickListTemplate\":{\"Change\":2,\"ReadFullRecord\":131071,\"Select\":0},\"BizMetrics\":{\"Change\":2,\"ReadFullRecord\":98369,\"Select\":0},\"Notification\":{\"Change\":131071,\"ReadFullRecord\":131071,\"Select\":0},\"NotifySubscription\":{\"Change\":131071,\"ReadFullRecord\":131071,\"Select\":0},\"Report\":{\"Change\":3,\"ReadFullRecord\":131071,\"Select\":131071},\"CustomerServiceRequest\":{\"Change\":4106,\"ReadFullRecord\":2437,\"Select\":131071},\"Memo\":{\"Change\":124927,\"ReadFullRecord\":124927,\"Select\":124927},\"Reminder\":{\"Change\":124927,\"ReadFullRecord\":124927,\"Select\":124927},\"Review\":{\"Change\":124927,\"ReadFullRecord\":124927,\"Select\":124927}}"; Dictionary lastRolesDeserialized = Newtonsoft.Json.JsonConvert.DeserializeObject>(lastRoles); if (lastRolesDeserialized.Count != roles.Count) { diff --git a/server/AyaNova/biz/FormSettingBiz.cs b/server/AyaNova/biz/FormUserOptionsBiz.cs similarity index 69% rename from server/AyaNova/biz/FormSettingBiz.cs rename to server/AyaNova/biz/FormUserOptionsBiz.cs index 2485828e..e878d59a 100644 --- a/server/AyaNova/biz/FormSettingBiz.cs +++ b/server/AyaNova/biz/FormUserOptionsBiz.cs @@ -9,44 +9,44 @@ namespace AyaNova.Biz //## This class manages personal form settings for users - internal class FormSettingBiz : BizObject + internal class FormUserOptionsBiz : BizObject { - internal FormSettingBiz(AyContext dbcontext, long currentUserId, long userTranslationId, AuthorizationRoles UserRoles) + internal FormUserOptionsBiz(AyContext dbcontext, long currentUserId, long userTranslationId, AuthorizationRoles UserRoles) { ct = dbcontext; UserId = currentUserId; UserTranslationId = userTranslationId; CurrentUserRoles = UserRoles; - BizType = AyaType.FormSetting; + BizType = AyaType.FormUserOptions; } - internal static FormSettingBiz GetBiz(AyContext ct, Microsoft.AspNetCore.Http.HttpContext httpContext = null) + internal static FormUserOptionsBiz GetBiz(AyContext ct, Microsoft.AspNetCore.Http.HttpContext httpContext = null) { if (httpContext != null) - return new FormSettingBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); + return new FormUserOptionsBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); else - return new FormSettingBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); + return new FormUserOptionsBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); } //////////////////////////////////////////////////////////////////////////////////////////////// //EXISTS internal async Task ExistsAsync(long id) { - return await ct.FormSetting.AnyAsync(z => z.Id == id); + return await ct.FormUserOptions.AnyAsync(z => z.Id == id); } //////////////////////////////////////////////////////////////////////////////////////////////// //CREATE // - internal async Task CreateAsync(FormSetting newObject) + internal async Task CreateAsync(FormUserOptions newObject) { Validate(newObject, null); if (HasErrors) return null; else { - newObject.Setting = JsonUtil.CompactJson(newObject.Setting); - await ct.FormSetting.AddAsync(newObject); + newObject.Options = JsonUtil.CompactJson(newObject.Options); + await ct.FormUserOptions.AddAsync(newObject); await ct.SaveChangesAsync(); return newObject; } @@ -57,16 +57,16 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //GET // - internal async Task GetAsync(string formKey) + internal async Task GetAsync(string formKey) { - var ret = await ct.FormSetting.AsNoTracking().SingleOrDefaultAsync(m => m.FormKey == formKey && m.UserId == UserId); + var ret = await ct.FormUserOptions.AsNoTracking().SingleOrDefaultAsync(m => m.FormKey == formKey && m.UserId == UserId); return ret; } //////////////////////////////////////////////////////////////////////////////////////////////// //UPDATE // - internal async Task PutAsync(FormSetting putObject) + internal async Task PutAsync(FormUserOptions putObject) { var dbObject = await GetAsync(putObject.FormKey); if (dbObject == null) @@ -80,7 +80,7 @@ namespace AyaNova.Biz return null; } - putObject.Setting = JsonUtil.CompactJson(putObject.Setting); + putObject.Options = JsonUtil.CompactJson(putObject.Options); Validate(putObject, dbObject); if (HasErrors) return null; ct.Replace(dbObject, putObject); @@ -116,7 +116,7 @@ namespace AyaNova.Biz ValidateCanDelete(dbObject); if (HasErrors) return false; - ct.FormSetting.Remove(dbObject); + ct.FormUserOptions.Remove(dbObject); await ct.SaveChangesAsync(); await transaction.CommitAsync(); return true; @@ -129,7 +129,7 @@ namespace AyaNova.Biz //VALIDATION // - private void Validate(FormSetting proposedObj, FormSetting currentObj) + private void Validate(FormUserOptions proposedObj, FormUserOptions currentObj) { if (proposedObj.UserId != UserId) { @@ -137,7 +137,7 @@ namespace AyaNova.Biz } } - private void ValidateCanDelete(FormSetting inObj) + private void ValidateCanDelete(FormUserOptions inObj) { if (inObj.UserId != UserId) { diff --git a/server/AyaNova/models/AyContext.cs b/server/AyaNova/models/AyContext.cs index 7b4ee02e..887d5cd6 100644 --- a/server/AyaNova/models/AyContext.cs +++ b/server/AyaNova/models/AyContext.cs @@ -25,7 +25,7 @@ namespace AyaNova.Models public virtual DbSet DataListColumnView { get; set; } public virtual DbSet Tag { get; set; } public virtual DbSet FormCustom { get; set; } - public virtual DbSet FormSetting { get; set; } + public virtual DbSet FormUserOptions { get; set; } public virtual DbSet PickListTemplate { get; set; } public virtual DbSet License { get; set; } public virtual DbSet Memo { get; set; } diff --git a/server/AyaNova/models/FormCustom.cs b/server/AyaNova/models/FormCustom.cs index 30fe4840..5ffef907 100644 --- a/server/AyaNova/models/FormCustom.cs +++ b/server/AyaNova/models/FormCustom.cs @@ -7,7 +7,7 @@ namespace AyaNova.Models ## NOTE: there is only one formcustom per ayatype, the formkey is the ayatype enum name This is a *GLOBAL* setting that applies to ALL users - for personal form settings (such as used by schedule form) see FormSetting.cs + for personal form settings (such as used by schedule form) see FormUserOptions.cs - Like DataFilter, holds a JSON fragment in one field and the form key in another field - JSON FRAGMENT holds items that differ from stock, Hide not valid for non hideable core fields diff --git a/server/AyaNova/models/FormSetting.cs b/server/AyaNova/models/FormUserOptions.cs similarity index 82% rename from server/AyaNova/models/FormSetting.cs rename to server/AyaNova/models/FormUserOptions.cs index 410c43e1..13c5531d 100644 --- a/server/AyaNova/models/FormSetting.cs +++ b/server/AyaNova/models/FormUserOptions.cs @@ -8,7 +8,7 @@ namespace AyaNova.Models */ - public class FormSetting + public class FormUserOptions { public long Id { get; set; } public uint Concurrency { get; set; } @@ -16,7 +16,7 @@ namespace AyaNova.Models [Required, MaxLength(255)] public string FormKey { get; set; }//max 255 characters ascii set [Required] - public string Setting { get; set; }//JSON fragment of form customization template, top level is array. + public string Options { get; set; }//JSON fragment of form customization template, top level is array. [Required] public long UserId {get;set;} diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index 0edfbf4c..8902e803 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -368,7 +368,7 @@ BEGIN case ayatype when 0 then return 'LT:NoType'; when 1 then return 'LT:Global'; - when 2 then return 'FormSetting'; + when 2 then return 'FormUserOptions'; when 3 then aytable = 'auser'; when 4 then return 'LT:ServerState'; when 5 then return 'LT:License'; @@ -517,8 +517,8 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); await ExecQueryAsync("CREATE TABLE atag (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL UNIQUE, refcount BIGINT NOT NULL)"); - await ExecQueryAsync("CREATE TABLE aformsetting (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, " - + "userid BIGINT NOT NULL REFERENCES auser ON DELETE CASCADE, formkey VARCHAR(255) NOT NULL, setting TEXT NOT NULL)"); + await ExecQueryAsync("CREATE TABLE aformuseroptions (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, " + + "userid BIGINT NOT NULL REFERENCES auser ON DELETE CASCADE, formkey VARCHAR(255) NOT NULL, options TEXT NOT NULL)"); await ExecQueryAsync("CREATE TABLE aformcustom (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, " + "formkey VARCHAR(255) NOT NULL, template TEXT, UNIQUE(formkey))");