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-04-13 00:29:42 +00:00
parent a50d80b7eb
commit 835709c981
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -958,7 +958,7 @@ namespace AyaNova.Biz
transaction = await ct.Database.BeginTransactionAsync(); transaction = await ct.Database.BeginTransactionAsync();
try try
{ {
var dbObject = await ct.WorkOrderItem.AsNoTracking().SingleOrDefaultAsync(z => z.Id == id); var dbObject = await ct.WorkOrderItem.AsNoTracking().SingleOrDefaultAsync(z => z.Id == id);
if (dbObject == null) if (dbObject == null)
{ {
AddError(ApiErrorCode.NOT_FOUND); AddError(ApiErrorCode.NOT_FOUND);
@@ -3772,19 +3772,20 @@ namespace AyaNova.Biz
{ {
//static method //static method
long WoId = await GetWorkOrderIdFromRelativeAsync(ayaType, id, ct); long WoId = await GetWorkOrderIdFromRelativeAsync(ayaType, id, ct);
var currentStatus = await ct.WorkOrderState.AsNoTracking() var stat = await ct.WorkOrderState.AsNoTracking()
.Include(z => z.WorkOrderStatus)
.Where(z => z.WorkOrderId == WoId) .Where(z => z.WorkOrderId == WoId)
.OrderBy(z => z.Created) .OrderByDescending(z => z.Created)
.Select(z => z.WorkOrderStatus)
.Take(1) .Take(1)
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
if (currentStatus == null)
{
//default //no state set yet?
if (stat == null)
{ //default
return new WorkOrderStatus() { Id = -1, Locked = false, Completed = false }; return new WorkOrderStatus() { Id = -1, Locked = false, Completed = false };
} }
return currentStatus; return await ct.WorkOrderStatus.AsNoTracking().Where(z => z.Id == stat.WorkOrderStatusId).FirstAsync();//this should never not be null
} }

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

@@ -19,7 +19,9 @@ namespace AyaNova.Models
[Required] [Required]
public long UserId { get; set; } public long UserId { get; set; }
//UTILITY FIELDS //UTILITY FIELDS
[NotMapped]
// public bool IsDirty { get; set; } = false;//never dirty coming from the server
//related //related
[JsonIgnore]//internal only here at server not used by client [JsonIgnore]//internal only here at server not used by client