Enhance Date and DateTime of Matches.

stefanDeveloper · Jun 13, 2017 · 74b1098 · 74b1098
1 parent 2fa3e6c
commit 74b1098
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 36 deletions.
diff --git a/LigaManagerBettorClient/Controllers/MenuWindowController.cs b/LigaManagerBettorClient/Controllers/MenuWindowController.cs
@@ -21,6 +21,7 @@ public void Initialize()
             _view = new MenuWindow();
             _bettorClient = new BettorClientServiceClient();
             var seasons = _bettorClient.GetSeasons();
+
             _viewModel = new MenuWindowViewModel
             {
                 Bettor = Bettor,

diff --git a/LigaManagerBettorClient/Views/BettorRankingWindow.xaml b/LigaManagerBettorClient/Views/BettorRankingWindow.xaml
@@ -2,22 +2,21 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:LigaManagerBettorClient.Views"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       mc:Ignorable="d" 
       d:DesignHeight="800" d:DesignWidth="1200"
       Title="BettorRankingWindow">
 
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition/>
+            <RowDefinition Height="2*"/>
             <RowDefinition Height="8*"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        <Label Content="Tipper Rangliste" FontSize="38" FontWeight="Bold" HorizontalAlignment="Left" Grid.Row="0" Margin="10,10,0,0" VerticalAlignment="Top" Height="60" Width="310"/>
+        <Label Content="Tipper Rangliste" FontSize="38" FontWeight="Bold" HorizontalAlignment="Left" Grid.Row="0" Margin="10,40,0,0" VerticalAlignment="Top" Height="75" Width="310"/>
         <DataGrid ItemsSource="{Binding Bettors}" 
-                  CanUserReorderColumns="True" CanUserResizeColumns="True" AutoGenerateColumns="False"
-                  CanUserResizeRows="False" CanUserSortColumns="True" Grid.Row="1">
+                  CanUserReorderColumns="True" CanUserResizeColumns="True"  AutoGenerateColumns="False"
+                  CanUserResizeRows="False" IsReadOnly="True" CanUserSortColumns="True" CanUserAddRows="false" CanUserDeleteRows="False" Grid.Row="1">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Platzierung" Binding="{Binding Place}" />
                 <DataGridTextColumn Header="Nickname" Binding="{Binding Bettor.Nickname}" />
@@ -26,8 +25,8 @@
                 <DataGridTextColumn Header="Punkte" Binding="{Binding Score}" />
             </DataGrid.Columns>
         </DataGrid>
-        <ComboBox ItemsSource="{Binding MatchDays}"  SelectedItem="{Binding SelectedMatchDay}" x:Name="MatchDayComboBox" Grid.Row="0" HorizontalAlignment="Left" Margin="1025,38,0,0" VerticalAlignment="Top" Width="165" Height="26"/>
-        <Label Grid.Row="0" Content="Spieltag" HorizontalAlignment="Left" Margin="970,38,0,0" VerticalAlignment="Top" Width="85"/>
-        <Button Command="{Binding BackCommand}" Content="Zurück" HorizontalAlignment="Left" Margin="10,47,0,0" Grid.Row="2" VerticalAlignment="Top" Width="80"/>
+        <ComboBox ItemsSource="{Binding MatchDays}"  SelectedItem="{Binding SelectedMatchDay}" x:Name="MatchDayComboBox" Grid.Row="0" HorizontalAlignment="Left" Margin="1025,63,0,0" VerticalAlignment="Top" Width="165" Height="26"/>
+        <Label Grid.Row="0" Content="Spieltag" HorizontalAlignment="Left" Margin="970,63,0,0" VerticalAlignment="Top" Width="85"/>
+        <Button Command="{Binding BackCommand}" Content="Zurück" HorizontalAlignment="Left" Margin="10,40,0,0" Grid.Row="2" VerticalAlignment="Top" Width="80"/>
     </Grid>
 </Page>
diff --git a/LigaManagerBettorClient/Views/DetailMatchWindow.xaml b/LigaManagerBettorClient/Views/DetailMatchWindow.xaml
@@ -8,28 +8,28 @@
         Title="DetailMatchWindow" Height="600" Width="600" ResizeMode="NoResize">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="80*"/>
-            <RowDefinition Height="80*"/>
-            <RowDefinition Height="80*"/>
-            <RowDefinition Height="80*"/>
+            <RowDefinition Height="120*"/>
+            <RowDefinition Height="65*"/>
+            <RowDefinition Height="55*"/>
+            <RowDefinition Height="81*"/>
             <RowDefinition Height="160*"/>
             <RowDefinition Height="90*"/>
         </Grid.RowDefinitions>
         <Label Content="Spiel" FontSize="24" HorizontalAlignment="Left" Margin="10,25,0,0" VerticalAlignment="Top" Height="45" Width="70"/>
-        <TextBlock Grid.Row="0" FontWeight="Bold" HorizontalAlignment="Left" FontSize="24" Margin="85,30,0,0" TextWrapping="Wrap" Text="{Binding Match.HomeTeam.Name}" VerticalAlignment="Top" Height="45" Width="225"/>
+        <TextBlock Grid.Row="0" FontWeight="Bold" HorizontalAlignment="Left" FontSize="24" Margin="85,30,0,0" TextWrapping="Wrap" Text="{Binding Match.HomeTeam.Name}" VerticalAlignment="Top" Height="90" Width="225"/>
         <Label Grid.Row="0" VerticalContentAlignment="Center" Content=":" FontSize="24" HorizontalAlignment="Left" Margin="312,24,0,0" VerticalAlignment="Top" Height="45" Width="16"/>
-        <TextBlock Grid.Row="0" FontWeight="Bold" HorizontalAlignment="Left" FontSize="24" Margin="330,30,0,0" TextWrapping="Wrap" Text="{Binding Match.AwayTeam.Name}" VerticalAlignment="Top" Height="45" Width="252"/>
-        <Label Content="Am" FontSize="18" HorizontalAlignment="Left" Margin="20,20,0,0" Grid.Row="1" VerticalAlignment="Top"/>
-        <TextBlock HorizontalAlignment="Left" FontSize="18" Margin="85,25,0,0" Grid.Row="1" TextWrapping="Wrap" Text="{Binding Match.DateTime, StringFormat=dd.MM.yyyy HH:mm}" VerticalAlignment="Top" Width="235"/>
+        <TextBlock Grid.Row="0" FontWeight="Bold" HorizontalAlignment="Left" FontSize="24" Margin="330,30,0,0" TextWrapping="Wrap" Text="{Binding Match.AwayTeam.Name}" VerticalAlignment="Top" Height="90" Width="252"/>
+        <Label Content="Am" FontSize="18" HorizontalAlignment="Left" Margin="20,20,0,0" Grid.Row="1" VerticalAlignment="Top" Height="34" Width="37"/>
+        <TextBlock HorizontalAlignment="Left" FontSize="18" Margin="85,25,0,0" Grid.Row="1" TextWrapping="Wrap" Text="{Binding Match.DateTime, StringFormat=dd.MM.yyyy HH:mm}" VerticalAlignment="Top" Width="235" Height="24"/>
         <Button x:Name="BetButton" Command="{Binding BetCommand}" Content="Tipp abgeben" HorizontalAlignment="Left" Margin="10,20,0,0" Grid.Row="5" VerticalAlignment="Top" Width="175" Height="50"/>
         <Button Content="Abbrechen" Command="{Binding CancelCommand}" HorizontalAlignment="Right" Margin="0,20,10,0" Grid.Row="5" VerticalAlignment="Top" Width="175" Height="50"/>
         <Label Content="Tipp" FontSize="24" HorizontalAlignment="Left" Margin="10,25,0,0" VerticalAlignment="Top" Height="45" Width="70" Grid.Row="3"/>
-        <Label Content="Ergebnis" FontSize="18" HorizontalAlignment="Left" Margin="20,25,0,0" Grid.Row="2" VerticalAlignment="Top"/>
+        <Label Content="Ergebnis" FontSize="18" HorizontalAlignment="Left" Margin="20,25,0,0" Grid.Row="2" VerticalAlignment="Top" Height="34" Width="78" Grid.RowSpan="2"/>
         <TextBlock PreviewTextInput="NumberValidationTextBox" FontWeight="Bold" TextAlignment="Center" HorizontalAlignment="Left" FontSize="18" Text="{Binding Match.HomeTeamScore}" Height="23" Margin="85,30,0,0" Grid.Row="2" TextWrapping="Wrap" VerticalAlignment="Top" Width="120"/>
         <TextBlock PreviewTextInput="NumberValidationTextBox"  FontWeight="Bold" TextAlignment="Center" HorizontalAlignment="Left" FontSize="18" Text="{Binding Match.AwayTeamScore}" Height="23" Margin="330,29,0,0" Grid.Row="2" TextWrapping="Wrap" VerticalAlignment="Top" Width="120"/>
         <TextBox x:Name="HomeTeamBet" Text="{Binding Bet.HomeTeamScore}" TextAlignment="Center" HorizontalAlignment="Left"  Height="23" Margin="85,53,0,0" Grid.Row="4" TextWrapping="Wrap" VerticalAlignment="Top" Width="120"/>
         <TextBox x:Name="AwayTeamBet" Text="{Binding Bet.AwayTeamScore}" TextAlignment="Center" HorizontalAlignment="Left" Height="23" Margin="330,53,0,0" Grid.Row="4" TextWrapping="Wrap" VerticalAlignment="Top" Width="120"/>
-        <Label Content="Geändert am " HorizontalAlignment="Left" Margin="0,134,0,0" Grid.Row="4" VerticalAlignment="Top"/>
-        <TextBlock HorizontalAlignment="Left" Margin="75,139,0,0" Grid.Row="4" TextWrapping="Wrap" Text="{Binding Bet.DateTime, StringFormat=dd.MM.yyyy HH:mm}" VerticalAlignment="Top"/>
+        <Label Content="Geändert am " HorizontalAlignment="Left" Margin="0,134,0,0" Grid.Row="4" VerticalAlignment="Top" Height="26" Width="82"/>
+        <TextBlock HorizontalAlignment="Left" Margin="75,139,0,0" Grid.Row="4" TextWrapping="Wrap" Text="{Binding Bet.DateTime, StringFormat=dd.MM.yyyy HH:mm}" VerticalAlignment="Top" Height="16" Width="0"/>
     </Grid>
 </Window>
diff --git a/LigaManagerBettorClient/Views/LoginWindow.xaml b/LigaManagerBettorClient/Views/LoginWindow.xaml
@@ -2,28 +2,26 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:LigaManagerBettorClient.Views"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       mc:Ignorable="d" 
       d:DesignHeight="300" d:DesignWidth="300"
-      Title="IsValidNicknameWindow">
+      Title="Login">
 
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="77*"/>
             <RowDefinition Height="48*"/>
-            <RowDefinition Height="49*"/>
-            <RowDefinition Height="86*"/>
-            <RowDefinition Height="40*"/>
+            <RowDefinition Height="85*"/>
+            <RowDefinition Height="70*"/>
+            <RowDefinition Height="20*"/>
         </Grid.RowDefinitions>
-
-
         <Grid HorizontalAlignment="Left" VerticalAlignment="Top" Height="0" Width="0"/>
-        <Button Content="Anmelden" Command="{Binding SignInCommand}" HorizontalAlignment="Left" Margin="160,10,0,0" VerticalAlignment="Top" Width="130" Grid.Row="3" Height="29"/>
-        <TextBox x:Name="LoginTextBox" TextAlignment="Left" HorizontalAlignment="Left" FontSize="14" Height="29" Margin="10,10,0,0" TextWrapping="Wrap" Text="{Binding Nickname}" VerticalAlignment="Top" Width="280" Grid.Row="2"/>
+        <Button Content="Anmelden" Command="{Binding SignInCommand}" HorizontalAlignment="Left" Margin="160,25,0,0" VerticalAlignment="Top" Width="130" Grid.Row="3" Height="29"/>
+        <TextBox x:Name="LoginTextBox" TextAlignment="Left" HorizontalAlignment="Left" FontSize="18" Height="29" Margin="10,45,0,0" TextWrapping="Wrap" Text="{Binding Nickname}" VerticalAlignment="Top" Width="280" Grid.Row="2"/>
         <TextBlock Grid.Row="0" FontWeight="Bold"  HorizontalAlignment="Left" FontSize="24" Margin="10,30,0,0" TextWrapping="Wrap" Text="Liga Manager" VerticalAlignment="Top" Height="37" Width="280"/>
         <TextBlock HorizontalAlignment="Left" FontSize="18" Margin="10,10,0,0" TextWrapping="Wrap" Text="Login" VerticalAlignment="Top" Height="32" Width="136" Grid.Row="1"/>
-        <Button Content="Beenden" Command="{Binding CloseCommand}" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="130" Grid.Row="3" Height="29"/>
+        <Button Content="Beenden" Command="{Binding CloseCommand}" HorizontalAlignment="Left" Margin="10,25,0,0" VerticalAlignment="Top" Width="130" Grid.Row="3" Height="29"/>
+        <Label Content="Nickanme" HorizontalAlignment="Left" Margin="5,19,0,0" Grid.Row="2" VerticalAlignment="Top" Width="130" Height="26"/>
 
     </Grid>
 </Page>
diff --git a/LigaManagerBettorClient/Views/MatchesWindow.xaml b/LigaManagerBettorClient/Views/MatchesWindow.xaml
@@ -25,6 +25,7 @@
                     Command="{Binding SelectedMatchCommand}"/>
             </DataGrid.InputBindings>
             <DataGrid.Columns>
+                <DataGridTextColumn Header="Datum" Binding="{Binding DateTime, StringFormat=dd.MM.yyyy}" />
                 <DataGridTextColumn Header="Uhrzeit" Binding="{Binding DateTime, StringFormat=HH:mm}" />
                 <DataGridTextColumn Header="Heim" Binding="{Binding HomeTeam.Name}" />
                 <DataGridTextColumn Header="Auswärts" Binding="{Binding AwayTeam.Name}" />
@@ -50,8 +51,6 @@
                                                 <StackPanel Orientation="Horizontal">
                                                     <TextBlock Text="Spieltag: "/>
                                                     <TextBlock Text="{Binding Path=Name}"/>
-                                                    <TextBlock Text="Datum: "/>
-                                                    <TextBlock Text="{Binding Path=DateTime, StringFormat=dd.MM.yyyy}"/>
                                                 </StackPanel>
                                             </Expander.Header>
                                             <ItemsPresenter />

diff --git a/LigaManagerBettorClient/Views/MenuWindow.xaml b/LigaManagerBettorClient/Views/MenuWindow.xaml
@@ -21,16 +21,17 @@
             <RowDefinition/>
             <RowDefinition Height="3*"/>
         </Grid.RowDefinitions>
-        <ComboBox ItemsSource="{Binding Seasons}" SelectedValue="{Binding SelectedSeason}" DisplayMemberPath="Name" SelectedValuePath="Name" HorizontalAlignment="Left" Margin="190,30,0,0" VerticalAlignment="Top" Width="120" Grid.Row="1" Grid.Column="2" Height="22" />
+        <ComboBox ItemsSource="{Binding Seasons}" SelectedValue="{Binding SelectedSeason.Name}" DisplayMemberPath="Name" SelectedValuePath="Name" HorizontalAlignment="Left" Margin="60,30,0,0" VerticalAlignment="Top" Width="250" Grid.Row="1" Grid.Column="2" Height="26" />
         <TextBlock Grid.Row="0" Grid.Column="0" FontWeight="Bold"  HorizontalAlignment="Left" FontSize="38" Margin="10,40,0,0" TextWrapping="Wrap" Text="Liga Manager" VerticalAlignment="Top" Height="70" Width="420" Grid.ColumnSpan="2"/>
         <Button Command="{Binding MatchesCommand}" Content="Zur Spielübersicht" HorizontalAlignment="Left" Margin="30,20,0,0" Grid.Row="2" Grid.Column="0"
                 VerticalAlignment="Top" Width="125" Height="50"/>
         <Button Command="{Binding BettorRankingCommand}" Content="Zur Rangliste" HorizontalAlignment="Left" Margin="30,20,0,0" Grid.Row="3" Grid.Column="0"
                 VerticalAlignment="Top" Width="125" Height="50"/>
         <Button Command="{Binding TeamsCommand}" Content="Zur Teamübersicht" HorizontalAlignment="Left" Margin="30,20,0,0" Grid.Row="4" Grid.Column="0"
                 VerticalAlignment="Top" Width="125" Height="50"/>
-        <Label Grid.Row="0" Grid.Column="0" Content="Herzlich Willkommen " HorizontalAlignment="Left" Margin="10,110,0,0" VerticalAlignment="Top" Height="30" Width="130"/>
-        <Label Grid.Row="0" Grid.Column="0" Content="{Binding Bettor.Firstname}" HorizontalAlignment="Left" Margin="130,110,0,0" VerticalAlignment="Top" Height="30" Width="105"/>
+        <Label Grid.Row="0" FontWeight="Bold" Grid.Column="0" Content="Herzlich Willkommen " HorizontalAlignment="Left" Margin="10,110,0,0" VerticalAlignment="Top" Height="30" Width="130"/>
+        <Label Grid.Row="0" FontWeight="Bold" Grid.Column="0" Content="{Binding Bettor.Firstname}" HorizontalAlignment="Left" Margin="135,110,0,0" VerticalAlignment="Top" Height="30" Width="105"/>
+        <Label Content="Saison" FontWeight="Bold" Grid.Column="2" HorizontalAlignment="Left" Margin="5,30,0,0" Grid.Row="1" VerticalAlignment="Top" Width="50"/>
 
     </Grid>
 </Page>