From 5f93b56b8e37cbcc63d0dd8683b9c99b9ac42272 Mon Sep 17 00:00:00 2001 From: Natlinux81 <97396587+Natlinux81@users.noreply.github.com> Date: Wed, 17 Aug 2022 20:13:43 +0200 Subject: [PATCH] combobox not ready --- Apollon.WPF/Models/Competition.cs | 21 +++++++++++++++++++ .../ViewModels/AddEditDetailsViewModel.cs | 6 +++--- .../ViewModels/OverviewDetailsViewModel.cs | 4 ++-- .../Views/Components/AddEditDetails.xaml | 5 ++++- .../Views/Components/OverviewDetails.xaml | 2 +- 5 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 Apollon.WPF/Models/Competition.cs diff --git a/Apollon.WPF/Models/Competition.cs b/Apollon.WPF/Models/Competition.cs new file mode 100644 index 0000000..3f9fed6 --- /dev/null +++ b/Apollon.WPF/Models/Competition.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Apollon.WPF.Models +{ + public class Competition + { + public Competition(string competitionName, byte competitionImage) + { + CompetitionName = competitionName; + CompetitionImage = competitionImage; + } + + public string CompetitionName { get; set; } + + public byte CompetitionImage { get; set; } + } +} diff --git a/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs b/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs index d6a7f03..b7c97ff 100644 --- a/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs +++ b/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs @@ -39,16 +39,16 @@ namespace Apollon.WPF.ViewModels } } - private string _category; + private string _competition; public string Competition { get { - return _category; + return _competition; } set { - _category = value; + _competition = value; OnPropertyChanged(nameof(Competition)); } } diff --git a/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs b/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs index a92dc5f..8a2fd19 100644 --- a/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs +++ b/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs @@ -17,7 +17,7 @@ namespace Apollon.WPF.ViewModels public bool HasSelectedTournament => SelectedTournament != null; public string Organisation => SelectedTournament?.Organisation ?? "keine Organisation"; public string TournamentName => SelectedTournament?.TournamentName ?? "kein Name"; - public string Category => SelectedTournament?.Competition ?? "keine Kategorie"; + public string Competition => SelectedTournament?.Competition ?? "keine Kategorie"; public string StartDate => SelectedTournament?.StartDate.ToString("d") ?? "kein Datum"; public string EndDate => SelectedTournament?.EndDate.ToString("d") ?? "kein Datum"; public string Location => SelectedTournament?.Location ?? "kein Ort"; @@ -41,7 +41,7 @@ namespace Apollon.WPF.ViewModels OnPropertyChanged(nameof(HasSelectedTournament)); OnPropertyChanged(nameof(Organisation)); OnPropertyChanged(nameof(TournamentName)); - OnPropertyChanged(nameof(Category)); + OnPropertyChanged(nameof(Competition)); OnPropertyChanged(nameof(StartDate)); OnPropertyChanged(nameof(EndDate)); OnPropertyChanged(nameof(Location)); diff --git a/Apollon.WPF/Views/Components/AddEditDetails.xaml b/Apollon.WPF/Views/Components/AddEditDetails.xaml index 0c1b09e..8669a12 100644 --- a/Apollon.WPF/Views/Components/AddEditDetails.xaml +++ b/Apollon.WPF/Views/Components/AddEditDetails.xaml @@ -57,11 +57,14 @@ Height="30" VerticalContentAlignment="Center" Background="LightGray"/> - diff --git a/Apollon.WPF/Views/Components/OverviewDetails.xaml b/Apollon.WPF/Views/Components/OverviewDetails.xaml index c9ecb30..e8ac9ef 100644 --- a/Apollon.WPF/Views/Components/OverviewDetails.xaml +++ b/Apollon.WPF/Views/Components/OverviewDetails.xaml @@ -72,7 +72,7 @@ -