From 90508ab6b28fca1d212882c34bf50c01105984fa Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 3 May 2021 23:49:20 +0000 Subject: [PATCH] --- .../WorkOrderItemStatusController.cs | 39 +++++++------------ server/AyaNova/biz/WorkOrderItemStatusBiz.cs | 4 +- server/AyaNova/biz/WorkOrderStatusBiz.cs | 4 +- 3 files changed, 19 insertions(+), 28 deletions(-) diff --git a/server/AyaNova/Controllers/WorkOrderItemStatusController.cs b/server/AyaNova/Controllers/WorkOrderItemStatusController.cs index 61e1b96d..7ddc406a 100644 --- a/server/AyaNova/Controllers/WorkOrderItemStatusController.cs +++ b/server/AyaNova/Controllers/WorkOrderItemStatusController.cs @@ -152,30 +152,21 @@ namespace AyaNova.Api.Controllers - // /// - // /// Get Status list - // /// - // /// List in alphabetical order of all work order status items - // [HttpGet("list")] - // public async Task StatusList() - // { - // if (!serverState.IsOpen) - // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); - // if (!Authorized.HasSelectRole(HttpContext.Items, AyaType.WorkOrderItemStatus)) - // return StatusCode(403, new ApiNotAuthorizedResponse()); - // var allStates = await ct.WorkOrderItemStatus.AsNoTracking().OrderBy(z => z.Name).ToListAsync(); - // var currentUserRoles = UserRolesFromContext.Roles(HttpContext.Items); - // var allowedStates = allStates.Where(z => currentUserRoles.HasAnyFlags(z.SelectRoles)).ToList(); - - // // foreach (var item in rpts) - // // { - // // if (CurrentUserRoles.HasAnyFlags(item.roles)) - // // { - // // ret.Add(new NameIdItem() { Name = item.name, Id = item.id }); - // // } - // // } - // return Ok(ApiOkResponse.Response(new { all = allStates, allowed = allowedStates })); - // } + /// + /// Get Status list + /// + /// List in alphabetical order of all WorkOrderItem status items + [HttpGet("list")] + public async Task StatusList() + { + if (!serverState.IsOpen) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); + if (!Authorized.HasSelectRole(HttpContext.Items, AyaType.WorkOrderItemStatus)) + return StatusCode(403, new ApiNotAuthorizedResponse()); + var allStates = await ct.WorkOrderItemStatus.AsNoTracking().OrderBy(z => z.Name).ToListAsync(); + + return Ok(ApiOkResponse.Response(allStates)); + } //------------ diff --git a/server/AyaNova/biz/WorkOrderItemStatusBiz.cs b/server/AyaNova/biz/WorkOrderItemStatusBiz.cs index 2b087d69..84531c0f 100644 --- a/server/AyaNova/biz/WorkOrderItemStatusBiz.cs +++ b/server/AyaNova/biz/WorkOrderItemStatusBiz.cs @@ -231,8 +231,8 @@ namespace AyaNova.Biz await Task.CompletedTask; //Referential integrity //FOREIGN KEY CHECKS - // if (await ct.PurchaseOrder.AnyAsync(m => m.WorkOrderItemStatusId == inObj.Id)) - // AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("PurchaseOrder")); + if (await ct.WorkOrderItem.AnyAsync(m => m.WorkorderItemStatusId == inObj.Id)) + AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("WorkOrderItem")); } diff --git a/server/AyaNova/biz/WorkOrderStatusBiz.cs b/server/AyaNova/biz/WorkOrderStatusBiz.cs index fd3d1b50..7de7cd62 100644 --- a/server/AyaNova/biz/WorkOrderStatusBiz.cs +++ b/server/AyaNova/biz/WorkOrderStatusBiz.cs @@ -231,8 +231,8 @@ namespace AyaNova.Biz await Task.CompletedTask; //Referential integrity //FOREIGN KEY CHECKS - // if (await ct.PurchaseOrder.AnyAsync(m => m.WorkOrderStatusId == inObj.Id)) - // AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("PurchaseOrder")); + if (await ct.WorkOrderState.AnyAsync(m => m.WorkOrderStatusId == inObj.Id)) + AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("WorkOrderStatus")); }