diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor index 275acea..3e4ddf9 100644 --- a/WebWindowComplex/TableComp.razor +++ b/WebWindowComplex/TableComp.razor @@ -21,7 +21,7 @@ @if (FrameWindow != null) {
  • - Gerarchia + Tree
    • @*
  • Frame @@ -111,7 +111,7 @@ } } - @if (currStep == CompileStep.Gerarchia) + @if (currStep == CompileStep.Tree) {
    @@ -313,7 +313,7 @@ { @if (currSplit >= SplitList.Count || currSplit == -1) { - currStep = CompileStep.Gerarchia; + currStep = CompileStep.Tree; } else { @@ -385,7 +385,7 @@ }
    - @if (item.SplitVertList.Count > 0) + @if (item.SplitVertList.Count > 0 && item.SplitHorizList.Count > 0) {
    @foreach (var dim in item.SplitVertList) @@ -397,9 +397,6 @@
    }
    - } - @if (item.SplitHorizList.Count > 0) - {
    @foreach (var dim in item.SplitHorizList) { @@ -412,6 +409,46 @@ }
    } + else if (item.SplitHorizList.Count > 0) + { + @foreach (var dim in item.SplitHorizList) + { +
    +
    + Height + + % +
    +
    + } + } + else if (item.SplitVertList.Count > 0) + { + @foreach (var dim in item.SplitVertList) + { +
    +
    + Width + + % +
    +
    + } + } + @* @if (item.SplitHorizList.Count > 0) + { +
    + @foreach (var dim in item.SplitHorizList) + { +
    + Height + + % +
    + + } +
    + } *@ @if (item.SelSplitShape == Json.WindowConst.SplitShapes.GRID) { @@ -444,7 +481,7 @@ { @if (currSash >= SashList.Count || currSash == -1) { - currStep = CompileStep.Gerarchia; + currStep = CompileStep.Tree; } else { @@ -674,7 +711,7 @@ { @if (currFill >= FillList.Count || currFill == -1) { - currStep = CompileStep.Gerarchia; + currStep = CompileStep.Tree; } else { diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index 1a2a5e5..4527578 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -160,7 +160,7 @@ namespace WebWindowComplex protected enum CompileStep { Template = 0, - Gerarchia = 1, + Tree = 1, Frame, Split, Sash, @@ -262,7 +262,7 @@ namespace WebWindowComplex } else { - currStep = CompileStep.Gerarchia; + currStep = CompileStep.Tree; } if (SashList.Count > 0) currAnta = 0; @@ -296,7 +296,7 @@ namespace WebWindowComplex SelGlass = IN_SelGlass ?? ""; Sash.m_HardwareCompleteList = IN_HardwareList; Sash.s_FamilyHardwareList = IN_FamilyHardwareList; - Sash.s_SelFamilyHW = IN_SelFamilyHardware; + Sash.s_SelFamilyHW = IN_SelFamilyHardware ?? ""; } // Ancora da fare... @@ -346,7 +346,7 @@ namespace WebWindowComplex currSash = -1; currFill = -1; currSplit = -1; - currStep = CompileStep.Gerarchia; + currStep = CompileStep.Tree; await DoPreviewSvg(); } @@ -882,7 +882,7 @@ namespace WebWindowComplex { ((Sash)currArea).Remove(); } - currStep = CompileStep.Gerarchia; + currStep = CompileStep.Tree; } /// diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index b2fc252..4072fb9 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.319 + 2.7.10.612 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -44,3 +44,6 @@ + + + diff --git a/WebWindowComplex/Window.cs b/WebWindowComplex/Window.cs index 07c8a8f..1631b21 100644 --- a/WebWindowComplex/Window.cs +++ b/WebWindowComplex/Window.cs @@ -273,6 +273,9 @@ namespace WebWindowComplex AreaList.Remove(AreaList[0]); // Aggiungo Area sash di default Sash SashArea = Sash.CreateSash(ParentArea); + Sash.s_SelFamilyHW = Sash.s_FamilyHardwareList.First(); + SashArea.RefreshHardwareList(); + SashArea.SetSelHardwareFromId(SashArea.HardwareList.First().Id); // Aggiungo area AreaList.Add(SashArea); if (SashArea.nSashQty == 1) @@ -1150,7 +1153,10 @@ namespace WebWindowComplex internal void SetSelHardwareFromId(string sId) { - m_SelHardware = m_HardwareList.FirstOrDefault(x => x.Id == sId) ?? new Hardware("", "", "", "", "", 0, 0); + if (m_HardwareList.Count == 0) + m_SelHardware = m_HardwareCompleteList.FirstOrDefault(x => x.Id == sId) ?? new Hardware("", "", "", "", "", 0, 0); + else + m_SelHardware = m_HardwareList.FirstOrDefault(x => x.Id == sId) ?? new Hardware("", "", "", "", "", 0, 0); if (m_SelHardware == null) m_SelHardware = m_HardwareList[0]; } @@ -1216,8 +1222,6 @@ namespace WebWindowComplex } private string FindSashShape() { - // Return "R" - //return "CHAMFER"; return "Rectangular"; } @@ -1289,7 +1293,7 @@ namespace WebWindowComplex } return ""; } - else if (m_SashList.Count > 0) + else if (m_SashList.Count == 1) { switch (GetOpeningType(m_SashList[0].OpeningType)) { @@ -1309,12 +1313,10 @@ namespace WebWindowComplex { return "PIVOT"; } - case OpeningTypes.COMPLANARSLIDE: { return "COMPLANARE"; } - case OpeningTypes.LIFTSLIDE: { return "ALZANTE_SCORREVOLE"; @@ -2083,83 +2085,6 @@ namespace WebWindowComplex } } - //public class Hardware - //{ - // private string m_sId; - // public string sId - // { - // get - // { - // return m_sId; - // } - // } - - // private string m_sFamily; - // public string sFamily - // { - // get - // { - // return m_sFamily; - // } - // } - - // private string m_sName; - // public string sName - // { - // get - // { - // return m_sName; - // } - // } - - // private string m_sOpeningType; - // public string sOpeningType - // { - // get - // { - // return m_sOpeningType; - // } - // } - - // private string m_sShape; - // public string sShape - // { - // get - // { - // return m_sShape; - // } - // } - - // private int m_nSashQty; - // public int nSashQty - // { - // get - // { - // return m_nSashQty; - // } - // } - - // private int m_nSashPosition; - // public int nSashPosition - // { - // get - // { - // return m_nSashPosition; - // } - // } - - // public Hardware(string sId, string sFamily, string sName, string sOpeningType, string sShape, int nSashQty, int nSashPosition) - // { - // m_sId = sId; - // m_sFamily = sFamily; - // m_sName = sName; - // m_sOpeningType = sOpeningType; - // m_sShape = sShape; - // m_nSashQty = nSashQty; - // m_nSashPosition = nSashPosition; - // } - //} - public partial class ParametriOpzioni { public enum HDWOPTIONTYPES : int diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index a7a3b34..062d5c8 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.319 + 2.7.10.612 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -43,3 +43,14 @@ + + + + + + + + + + + diff --git a/WebWindowTest/Test.razor b/WebWindowTest/Test.razor index 6efbe50..c25a2c1 100644 --- a/WebWindowTest/Test.razor +++ b/WebWindowTest/Test.razor @@ -21,7 +21,7 @@ @if (FrameWindow != null) {
  • - Gerarchia + Tree
    • @*
  • Frame @@ -111,7 +111,7 @@
    • } } - @if (currStep == CompileStep.Gerarchia) + @if (currStep == CompileStep.Tree) {
    @@ -313,7 +313,7 @@ { @if (currSplit >= SplitList.Count || currSplit == -1) { - currStep = CompileStep.Gerarchia; + currStep = CompileStep.Tree; } else { @@ -385,7 +385,7 @@ }
    - @if (item.SplitVertList.Count > 0) + @if (item.SplitVertList.Count > 0 && item.SplitHorizList.Count > 0) {
    @foreach (var dim in item.SplitVertList) @@ -397,9 +397,6 @@
    }
    - } - @if (item.SplitHorizList.Count > 0) - {
    @foreach (var dim in item.SplitHorizList) { @@ -412,6 +409,45 @@ }
    } + else if (item.SplitHorizList.Count > 0) + { + @foreach (var dim in item.SplitHorizList) + { +
    +
    + Height + + % +
    +
    + } + } + else if (item.SplitVertList.Count > 0) + { + @foreach (var dim in item.SplitVertList) + { +
    +
    + Width + + % +
    +
    + } + } + @* @if (item.SplitHorizList.Count > 0) + { +
    + @foreach (var dim in item.SplitHorizList) + { +
    + Height + + % +
    + } +
    + } *@ @if (item.SelSplitShape == Json.WindowConst.SplitShapes.GRID) { @@ -444,7 +480,7 @@ { @if (currSash >= SashList.Count || currSash == -1) { - currStep = CompileStep.Gerarchia; + currStep = CompileStep.Tree; } else { @@ -674,7 +710,7 @@ { @if (currFill >= FillList.Count || currFill == -1) { - currStep = CompileStep.Gerarchia; + currStep = CompileStep.Tree; } else { diff --git a/WebWindowTest/Test.razor.cs b/WebWindowTest/Test.razor.cs index a9876f1..1aec3b2 100644 --- a/WebWindowTest/Test.razor.cs +++ b/WebWindowTest/Test.razor.cs @@ -160,7 +160,7 @@ namespace WebWindowTest protected enum CompileStep { Template = 0, - Gerarchia = 1, + Tree = 1, Frame, Split, Sash, @@ -262,7 +262,7 @@ namespace WebWindowTest } else { - currStep = CompileStep.Gerarchia; + currStep = CompileStep.Tree; } if (SashList.Count > 0) currAnta = 0; @@ -346,7 +346,7 @@ namespace WebWindowTest currSash = -1; currFill = -1; currSplit = -1; - currStep = CompileStep.Gerarchia; + currStep = CompileStep.Tree; await DoPreviewSvg(); } @@ -882,7 +882,7 @@ namespace WebWindowTest { ((Sash)currArea).Remove(); } - currStep = CompileStep.Gerarchia; + currStep = CompileStep.Tree; } /// diff --git a/WebWindowTest/Window.cs b/WebWindowTest/Window.cs index 657aa2a..5b88ce8 100644 --- a/WebWindowTest/Window.cs +++ b/WebWindowTest/Window.cs @@ -273,6 +273,9 @@ namespace WebWindowTest AreaList.Remove(AreaList[0]); // Aggiungo Area sash di default Sash SashArea = Sash.CreateSash(ParentArea); + Sash.s_SelFamilyHW = Sash.s_FamilyHardwareList.First(); + SashArea.RefreshHardwareList(); + SashArea.SetSelHardwareFromId(SashArea.HardwareList.First().Id); // Aggiungo area AreaList.Add(SashArea); if(SashArea.nSashQty == 1) @@ -1150,7 +1153,10 @@ namespace WebWindowTest internal void SetSelHardwareFromId(string sId) { - m_SelHardware = m_HardwareList.FirstOrDefault(x => x.Id == sId)?? new Hardware("","","","","",0,0); + if(m_HardwareList.Count == 0) + m_SelHardware = m_HardwareCompleteList.FirstOrDefault(x => x.Id == sId) ?? new Hardware("", "", "", "", "", 0, 0); + else + m_SelHardware = m_HardwareList.FirstOrDefault(x => x.Id == sId)?? new Hardware("","","","","",0,0); if (m_SelHardware == null) m_SelHardware = m_HardwareList[0]; } @@ -1216,9 +1222,7 @@ namespace WebWindowTest } private string FindSashShape() { - // Return "R" - //return "CHAMFER"; - return "RECTANGLE"; + return "Rectangular"; } internal OpeningTypes GetOpeningType(Openings OpeningType) @@ -1333,9 +1337,20 @@ namespace WebWindowTest m_HardwareList.Clear(); string sSashShape = FindSashShape(); string sOpeningType = ConvertOpeningType(); - m_HardwareList = new ObservableCollection(from Hardware in m_HardwareCompleteList - where Hardware.Id == "000000" || (Hardware.FamilyName == s_SelFamilyHW && Hardware.SashQty == nSashQty && Hardware.Shape == sSashShape && Hardware.OpeningType == sOpeningType) - select Hardware); + var iComp = StringComparison.InvariantCultureIgnoreCase; + var rawList = m_HardwareCompleteList + .Where(x => x.Id == "000000" || + (x.FamilyName.Equals(s_SelFamilyHW, iComp) && x.SashQty == nSashQty && x.Shape.Equals(sSashShape, iComp) && x.OpeningType.Equals(sOpeningType, iComp)) + ) + .ToList(); + if (rawList != null && rawList.Count > 0) + { + m_HardwareList = new ObservableCollection(rawList); + } + else + { + m_HardwareList = new ObservableCollection(); + } } internal void RefreshHardwareOptionList() @@ -2067,83 +2082,6 @@ namespace WebWindowTest } } - //public class Hardware - //{ - // private string m_sId; - // public string sId - // { - // get - // { - // return m_sId; - // } - // } - - // private string m_sFamily; - // public string sFamily - // { - // get - // { - // return m_sFamily; - // } - // } - - // private string m_sName; - // public string sName - // { - // get - // { - // return m_sName; - // } - // } - - // private string m_sOpeningType; - // public string sOpeningType - // { - // get - // { - // return m_sOpeningType; - // } - // } - - // private string m_sShape; - // public string sShape - // { - // get - // { - // return m_sShape; - // } - // } - - // private int m_nSashQty; - // public int nSashQty - // { - // get - // { - // return m_nSashQty; - // } - // } - - // private int m_nSashPosition; - // public int nSashPosition - // { - // get - // { - // return m_nSashPosition; - // } - // } - - // public Hardware(string sId, string sFamily, string sName, string sOpeningType, string sShape, int nSashQty, int nSashPosition) - // { - // m_sId = sId; - // m_sFamily = sFamily; - // m_sName = sName; - // m_sOpeningType = sOpeningType; - // m_sShape = sShape; - // m_nSashQty = nSashQty; - // m_nSashPosition = nSashPosition; - // } - //} - public partial class ParametriOpzioni { public enum HDWOPTIONTYPES : int @@ -2193,7 +2131,8 @@ namespace WebWindowTest { m_sName = HdwOptionParam.NomeParametro; m_sDescription = HdwOptionParam.DescrizioneParametro; - m_OptVisibility = Visibility.VISIBLE; // If(HdwOptionParam.Visible.ToLower = "true", Visibility.Visible, Visibility.Collapsed) + m_OptVisibility = Visibility.VISIBLE; + // If(HdwOptionParam.Visible.ToLower = "true", Visibility.Visible, Visibility.Collapsed) } }