Natlinux/Apollon
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Navigate NavBar finished

Browse Source
This commit is contained in:
Natlinux81
2022-09-10 22:10:47 +02:00
parent 8b2b77bb56
commit 62d3863df6
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Apollon.WPF/ViewModels/NavBarViewModel.cs
View File

@@ -15,7 +15,6 @@ namespace Apollon.WPF.ViewModels
{ {
private readonly SelectedTournamentsStore _selectedTournamentsStore; private readonly SelectedTournamentsStore _selectedTournamentsStore;
private Tournament SelectedTournament => _selectedTournamentsStore.SelectedTournament; private Tournament SelectedTournament => _selectedTournamentsStore.SelectedTournament;
public bool HasSelectedTournament => SelectedTournament != null; public bool HasSelectedTournament => SelectedTournament != null;
@@ -28,11 +27,10 @@ namespace Apollon.WPF.ViewModels
public string Location => SelectedTournament?.Location ?? "kein Ort"; public string Location => SelectedTournament?.Location ?? "kein Ort";
public int Rounds => SelectedTournament?.Rounds ?? 0; public int Rounds => SelectedTournament?.Rounds ?? 0;
public AddEditDetailsViewModel AddEditDetailsViewModel { get; }
public ICommand NavigateOverviewCommand { get; } public ICommand NavigateOverviewCommand { get; }
public NavBarViewModel(NavigationStore navigationStore, SelectedTournamentsStore selectedTournamentsStore, ModalNavigationStore modalNavigationStore, TournamentsStore tournamentsStore) public NavBarViewModel(NavigationStore navigationStore, SelectedTournamentsStore selectedTournamentsStore, ModalNavigationStore modalNavigationStore, TournamentsStore tournamentsStore)
{ {
NavigateOverviewCommand = new NavigateCommand<OverviewViewModel>(navigationStore, () => new OverviewViewModel(tournamentsStore, selectedTournamentsStore, modalNavigationStore,navigationStore)); NavigateOverviewCommand = new NavigateCommand<OverviewViewModel>(navigationStore, () => OverviewViewModel.LoadViewModel( selectedTournamentsStore, modalNavigationStore, tournamentsStore, navigationStore));
_selectedTournamentsStore = selectedTournamentsStore; _selectedTournamentsStore = selectedTournamentsStore;
} }

2
Apollon.WPF/ViewModels/OverviewListingViewModel.cs
View File

@@ -52,7 +52,7 @@ namespace Apollon.WPF.ViewModels
protected override void Dispose() protected override void Dispose()
{ {
_selectedTournamentStore.SelectedTournamentChanged += SelectedTournamentStore_SelectedTournamentChanged; _selectedTournamentStore.SelectedTournamentChanged -= SelectedTournamentStore_SelectedTournamentChanged;
_tournamentStore.TournamentLoaded -= TournamentStore_TournamentLoaded; _tournamentStore.TournamentLoaded -= TournamentStore_TournamentLoaded;
_tournamentStore.TournamentAdded -= TournamentStore_TournamentAdded; _tournamentStore.TournamentAdded -= TournamentStore_TournamentAdded;