diff --git a/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor b/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor index 56073e0..a55e0e1 100644 --- a/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor +++ b/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor @@ -1,10 +1,10 @@ -@if (DoorOpList != null) +@if (isLoading) { - @if (isLoading) - { - - } - else + +} +else +{ + @if (DoorOpList != null) {
@foreach (var item in DoorOpList) diff --git a/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor.cs b/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor.cs index 8db9840..4585a5c 100644 --- a/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor.cs +++ b/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor.cs @@ -1,12 +1,13 @@ using Microsoft.AspNetCore.Components; using WebDoorCreator.Data; using WebDoorCreator.Data.DbModels; +using WebDoorCreator.UI.Components.DoorMan; using WebDoorCreator.UI.Data; using static WebDoorCreator.UI.Data.WDCRefreshService; namespace WebDoorCreator.UI.Components.Hardware { - public partial class HardwareNewPanel:IDisposable + public partial class HardwareNewPanel : IDisposable { #region Public Properties @@ -128,16 +129,24 @@ namespace WebDoorCreator.UI.Components.Hardware protected bool isLoading { get; set; } = false; + protected List? ListRecord { get; set; } = null; + private async Task ReloadData() { isLoading = true; - var ListRecord = await WDCService.DoorOpGetByDoorId(DoorId); + //await Task.Delay(50); + await InvokeAsync(StateHasChanged); + ListRecord = null; + DoorOpList = null; + await Task.Delay(1); + ListRecord = await WDCService.DoorOpGetByDoorId(DoorId); var tempListVal = await WDCService.ListValuesGetAll(HwCode, "Folder"); if (ListRecord != null) { DoorOpList = ListRecord.Where(x => (x.DoorId == DoorId) && (x.ObjectId == HwCode)).ToList(); } isLoading = false; + await InvokeAsync(StateHasChanged); } #endregion Private Methods diff --git a/WebDoorCreator.UI/temp/Conf.yaml b/WebDoorCreator.UI/temp/Conf.yaml index 0b60a81..74a49d4 100644 --- a/WebDoorCreator.UI/temp/Conf.yaml +++ b/WebDoorCreator.UI/temp/Conf.yaml @@ -12,7 +12,7 @@ order: project: pO: line: -date: 2023-05-15T00:00:00.0000000+02:00 +date: 2023-05-16T00:00:00.0000000+02:00 piece: DO_1 size: width: 33.8125 @@ -40,19 +40,19 @@ profiles: overmaterial: 0.1 hardware: vision_cut_outs: - - shape: Generic\Circle - radius: 10 - center_from_top: 20 - center_from_lock: 0 + - shape: Generic\Rect + length: 30 + width: 16 + top_rail: 5.5 + lock_stile: 0 + radius: 0 door_center: center - louver_cut_outs: - - shape: Generic\Cuore2.nge - length: 10.0000 - width: 18.8125 - bottom_rail: 8.0 - lock_stile: 0.0 - door_center: center + mail_slots: + - template: Generic\Rect + height: 3 + bottom_rail: 20 + delta_center: 0 hinges: - template: Generic Conceiled\StdConHingeDeepR @@ -60,7 +60,7 @@ hardware: back_set: 0.125 thickness: 0.25 - template: Generic Conceiled\StdConHingeDeepR - ToptoCL: 28,9375 + ToptoCL: 4.875 back_set: 0.125 thickness: 0.25