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

SchachtDataService hinzugefügt

Browse Source
This commit is contained in:
Damian Wessels
2023-04-13 14:08:48 +02:00
parent 047e036442
commit 47aba01cb4
28 changed files with 360 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SewerStammGen.WPF/App.xaml.cs
View File

@@ -53,7 +53,7 @@ namespace SewerStammGen.WPF
try
{
Exception ex = (Exception)e.ExceptionObject;
string text = "An application error occured. Plrease contact the Administrator with the following information:\n\n";
string text = "An application error occured. Please contact the Administrator with the following information:\n\n";
MessageBox.Show(text + " " + ex.Message + "\n\n" + ex.StackTrace);
}
catch (Exception ex2)

2
SewerStammGen.WPF/Commands/HaltungEditCommand.cs
View File

@@ -28,7 +28,7 @@ namespace SewerStammGen.WPF.Commands
public override async Task ExecuteAsync(object? parameter)
{
//actualState.SetHaltung(haltungListViewModel.SelectedHaltung);
actualState.SetHaltung(haltungListViewModel.SelectedHaltung);
renavigator.Renavigate();
}
}

25
SewerStammGen.WPF/Commands/HaltungEditSaveCommand.cs
View File

@@ -1,5 +1,6 @@
using SewerStammGen.Shared.Contracts;
using SewerStammGen.Shared.Domain;
using SewerStammGen.WPF.Interface.Navigator;
using SewerStammGen.WPF.ViewModel;
using Shared.Contracts;
using System;
@@ -13,26 +14,22 @@ namespace SewerStammGen.WPF.Commands
{
internal class HaltungEditSaveCommand : AsyncCommandBase
{
private HaltungEditViewModel haltungEditViewModel;
private IDataService<Kanal> kanalDataService;
private readonly HaltungEditViewModel _haltungEditViewModel;
private readonly IHaltungDataService _haltungDataService;
private readonly IRenavigator _renavigator;
public HaltungEditSaveCommand(HaltungEditViewModel haltungEditViewModel)
public HaltungEditSaveCommand(IHaltungDataService haltungDataService,IRenavigator renavigator,HaltungEditViewModel haltungEditViewModel)
{
this.haltungEditViewModel = haltungEditViewModel;
//this.kanalDataService = kanalDataService;
this._haltungEditViewModel = haltungEditViewModel;
this._haltungDataService = haltungDataService;
this._renavigator = renavigator;
}
public override async Task ExecuteAsync(object? parameter)
{
if(haltungEditViewModel._oberePunkt != haltungEditViewModel.Model.StartSchacht.Objektbezeichnung)
{
//Schacht s = await schachtService.FindSchachtByNameAndProjektID(haltungEditViewModel._oberePunkt, haltungEditViewModel.Model.Projekt.Id);
//haltungEditViewModel.Model.StartSchacht = s;
}
//haltungEditViewModel.Model = await kanalDataService.Update(haltungEditViewModel.Model.Id, haltungEditViewModel.Model);
Trace.WriteLine("Daten gespeichert");
_haltungEditViewModel.Model = await _haltungDataService.Update(_haltungEditViewModel.Model);
_renavigator.Renavigate();
}
}
}

9
SewerStammGen.WPF/Commands/ProjektAddCommand.cs
View File

