admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-08-17 22:14:24 +00:00
parent b84fe5ca74
commit da940cdba0
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/AyaNova/biz/CustomerServiceRequestBiz.cs
View File

@@ -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();

2
server/AyaNova/biz/JobsBiz.cs
View File

@@ -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;
}

4
server/AyaNova/biz/PMBiz.cs
View File

@@ -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)
{

2
server/AyaNova/biz/WorkOrderItemPriorityBiz.cs
View File

@@ -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"));
}

2
server/AyaNova/biz/WorkOrderItemStatusBiz.cs
View File

@@ -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"));
}

4
server/AyaNova/models/CustomerServiceRequest.cs
View File

@@ -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]

4
server/AyaNova/models/WorkOrderItem.cs
View File

@@ -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; }

2
server/AyaNova/util/AyaNovaVersion.cs
View File

@@ -5,7 +5,7 @@ namespace AyaNova.Util
/// </summary>
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

4
server/AyaNova/util/Seeder.cs
View File

@@ -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