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

selected Tournament changed

Browse Source
This commit is contained in:
Natlinux81
2022-08-12 03:15:29 +02:00
parent bfe404fbc7
commit e98978a02a
5 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Apollon.WPF/MainWindow.xaml
View File

@@ -30,7 +30,7 @@
Background="Transparent" Background="Transparent"
BorderBrush="Transparent" BorderBrush="Transparent"
Content="🗙" Content="🗙"
FontSize="20" FontSize="18"
Foreground="#0000a0" Foreground="#0000a0"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
HorizontalContentAlignment="Center" HorizontalContentAlignment="Center"
@@ -43,7 +43,7 @@
Padding="-4" Padding="-4"
BorderBrush="Transparent" BorderBrush="Transparent"
Content="☐" Content="☐"
FontSize="20" FontSize="18"
FontWeight="UltraBold" FontWeight="UltraBold"
Foreground="#0000a0" Foreground="#0000a0"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
@@ -59,7 +59,7 @@
Background="Transparent" Background="Transparent"
BorderBrush="Transparent" BorderBrush="Transparent"
Content="🗕" Content="🗕"
FontSize="20" FontSize="18"
FontWeight="Bold" FontWeight="Bold"
Foreground="#0000a0" Foreground="#0000a0"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"

12
Apollon.WPF/Models/Tournament.cs
View File

@@ -8,21 +8,23 @@ namespace Apollon.WPF.Models
{ {
public class Tournament 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; Organisation = organisation;
Tournamentname = tournamentname; Tournamentname = tournamentname;
Category = category; Category = category;
//Startdate = startdate; Startdate = startdate;
//Enddate = enddate; Enddate = enddate;
Location = location; Location = location;
} }
public string Organisation { get; } public string Organisation { get; }
public string Tournamentname { get; } public string Tournamentname { get; }
public string Category { get; } public string Category { get; }
//public DateTime Startdate { get; } public string Startdate { get; }
//public DateTime Enddate { get; } public string Enddate { get; }
public string Location { get; } public string Location { get; }
} }
} }

6
Apollon.WPF/ViewModels/ApollonOverviewDetailsViewModel.cs
View File

@@ -18,8 +18,8 @@ namespace Apollon.WPF.ViewModels
public string Organisation => _selectedTournament?.Organisation ?? "keine Organisation"; public string Organisation => _selectedTournament?.Organisation ?? "keine Organisation";
public string Tournamentname => _selectedTournament?.Tournamentname ?? "kein Name"; public string Tournamentname => _selectedTournament?.Tournamentname ?? "kein Name";
public string Category => _selectedTournament?.Category ?? "keine Kategorie"; public string Category => _selectedTournament?.Category ?? "keine Kategorie";
//public DateTime Startdate => _selectedTournament?.Startdate ?? DateTime.MinValue; public string Startdate => _selectedTournament?.Startdate ?? "kein Datum";
//public DateTime Enddate => _selectedTournament?.Enddate ?? DateTime.MinValue; public string Enddate => _selectedTournament?.Enddate ?? "kein Datum";
public string Location => _selectedTournament?.Location ?? "kein Ort"; public string Location => _selectedTournament?.Location ?? "kein Ort";
public ApollonOverviewDetailsViewModel(SelectedTournamentStore selectedTournamentStore) public ApollonOverviewDetailsViewModel(SelectedTournamentStore selectedTournamentStore)
@@ -41,6 +41,8 @@ namespace Apollon.WPF.ViewModels
OnPropertyChanged(nameof(Organisation)); OnPropertyChanged(nameof(Organisation));
OnPropertyChanged(nameof(Tournamentname)); OnPropertyChanged(nameof(Tournamentname));
OnPropertyChanged(nameof(Category)); OnPropertyChanged(nameof(Category));
OnPropertyChanged(nameof(Startdate));
OnPropertyChanged(nameof(Enddate));
OnPropertyChanged(nameof(Location)); OnPropertyChanged(nameof(Location));
} }
} }

6
Apollon.WPF/ViewModels/ApollonOverviewListingViewModel.cs
View File

@@ -39,9 +39,9 @@ namespace Apollon.WPF.ViewModels
_selectedTournamentStore = selectedTournamentStore; _selectedTournamentStore = selectedTournamentStore;
_apollonOverviewListingItemViewModels = new ObservableCollection<ApollonOverviewListingItemViewModel>(); _apollonOverviewListingItemViewModels = new ObservableCollection<ApollonOverviewListingItemViewModel>();
_apollonOverviewListingItemViewModels.Add(new ApollonOverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft1", "Halle", "Wiesbaden"))); _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", "Berlin"))); _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", "Bruchsal"))); _apollonOverviewListingItemViewModels.Add(new ApollonOverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft3", "Halle", "01.01.2021", "05.01.2021", "Bruchsal")));
} }
} }

15
Apollon.WPF/Views/Components/ApollonOverviewDetails.xaml
View File

@@ -33,8 +33,21 @@
FontSize="14" FontSize="14"
Foreground="#0000a0" Foreground="#0000a0"
Margin="10"/> Margin="10"/>
<WrapPanel Margin="10"> <WrapPanel Margin="10" HorizontalAlignment="Center">
<TextBlock Text="vom "
TextAlignment="Center"
FontFamily="Arial"
FontWeight="Bold"
FontSize="14"
Foreground="#0000a0"/>
<TextBlock Text="{Binding Startdate}" <TextBlock Text="{Binding Startdate}"
TextAlignment="Center"
FontFamily="Arial"
FontWeight="Bold"
FontSize="14"
Foreground="#0000a0"
Margin="0 0 5 0"/>
<TextBlock Text="bis "
TextAlignment="Center" TextAlignment="Center"
FontFamily="Arial" FontFamily="Arial"
FontWeight="Bold" FontWeight="Bold"