@@ -1,4 +1,5 @@
using SewerStammGen.Shared.Domain;
using SewerStammGen.Shared.Contracts;
using SewerStammGen.Shared.Domain;
using SewerStammGen.WPF.Interface.Navigator;
using SewerStammGen.WPF.ViewModel.State;
using Shared.Contracts;
@@ -13,10 +14,10 @@ namespace SewerStammGen.WPF.Commands
internal class ProjektAddCommand : AsyncCommandBase
{
private readonly IActualState _actualState;
private readonly IDataService<Projekt> _generic;
private readonly IProjektDataService _generic;
private readonly IRenavigator _renavigator;
public ProjektAddCommand(IDataService<Projekt> generic, IActualState actualState, IRenavigator renavigator)
public ProjektAddCommand(IProjektDataService generic, IActualState actualState, IRenavigator renavigator)
{
_renavigator = renavigator;
_generic = generic;
@@ -35,7 +36,7 @@ namespace SewerStammGen.WPF.Commands
Schaechte = new List<Schacht>(),
Kanaele = new List<Kanal>()
};
//newProjekt = await _generic.Create(newProjekt);
newProjekt = await _generic.Create(newProjekt);
_actualState.SetProjekt(newProjekt);
_renavigator.Renavigate();

14
SewerStammGen.WPF/Commands/SchachtAddCommand.cs
View File

@@ -15,22 +15,22 @@ namespace SewerStammGen.WPF.Commands
{
private readonly IActualState actualState;
private readonly IRenavigator renavigator;
private readonly IDataService<Projekt> projektService;
public SchachtAddCommand(IDataService<Projekt> projektService, IActualState actualState, IRenavigator renavigator)
public SchachtAddCommand(IActualState actualState, IRenavigator renavigator)
{
this.actualState = actualState;
this.renavigator = renavigator;
this.projektService = projektService;
}
public override async Task ExecuteAsync(object? parameter)
{
Projekt aktuelleProjekt = await projektService.Get(actualState.ProjektID);
// Schacht schacht = await schachtService.CreateSchacht(aktuelleProjekt);
Schacht newSchacht = new Schacht()
{
Projekt = new Projekt() { Id = actualState.ProjektID },
};
actualState.SetSchacht(newSchacht);
renavigator.Renavigate();
}
}
}

5
SewerStammGen.WPF/Commands/SchachtEditCommand.cs
View File

