From bb3394b03f6e9406cab82bb2608ace7e07ad2af9 Mon Sep 17 00:00:00 2001 From: Natlinux81 <97396587+Natlinux81@users.noreply.github.com> Date: Fri, 12 Aug 2022 15:46:04 +0200 Subject: [PATCH] StartView finished --- .../ApollonOverviewDetailsViewModel.cs | 18 +- Apollon.WPF/Views/ApollonOverviewView.xaml | 2 +- .../Components/ApollonOverviewDetails.xaml | 154 +++++++++++++++--- 3 files changed, 143 insertions(+), 31 deletions(-) diff --git a/Apollon.WPF/ViewModels/ApollonOverviewDetailsViewModel.cs b/Apollon.WPF/ViewModels/ApollonOverviewDetailsViewModel.cs index f87b7f2..14afa6f 100644 --- a/Apollon.WPF/ViewModels/ApollonOverviewDetailsViewModel.cs +++ b/Apollon.WPF/ViewModels/ApollonOverviewDetailsViewModel.cs @@ -12,15 +12,15 @@ namespace Apollon.WPF.ViewModels { private readonly SelectedTournamentStore _selectedTournamentStore; - private Tournament _selectedTournament => _selectedTournamentStore.SelectedTournament; + private Tournament SelectedTournament => _selectedTournamentStore.SelectedTournament; - public bool hasSelectedTournament => _selectedTournament != null; - public string Organisation => _selectedTournament?.Organisation ?? "keine Organisation"; - public string Tournamentname => _selectedTournament?.Tournamentname ?? "kein Name"; - public string Category => _selectedTournament?.Category ?? "keine Kategorie"; - public string Startdate => _selectedTournament?.Startdate ?? "kein Datum"; - public string Enddate => _selectedTournament?.Enddate ?? "kein Datum"; - public string Location => _selectedTournament?.Location ?? "kein Ort"; + public bool HasSelectedTournament => SelectedTournament != null; + public string Organisation => SelectedTournament?.Organisation ?? "keine Organisation"; + public string Tournamentname => SelectedTournament?.Tournamentname ?? "kein Name"; + public string Category => SelectedTournament?.Category ?? "keine Kategorie"; + public string Startdate => SelectedTournament?.Startdate ?? "kein Datum"; + public string Enddate => SelectedTournament?.Enddate ?? "kein Datum"; + public string Location => SelectedTournament?.Location ?? "kein Ort"; public ApollonOverviewDetailsViewModel(SelectedTournamentStore selectedTournamentStore) { @@ -37,7 +37,7 @@ namespace Apollon.WPF.ViewModels private void SelectedTournamentStore_SelectedTournamentChanged() { - OnPropertyChanged(nameof(hasSelectedTournament)); + OnPropertyChanged(nameof(HasSelectedTournament)); OnPropertyChanged(nameof(Organisation)); OnPropertyChanged(nameof(Tournamentname)); OnPropertyChanged(nameof(Category)); diff --git a/Apollon.WPF/Views/ApollonOverviewView.xaml b/Apollon.WPF/Views/ApollonOverviewView.xaml index 8466a8d..bfb4bbb 100644 --- a/Apollon.WPF/Views/ApollonOverviewView.xaml +++ b/Apollon.WPF/Views/ApollonOverviewView.xaml @@ -17,7 +17,7 @@ - + diff --git a/Apollon.WPF/Views/Components/ApollonOverviewDetails.xaml b/Apollon.WPF/Views/Components/ApollonOverviewDetails.xaml index 847c11a..a521acb 100644 --- a/Apollon.WPF/Views/Components/ApollonOverviewDetails.xaml +++ b/Apollon.WPF/Views/Components/ApollonOverviewDetails.xaml @@ -11,63 +11,175 @@ BorderThickness="1" CornerRadius="10"> - - + + + + + + + - + + + + + + - + + + + + - - + + + + + + - + + + + + + - + + + + + - + + + + + - - - + + + + + + + - + Margin="10"> + + + + +