diff --git a/Test.UI/Components/Pages/EditJWD.razor b/Test.UI/Components/Pages/EditJWD.razor index 8fdf09d..023ae55 100644 --- a/Test.UI/Components/Pages/EditJWD.razor +++ b/Test.UI/Components/Pages/EditJWD.razor @@ -29,9 +29,9 @@
- Material - + @foreach (var item in AvailWoodList) { } @@ -63,7 +63,7 @@
- +
diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs index bae3fd5..ffa074f 100644 --- a/Test.UI/Components/Pages/EditJWD.razor.cs +++ b/Test.UI/Components/Pages/EditJWD.razor.cs @@ -106,7 +106,7 @@ namespace Test.UI.Components.Pages FamilyHardware = AvailFamilyHardwareList, Glass = AvailGlassList, Hardware = AvailHardwareList, - Material = AvailMaterialList, + Wood = AvailWoodList, ProfileList = profList }; CurrData = new LivePayload() @@ -157,7 +157,7 @@ namespace Test.UI.Components.Pages private string SelGlass { get; set; } = ""; - private string SelMaterial { get; set; } = ""; + private string SelWood { get; set; } = ""; #endregion Private Properties @@ -171,7 +171,7 @@ namespace Test.UI.Components.Pages private List AvailFamilyHardwareList = new List(); private List AvailGlassList = new List(); private List AvailHardwareList = new(); - private List AvailMaterialList = new List(); + private List AvailWoodList = new List(); private List AvailProfileList = new(); private List DescriptionProfileList = new(); @@ -235,7 +235,7 @@ namespace Test.UI.Components.Pages private string familyHWMassUpdate; private string glassMassUpdate; private Hardware hardwareMassUpdate; - private string materialMassUpdate; + private string woodMassUpdate; private string profileMassUpdate; private string outClose = ""; @@ -305,7 +305,7 @@ namespace Test.UI.Components.Pages AvailHardwareList = AllConfHardware .Select(x => new Egw.Window.Data.Hardware(x.Id, x.FamilyName, x.Description, x.OpeningType, x.Shape, x.SashQty, x.SashPosition)) .ToList(); - AvailMaterialList = AllConfWood + AvailWoodList = AllConfWood .Select(x => x.Description) .ToList(); AvailColorMaterialList = AllColors @@ -497,15 +497,15 @@ namespace Test.UI.Components.Pages return InvokeAsync(StateHasChanged); } - private async Task UpdateInfoJwdAsync(string currSer, string? newFamilyHardware, string? newColorMaterial, string? newMaterial, string? newGlass, string? newProfile) + private async Task UpdateInfoJwdAsync(string currSer, string? newFamilyHardware, string? newColorMaterial, string? newWood, string? newGlass, string? newProfile) { Dictionary DictParam = new Dictionary(); if (!string.IsNullOrEmpty(newFamilyHardware)) DictParam.Add( "FamilyHardware", newFamilyHardware! ); if (!string.IsNullOrEmpty(newColorMaterial)) DictParam.Add("Color", newColorMaterial!); - if (!string.IsNullOrEmpty(newMaterial)) - DictParam.Add("Material", newMaterial!); + if (!string.IsNullOrEmpty(newWood)) + DictParam.Add("Wood", newWood!); if (!string.IsNullOrEmpty(newGlass)) DictParam.Add("Glass", newGlass!); if (!string.IsNullOrEmpty(newProfile)) diff --git a/Test.UI/Components/Pages/Home.razor.cs b/Test.UI/Components/Pages/Home.razor.cs index 0964fff..20891c5 100644 --- a/Test.UI/Components/Pages/Home.razor.cs +++ b/Test.UI/Components/Pages/Home.razor.cs @@ -344,7 +344,7 @@ namespace Test.UI.Components.Pages FamilyHardware = AvailFamilyHardwareList, Glass = AvailGlassList, Hardware = AvailHardwareList, - Material = AvailMaterialList + Wood = AvailMaterialList }; } diff --git a/Test.UI/Components/Pages/TestError.razor.cs b/Test.UI/Components/Pages/TestError.razor.cs index 78e7347..e93793f 100644 --- a/Test.UI/Components/Pages/TestError.razor.cs +++ b/Test.UI/Components/Pages/TestError.razor.cs @@ -361,7 +361,7 @@ namespace Test.UI.Components.Pages FamilyHardware = AvailFamilyHardwareList, Glass = AvailGlassList, Hardware = AvailHardwareList, - Material = AvailMaterialList, + Wood = AvailMaterialList, ProfileList = AvailProfileList }; CurrData = new LivePayload() diff --git a/Test.UI/Data/AntaDoppia.jwd b/Test.UI/Data/AntaDoppia.jwd index 9e2534c..337f95a 100644 --- a/Test.UI/Data/AntaDoppia.jwd +++ b/Test.UI/Data/AntaDoppia.jwd @@ -1,6 +1,6 @@ { "ProfilePath": "Profilo78", - "Material": "Pino", + "Wood": "Pino", "ColorMaterial": "Black", "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ diff --git a/Test.UI/Data/AntaDoppiaInglesine.jwd b/Test.UI/Data/AntaDoppiaInglesine.jwd index d81929a..6e18c07 100644 --- a/Test.UI/Data/AntaDoppiaInglesine.jwd +++ b/Test.UI/Data/AntaDoppiaInglesine.jwd @@ -1,6 +1,6 @@ { "ProfilePath": "Profilo78", - "Material": "Pino", + "Wood": "Pino", "ColorMaterial": "Black", "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ diff --git a/Test.UI/Data/AntaSingola.jwd b/Test.UI/Data/AntaSingola.jwd index d24dcfa..e36ec1c 100644 --- a/Test.UI/Data/AntaSingola.jwd +++ b/Test.UI/Data/AntaSingola.jwd @@ -1,6 +1,6 @@ { "ProfilePath": "Profilo78", - "Material": "Pino", + "Wood": "Pino", "ColorMaterial": "Black", "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ diff --git a/Test.UI/Data/ArcoAntaDoppia.jwd b/Test.UI/Data/ArcoAntaDoppia.jwd index 584e9b4..2c35898 100644 --- a/Test.UI/Data/ArcoAntaDoppia.jwd +++ b/Test.UI/Data/ArcoAntaDoppia.jwd @@ -1,6 +1,6 @@ { "ProfilePath": "Profilo78", - "Material": "Pino", + "Wood": "Pino", "ColorMaterial": "Black", "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ diff --git a/Test.UI/Data/FinDueAnteBottomFisso.jwd b/Test.UI/Data/FinDueAnteBottomFisso.jwd index a543f83..4c2da53 100644 --- a/Test.UI/Data/FinDueAnteBottomFisso.jwd +++ b/Test.UI/Data/FinDueAnteBottomFisso.jwd @@ -1,6 +1,6 @@ { "ProfilePath": "Profilo78", - "Material": "Pino", + "Wood": "Pino", "ColorMaterial": "Black", "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ diff --git a/Test.UI/Data/FinestraDueAnteSeparate.jwd b/Test.UI/Data/FinestraDueAnteSeparate.jwd index a25d7b6..6365a9c 100644 --- a/Test.UI/Data/FinestraDueAnteSeparate.jwd +++ b/Test.UI/Data/FinestraDueAnteSeparate.jwd @@ -1,6 +1,6 @@ { "ProfilePath": "Profilo78", - "Material": "Pino", + "Wood": "Pino", "ColorMaterial": "Black", "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ diff --git a/Test.UI/Data/FinestraSplitGrid.jwd b/Test.UI/Data/FinestraSplitGrid.jwd index 021bbff..507b704 100644 --- a/Test.UI/Data/FinestraSplitGrid.jwd +++ b/Test.UI/Data/FinestraSplitGrid.jwd @@ -1,6 +1,6 @@ { "ProfilePath": "Profilo78", - "Material": "Pino", + "Wood": "Pino", "ColorMaterial": "Black", "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ diff --git a/Test.UI/Data/FinestraSplitHoriz.jwd b/Test.UI/Data/FinestraSplitHoriz.jwd index 15614a1..b1d9813 100644 --- a/Test.UI/Data/FinestraSplitHoriz.jwd +++ b/Test.UI/Data/FinestraSplitHoriz.jwd @@ -1,6 +1,6 @@ { "ProfilePath": "Profilo78", - "Material": "Pino", + "Wood": "Pino", "ColorMaterial": "Black", "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ diff --git a/Test.UI/Data/FinestraSplitVert.jwd b/Test.UI/Data/FinestraSplitVert.jwd index 1d98e14..6e9a7ad 100644 --- a/Test.UI/Data/FinestraSplitVert.jwd +++ b/Test.UI/Data/FinestraSplitVert.jwd @@ -1,6 +1,6 @@ { "ProfilePath": "Profilo78", - "Material": "Pino", + "Wood": "Pino", "ColorMaterial": "Black", "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ diff --git a/WebWindowComplex/Compo/General.razor b/WebWindowComplex/Compo/General.razor index 96f0e55..6533afc 100644 --- a/WebWindowComplex/Compo/General.razor +++ b/WebWindowComplex/Compo/General.razor @@ -16,14 +16,14 @@
@if (User) { - Material - + Wood + } else { - - + @foreach (var item in ListPayload.Wood) { } diff --git a/WebWindowComplex/Compo/General.razor.cs b/WebWindowComplex/Compo/General.razor.cs index 308aee2..2d8c287 100644 --- a/WebWindowComplex/Compo/General.razor.cs +++ b/WebWindowComplex/Compo/General.razor.cs @@ -83,15 +83,15 @@ namespace WebWindowComplex.Compo /// /// Materiale corrente /// - protected string CurrMaterial + protected string CurrWood { - get => currMaterial; + get => currWood; set { - currMaterial = value; + currWood = value; var args = new DataUpdateGeneral { - Material = value, + Wood = value, }; _ = EC_UpdateGeneral.InvokeAsync(args); } @@ -137,7 +137,7 @@ namespace WebWindowComplex.Compo { currColor = CurrWindow.sColorMaterial; currGlass = CurrWindow.sGlass; - currMaterial = CurrWindow.sMaterial; + currWood = CurrWindow.sWood; currProfile = CurrWindow.sProfilePath; } @@ -147,7 +147,7 @@ namespace WebWindowComplex.Compo private string currColor = ""; private string currGlass = ""; - private string currMaterial = ""; + private string currWood = ""; private string currProfile = ""; #endregion Private Fields @@ -166,7 +166,7 @@ namespace WebWindowComplex.Compo { public string Color { get; set; } = ""; public string Glass { get; set; } = ""; - public string Material { get; set; } = ""; + public string Wood { get; set; } = ""; public string Profile { get; set; } = ""; } } \ No newline at end of file diff --git a/WebWindowComplex/DTO/BaseListPayload.cs b/WebWindowComplex/DTO/BaseListPayload.cs index a9021fc..c6c94f1 100644 --- a/WebWindowComplex/DTO/BaseListPayload.cs +++ b/WebWindowComplex/DTO/BaseListPayload.cs @@ -32,7 +32,7 @@ namespace WebWindowComplex.DTO /// /// Elenco Materiali impiegabili /// - public List Material { get; set; } = null!; + public List Wood { get; set; } = null!; /// /// Elenco vetri ammessi @@ -53,10 +53,10 @@ namespace WebWindowComplex.DTO bool famHwOK = FamilyHardware != null && FamilyHardware.Count > 0; bool hwOK = Hardware != null && Hardware.Count > 0; bool glassOK = Glass != null && Glass.Count > 0; - bool matOK = Material != null && Material.Count > 0; + bool woodOK = Wood != null && Wood.Count > 0; bool colorOK = ColorMaterial != null && ColorMaterial.Count > 0; bool profileOK = ProfileList != null && ProfileList.Count > 0; - return famHwOK && glassOK && hwOK && colorOK && matOK && profileOK; + return famHwOK && glassOK && hwOK && colorOK && woodOK && profileOK; } /// /// Verifica che Payload sia almeno parzialmente popolato @@ -67,10 +67,10 @@ namespace WebWindowComplex.DTO bool famHwOK = FamilyHardware != null && FamilyHardware.Count > 0; bool hwOK = Hardware != null && Hardware.Count > 0; bool glassOK = Glass != null && Glass.Count > 0; - bool matOK = Material != null && Material.Count > 0; + bool woodOK = Wood != null && Wood.Count > 0; bool colorOK = ColorMaterial != null && ColorMaterial.Count > 0; bool profileOK = ProfileList != null && ProfileList.Count > 0; - return famHwOK || glassOK || hwOK || colorOK || matOK || profileOK; + return famHwOK || glassOK || hwOK || colorOK || woodOK || profileOK; } } } diff --git a/WebWindowComplex/DTO/SelectPayload.cs b/WebWindowComplex/DTO/SelectPayload.cs index 466b2e0..0bc8d6b 100644 --- a/WebWindowComplex/DTO/SelectPayload.cs +++ b/WebWindowComplex/DTO/SelectPayload.cs @@ -27,7 +27,7 @@ namespace WebWindowComplex.DTO /// /// Materiale selezionato /// - public string Material { get; set; } = string.Empty; + public string Wood { get; set; } = string.Empty; /// /// Tipologia vetro selezionato @@ -48,9 +48,9 @@ namespace WebWindowComplex.DTO bool famHwOK = !string.IsNullOrEmpty(FamilyHardware); bool colorOK = !string.IsNullOrEmpty(ColorMaterial); bool glassOk = !string.IsNullOrEmpty(Glass); - bool matOK = !string.IsNullOrEmpty(Material); + bool woodOK = !string.IsNullOrEmpty(Wood); bool profileOK = !string.IsNullOrEmpty(Profile); - return famHwOK && colorOK && matOK && glassOk && profileOK; + return famHwOK && colorOK && woodOK && glassOk && profileOK; } /// @@ -61,10 +61,10 @@ namespace WebWindowComplex.DTO { bool famHwOK = FamilyHardware != null; bool glassOK = Glass != null; - bool matOK = Material != null; + bool woodOK = Wood != null; bool colorOK = ColorMaterial != null; bool profileOK = Profile != null; - return famHwOK || glassOK || colorOK || matOK || profileOK; + return famHwOK || glassOK || colorOK || woodOK || profileOK; } } } diff --git a/WebWindowComplex/Json/JsonUtility.cs b/WebWindowComplex/Json/JsonUtility.cs index 3418bcf..86f1d62 100644 --- a/WebWindowComplex/Json/JsonUtility.cs +++ b/WebWindowComplex/Json/JsonUtility.cs @@ -26,17 +26,17 @@ namespace WebWindowComplex.Json } } - private string m_sMaterial; + private string m_sWood; [JsonProperty] - public string Material + public string Wood { get { - return m_sMaterial; + return m_sWood; } set { - m_sMaterial = value; + m_sWood = value; } } @@ -82,10 +82,10 @@ namespace WebWindowComplex.Json } } - public JsonWindow(string ProfilePath, string Material, string ColorMaterial, string Glass) + public JsonWindow(string ProfilePath, string Wood, string ColorMaterial, string Glass) { m_sProfilePath = ProfilePath; - m_sMaterial = Material; + m_sWood = Wood; m_sColorMaterial = ColorMaterial; m_sGlass = Glass; } @@ -95,7 +95,7 @@ namespace WebWindowComplex.Json Window Window = new Window() { sProfilePath = m_sProfilePath, - sMaterial = m_sMaterial, + sWood = m_sWood, sColorMaterial = m_sColorMaterial, sGlass = m_sGlass }; diff --git a/WebWindowComplex/Models/Window.cs b/WebWindowComplex/Models/Window.cs index a0bdb63..0796e51 100644 --- a/WebWindowComplex/Models/Window.cs +++ b/WebWindowComplex/Models/Window.cs @@ -50,15 +50,15 @@ namespace WebWindowComplex.Models } } - public string sMaterial + public string sWood { get { - return m_sMaterial; + return m_sWood; } set { - m_sMaterial = value; + m_sWood = value; } } @@ -115,7 +115,7 @@ namespace WebWindowComplex.Models /// internal JsonWindow Serialize(bool hideHw = false) { - JsonWindow JsonWindow = new JsonWindow(sProfilePath, sMaterial, sColorMaterial, sGlass); + JsonWindow JsonWindow = new JsonWindow(sProfilePath, sWood, sColorMaterial, sGlass); foreach (var Area in AreaList) JsonWindow.AreaList.Add(Area.Serialize(hideHw)); return JsonWindow; @@ -133,7 +133,7 @@ namespace WebWindowComplex.Models private List m_AreaList = new List(); private string? m_sColorMaterial; private string? m_sGlass; - private string? m_sMaterial; + private string? m_sWood; private string? m_sProfilePath; #endregion Private Fields diff --git a/WebWindowComplex/SerialMan.cs b/WebWindowComplex/SerialMan.cs index 7217fa5..dbec0af 100644 --- a/WebWindowComplex/SerialMan.cs +++ b/WebWindowComplex/SerialMan.cs @@ -40,10 +40,10 @@ namespace WebWindowComplex currWindow.sColorMaterial = DictParameter.GetValueOrDefault("Color")!; DictParameter.Remove("Color"); } - if (!string.IsNullOrEmpty(DictParameter.GetValueOrDefault("Material"))) + if (!string.IsNullOrEmpty(DictParameter.GetValueOrDefault("Wood"))) { - currWindow.sMaterial = DictParameter.GetValueOrDefault("Material")!; - DictParameter.Remove("Material"); + currWindow.sWood = DictParameter.GetValueOrDefault("Wood")!; + DictParameter.Remove("Wood"); } if (!string.IsNullOrEmpty(DictParameter.GetValueOrDefault("Glass"))) { diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index eb871de..9a6dfed 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -443,7 +443,7 @@ namespace WebWindowComplex private string SelGlass { get; set; } = ""; - private string SelMaterial { get; set; } = ""!; + private string SelWood { get; set; } = ""!; private string SelProfile { get; set; } = ""; @@ -526,7 +526,7 @@ namespace WebWindowComplex // Costruisco window e setto i parametri Window window = new Window(); window.sProfilePath = "Profilo78"; - window.sMaterial = "Pino"; + window.sWood = "Pino"; window.sGlass = "Vetro BE 2S 4T/16/4T"; window.sColorMaterial = "Wood"; // Costruisco frame e setto i parametri @@ -612,10 +612,10 @@ namespace WebWindowComplex listErrPre.Add("Glass", "Missing Glass List!"); Log.Warn(" Missing Glass List"); } - if (ListPayload.Material == null || ListPayload.Material.Count == 0) + if (ListPayload.Wood == null || ListPayload.Wood.Count == 0) { - listErrPre.Add("Material", "Missing Material List!"); - Log.Warn(" Missing Material List"); + listErrPre.Add("Wood", "Missing Wood List!"); + Log.Warn(" Missing Wood List"); } if (ListPayload.ColorMaterial == null || ListPayload.ColorMaterial.Count == 0) { @@ -663,9 +663,9 @@ namespace WebWindowComplex { listWarnings.Add("Glass", $"Missing Glass: {m_CurrWindow.sGlass}"); } - if (ListPayload.Material == null || !ListPayload.Material.Contains(m_CurrWindow.sMaterial)) + if (ListPayload.Wood == null || !ListPayload.Wood.Contains(m_CurrWindow.sWood)) { - listWarnings.Add("Material", $"Missing Material: {m_CurrWindow.sMaterial}"); + listWarnings.Add("Wood", $"Missing Material: {m_CurrWindow.sWood}"); } if (ListPayload.ProfileList == null || !ListPayload.ProfileList.Any(x => x.ProfileName.Contains(m_CurrWindow.sProfilePath))) { @@ -1882,7 +1882,7 @@ namespace WebWindowComplex { string Color = args.Color; string Glass = args.Glass; - string Material = args.Material; + string Wood = args.Wood; string Profile = args.Profile; if (m_CurrWindow != null) { @@ -1890,8 +1890,8 @@ namespace WebWindowComplex m_CurrWindow.sColorMaterial = Color; else if (!string.IsNullOrEmpty(Glass)) m_CurrWindow.sGlass = Glass; - else if (!string.IsNullOrEmpty(Material)) - m_CurrWindow.sMaterial = Material; + else if (!string.IsNullOrEmpty(Wood)) + m_CurrWindow.sWood = Wood; else if (!string.IsNullOrEmpty(Profile)) m_CurrWindow.sProfilePath = Profile; _ = DoPreviewSvg(); @@ -2087,7 +2087,7 @@ namespace WebWindowComplex { SelFamilyHardware = SelectionData.FamilyHardware ?? ""; SelColorMaterial = SelectionData.ColorMaterial ?? ""; - SelMaterial = SelectionData.Material ?? ""; + SelWood = SelectionData.Wood ?? ""; SelGlass = SelectionData.Glass ?? ""; SelProfile = SelectionData.Profile ?? ""; } diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 5b6ac30..a7012d9 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.3.3010 + 3.1.3.3012 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -100,6 +100,8 @@ + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 80ce5b5..7c72dc8 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.3.3010 + 3.1.3.3012 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -121,6 +121,13 @@ + + + + + + +