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

clean up AddCommand EditCommand

Browse Source
This commit is contained in:
Natlinux81
2022-08-15 15:17:05 +02:00
parent a694685181
commit 7c5551d619
9 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Apollon.WPF/Commands/OpenAddTournamentCommand.cs
View File

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
namespace Apollon.WPF.Commands namespace Apollon.WPF.Commands
{ {
internal class OpenAddTournamentCommand : CommandBase public class OpenAddTournamentCommand : CommandBase
{ {
private readonly ModalNavigationStore _modalNavigationStore; private readonly ModalNavigationStore _modalNavigationStore;
@@ -19,8 +19,8 @@ namespace Apollon.WPF.Commands
public override void Execute(object parameter) public override void Execute(object parameter)
{ {
AddTournametViewModel addTournametViewModel = new AddTournametViewModel(_modalNavigationStore); AddTournamentViewModel addTournamentViewModel = new AddTournamentViewModel(_modalNavigationStore);
_modalNavigationStore.CurrentViewModel = addTournametViewModel; _modalNavigationStore.CurrentViewModel = addTournamentViewModel;
} }
} }
} }

26
Apollon.WPF/Commands/OpenEditTournamentCommand.cs Normal file
View File

@@ -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;
}
}
}

2
Apollon.WPF/MainWindow.xaml
View File

@@ -17,7 +17,7 @@
WindowStyle="None" WindowStyle="None"
ResizeMode="CanResizeWithGrip"> ResizeMode="CanResizeWithGrip">
<Window.Resources> <Window.Resources>
<DataTemplate DataType="{x:Type vms:AddTournametViewModel}"> <DataTemplate DataType="{x:Type vms:AddTournamentViewModel}">
<views:AddTournamentView/> <views:AddTournamentView/>
</DataTemplate> </DataTemplate>
<DataTemplate DataType="{x:Type vms:EditTournamentViewModel}"> <DataTemplate DataType="{x:Type vms:EditTournamentViewModel}">

4
Apollon.WPF/ViewModels/AddTournametViewModel.cs
View File

