Egalware/webwindowconfigurator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Aggiunta lista Profili

Browse Source 
- Aggiornato setup Hardware
This commit is contained in:
Annamaria Sassi
2025-10-14 15:02:39 +02:00
parent 0d8effa120
commit 90e6bc799a
17 changed files with 716 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Test.UI/Components/Pages/EditJWD.razor.cs
+11 -3
View File
@@ -64,8 +64,8 @@ namespace Test.UI.Components.Pages
protected List<string> AvailFamilyHardwareList { get; set; } = new List<string>()
{
new string("Arc"),
new string("Profilo78")
new string("ArTech"),
new string("ArTechPlana")
};
protected List<string> AvailGlassList { get; set; } = new List<string>()
@@ -85,6 +85,13 @@ namespace Test.UI.Components.Pages
new string("Abete")
};
protected List<string> AvailProfileList { get; set; } = new List<string>()
{
new string("Profilo60"),
new string("Profilo78"),
new string("Profilo90")
};
protected List<TemplateSelectDTO> AvailTemplateList { get; set; } = new List<TemplateSelectDTO>();
[Inject]
protected IConfiguration Config { get; set; } = null!;
@@ -117,7 +124,7 @@ namespace Test.UI.Components.Pages
// rileggo altri dati
await ReloadData();
// preparo conf oggetti x controllo
SetupList = SetupList = new BaseListPayload()
SetupList = new BaseListPayload()
{
ColorMaterial = AvailColorMaterialList,
FamilyHardware = AvailFamilyHardwareList,
@@ -126,6 +133,7 @@ namespace Test.UI.Components.Pages
//Material = new List<string>(),
Hardware = AvailHardwareList,
Material = AvailMaterialList,
Profile = AvailProfileList,
TemplateDTO = null
};
CurrData = new LivePayload()
Test.UI/Data/AntaDoppia.jwd
+1 -1
View File
@@ -75,7 +75,7 @@
"JointType": "FULL_V"
}
],
"Hardware": "000559",
"Hardware": "000656",
"IdGroup": 2,
"AreaList": [
{
Test.UI/Data/AntaSingola.jwd
+1 -1
View File
@@ -69,7 +69,7 @@
"JointType": "FULL_H"
}
],
"Hardware": "000558",
"Hardware": "000665",
"IdGroup": 2,
"AreaList": [
{
Test.UI/Data/FinDueAnteBottomFisso.jwd
+1 -1
View File
@@ -106,7 +106,7 @@
"JointType": "FULL_H"
}
],
"Hardware": "000559",
"Hardware": "000656",
"IdGroup": 6,
"AreaList": [
{
Test.UI/Hardware/Setup.json
+558 -315
View File
@@ -1,370 +1,613 @@
[
{
"id": "000548",
"familyName": "Rect",
"description": "Rect_DoubleSash",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000546",
"familyName": "Trap",
"description": "Trap_Sash",
"openingType": "TiltTurn",
"shape": "Trapezoidal",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000547",
"familyName": "Rect",
"description": "Rect_Sash_Compl",
"openingType": "ComplanarSlide",
"shape": "Rectangular",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000561",
"familyName": "Profilo78",
"description": "Profilo78_Rect_TripleSash_HiddenHinges",
"id": "000625",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 1
},
{
"id": "000563",
"familyName": "Profilo78",
"description": "Profilo78_TurnOnly_Rect_DoubleSash",
"id": "000666",
"familyName": "ArTechPlana",
"description": "ArTechPlana_Aria4",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000564",
"familyName": "Profilo78",
"description": "Profilo78_TurnOnly_Rect_TripleSash",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 2
},
{
"id": "000603",
"familyName": "SegArc",
"description": "SegArc_2S_TurnOnly",
"openingType": "TurnOnly",
"shape": "Arc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000602",
"familyName": "Arc",
"description": "Arc_2S_TurnOnly",
"openingType": "TurnOnly",
"shape": "FullArc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000601",
"familyName": "SegArc",
"description": "SegArc_1S_TurnOnly",
"openingType": "TurnOnly",
"shape": "Arc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000610",
"familyName": "SemiArc",
"description": "SemiArc_1S",
"openingType": "TiltTurn",
"shape": "SemiFullArc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000611",
"familyName": "SemiSegArc",
"description": "SemiSegArc_S1",
"id": "000642",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TiltTurn",
"shape": "SemiArc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000596",
"familyName": "Arc",
"description": "Arc_1S",
"openingType": "TiltTurn",
"shape": "FullArc",
"id": "000665",
"familyName": "ArTechPlana",
"description": "ArTechPlana_Aria4",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000599",
"familyName": "SegArc",
"description": "SegArc_2S",
"id": "000693",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TurnOnly",
"shape": "FullArc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000644",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TiltTurn",
"shape": "Arc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000597",
"familyName": "SegArc",
"description": "SegArc_1S",
"id": "000637",
"familyName": "ArTechPlana",
"description": "ArTechPlana_Aria4",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 1
},
{
"id": "000656",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000686",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TurnOnly",
"shape": "Arc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000678",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TurnOnly",
"shape": "Arc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000635",
"familyName": "ArTechPlana",
"description": "ArTechPlana_Aria4",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000685",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TurnOnly",
"shape": "Arc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000631",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000649",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TiltTurn",
"shape": "FullArc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000662",
"familyName": "ArTech",
"description": "ArTech_Aria4_Centrale",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 2
},
{
"id": "000652",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TiltTurn",
"shape": "Trapezoidal",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000630",
"familyName": "ArTech",
"description": "ArTech_Aria4_CerniereScomparsa",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 1
},
{
"id": "000623",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000674",
"familyName": "ArTechPlana",
"description": "ArTechPlana_Aria12",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000670",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 4,
"sashPosition": 2
},
{
"id": "000640",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TiltTurn",
"shape": "SemiArc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000673",
"familyName": "ArTechPlana",
"description": "ArTechPlana_Aria12_Centrale",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 2
},
{
"id": "000647",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TiltTurn",
"shape": "FullArc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000690",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TurnOnly",
"shape": "Arc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000632",
"familyName": "ArTechPlana",
"description": "ArTechPlana_Aria12",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000669",
"familyName": "ArTechPlana",
"description": "ArTechPlana_Aria4",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 4,
"sashPosition": 2
},
{
"id": "000624",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000667",
"familyName": "ArTechPlana",
"description": "ArTechPlana_Aria4_Centrale",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 2
},
{
"id": "000629",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 1
},
{
"id": "000657",
"familyName": "ArTech",
"description": "ArTech_Aria12_Centrale",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 2
},
{
"id": "000691",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TurnOnly",
"shape": "SemiArc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000683",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TurnOnly",
"shape": "SemiFullArc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000633",
"familyName": "ArTechPlana",
"description": "ArTechPlana_Aria12",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000675",
"familyName": "ArTechPlana",
"description": "ArTechPlana_Aria12",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000692",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TurnOnly",
"shape": "SemiFullArc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000676",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TurnOnly",
"shape": "Arc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000684",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TurnOnly",
"shape": "SemiFullArc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000660",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 4,
"sashPosition": 2
},
{
"id": "000627",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000688",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TurnOnly",
"shape": "SemiFullArc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000689",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TurnOnly",
"shape": "FullArc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000658",
"familyName": "ArTech",
"description": "ArTech_Aria12_Laterale",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 1
},
{
"id": "000653",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TiltTurn",
"shape": "Trapezoidal",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000668",
"familyName": "ArTechPlana",
"description": "ArTechPlana_Aria4_Laterale",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 1
},
{
"id": "000626",
"familyName": "ArTech",
"description": "ArTech_Aria12_CernieraScomparsa",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 1
},
{
"id": "000679",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TurnOnly",
"shape": "SemiArc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000643",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TiltTurn",
"shape": "SemiArc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000650",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TiltTurn",
"shape": "FullArc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000661",
"familyName": "ArTech",
"description": "ArTech_Aria4_Laterale",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 1
},
{
"id": "000639",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TiltTurn",
"shape": "Arc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000663",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000664",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000682",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TurnOnly",
"shape": "FullArc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000681",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TurnOnly",
"shape": "FullArc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000645",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TiltTurn",
"shape": "Arc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000598",
"familyName": "Arc",
"description": "Arc_2S",
"openingType": "TiltTurn",
"shape": "FullArc",
"id": "000672",
"familyName": "ArTechPlana",
"description": "ArTechPlana_Aria12_Laterale",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 1
},
{
"id": "000671",
"familyName": "ArTechPlana",
"description": "ArTechPlana_Aria12",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 4,
"sashPosition": 2
},
{
"id": "000687",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TurnOnly",
"shape": "SemiArc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000677",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TurnOnly",
"shape": "Arc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000600",
"familyName": "Arc",
"description": "Arc_1S_TurnOnly",
"id": "000636",
"familyName": "ArTechPlana",
"description": "ArTechPlana_Aria4",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000638",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TiltTurn",
"shape": "Arc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000634",
"familyName": "ArTechPlana",
"description": "ArTechPlana_Aria12",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 1
},
{
"id": "000655",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000680",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TurnOnly",
"shape": "SemiArc",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000651",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TiltTurn",
"shape": "Trapezoidal",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000648",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TiltTurn",
"shape": "FullArc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000606",
"familyName": "Trap",
"description": "Trap_S1_TurnOnly",
"openingType": "TurnOnly",
"shape": "Trapezoidal",
"id": "000641",
"familyName": "ArTech",
"description": "ArTech_Aria12",
"openingType": "TiltTurn",
"shape": "SemiArc",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000605",
"familyName": "Trap",
"description": "Trap_S2",
"id": "000654",
"familyName": "ArTech",
"description": "ArTech_Aria4",
"openingType": "TiltTurn",
"shape": "Trapezoidal",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000607",
"familyName": "Trap",
"description": "Trap_S2_TurnOnly",
"openingType": "TurnOnly",
"shape": "Trapezoidal",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000604",
"familyName": "Trap",
"description": "Trap_S1",
"openingType": "TiltTurn",
"shape": "Trapezoidal",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000595",
"familyName": "Slide",
"description": "Slide_quadruple",
"openingType": "LiftSlide",
"shape": "Rectangular",
"sashQty": 4,
"sashPosition": 2
},
{
"id": "000592",
"familyName": "Slide",
"description": "Slide_2S",
"openingType": "LiftSlide",
"shape": "Rectangular",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000594",
"familyName": "Slide",
"description": "Slide_4S",
"openingType": "LiftSlide",
"shape": "Rectangular",
"sashQty": 4,
"sashPosition": 2
},
{
"id": "000593",
"familyName": "Slide",
"description": "Slide_double",
"openingType": "LiftSlide",
"shape": "Rectangular",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000575",
"familyName": "Profilo78",
"description": "Profilo78_TurnOnly_Rect_QuadrupleSash",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 4,
"sashPosition": 2
},
{
"id": "000558",
"familyName": "Profilo78",
"description": "Profilo78_Rect_Sash",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000559",
"familyName": "Profilo78",
"description": "Profilo78_Rect_DoubleSash",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000566",
"familyName": "Profilo78",
"description": "Profilo78_TurnOnly_Rect_TripleSash_CenterHandle",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 2
},
{
"id": "000565",
"familyName": "Profilo78",
"description": "Profilo78_TurnOnly_Rect_TripleSash_SideHandle",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 1
},
{
"id": "000562",
"familyName": "Profilo78",
"description": "Profilo78_Rect_Sash",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000560",
"familyName": "Profilo78",
"description": "Profilo78_Rect_TripleSash",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 1
},
{
"id": "000550",
"familyName": "Rect",
"description": "Rect_DoubleSash_4",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000552",
"familyName": "Rect",
"description": "Rect_DoubleSashStrana",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 1
},
{
"id": "000549",
"familyName": "Rect",
"description": "Rect_DoubleSash",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 2,
"sashPosition": 1
},
{
"id": "000555",
"familyName": "Round",
"description": "Round_Sash",
"openingType": "Pivot",
"shape": "Circular",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000556",
"familyName": "Rect",
"description": "Rect_Sash_Bilico",
"openingType": "Pivot",
"shape": "Rectangular",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000554",
"familyName": "Rect",
"description": "Rect_QuadrupolSash_Bandiera",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 4,
"sashPosition": 2
},
{
"id": "000551",
"familyName": "Rect",
"description": "Rect_Sash_Bandiera",
"openingType": "TurnOnly",
"shape": "Rectangular",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000544",
"familyName": "Rect",
"description": "Rect_Sash",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 1,
"sashPosition": 1
},
{
"id": "000553",
"familyName": "Rect",
"description": "Rect_TripleSash",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 3,
"sashPosition": 1
},
{
"id": "000545",
"familyName": "Rect",
"description": "Rect_Sash_4",
"openingType": "TiltTurn",
"shape": "Rectangular",
"sashQty": 1,
"sashPosition": 1
}
WebWindowComplex/Compo/CardSashGroup.razor
+1 -1
View File
@@ -104,7 +104,7 @@
{
@foreach (var hlItem in CurrItem.HardwareList)
{
<option value="@hlItem.Id" typeof="string">@hlItem.Description</option>
<option value="@hlItem.Id">@hlItem.Description</option>
}
}
</select>
WebWindowComplex/Compo/General.razor
+5 -4
View File
@@ -24,10 +24,11 @@
</div>
<div class="input-group mb-2">
<label class="input-group-text" for="ProfileWindow">Profile</label>
<select class="form-select" id="ProfileWindow">
<option value="0">Profilo 78</option>
<option value="1">Profilo..</option>
<option value="2">Profilo...</option>
<select class="form-select @(cssValid("Profile"))" id="ProfileWindow" @bind="@CurrProfile">
@foreach (string profile in ListPayload.Profile)
{
<option value="@profile">@profile</option>
}
</select>
</div>
</div>
WebWindowComplex/Compo/General.razor.cs
+15
View File
@@ -23,6 +23,9 @@ namespace WebWindowComplex.Compo
[Parameter]
public EventCallback<string> EC_SelWindMat { get; set; }
[Parameter]
public EventCallback<string> EC_SelProfile { get; set; }
[Parameter]
public EventCallback<bool> EC_ReqClose { get; set; }
@@ -72,6 +75,16 @@ namespace WebWindowComplex.Compo
}
}
protected string CurrProfile
{
get => currProfile;
set
{
currProfile = value;
_ = EC_SelProfile.InvokeAsync(value);
}
}
#endregion Protected Properties
#region Protected Methods
@@ -91,6 +104,7 @@ namespace WebWindowComplex.Compo
currColor = CurrWindow.sColorMaterial;
currGlass = CurrWindow.sGlass;
currMaterial = CurrWindow.sMaterial;
currProfile = CurrWindow.sProfilePath;
}
#endregion Protected Methods
@@ -100,6 +114,7 @@ namespace WebWindowComplex.Compo
private string currColor = "";
private string currGlass = "";
private string currMaterial = "";
private string currProfile = "";
#endregion Private Fields
WebWindowComplex/DTO/BaseListPayload.cs
+9 -2
View File
@@ -44,6 +44,11 @@ namespace WebWindowComplex.DTO
/// </summary>
public List<string> Glass { get; set; } = null!;
/// <summary>
/// Elenco profili ammessi
/// </summary>
public List<string> Profile { get; set; } = null!;
/// <summary>
/// Verifica di validità dell'intero Payload
/// </summary>
@@ -55,7 +60,8 @@ namespace WebWindowComplex.DTO
bool glassOK = Glass != null && Glass.Count > 0;
bool matOK = Material != null && Material.Count > 0;
bool colorOK = ColorMaterial != null && ColorMaterial.Count > 0;
return famHwOK && glassOK && hwOK && colorOK && matOK;
bool profileOK = Profile != null && Profile.Count > 0;
return famHwOK && glassOK && hwOK && colorOK && matOK && profileOK;
}
/// <summary>
/// Verifica che Payload sia almeno parzialmente popolato
@@ -68,7 +74,8 @@ namespace WebWindowComplex.DTO
bool glassOK = Glass != null && Glass.Count > 0;
bool matOK = Material != null && Material.Count > 0;
bool colorOK = ColorMaterial != null && ColorMaterial.Count > 0;
return famHwOK || glassOK || hwOK || colorOK || matOK;
bool profileOK = Profile != null && Profile.Count > 0;
return famHwOK || glassOK || hwOK || colorOK || matOK || profileOK;
}
}
}
WebWindowComplex/DTO/SelectPayload.cs
+7 -1
View File
@@ -34,6 +34,11 @@ namespace WebWindowComplex.DTO
/// </summary>
public string Glass { get; set; } = string.Empty;
/// <summary>
/// Tipologia profilo selezionato
/// </summary>
public string Profile { get; set; } = string.Empty;
/// <summary>
/// Template selezionato
/// </summary>
@@ -49,8 +54,9 @@ namespace WebWindowComplex.DTO
bool colorOK = !string.IsNullOrEmpty(ColorMaterial);
bool glassOk = !string.IsNullOrEmpty(Glass);
bool matOK = !string.IsNullOrEmpty(Material);
bool profileOK = !string.IsNullOrEmpty(Profile);
bool templateOK = Template != null;
return famHwOK && colorOK && matOK && glassOk && templateOK;
return famHwOK && colorOK && matOK && glassOk && templateOK && profileOK;
}
}
}
WebWindowComplex/Json/JsonUtility.cs
+7 -2
View File
@@ -398,10 +398,15 @@ namespace WebWindowComplex.Json
}
foreach (var Joint in m_JointList)
newSash.JointList.Add(Joint.Deserialize((Area)ParentArea));
newSash.SetSelHardwareFromId(Hardware);
newSash.SetSelFamilyHardwareFromIndex(Hardware);
newSash.RefreshHardwareList();
if (newSash.HardwareList.Count() > 0)
newSash.SetSelHardwareFromId(newSash.HardwareList.First().Id);
//if(Hardware != null && !Hardware.Equals(""))
// newSash.SetSelHardwareFromId(Hardware);
//else
newSash.SetSelHardwareFromId(newSash.SelHardware.Id);
//if (newSash.HardwareList.Count() > 0)
// newSash.SetSelHardwareFromId(newSash.HardwareList.First().Id);
foreach (var Area in AreaList)
{
var AreaDeserealized = Area.Deserialize(newSash, ParentWindow);
WebWindowComplex/Models/Sash.cs
+9 -7
View File
@@ -712,26 +712,28 @@ namespace WebWindowComplex.Models
{
if (string.IsNullOrEmpty(m_SelFamilyHardware))
{
SelFamilyHardware = (m_HardwareCompleteList
var item = m_HardwareCompleteList
.Where(x => x.Id == codHardware)
.First()).FamilyName;
.Select(x => x.FamilyName)
.ToList();
SelFamilyHardware = item.First();
}
return SelFamilyHardware;
}
internal void SetSelHardware(Hardware value)
{
m_SelHardware = value;
SelHardware = value;
}
internal void SetSelHardwareFromId(string sId)
{
if (m_HardwareList.Count == 0)
m_SelHardware = m_HardwareCompleteList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware("", "", "", Enums.OpeningTypes.Null, "", 0, 0);
SelHardware = m_HardwareCompleteList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware("", "", "", Enums.OpeningTypes.Null, "", 0, 0);
else
m_SelHardware = m_HardwareList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware("", "", "", Enums.OpeningTypes.Null, "", 0, 0);
if (m_SelHardware == null)
m_SelHardware = m_HardwareList[0];
SelHardware = m_HardwareList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware("", "", "", Enums.OpeningTypes.Null, "", 0, 0);
if (SelHardware == null)
SelHardware = m_HardwareList[0];
//SelFamilyHardware = m_SelHardware.FamilyName;
}
WebWindowComplex/Models/Window.cs
+1
View File
@@ -85,6 +85,7 @@ namespace WebWindowComplex.Models
set
{
m_sProfilePath = value;
OnUpdatePreview(sSerialized());
}
}
WebWindowComplex/TableComp.razor
+1 -1
View File
@@ -163,7 +163,7 @@
}
else if (currStep == CompileStep.General)
{
<General CurrWindow="@m_CurrWindow" ListPayload="ListPayload" ListWarnings="listWarnings" EC_SelColor="SelectColor" EC_SelGlass="SelectGlass" EC_SelWindMat="SelectMat" EC_ReqClose="ReturnTree"></General>
<General CurrWindow="@m_CurrWindow" ListPayload="ListPayload" ListWarnings="listWarnings" EC_SelColor="SelectColor" EC_SelGlass="SelectGlass" EC_SelWindMat="SelectMat" EC_SelProfile="SelectProfile" EC_ReqClose="ReturnTree"></General>
}
</div>
</div>
WebWindowComplex/TableComp.razor.cs
+35 -4
View File
@@ -130,6 +130,7 @@ namespace WebWindowComplex
protected string SelColorMaterial { get; set; } = "";
protected string SelFamilyHardware { get; set; } = "";
protected string SelGlass { get; set; } = "";
protected string SelProfile { get; set; } = "";
protected string SelMaterial { get; set; } = ""!;
@@ -417,8 +418,6 @@ namespace WebWindowComplex
return listWarnings.ContainsKey(fKey) ? "border border-danger" : "";
}
/// <summary>
/// Richiesta chiusura SENZA salvataggio (= restore prev)
/// </summary>
@@ -551,7 +550,6 @@ namespace WebWindowComplex
{
listErrLink.Add("Window", $"Deserializing Error:{Environment.NewLine}{ex}");
}
updateSvg = true;
}
checkWarnings();
@@ -652,6 +650,7 @@ namespace WebWindowComplex
SelColorMaterial = CurrSelection.ColorMaterial ?? "";
SelMaterial = CurrSelection.Material ?? "";
SelGlass = CurrSelection.Glass ?? "";
SelProfile = CurrSelection.Profile ?? "";
}
}
@@ -850,6 +849,10 @@ namespace WebWindowComplex
{
listErrPre.Add("ColorMaterial", "Missing ColorMaterial List!");
}
if (ListPayload.Profile == null || ListPayload.Profile.Count == 0)
{
listErrPre.Add("Profile", "Missing Profile List!");
}
}
/// <summary>
@@ -875,6 +878,10 @@ namespace WebWindowComplex
{
listWarnings.Add("Material", $"Missing Material: {m_CurrWindow.sMaterial}");
}
if (!ListPayload.Profile.Contains(m_CurrWindow.sProfilePath))
{
listWarnings.Add("Profile", $"Missing Profile: {m_CurrWindow.sProfilePath}");
}
}
}
}
@@ -893,7 +900,7 @@ namespace WebWindowComplex
// Rimuovo riempimento da anta selezionata
sashSplitted.AreaList.RemoveAt(0);
// Creo la copia dell'anta scelta
Area a = sashItem.AreaList[IndexCopy].AreaList[0].Copy(sashSplitted);
Area a = sashItem.AreaList[IndexCopy].AreaList.First().Copy(sashSplitted);
// Aggiungo copia all'anta selezionata
sashItem.AreaList[IndexModify].AreaList.Add(a);
await DoPreviewSvg();
@@ -1015,6 +1022,10 @@ namespace WebWindowComplex
AdvStep(CompileStep.Tree);
}
/// <summary>
/// Selezione del colore
/// </summary>
/// <param name="newVal"></param>
private void SelectColor(string newVal)
{
if (m_CurrWindow != null)
@@ -1023,6 +1034,10 @@ namespace WebWindowComplex
}
}
/// <summary>
/// Selezione del vetro
/// </summary>
/// <param name="newVal"></param>
private void SelectGlass(string newVal)
{
if (m_CurrWindow != null)
@@ -1031,6 +1046,10 @@ namespace WebWindowComplex
}
}
/// <summary>
/// Selezione del materiale
/// </summary>
/// <param name="newVal"></param>
private void SelectMat(string newVal)
{
if (m_CurrWindow != null)
@@ -1039,6 +1058,18 @@ namespace WebWindowComplex
}
}
/// <summary>
/// Selezione del profilo
/// </summary>
/// <param name="newVal"></param>
private void SelectProfile(string newVal)
{
if (m_CurrWindow != null)
{
m_CurrWindow.sProfilePath = newVal;
}
}
/// <summary>
/// Metodo per scambiare due aree di uno split
/// </summary>
WebWindowComplex/WebWindowComplex.csproj
+21 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>2.7.10.1412</Version>
<Version>2.7.10.1414</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -30,3 +30,23 @@
</Project>
WebWindowConfigurator/WebWindowConfigurator.csproj
+33 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>2.7.10.1412</Version>
<Version>2.7.10.1414</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione JWD per LUX</Description>
@@ -37,3 +37,35 @@
</Target>
</Project>