SchachtDataService hinzugefügt

This commit is contained in:
2023-04-13 14:08:48 +02:00
parent 047e036442
commit 47aba01cb4
28 changed files with 360 additions and 237 deletions

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();
}
}
}

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)