diff --git a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor index 59a4883..67d3ebf 100644 --- a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor +++ b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor @@ -4,6 +4,10 @@ { + @if (IsErr) + { + + } } else { @@ -11,4 +15,24 @@ } @**@ + + + + \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs index 85cf504..919aa7c 100644 --- a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs +++ b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs @@ -14,33 +14,16 @@ namespace WebDoorCreator.UI.Components.Buttons [CascadingParameter] public bool B_doorOpUpd { get; set; } + [CascadingParameter] + public string ErrCode { get; set; } = "ERROREEEEE"; + [CascadingParameter] + public int idDoor { get; set; } = 0; + [Parameter] public int idOrd { get; set; } = 0; [CascadingParameter] - public int idDoor { get; set; } = 0; - - [Inject] - protected IJSRuntime JSRuntime { get; set; } = null!; - - [Inject] - protected NavigationManager NavManager { get; set; } = null!; - - [Inject] - protected WebDoorCreatorService WDCService { get; set; } = null!; - [Inject] - protected WDCUserService WDCUService { get; set; } = null!; - - [Inject] - protected QueueDataService QDataServ { get; set; } = null!; - - - [Inject] - protected IConfiguration config { get; set; } = null!; - - protected List? listDoorOp { get; set; } - protected List> listDictDoorOP { get; set; } = new List>(); - protected Dictionary>> dictDoorOP { get; set; } = new Dictionary>>(); + public bool IsErr { get; set; } = false; protected Dictionary a { get; set; } = new Dictionary(); protected bool change @@ -48,23 +31,39 @@ namespace WebDoorCreator.UI.Components.Buttons get => WDCRService.isDoorOpUpd; } - protected async Task toOrderPage() - { - if (!await JSRuntime.InvokeAsync("confirm", $"Do you really want to return to the order page without saving current work?")) - return; + [Inject] + protected IConfiguration config { get; set; } = null!; - await Task.Delay(1); - NavManager.NavigateTo($"OrderDetails?idOrd={idOrd}"); - } + protected WebDoorCreator.Data.DDF.Converter currDdfConv { get; set; } = null!; - protected override async Task OnParametersSetAsync() - { - await Task.Delay(1); - //change = paramsChanged; - } protected DDFDto CurrentConf { get; set; } = new DDFDto(); + protected DoorOpsDTO CurrentDoorOp { get; set; } = new DoorOpsDTO(); + + protected Dictionary>> dictDoorOP { get; set; } = new Dictionary>>(); + + [Inject] + protected IJSRuntime JSRuntime { get; set; } = null!; + + protected List> listDictDoorOP { get; set; } = new List>(); + + protected List? listDoorOp { get; set; } + + [Inject] + protected NavigationManager NavManager { get; set; } = null!; + protected List ordListVal { get; set; } = new List(); + + [Inject] + protected QueueDataService QDataServ { get; set; } = null!; + + [Inject] + protected WDCRefreshService WDCRService { get; set; } = null!; + + [Inject] + protected WebDoorCreatorService WDCService { get; set; } = null!; + [Inject] + protected WDCUserService WDCUService { get; set; } = null!; public async Task SaveYaml(string ddfContent) { await Task.Delay(1); @@ -78,28 +77,15 @@ namespace WebDoorCreator.UI.Components.Buttons File.WriteAllText(fileName, ddfContent); } - protected override void OnInitialized() + /// + /// Effettua Richiesta visione porta 3D + /// + /// + protected async Task doReq3D() { - base.OnInitialized(); - 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>(); - currDdfConv = new WebDoorCreator.Data.DDF.Converter(vers, remDoorOp, headRows, footRows); - WDCRService.EA_UpdDoorOp += WDCRService_EA_UpdDoorOp; + await Task.Delay(1); } - private async void WDCRService_EA_UpdDoorOp() - { - await InvokeAsync(() => - { - StateHasChanged(); - }); - } - - [Inject] - protected WDCRefreshService WDCRService { get; set; } = null!; - /// /// Effettua salvataggio record e generazione DDF /// @@ -133,15 +119,38 @@ namespace WebDoorCreator.UI.Components.Buttons } } } - /// - /// Effettua Richiesta visione porta 3D - /// - /// - protected async Task doReq3D() + + protected override void OnInitialized() { - await Task.Delay(1); + base.OnInitialized(); + 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>(); + currDdfConv = new WebDoorCreator.Data.DDF.Converter(vers, remDoorOp, headRows, footRows); + WDCRService.EA_UpdDoorOp += WDCRService_EA_UpdDoorOp; } - protected WebDoorCreator.Data.DDF.Converter currDdfConv { get; set; } = null!; + protected override async Task OnParametersSetAsync() + { + await Task.Delay(1); + //change = paramsChanged; + } + + protected async Task toOrderPage() + { + if (!await JSRuntime.InvokeAsync("confirm", $"Do you really want to return to the order page without saving current work?")) + return; + + await Task.Delay(1); + NavManager.NavigateTo($"OrderDetails?idOrd={idOrd}"); + } + private async void WDCRService_EA_UpdDoorOp() + { + await InvokeAsync(() => + { + StateHasChanged(); + }); + } } } \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorPreview.razor b/WebDoorCreator.UI/Components/DoorDef/DoorPreview.razor index 7e357ee..c895b27 100644 --- a/WebDoorCreator.UI/Components/DoorDef/DoorPreview.razor +++ b/WebDoorCreator.UI/Components/DoorDef/DoorPreview.razor @@ -1,8 +1,8 @@ 
- @if (IsErr) + @*@if (IsErr) { -
@ErrCode
- } + @*
@ErrCode
+ }*@ @if (!string.IsNullOrEmpty(@SvgContent)) { @svgPreview diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorPreview.razor.cs b/WebDoorCreator.UI/Components/DoorDef/DoorPreview.razor.cs index f97f239..0845ee7 100644 --- a/WebDoorCreator.UI/Components/DoorDef/DoorPreview.razor.cs +++ b/WebDoorCreator.UI/Components/DoorDef/DoorPreview.razor.cs @@ -17,11 +17,7 @@ namespace WebDoorCreator.UI.Components.DoorDef //Log.Info($"Ricevuto {value}"); //StateHasChanged(); } - } - [Parameter] - public string ErrCode { get; set; } = "ERROREEEEE"; - [Parameter] - public bool IsErr { get; set; } = false; + } private static Logger Log = LogManager.GetCurrentClassLogger(); diff --git a/WebDoorCreator.UI/Pages/DoorDefinition.razor b/WebDoorCreator.UI/Pages/DoorDefinition.razor index d14a2e4..ea8fbe5 100644 --- a/WebDoorCreator.UI/Pages/DoorDefinition.razor +++ b/WebDoorCreator.UI/Pages/DoorDefinition.razor @@ -10,7 +10,11 @@
- + + + + +
@@ -41,8 +45,8 @@
- - + +
diff --git a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs index 4563c59..bf2dc96 100644 --- a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs +++ b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs @@ -28,12 +28,12 @@ namespace WebDoorCreator.UI.Pages protected bool B_doorOpUpd { get; set; } = false; protected string DoorSvgContent { get; set; } = ""; - protected string ErrCode { get; set; } = "ERRORE GRAVISSIMO! NON SI FA!!!!"; + protected string ErrCode { get; set; } = "Err=1002\r\n\r\n Error! Geometry: 534 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 535 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 545 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 546 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 547 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 548 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 549 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 550 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 551 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 552 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 553 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 558 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1491 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1495 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1496 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1497 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1498 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1499 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1505 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1506 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1507 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1508 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1509 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1510 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1511 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1512 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1513 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1514 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error! Geometry: 1515 of Lock: 1516, has not specified the SideDoor note\r\n Check the imported nge file loaded into ddf: c:\\EgtData\\WebDoor\\Ddf\\185.1.ddf \r\n Error. Kind of hardware: 8501 is allowed only on inactive door. actual door type: LH. Check ddf file \r\n Error. Kind of hardware: StdFaceStrike is allowed only on inactive door. actual door type: LH. Check ddf file "; protected int idDoor { get; set; } = 0; protected int idOrd { get; set; } = 0; - protected bool IsErr { get; set; } = false; + protected bool IsErr { get; set; } = true; [Inject] protected IJSRuntime JSRuntime { get; set; } = null!; @@ -192,7 +192,7 @@ namespace WebDoorCreator.UI.Pages if (string.IsNullOrEmpty(DoorSvgContent)) { IsErr = true; - ErrCode = await QDataServ.DoorErrGet(doorSvgVers); + //ErrCode = await QDataServ.DoorErrGet(doorSvgVers); } await Task.Run(async () => await InvokeAsync(StateHasChanged)); }