diff --git a/Test.UI.sln b/Test.UI.sln index 5245615..d00bbdb 100644 --- a/Test.UI.sln +++ b/Test.UI.sln @@ -17,6 +17,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebWindowComplex", "WebWind EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebWindowTest", "WebWindowTest\WebWindowTest.csproj", "{C22770A7-C344-4CE9-8D6F-6ACE62091C31}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebWindow.Base", "WebWindow.Base\WebWindow.Base.csproj", "{5D1B481C-8029-488A-BD4F-B03001A482FB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,6 +53,10 @@ Global {C22770A7-C344-4CE9-8D6F-6ACE62091C31}.Debug|Any CPU.Build.0 = Debug|Any CPU {C22770A7-C344-4CE9-8D6F-6ACE62091C31}.Release|Any CPU.ActiveCfg = Release|Any CPU {C22770A7-C344-4CE9-8D6F-6ACE62091C31}.Release|Any CPU.Build.0 = Release|Any CPU + {5D1B481C-8029-488A-BD4F-B03001A482FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5D1B481C-8029-488A-BD4F-B03001A482FB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5D1B481C-8029-488A-BD4F-B03001A482FB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5D1B481C-8029-488A-BD4F-B03001A482FB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/WebWindow.Base/Hardware.cs b/WebWindow.Base/Hardware.cs index c47ff94..e31c4d4 100644 --- a/WebWindow.Base/Hardware.cs +++ b/WebWindow.Base/Hardware.cs @@ -1,7 +1,79 @@ namespace WebWindow.Base { - public class Class1 + 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; + } } } diff --git a/WebWindow.Base/WebWindow.Base.csproj b/WebWindow.Base/WebWindow.Base.csproj index fa71b7a..b5255ca 100644 --- a/WebWindow.Base/WebWindow.Base.csproj +++ b/WebWindow.Base/WebWindow.Base.csproj @@ -1,9 +1,17 @@ - + - - net8.0 - enable - enable - + + net8.0 + enable + enable + 2.7.9.1217 + Annamaria Sassi + Egalware + Componente gestione JWD per LUX + + + + + diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 87fdea0..c432686 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -21,6 +21,10 @@ + + + + diff --git a/WebWindowComplex/Window.cs b/WebWindowComplex/Window.cs index 3a31f8a..0364c68 100644 --- a/WebWindowComplex/Window.cs +++ b/WebWindowComplex/Window.cs @@ -6,6 +6,7 @@ using System.ComponentModel; using System.Drawing; using System.Runtime.Intrinsics.Arm; using System.Xml.Serialization; +using WebWindow.Base; using WebWindowComplex.Json; using static WebWindowComplex.Json.WindowConst; @@ -1753,8 +1754,9 @@ namespace WebWindowComplex } } +#if false public class Hardware - { + { private string m_sId; public string sId { @@ -1772,7 +1774,7 @@ namespace WebWindowComplex return m_sFamily; } } - + private string m_sName; public string sName { @@ -1828,7 +1830,8 @@ namespace WebWindowComplex m_nSashQty = nSashQty; m_nSashPosition = nSashPosition; } - } + } +#endif public class AGBOption { diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 7f8a0e9..7629fb7 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -29,6 +29,10 @@ + + + +