diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor b/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor index eac2288..9ad9929 100644 --- a/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor +++ b/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor @@ -8,83 +8,92 @@
@if (isSizing) { -
-
Width
- -
-
-
Height
- -
-
-
Thickness
- -
+ @if (ListVals != null) + { + @foreach (var size in ListVals.Where(x => x.Value != "Swing")) + { +
+
@size.Label
+ +
+ } + } } else if (isOpening) { -
-
Swing
- -
+ @if (ListVals != null) + { + @foreach (var swing in ListVals.Where(x => x.Value == "Swing")) + { + +
+
Swing
+ +
+ } + } } else if (isEdges) { -
-
Lock edge
- -
-
-
Hinge edge
- -
-
-
Top edge
- -
-
-
Bottom edge
- -
+ @if (ListVals != null) + { + @foreach (var size in ListVals) + { +
+
@size.Label
+ +
+ } + } + + @*
+
Lock edge
+ +
+
+
Hinge edge
+ +
+
+
Top edge
+ +
+
+
Bottom edge
+ +
*@ }
\ No newline at end of file diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor.cs b/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor.cs index 7d9d536..663df2f 100644 --- a/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor.cs +++ b/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor.cs @@ -20,8 +20,8 @@ namespace WebDoorCreator.UI.Components.DoorDef public EventCallback E_paramChanged { get; set; } protected bool isSizing { get; set; } = true; - protected List? ListSwings { get; set; } = null; - protected List? ListEdges { get; set; } = null; + //protected List? ListSwings { get; set; } = null; + protected List? ListVals { get; set; } = null; protected List? ListDoorOp { get; set; } = null; protected Edges? DefaultEdges { get; set; } = null; protected Opening? DefaultOpening { get; set; } = null; @@ -49,6 +49,7 @@ namespace WebDoorCreator.UI.Components.DoorDef protected void setSizing() { + currInStep = "Sizing"; isOpening = false; isEdges = false; isSizing = true; @@ -56,6 +57,7 @@ namespace WebDoorCreator.UI.Components.DoorDef protected void setOpening() { + isEdges = false; isSizing = false; isOpening = true; @@ -63,6 +65,7 @@ namespace WebDoorCreator.UI.Components.DoorDef protected void setEdges() { + currInStep = "Edges"; isOpening = false; isSizing = false; isEdges = true; @@ -152,62 +155,27 @@ namespace WebDoorCreator.UI.Components.DoorDef set => _swing = value; } - protected async Task ReloadData() + protected string _currInStep { get; set; } = ""; + protected string currInStep { - ListSwings = await WDService.ListValuesGetAll("Opening", "Swing"); - ListEdges = await WDService.ListValuesGetAll("Edges", "EdgeType"); - - ListDoorOp = await WDService.DoorOpGetByDoorId(DoorId); - if (ListDoorOp != null) + get => _currInStep; + set { - foreach (var doorOp in ListDoorOp) + if (_currInStep != value) { - //if (doorOp.DoorOpTypId == 19) - //{ - // var edges = JsonConvert.DeserializeObject>(doorOp.JsoncConfigVal); - // if (edges != null) - // { - // DefaultEdges = edges.FirstOrDefault(); - // if (DefaultEdges != null) - // { - // lockEdge = DefaultEdges.lockEdge; - // hingeEdge = DefaultEdges.hingeEdge; - // topEdge = DefaultEdges.topEdge; - // bottomEdge = DefaultEdges.bottomEdge; - - // } - // } - //} - //if (doorOp.DoorOpTypId == 20) - //{ - // var sizing = JsonConvert.DeserializeObject>(doorOp.JsoncConfigVal); - // if (sizing != null) - // { - // DefaultSizing = sizing.FirstOrDefault(); - // if (DefaultSizing != null) - // { - // width = double.Parse(DefaultSizing.width); - // height = double.Parse(DefaultSizing.height); - // thickness = double.Parse(DefaultSizing.thickness); - // } - // } - //} - //if (doorOp.DoorOpTypId == 21) - //{ - // var opening = JsonConvert.DeserializeObject>(doorOp.JsoncConfigVal); - // if (opening != null) - // { - // DefaultOpening = opening.FirstOrDefault(); - // if (DefaultOpening != null) - // { - // swing = DefaultOpening.swing; - // } - // } - //} + _currInStep = value; + Task.Run(async () => await ReloadData()); } } } + protected async Task ReloadData() + { + ListVals = await WDService.ListValuesGetAll("DoorDef", currInStep); + + ListDoorOp = await WDService.DoorOpGetByDoorId(DoorId); + } + protected override async Task OnParametersSetAsync() { if (!paramIsChanged)