Commands auf Async umgestellt

DaSaSo.Wpf/App.xaml.cs

@@ -7,7 +7,9 @@ using DaSaSo.ViewModel.Factories;
 using DaSaSo.ViewModel.Interface;
 using DaSaSo.ViewModel.State.ActualState;
 using DaSaSo.ViewModel.State.Navigation;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using System;
 using System.Windows;
 
@@ -18,17 +20,92 @@ namespace DaSaSo.Wpf
     /// </summary>
     public partial class App : Application
     {
+        private readonly IHost _host;
+        public App()
+        {
+            _host = CreateHostBuilder().Build();
+        }
+
+        public static IHostBuilder CreateHostBuilder(string[]? args = null)
+        {
+            return Host.CreateDefaultBuilder(args)
+                .ConfigureAppConfiguration(c=>
+                {
+                    c.AddJsonFile("appsettings.json");
+                    c.AddEnvironmentVariables();
+                })
+                .ConfigureServices((context, services) =>
+                {
+
+                    string connectionString = context.Configuration.GetConnectionString("default");
+                    
+                    services.AddSingleton<DaSaSoDbContextFactory>(new DaSaSoDbContextFactory(connectionString));
+                    services.AddSingleton<IDataService<Client>, ClientDataService>();
+                    services.AddSingleton<IDataService<Project>, ProjectDataService>();
+                    services.AddSingleton<ClientListViewModel>();
+
+
+
+                    services.AddSingleton<IViewModelAbstractFactory, ViewModelAbstractFactory>();
+                    services.AddSingleton<CreateViewModel<ClientEditViewModel>>(services =>
+                    {
+                        return () => new ClientEditViewModel(
+                             services.GetRequiredService<IDataService<Client>>(),
+                             services.GetRequiredService<IActualProject>(),
+                             new ViewModelDelegateRenavigator(
+                                 services.GetRequiredService<INavigator>()
+                             ));
+                    });
+                    services.AddSingleton<CreateViewModel<HomeViewModel>>(services =>
+                    {
+                        return () => new HomeViewModel();
+                    });
+                    services.AddSingleton<CreateViewModel<ClientListViewModel>>(services =>
+                    {
+                        return () => new ClientListViewModel(
+                            services.GetRequiredService<IDataService<Client>>(),
+                            services.GetRequiredService<IActualProject>(),
+                            new ViewModelDelegateRenavigator(
+                                services.GetRequiredService<INavigator>()
+                            ));
+                    });
+
+                    services.AddSingleton<CreateViewModel<ProjectListViewModel>>(services =>
+                    {
+                        return () => new ProjectListViewModel(
+                            services.GetRequiredService<IDataService<Project>>(),
+                            services.GetRequiredService<IActualProject>(),
+                            new ViewModelDelegateRenavigator(
+                                services.GetRequiredService<INavigator>()));
+                    });
+
+                    //services.AddSingleton<INavigator, Navigator>();
+                    services.AddScoped<IActualProject, ActualProject>();
+                    services.AddScoped<INavigator, Navigator>();
+
+                    services.AddScoped<MainWindowViewModel>();
+                });
+        }
         protected override void OnStartup(StartupEventArgs e)
         {
             Application.Current.DispatcherUnhandledException += Current_DispatcherUnhandledException;
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
-            IServiceProvider serviceProvider = CreateServiceProvider();
+
+
+            _host.Start();
             
-            MainWindow? window = new MainWindow() { DataContext = serviceProvider.GetRequiredService<MainWindowViewModel>() };
+            MainWindow? window = new MainWindow() { DataContext = _host.Services.GetRequiredService<MainWindowViewModel>() };
             window.Show();
             base.OnStartup(e);
         }
 
+        protected override  async void OnExit(ExitEventArgs e)
+        {
+            _host.StopAsync();
+            _host.Dispose();
+            base.OnExit(e);
+        }
+
         private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
             try
@@ -48,49 +125,5 @@ namespace DaSaSo.Wpf
             throw new NotImplementedException();
         }
 
