Codecleanup
This commit is contained in:
@@ -14,26 +14,24 @@ namespace DaSaSo.ViewModel.Commands
|
||||
{
|
||||
public class SaveSewerCommand : AsyncCommandBase
|
||||
{
|
||||
private readonly SewerMainListViewModel _sewerMainListViewModel;
|
||||
|
||||
private IDataService<SewerObject> _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<SewerObject> 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));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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));
|
||||
|
||||
Reference in New Issue
Block a user