diff --git a/Test.UI/Components/Pages/EditJWD.razor b/Test.UI/Components/Pages/EditJWD.razor index bfda185..48e4a75 100644 --- a/Test.UI/Components/Pages/EditJWD.razor +++ b/Test.UI/Components/Pages/EditJWD.razor @@ -22,6 +22,9 @@ else if (!string.IsNullOrEmpty(outSave)) @outSave } +

+ @currJwd +

@* IN_ColorMaterialList="@AvailColorMaterialList" diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs index f2edbdf..c32518f 100644 --- a/Test.UI/Components/Pages/EditJWD.razor.cs +++ b/Test.UI/Components/Pages/EditJWD.razor.cs @@ -93,7 +93,7 @@ namespace Test.UI.Components.Pages protected override async Task OnInitializedAsync() { ConfInit(); - SelFamilyHardware = "Natura"; + //SelFamilyHardware = "Natura"; //SelColorMaterial = "Black"; //SelColorMaterial = "Pine"; //SelGlass = "4T/16/4T"; diff --git a/Test.UI/Data/AntaDoppia.jwd b/Test.UI/Data/AntaDoppia.jwd index 83df841..21d2d91 100644 --- a/Test.UI/Data/AntaDoppia.jwd +++ b/Test.UI/Data/AntaDoppia.jwd @@ -75,7 +75,7 @@ "JointType": "FULL_V" } ], - "Hardware": "000558", + "Hardware": "000559", "IdGroup": 2, "AreaList": [ { diff --git a/WebWindowComplex/Json/JsonUtility.cs b/WebWindowComplex/Json/JsonUtility.cs index 164836b..a1edcdf 100644 --- a/WebWindowComplex/Json/JsonUtility.cs +++ b/WebWindowComplex/Json/JsonUtility.cs @@ -397,6 +397,7 @@ namespace WebWindowComplex.Json } foreach (var Joint in m_JointList) newSash.JointList.Add(Joint.Deserialize((Area)ParentArea)); + newSash.SetSelFamilyHardwareFromIndex(Hardware); newSash.RefreshHardwareList(); newSash.SetSelHardwareFromId(Hardware); foreach (var Area in AreaList) diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor index 22dd190..45052a8 100644 --- a/WebWindowComplex/TableComp.razor +++ b/WebWindowComplex/TableComp.razor @@ -535,16 +535,23 @@
- + @if (Sash.s_FamilyHardwareList == null || Sash.s_FamilyHardwareList.Count == 0) { - + + } + else + { + @foreach (var familyHw in Sash.s_FamilyHardwareList) + { + + } }
- @if (item.HardwareList == null || item.HardwareList.Count == 0) { @@ -553,13 +560,9 @@ { @foreach (var hlItem in item.HardwareList) { - + } } - @* @for (int i = 0; i < item.HardwareList.Count; i++) - { - - } *@
@@ -719,9 +722,10 @@ - @for (int i = 0; i < SplittedList.Count; i++) + @foreach(var currSplitted in SplittedList) + @* @for (int i = 0; i < SplittedList.Count; i++) *@ { - Splitted currSplitted = SplittedList[i]; + @* Splitted currSplitted = SplittedList[i]; *@ @if (currSplitted.AreaList[0].Equals(item)) {
@@ -730,7 +734,7 @@
@if (SplittedList.Count > 1) { -

Area split @(i + 1)

+

Area split @(SplittedList.IndexOf(currSplitted) + 1)

} else { @@ -742,12 +746,13 @@
- @for (int j = 0; j < SashList.Count; j++) + @foreach(var Index in SashList) + @* @for (int j = 0; j < SashList.Count; j++) *@ { - int Index = j; + @* int Index = j; *@
- +
} @@ -780,7 +785,7 @@
- +