-        private IServiceProvider CreateServiceProvider()
-        {
-            IServiceCollection services = new ServiceCollection();
-
-            services.AddSingleton<DaSaSoDbContextFactory>();
-            services.AddSingleton<IDataService<Client>, ClientDataService>();
-            services.AddSingleton<ClientListViewModel>();
-            
-            
-
-            services.AddSingleton<IViewModelAbstractFactory, ViewModelAbstractFactory>();
-            services.AddSingleton<CreateViewModel<ClientEditViewModel>>(services =>
-            {
-                return () => new ClientEditViewModel(
-                     services.GetRequiredService<IDataService<Client>>(),
-                     services.GetRequiredService<IActualProject>(),
-                     new ViewModelDelegateRenavigator(
-                         services.GetRequiredService<INavigator>()
-                     ));
-            });
-            services.AddSingleton<CreateViewModel<HomeViewModel>>(services =>
-            {
-                return () => new HomeViewModel();
-            });
-            services.AddSingleton<CreateViewModel<ClientListViewModel>>(services =>
-            {
-                return () => new ClientListViewModel(
-                    services.GetRequiredService<IDataService<Client>>(),
-                    services.GetRequiredService<IActualProject>(),
-                    new ViewModelDelegateRenavigator(
-                        services.GetRequiredService<INavigator>()
-                    ));
-            });
-            
-
-            //services.AddSingleton<INavigator, Navigator>();
-            services.AddScoped<IActualProject, ActualProject>();
-            services.AddScoped<INavigator, Navigator>();
-
-            services.AddScoped<MainWindowViewModel>();
-            
-
-            return services.BuildServiceProvider();
-        }
     }
 }

DaSaSo.Wpf/Controls/NavigationBar.xaml

@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:DaSaSo.Wpf.Controls"
-             xmlns:nav="clr-namespace:DaSaSo.ViewModel.Enums;assembly=DaSaSo.ViewModel"
+             xmlns:nav="clr-namespace:DaSaSo.ViewModel.Enums;assembly=DaSaSo.ViewModel" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
@@ -14,9 +14,9 @@
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
-        <RadioButton Grid.Row="0" Content="Kunden" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" CommandParameter="{x:Static nav:EViewType.Clients}" />
-        <RadioButton Grid.Row="1" Content="Projekte" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" CommandParameter="{x:Static nav:EViewType.ClientEdit}" />
-        <RadioButton Grid.Row="2" Content="Baustellen" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" CommandParameter="{x:Static nav:EViewType.Buildingsites}" />
-        <RadioButton Grid.Row="3" Content="Objekten" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" CommandParameter="{x:Static nav:EViewType.SewerObjects}" />
+        <RadioButton Grid.Row="0" Content="Kunden" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="True" CommandParameter="{x:Static nav:EViewType.Clients}" />
+        <RadioButton Grid.Row="1" Content="Projekte" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="{Binding CanSelectProject}" CommandParameter="{x:Static nav:EViewType.Projects}" />
+        <RadioButton Grid.Row="2" Content="Baustellen" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="{Binding CanSelectBuildingSite}" CommandParameter="{x:Static nav:EViewType.Buildingsites}" />
+        <RadioButton Grid.Row="3" Content="Objekten" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentViewModelCommand}" IsEnabled="{Binding CanSelectSewerObjects}"  CommandParameter="{x:Static nav:EViewType.SewerObjects}" />
     </Grid>
 </UserControl>

DaSaSo.Wpf/DaSaSo.Wpf.csproj

@@ -7,9 +7,19 @@
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0-rc.1.21451.13" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\DaSaSo.Domain\DaSaSo.Domain.csproj" />
     <ProjectReference Include="..\DaSaSo.ViewModel\DaSaSo.ViewModel.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

DaSaSo.Wpf/appsettings.json

@@ -0,0 +1,5 @@
+{
+  "ConnectionStrings": {
+    "default": "Host = localhoste; Database = dasaso; Username = kansan; Password = kansan"
+  }
+}