diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs index 4e6ecdd..f2edbdf 100644 --- a/Test.UI/Components/Pages/EditJWD.razor.cs +++ b/Test.UI/Components/Pages/EditJWD.razor.cs @@ -44,8 +44,8 @@ namespace Test.UI.Components.Pages protected List AvailHardwareList { get; set; } = new List(); protected List AvailFamilyHardwareList { get; set; } = new List() { - new string("Natura"), - new string("Optima") + new string("Arc"), + new string("Profilo78") }; protected List AvailColorMaterialList { get; set; } = new List() { @@ -55,17 +55,17 @@ namespace Test.UI.Components.Pages }; protected List AvailMaterialList { get; set; } = new List() { - new string("Pine"), - new string("Fir") + new string("Pino"), + new string("Abete") }; protected List AvailGlassList { get; set; } = new List() { - new string("4/12/4"), - new string("4/16/4"), - new string("4/12/4/12/4"), - new string("4/16/4/16/4"), - new string("4T/12/4T"), - new string("4T/16/4T") + new string("Vetro BE 2S 4/12/4"), + new string("Vetro BE 2S 4/16/4"), + new string("Vetro BE 3S 4/12/4/12/4"), + new string("Vetro BE 3S 4/16/4/16/4"), + new string("Vetro BE 2S 4T/12/4T"), + new string("Vetro BE 2S 4T/16/4T") }; protected string SelFamilyHardware { get; set; } = ""; protected string SelColorMaterial { get; set; } = ""; diff --git a/Test.UI/Data/AntaDoppia.jwd b/Test.UI/Data/AntaDoppia.jwd index 12d9235..68dfb32 100644 --- a/Test.UI/Data/AntaDoppia.jwd +++ b/Test.UI/Data/AntaDoppia.jwd @@ -1,8 +1,8 @@ { "ProfilePath": "Profilo78", - "Material": "Pine", + "Material": "Pino", "ColorMaterial": "Black", - "Glass": "4T/16/4T", + "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ { "IdGroup": 1, @@ -76,7 +76,7 @@ "JointType": "FULL_V" } ], - "Hardware": "000559", + "Hardware": "000558", "AreaList": [ { "IdGroup": 3, diff --git a/Test.UI/Hardware/Setup.json b/Test.UI/Hardware/Setup.json index ff15768..4a81ba4 100644 --- a/Test.UI/Hardware/Setup.json +++ b/Test.UI/Hardware/Setup.json @@ -1,47 +1,371 @@ [ { - "Id": "000558", - "FamilyName": "Natura", - "Description": "Profilo78_Rect_Sash", - "OpeningType": "ANTA_RIBALTA", - "Shape": "Rectangular", - "SashQty": 1, - "SashPosition": 1 - }, - { - "Id": "000562", - "FamilyName": "Natura", - "Description": "Profilo78_Rect_Sash", - "OpeningType": "ANTA_BANDIERA", - "Shape": "Rectangular", - "SashQty": 1, - "SashPosition": 1 - }, - { - "Id": "000559", - "FamilyName": "Natura", - "Description": "Profilo78_Rect_DoubleSash", - "OpeningType": "ANTA_RIBALTA", - "Shape": "Rectangular", + "Description": "Rect_Sash_Compl", + "FamilyName": "Rect", + "Id": "000547", + "OpeningType": "CO", + "SashPosition": 1, "SashQty": 2, - "SashPosition": 1 + "Shape": "Rectangular" }, { - "Id": "000563", - "FamilyName": "Natura", - "Description": "Profilo78_TurnOnly_Rect_DoubleSash", - "OpeningType": "ANTA_BANDIERA", - "Shape": "Rectangular", - "SashQty": 2, - "SashPosition": 1 + "Description": "Vasistas", + "FamilyName": "Vasistas", + "Id": "000573", + "OpeningType": "VA", + "SashPosition": 1, + "SashQty": 1, + "Shape": "Rectangular" }, { - "Id": "000560", - "FamilyName": "Natura", - "Description": "Profilo78_Rect_TripleSash", - "OpeningType": "ANTA_RIBALTA", - "Shape": "Rectangular", + "Description": "Profilo78_Rect_TripleSash_HiddenHinges", + "FamilyName": "Profilo78", + "Id": "000561", + "OpeningType": "AR", + "SashPosition": 1, "SashQty": 3, - "SashPosition": 1 + "Shape": "Rectangular" + }, + { + "Description": "Profilo78_TurnOnly_Rect_DoubleSash", + "FamilyName": "Profilo78", + "Id": "000563", + "OpeningType": "AB", + "SashPosition": 1, + "SashQty": 2, + "Shape": "Rectangular" + }, + { + "Description": "Profilo78_TurnOnly_Rect_TripleSash", + "FamilyName": "Profilo78", + "Id": "000564", + "OpeningType": "AB", + "SashPosition": 2, + "SashQty": 3, + "Shape": "Rectangular" + }, + { + "Description": "SegArc_2S_TurnOnly", + "FamilyName": "SegArc", + "Id": "000603", + "OpeningType": "AB", + "SashPosition": 1, + "SashQty": 2, + "Shape": "Arc" + }, + { + "Description": "Arc_2S_TurnOnly", + "FamilyName": "Arc", + "Id": "000602", + "OpeningType": "AB", + "SashPosition": 1, + "SashQty": 2, + "Shape": "FullArc" + }, + { + "Description": "SegArc_1S_TurnOnly", + "FamilyName": "SegArc", + "Id": "000601", + "OpeningType": "AB", + "SashPosition": 1, + "SashQty": 1, + "Shape": "Arc" + }, + { + "Description": "SemiArc_1S", + "FamilyName": "SemiArc", + "Id": "000610", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 1, + "Shape": "SemiFullArc" + }, + { + "Description": "SemiSegArc_S1", + "FamilyName": "SemiSegArc", + "Id": "000611", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 1, + "Shape": "SemiArc" + }, + { + "Description": "Arc_1S", + "FamilyName": "Arc", + "Id": "000596", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 1, + "Shape": "FullArc" + }, + { + "Description": "SegArc_2S", + "FamilyName": "SegArc", + "Id": "000599", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 2, + "Shape": "Arc" + }, + { + "Description": "SegArc_1S", + "FamilyName": "SegArc", + "Id": "000597", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 1, + "Shape": "Arc" + }, + { + "Description": "Test aria 4", + "FamilyName": "Test aria 4", + "Id": "000609", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 2, + "Shape": "Arc" + }, + { + "Description": "Arc_2S", + "FamilyName": "Arc", + "Id": "000598", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 2, + "Shape": "FullArc" + }, + { + "Description": "Arc_1S_TurnOnly", + "FamilyName": "Arc", + "Id": "000600", + "OpeningType": "AB", + "SashPosition": 1, + "SashQty": 1, + "Shape": "FullArc" + }, + { + "Description": "Trap_S1_TurnOnly", + "FamilyName": "Trap", + "Id": "000606", + "OpeningType": "AB", + "SashPosition": 1, + "SashQty": 1, + "Shape": "Trapezoidal" + }, + { + "Description": "Trap_S2", + "FamilyName": "Trap", + "Id": "000605", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 2, + "Shape": "Trapezoidal" + }, + { + "Description": "Trap_S2_TurnOnly", + "FamilyName": "Trap", + "Id": "000607", + "OpeningType": "AB", + "SashPosition": 1, + "SashQty": 2, + "Shape": "Trapezoidal" + }, + { + "Description": "Trap_S1", + "FamilyName": "Trap", + "Id": "000604", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 1, + "Shape": "Trapezoidal" + }, + { + "Description": "Slide_quadruple", + "FamilyName": "Slide", + "Id": "000595", + "OpeningType": "AS", + "SashPosition": 2, + "SashQty": 4, + "Shape": "Rectangular" + }, + { + "Description": "Slide_2S", + "FamilyName": "Slide", + "Id": "000592", + "OpeningType": "AS", + "SashPosition": 1, + "SashQty": 2, + "Shape": "Rectangular" + }, + { + "Description": "Slide_4S", + "FamilyName": "Slide", + "Id": "000594", + "OpeningType": "AS", + "SashPosition": 2, + "SashQty": 4, + "Shape": "Rectangular" + }, + { + "Description": "Slide_double", + "FamilyName": "Slide", + "Id": "000593", + "OpeningType": "AS", + "SashPosition": 1, + "SashQty": 2, + "Shape": "Rectangular" + }, + { + "Description": "Profilo78_TurnOnly_Rect_QuadrupleSash", + "FamilyName": "Profilo78", + "Id": "000575", + "OpeningType": "AB", + "SashPosition": 2, + "SashQty": 4, + "Shape": "Rectangular" + }, + { + "Description": "Profilo78_Rect_Sash", + "FamilyName": "Profilo78", + "Id": "000558", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 1, + "Shape": "Rectangular" + }, + { + "Description": "Profilo78_Rect_DoubleSash", + "FamilyName": "Profilo78", + "Id": "000559", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 2, + "Shape": "Rectangular" + }, + { + "Description": "Profilo78_TurnOnly_Rect_TripleSash_CenterHandle", + "FamilyName": "Profilo78", + "Id": "000566", + "OpeningType": "AB", + "SashPosition": 2, + "SashQty": 3, + "Shape": "Rectangular" + }, + { + "Description": "Profilo78_TurnOnly_Rect_TripleSash_SideHandle", + "FamilyName": "Profilo78", + "Id": "000565", + "OpeningType": "AB", + "SashPosition": 1, + "SashQty": 3, + "Shape": "Rectangular" + }, + { + "Description": "Profilo78_Rect_Sash", + "FamilyName": "Profilo78", + "Id": "000562", + "OpeningType": "AB", + "SashPosition": 1, + "SashQty": 1, + "Shape": "Rectangular" + }, + { + "Description": "Profilo78_Rect_TripleSash", + "FamilyName": "Profilo78", + "Id": "000560", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 3, + "Shape": "Rectangular" + }, + { + "Description": "Rect_DoubleSash_4", + "FamilyName": "Rect", + "Id": "000550", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 2, + "Shape": "Rectangular" + }, + { + "Description": "Rect_DoubleSashStrana", + "FamilyName": "Rect", + "Id": "000552", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 3, + "Shape": "Rectangular" + }, + { + "Description": "Rect_DoubleSash", + "FamilyName": "Rect", + "Id": "000549", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 2, + "Shape": "Rectangular" + }, + { + "Description": "Round_Sash", + "FamilyName": "Round", + "Id": "000555", + "OpeningType": "BI", + "SashPosition": 1, + "SashQty": 1, + "Shape": "Circular" + }, + { + "Description": "Rect_Sash_Bilico", + "FamilyName": "Rect", + "Id": "000556", + "OpeningType": "BI", + "SashPosition": 1, + "SashQty": 1, + "Shape": "Rectangular" + }, + { + "Description": "Rect_QuadrupolSash_Bandiera", + "FamilyName": "Rect", + "Id": "000554", + "OpeningType": "AB", + "SashPosition": 2, + "SashQty": 4, + "Shape": "Rectangular" + }, + { + "Description": "Rect_Sash_Bandiera", + "FamilyName": "Rect", + "Id": "000551", + "OpeningType": "AB", + "SashPosition": 1, + "SashQty": 1, + "Shape": "Rectangular" + }, + { + "Description": "Rect_Sash", + "FamilyName": "Rect", + "Id": "000544", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 1, + "Shape": "Rectangular" + }, + { + "Description": "Rect_TripleSash", + "FamilyName": "Rect", + "Id": "000553", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 3, + "Shape": "Rectangular" + }, + { + "Description": "Rect_Sash_4", + "FamilyName": "Rect", + "Id": "000545", + "OpeningType": "AR", + "SashPosition": 1, + "SashQty": 1, + "Shape": "Rectangular" } ] \ No newline at end of file diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor index 9abc3a8..22dd190 100644 --- a/WebWindowComplex/TableComp.razor +++ b/WebWindowComplex/TableComp.razor @@ -545,9 +545,16 @@
- @foreach(string glass in ListPayload.Glass) + @foreach (string glass in ListPayload.Glass) { } @@ -825,7 +832,7 @@