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

Merge branch 'ClientsNotDomain'

Browse Source
This commit is contained in:
HuskyTeufel
2021-11-29 10:08:16 +01:00
parent 49f9b6c496 1b4911e6aa
commit f903da3af7
17 changed files with 519 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DaSaSo.ViewModel/BuildingsiteEditViewModel.cs
View File

@@ -69,12 +69,12 @@ namespace DaSaSo.ViewModel
_renavigator = renavigator;
_model = actualProject.AktuellBaustelle;
SaveBuildingsiteCommand = new RelayCommand(SaveBuildingsite);
SaveBuildingsiteCommand = new RelayCommand(SaveBuildingsiteAsync);
}
private void SaveBuildingsite()
private async void SaveBuildingsiteAsync()
{
_buildingsiteService.Update(Model.Id, Model);
await _buildingsiteService.Update(Model.Id, Model);
_renavigator.Renavigate();
}
}

3
DaSaSo.ViewModel/ClientListViewModel.cs
View File

@@ -22,7 +22,6 @@ namespace DaSaSo.ViewModel
private readonly IDataService<Client> _dataService;
bool _isLoading = true;
public ICommand SelectCommand { get; set; }
public ICommand EditCommand { get; set; }
public ICommand AddNewClientCommand { get; set; }
@@ -63,7 +62,7 @@ namespace DaSaSo.ViewModel
_dataService = dataService;
LoadClient();
SelectCommand = new SelectClientCommand(dataService,actualProject, this);
EditCommand = new EditClientCommand(_dataService,actualProject, editRenavigator, this);
AddNewClientCommand = new AddClientCommand(_dataService, actualProject, editRenavigator, this);

2
DaSaSo.ViewModel/Commands/AddProjectCommand.cs
View File

@@ -29,7 +29,7 @@ namespace DaSaSo.ViewModel.Commands
public override async Task ExecuteAsync(object? parameter)
{
Project pro = await _projectService.CreateProject(_actualProject.AktuellClient);
Project pro = await _projectService.CreateProject();
_actualProject.SetProject(pro);
_renavigator.Renavigate();

5
DaSaSo.ViewModel/ProjectListViewModel.cs
View File

@@ -56,9 +56,10 @@ namespace DaSaSo.ViewModel
LoadProjecte();
}
public void LoadProjecte()
public async void LoadProjecte()
{
InitCollection(Projekte, actualProject.AktuellClient.Projects);
var projects = await genericDataService.GetAll();
InitCollection(Projekte, projects);
}
private void InitCollection(ObservableCollection<Project> target, IEnumerable<Project> source)

10
DaSaSo.ViewModel/Window/MainWindowViewModel.cs
View File

@@ -41,7 +41,6 @@ namespace DaSaSo.ViewModel
private string _buildingsitename = "";
private RegistryKey? registry;
const string REGISTRYKEY = "HKEY_CURRENT_USER\\Software\\Cosysda\\DaSaSo";
public bool CanSelectProject { get => _actualProject.AktuellClient != null; }
public bool CanSelectBuildingSite { get => _actualProject.AktuellProjekt != null; }
public bool CanSelectSewerObjects { get => _actualProject.AktuellBaustelle != null; }
@@ -137,7 +136,6 @@ namespace DaSaSo.ViewModel
UpdateCurrentViewModelCommand = new UpdateCurrentViewModelCommand(navigator, viewModelFactory);
UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.Home);
_actualProject = actualProject;
_actualProject.ClientChanged += ActualProject_ClientChanged;
_actualProject.ProjectChanged += ActualProject_ProjectChanged;
_actualProject.BuildingSiteChanged += ActualProject_BuildingSiteChanged;
_actualProject.SewerObjectChanged += ActualProject_SewerObjectChanged;
@@ -220,13 +218,5 @@ namespace DaSaSo.ViewModel
OnPropertyChanged(nameof(CanSelectBuildingSite));
UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.Buildingsites);
}
private void ActualProject_ClientChanged(object? sender, EventArgs e)
{
SaveInRegistry("lastclient", _actualProject.AktuellClient.Id.ToString());
ClientName = _actualProject.AktuellClient.Firstname;
OnPropertyChanged(nameof(CanSelectProject));
UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.Projects);
}
}
}