This commit is contained in:
2021-08-10 20:01:15 +00:00
parent 7f86fde5f8
commit 5de0ec3f7c
2 changed files with 17 additions and 14 deletions

View File

@@ -2307,7 +2307,7 @@ namespace AyaNova.PlugIn.V8
progress.Op("Start WorkOrder/Item Status export");
progress.SubOp("");
var ObjectTypeName = "Workorder/Item Status";
progress.Append("Exporting all " + " " + ObjectTypeName );
progress.Append("Exporting all " + " " + ObjectTypeName);
List<string> tags = new List<string>();
AddImportTag(tags);
WorkorderStatuses w = WorkorderStatuses.GetItems();
@@ -2457,20 +2457,13 @@ namespace AyaNova.PlugIn.V8
d.latitude = client.GoToAddress.Latitude;
d.longitude = client.GoToAddress.Longitude;
}
if (c.uiHasSignature)
{
d.v7SigStrokePath = c.WorkorderService.Signature.StrokePath;
d.v7SigWidth = c.WorkorderService.Signature.Width;
d.v7SigHeight = c.WorkorderService.Signature.Height;
d.customerSignature = util.v7StrokePathTov8SVG(c.WorkorderService.Signature.StrokePath, c.WorkorderService.Signature.Width, c.WorkorderService.Signature.Height);
d.customerSignatureCaptured = util.DateToV8(c.WorkorderService.Signature.ClientCapturedDateTime);
}
TagFromv7Guid(c.RegionID, tags);
TagFromv7Guid(c.WorkorderCategoryID, tags);
@@ -2521,7 +2514,7 @@ namespace AyaNova.PlugIn.V8
{
dynamic state = new JObject();
state.workOrderId = RavenId;
state.workOrderStatusId = Getv7v8IdMap(c.WorkorderService.WorkorderStatusID,"Workorder status");
state.workOrderStatusId = Getv7v8IdMap(c.WorkorderService.WorkorderStatusID, "Workorder status");
state.created = util.DateToV8(c.Created, true);
state.userId = Getv7v8IdMap(c.Creator, "Workorder creator for status");
await util.PostAsync("workorder/states", state.ToString());
@@ -2530,7 +2523,7 @@ namespace AyaNova.PlugIn.V8
{
dynamic state = new JObject();
state.workOrderId = RavenId;
state.workOrderStatusId =ClosedWorkOrderStatus;
state.workOrderStatusId = ClosedWorkOrderStatus;
state.created = util.DateToV8(c.Created, true);
state.userId = Getv7v8IdMap(c.Creator, "Workorder creator for status");
await util.PostAsync("workorder/states", state.ToString());

View File

@@ -781,12 +781,22 @@ Locale Français is customized [signature: 804154061] exporting
System.Text.StringBuilder sb = new System.Text.StringBuilder();
//open
// sb.Append("<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" viewBox=\"0 0 300 100\" width=\"300\" height=\"100\">");
sb.Append($"<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"{width}\" height=\"{height}\">");
sb.Append("<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"");
sb.Append(width.ToString());
sb.Append("\" height=\"");
sb.Append(height.ToString());
sb.Append("\">");
//draw
sb.Append($"<path d=\"M {lPoints[0].Item1},{lPoints[0].Item2} C ");
sb.Append("<path d=\"M ");
sb.Append(lPoints[0].Item1.ToString());
sb.Append(",");
sb.Append(lPoints[0].Item2.ToString());
sb.Append("C ");
foreach (var p in lPoints)
{
sb.Append($"{p.Item1},{p.Item2} ");
sb.Append(p.Item1.ToString());
sb.Append(",");
sb.Append(p.Item2.ToString());
}
sb.Append("\" stroke-width=\"3\" stroke=\"rgb(0, 255, 255)\" fill=\"none\" stroke-linecap=\"round\"></path>");