diff --git a/WebDoorCreator.Data/DDF/Converter.cs b/WebDoorCreator.Data/DDF/Converter.cs index 5f93532..8e9e7c2 100644 --- a/WebDoorCreator.Data/DDF/Converter.cs +++ b/WebDoorCreator.Data/DDF/Converter.cs @@ -56,6 +56,7 @@ namespace WebDoorCreator.Data.DDF { var currList = new List>(); currList.Add(deserialized.Where(x => x.Key != "Folder").ToDictionary(x => x.Key, x => x.Value)); + deserialized.Add("Separator", " "); dictDoorOP.Add(item.ObjectId, currList); } } diff --git a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs index edc20ca..93cc0e5 100644 --- a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs +++ b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs @@ -63,17 +63,6 @@ namespace WebDoorCreator.UI.Components.Buttons { await Task.Delay(1); string fileName = Path.Combine("temp", $"Conf.yaml"); -#if false - string vers = config.GetValue("ConfDDF:VersNumber"); - bool remDoorOp = config.GetValue("ConfDDF:RemoveDoorOps"); - var headRows = config.GetSection("ConfDDF:Header").Get>(); - var footRows = config.GetSection("ConfDDF:Footer").Get>(); - - string doorOpSer = CurrentDoorOp.GetSerialized(remDoorOp); - - CurrentConf.version = vers; - string fullData = CurrentConf.GetSerialized(headRows, footRows, doorOpSer); -#endif if (File.Exists(fileName)) { @@ -107,38 +96,6 @@ namespace WebDoorCreator.UI.Components.Buttons { // chiamo metodo x avewre DDF serializzato string currDdf = currDdfConv.GetSerialized(listOp); - -#if false - dictDoorOP = new Dictionary>>(); - listDoorOp = listOp; - foreach (var item in listDoorOp) - { - var deserialized = JsonConvert.DeserializeObject>(item.JsoncActVal!); - if (deserialized != null) - { - //if (dictDoorOP[item.ObjectId].Count() == 1) - //{ - // dictDoorOP[item.ObjectId]; - //} - //else - //{ - if (dictDoorOP.ContainsKey(item.ObjectId)) - { - var actList = dictDoorOP[item.ObjectId]; - actList.Add(deserialized.Where(x => x.Key != "Folder").ToDictionary(x => x.Key, x => x.Value)); - dictDoorOP[item.ObjectId] = actList; - } - else - { - var currList = new List>(); - currList.Add(deserialized.Where(x => x.Key != "Folder").ToDictionary(x => x.Key, x => x.Value)); - dictDoorOP.Add(item.ObjectId, currList); - } - //} - } - } - CurrentDoorOp.doorOpsDict = dictDoorOP; -#endif // FIXME TODO: si potrebbe eliminare in futuro che va su REDIS await SaveYaml(currDdf); // versione corrente del DDF generato diff --git a/WebDoorCreator.UI/Components/Hardware/HardwareList.razor.cs b/WebDoorCreator.UI/Components/Hardware/HardwareList.razor.cs index 2ccba97..4841501 100644 --- a/WebDoorCreator.UI/Components/Hardware/HardwareList.razor.cs +++ b/WebDoorCreator.UI/Components/Hardware/HardwareList.razor.cs @@ -158,10 +158,10 @@ namespace WebDoorCreator.UI.Components.Hardware actDict.Add(item.Value.Trim(), item.DefaultVal.Trim()); } } - //defaultParamsList.Add(listDefVal); defaultDict.Add(item.Value.Trim(), listDefVal); } + //actDict.Add(HwToShow.TableName, actParamsList); var jsonDef = JsonConvert.SerializeObject(defaultDict); diff --git a/WebDoorCreator.UI/temp/Conf.yaml b/WebDoorCreator.UI/temp/Conf.yaml index c4b0f6d..524cfe6 100644 --- a/WebDoorCreator.UI/temp/Conf.yaml +++ b/WebDoorCreator.UI/temp/Conf.yaml @@ -3,7 +3,7 @@ #Door1 code: 0015943 -date: 2023-04-19T14:59:00.2592242+02:00 +date: 2023-04-20T17:46:12.0177337+02:00 material: wood measures: millimiters order: @@ -11,8 +11,7 @@ order: elevation: project: pO: - line: -date: 2023-04-19T12:47:14.6842406+02:00 + line: piece: DO_1 produce: false profiles: @@ -39,9 +38,27 @@ size: thickness: 1.75 swing: RH version: 2 -edge_pulls: - - template: Generic\EdgePull230B - position: 45 +ept: + - template: Generic\StdEPT + ToptoCL: 15 + FacetoCL: 0.875 +face_decoration: + - template: General\Decor_A + type: lines + depth: 0.0625 + topdistance: 5.0 + bottomdistance: 7.0 + lockstiledistance: 4.0 + hingestiledistance: 4.0 + face: secure + - template: General\Decor_A + type: lines + depth: 0.0625 + topdistance: 5.0 + bottomdistance: 7.0 + lockstiledistance: 4.0 + hingestiledistance: 4.0 + face: secure flush_bolts: - template: Corner\8501 type: corner @@ -53,11 +70,13 @@ flush_bolts: side: top position: 5 offset_WS: 0.0 -locks: - - template: Generic\DocMyTest5Bore - position: 45.875 - back_set: 2.0 - offset_WS: 0.0 - side: lock_top + Separator: ' ' +groove: + - template: Generic\Groove + type: side + width: 0.6 + depth: 0.8 + offset_WS: 0 + side: bottom ---