diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index c3ff7078..2d309b9c 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -31,7 +31,7 @@ namespace AyaNova.Biz return new WorkOrderBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdminFull); } - #region Workorder level + #region WorkOrder level //////////////////////////////////////////////////////////////////////////////////////////////// //EXISTS @@ -103,10 +103,10 @@ namespace AyaNova.Biz //docs say this will not query twice but will recognize the duplicate woitem bit which is required for multiple grandchild collections var ret = await ct.WorkOrder - .Include(w => w.WorkorderItems) - .ThenInclude(wi => wi.WorkorderItemLabors) - .Include(w => w.WorkorderItems) - .ThenInclude(wi => wi.WorkorderItemParts) + .Include(w => w.WorkOrderItems) + .ThenInclude(wi => wi.WorkOrderItemLabors) + .Include(w => w.WorkOrderItems) + .ThenInclude(wi => wi.WorkOrderItemParts) .SingleOrDefaultAsync(m => m.Id == id); if (logTheGetEvent && ret != null) await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, BizType, AyaEvent.Retrieved), ct); @@ -312,8 +312,8 @@ namespace AyaNova.Biz //docs say this will not query twice but will recognize the duplicate woitem bit which is required for multiple grandchild collections var ret = await ct.WorkOrderItem - .Include(wi => wi.WorkorderItemLabors) - .Include(wi => wi.WorkorderItemParts) + .Include(wi => wi.WorkOrderItemLabors) + .Include(wi => wi.WorkOrderItemParts) .SingleOrDefaultAsync(m => m.Id == id); if (logTheGetEvent && ret != null) await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, id, AyaType.WorkOrderItem, AyaEvent.Retrieved), ct); @@ -330,11 +330,11 @@ namespace AyaNova.Biz bool isNew = currentObj == null; //does it have a valid workorder id - if (proposedObj.WorkorderId == 0) - AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkorderId"); - else if (!await WorkOrderExistsAsync(proposedObj.WorkorderId)) + if (proposedObj.WorkOrderId == 0) + AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkOrderId"); + else if (!await WorkOrderExistsAsync(proposedObj.WorkOrderId)) { - AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkorderId"); + AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkOrderId"); } //Any form customizations to validate? @@ -435,11 +435,11 @@ namespace AyaNova.Biz //run validation and biz rules bool isNew = currentObj == null; - if (proposedObj.WorkorderItemId == 0) - AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkorderItemId"); - else if (!await ItemExistsAsync(proposedObj.WorkorderItemId)) + if (proposedObj.WorkOrderItemId == 0) + AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkOrderItemId"); + else if (!await ItemExistsAsync(proposedObj.WorkOrderItemId)) { - AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkorderItemId"); + AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkOrderItemId"); } //Any form customizations to validate? @@ -541,11 +541,11 @@ namespace AyaNova.Biz //run validation and biz rules bool isNew = currentObj == null; - if (proposedObj.WorkorderItemId == 0) - AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkorderItemId"); - else if (!await ItemExistsAsync(proposedObj.WorkorderItemId)) + if (proposedObj.WorkOrderItemId == 0) + AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkOrderItemId"); + else if (!await ItemExistsAsync(proposedObj.WorkOrderItemId)) { - AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkorderItemId"); + AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkOrderItemId"); } //Any form customizations to validate? diff --git a/server/AyaNova/models/WorkOrder.cs b/server/AyaNova/models/WorkOrder.cs index cabb0582..a821351e 100644 --- a/server/AyaNova/models/WorkOrder.cs +++ b/server/AyaNova/models/WorkOrder.cs @@ -34,7 +34,7 @@ namespace AyaNova.Models Tags = new List(); //dependents - WorkorderItems = new List(); + WorkOrderItems = new List(); } public long Id { get; set; } @@ -49,7 +49,7 @@ namespace AyaNova.Models public List Tags { get; set; } //dependents - public List WorkorderItems { get; set; } + public List WorkOrderItems { get; set; } // [NotMapped] diff --git a/server/AyaNova/models/WorkOrderItem.cs b/server/AyaNova/models/WorkOrderItem.cs index 7deb287b..b4f4d830 100644 --- a/server/AyaNova/models/WorkOrderItem.cs +++ b/server/AyaNova/models/WorkOrderItem.cs @@ -20,7 +20,7 @@ namespace AyaNova.Models //Principle [Required] - public long WorkorderId { get; set; } + public long WorkOrderId { get; set; } }//eoc public class WorkOrderItem @@ -29,8 +29,8 @@ namespace AyaNova.Models { Tags = new List(); //dependents - WorkorderItemLabors = new List(); - WorkorderItemParts = new List(); + WorkOrderItemLabors = new List(); + WorkOrderItemParts = new List(); } public long Id { get; set; } public uint ConcurrencyToken { get; set; } @@ -41,13 +41,13 @@ namespace AyaNova.Models //Principle [Required] - public long WorkorderId { get; set; } + public long WorkOrderId { get; set; } [JsonIgnore] public WorkOrder WorkOrder { get; set; } //dependents - public List WorkorderItemLabors { get; set; } - public List WorkorderItemParts { get; set; } + public List WorkOrderItemLabors { get; set; } + public List WorkOrderItemParts { get; set; } }//eoc }//eons diff --git a/server/AyaNova/models/WorkOrderItemLabor.cs b/server/AyaNova/models/WorkOrderItemLabor.cs index d83c9f87..be3deb44 100644 --- a/server/AyaNova/models/WorkOrderItemLabor.cs +++ b/server/AyaNova/models/WorkOrderItemLabor.cs @@ -21,7 +21,7 @@ namespace AyaNova.Models //Principle [Required] - public long WorkorderItemId { get; set; }//fk + public long WorkOrderItemId { get; set; }//fk [JsonIgnore]//Avoid circular reference when serializing public WorkOrderItem WorkOrderItem { get; set; } diff --git a/server/AyaNova/models/WorkOrderItemPart.cs b/server/AyaNova/models/WorkOrderItemPart.cs index b00d368b..3ea61004 100644 --- a/server/AyaNova/models/WorkOrderItemPart.cs +++ b/server/AyaNova/models/WorkOrderItemPart.cs @@ -21,7 +21,7 @@ namespace AyaNova.Models //Principle [Required] - public long WorkorderItemId { get; set; }//fk + public long WorkOrderItemId { get; set; }//fk [JsonIgnore]//Avoid circular reference when serializing public WorkOrderItem WorkOrderItem { get; set; }