diff --git a/Apollon.WPF/MainWindow.xaml b/Apollon.WPF/MainWindow.xaml index cc45e00..37ef4fd 100644 --- a/Apollon.WPF/MainWindow.xaml +++ b/Apollon.WPF/MainWindow.xaml @@ -30,7 +30,7 @@ Background="Transparent" BorderBrush="Transparent" Content="🗙" - FontSize="20" + FontSize="18" Foreground="#0000a0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" @@ -43,7 +43,7 @@ Padding="-4" BorderBrush="Transparent" Content="☐" - FontSize="20" + FontSize="18" FontWeight="UltraBold" Foreground="#0000a0" VerticalContentAlignment="Center" @@ -59,7 +59,7 @@ Background="Transparent" BorderBrush="Transparent" Content="🗕" - FontSize="20" + FontSize="18" FontWeight="Bold" Foreground="#0000a0" VerticalContentAlignment="Center" diff --git a/Apollon.WPF/Models/Tournament.cs b/Apollon.WPF/Models/Tournament.cs index 2bfbfcb..e6f0a2a 100644 --- a/Apollon.WPF/Models/Tournament.cs +++ b/Apollon.WPF/Models/Tournament.cs @@ -8,21 +8,23 @@ namespace Apollon.WPF.Models { public class Tournament { - public Tournament(string organisation, string tournamentname, string category, string location) + public Tournament(string organisation, string tournamentname, string category, string startdate, string enddate, string location) { Organisation = organisation; Tournamentname = tournamentname; Category = category; - //Startdate = startdate; - //Enddate = enddate; + Startdate = startdate; + Enddate = enddate; Location = location; + } public string Organisation { get; } public string Tournamentname { get; } public string Category { get; } - //public DateTime Startdate { get; } - //public DateTime Enddate { get; } + public string Startdate { get; } + public string Enddate { get; } public string Location { get; } + } } diff --git a/Apollon.WPF/ViewModels/ApollonOverviewDetailsViewModel.cs b/Apollon.WPF/ViewModels/ApollonOverviewDetailsViewModel.cs index 958d36d..f87b7f2 100644 --- a/Apollon.WPF/ViewModels/ApollonOverviewDetailsViewModel.cs +++ b/Apollon.WPF/ViewModels/ApollonOverviewDetailsViewModel.cs @@ -18,8 +18,8 @@ namespace Apollon.WPF.ViewModels public string Organisation => _selectedTournament?.Organisation ?? "keine Organisation"; public string Tournamentname => _selectedTournament?.Tournamentname ?? "kein Name"; public string Category => _selectedTournament?.Category ?? "keine Kategorie"; - //public DateTime Startdate => _selectedTournament?.Startdate ?? DateTime.MinValue; - //public DateTime Enddate => _selectedTournament?.Enddate ?? DateTime.MinValue; + 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) @@ -41,6 +41,8 @@ namespace Apollon.WPF.ViewModels OnPropertyChanged(nameof(Organisation)); OnPropertyChanged(nameof(Tournamentname)); OnPropertyChanged(nameof(Category)); + OnPropertyChanged(nameof(Startdate)); + OnPropertyChanged(nameof(Enddate)); OnPropertyChanged(nameof(Location)); } } diff --git a/Apollon.WPF/ViewModels/ApollonOverviewListingViewModel.cs b/Apollon.WPF/ViewModels/ApollonOverviewListingViewModel.cs index a2292cc..d50032a 100644 --- a/Apollon.WPF/ViewModels/ApollonOverviewListingViewModel.cs +++ b/Apollon.WPF/ViewModels/ApollonOverviewListingViewModel.cs @@ -39,9 +39,9 @@ namespace Apollon.WPF.ViewModels _selectedTournamentStore = selectedTournamentStore; _apollonOverviewListingItemViewModels = new ObservableCollection(); - _apollonOverviewListingItemViewModels.Add(new ApollonOverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft1", "Halle", "Wiesbaden"))); - _apollonOverviewListingItemViewModels.Add(new ApollonOverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft2", "im Freien", "Berlin"))); - _apollonOverviewListingItemViewModels.Add(new ApollonOverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft3", "Halle", "Bruchsal"))); + _apollonOverviewListingItemViewModels.Add(new ApollonOverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft1", "Halle", "01.01.2021", "05.01.2021", "Wiesbaden"))); + _apollonOverviewListingItemViewModels.Add(new ApollonOverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft2", "im Freien", "01.01.2021", "05.01.2021", "Berlin"))); + _apollonOverviewListingItemViewModels.Add(new ApollonOverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft3", "Halle", "01.01.2021", "05.01.2021", "Bruchsal"))); } } diff --git a/Apollon.WPF/Views/Components/ApollonOverviewDetails.xaml b/Apollon.WPF/Views/Components/ApollonOverviewDetails.xaml index 7a90790..847c11a 100644 --- a/Apollon.WPF/Views/Components/ApollonOverviewDetails.xaml +++ b/Apollon.WPF/Views/Components/ApollonOverviewDetails.xaml @@ -33,8 +33,21 @@ FontSize="14" Foreground="#0000a0" Margin="10"/> - + + +