From 759d9be1182e87e14cf152aefa87c82664f803aa Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Fri, 12 May 2023 15:56:04 +0200 Subject: [PATCH] fix catena di aggiornamenti --- .../Components/Buttons/ButtonsDoorDef.razor | 1 - .../Buttons/ButtonsDoorDef.razor.cs | 5 ++ .../Components/DoorDef/DoorDataBlock.razor.cs | 3 +- .../Components/DoorDef/DoorPreview.razor | 8 ++- WebDoorCreator.UI/temp/Conf.yaml | 62 ++++--------------- 5 files changed, 24 insertions(+), 55 deletions(-) diff --git a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor index c6d1614..be1b455 100644 --- a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor +++ b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor @@ -1,5 +1,4 @@ 
- @B_doorOpUpd @if (B_doorOpUpd || true) { diff --git a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs index 919aa7c..6d1c066 100644 --- a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs +++ b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs @@ -116,6 +116,11 @@ namespace WebDoorCreator.UI.Components.Buttons await SaveYaml(currDdf); // versione corrente del DDF generato int currVers = await QDataServ.SendCalcReq(idDoor, currDdf); + + if(currVers > 0) + { + IsErr = false; + } } } } diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorDataBlock.razor.cs b/WebDoorCreator.UI/Components/DoorDef/DoorDataBlock.razor.cs index 2f01c11..1548d48 100644 --- a/WebDoorCreator.UI/Components/DoorDef/DoorDataBlock.razor.cs +++ b/WebDoorCreator.UI/Components/DoorDef/DoorDataBlock.razor.cs @@ -61,7 +61,8 @@ namespace WebDoorCreator.UI.Components.DoorDef /// protected Dictionary> bdoList { get; set; } = new Dictionary>(); - protected bool paramsChanged { get; set; } = false; + [Parameter] + public bool paramsChanged { get; set; } = false; protected string userLang { get; set; } = "EN"; #endregion Protected Properties diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorPreview.razor b/WebDoorCreator.UI/Components/DoorDef/DoorPreview.razor index c895b27..44fe0d6 100644 --- a/WebDoorCreator.UI/Components/DoorDef/DoorPreview.razor +++ b/WebDoorCreator.UI/Components/DoorDef/DoorPreview.razor @@ -1,10 +1,12 @@ -
+
@*@if (IsErr) { - @*
@ErrCode
+ @*
@ErrCode
}*@ @if (!string.IsNullOrEmpty(@SvgContent)) { - @svgPreview +
+ @svgPreview +
}
\ No newline at end of file diff --git a/WebDoorCreator.UI/temp/Conf.yaml b/WebDoorCreator.UI/temp/Conf.yaml index 94440db..617f698 100644 --- a/WebDoorCreator.UI/temp/Conf.yaml +++ b/WebDoorCreator.UI/temp/Conf.yaml @@ -15,10 +15,10 @@ order: date: 2023-12-05T00:00:00.0000000 piece: DO_1 size: - width: 30 - height: 100 - thickness: 2 -swing: LHI + width: 90 + height: 150 + thickness: 1.75 +swing: LH secure: UP material: wood profiles: @@ -28,7 +28,7 @@ profiles: overmaterial: 0.1 hingeedge: type: SQ - machining: OFF + machining: ON overmaterial: 0.1 top: type: SQ @@ -36,54 +36,16 @@ profiles: overmaterial: 0.1 bottom: type: SQ - machining: OFF + machining: ON overmaterial: 0.1 hardware: - vision_cut_outs: - - shape: Generic\Circle - radius: 8.5 - center_from_top: 40 - center_from_lock: 0 + louver_cut_outs: + - shape: Generic\Cuore2.nge + length: 10.0000 + width: 18.8125 + bottom_rail: 8.0 + lock_stile: 0.0 door_center: center - - shape: Generic\Circle - radius: 10 - center_from_top: 60 - center_from_lock: 0 - door_center: center - - shape: Generic\Rect - length: 10 - width: 16 - top_rail: 5.5 - lock_stile: 0 - radius: 0 - door_center: center - - hinges: - - template: Generic Conceiled\StdConHingeDeepR - ToptoCL: 10 - back_set: 0.125 - thickness: 0.25 - - template: Generic Conceiled\StdConHingeDeepR - ToptoCL: 50 - back_set: 0.125 - thickness: 0.25 - - template: Generic Conceiled\StdConHingeDeepR - ToptoCL: 80 - back_set: 0.125 - thickness: 0.25 - - flush_bolts: - - template: Corner\8501 - type: corner - side: top - position: 5 - offset_WS: 0.0 - - strikes: - - template: Generic\StdFaceStrike - position: 57.875 - back_set: 2.75 - offset_WS: 0.0 ---