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

before conected to database

Browse Source
This commit is contained in:
Natlinux81
2022-08-19 18:39:38 +02:00
parent 44e2e17c15
commit fcd1d90292
9 changed files with 108 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Apollon.WPF/Images/Scheibe.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 75 KiB

4
Apollon.WPF/MainWindow.xaml
View File

@@ -31,8 +31,8 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<custom:Modal Grid.RowSpan="2" Panel.ZIndex="1" IsOpen="{Binding IsModalOpen}"> <custom:Modal Grid.RowSpan="2" Panel.ZIndex="1" IsOpen="{Binding IsModalOpen}">
<ContentControl Margin="100 50 100 50" Content="{Binding CurrentModalViewModel}"/> <ContentControl Margin="30" Content="{Binding CurrentModalViewModel}"/>
</custom:Modal> </custom:Modal>
<views:OverviewView Grid.RowSpan="2" <views:OverviewView Grid.RowSpan="2"

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

@@ -27,18 +27,20 @@ namespace Apollon.WPF.ViewModels
{ {
_selectedTournamentStore = selectedTournamentStore; _selectedTournamentStore = selectedTournamentStore;
_selectedTournamentStore.SelectedTournamentChanged += SelectedTournamentStore_SelectedTournamentChanged; _selectedTournamentStore.SelectedTournamentChanged += SelectedTournamentStore_SelectedTournamentChanged;
} }
protected override void Dispose() protected override void Dispose()
{ {
_selectedTournamentStore.SelectedTournamentChanged -= SelectedTournamentStore_SelectedTournamentChanged; _selectedTournamentStore.SelectedTournamentChanged -= SelectedTournamentStore_SelectedTournamentChanged;
base.Dispose(); base.Dispose();
} }
private void SelectedTournamentStore_SelectedTournamentChanged() private void SelectedTournamentStore_SelectedTournamentChanged()
{ {
OnPropertyChanged(nameof(HasSelectedTournament)); //OnPropertyChanged(nameof(HasSelectedTournament));
OnPropertyChanged(nameof(Organisation)); OnPropertyChanged(nameof(Organisation));
OnPropertyChanged(nameof(TournamentName)); OnPropertyChanged(nameof(TournamentName));
OnPropertyChanged(nameof(Competition)); OnPropertyChanged(nameof(Competition));

165
Apollon.WPF/Views/Components/AddEditDetails.xaml
View File

@@ -22,86 +22,109 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="Veranstalter: " <TextBlock Text="Veranstalter: "
Style="{StaticResource ModalTextBlock}"/> Style="{StaticResource ModalTextBlock}"/>
<TextBlock Grid.Row="1" <TextBlock Grid.Row="1"
Text="Turniername: " Text="Turniername: "
Style="{StaticResource ModalTextBlock}"/> Style="{StaticResource ModalTextBlock}"/>
<TextBlock Grid.Row="2"
Text="Wettkampfart: " <TextBlock Grid.Row="2"
Style="{StaticResource ModalTextBlock}"/> Text="Wettkampfart: "
Style="{StaticResource ModalTextBlock}"/>
<TextBlock Grid.Row="3" <TextBlock Grid.Row="3"
Text="Startdatum: " Text="Startdatum: "
Style="{StaticResource ModalTextBlock}"/> Style="{StaticResource ModalTextBlock}"/>
<TextBlock Grid.Row="4" <TextBlock Grid.Row="4"
Text="Enddatum: " Text="Enddatum: "
Style="{StaticResource ModalTextBlock}"/> Style="{StaticResource ModalTextBlock}"/>
<TextBlock Grid.Row="5" <TextBlock Grid.Row="5"
Text="Veranstaltungsort: " Text="Veranstaltungsort: "
Style="{StaticResource ModalTextBlock}"/> Style="{StaticResource ModalTextBlock}"/>
<TextBlock Grid.Row="6" <TextBlock Grid.Row="6"
Text="Durchgänge: " Text="Durchgänge: "
Style="{StaticResource ModalTextBlock}"/> Style="{StaticResource ModalTextBlock}"/>
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
Text="{Binding Organisation}" Text="{Binding Organisation}"
FontFamily="Arial" FontFamily="Arial"
FontSize="16" FontSize="16"
Height="30" Height="30"
Background="LightGray" Background="LightGray"
VerticalContentAlignment="Center"/> VerticalContentAlignment="Center"/>
<TextBox Grid.Row="1" <TextBox Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Text="{Binding TournamentName, UpdateSourceTrigger=PropertyChanged}" Text="{Binding TournamentName, UpdateSourceTrigger=PropertyChanged}"
FontFamily="Arial" FontFamily="Arial"
FontSize="16" FontSize="16"
Height="30" Height="30"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Background="LightGray"/> Background="LightGray"/>
<ComboBox Grid.Row="2"
Text="{Binding Competition}"
IsEditable="True"
Grid.Column="1"
Height="30"
Width="150"
FontSize="16"
VerticalContentAlignment="Center"
HorizontalAlignment="Left"/>
<DatePicker SelectedDateFormat="Long" <ComboBox Grid.Row="2"
Grid.Row="3" x:Name="ComboBox"
SelectedDate="{Binding StartDate}" Text="{Binding Competition}"
Grid.Column="1" IsReadOnly="False"
Height="30" IsEditable="True"
FontSize="16" Grid.Column="1"
HorizontalAlignment="Left"/> Height="30"
Width="150"
FontSize="16"
VerticalContentAlignment="Center"
HorizontalAlignment="Left">
<ComboBoxItem Content="Halle"></ComboBoxItem>
<ComboBoxItem Content="im Freien"></ComboBoxItem>
<ComboBoxItem Content="Feld"></ComboBoxItem>
<ComboBoxItem Content="3 D"></ComboBoxItem>
</ComboBox>
<DatePicker SelectedDateFormat="Long" <Image x:Name="CompetitionImage"
Grid.Row="4" Grid.Row="2"
SelectedDate="{Binding EndDate}" Grid.Column="1"
Grid.Column="1" Grid.RowSpan="2"
Height="30" Height="80"
FontSize="16" Width="80"
HorizontalAlignment="Left"/> HorizontalAlignment="Right"
Margin="0 0 80 0"/>
<DatePicker SelectedDateFormat="Long"
Grid.Row="3"
SelectedDate="{Binding StartDate}"
Grid.Column="1"
Height="30"
FontSize="14"
HorizontalAlignment="Left"/>
<DatePicker SelectedDateFormat="Long"
Grid.Row="4"
SelectedDate="{Binding EndDate}"
Grid.Column="1"
Height="30"
FontSize="14"
HorizontalAlignment="Left"/>
<TextBox Grid.Row="5" <TextBox Grid.Row="5"
Grid.Column="1" Grid.Column="1"
Text="{Binding Location}" Text="{Binding Location}"
FontFamily="Arial" FontFamily="Arial"
FontSize="16" FontSize="16"
Height="30" Height="30"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Background="LightGray"/> Background="LightGray"/>
<TextBox Grid.Row="6" <TextBox Grid.Row="6"
Grid.Column="1" Grid.Column="1"
Text="{Binding Rounds}" Text="{Binding Rounds}"
FontFamily="Arial" FontFamily="Arial"
FontSize="16" FontSize="16"
Height="30" Height="30"
Width="50" Width="50"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Background="LightGray"/> Background="LightGray"/>
<Grid Grid.Row="7" <Grid Grid.Row="7"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
@@ -112,14 +135,15 @@
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Button Content="Speichern" <Button Content="Speichern"
Command="{Binding SubmitCommand}" Command="{Binding SubmitCommand}"
Style="{StaticResource ModernButton}" Style="{StaticResource ModernButton}"
Width="120" Width="120"
Height="35" Height="35"
FontSize="16" FontSize="16"
IsEnabled="{Binding CanSubmit}"> IsEnabled="{Binding CanSubmit}"/>
</Button>
<Button Content="Abbrechen" <Button Content="Abbrechen"
Command="{Binding CancelCommand}" Command="{Binding CancelCommand}"
Style="{StaticResource ModernButton}" Style="{StaticResource ModernButton}"
@@ -128,8 +152,5 @@
FontSize="16" FontSize="16"
Grid.Column="1"/> Grid.Column="1"/>
</Grid> </Grid>
</Grid> </Grid>
</UserControl> </UserControl>

5
Apollon.WPF/Views/Components/AddEditDetails.xaml.cs
View File

@@ -22,7 +22,8 @@ namespace Apollon.WPF.Views.Components
{ {
public AddEditDetails() public AddEditDetails()
{ {
InitializeComponent(); InitializeComponent();
}
}
} }
} }

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

