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

Auftraggeberservice und Projektservice hinzugefügt

Browse Source
This commit is contained in:
Damian Wessels
2023-04-12 18:22:14 +02:00
parent 1c3e3c876b
commit b100eca490
37 changed files with 400 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SewerStammGen/Commands/HaltungEditSaveCommand.cs
View File

@@ -1,7 +1,7 @@
using SewerStammGen.Shared.Contracts;
using SewerStammGen.Shared.Domain;
using SewerStammGen.WPF.ViewModel;
using Shared.Contracts;
using Shared.Domain;
using System;
using System.Collections.Generic;
using System.Diagnostics;

4
SewerStammGen/Commands/ProjektAddCommand.cs
View File

@@ -1,7 +1,7 @@
using SewerStammGen.WPF.Interface.Navigator;
using SewerStammGen.Shared.Domain;
using SewerStammGen.WPF.Interface.Navigator;
using SewerStammGen.WPF.ViewModel.State;
using Shared.Contracts;
using Shared.Domain;
using System;
using System.Collections.Generic;
using System.Linq;

4
SewerStammGen/Commands/ProjektEditCommand.cs
View File

@@ -1,8 +1,8 @@
using SewerStammGen.WPF.Interface.Navigator;
using SewerStammGen.Shared.Domain;
using SewerStammGen.WPF.Interface.Navigator;
using SewerStammGen.WPF.ViewModel;
using SewerStammGen.WPF.ViewModel.State;
using Shared.Contracts;
using Shared.Domain;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;

1
SewerStammGen/Commands/ProjektSelectCommand.cs
View File

@@ -1,6 +1,5 @@
using SewerStammGen.WPF.ViewModel;
using SewerStammGen.WPF.ViewModel.State;
using Shared.Domain;
using System;
using System.Threading.Tasks;

2
SewerStammGen/Commands/SchachtAddCommand.cs
View File

@@ -1,8 +1,8 @@
using SewerStammGen.Shared.Contracts;
using SewerStammGen.Shared.Domain;
using SewerStammGen.WPF.Interface.Navigator;
using SewerStammGen.WPF.ViewModel.State;
using Shared.Contracts;
using Shared.Domain;
using System;
using System.Collections.Generic;
using System.Linq;

13
SewerStammGen/HostBuilders/AddServicesHostBuilderExtensions.cs
View File

@@ -1,13 +1,13 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using SewerStammGen.DAL.Services;
using SewerStammGen.Shared.Contracts;
using SewerStammGen.Shared.Services;
using SewerStammGen.WPF.Interface.Navigator;
using SewerStammGen.WPF.ViewModel;
using SewerStammGen.WPF.ViewModel.State.Navigation;
using Shared.Contracts;
using Shared.Domain;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -25,12 +25,9 @@ namespace SewerStammGen.HostBuilders
{
services.AddSingleton<IMainWindowNavigator, MainWindowNavigator>();
services.AddSingleton<ViewModelDelegateRenavigator<ProjektEditViewModel>>();
/* services.AddSingleton<IDataService<Projekt>, GenericDataService<Projekt>>();
services.AddSingleton<IDataService<Schacht>, GenericDataService<Schacht>>();
services.AddSingleton<IDataService<Kanal>, GenericDataService<Kanal>>();
services.AddSingleton<ISchachtDataService, SchachtDataService>();
services.AddSingleton<IHaltungDataService, HaltungDataService>();
*/
services.AddSingleton<IProjektDataService, ProjektDataService>();
services.AddSingleton<IAuftraggeberDataService, AuftraggeberDataService>();
services.AddSingleton<ISchachtService, SchachtService>();
});
return host;

6
SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs
View File

