This commit is contained in:
2021-08-20 20:09:26 +00:00
parent d000ab45e8
commit 3a68425a4c

View File

@@ -334,11 +334,11 @@ namespace AyaNova.PlugIn.V8
private long XXXSafeGetUserMap(Guid id) // private long XXXSafeGetUserMap(Guid id)
{ // {
if (!V7ToV8IdMap.ContainsKey(id)) return 1;//1=raven administrator account // if (!V7ToV8IdMap.ContainsKey(id)) return 1;//1=raven administrator account
return V7ToV8IdMap[id]; // return V7ToV8IdMap[id];
} // }
private enum RavenUserType : int private enum RavenUserType : int
@@ -1263,7 +1263,7 @@ namespace AyaNova.PlugIn.V8
tags.Clear(); tags.Clear();
d = new JObject(); d = new JObject();
d.customerId = RavenId; d.customerId = RavenId;
d.userId = await Getv7v8IdMap(cn.Creator, RootObjectTypes.User);//SafeGetUserMap(cn.Creator); d.userId = await Getv7v8IdMap(cn.Creator, RootObjectTypes.User);
d.noteDate = util.DateToV8(cn.Created, true); d.noteDate = util.DateToV8(cn.Created, true);
d.notes = cn.Notes; d.notes = cn.Notes;
TagFromv7Guid(cn.ClientNoteTypeID, tags); TagFromv7Guid(cn.ClientNoteTypeID, tags);
@@ -1863,7 +1863,6 @@ namespace AyaNova.PlugIn.V8
var rMainObject = await util.PostAsync("part-assembly", d.ToString()); var rMainObject = await util.PostAsync("part-assembly", d.ToString());
long RavenId = util.IdFromResponse(rMainObject); long RavenId = util.IdFromResponse(rMainObject);
//Event log fixup //Event log fixup
//await util.EventLog(util.AyaType.Project, RavenId, SafeGetUserMap(p.Creator), SafeGetUserMap(p.Modifier), p.Created, p.Modified);
long lCreator = await Getv7v8IdMap(p.Creator, RootObjectTypes.User); long lCreator = await Getv7v8IdMap(p.Creator, RootObjectTypes.User);
long lModifier = await Getv7v8IdMap(p.Modifier, RootObjectTypes.User); long lModifier = await Getv7v8IdMap(p.Modifier, RootObjectTypes.User);
await util.EventLog(util.AyaType.Project, RavenId, lCreator, lModifier, p.Created, p.Modified); await util.EventLog(util.AyaType.Project, RavenId, lCreator, lModifier, p.Created, p.Modified);
@@ -1907,7 +1906,7 @@ namespace AyaNova.PlugIn.V8
long RavenId = util.IdFromResponse(rMainObject); long RavenId = util.IdFromResponse(rMainObject);
Addv7v8IdMap(i.ID, RavenId); Addv7v8IdMap(i.ID, RavenId);
Allv8WarehouseIds.Add(RavenId); Allv8WarehouseIds.Add(RavenId);
await util.EventLog(util.AyaType.PartWarehouse, RavenId, SafeGetUserMap(i.Creator), SafeGetUserMap(i.Modifier), i.Created, i.Modified); await util.EventLog(util.AyaType.PartWarehouse, RavenId, await Getv7v8IdMap(i.Creator, RootObjectTypes.User), await Getv7v8IdMap(i.Modifier, RootObjectTypes.User), i.Created, i.Modified);
} }
} }
#endregion warehouses #endregion warehouses
@@ -1948,7 +1947,7 @@ namespace AyaNova.PlugIn.V8
d.dateStarted = util.DateToV8(c.DateStarted, true); d.dateStarted = util.DateToV8(c.DateStarted, true);
d.dateCompleted = util.DateToV8(c.DateCompleted, false); d.dateCompleted = util.DateToV8(c.DateCompleted, false);
d.accountNumber = c.AccountNumber; d.accountNumber = c.AccountNumber;
d.projectOverseerId = SafeGetUserMap(c.ProjectOverseerID); d.projectOverseerId = await Getv7v8IdMap(c.ProjectOverseerID, RootObjectTypes.User);
TagFromv7Guid(c.RegionID, tags); TagFromv7Guid(c.RegionID, tags);
SetTags(d, tags); SetTags(d, tags);
//Custom fields? //Custom fields?
@@ -2650,7 +2649,7 @@ namespace AyaNova.PlugIn.V8
//----- //-----
//Event log fixup //Event log fixup
await util.EventLog(ravenType, RavenId, SafeGetUserMap(i.Creator), SafeGetUserMap(i.Modifier), i.Created, i.Modified); await util.EventLog(ravenType, RavenId, await Getv7v8IdMap(i.Creator, RootObjectTypes.User),await Getv7v8IdMap(i.Modifier, RootObjectTypes.User), i.Created, i.Modified);
} }
} }
@@ -2764,7 +2763,7 @@ namespace AyaNova.PlugIn.V8
//----- //-----
//Event log fixup //Event log fixup
await util.EventLog(util.AyaType.TaxCode, RavenId, SafeGetUserMap(i.Creator), SafeGetUserMap(i.Modifier), i.Created, i.Modified); await util.EventLog(util.AyaType.TaxCode, RavenId, await Getv7v8IdMap(i.Creator, RootObjectTypes.User),await Getv7v8IdMap(i.Modifier, RootObjectTypes.User), i.Created, i.Modified);
} }
} }
@@ -2798,10 +2797,10 @@ namespace AyaNova.PlugIn.V8
dmemo.notes = mem.Message; dmemo.notes = mem.Message;
dmemo.viewed = mem.Viewed; dmemo.viewed = mem.Viewed;
dmemo.replied = mem.Replied; dmemo.replied = mem.Replied;
var RavenFromId = SafeGetUserMap(mem.FromID); var RavenFromId = await Getv7v8IdMap(mem.FromID, RootObjectTypes.User);
dmemo.fromId = RavenFromId; dmemo.fromId = RavenFromId;
dmemo.sent = util.DateToV8(mem.Created, true); dmemo.sent = util.DateToV8(mem.Created, true);
dmemo.toId = SafeGetUserMap(mem.ToID); dmemo.toId = await Getv7v8IdMap(mem.ToID, RootObjectTypes.User);
SetTags(dmemo, tags); SetTags(dmemo, tags);
duserid.Add(-7);//special code to server to treat as an import single duserid.Add(-7);//special code to server to treat as an import single
d.users = duserid; d.users = duserid;
@@ -2849,7 +2848,7 @@ namespace AyaNova.PlugIn.V8
var rMainObject = await util.PostAsync("work-order-item-priority", d.ToString()); var rMainObject = await util.PostAsync("work-order-item-priority", d.ToString());
long RavenId = util.IdFromResponse(rMainObject); long RavenId = util.IdFromResponse(rMainObject);
Addv7v8IdMap(s.ID, RavenId); Addv7v8IdMap(s.ID, RavenId);
await util.EventLog(util.AyaType.WorkOrderItemPriority, RavenId, SafeGetUserMap(s.Creator), SafeGetUserMap(s.Modifier), s.Created, s.Modified); await util.EventLog(util.AyaType.WorkOrderItemPriority, RavenId, await Getv7v8IdMap(s.Creator, RootObjectTypes.User),await Getv7v8IdMap(s.Modifier, RootObjectTypes.User), s.Created, s.Modified);
} }
@@ -2892,7 +2891,7 @@ namespace AyaNova.PlugIn.V8
long RavenId = util.IdFromResponse(rMainObject); long RavenId = util.IdFromResponse(rMainObject);
Addv7v8IdMap(s.ID, RavenId); Addv7v8IdMap(s.ID, RavenId);
//Event log fixup //Event log fixup
await util.EventLog(util.AyaType.WorkOrderStatus, RavenId, SafeGetUserMap(s.Creator), SafeGetUserMap(s.Modifier), s.Created, s.Modified); await util.EventLog(util.AyaType.WorkOrderStatus, RavenId, await Getv7v8IdMap(s.Creator, RootObjectTypes.User),await Getv7v8IdMap(s.Modifier, RootObjectTypes.User), s.Created, s.Modified);
} }
//Second export for workorder items //Second export for workorder items
@@ -2909,7 +2908,7 @@ namespace AyaNova.PlugIn.V8
var rMainObject = await util.PostAsync("work-order-item-status", d.ToString()); var rMainObject = await util.PostAsync("work-order-item-status", d.ToString());
long RavenId = util.IdFromResponse(rMainObject); long RavenId = util.IdFromResponse(rMainObject);
Addv7v8WorkOrderItemStatusIdMap(s.ID, RavenId); Addv7v8WorkOrderItemStatusIdMap(s.ID, RavenId);
await util.EventLog(util.AyaType.WorkOrderItemStatus, RavenId, SafeGetUserMap(s.Creator), SafeGetUserMap(s.Modifier), s.Created, s.Modified); await util.EventLog(util.AyaType.WorkOrderItemStatus, RavenId, await Getv7v8IdMap(s.Creator, RootObjectTypes.User),await Getv7v8IdMap(s.Modifier, RootObjectTypes.User), s.Created, s.Modified);
} }
@@ -2931,7 +2930,7 @@ namespace AyaNova.PlugIn.V8
var rMainObject = await util.PostAsync("work-order-status", d.ToString()); var rMainObject = await util.PostAsync("work-order-status", d.ToString());
ClosedWorkOrderStatus = util.IdFromResponse(rMainObject); ClosedWorkOrderStatus = util.IdFromResponse(rMainObject);
//Event log fixup //Event log fixup
//await util.EventLog(util.AyaType.WorkOrderStatus, RavenId, SafeGetUserMap(s.Creator), SafeGetUserMap(s.Modifier), s.Created, s.Modified); //await util.EventLog(util.AyaType.WorkOrderStatus, RavenId, await Getv7v8IdMap(s.Creator, RootObjectTypes.User),await Getv7v8IdMap(s.Modifier, RootObjectTypes.User), s.Created, s.Modified);
} }
//Fourth export for service completed status //Fourth export for service completed status
@@ -2952,7 +2951,7 @@ namespace AyaNova.PlugIn.V8
var rMainObject = await util.PostAsync("work-order-status", d.ToString()); var rMainObject = await util.PostAsync("work-order-status", d.ToString());
ServiceCompletedWorkOrderStatus = util.IdFromResponse(rMainObject); ServiceCompletedWorkOrderStatus = util.IdFromResponse(rMainObject);
//Event log fixup //Event log fixup
//await util.EventLog(util.AyaType.WorkOrderStatus, RavenId, SafeGetUserMap(s.Creator), SafeGetUserMap(s.Modifier), s.Created, s.Modified); //await util.EventLog(util.AyaType.WorkOrderStatus, RavenId, await Getv7v8IdMap(s.Creator, RootObjectTypes.User),await Getv7v8IdMap(s.Modifier, RootObjectTypes.User), s.Created, s.Modified);
} }
@@ -3164,7 +3163,7 @@ namespace AyaNova.PlugIn.V8
var ravenwoitemid = util.IdFromResponse(await util.PostAsync("workorder/items", dwi.ToString())); var ravenwoitemid = util.IdFromResponse(await util.PostAsync("workorder/items", dwi.ToString()));
await util.EventLog(util.AyaType.WorkOrderItem, ravenwoitemid, SafeGetUserMap(wi.Creator), SafeGetUserMap(wi.Modifier), wi.Created, wi.Modified); await util.EventLog(util.AyaType.WorkOrderItem, ravenwoitemid, await Getv7v8IdMap(wi.Creator, RootObjectTypes.User),await Getv7v8IdMap(wi.Modifier, RootObjectTypes.User), wi.Created, wi.Modified);
//##### WORKORDER ITEM UNIT //##### WORKORDER ITEM UNIT
if (wi.UnitID != Guid.Empty) if (wi.UnitID != Guid.Empty)
@@ -3688,7 +3687,7 @@ namespace AyaNova.PlugIn.V8
var ravenwoitemid = util.IdFromResponse(await util.PostAsync("quote/items", dwi.ToString())); var ravenwoitemid = util.IdFromResponse(await util.PostAsync("quote/items", dwi.ToString()));
await util.EventLog(util.AyaType.WorkOrderItem, ravenwoitemid, SafeGetUserMap(wi.Creator), SafeGetUserMap(wi.Modifier), wi.Created, wi.Modified); await util.EventLog(util.AyaType.WorkOrderItem, ravenwoitemid, await Getv7v8IdMap(wi.Creator, RootObjectTypes.User),await Getv7v8IdMap(wi.Modifier, RootObjectTypes.User), wi.Created, wi.Modified);
//##### WORKORDER ITEM UNIT //##### WORKORDER ITEM UNIT
if (wi.UnitID != Guid.Empty) if (wi.UnitID != Guid.Empty)
@@ -4040,7 +4039,7 @@ namespace AyaNova.PlugIn.V8
var ravenwoitemid = util.IdFromResponse(await util.PostAsync("pm/items", dwi.ToString())); var ravenwoitemid = util.IdFromResponse(await util.PostAsync("pm/items", dwi.ToString()));
await util.EventLog(util.AyaType.WorkOrderItem, ravenwoitemid, SafeGetUserMap(wi.Creator), SafeGetUserMap(wi.Modifier), wi.Created, wi.Modified); await util.EventLog(util.AyaType.WorkOrderItem, ravenwoitemid, await Getv7v8IdMap(wi.Creator, RootObjectTypes.User),await Getv7v8IdMap(wi.Modifier, RootObjectTypes.User), wi.Created, wi.Modified);
//##### WORKORDER ITEM UNIT //##### WORKORDER ITEM UNIT
if (wi.UnitID != Guid.Empty) if (wi.UnitID != Guid.Empty)
@@ -4390,7 +4389,7 @@ namespace AyaNova.PlugIn.V8
// //Event log fixup // //Event log fixup
// ServiceBank sb = ServiceBank.GetItem(i.LT_ServiceBank_Label_ID); // ServiceBank sb = ServiceBank.GetItem(i.LT_ServiceBank_Label_ID);
// await util.EventLog(util.AyaType.ServiceBank, RavenId, SafeGetUserMap(sb.Creator), SafeGetUserMap(sb.Creator), sb.Created, sb.Created); // await util.EventLog(util.AyaType.ServiceBank, RavenId, SaxxfeGetUserMap(sb.Creator), SaxxfeGetUserMap(sb.Creator), sb.Created, sb.Created);
// FirstEntry = false; // FirstEntry = false;
// } // }
// } // }
@@ -5292,7 +5291,7 @@ namespace AyaNova.PlugIn.V8
await util.PutAsync("form-custom/" + formCustomKey, d.ToString()); await util.PutAsync("form-custom/" + formCustomKey, d.ToString());
//Event log fixup //Event log fixup
await util.EventLog(util.AyaType.FormCustom, RavenFormCustomId, SafeGetUserMap(Creator), SafeGetUserMap(Modifier), Created, Modified); await util.EventLog(util.AyaType.FormCustom, RavenFormCustomId, await Getv7v8IdMap(Creator, RootObjectTypes.User),await Getv7v8IdMap(Modifier, RootObjectTypes.User), Created, Modified);
return ret; return ret;