diff --git a/WebDoorCreator.UI.sln b/WebDoorCreator.UI.sln index 56c570c..4650908 100644 --- a/WebDoorCreator.UI.sln +++ b/WebDoorCreator.UI.sln @@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDoorCreator.Core", "WebD EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDoorCreator.Data", "WebDoorCreator.Data\WebDoorCreator.Data.csproj", "{26466C0D-8946-466B-A38C-C1A9603DA2DC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebDoorCreator.API", "WebDoorCreator.API\WebDoorCreator.API.csproj", "{2DFE8045-2F56-43E2-9D2F-1180EF7AD721}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebDoorCreator.API", "WebDoorCreator.API\WebDoorCreator.API.csproj", "{2DFE8045-2F56-43E2-9D2F-1180EF7AD721}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/WebDoorCreator.UI/Components/DoorDef/BaseParamList.razor b/WebDoorCreator.UI/Components/DoorDef/BaseParamList.razor new file mode 100644 index 0000000..088c155 --- /dev/null +++ b/WebDoorCreator.UI/Components/DoorDef/BaseParamList.razor @@ -0,0 +1,16 @@ +@if (CurrBaseDoorOp == null) +{ + +} +else +{ + int numIdx = 1; + @foreach (var item in CurrBaseDoorOp) + { +
+

record @(numIdx++)

+ +
+
+ } +} \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/DoorDef/BaseParamList.razor.cs b/WebDoorCreator.UI/Components/DoorDef/BaseParamList.razor.cs new file mode 100644 index 0000000..b39dd9f --- /dev/null +++ b/WebDoorCreator.UI/Components/DoorDef/BaseParamList.razor.cs @@ -0,0 +1,41 @@ +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.Components.Hardware; +using WebDoorCreator.UI.Shared; +using WebDoorCreator.Data.DbModels; + +namespace WebDoorCreator.UI.Components.DoorDef +{ + public partial class BaseParamList + { + /// + /// Elenco parametri di base + /// + [Parameter] + public List? CurrBaseDoorOp { get; set; } = null; + + + protected string userLang { get; set; } = "EN"; + + } +} \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor b/WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor index ff96ed2..f51303f 100644 --- a/WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor +++ b/WebDoorCreator.UI/Components/DoorDef/DoorDefSizingSI.razor @@ -1,6 +1,6 @@ @if (currVal == null) { - + } else { diff --git a/WebDoorCreator.UI/Data/WDCUserService.cs b/WebDoorCreator.UI/Data/WDCUserService.cs index 1af9414..58690c1 100644 --- a/WebDoorCreator.UI/Data/WDCUserService.cs +++ b/WebDoorCreator.UI/Data/WDCUserService.cs @@ -19,6 +19,8 @@ #region Public Properties + public Dictionary UserPref { get; set; } = new Dictionary(); + public string userId { get => _userId; diff --git a/WebDoorCreator.UI/Pages/DoorDefinition.razor b/WebDoorCreator.UI/Pages/DoorDefinition.razor index 4b0d31c..1c83fc2 100644 --- a/WebDoorCreator.UI/Pages/DoorDefinition.razor +++ b/WebDoorCreator.UI/Pages/DoorDefinition.razor @@ -16,25 +16,20 @@
- @if (currDefStep == Core.Enum.DoorDefStep.Door) - { - @if (ListBaseDoorOp != null) + + @if (currDefStep == Core.Enum.DoorDefStep.Door) { - @foreach (var item in ListBaseDoorOp) + @if (ListBaseDoorOp != null) { - - - + } + @**@ } - @**@ - } - else if (currDefStep == Core.Enum.DoorDefStep.Hardware) - { - + else if (currDefStep == Core.Enum.DoorDefStep.Hardware) + { - - } + } +
diff --git a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs index 6f7e7f2..cea9212 100644 --- a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs +++ b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs @@ -15,6 +15,8 @@ namespace WebDoorCreator.UI.Pages public void Dispose() { + ListBaseDoorOp = null; + orderStatus = null; WDCUService.EA_CurrLanguage -= WDUService_EA_CurrLanguage; QDataServ.CalcDonePipe.EA_NewMessage -= CalcDonePipe_EA_NewMessage; } @@ -81,10 +83,20 @@ namespace WebDoorCreator.UI.Pages protected async Task ReloadData() { + ListBaseDoorOp = null; + ListHwDoorOp = null; + orderStatus = null; + await Task.Delay(1); var ListRecordDoorOp = await WDService.DoorOpGetByDoorId(idDoor); if (ListRecordDoorOp != null) { + ListHwDoorOp = ListRecordDoorOp; ListBaseDoorOp = ListRecordDoorOp.Where(x => x.ObjectId == "Size" || x.ObjectId == "Profiles").ToList(); + // calcolo gli hw togliendo DoorOpBase + foreach (var item in ListBaseDoorOp) + { + ListHwDoorOp.Remove(item); + } } var domani = DateTime.Today.AddDays(1); ListOrdersStatus = null; @@ -97,22 +109,6 @@ namespace WebDoorCreator.UI.Pages await Task.Delay(1); } - #endregion Protected Methods - - #region Private Fields - - private static Logger Log = LogManager.GetCurrentClassLogger(); - - private List? ListBaseDoorOp = null; - private List? ListOrdersStatus = null; - - #endregion Private Fields - - #region Private Methods - - private Core.Enum.DoorDefStep currDefStep { get; set; } = Core.Enum.DoorDefStep.Door; - private bool setHwToNull { get; set; } = false; - /// /// gestione impostazione step /// @@ -129,6 +125,26 @@ namespace WebDoorCreator.UI.Pages } } + #endregion Protected Methods + + #region Private Fields + + private static Logger Log = LogManager.GetCurrentClassLogger(); + + #endregion Private Fields + + #region Private Properties + + private Core.Enum.DoorDefStep currDefStep { get; set; } = Core.Enum.DoorDefStep.Door; + private List? ListBaseDoorOp { get; set; } = null; + private List? ListHwDoorOp { get; set; } = null; + private List? ListOrdersStatus { get; set; } = null; + private bool setHwToNull { get; set; } = false; + + #endregion Private Properties + + #region Private Methods + private async void CalcDonePipe_EA_NewMessage(object? sender, EventArgs e) { DoorSvgContent = ""; diff --git a/WebDoorCreator.UI/temp/Conf.yaml b/WebDoorCreator.UI/temp/Conf.yaml index a900ed4..bedbbc1 100644 --- a/WebDoorCreator.UI/temp/Conf.yaml +++ b/WebDoorCreator.UI/temp/Conf.yaml @@ -12,7 +12,7 @@ order: project: pO: line: -date: 21-04-2023 +date: 2023-04-26T12:20:39.8125610+02:00 piece: DO_1 size: width: 33.8125 @@ -21,7 +21,7 @@ size: swing: RH secure: UP material: wood -profiles: +profiles: lockedge: type: BV machining: ON @@ -41,26 +41,8 @@ profiles: hardware: ept: - template: Generic\StdEPT - ToptoCL: 15 + ToptoCL: 16 FacetoCL: 0.875 - - template: Generic\StdEPT - ToptoCL: 15 - FacetoCL: 0.875 - - flush_bolts: - - template: Corner\8501 - type: corner - side: top - position: 5 - offset_WS: 0.0 - - groove: - - template: Generic\Groove - type: side - width: 0.6 - depth: 0.8 - offset_WS: 0 - side: bottom ---