@@ -9,11 +9,11 @@ using System.Windows.Input;
namespace Apollon.WPF.ViewModels namespace Apollon.WPF.ViewModels
{ {
public class AddTournametViewModel : ViewModelBase public class AddTournamentViewModel : ViewModelBase
{ {
public AddEditDetailsViewModel AddEditDetailsViewModel { get; } public AddEditDetailsViewModel AddEditDetailsViewModel { get; }
public AddTournametViewModel(ModalNavigationStore modalNavigationStore) public AddTournamentViewModel(ModalNavigationStore modalNavigationStore)
{ {
ICommand cancelCommand = new CloseModalCommand(modalNavigationStore); ICommand cancelCommand = new CloseModalCommand(modalNavigationStore);
AddEditDetailsViewModel = new AddEditDetailsViewModel(null, cancelCommand); AddEditDetailsViewModel = new AddEditDetailsViewModel(null, cancelCommand);

12
Apollon.WPF/ViewModels/OverviewListingViewModel.cs
View File

@@ -11,10 +11,10 @@ namespace Apollon.WPF.ViewModels
{ {
public class OverviewListingViewModel : ViewModelBase public class OverviewListingViewModel : ViewModelBase
{ {
private readonly ObservableCollection<OverviewListingItemViewModel> _apollonOverviewListingItemViewModels; private readonly ObservableCollection<OverviewListingItemViewModel> _OverviewListingItemViewModels;
private readonly SelectedTournamentStore _selectedTournamentStore; private readonly SelectedTournamentStore _selectedTournamentStore;
public IEnumerable<OverviewListingItemViewModel> ApollonOverviewListingItemViewModels => _apollonOverviewListingItemViewModels; public IEnumerable<OverviewListingItemViewModel> OverviewListingItemViewModels => _OverviewListingItemViewModels;
private OverviewListingItemViewModel _selectedOverviewListingItemViewModel; private OverviewListingItemViewModel _selectedOverviewListingItemViewModel;
@@ -37,11 +37,11 @@ namespace Apollon.WPF.ViewModels
{ {
_selectedTournamentStore = selectedTournamentStore; _selectedTournamentStore = selectedTournamentStore;
_apollonOverviewListingItemViewModels = new ObservableCollection<OverviewListingItemViewModel>(); _OverviewListingItemViewModels = new ObservableCollection<OverviewListingItemViewModel>();
_apollonOverviewListingItemViewModels.Add(new OverviewListingItemViewModel(new Tournament("DSB", "Deutschemeisterschaft1", "Halle", "01.01.2021", "05.01.2021", "Wiesbaden",3))); _OverviewListingItemViewModels.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))); _OverviewListingItemViewModels.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", "Deutschemeisterschaft3", "Halle", "01.01.2021", "05.01.2021", "Bruchsal", 6)));
} }
} }

2
Apollon.WPF/ViewModels/OverviewViewModel.cs
View File

@@ -15,6 +15,7 @@ namespace Apollon.WPF.ViewModels
public OverviewDetailsViewModel OverviewDetailsViewModel{ get; } public OverviewDetailsViewModel OverviewDetailsViewModel{ get; }
public ICommand AddTournamentCommand { get; } public ICommand AddTournamentCommand { get; }
public ICommand EditTournamentCommand { get; }
public OverviewViewModel(SelectedTournamentStore _selectedTournamentStore, ModalNavigationStore modalNavigationStore) public OverviewViewModel(SelectedTournamentStore _selectedTournamentStore, ModalNavigationStore modalNavigationStore)
{ {
@@ -22,6 +23,7 @@ namespace Apollon.WPF.ViewModels
OverviewDetailsViewModel = new OverviewDetailsViewModel(_selectedTournamentStore); OverviewDetailsViewModel = new OverviewDetailsViewModel(_selectedTournamentStore);
AddTournamentCommand = new OpenAddTournamentCommand(modalNavigationStore); AddTournamentCommand = new OpenAddTournamentCommand(modalNavigationStore);
EditTournamentCommand = new OpenEditTournamentCommand(modalNavigationStore);
} }
} }
} }

2
Apollon.WPF/Views/Components/OverViewListing.xaml
View File

@@ -18,7 +18,7 @@
Background="Transparent" Background="Transparent"
BorderBrush="Transparent" BorderBrush="Transparent"
Padding="20" Padding="20"
ItemsSource="{Binding ApollonOverviewListingItemViewModels}" ItemsSource="{Binding OverviewListingItemViewModels}"
SelectedItem="{Binding SelectedOverviewListingItemViewModel}"> SelectedItem="{Binding SelectedOverviewListingItemViewModel}">
<ListView.ItemContainerStyle> <ListView.ItemContainerStyle>
<Style TargetType="ListViewItem"> <Style TargetType="ListViewItem">

2
Apollon.WPF/Views/EditTournamentView.xaml
View File

@@ -7,7 +7,7 @@
xmlns:components="clr-namespace:Apollon.WPF.Views.Components" xmlns:components="clr-namespace:Apollon.WPF.Views.Components"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid> <Grid>
<TextBlock Text="Turniers Bearbeiten" <TextBlock Text="Turniers bearbeiten"
TextAlignment="Center" TextAlignment="Center"
FontFamily="Arial" FontFamily="Arial"
FontWeight="Bold" FontWeight="Bold"

3
Apollon.WPF/Views/OverviewView.xaml
View File

@@ -112,7 +112,8 @@
Height="40" Height="40"
Width="210" Width="210"
Margin="40" Margin="40"
Cursor="Hand"/> Cursor="Hand"
Command="{Binding EditTournamentCommand}"/>
</StackPanel> </StackPanel>
</Grid> </Grid>