diff --git a/.gitignore b/.gitignore index c66999f80..9a7b012d0 100644 --- a/.gitignore +++ b/.gitignore @@ -624,6 +624,10 @@ obj /Dakota/obj /DakotaSender/bin /DakotaSender/obj +/DakotaUnitTest/bin +/DakotaUnitTest/obj +/WohneinheitUnitTest/bin +/WohneinheitUnitTest/obj /BeWoDatabaseTerminator/BeWoDatabaseTerminator/bin/Debug /BeWoDatabaseTerminator/BeWoDatabaseTerminator/bin/Release /ReportImp/TestLWV diff --git a/BeWo/View/Detail/WohnheimView.xaml b/BeWo/View/Detail/WohnheimView.xaml index 95df978ff..0819bb058 100644 --- a/BeWo/View/Detail/WohnheimView.xaml +++ b/BeWo/View/Detail/WohnheimView.xaml @@ -308,6 +308,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BeWoTests.sln b/BeWoTests.sln new file mode 100644 index 000000000..ac36fd2ed --- /dev/null +++ b/BeWoTests.sln @@ -0,0 +1,196 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.33927.289 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{FEB0336B-F053-40B6-92DD-7DE56AB9408A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWo", "BeWo\BeWo.csproj", "{3FEBB560-9275-413A-9767-BB68C44EEBC3}" + ProjectSection(ProjectDependencies) = postProject + {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3} = {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3} + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} = {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Service", "Service\Service.csproj", "{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "Data\Data.csproj", "{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared", "Shared\Shared.csproj", "{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls", "Controls\Controls.csproj", "{D5E53B0F-BF5A-41E8-93E2-0F32845FC729}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Report", "Report\Report.csproj", "{40D8B312-EA64-49E3-A31A-5E57ED4D5654}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Host", "Host\Host.csproj", "{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportingService", "ReportService\ReportingService.csproj", "{663EFCB5-9E3E-4C76-97EE-3188E072634C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatController", "..\Chat\ChatController\ChatController.csproj", "{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dakota", "Dakota\Dakota.csproj", "{47331732-DD96-4075-869F-83AA9F3F9937}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B6039E62-D43E-477A-BE82-EADB1057A3A2}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{CCD6B644-49E7-4A11-BD8F-607088A4AC83}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wohneinheit", "Wohneinheit", "{2F7893AD-34FC-40A2-838A-3D2D8596E9AC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WohneinheitUnitTest", "WohneinheitUnitTest\WohneinheitUnitTest.csproj", "{7630915F-DFE4-45A4-A7B1-B6D19B0126C1}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|.NET = Debug|.NET + Debug|Any CPU = Debug|Any CPU + Debug|Mixed Platforms = Debug|Mixed Platforms + Release|.NET = Release|.NET + Release|Any CPU = Release|Any CPU + Release|Mixed Platforms = Release|Mixed Platforms + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|.NET.ActiveCfg = Debug|Any CPU + {3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|.NET.Build.0 = Debug|Any CPU + {3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {3FEBB560-9275-413A-9767-BB68C44EEBC3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3FEBB560-9275-413A-9767-BB68C44EEBC3}.Release|.NET.ActiveCfg = Release|Any CPU + {3FEBB560-9275-413A-9767-BB68C44EEBC3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3FEBB560-9275-413A-9767-BB68C44EEBC3}.Release|Any CPU.Build.0 = Release|Any CPU + {3FEBB560-9275-413A-9767-BB68C44EEBC3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {3FEBB560-9275-413A-9767-BB68C44EEBC3}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|.NET.ActiveCfg = Debug|Any CPU + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|.NET.Build.0 = Debug|Any CPU + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Release|.NET.ActiveCfg = Release|Any CPU + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Release|Any CPU.Build.0 = Release|Any CPU + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|.NET.ActiveCfg = Debug|Any CPU + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|.NET.Build.0 = Debug|Any CPU + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Release|.NET.ActiveCfg = Release|Any CPU + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Release|Any CPU.Build.0 = Release|Any CPU + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|.NET.ActiveCfg = Debug|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|.NET.Build.0 = Debug|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|.NET.ActiveCfg = Release|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|Any CPU.Build.0 = Release|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|.NET.ActiveCfg = Debug|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|.NET.Build.0 = Debug|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|.NET.ActiveCfg = Release|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|Any CPU.Build.0 = Release|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|.NET.ActiveCfg = Debug|Any CPU + {40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|.NET.Build.0 = Debug|Any CPU + {40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|Any CPU.Build.0 = Debug|Any CPU + {40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Release|.NET.ActiveCfg = Release|Any CPU + {40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Release|Any CPU.ActiveCfg = Release|Any CPU + {40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Release|Any CPU.Build.0 = Release|Any CPU + {40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {40D8B312-EA64-49E3-A31A-5E57ED4D5654}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|.NET.ActiveCfg = Debug|Any CPU + {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|.NET.Build.0 = Debug|Any CPU + {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|.NET.ActiveCfg = Release|Any CPU + {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Any CPU.Build.0 = Release|Any CPU + {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|.NET.ActiveCfg = Debug|Any CPU + {663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|.NET.Build.0 = Debug|Any CPU + {663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|.NET.ActiveCfg = Release|Any CPU + {663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Any CPU.Build.0 = Release|Any CPU + {663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|.NET.ActiveCfg = Debug|Any CPU + {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|.NET.Build.0 = Debug|Any CPU + {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|.NET.ActiveCfg = Release|Any CPU + {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|.NET.Build.0 = Release|Any CPU + {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Any CPU.Build.0 = Release|Any CPU + {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|.NET.ActiveCfg = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|.NET.Build.0 = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Any CPU.Build.0 = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Release|.NET.ActiveCfg = Release|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Release|.NET.Build.0 = Release|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Release|Any CPU.ActiveCfg = Release|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Release|Any CPU.Build.0 = Release|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {47331732-DD96-4075-869F-83AA9F3F9937}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Debug|.NET.ActiveCfg = Debug|Any CPU + {7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Debug|.NET.Build.0 = Debug|Any CPU + {7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Release|.NET.ActiveCfg = Release|Any CPU + {7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Release|.NET.Build.0 = Release|Any CPU + {7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Release|Any CPU.Build.0 = Release|Any CPU + {7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {7630915F-DFE4-45A4-A7B1-B6D19B0126C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {3FEBB560-9275-413A-9767-BB68C44EEBC3} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852} + {094331C3-ECEE-4C89-BBFD-4C9DED89F0EF} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} + {D5E53B0F-BF5A-41E8-93E2-0F32845FC729} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852} + {40D8B312-EA64-49E3-A31A-5E57ED4D5654} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} + {E1154C7B-BB77-4155-9854-DAD8FC5A8BC3} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} + {663EFCB5-9E3E-4C76-97EE-3188E072634C} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} + {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852} + {47331732-DD96-4075-869F-83AA9F3F9937} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} + {2F7893AD-34FC-40A2-838A-3D2D8596E9AC} = {CCD6B644-49E7-4A11-BD8F-607088A4AC83} + {7630915F-DFE4-45A4-A7B1-B6D19B0126C1} = {2F7893AD-34FC-40A2-838A-3D2D8596E9AC} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {5352BE53-F2FD-442F-85A8-4157599AA153} + EndGlobalSection +EndGlobal diff --git a/Data/Data.csproj b/Data/Data.csproj index b0ffe0de7..7c17e6e59 100644 --- a/Data/Data.csproj +++ b/Data/Data.csproj @@ -301,6 +301,8 @@ + + @@ -696,6 +698,12 @@ PreserveNewest + + Designer + + + Designer + diff --git a/Data/Entities/Wohneinheit.cs b/Data/Entities/Wohneinheit.cs new file mode 100644 index 000000000..956ddcfa5 --- /dev/null +++ b/Data/Entities/Wohneinheit.cs @@ -0,0 +1,257 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BeWo.Data.Entities +{ + public class Wohneinheit : BeWoEntityBase + { + public static string PropertyName_Wohnheim = nameof(Wohnheim); + public static string PropertyName_Wohnname = nameof(Wohnname); + public static string PropertyName_Zimmername = nameof(Zimmername); + public static string PropertyName_Miete = nameof(Miete); + public static string PropertyName_Heizung = nameof(Heizung); + public static string PropertyName_Strom = nameof(Strom); + public static string PropertyName_Betriebskosten = nameof(Betriebskosten); + public static string PropertyName_SonstigeKosten = nameof(SonstigeKosten); + public static string PropertyName_QM = nameof(QM); + public static string PropertyName_Baujahr = nameof(Baujahr); + public static string PropertyName_Mobilierung = nameof(Mobilierung); + public static string PropertyName_Zusatznotiz = nameof(Zusatznotiz); + public static string PropertyName_Stock = nameof(Stock); + public static string PropertyName_Belegungen = nameof(Belegungen); + + private Wohnheim _Wohnheim; + private string _Wohnname; + private string _Zimmername; + private decimal _Miete; + private decimal _Heizung; + private decimal _Strom; + private decimal _Betriebskosten; + private decimal _SonstigeKosten; + private decimal _QM; + private int _Baujahr; + private string _Mobilierung; + private string _Zusatznotiz; + private string _Stock; + private IList _Belegungen; + + public Wohneinheit() + { + _Tid = BS.Shared.TableID.Wohneinheit; + } + + public virtual Wohnheim Wohnheim + { + get + { + return this._Wohnheim; + } + + set + { + if (this.AreDifferent(this._Wohnheim, value)) + { + this._Wohnheim = value; + } + } + } + public virtual string Wohnname + { + get + { + return this._Wohnname; + } + + set + { + if (this.AreDifferent(this._Wohnname, value)) + { + this._Wohnname = value; + } + } + } + public virtual string Zimmername + { + get + { + return this._Zimmername; + } + + set + { + if (this.AreDifferent(this._Zimmername, value)) + { + this._Zimmername = value; + } + } + } + public virtual decimal Miete + { + get + { + return this._Miete; + } + + set + { + if (this.AreDifferent(this._Miete, value)) + { + this._Miete = value; + } + } + } + public virtual decimal Heizung + { + get + { + return this._Heizung; + } + + set + { + if (this.AreDifferent(this._Heizung, value)) + { + this._Heizung = value; + } + } + } + public virtual decimal Strom + { + get + { + return this._Strom; + } + + set + { + if (this.AreDifferent(this._Strom, value)) + { + this._Strom = value; + } + } + } + public virtual decimal Betriebskosten + { + get + { + return this._Betriebskosten; + } + + set + { + if (this.AreDifferent(this._Betriebskosten, value)) + { + this._Betriebskosten = value; + } + } + } + public virtual decimal SonstigeKosten + { + get + { + return this._SonstigeKosten; + } + + set + { + if (this.AreDifferent(this._SonstigeKosten, value)) + { + this._SonstigeKosten = value; + } + } + } + public virtual decimal QM + { + get + { + return this._QM; + } + + set + { + if (this.AreDifferent(this._QM, value)) + { + this._QM = value; + } + } + } + public virtual int Baujahr + { + get + { + return this._Baujahr; + } + + set + { + if (this.AreDifferent(this._Baujahr, value)) + { + this._Baujahr = value; + } + } + } + public virtual string Mobilierung + { + get + { + return this._Mobilierung; + } + + set + { + if (this.AreDifferent(this._Mobilierung, value)) + { + this._Mobilierung = value; + } + } + } + public virtual string Zusatznotiz + { + get + { + return this._Zusatznotiz; + } + + set + { + if (this.AreDifferent(this._Zusatznotiz, value)) + { + this._Zusatznotiz = value; + } + } + } + public virtual string Stock + { + get + { + return this._Stock; + } + + set + { + if (this.AreDifferent(this._Stock, value)) + { + this._Stock = value; + } + } + } + public virtual IList Belegungen + { + get + { + return this._Belegungen; + } + + set + { + if (this.AreDifferent(this._Belegungen, value)) + { + this._Belegungen = value; + } + } + } + } +} diff --git a/Data/Entities/WohneinheitBelegung.cs b/Data/Entities/WohneinheitBelegung.cs new file mode 100644 index 000000000..00fbc29bd --- /dev/null +++ b/Data/Entities/WohneinheitBelegung.cs @@ -0,0 +1,105 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BeWo.Data.Entities +{ + public class WohneinheitBelegung : BeWoEntityBase + { + public static string PropertyName_Customer = nameof(Customer); + public static string PropertyName_Wohneinheit = nameof(Wohneinheit); + public static string PropertyName_StartDate = nameof(StartDate); + public static string PropertyName_EndDate = nameof(EndDate); + public static string PropertyName_Kommentar = nameof(Kommentar); + + private Customer _Customer; + private Wohneinheit _Wohneinheit; + private DateTime _StartDate; + private DateTime? _EndDate; + private string _Kommentar; + + public WohneinheitBelegung() + { + _Tid = BS.Shared.TableID.WohneinheitBelegung; + } + + public virtual Customer Customer + { + get + { + return this._Customer; + } + + set + { + if (this.AreDifferent(this._Customer, value)) + { + this._Customer = value; + } + } + } + public virtual Wohneinheit Wohneinheit + { + get + { + return this._Wohneinheit; + } + + set + { + if (this.AreDifferent(this._Wohneinheit, value)) + { + this._Wohneinheit = value; + } + } + } + public virtual DateTime StartDate + { + get + { + return this._StartDate; + } + + set + { + if (this.AreDifferent(this._StartDate, value)) + { + this._StartDate = value; + } + } + } + public virtual DateTime? EndDate + { + get + { + return this._EndDate; + } + + set + { + if (this.AreDifferent(this._EndDate, value)) + { + this._EndDate = value; + } + } + } + public virtual string Kommentar + { + get + { + return this._Kommentar; + } + + set + { + if (this.AreDifferent(this._Kommentar, value)) + { + this._Kommentar = value; + } + } + } + + } +} diff --git a/Data/Mappings/Wohneinheit.hbm.xml b/Data/Mappings/Wohneinheit.hbm.xml new file mode 100644 index 000000000..6a98c80fc --- /dev/null +++ b/Data/Mappings/Wohneinheit.hbm.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Data/Mappings/WohneinheitBelegung.hbm.xml b/Data/Mappings/WohneinheitBelegung.hbm.xml new file mode 100644 index 000000000..c719b2a73 --- /dev/null +++ b/Data/Mappings/WohneinheitBelegung.hbm.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user index 769cd8b25..a0002e9f5 100644 --- a/Host/Host.csproj.user +++ b/Host/Host.csproj.user @@ -3,7 +3,7 @@ BeWo2.0 true - Release|Any CPU + Debug|Any CPU false diff --git a/Model/Changes_2024_07_15 Wohneinheit.txt b/Model/Changes_2024_07_15 Wohneinheit.txt new file mode 100644 index 000000000..bc62e3cee --- /dev/null +++ b/Model/Changes_2024_07_15 Wohneinheit.txt @@ -0,0 +1,46 @@ +CREATE TABLE `wohneinheit` ( + `Oid` bigint NOT NULL AUTO_INCREMENT, + `InsTs` datetime DEFAULT NULL, + `InsUser` varchar(256) DEFAULT NULL, + `Notice` varchar(1024) DEFAULT NULL, + `Tid` int DEFAULT NULL, + `UdpUser` varchar(256) DEFAULT NULL, + `Version` bigint DEFAULT NULL, + `IsActive` tinyint DEFAULT NULL, + `SystemEntryID` int DEFAULT NULL, + `WohnheimOid` bigint NOT NULL, + `Wohnname` varchar(256) NOT NULL, + `Zimmername` varchar(256) DEFAULT NULL, + `Miete` decimal(18,10) DEFAULT NULL, + `Heizung` decimal(18,10) DEFAULT NULL, + `Strom` decimal(18,10) DEFAULT NULL, + `Betriebskosten` decimal(18,10) DEFAULT NULL, + `SonstigeKosten` decimal(18,10) DEFAULT NULL, + `QM` decimal(18,10) DEFAULT NULL, + `Baujahr` int DEFAULT NULL, + `Mobilierung` varchar(1024) DEFAULT NULL, + `Zusatznotiz` varchar(1024) DEFAULT NULL, + `Stock` varchar(256) DEFAULT NULL, + PRIMARY KEY (`Oid`), + CONSTRAINT `FK_WOHNEINHEIT_WOHNHEIM` FOREIGN KEY (`WohnheimOid`) REFERENCES `Wohnheim` (`Oid`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 + +CREATE TABLE `wohneinheitbelegung` ( + `Oid` bigint NOT NULL AUTO_INCREMENT, + `InsTs` datetime DEFAULT NULL, + `InsUser` varchar(256) DEFAULT NULL, + `Notice` varchar(1024) DEFAULT NULL, + `Tid` int DEFAULT NULL, + `UdpUser` varchar(256) DEFAULT NULL, + `Version` bigint DEFAULT NULL, + `IsActive` tinyint DEFAULT NULL, + `SystemEntryID` int DEFAULT NULL, + `WohneinheitOid` bigint NOT NULL, + `CustomerOid` bigint NOT NULL, + `StartDate` datetime NOT NULL, + `EndDate` datetime DEFAULT NULL, + `Kommentar` varchar(1024) DEFAULT NULL, + PRIMARY KEY (`Oid`), + CONSTRAINT `FK_WOHNEINHEITBELEGUNG_WOHNEINHEIT` FOREIGN KEY (`WohneinheitOid`) REFERENCES `Wohneinheit` (`Oid`) + CONSTRAINT `FK_WOHNEINHEITBELEGUNG_CUSTOMER` FOREIGN KEY (`CustomerOid`) REFERENCES `Customer` (`Oid`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 \ No newline at end of file diff --git a/Service/ServiceImplementations/AccountingServiceImp.cs b/Service/ServiceImplementations/AccountingServiceImp.cs index 290c0e867..f0a5797b1 100644 --- a/Service/ServiceImplementations/AccountingServiceImp.cs +++ b/Service/ServiceImplementations/AccountingServiceImp.cs @@ -566,7 +566,7 @@ namespace BeWo.Service.ServiceImplementations { var dc = invoices.Where(i => i.InvoiceBaseOid == entity.Oid).FirstOrDefault(); - + if (dc.IsPaid != entity.IsPaid || dc.IsExported != entity.IsExported || dc.IsReviewed != entity.IsReviewed || @@ -885,7 +885,7 @@ namespace BeWo.Service.ServiceImplementations { var validation_success = CreateGkvTransferProtokoll(entity, protokoll); - if(!validation_success) + if (!validation_success) { response.Message = "Validierung fehlgeschlagen"; return response; @@ -1077,7 +1077,7 @@ namespace BeWo.Service.ServiceImplementations GkvTransferProtokoll = gkv_transfer_dc, Username = loginName, Password = hashed_password, - Tenant = MultitenancyOperationContextExt.Current.Tenant, + Tenant = MultitenancyOperationContextExt.Current.Tenant, DebugMode = "fozc4897b6ztvf978AFCRRG244fvFV2532fvf324AF" }; @@ -1131,14 +1131,14 @@ namespace BeWo.Service.ServiceImplementations response_app8 = JsonConvert.DeserializeObject(response_app8_str); } - catch(Exception e) + catch (Exception e) { return true; } if (!response_app8.Success) throw new DakotaException(response_app8.Message); - + bool allAreUpToDate = true; for (int id = 0; id < updateables_len; id++) { @@ -1181,7 +1181,7 @@ namespace BeWo.Service.ServiceImplementations response_app8_str = client.UploadString(url, "POST", dataString); } } - catch(Exception e) + catch (Exception e) { throw new DakotaException(e.Message, "App8"); } diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs index c7039441b..7c2df7ac6 100644 --- a/Shared/BeWoEntityEnums.cs +++ b/Shared/BeWoEntityEnums.cs @@ -172,6 +172,8 @@ namespace BS.Shared GkvAbrechnung = 165, Bargeldtransaktionshistory = 166, GkvTransferprotokoll = 167, + Wohneinheit = 168, + WohneinheitBelegung = 169 } public enum SystemEntryID diff --git a/Shared/DataContracts/DataContract.cs b/Shared/DataContracts/DataContract.cs new file mode 100644 index 000000000..5eb2c3d01 --- /dev/null +++ b/Shared/DataContracts/DataContract.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace BS.Shared.DataContracts +{ + public abstract class DataContract : IDataContract + { + [DataMember] + public long? Oid { get; set; } + + [DataMember] + public ActivationTypeId IsActive { get; set; } + + [DataMember] + public string Notice { get; set; } + + [DataMember] + public DateTime? InsTs { get; set; } + + [DataMember] + public string InsUser { get; set; } + + [DataMember] + public long? Version { get; set; } + + [DataMember] + public string UdpUser { get; set; } + + [DataMember] + public SystemEntryID? SystemEntryID { get; set; } + } +} diff --git a/Shared/DataContracts/WohneinheitBelegungDC.cs b/Shared/DataContracts/WohneinheitBelegungDC.cs new file mode 100644 index 000000000..6837d5b36 --- /dev/null +++ b/Shared/DataContracts/WohneinheitBelegungDC.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace BS.Shared.DataContracts +{ + public class WohneinheitBelegungDC : DataContract + { + [DataMember] public WohneinheitDC Wohneinheit { get; set; } + [DataMember] public CustomerDC Customer { get; set; } + [DataMember] public DateTime StartDate { get; set; } + [DataMember] public DateTime? EndDate { get; set; } + [DataMember] public string Kommentar { get; set; } + } +} diff --git a/Shared/DataContracts/WohneinheitDC.cs b/Shared/DataContracts/WohneinheitDC.cs new file mode 100644 index 000000000..ed0874e26 --- /dev/null +++ b/Shared/DataContracts/WohneinheitDC.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace BS.Shared.DataContracts +{ + public class WohneinheitDC : DataContract + { + [DataMember] public WohnheimDC Wohnheim { get; set; } + [DataMember] public string Wohnname { get; set; } + [DataMember] public string Zimmername { get; set; } + [DataMember] public decimal Miete { get; set; } + [DataMember] public decimal Heizung { get; set; } + [DataMember] public decimal Strom { get; set; } + [DataMember] public decimal Betriebskosten { get; set; } + [DataMember] public decimal SonstigeKosten { get; set; } + [DataMember] public decimal QM { get; set; } + [DataMember] public int Baujahr { get; set; } + [DataMember] public string Mobilierung { get; set; } + [DataMember] public string Zusatznotiz { get; set; } + [DataMember] public string Stock { get; set; } + [DataMember] public List Belegungen { get; set; } + } +} diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj index a5e76b1eb..ebf12b264 100644 --- a/Shared/Shared.csproj +++ b/Shared/Shared.csproj @@ -170,6 +170,7 @@ + @@ -285,6 +286,8 @@ + + diff --git a/WohneinheitUnitTest/Properties/AssemblyInfo.cs b/WohneinheitUnitTest/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..71fcba43c --- /dev/null +++ b/WohneinheitUnitTest/Properties/AssemblyInfo.cs @@ -0,0 +1,20 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("WohneinheitUnitTest")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("WohneinheitUnitTest")] +[assembly: AssemblyCopyright("Copyright © 2024")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +[assembly: ComVisible(false)] + +[assembly: Guid("7630915f-dfe4-45a4-a7b1-b6d19b0126c1")] + +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/WohneinheitUnitTest/WohneinheitUnitTest.csproj b/WohneinheitUnitTest/WohneinheitUnitTest.csproj new file mode 100644 index 000000000..93879d9c5 --- /dev/null +++ b/WohneinheitUnitTest/WohneinheitUnitTest.csproj @@ -0,0 +1,78 @@ + + + + + + Debug + AnyCPU + {7630915F-DFE4-45A4-A7B1-B6D19B0126C1} + Library + Properties + WohneinheitUnitTest + WohneinheitUnitTest + v4.7.2 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 15.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\MSTest.TestFramework.2.1.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + + + ..\packages\MSTest.TestFramework.2.1.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + + + + + + + + + + + + + + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} + Data + + + {2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4} + Shared + + + + + + + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". + + + + + + \ No newline at end of file diff --git a/WohneinheitUnitTest/WohneinheitUnitTest1.cs b/WohneinheitUnitTest/WohneinheitUnitTest1.cs new file mode 100644 index 000000000..5ccc9090b --- /dev/null +++ b/WohneinheitUnitTest/WohneinheitUnitTest1.cs @@ -0,0 +1,27 @@ +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BS.Shared.DataContracts; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; + +namespace WohneinheitUnitTest +{ + [TestClass] + public class WohneinheitUnitTest1 + { + [TestMethod] + public void TestMethod1() + { + var wohnheim = DAOFactory.GenericDAO.GetByID(1); + + var wohneinheit = new Wohneinheit(); + + wohneinheit.Wohnheim = wohnheim; + wohneinheit.Wohnname = "Test"; + + DAOFactory.GenericDAO.Insert(wohneinheit); + + Assert.IsTrue(true); + } + } +} diff --git a/WohneinheitUnitTest/packages.config b/WohneinheitUnitTest/packages.config new file mode 100644 index 000000000..f84cb1064 --- /dev/null +++ b/WohneinheitUnitTest/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file