Husky/DaSaSo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'renavigatorumbau' into sewerdamages

Browse Source 
# Conflicts:
#	DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs
This commit is contained in:
HuskyTeufel
2021-09-29 18:50:32 +02:00
parent 4789b5f252 debecff686
commit 9da7090883
16 changed files with 71 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs
View File

@@ -28,20 +28,38 @@ namespace DaSaSo.Wpf.HostBuilders
services.AddTransient<MainWindowViewModel>();
services.AddSingleton<ClientListViewModel>();
services.AddTransient<SewerMainListViewModel>();
services.AddSingleton<ViewModelDelegateRenavigator<ClientListViewModel>>();
services.AddSingleton<ViewModelDelegateRenavigator<ClientEditViewModel>>();
services.AddSingleton<ViewModelDelegateRenavigator<ProjectListViewModel>>();
services.AddSingleton<ViewModelDelegateRenavigator<ProjectEditViewModel>>();
services.AddSingleton<ViewModelDelegateRenavigator<BuildingsiteListViewModel>>();
services.AddSingleton<ViewModelDelegateRenavigator<BuildingsiteEditViewModel>>();
services.AddSingleton<ViewModelDelegateRenavigator<SewerObjectListViewModel>>();
services.AddSingleton<CreateViewModel<HomeViewModel>>(services =>
{
return () => new HomeViewModel();
});
services.AddSingleton<CreateViewModel<ClientEditViewModel>>(services =>
services.AddTransient<CreateViewModel<ClientEditViewModel>>(services =>
{
return () => new ClientEditViewModel(
services.GetRequiredService<IDataService<Client>>(),
services.GetRequiredService<IActualProject>(),
new ViewModelDelegateRenavigator(
services.GetRequiredService<IMainWindowNavigator>()
));
services.GetRequiredService<ViewModelDelegateRenavigator<ClientListViewModel>>()
);
});
services.AddTransient<CreateViewModel<ProjectEditViewModel>>(services =>
{
return () => new ProjectEditViewModel(
services.GetRequiredService<IDataService<Project>>(),
services.GetRequiredService<IActualProject>(),
services.GetRequiredService<ViewModelDelegateRenavigator<ProjectListViewModel>>(),
services.GetRequiredService<IProjectService>()
);
});
services.AddSingleton<CreateViewModel<HomeViewModel>>(services =>
{
@@ -65,14 +83,14 @@ namespace DaSaSo.Wpf.HostBuilders
);
});
services.AddSingleton<CreateViewModel<ClientListViewModel>>(services =>
services.AddTransient<CreateViewModel<ClientListViewModel>>(services =>
{
return () => new ClientListViewModel(
services.GetRequiredService<IDataService<Client>>(),
services.GetRequiredService<IActualProject>(),
new ViewModelDelegateRenavigator(
services.GetRequiredService<IMainWindowNavigator>()
));
services.GetRequiredService<ViewModelDelegateRenavigator<ClientEditViewModel>>()
);
});
services.AddSingleton<CreateViewModel<SewerMainListViewModel>>(services =>
{
@@ -81,9 +99,7 @@ namespace DaSaSo.Wpf.HostBuilders
services.GetRequiredService<ISewerMainNavigator>(),
services.GetRequiredService<IActualProject>(),
services.GetRequiredService<IViewModelSewerMainFactory>(),
new ViewModelDelegateRenavigator(
services.GetRequiredService<IMainWindowNavigator>()
),
services.GetRequiredService<ViewModelDelegateRenavigator<SewerObjectListViewModel>>(),
services.GetRequiredService<ISewerObjectService>(),
services.GetRequiredService<ISewerpointService>()
);
@@ -93,24 +109,31 @@ namespace DaSaSo.Wpf.HostBuilders
return () => new ProjectListViewModel(
services.GetRequiredService<IDataService<Project>>(),
services.GetRequiredService<IActualProject>(),
new ViewModelDelegateRenavigator(
services.GetRequiredService<IMainWindowNavigator>()),
services.GetRequiredService<ViewModelDelegateRenavigator<ProjectEditViewModel>>(),
services.GetRequiredService<IProjectService>()
);
});
services.AddSingleton<CreateViewModel<BuildingsiteListViewModel>>(services =>
services.AddTransient<CreateViewModel<BuildingsiteListViewModel>>(services =>
{
return () => new BuildingsiteListViewModel(
services.GetRequiredService<IDataService<Buildingsite>>(),
services.GetRequiredService<IActualProject>(),
new ViewModelDelegateRenavigator(
services.GetRequiredService<IMainWindowNavigator>()),
services.GetRequiredService<ViewModelDelegateRenavigator<BuildingsiteEditViewModel>>(),
services.GetRequiredService<IBuildingsiteService>()
);
});
services.AddTransient<CreateViewModel<BuildingsiteEditViewModel>>(services =>
{
return () => new BuildingsiteEditViewModel(
services.GetRequiredService<IDataService<Buildingsite>>(),
services.GetRequiredService<IActualProject>(),
services.GetRequiredService<ViewModelDelegateRenavigator<BuildingsiteListViewModel>>()
);
});
services.AddSingleton<CreateViewModel<SewerObjectListViewModel>>(services =>
{
return () => new SewerObjectListViewModel(