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

Fixed bug updating status breaks concurrency token for header so can't update it

Browse Source
This commit is contained in:
John Cardinal
2022-03-09 18:04:21 +00:00
parent a33f36e5b3
commit 8b5a8e323a
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -48,7 +48,7 @@
"AYANOVA_DATA_PATH": "c:\\temp\\ravendata", "AYANOVA_DATA_PATH": "c:\\temp\\ravendata",
"AYANOVA_USE_URLS": "http://*:7575;", "AYANOVA_USE_URLS": "http://*:7575;",
//"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true", //"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true",
"AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE": "false",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8",
//"AYANOVA_REPORT_RENDERING_TIMEOUT":"1", //"AYANOVA_REPORT_RENDERING_TIMEOUT":"1",
"AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",

6
server/AyaNova/biz/QuoteBiz.cs
View File

@@ -1107,10 +1107,12 @@ namespace AyaNova.Biz
else else
{ {
await ct.QuoteState.AddAsync(newObject); await ct.QuoteState.AddAsync(newObject);
var qoute = await ct.Quote.FirstOrDefaultAsync(x => x.Id == newObject.QuoteId); var quote = await ct.Quote.FirstOrDefaultAsync(x => x.Id == newObject.QuoteId);
var newStatusInfo = await ct.QuoteStatus.AsNoTracking().FirstOrDefaultAsync(x => x.Id == newObject.QuoteStatusId); var newStatusInfo = await ct.QuoteStatus.AsNoTracking().FirstOrDefaultAsync(x => x.Id == newObject.QuoteStatusId);
qoute.LastStatusId = newObject.QuoteStatusId; quote.LastStatusId = newObject.QuoteStatusId;
await ct.SaveChangesAsync(); await ct.SaveChangesAsync();
newObject.NewQuoteConcurrency=quote.Concurrency;
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, AyaType.QuoteStatus, AyaEvent.Created), ct); await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, AyaType.QuoteStatus, AyaEvent.Created), ct);
await StateHandlePotentialNotificationEvent(AyaEvent.Created, newObject); await StateHandlePotentialNotificationEvent(AyaEvent.Created, newObject);
return newObject; return newObject;

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

@@ -1646,6 +1646,8 @@ namespace AyaNova.Biz
wo.DurationToCompleted = TimeSpan.Zero; wo.DurationToCompleted = TimeSpan.Zero;
wo.LastStatusId = newObject.WorkOrderStatusId; wo.LastStatusId = newObject.WorkOrderStatusId;
await ct.SaveChangesAsync(); await ct.SaveChangesAsync();
newObject.NewWOConcurrency = wo.Concurrency;
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, AyaType.WorkOrderStatus, AyaEvent.Created), ct); await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, AyaType.WorkOrderStatus, AyaEvent.Created), ct);
await StateHandlePotentialNotificationEvent(AyaEvent.Created, newObject); await StateHandlePotentialNotificationEvent(AyaEvent.Created, newObject);
return newObject; return newObject;
@@ -2056,7 +2058,7 @@ namespace AyaNova.Biz
{ {
EventType = NotifyEventType.WorkorderCompleted, EventType = NotifyEventType.WorkorderCompleted,
CustomerId = WorkorderInfo.CustomerId, CustomerId = WorkorderInfo.CustomerId,
AyaType = AyaType.WorkOrder, AyaType = AyaType.WorkOrder,
ObjectId = oProposed.WorkOrderId, ObjectId = oProposed.WorkOrderId,
CustomerNotifySubscriptionId = sub.Id, CustomerNotifySubscriptionId = sub.Id,
Name = WorkorderInfo.Serial.ToString() Name = WorkorderInfo.Serial.ToString()

6
server/AyaNova/models/QuoteState.cs
View File

@@ -38,11 +38,9 @@ namespace AyaNova.Models
[NotMapped, JsonIgnore] [NotMapped, JsonIgnore]
public string Name { get; set; } public string Name { get; set; }
//UTILITY FIELDS [NotMapped]
public uint NewQuoteConcurrency { get; set; }
//related
// [JsonIgnore]//internal only here at server not used by client
// public QuoteStatus QuoteStatus { get; set; }
[NotMapped, JsonIgnore] [NotMapped, JsonIgnore]
public AyaType AyaType { get => AyaType.QuoteStatus; } public AyaType AyaType { get => AyaType.QuoteStatus; }

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

@@ -38,6 +38,9 @@ namespace AyaNova.Models
[NotMapped, JsonIgnore] [NotMapped, JsonIgnore]
public string Name { get; set; } public string Name { get; set; }
[NotMapped]
public uint NewWOConcurrency { get; set; }
//UTILITY FIELDS //UTILITY FIELDS
//related //related