From 04f0044b365023f599a89df38da98d32264b4338 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Wed, 19 Apr 2023 10:42:56 +0200 Subject: [PATCH] fix disegno parametri iniziali --- .../Components/DoorDef/DoorDefHwStep.razor | 4 - .../Components/DoorDef/DoorDefHwStep.razor.cs | 21 --- .../Components/DoorDef/DoorDefSizingSI.razor | 23 +++- .../DoorDef/DoorDefSizingSI.razor.cs | 10 +- .../Components/DoorDef/DoorSizingStep.razor | 106 --------------- .../DoorDef/DoorSizingStep.razor.cs | 126 ------------------ .../Order/OrderDetailsDoorsList.razor | 1 - .../Order/OrderDetailsDoorsList.razor.cs | 33 ----- WebDoorCreator.UI/Pages/DoorDefinition.razor | 35 +++-- .../Pages/DoorDefinition.razor.cs | 6 + WebDoorCreator.UI/Pages/OrderDetails.razor.cs | 3 +- WebDoorCreator.UI/temp/Conf.yaml | 12 +- 12 files changed, 52 insertions(+), 328 deletions(-) delete mode 100644 WebDoorCreator.UI/Components/DoorDef/DoorDefHwStep.razor delete mode 100644 WebDoorCreator.UI/Components/DoorDef/DoorDefHwStep.razor.cs delete mode 100644 WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor delete mode 100644 WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor.cs delete mode 100644 WebDoorCreator.UI/Components/Order/OrderDetailsDoorsList.razor delete mode 100644 WebDoorCreator.UI/Components/Order/OrderDetailsDoorsList.razor.cs diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorDefHwStep.razor b/WebDoorCreator.UI/Components/DoorDef/DoorDefHwStep.razor deleted file mode 100644 index 4460ef1..0000000 --- a/WebDoorCreator.UI/Components/DoorDef/DoorDefHwStep.razor +++ /dev/null @@ -1,4 +0,0 @@ -@if(ListGraphicParams != null){ - -} - diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorDefHwStep.razor.cs b/WebDoorCreator.UI/Components/DoorDef/DoorDefHwStep.razor.cs deleted file mode 100644 index ae3c766..0000000 --- a/WebDoorCreator.UI/Components/DoorDef/DoorDefHwStep.razor.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Microsoft.AspNetCore.Components; -using WebDoorCreator.Data.DbModels; -using WebDoorCreator.UI.Data; - -namespace WebDoorCreator.UI.Components.DoorDef -{ - public partial class DoorDefHwStep - { - - [Inject] - protected WebDoorCreatorService WDService { get; set; } = null!; - - List? ListGraphicParams { get; set; } = null; - - - protected async override Task OnInitializedAsync() - { - ListGraphicParams = await WDService.ParamGetByHwId(6); - } - } -} \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor b/WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor index add4409..17431bd 100644 --- a/WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor +++ b/WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor @@ -7,7 +7,7 @@ else
-
+
@foreach (var item in currVal) { @if (isCombo(item.Key)) @@ -20,8 +20,8 @@ else @@ -36,13 +36,22 @@ else
- - } } + @if (doCheckVal()) + { +
+
+ + +
+
+ }
- -
diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor.cs b/WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor.cs index 2ca4f88..f6ff8c3 100644 --- a/WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor.cs +++ b/WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor.cs @@ -206,13 +206,13 @@ namespace WebDoorCreator.UI.Components.DoorDef { setupCurrValues(); setupGraphicParams(); - await ReloadData(isFirst); + //await ReloadData(isFirst); } - private async Task ReloadData(bool isFirst) - { - - } + //private async Task ReloadData(bool isFirst) + //{ + // await FullReloadData(true); + //} #endregion Private Methods } diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor b/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor deleted file mode 100644 index 7921aa6..0000000 --- a/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor +++ /dev/null @@ -1,106 +0,0 @@ -
-
Sizing
-
Opening
-
Edges
-
- - -
- @if (ListVals != null) - { - @foreach (var size in ListVals) - { -
-
@size.Label
- @if (isEdges) - { - - } - -
- } - } - @*@if (isSizing) - { - @if (ListVals != null) - { - @foreach (var size in ListVals.Where(x => x.Value != "Swing")) - { -
-
@size.Label
- -
- } - } - } - else if (isOpening) - { - @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
- -
- }*@ -
\ No newline at end of file diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor.cs b/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor.cs deleted file mode 100644 index 01823c8..0000000 --- a/WebDoorCreator.UI/Components/DoorDef/DoorSizingStep.razor.cs +++ /dev/null @@ -1,126 +0,0 @@ -using Microsoft.AspNetCore.Components; -using Newtonsoft.Json; -using WebDoorCreator.Data.DbModels; -using WebDoorCreator.UI.Data; - -namespace WebDoorCreator.UI.Components.DoorDef -{ - public partial class DoorSizingStep - { - [Inject] - protected WebDoorCreatorService WDService { get; set; } = null!; - - [Inject] - protected WDCCurrDataService CamDataServ { get; set; } = null!; - - [Parameter] - public int DoorId { get; set; } = 0; - - [Parameter] - public EventCallback E_paramChanged { get; set; } - - protected bool isSizing { get; set; } = true; - - protected List? ListVals { get; set; } = null; - protected List? ListDoorOp { get; set; } = null; - - protected string isSizingActive - { - get => isSizing ? "btn-primary" : "btn-secondary"; - } - - protected bool isOpening { get; set; } = false; - - protected string isOpeningActive - { - get => isOpening ? "btn-primary" : "btn-secondary"; - } - - protected bool isEdges { get; set; } = false; - protected bool paramIsChanged { get; set; } = false; - - protected string isEdgesActive - { - get => isEdges ? "btn-primary" : "btn-secondary"; - } - - protected async void setSizing() - { - isOpening = false; - isEdges = false; - isSizing = true; - await ReloadData(); - } - - protected void setOpening() - { - isEdges = false; - isSizing = false; - isOpening = true; - } - - protected async void setEdges() - { - isOpening = false; - isSizing = false; - isEdges = true; - await ReloadData(); - } - - protected string _lockEdge { get; set; } = ""; - - //protected string lockEdge - //{ - // get => _lockEdge; - // set - // { - // _lockEdge = value; - // if (DefaultEdges != null) - // { - // if (_lockEdge != DefaultEdges.lockEdge) - // { - // paramIsChanged = true; - // var pUpd = Task.Run(async () => await CamDataServ.sendCalcReq($"ORD{DoorId:00000}")); - // } - // } - // } - //} - - protected string _height { get; set; } = ""; - - //protected string height - //{ - // get => _height; - // set - // { - // _height = value; - // if (DefaultSizing != null) - // { - // if (_height != DefaultSizing.height) - // { - // paramIsChanged = true; - // var pUpd = Task.Run(async () => await CamDataServ.sendCalcReq($"ORD{DoorId:00000}")); - // } - // } - // } - //} - - - protected async Task ReloadData() - { - //ListVals = null; - //ListVals.Clear(); - - ListDoorOp = await WDService.DoorOpGetByDoorId(DoorId); - } - - protected override async Task OnParametersSetAsync() - { - if (!paramIsChanged) - { - await ReloadData(); - } - } - - } -} \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/Order/OrderDetailsDoorsList.razor b/WebDoorCreator.UI/Components/Order/OrderDetailsDoorsList.razor deleted file mode 100644 index 5f28270..0000000 --- a/WebDoorCreator.UI/Components/Order/OrderDetailsDoorsList.razor +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/Order/OrderDetailsDoorsList.razor.cs b/WebDoorCreator.UI/Components/Order/OrderDetailsDoorsList.razor.cs deleted file mode 100644 index 82b4119..0000000 --- a/WebDoorCreator.UI/Components/Order/OrderDetailsDoorsList.razor.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Components; -using System.Net.Http; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components.Routing; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.Web.Virtualization; -using Microsoft.JSInterop; -using WebDoorCreator.UI; -using WebDoorCreator.UI.Components; -using WebDoorCreator.UI.Components.Buttons; -using WebDoorCreator.UI.Components.CompMan; -using WebDoorCreator.UI.Components.DoorMan; -using WebDoorCreator.UI.Components.DoorDef; -using WebDoorCreator.UI.Components.Gen; -using WebDoorCreator.UI.Components.Order; -using WebDoorCreator.UI.Components.Users; -using WebDoorCreator.UI.Shared; -using WebDoorCreator.Data.DbModels; - -namespace WebDoorCreator.UI.Components.Order -{ - public partial class OrderDetailsDoorsList - { - [Parameter] - public OrderStatusViewModel? currOrderStatus { get; set; } = null; - } -} \ No newline at end of file diff --git a/WebDoorCreator.UI/Pages/DoorDefinition.razor b/WebDoorCreator.UI/Pages/DoorDefinition.razor index 2f4d402..5f76f10 100644 --- a/WebDoorCreator.UI/Pages/DoorDefinition.razor +++ b/WebDoorCreator.UI/Pages/DoorDefinition.razor @@ -14,19 +14,28 @@
- @if (currDefStep == Core.Enum.DoorDefStep.Door) - { - - - - @**@ - } - else if (currDefStep == Core.Enum.DoorDefStep.Hardware) - { - - - - } +
+ + @if (currDefStep == Core.Enum.DoorDefStep.Door) + { + @if (ListBaseDoorOp != null) + { + @foreach (var item in ListBaseDoorOp) + { + + + + } + } + @**@ + } + else if (currDefStep == Core.Enum.DoorDefStep.Hardware) + { + + + + } +
diff --git a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs index 22cfade..68f7734 100644 --- a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs +++ b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs @@ -76,6 +76,11 @@ namespace WebDoorCreator.UI.Pages protected async Task ReloadData() { + var ListRecordDoorOp = await WDService.DoorOpGetByDoorId(idDoor); + if (ListRecordDoorOp != null) + { + ListBaseDoorOp = ListRecordDoorOp.Where(x => x.ObjectId == "1" || x.ObjectId == "2").ToList(); + } var domani = DateTime.Today.AddDays(1); ListOrdersStatus = null; await Task.Delay(1); @@ -94,6 +99,7 @@ namespace WebDoorCreator.UI.Pages private static Logger Log = LogManager.GetCurrentClassLogger(); private List? ListOrdersStatus = null; + private List? ListBaseDoorOp = null; #endregion Private Fields diff --git a/WebDoorCreator.UI/Pages/OrderDetails.razor.cs b/WebDoorCreator.UI/Pages/OrderDetails.razor.cs index 3c43381..de31281 100644 --- a/WebDoorCreator.UI/Pages/OrderDetails.razor.cs +++ b/WebDoorCreator.UI/Pages/OrderDetails.razor.cs @@ -117,6 +117,7 @@ namespace WebDoorCreator.UI.Pages // salvo Door OP associate //bool fatto = await WDService.DoorOpInsert(doorId, listOp); defaultDict.Clear(); + actDict.Clear(); foreach (var item in listRecordEdge) { if (item.isSerializable && item.DefaultVal.Contains(",")) @@ -144,7 +145,7 @@ namespace WebDoorCreator.UI.Pages DateMod = adesso, UserIdIns = WDCUService.userId, UserIdMod = WDCUService.userId, - ObjectId = "1", + ObjectId = "2", DoorId = doorId, JsoncConfigVal = jsonDef, JsoncActVal = jsonAct diff --git a/WebDoorCreator.UI/temp/Conf.yaml b/WebDoorCreator.UI/temp/Conf.yaml index 5c6c125..866fb9f 100644 --- a/WebDoorCreator.UI/temp/Conf.yaml +++ b/WebDoorCreator.UI/temp/Conf.yaml @@ -12,7 +12,7 @@ order: project: pO: line: -date: 2023-04-18T16:04:34.2625885+02:00 +date: 2023-04-19T10:34:02.0077472+02:00 piece: DO_1 size: width: 33.8125 @@ -38,15 +38,5 @@ profiles: type: BV machining: ON overmaterial: 0.1 -ept: - - template: Generic\StdEPT - ToptoCL: 15 - FacetoCL: 0.875 -flush_bolts: - - template: Corner\8501 - type: corner - side: top - position: 5 - offset_WS: 0.0 ---