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-11 18:34:03 +00:00
parent ebc325aa44
commit 581bb7a656
3 changed files with 2 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,21 +113,7 @@ namespace AyaNova.Biz
return null;
else
{
// //Only set on v7 migrate to v8
// if(!string.IsNullOrWhiteSpace(newObject.v7SigStrokePath)){
// //todo: convert v7 style strokepath signature to svg for v8
// /*
// v7 sig
// 71.5,77.19999694824219 71.5,79.19999694824219 71.5,83.19999694824219 71.5,91.19999694824219 74.5,101.19999694824219 75.5,103.19999694824219 80.5,104.19999694824219 86.5,104.19999694824219 96.5,101.19999694824219 116.5,91.19999694824219 145.5,75.19999694824219 167.5,
// 61.19999694824219 183.5,50.19999694824219 194.5,42.19999694824219 197.5,42.19999694824219 199.5,51.19999694824219 202.5,66.19999694824219 210.5,87.19999694824219 219.5,94.19999694824219 235.5,97.19999694824219 260.5,89.19999694824219 298.5,74.19999694824219 326.5,
// 62.19999694824219 339.5,56.19999694824219 343.5,58.19999694824219 345.5,62.19999694824219 349.5,74.19999694824219 357.5,87.19999694824219 368.5,97.19999694824219 387.5,99.19999694824219 423.5,89.19999694824219 465.5,71.19999694824219 498.5,55.19999694824219 511.5,
// 48.19999694824219 514.5,52.19999694824219 514.5,57.19999694824219 515.5,65.19999694824219 515.5,67.19999694824219 518.5,67.19999694824219 521.5,67.19999694824219 521.5,67.19999694824219
// */
// Console.WriteLine("v7 sig");
// Console.WriteLine(newObject.v7SigStrokePath);
// newObject.CustomerSignature=Util.SigV7Util.v7StrokePathTov8SVG(newObject.v7SigStrokePath);
// }
await WorkOrderBizActionsAsync(AyaEvent.Created, newObject, null, null);
newObject.Tags = TagBiz.NormalizeTags(newObject.Tags);
newObject.CustomFields = JsonUtil.CompactJson(newObject.CustomFields);

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

@@ -111,9 +111,7 @@ namespace AyaNova.Models
[NotMapped, JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
public AyaTypeId GenCopyAttachmentsFrom { get; set; }//INTERNAL, USED TO SIGNIFY ATTACHMENTS NEED TO BE COPIED ON SAVE
// [NotMapped, JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
// public string v7SigStrokePath { get; set; }//INTERNAL, USED TO EXPORT v7 SIGNATURES TO V8
[NotMapped, JsonIgnore]
public AyaType AyaType { get => AyaType.WorkOrder; }

109
server/AyaNova/util/SigV7Util.cs
View File

@@ -1,109 +0,0 @@
using System;
using System.Collections.Generic;
namespace AyaNova.Util
{
internal static class SigV7Util
{
public static string v7StrokePathTov8SVG(string spath)
{
List<Tuple<int, int>> lPoints = new List<Tuple<int, int>>();
string[] sLines = spath.Split('X');
foreach (string sLine in sLines)
{
string[] sPoints = sLine.Trim().Split(' ');
if (sPoints.Length > 0)
{
foreach (string s in sPoints)
{
lPoints.Add(StringToPoint(s));
}
}
}
//"71.5,77.19999694824219 71.5,79.19999694824219 71.5,83.19999694824219 71.5,91.19999694824219 74.5,101.19999694824219 75.5,103.19999694824219 80.5,104.19999694824219 86.5,104.19999694824219 96.5,101.19999694824219 116.5,91.19999694824219 145.5,75.19999694824219 167.5,61.19999694824219 183.5,50.19999694824219 194.5,42.19999694824219 197.5,42.19999694824219 199.5,51.19999694824219 202.5,66.19999694824219 210.5,87.19999694824219 219.5,94.19999694824219 235.5,97.19999694824219 260.5,89.19999694824219 298.5,74.19999694824219 326.5,62.19999694824219 339.5,56.19999694824219 343.5,58.19999694824219 345.5,62.19999694824219 349.5,74.19999694824219 357.5,87.19999694824219 368.5,97.19999694824219 387.5,99.19999694824219 423.5,89.19999694824219 465.5,71.19999694824219 498.5,55.19999694824219 511.5,48.19999694824219 514.5,52.19999694824219 514.5,57.19999694824219 515.5,65.19999694824219 515.5,67.19999694824219 518.5,67.19999694824219 521.5,67.19999694824219 521.5,67.19999694824219"
//handmade equivalent
// <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"><path d="M 72,77 C 72,77 72,79 72,83 72,91 74,101 76,103 80,104 86,104 96,101 116,91 146,75 168,61 184,50 194,42 198,42 200,51 202,66 210,87 220,94 236,97 260,89 298,74 326,62 340,56 344,58 346,62 350,74 358,87 368,97 388,99 424,89 466,71 498,55 512,48 514,52 514,57 516,65 516,67 518,67 522,67 522,67 " stroke-width="5.525" stroke="rgb(0, 0, 0)" fill="none" stroke-linecap="round"></path></svg>
//Now turn lPoints into svg and return
// <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 552 120" width="552" height="120">
//<path d="M 79.400,15.300 C 82.236,17.326 82.400,16.800 85.400,18.300" stroke-width="5.525" stroke="rgb(0, 0, 0)" fill="none" stroke-linecap="round"></path>
//<path d="M 85.400,18.300 C 88.884,19.030 88.736,19.326 92.400,19.300" stroke-wke="rgb(0, 0, 0)" fill="none" stroke-linecap="round"></path><path d="M 510.400,91.300 C 513.725,93.769 513.448,93.840 517.400,95.300" stroke-width="4.888" stroke="rgb(0, 0, 0)" fill="none" stroke-linecap="round"></path><path d="M 517.400,95.300 C 519.870,96.105 519.725,96.269 522.400,96.300" stroke-width="5.121" stroke="rgb(0, 0, 0)" fill="none" stroke-linecap="round"></path></svg>
//https://developer.mozilla.org/en-US/docs/Web/SVG/Tutorial/Paths
//NOTE: v7 sigpad is 300 by 100 pixels, however the points drawn are way larger than that so going with v8 size
//If this proves to be an issue could perhaps look for the largest coordinates then use that as the size, though I think
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=\"552\" height=\"120\">");
//draw
sb.Append($"<path d=\"M {lPoints[0].Item1},{lPoints[0].Item2} C ");
foreach(var p in lPoints){
sb.Append($"{p.Item1},{p.Item2} ");
}
sb.Append("\" stroke-width=\"3\" stroke=\"rgb(0, 255, 255)\" fill=\"none\" stroke-linecap=\"round\"></path>");
//close
sb.Append("</svg>");
return sb.ToString();
}
private static Tuple<int, int> StringToPoint(string s)
{
if (string.IsNullOrWhiteSpace(s))
return new Tuple<int, int>(0, 0);
if (!s.Contains(','))
return new Tuple<int, int>(0, 0);
string[] spoint = s.Split(',');
//case 1939 - can't treat the input in the parse as integers as they can apparently contain decimals now
//I suspect that the conversion with decimal is likely slower than checking to see if it has a decimal first so
//I'm breaking this out into two separate streams for performance
if (s.Contains('.'))
{
// if it contains a decimal then convert differently
return new Tuple<int, int>(
Convert.ToInt32(Math.Round(Convert.ToDouble(spoint[0]))),
Convert.ToInt32(Math.Round(Convert.ToDouble(spoint[1])))
);
// return new Point(
// Convert.ToInt32(Math.Round(Convert.ToDouble(spoint[0]))),
// Convert.ToInt32(Math.Round(Convert.ToDouble(spoint[1])))
// );
}
else
{
//if it doesn't contain a decimal then use the original method
//case 1978 wrap this in a try catch block due to one customer having NaN values
//in their signature stroke path string.
try
{
return new Tuple<int, int>(int.Parse(spoint[0]), int.Parse(spoint[1]));
}
catch (System.FormatException)
{
return new Tuple<int, int>(0, 0);
}
}
}
}//eoc
}//eons