diff --git a/SewerStammGen/Enum/EMainWindowViewType.cs b/SewerStammGen/Enum/EMainWindowViewType.cs index 20b4824..56996d1 100644 --- a/SewerStammGen/Enum/EMainWindowViewType.cs +++ b/SewerStammGen/Enum/EMainWindowViewType.cs @@ -9,7 +9,7 @@ namespace SewerStammGen.Enum public enum EMainWindowViewType { Home, - Projects, + ProjectsList, EditSchacht, SewerConnectionEdit } diff --git a/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs b/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs index 94889f2..01ab098 100644 --- a/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs +++ b/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs @@ -6,6 +6,7 @@ using SewerStammGen.WPF.ViewModel.Factories; using System; using System.Collections.Generic; using System.Linq; +using System.Net.Security; using System.Text; using System.Threading.Tasks; @@ -33,7 +34,10 @@ namespace SewerStammGen.HostBuilders return () => new SewerConnectorViewModel(); }); - + services.AddSingleton>(services => + { + return () => new ProjektListViewModel(); + }); services.AddSingleton(); }); diff --git a/SewerStammGen/MainWindow.xaml b/SewerStammGen/MainWindow.xaml index 9f792f3..38730b9 100644 --- a/SewerStammGen/MainWindow.xaml +++ b/SewerStammGen/MainWindow.xaml @@ -20,6 +20,9 @@ + + + diff --git a/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs b/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs index 4bf9700..a0b9dab 100644 --- a/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs +++ b/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs @@ -13,16 +13,19 @@ namespace SewerStammGen.WPF.ViewModel.Factories private CreateViewModel _createHomeViewModel; private CreateViewModel _createEditManholeViewModel; private CreateViewModel _createSewerConnectorViewModel; + private CreateViewModel _createProjektListViewModel; public MainWindowViewModelFactory( CreateViewModel createHomeViewModel, CreateViewModel createEditManholeViewModel, - CreateViewModel createSewerConnectorViewModel + CreateViewModel createSewerConnectorViewModel, + CreateViewModel createProjektListViewModel ) { _createHomeViewModel = createHomeViewModel; _createEditManholeViewModel = createEditManholeViewModel; _createSewerConnectorViewModel = createSewerConnectorViewModel; + _createProjektListViewModel = createProjektListViewModel; } public BaseViewModel CreateViewModel(EMainWindowViewType viewType) @@ -38,6 +41,8 @@ namespace SewerStammGen.WPF.ViewModel.Factories case EMainWindowViewType.SewerConnectionEdit: return _createSewerConnectorViewModel(); + case EMainWindowViewType.ProjectsList: return _createProjektListViewModel(); + default: throw new NotImplementedException(); } diff --git a/SewerStammGen/ViewModel/ProjectListViewModel.cs b/SewerStammGen/ViewModel/ProjectListViewModel.cs deleted file mode 100644 index 72d90fb..0000000 --- a/SewerStammGen/ViewModel/ProjectListViewModel.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SewerStammGen.WPF.ViewModel -{ - public class ProjectListViewModel : BaseViewModel - { - - } -} diff --git a/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml b/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml index 2767b3a..b3e0b2c 100644 --- a/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml +++ b/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml @@ -15,10 +15,10 @@ - - - - + + + + diff --git a/SewerStammGen/Views/Projekte/ProjektListView.xaml b/SewerStammGen/Views/Projekte/ProjektListView.xaml index 64bec4f..21f0f43 100644 --- a/SewerStammGen/Views/Projekte/ProjektListView.xaml +++ b/SewerStammGen/Views/Projekte/ProjektListView.xaml @@ -1,9 +1,9 @@ - diff --git a/SewerStammGen/Views/Projekte/ProjektListView.xaml.cs b/SewerStammGen/Views/Projekte/ProjektListView.xaml.cs index 450bca1..ee9ad8d 100644 --- a/SewerStammGen/Views/Projekte/ProjektListView.xaml.cs +++ b/SewerStammGen/Views/Projekte/ProjektListView.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace SewerStammGen.WPF.Views.Projekte +namespace SewerStammGen.WPF.Views { /// /// Interaktionslogik für ProjektListView.xaml