@@ -19,7 +19,7 @@
BorderBrush="Transparent" BorderBrush="Transparent"
Padding="5" Padding="5"
ItemsSource="{Binding OverviewListingItemViewModels}" ItemsSource="{Binding OverviewListingItemViewModels}"
SelectedItem="{Binding SelectedOverviewListingItemViewModel}"> SelectedItem="{Binding SelectedOverviewListingItemViewModel}" >
<ListView.ItemContainerStyle> <ListView.ItemContainerStyle>
<Style TargetType="ListViewItem"> <Style TargetType="ListViewItem">
<Setter Property="HorizontalContentAlignment" Value="Stretch"/> <Setter Property="HorizontalContentAlignment" Value="Stretch"/>

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

@@ -23,6 +23,6 @@ namespace Apollon.WPF.Views.Components
public OverViewListing() public OverViewListing()
{ {
InitializeComponent(); InitializeComponent();
} }
} }
} }

7
Apollon.WPF/Views/Components/OverviewDetails.xaml
View File

@@ -31,8 +31,7 @@
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</TextBlock.Style> </TextBlock.Style>
</TextBlock> </TextBlock>
<StackPanel> <StackPanel>
<TextBlock Text="{Binding TournamentName}" <TextBlock Text="{Binding TournamentName}"
TextAlignment="Center" TextAlignment="Center"
@@ -66,8 +65,8 @@
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding HasSelectedTournament}" Value="True"> <DataTrigger Binding="{Binding HasSelectedTournament}" Value="True">
<Setter Property="Visibility" Value="Visible"/> <Setter Property="Visibility" Value="Visible"/>
</DataTrigger> </DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</TextBlock.Style> </TextBlock.Style>
</TextBlock> </TextBlock>

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

@@ -57,7 +57,7 @@
</StackPanel> </StackPanel>
<StackPanel Grid.Row="2" <StackPanel Grid.Row="2"
VerticalAlignment="Center"> VerticalAlignment="Stretch">
<Image Grid.Column="2" <Image Grid.Column="2"
Grid.Row="2" Grid.Row="2"