@@ -6,7 +6,6 @@ using SewerStammGen.WPF.ViewModel;
using SewerStammGen.WPF.ViewModel.State.Navigation;
using SewerStammGen.WPF.ViewModel.Factories;
using Shared.Contracts;
using Shared.Domain;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -15,6 +14,7 @@ using System.Text;
using System.Threading.Tasks;
using SewerStammGen.WPF.ViewModel.State;
using SewerStammGen.Shared.Contracts;
using SewerStammGen.Shared.Domain;
namespace SewerStammGen.HostBuilders
{
@@ -86,7 +86,7 @@ namespace SewerStammGen.HostBuilders
services.AddSingleton<CreateViewModel<ProjektEditViewModel>>(services =>
{
return () => new ProjektEditViewModel(
services.GetRequiredService<IDataService<Projekt>>(),
services.GetRequiredService<IProjektDataService>(),
services.GetRequiredService<ViewModelDelegateRenavigator<ProjektListViewModel>>(),
services.GetRequiredService<IActualState>()
);
@@ -95,7 +95,7 @@ namespace SewerStammGen.HostBuilders
services.AddSingleton<CreateViewModel<ProjektListViewModel>>(services =>
{
return () => new ProjektListViewModel(
services.GetRequiredService<IDataService<Projekt>>(),
services.GetRequiredService<IProjektDataService>(),
services.GetRequiredService<ViewModelDelegateRenavigator<ProjektEditViewModel>>(),
services.GetRequiredService<IActualState>()
);

1
SewerStammGen/SewerStammGen.WPF.csproj
View File

@@ -19,6 +19,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SewerStammGen.DAL\SewerStammGen.DAL.csproj" />
<ProjectReference Include="..\Shared\SewerStammGen.Shared.csproj" />
</ItemGroup>

2
SewerStammGen/ViewModel/Haltung/HaltungEditViewModel.cs
View File

@@ -1,8 +1,8 @@
using SewerStammGen.Shared.Contracts;
using SewerStammGen.Shared.Domain;
using SewerStammGen.WPF.Commands;
using SewerStammGen.WPF.ViewModel.State;
using Shared.Contracts;
using Shared.Domain;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;

2
SewerStammGen/ViewModel/Haltung/HaltungListViewModel.cs
View File

@@ -1,8 +1,8 @@
using SewerStammGen.Shared.Contracts;
using SewerStammGen.Shared.Domain;
using SewerStammGen.WPF.Commands;
using SewerStammGen.WPF.Interface.Navigator;
using SewerStammGen.WPF.ViewModel.State;
using Shared.Domain;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;

4
SewerStammGen/ViewModel/Projekt/ProjektEditViewModel.cs
View File

@@ -1,7 +1,7 @@
using SewerStammGen.WPF.Interface.Navigator;
using SewerStammGen.Shared.Domain;
using SewerStammGen.WPF.Interface.Navigator;
using SewerStammGen.WPF.ViewModel.State;
using Shared.Contracts;
using Shared.Domain;
using System;
using System.Collections.Generic;
using System.Diagnostics;

9
SewerStammGen/ViewModel/Projekt/ProjektListViewModel.cs
View File

@@ -1,9 +1,10 @@
using SewerStammGen.WPF.Commands;
using SewerStammGen.Shared.Contracts;
using SewerStammGen.Shared.Domain;
using SewerStammGen.WPF.Commands;
using SewerStammGen.WPF.Interface.Navigator;
using SewerStammGen.WPF.ViewModel;
using SewerStammGen.WPF.ViewModel.State;
using Shared.Contracts;
using Shared.Domain;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -16,7 +17,7 @@ namespace SewerStammGen.WPF.ViewModel
{
public class ProjektListViewModel : BaseViewModel
{
private IDataService<Projekt> genericDataService;
private IProjektDataService genericDataService;
private readonly ObservableCollection<Projekt> _projekte;
private readonly IActualState _actualState;
public ObservableCollection<Projekt> Projekte { get => _projekte; }
@@ -44,7 +45,7 @@ namespace SewerStammGen.WPF.ViewModel
}
}
public ProjektListViewModel(IDataService<Projekt> generic, IRenavigator renavigator,IActualState actualState)
public ProjektListViewModel(IProjektDataService generic, IRenavigator renavigator,IActualState actualState)
{
_projekte = new ObservableCollection<Projekt>();
if (generic == null) throw new ArgumentNullException(nameof(generic));

4
SewerStammGen/ViewModel/Schacht/ManholeEditViewModel.cs
View File

@@ -1,6 +1,6 @@
using SewerStammGen.WPF.ViewModel.State;
using SewerStammGen.Shared.Domain;
using SewerStammGen.WPF.ViewModel.State;
using Shared.Contracts;
using Shared.Domain;
using System;
using System.Collections.Generic;
using System.Linq;

2
SewerStammGen/ViewModel/Schacht/ManholeListViewModel.cs
View File

@@ -1,9 +1,9 @@
using SewerStammGen.Shared.Contracts;
using SewerStammGen.Shared.Domain;
using SewerStammGen.WPF.Commands;
using SewerStammGen.WPF.Interface.Navigator;
using SewerStammGen.WPF.ViewModel.State;
using Shared.Contracts;
using Shared.Domain;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;

2
SewerStammGen/ViewModel/State/ActualState.cs
View File

@@ -1,4 +1,4 @@
using Shared.Domain;
using SewerStammGen.Shared.Domain;
using System;
using System.Collections.Generic;
using System.Linq;

2
SewerStammGen/ViewModel/State/IActualState.cs
View File

@@ -1,4 +1,4 @@
using Shared.Domain;
using SewerStammGen.Shared.Domain;
using System;
using System.Collections.Generic;
using System.Linq;