diff --git a/DaSaSo.ViewModel/Commands/SaveSewerCommand.cs b/DaSaSo.ViewModel/Commands/SaveSewerCommand.cs index 82e3184..20a2676 100644 --- a/DaSaSo.ViewModel/Commands/SaveSewerCommand.cs +++ b/DaSaSo.ViewModel/Commands/SaveSewerCommand.cs @@ -14,26 +14,24 @@ namespace DaSaSo.ViewModel.Commands { public class SaveSewerCommand : AsyncCommandBase { - private readonly SewerMainListViewModel _sewerMainListViewModel; + private IDataService _dataService; - private readonly ISewerpointService _sewerPointService; private IActualProject _actualProject; private readonly ISewerObjectService _sewerObjectService; private readonly IRenavigator _renavigator; private readonly ISewerMainNavigator _navigator; public SaveSewerCommand( - SewerMainListViewModel sewerMainListViewModel, + IDataService dataService, IActualProject actualProject, ISewerObjectService sewerObjectService, IRenavigator renavigator, - ISewerpointService sewerpointService, ISewerMainNavigator navigator) { - _sewerMainListViewModel = sewerMainListViewModel; + _dataService = dataService; - _sewerPointService = sewerpointService; + _actualProject = actualProject; _sewerObjectService = sewerObjectService; _renavigator = renavigator; @@ -44,11 +42,6 @@ namespace DaSaSo.ViewModel.Commands public override async Task ExecuteAsync(object? parameter) { _navigator.CurrentViewModel = null; - - //Debugger.Break(); - - //_actualProject.AktuellSewerObject.PunktOben = d; - //_ = await _dataService.Update(_actualProject.AktuellSewerObject.Id, _actualProject.AktuellSewerObject); _renavigator.Renavigate(new SewerObjectListViewModel(_dataService, _actualProject, _sewerObjectService)); } } diff --git a/DaSaSo.ViewModel/SewerMainListViewModel.cs b/DaSaSo.ViewModel/SewerMainListViewModel.cs index 99b114d..c8101b5 100644 --- a/DaSaSo.ViewModel/SewerMainListViewModel.cs +++ b/DaSaSo.ViewModel/SewerMainListViewModel.cs @@ -23,7 +23,7 @@ namespace DaSaSo.ViewModel private readonly IRenavigator _renavigator; private IActualProject _actualProject { get; set; } public ICommand UpdateCurrentSewerViewModelCommand { get; } - public ICommand SaveCommand { get; set; } + public ICommand CloseCommand { get; set; } public BaseViewModel CurrentSewerViewModel => _navigator.CurrentViewModel; public bool IsLoading @@ -39,6 +39,9 @@ namespace DaSaSo.ViewModel } } + public string Strasse { get => _actualProject.AktuellSewerObject.StreetName; } + public string AktualObject { get => _actualProject.AktuellSewerObject.ObjektName; } + bool _isLoading = true; public bool CanSaveSewer => !string.IsNullOrEmpty(_actualProject.AktuellSewerObject.StreetName); @@ -49,7 +52,7 @@ namespace DaSaSo.ViewModel _dataservice = (SewerObjectDataService)dataService; _renavigator = renavigator; _sewerObjectService = sewerObjectService; - SaveCommand = new SaveSewerCommand(this,dataService,actualProject,sewerObjectService,renavigator,sewerpointService,navigator); //RelayCommand(SaveSewer); + CloseCommand = new SaveSewerCommand(_dataservice,_actualProject,_sewerObjectService,_renavigator,_navigator); //RelayCommand(SaveSewer); LoadModel(); UpdateCurrentSewerViewModelCommand = new UpdateCurrentSewerViewModelCommand(_navigator, viewModelFactory); _navigator.StateChanged += () => OnPropertyChanged(nameof(CurrentSewerViewModel)); diff --git a/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml b/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml index b553646..801093f 100644 --- a/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml +++ b/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml @@ -11,7 +11,7 @@ - + diff --git a/DaSaSo.Wpf/View/Buildingsites/BuildingSiteListView.xaml b/DaSaSo.Wpf/View/Buildingsites/BuildingSiteListView.xaml index eb9298b..349af49 100644 --- a/DaSaSo.Wpf/View/Buildingsites/BuildingSiteListView.xaml +++ b/DaSaSo.Wpf/View/Buildingsites/BuildingSiteListView.xaml @@ -8,7 +8,13 @@ d:DesignHeight="450" d:DesignWidth="800"> - + + + + + + +