diff --git a/server/AyaNova/biz/CustomerServiceRequestBiz.cs b/server/AyaNova/biz/CustomerServiceRequestBiz.cs index c4666d52..d9e39d0f 100644 --- a/server/AyaNova/biz/CustomerServiceRequestBiz.cs +++ b/server/AyaNova/biz/CustomerServiceRequestBiz.cs @@ -356,10 +356,10 @@ namespace AyaNova.Biz o.UnitViz = await ct.Unit.AsNoTracking().Where(x => x.Id == o.UnitId).Select(x => x.Serial).FirstOrDefaultAsync(); o.CustomerViz = await ct.Customer.AsNoTracking().Where(x => x.Id == o.CustomerId).Select(x => x.Name).FirstOrDefaultAsync(); - //MIGRATE_OUTSTANDING routine to get wo id from the WorkorderItemId - o.WorkorderItemViz = "MIGRATE_OUTSTANDING woitem display value"; - // if (o.WorkorderItemId != null) - // o.WorkorderItemViz = await ct.WorkorderItem.AsNoTracking().Where(x=>x.Id==o.WorkorderItemId).Select(x => x.Name).FirstOrDefaultAsync(); + //MIGRATE_OUTSTANDING routine to get wo id from the WorkOrderItemId + o.WorkOrderItemViz = "MIGRATE_OUTSTANDING woitem display value"; + // if (o.WorkOrderItemId != null) + // o.WorkorderItemViz = await ct.WorkorderItem.AsNoTracking().Where(x=>x.Id==o.WorkOrderItemId).Select(x => x.Name).FirstOrDefaultAsync(); o.RequestedByUserViz = await ct.User.AsNoTracking().Where(x => x.Id == o.RequestedByUserId).Select(x => x.Name).FirstOrDefaultAsync(); o.StatusViz = customerServiceRequestStatusEnumList.Where(x => x.Id == (long)o.Status).Select(x => x.Name).First(); diff --git a/server/AyaNova/biz/JobsBiz.cs b/server/AyaNova/biz/JobsBiz.cs index 5b5a3101..b79f4d87 100644 --- a/server/AyaNova/biz/JobsBiz.cs +++ b/server/AyaNova/biz/JobsBiz.cs @@ -188,7 +188,7 @@ namespace AyaNova.Biz if (serverState.IsSystemLocked) return; if (serverState.IsMigrateMode){ - log.LogInformation("Server is in migrate mode, skipping non-critical internal jobs"); + log.LogDebug("Server is in migrate mode, skipping non-critical internal jobs"); return; } diff --git a/server/AyaNova/biz/PMBiz.cs b/server/AyaNova/biz/PMBiz.cs index 1b241474..eae26172 100644 --- a/server/AyaNova/biz/PMBiz.cs +++ b/server/AyaNova/biz/PMBiz.cs @@ -4906,8 +4906,8 @@ namespace AyaNova.Biz woi.WarrantyService = pmi.WarrantyService; if (p.CopyWiki) woi.Wiki = pmi.Wiki; - woi.WorkorderItemPriorityId = pmi.WorkOrderItemPriorityId; - woi.WorkorderItemStatusId = pmi.WorkOrderItemStatusId; + woi.WorkOrderItemPriorityId = pmi.WorkOrderItemPriorityId; + woi.WorkOrderItemStatusId = pmi.WorkOrderItemStatusId; foreach (PMItemUnit pmiunit in pmi.Units) { diff --git a/server/AyaNova/biz/WorkOrderItemPriorityBiz.cs b/server/AyaNova/biz/WorkOrderItemPriorityBiz.cs index 0ab97bd2..7cf11567 100644 --- a/server/AyaNova/biz/WorkOrderItemPriorityBiz.cs +++ b/server/AyaNova/biz/WorkOrderItemPriorityBiz.cs @@ -222,7 +222,7 @@ namespace AyaNova.Biz await Task.CompletedTask; //Referential integrity //FOREIGN KEY CHECKS - if (await ct.WorkOrderItem.AnyAsync(m => m.WorkorderItemPriorityId == inObj.Id)) + if (await ct.WorkOrderItem.AnyAsync(m => m.WorkOrderItemPriorityId == inObj.Id)) AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("WorkOrderItem")); } diff --git a/server/AyaNova/biz/WorkOrderItemStatusBiz.cs b/server/AyaNova/biz/WorkOrderItemStatusBiz.cs index 5b82c239..28b079a0 100644 --- a/server/AyaNova/biz/WorkOrderItemStatusBiz.cs +++ b/server/AyaNova/biz/WorkOrderItemStatusBiz.cs @@ -223,7 +223,7 @@ namespace AyaNova.Biz await Task.CompletedTask; //Referential integrity //FOREIGN KEY CHECKS - if (await ct.WorkOrderItem.AnyAsync(m => m.WorkorderItemStatusId == inObj.Id)) + if (await ct.WorkOrderItem.AnyAsync(m => m.WorkOrderItemStatusId == inObj.Id)) AddError(ApiErrorCode.VALIDATION_REFERENTIAL_INTEGRITY, "generalerror", await Translate("WorkOrderItem")); } diff --git a/server/AyaNova/models/CustomerServiceRequest.cs b/server/AyaNova/models/CustomerServiceRequest.cs index 5ddf5f62..19a0e9f9 100644 --- a/server/AyaNova/models/CustomerServiceRequest.cs +++ b/server/AyaNova/models/CustomerServiceRequest.cs @@ -31,9 +31,9 @@ namespace AyaNova.Models public long? UnitId { get; set; } [NotMapped] public string UnitViz { get; set; } - public long? WorkorderItemId { get; set; } + public long? WorkOrderItemId { get; set; } [NotMapped] - public string WorkorderItemViz { get; set; } + public string WorkOrderItemViz { get; set; } [Required] public long RequestedByUserId { get; set; } [NotMapped] diff --git a/server/AyaNova/models/WorkOrderItem.cs b/server/AyaNova/models/WorkOrderItem.cs index 748dbd3f..c4ab3cb4 100644 --- a/server/AyaNova/models/WorkOrderItem.cs +++ b/server/AyaNova/models/WorkOrderItem.cs @@ -25,8 +25,8 @@ namespace AyaNova.Models [Required] public long WorkOrderId { get; set; } public string TechNotes { get; set; } - public long? WorkorderItemStatusId { get; set; } - public long? WorkorderItemPriorityId { get; set; } + public long? WorkOrderItemStatusId { get; set; } + public long? WorkOrderItemPriorityId { get; set; } public DateTime? RequestDate { get; set; } public bool WarrantyService { get; set; } = false; public int Sequence { get; set; } diff --git a/server/AyaNova/util/AyaNovaVersion.cs b/server/AyaNova/util/AyaNovaVersion.cs index 2e38228e..395f485a 100644 --- a/server/AyaNova/util/AyaNovaVersion.cs +++ b/server/AyaNova/util/AyaNovaVersion.cs @@ -5,7 +5,7 @@ namespace AyaNova.Util /// internal static class AyaNovaVersion { - public const string VersionString = "8.0.0-alpha.120"; + public const string VersionString = "8.0.0-alpha.121"; public const string FullNameAndVersion = "AyaNova server " + VersionString; }//eoc }//eons \ No newline at end of file diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs index f7e21a18..14535c55 100644 --- a/server/AyaNova/util/Seeder.cs +++ b/server/AyaNova/util/Seeder.cs @@ -2841,8 +2841,8 @@ namespace AyaNova.Util Notes = $"itemnotes - {y} ", TechNotes = $"technotes - {y}", RequestDate = woDate.AddMinutes(y), - WorkorderItemPriorityId = Fake.Random.Long(1, 5),//there are 5 different sample priorities - WorkorderItemStatusId = Fake.Random.Long(1, 3)//there are 3 different sample woitem status + WorkOrderItemPriorityId = Fake.Random.Long(1, 5),//there are 5 different sample priorities + WorkOrderItemStatusId = Fake.Random.Long(1, 3)//there are 3 different sample woitem status }; //UNITS