From 7c5551d61923b978918357427ec9f15a50b4fd75 Mon Sep 17 00:00:00 2001 From: Natlinux81 <97396587+Natlinux81@users.noreply.github.com> Date: Mon, 15 Aug 2022 15:17:05 +0200 Subject: [PATCH] clean up AddCommand EditCommand --- .../Commands/OpenAddTournamentCommand.cs | 6 ++--- .../Commands/OpenEditTournamentCommand.cs | 26 +++++++++++++++++++ Apollon.WPF/MainWindow.xaml | 2 +- .../ViewModels/AddTournametViewModel.cs | 4 +-- .../ViewModels/OverviewListingViewModel.cs | 12 ++++----- Apollon.WPF/ViewModels/OverviewViewModel.cs | 2 ++ .../Views/Components/OverViewListing.xaml | 2 +- Apollon.WPF/Views/EditTournamentView.xaml | 2 +- Apollon.WPF/Views/OverviewView.xaml | 3 ++- 9 files changed, 44 insertions(+), 15 deletions(-) create mode 100644 Apollon.WPF/Commands/OpenEditTournamentCommand.cs diff --git a/Apollon.WPF/Commands/OpenAddTournamentCommand.cs b/Apollon.WPF/Commands/OpenAddTournamentCommand.cs index ca914bc..6169e3d 100644 --- a/Apollon.WPF/Commands/OpenAddTournamentCommand.cs +++ b/Apollon.WPF/Commands/OpenAddTournamentCommand.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace Apollon.WPF.Commands { - internal class OpenAddTournamentCommand : CommandBase + public class OpenAddTournamentCommand : CommandBase { private readonly ModalNavigationStore _modalNavigationStore; @@ -19,8 +19,8 @@ namespace Apollon.WPF.Commands public override void Execute(object parameter) { - AddTournametViewModel addTournametViewModel = new AddTournametViewModel(_modalNavigationStore); - _modalNavigationStore.CurrentViewModel = addTournametViewModel; + AddTournamentViewModel addTournamentViewModel = new AddTournamentViewModel(_modalNavigationStore); + _modalNavigationStore.CurrentViewModel = addTournamentViewModel; } } } diff --git a/Apollon.WPF/Commands/OpenEditTournamentCommand.cs b/Apollon.WPF/Commands/OpenEditTournamentCommand.cs new file mode 100644 index 0000000..b35269f --- /dev/null +++ b/Apollon.WPF/Commands/OpenEditTournamentCommand.cs @@ -0,0 +1,26 @@ +using Apollon.WPF.Stores; +using Apollon.WPF.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Apollon.WPF.Commands +{ + public class OpenEditTournamentCommand : CommandBase + { + private readonly ModalNavigationStore _modalNavigationStore; + + public OpenEditTournamentCommand(ModalNavigationStore modalNavigationStore) + { + _modalNavigationStore = modalNavigationStore; + } + + public override void Execute(object parameter) + { + EditTournamentViewModel editTournamentViewModel = new EditTournamentViewModel(_modalNavigationStore); + _modalNavigationStore.CurrentViewModel = editTournamentViewModel; + } + } +} diff --git a/Apollon.WPF/MainWindow.xaml b/Apollon.WPF/MainWindow.xaml index 840f284..cd6daec 100644 --- a/Apollon.WPF/MainWindow.xaml +++ b/Apollon.WPF/MainWindow.xaml @@ -17,7 +17,7 @@ WindowStyle="None" ResizeMode="CanResizeWithGrip"> - + diff --git a/Apollon.WPF/ViewModels/AddTournametViewModel.cs b/Apollon.WPF/ViewModels/AddTournametViewModel.cs index e87f693..1ef0cd8 100644 --- a/Apollon.WPF/ViewModels/AddTournametViewModel.cs +++ b/Apollon.WPF/ViewModels/AddTournametViewModel.cs @@ -9,11 +9,11 @@ using System.Windows.Input; namespace Apollon.WPF.ViewModels { - public class AddTournametViewModel : ViewModelBase + public class AddTournamentViewModel : ViewModelBase { public AddEditDetailsViewModel AddEditDetailsViewModel { get; } - public AddTournametViewModel(ModalNavigationStore modalNavigationStore) + public AddTournamentViewModel(ModalNavigationStore modalNavigationStore) { ICommand cancelCommand = new CloseModalCommand(modalNavigationStore); AddEditDetailsViewModel = new AddEditDetailsViewModel(null, cancelCommand); diff --git a/Apollon.WPF/ViewModels/OverviewListingViewModel.cs b/Apollon.WPF/ViewModels/OverviewListingViewModel.cs index dbe6245..4c397e2 100644 --- a/Apollon.WPF/ViewModels/OverviewListingViewModel.cs +++ b/Apollon.WPF/ViewModels/OverviewListingViewModel.cs @@ -11,10 +11,10 @@ namespace Apollon.WPF.ViewModels { public class OverviewListingViewModel : ViewModelBase { - private readonly ObservableCollection _apollonOverviewListingItemViewModels; + private readonly ObservableCollection _OverviewListingItemViewModels; private readonly SelectedTournamentStore _selectedTournamentStore; - public IEnumerable ApollonOverviewListingItemViewModels => _apollonOverviewListingItemViewModels; + public IEnumerable OverviewListingItemViewModels => _OverviewListingItemViewModels; private OverviewListingItemViewModel _selectedOverviewListingItemViewModel; @@ -37,11 +37,11 @@ namespace Apollon.WPF.ViewModels { _selectedTournamentStore = selectedTournamentStore; - _apollonOverviewListingItemViewModels = new ObservableCollection(); + _OverviewListingItemViewModels = new ObservableCollection(); - _apollonOverviewListingItemViewModels.Add(new OverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft1", "Halle", "01.01.2021", "05.01.2021", "Wiesbaden",3))); - _apollonOverviewListingItemViewModels.Add(new OverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft2", "im Freien", "01.01.2021", "05.01.2021", "Berlin",5))); - _apollonOverviewListingItemViewModels.Add(new OverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft3", "Halle", "01.01.2021", "05.01.2021", "Bruchsal", 6))); + _OverviewListingItemViewModels.Add(new OverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft1", "Halle", "01.01.2021", "05.01.2021", "Wiesbaden",3))); + _OverviewListingItemViewModels.Add(new OverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft2", "im Freien", "01.01.2021", "05.01.2021", "Berlin",5))); + _OverviewListingItemViewModels.Add(new OverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft3", "Halle", "01.01.2021", "05.01.2021", "Bruchsal", 6))); } } diff --git a/Apollon.WPF/ViewModels/OverviewViewModel.cs b/Apollon.WPF/ViewModels/OverviewViewModel.cs index b127493..dbe1759 100644 --- a/Apollon.WPF/ViewModels/OverviewViewModel.cs +++ b/Apollon.WPF/ViewModels/OverviewViewModel.cs @@ -15,6 +15,7 @@ namespace Apollon.WPF.ViewModels public OverviewDetailsViewModel OverviewDetailsViewModel{ get; } public ICommand AddTournamentCommand { get; } + public ICommand EditTournamentCommand { get; } public OverviewViewModel(SelectedTournamentStore _selectedTournamentStore, ModalNavigationStore modalNavigationStore) { @@ -22,6 +23,7 @@ namespace Apollon.WPF.ViewModels OverviewDetailsViewModel = new OverviewDetailsViewModel(_selectedTournamentStore); AddTournamentCommand = new OpenAddTournamentCommand(modalNavigationStore); + EditTournamentCommand = new OpenEditTournamentCommand(modalNavigationStore); } } } diff --git a/Apollon.WPF/Views/Components/OverViewListing.xaml b/Apollon.WPF/Views/Components/OverViewListing.xaml index 7c9ee73..db4d016 100644 --- a/Apollon.WPF/Views/Components/OverViewListing.xaml +++ b/Apollon.WPF/Views/Components/OverViewListing.xaml @@ -18,7 +18,7 @@ Background="Transparent" BorderBrush="Transparent" Padding="20" - ItemsSource="{Binding ApollonOverviewListingItemViewModels}" + ItemsSource="{Binding OverviewListingItemViewModels}" SelectedItem="{Binding SelectedOverviewListingItemViewModel}">