From 9dbd4d6d324031cd5a245277cf6b33c38463341b Mon Sep 17 00:00:00 2001 From: Damian Wessels Date: Sun, 26 Mar 2023 14:55:16 +0200 Subject: [PATCH] =?UTF-8?q?Sewerconnection=20viewmodel=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SewerStammGen/Enum/EMainWindowViewType.cs | 2 +- .../AddViewModelsHostBuilderExtensions.cs | 5 ++ SewerStammGen/MainWindow.xaml | 3 + .../Factories/MainWindowViewModelFactory.cs | 8 ++- .../ViewModel/SewerConnectorViewModel.cs | 2 +- .../Controls/UCMainWindowNavigationBar.xaml | 2 +- SewerStammGen/Views/UCSewerConnector.xaml | 63 +++++++++++++++++-- 7 files changed, 77 insertions(+), 8 deletions(-) diff --git a/SewerStammGen/Enum/EMainWindowViewType.cs b/SewerStammGen/Enum/EMainWindowViewType.cs index dd490ec..20b4824 100644 --- a/SewerStammGen/Enum/EMainWindowViewType.cs +++ b/SewerStammGen/Enum/EMainWindowViewType.cs @@ -11,6 +11,6 @@ namespace SewerStammGen.Enum Home, Projects, EditSchacht, - Sewer + SewerConnectionEdit } } diff --git a/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs b/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs index e910fce..a071db6 100644 --- a/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs +++ b/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs @@ -28,6 +28,11 @@ namespace SewerStammGen.HostBuilders return () => new EditManHoleViewModel(); }); + services.AddSingleton>(services => + { + return () => new SewerConnectorViewModel(); + }); + services.AddSingleton(); diff --git a/SewerStammGen/MainWindow.xaml b/SewerStammGen/MainWindow.xaml index b1f25a5..8570eef 100644 --- a/SewerStammGen/MainWindow.xaml +++ b/SewerStammGen/MainWindow.xaml @@ -17,6 +17,9 @@ + + + diff --git a/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs b/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs index f9823e0..604584b 100644 --- a/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs +++ b/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs @@ -12,14 +12,17 @@ namespace SewerStammGen.ViewModel.Factories { private CreateViewModel _createHomeViewModel; private CreateViewModel _createEditManholeViewModel; + private CreateViewModel _createSewerConnectorViewModel; public MainWindowViewModelFactory( CreateViewModel createHomeViewModel, - CreateViewModel createEditManholeViewModel + CreateViewModel createEditManholeViewModel, + CreateViewModel createSewerConnectorViewModel ) { _createHomeViewModel = createHomeViewModel; _createEditManholeViewModel = createEditManholeViewModel; + _createSewerConnectorViewModel = createSewerConnectorViewModel; } public BaseViewModel CreateViewModel(EMainWindowViewType viewType) @@ -32,6 +35,9 @@ namespace SewerStammGen.ViewModel.Factories case EMainWindowViewType.EditSchacht: return _createEditManholeViewModel(); + case EMainWindowViewType.SewerConnectionEdit: + return _createSewerConnectorViewModel(); + default: throw new NotImplementedException(); } diff --git a/SewerStammGen/ViewModel/SewerConnectorViewModel.cs b/SewerStammGen/ViewModel/SewerConnectorViewModel.cs index 4b7b1d2..8e62d28 100644 --- a/SewerStammGen/ViewModel/SewerConnectorViewModel.cs +++ b/SewerStammGen/ViewModel/SewerConnectorViewModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace SewerStammGen.ViewModel { - class SewerConnectorViewModel : BaseViewModel + public class SewerConnectorViewModel : BaseViewModel { } } diff --git a/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml b/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml index 445fef4..ed42711 100644 --- a/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml +++ b/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml @@ -18,7 +18,7 @@ - + diff --git a/SewerStammGen/Views/UCSewerConnector.xaml b/SewerStammGen/Views/UCSewerConnector.xaml index f65bf30..9fd9d68 100644 --- a/SewerStammGen/Views/UCSewerConnector.xaml +++ b/SewerStammGen/Views/UCSewerConnector.xaml @@ -13,11 +13,31 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + +