diff --git a/Test.UI/Data/AntaDoppia.jwd b/Test.UI/Data/AntaDoppia.jwd index 86e2fa4..a44e672 100644 --- a/Test.UI/Data/AntaDoppia.jwd +++ b/Test.UI/Data/AntaDoppia.jwd @@ -75,33 +75,27 @@ "HwOptionList": [ { "Name": "Entrata", - "Value": "15 mm", - "Type": "Combo" + "Value": "15 mm" }, { "Name": "LavManigliaPassante", - "Value": "No", - "Type": "Combo" + "Value": "No" }, { "Name": "PosizioneForoCilindro", - "Value": "Cilindro sopra la maniglia", - "Type": "Combo" + "Value": "Cilindro sopra la maniglia" }, { "Name": "ModelloCilindro", - "Value": "Nessun cilindro", - "Type": "Combo" + "Value": "Nessun cilindro" }, { "Name": "LavCilindroPassante", - "Value": "No", - "Type": "Combo" + "Value": "No" }, { "Name": "HMan", - "Value": "", - "Type": "Text" + "Value": "" } ], "GroupId": 2, diff --git a/WebWindowComplex/Json/JsonUtility.cs b/WebWindowComplex/Json/JsonUtility.cs index 110e931..f8d35e0 100644 --- a/WebWindowComplex/Json/JsonUtility.cs +++ b/WebWindowComplex/Json/JsonUtility.cs @@ -416,6 +416,8 @@ namespace WebWindowComplex.Json newSash.ReqRefreshShape(); newSash.SetSelHardwareFromId(Hardware); //foreach (var HwOption in m_HwOptionList) + // newSash.SelHwOptionList.Add(HwOption.Name, HwOption.Value); + //foreach (var HwOption in m_HwOptionList) // newSash.HwOptionList.Add(HwOption.Deserialize()); foreach (var Area in AreaList) { diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs index 349d67e..7fd3216 100644 --- a/WebWindowComplex/Models/Sash.cs +++ b/WebWindowComplex/Models/Sash.cs @@ -88,6 +88,15 @@ namespace WebWindowComplex.Models } } + public Dictionary SelHwOptionList + { + get + { + return m_SelHwdOptionList; + } + } + + public List JointList { get @@ -718,6 +727,29 @@ namespace WebWindowComplex.Models } } } + //if (SelHwOptionList.Count > 0) + //{ + // foreach(var selHwOption in SelHwOptionList) + // { + // var HwOption = HwOptionList.Where(x => x.sName == selHwOption.Key).First(); + // switch (HwOption.Type) + // { + // case HwOptionTypes.COMBO: + // { + // AGBOptionCombo OptCombo = (AGBOptionCombo)HwOption; + // var selValue = OptCombo.ValueList.Where(x => x.sDescription == selHwOption.Value).First(); + // OptCombo.sValue = selValue; + // break; + // } + // case HwOptionTypes.TEXT: + // { + // AGBOptionText OptText = (AGBOptionText)HwOption; + // OptText.sValue = selHwOption.Value; + // break; + // } + // } + // } + //} } internal void SetOrientationSashType(OrientationSash value) @@ -820,6 +852,7 @@ namespace WebWindowComplex.Models private List m_HardwareList = new List(); private List m_HwdOptionList = new List(); + private Dictionary m_SelHwdOptionList = new Dictionary(); private List m_JointList = new List(); diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index d36fb35..36a0ea7 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -771,6 +771,10 @@ namespace WebWindowComplex // Inserisco le forme ricevuto nei sash group foreach (var item in LiveData.DictShape) { + //if (LiveData.DictShape.ContainsKey(item.GroupId)) + //{ + // item.UpdateShape(LiveData.DictOptionsXml[item.GroupId]); + //} Sash sashFromGroupId = SashList.Where(x => x.GroupId == item.Key).ToList().First(); sashFromGroupId.SashShape = item.Value; sashFromGroupId.UpdateShape(item.Value); diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 9ad9288..08a8c58 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.2912 + 2.7.10.2914 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -172,6 +172,11 @@ + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 10be022..162964d 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.2912 + 2.7.10.2914 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -243,6 +243,12 @@ + + + + + +