@@ -12,14 +12,13 @@ namespace SewerStammGen.WPF.Commands
{
class SchachtEditCommand : AsyncCommandBase
{
private ISchachtDataService schachtService;
private IActualState actualState;
private IRenavigator renavigator;
private ManholeListViewModel manholeListViewModel;
public SchachtEditCommand(ISchachtDataService schachtService, IActualState actualState, IRenavigator renavigator, ManholeListViewModel manholeListViewModel)
public SchachtEditCommand(IActualState actualState, IRenavigator renavigator, ManholeListViewModel manholeListViewModel)
{
this.schachtService = schachtService;
this.actualState = actualState;
this.renavigator = renavigator;
this.manholeListViewModel = manholeListViewModel;

25
SewerStammGen.WPF/HostBuilders/AddServicesHostBuilderExtensions.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using SewerStammGen.DAL.Services;
using SewerStammGen.Shared.Contracts;
using SewerStammGen.WPF.Interface.Navigator;
using SewerStammGen.WPF.ViewModel;
@@ -9,6 +9,7 @@ using Shared.Contracts;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
@@ -20,13 +21,25 @@ namespace SewerStammGen.HostBuilders
{
public static IHostBuilder AddServices(this IHostBuilder host)
{
host.ConfigureServices(services =>
host.ConfigureServices((context,services) =>
{
services.AddSingleton<IMainWindowNavigator, MainWindowNavigator>();
services.AddSingleton<ViewModelDelegateRenavigator<ProjektEditViewModel>>();
services.AddSingleton<IProjektDataService, ProjektDataService>();
services.AddSingleton<IAuftraggeberDataService, AuftraggeberDataService>();
services.AddSingleton<ISchachtDataService, SchachtDataService>();
string? databaseToUse = context.Configuration.GetConnectionString("databaseToUse");
if(databaseToUse != null)
{
if(databaseToUse.Equals("postgresql"))
{
string? connectionstring = context.Configuration.GetConnectionString("postgresql");
if(connectionstring == null) throw new ArgumentNullException(nameof(connectionstring));
services.AddSingleton<IProjektDataService>(_=> new DAL.Services.PostgresqlData.ProjektDataService(connectionstring));
services.AddSingleton<IAuftraggeberDataService>(_ => new DAL.Services.PostgresqlData.AuftraggeberDataService(connectionstring));
services.AddSingleton<ISchachtDataService>(_ => new DAL.Services.PostgresqlData.SchachtDataService(connectionstring));
services.AddSingleton<IHaltungDataService>(_ => new DAL.Services.PostgresqlData.HaltungDataService(connectionstring));
}
}
});

14
SewerStammGen.WPF/HostBuilders/AddViewModelsHostBuilderExtensions.cs
View File

@@ -46,7 +46,6 @@ namespace SewerStammGen.HostBuilders
{
return () => new ManholeListViewModel(
services.GetRequiredService<ISchachtDataService>(),
services.GetRequiredService<IDataService<Projekt>>(),
services.GetRequiredService<ViewModelDelegateRenavigator<ManholeEditViewModel>>(),
services.GetRequiredService<IActualState>()
@@ -56,8 +55,9 @@ namespace SewerStammGen.HostBuilders
services.AddSingleton<CreateViewModel<ManholeEditViewModel>>(services =>
{
return () => new ManholeEditViewModel(
services.GetRequiredService<IDataService<Schacht>>(),
services.GetRequiredService<IActualState>()
services.GetRequiredService<ISchachtDataService>(),
services.GetRequiredService<IActualState>(),
services.GetRequiredService<ViewModelDelegateRenavigator<ManholeListViewModel>>()
);
});
#endregion
@@ -66,7 +66,7 @@ namespace SewerStammGen.HostBuilders
services.AddSingleton<CreateViewModel<HaltungListViewModel>>(services =>
{
return () => new HaltungListViewModel(
services.GetRequiredService<IHaltungDataService>(),
services.GetRequiredService<IActualState>(),
services.GetRequiredService<ViewModelDelegateRenavigator<HaltungEditViewModel>>()
);
@@ -75,9 +75,9 @@ namespace SewerStammGen.HostBuilders
services.AddTransient<CreateViewModel<HaltungEditViewModel>>(services =>
{
return () => new HaltungEditViewModel(
services.GetRequiredService<IActualState>()
services.GetRequiredService<IHaltungDataService>(),
services.GetRequiredService<IActualState>(),
services.GetRequiredService<ViewModelDelegateRenavigator<HaltungListViewModel>>()
);
});
#endregion

4
SewerStammGen.WPF/SewerStammGen.WPF.csproj
View File

@@ -8,10 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />

35
SewerStammGen.WPF/ViewModel/Haltung/HaltungEditViewModel.cs
View File

@@ -1,6 +1,7 @@
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 System;
@@ -17,7 +18,7 @@ namespace SewerStammGen.WPF.ViewModel
internal class HaltungEditViewModel : BaseViewModel
{
private readonly IActualState _actualState;
//private readonly IHaltungDataService _kanalDataService;
private readonly IHaltungDataService _haltungDataService;
private Kanal _model;
@@ -113,32 +114,20 @@ namespace SewerStammGen.WPF.ViewModel
public ICommand Speichern { get; set; }
public HaltungEditViewModel(
IActualState actualState)
IHaltungDataService haltungDataService,
IActualState actualState,
IRenavigator renavigator)
{
_actualState = actualState;
//_kanalDataService = kanalDataService;
_haltungDataService = haltungDataService;
_model = _actualState.SelectedHaltung;
_oberePunkt = _model.StartSchacht.Objektbezeichnung;
_unterePunkt = _model.EndSchacht.Objektbezeichnung;
Speichern = new HaltungEditSaveCommand(_haltungDataService,renavigator,this);
_model = new Kanal();
Speichern = new HaltungEditSaveCommand(this);
LoadModel();
}
private async void LoadModel()
{
/*_model = await _kanalDataService.Get(_actualState.HaltungID);
UntereSchacht = _model.EndSchacht.Objektbezeichnung;
ObereSchacht = _model.StartSchacht.Objektbezeichnung;
OnPropertyChanged(nameof(ObereSchacht));
OnPropertyChanged(nameof(UntereSchacht));
OnPropertyChanged(nameof(Haltungslaenge));
OnPropertyChanged(nameof(Haltungsbezeichnung));
OnPropertyChanged(nameof(Material));
OnPropertyChanged(nameof(Durchmesser));
*/
}
}
}

9
SewerStammGen.WPF/ViewModel/Haltung/HaltungListViewModel.cs
View File

@@ -17,7 +17,7 @@ namespace SewerStammGen.WPF.ViewModel
{
private readonly ObservableCollection<Kanal> _haltungen;
private readonly IActualState _actualState;
//private readonly IHaltungDataService _haltungDataService;
private readonly IHaltungDataService _haltungDataService;
public Kanal? SelectedHaltung { get; set; }
public ObservableCollection<Kanal> Haltungen { get => _haltungen; }
@@ -25,9 +25,10 @@ namespace SewerStammGen.WPF.ViewModel
public ICommand EditCommand { get; set; }
public ICommand AddCommand { get; set; }
public HaltungListViewModel( IActualState actualState, IRenavigator renavigator )
public HaltungListViewModel(IHaltungDataService haltungDataService, IActualState actualState, IRenavigator renavigator )
{
_haltungen = new ObservableCollection<Kanal>();
_haltungDataService = haltungDataService;
_actualState = actualState;
@@ -40,9 +41,9 @@ namespace SewerStammGen.WPF.ViewModel
private async void LoadHaltungen()
{
/* var haltungen = await _haltungDataService.GetAll(_actualState.ProjektID);
var haltungen = await _haltungDataService.GetAllByProjekt(_actualState.ProjektID);
InitCollection(_haltungen, haltungen);
*/
}
private void InitCollection(ObservableCollection<Kanal> dest, IEnumerable<Kanal> source)

10
SewerStammGen.WPF/ViewModel/Projekt/ProjektEditViewModel.cs
View File

@@ -103,14 +103,8 @@ namespace SewerStammGen.WPF.ViewModel
private void SaveProject()
{
if (_model.Id == 0) // Handelt sich um ein neuen Eintrag
{
_dataService.Create(_model);
}
else
{
_dataService.Update(_model);
}
_dataService.Update(_model);
_renavigator.Renavigate();
}
}

40
SewerStammGen.WPF/ViewModel/Schacht/ManholeEditViewModel.cs
View File

@@ -1,4 +1,6 @@
using SewerStammGen.Shared.Domain;
using SewerStammGen.Shared.Contracts;
using SewerStammGen.Shared.Domain;
using SewerStammGen.WPF.Interface.Navigator;
using SewerStammGen.WPF.ViewModel.State;
using Shared.Contracts;
using System;
@@ -12,8 +14,8 @@ namespace SewerStammGen.WPF.ViewModel
{
public class ManholeEditViewModel : BaseViewModel
{
private readonly IActualState _actualState;
private readonly IDataService<Schacht> _schachtDataService;
private readonly ISchachtDataService _schachtDataService;
private readonly IRenavigator _renavigator;
private Schacht _model;
@@ -94,33 +96,27 @@ namespace SewerStammGen.WPF.ViewModel
}
}
public ManholeEditViewModel(IDataService<Schacht> schachtDataService,IActualState actualState)
public ManholeEditViewModel(ISchachtDataService schachtDataService,IActualState actualState, IRenavigator renavigator)
{
_actualState = actualState;
_schachtDataService = schachtDataService;
_model = new Schacht();
_model = actualState.SelectedSchacht;
_renavigator = renavigator;
Speichern = new RelayCommand((x) => SaveSchacht());
LoadModel();
}
private void SaveSchacht()
private async void SaveSchacht()
{
//_schachtDataService.Update(_model.Id, _model);
}
private async void LoadModel()
{
_model = await _schachtDataService.Get(_actualState.SchachtID);
OnPropertyChanged(nameof(Entwaeserung));
OnPropertyChanged(nameof(Objektbezeichnung));
OnPropertyChanged(nameof(HochWert));
OnPropertyChanged(nameof(RechtsWert));
OnPropertyChanged(nameof(DeckelHoehe));
OnPropertyChanged(nameof(SohlHoehe));
if (_model.Id == 0)
{
await _schachtDataService.Create(_model);
}
else
{
await _schachtDataService.Update(_model);
}
_renavigator.Renavigate();
}
}
}

12
SewerStammGen.WPF/ViewModel/Schacht/ManholeListViewModel.cs
View File

@@ -16,7 +16,7 @@ namespace SewerStammGen.WPF.ViewModel
{
public class ManholeListViewModel : BaseViewModel
{
private ISchachtDataService _schachtDataService;
private readonly ISchachtDataService _schachtDataService;
private readonly ObservableCollection<Schacht> _schaechte;
private readonly IActualState _actualState;
@@ -29,7 +29,7 @@ namespace SewerStammGen.WPF.ViewModel
public ICommand DeleteSchachtCommand { get; set; }
public ManholeListViewModel(ISchachtDataService schachtDataService, IDataService<Projekt> projektService,IRenavigator renavigator ,IActualState actualState)
public ManholeListViewModel(ISchachtDataService schachtDataService, IRenavigator renavigator ,IActualState actualState)
{
_schachtDataService = schachtDataService;
_actualState = actualState;
@@ -37,8 +37,8 @@ namespace SewerStammGen.WPF.ViewModel
_schaechte = new ObservableCollection<Schacht>();
AddSchachtCommand = new SchachtAddCommand(projektService, actualState,renavigator);
EditSchachtCommand = new SchachtEditCommand(schachtDataService, actualState, renavigator,this);
AddSchachtCommand = new SchachtAddCommand(actualState,renavigator);
EditSchachtCommand = new SchachtEditCommand(actualState, renavigator,this);
DeleteSchachtCommand = new SchachtDeleteCommand(schachtDataService, actualState, renavigator, this);
LoadSchaechte();
@@ -46,8 +46,8 @@ namespace SewerStammGen.WPF.ViewModel
private async void LoadSchaechte()
{
//var schaechte = await _schachtDataService.GetAll(_actualState.ProjektID);
//InitCollection(_schaechte, schaechte);
var schaechte = await _schachtDataService.GetAllByProjekt(_actualState.ProjektID);
InitCollection(_schaechte, schaechte);
}
private void InitCollection(ObservableCollection<Schacht> dest, IEnumerable<Schacht> source)

5
SewerStammGen.WPF/ViewModel/State/ActualState.cs
View File

@@ -14,6 +14,9 @@ namespace SewerStammGen.WPF.ViewModel.State
public int SchachtID { get; private set; }
public int HaltungID { get; private set; }
public Schacht SelectedSchacht { get; private set; }
public Kanal SelectedHaltung {get; private set; }
public void SetProjekt(Projekt projekt, bool notification = true)
{
@@ -25,6 +28,7 @@ namespace SewerStammGen.WPF.ViewModel.State
}
public void SetSchacht(Schacht schacht, bool notification = true)
{
SelectedSchacht = schacht;
SchachtID = schacht.Id;
if(notification)
{
@@ -33,6 +37,7 @@ namespace SewerStammGen.WPF.ViewModel.State
}
public void SetHaltung(Kanal haltung, bool notification = true)
{
SelectedHaltung = haltung;
HaltungID = haltung.Id;
if(notification)
{

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

@@ -14,6 +14,8 @@ namespace SewerStammGen.WPF.ViewModel.State
int ProjektID { get; set; }
int SchachtID { get; }
int HaltungID { get; }
Schacht SelectedSchacht { get; }
Kanal SelectedHaltung { get; }
void SetProjekt(Projekt projekt, bool notification = true);
void SetSchacht(Schacht schacht, bool notification = true);

4
SewerStammGen.WPF/appsettings.json
View File

@@ -1,7 +1,7 @@
{
"ConnectionStrings": {
"databaseToUse": "default",
"default": "Host = localhost; Database = SewerGen; Username = SewerGen; Password = SewerGen",
"databaseToUse": "postgresql",
"postgresql": "Host = localhost; Database = SewerGen; Username = SewerGen; Password = SewerGen",
"sqlite": "Data Source=database.db"
}
}