Merge branch 'master' of http://gogs.ngknn.ru:3000/kot-senya/PM-02-programm-TeaTime

TeaTime/page/wWorkerMain.xaml

@@ -120,7 +120,7 @@
                         <MenuItem x:Name="btUser" Click="bUserProfile_Click" HorizontalContentAlignment="Center" HorizontalAlignment="Right" Width="205.5" Template="{DynamicResource MenuMainItem}">
                             <MenuItem.Header>
                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock x:Name="aFio" Text="Фамилия имя отчество"  VerticalAlignment="Center"/>
+                                    <TextBlock x:Name="aFio" Text="Фамилия имя отчество" HorizontalAlignment="Right" VerticalAlignment="Center"/>
                                     <Image x:Name="aImage" Width="25" Height="25" HorizontalAlignment="Right" Margin="10 0 10 0"/>
                                 </StackPanel>
                             </MenuItem.Header>

TeaTime/page/wWorkerMain.xaml.cs

@@ -30,6 +30,7 @@ namespace teaTime
         {
             InitializeComponent();
             worker = user;
+            aFio.Text = worker.surname + " " + worker.name[0] + "." + worker.middleName[0] + ".";
             loadedCalendar();
             loadedData();
             loadedColorData();

TeaTime/page/wWorkerUserPrifile.xaml

@@ -163,13 +163,13 @@
                             <Setter Property="ScrollViewer.Background" Value="#E8ECC8" />
                         </Style>
                     </Grid.Resources>
-                    <DataGrid x:Name="tInfo" CanUserAddRows="False" AutoGenerateColumns="False" CanUserSortColumns="True" Loaded="tInfo_Loaded"
+                    <DataGrid x:Name="tInfo" CanUserAddRows="False" AutoGenerateColumns="False" CanUserSortColumns="True"
                            Width="700" Height="170" Canvas.Top="510" Canvas.Left="40" ColumnHeaderHeight="25" 
                            FontFamily="{StaticResource UniNeue-Bold}" Foreground="#A77748" FontSize="15"
                            BorderBrush="#D3DB94" Background="#FAEDCD"                           
                            RowBackground="#FAEDCD" AlternatingRowBackground="#FAEDCD" VerticalGridLinesBrush="#D3DB94"  
                            HorizontalGridLinesBrush="#D3DB94"  
-                           HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Margin="42,252,58,28" SelectionChanged="tInfo_SelectionChanged"                              
+                           HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Margin="42,252,58,28"                            
                            >
                         <DataGrid.Resources>
 

TeaTime/page/wWorkerUserPrifile.xaml.cs

@@ -25,7 +25,8 @@ namespace teaTime
         public wWorkerUserPrifile(Worker user)
         {
             InitializeComponent();
-            this.worker = user;
+            worker = user;
+            aFio.Text = worker.surname + " " + worker.name[0] + "." + worker.middleName[0] + ".";
         }
 
         private void btMain_Click(object sender, RoutedEventArgs e)
@@ -38,12 +39,7 @@ namespace teaTime
             NavigationService.Navigate(new wWorkerChangeProfile(worker));
         }
 
-        private void tInfo_Loaded(object sender, RoutedEventArgs e)
-        {
-
-        }
-
-        private void tInfo_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void loadData()
         {
 
         }