diff --git a/Apollon.Domain/Models/NameList.cs b/Apollon.Domain/Models/NameList.cs
index 8219c53..9789840 100644
--- a/Apollon.Domain/Models/NameList.cs
+++ b/Apollon.Domain/Models/NameList.cs
@@ -8,7 +8,7 @@ namespace Apollon.Domain.Models
{
public class NameList
{
- public NameList(Guid id, string firstName, string lastName, int passNumber, string society, int societyNumber, string birthday, string country, int qualification)
+ public NameList(Guid id, string firstName, string lastName, int passNumber, string society, int societyNumber, DateTime birthday, string country, int qualification)
{
Id = id;
FirstName = firstName;
@@ -27,7 +27,7 @@ namespace Apollon.Domain.Models
public int PassNumber { get; }
public string Society { get; }
public int SocietyNumber { get; }
- public string Birthday { get; }
+ public DateTime Birthday { get; }
public string Country { get; }
public int Qualification { get; }
}
diff --git a/Apollon.EntityFramework/DTOs/NameListDto.cs b/Apollon.EntityFramework/DTOs/NameListDto.cs
index e0072c7..64333fc 100644
--- a/Apollon.EntityFramework/DTOs/NameListDto.cs
+++ b/Apollon.EntityFramework/DTOs/NameListDto.cs
@@ -14,7 +14,7 @@ namespace Apollon.EntityFramework.DTOs
public int PassNumber { get; set; }
public string Society { get; set; }
public int SocietyNumber { get; set; }
- public string Birthday { get; set; }
+ public DateTime Birthday { get; set; }
public string Country { get; set; }
public int Qualification { get; set; }
}
diff --git a/Apollon.WPF/Apollon.WPF.csproj b/Apollon.WPF/Apollon.WPF.csproj
index 0a50e86..0f7a327 100644
--- a/Apollon.WPF/Apollon.WPF.csproj
+++ b/Apollon.WPF/Apollon.WPF.csproj
@@ -9,6 +9,7 @@
+
@@ -25,14 +26,13 @@
-
-
-
-
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
diff --git a/Apollon.WPF/App.xaml.cs b/Apollon.WPF/App.xaml.cs
index 7628f6d..747f7f2 100644
--- a/Apollon.WPF/App.xaml.cs
+++ b/Apollon.WPF/App.xaml.cs
@@ -51,7 +51,8 @@ namespace Apollon.WPF
_navBarPreparationViewModel = new NavBarPreparationViewModel(CreateOverviewNavigationService(),
CreateGroupsNavigationService(),
- CreateClassesNavigationService(),
+ CreateNamelistNavigationService(),
+ CreateClassesNavigationService(),
CreateArchersNavigationService());
}
@@ -105,6 +106,12 @@ namespace Apollon.WPF
_navigationStore, ()=> new ClassesViewModel(_navBarPreparationViewModel, _selectedTournamentStore));
}
+ private NavigationService CreateNamelistNavigationService()
+ {
+ return new NavigationService(
+ _navigationStore, () => new NameListViewModel());
+ }
+
private NavigationService CreateArchersNavigationService()
{
return new NavigationService(
diff --git a/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs b/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs
index ba7d166..b930ce5 100644
--- a/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs
+++ b/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs
@@ -134,16 +134,16 @@ namespace Apollon.WPF.ViewModels
}
}
- private int _rounds;
+ private int _groups;
public int Groups
{
get
{
- return _rounds;
+ return _groups;
}
set
{
- _rounds = value;
+ _groups = value;
OnPropertyChanged(nameof(Groups));
}
}
diff --git a/Apollon.WPF/ViewModels/NameListViewModel.cs b/Apollon.WPF/ViewModels/NameListViewModel.cs
index 8b89a4b..884f1ea 100644
--- a/Apollon.WPF/ViewModels/NameListViewModel.cs
+++ b/Apollon.WPF/ViewModels/NameListViewModel.cs
@@ -78,8 +78,8 @@ namespace Apollon.WPF.ViewModels
}
}
- private string _birthday;
- public string Birthday
+ private DateTime _birthday;
+ public DateTime Birthday
{
get
{
@@ -119,5 +119,19 @@ namespace Apollon.WPF.ViewModels
OnPropertyChanged(nameof(Qualification));
}
}
+
+ private bool _isreadOnly;
+ public bool IsReadOnly
+ {
+ get
+ {
+ return _isreadOnly;
+ }
+ set
+ {
+ _isreadOnly = value;
+ OnPropertyChanged(nameof(IsReadOnly));
+ }
+ }
}
}
diff --git a/Apollon.WPF/ViewModels/NavBarPreparationViewModel.cs b/Apollon.WPF/ViewModels/NavBarPreparationViewModel.cs
index 5f683b6..23bbd5b 100644
--- a/Apollon.WPF/ViewModels/NavBarPreparationViewModel.cs
+++ b/Apollon.WPF/ViewModels/NavBarPreparationViewModel.cs
@@ -14,14 +14,19 @@ namespace Apollon.WPF.ViewModels
public ICommand NavigateOverviewCommand { get; }
public ICommand NavigateGroupsCommand { get;}
public ICommand NavigateClassesCommand { get;}
+ public ICommand NavigateNamelistCommand { get;}
public ICommand NavigateArchersCommand { get;}
- public NavBarPreparationViewModel(NavigationService overviewNavigationService, NavigationService groupNavigationService,
- NavigationService classNavigationService, NavigationService archersNavigationService)
+ public NavBarPreparationViewModel(NavigationService overviewNavigationService,
+ NavigationService groupNavigationService,
+ NavigationService namelistNavigationService,
+ NavigationService classNavigationService,
+ NavigationService archersNavigationService)
{
NavigateOverviewCommand = new NavigateCommand(overviewNavigationService);
NavigateGroupsCommand = new NavigateCommand(groupNavigationService);
NavigateClassesCommand = new NavigateCommand(classNavigationService);
+ NavigateNamelistCommand = new NavigateCommand(namelistNavigationService);
NavigateArchersCommand = new NavigateCommand(archersNavigationService);
}
}
diff --git a/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs b/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs
index 694a5a1..533f65d 100644
--- a/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs
+++ b/Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs
@@ -2,11 +2,6 @@
using Apollon.WPF.Commands;
using Apollon.WPF.Services;
using Apollon.WPF.Stores;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Input;
namespace Apollon.WPF.ViewModels
@@ -17,11 +12,11 @@ namespace Apollon.WPF.ViewModels
private Tournament SelectedTournament => _selectedTournamentStore.SelectedTournament;
public bool HasSelectedTournament => SelectedTournament != null;
- public string Logo => SelectedTournament?.Logo ?? "D:\\Projekte\\Apollon\\Apollon\\Apollon.WPF\\Images\\Archery.png";
+ public string Logo => SelectedTournament?.Logo ?? @"\images\Archery.png";
public string Organisation => SelectedTournament?.Organisation ?? "keine Organisation";
public string TournamentName => SelectedTournament?.TournamentName ?? "kein Name";
public string Competition => SelectedTournament?.Competition ?? "keine Kategorie";
- public string CompetitionImage => SelectedTournament?.CompetitionImage ?? "D:\\Projekte\\Apollon\\Apollon\\Apollon.WPF\\Images\\Archery.png";
+ public string CompetitionImage => SelectedTournament?.CompetitionImage ?? @"\images\Archery.png";
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";
diff --git a/Apollon.WPF/ViewModels/TournamentDetailsViewModel.cs b/Apollon.WPF/ViewModels/TournamentDetailsViewModel.cs
index b354a35..696a130 100644
--- a/Apollon.WPF/ViewModels/TournamentDetailsViewModel.cs
+++ b/Apollon.WPF/ViewModels/TournamentDetailsViewModel.cs
@@ -16,11 +16,11 @@ namespace Apollon.WPF.ViewModels
private Tournament SelectedTournament => _selectedTournamentsStore.SelectedTournament;
public bool HasSelectedTournament => SelectedTournament != null;
- public string Logo => SelectedTournament?.Logo ?? "D:\\Projekte\\Apollon\\Apollon\\Apollon.WPF\\Images\\Archery.png";
+ public string Logo => SelectedTournament?.Logo ?? @"\images\Archery.png";
public string Organisation => SelectedTournament?.Organisation ?? "keine Organisation";
public string TournamentName => SelectedTournament?.TournamentName ?? "kein Name";
public string Competition => SelectedTournament?.Competition ?? "keine Kategorie";
- public string CompetitionImage => SelectedTournament?.CompetitionImage ?? "D:\\Projekte\\Apollon\\Apollon\\Apollon.WPF\\Images\\Archery.png";
+ public string CompetitionImage => SelectedTournament?.CompetitionImage ?? @"\images\Archery.png";
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";
diff --git a/Apollon.WPF/Views/Components/NavBarPreparationView.xaml b/Apollon.WPF/Views/Components/NavBarPreparationView.xaml
index e36540d..f9dee5b 100644
--- a/Apollon.WPF/Views/Components/NavBarPreparationView.xaml
+++ b/Apollon.WPF/Views/Components/NavBarPreparationView.xaml
@@ -83,7 +83,8 @@