ауцацау

CopyCenter/App.xaml

@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:CopyCenter"
-             StartupUri="AuthorizationWindow.xaml">
+             StartupUri="MenuWindow.xaml">
     <Application.Resources>
         <ResourceDictionary Source="Style.xaml"/>
     </Application.Resources>

CopyCenter/ClientsWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:CopyCenter"
         mc:Ignorable="d"
-        Title="Клиенты" Height="450" Width="800" WindowStartupLocation="CenterScreen">
+        Title="Клиенты" Height="450" Width="800" WindowStartupLocation="CenterScreen" Loaded="Window_Loaded">
     <Grid>
         <DataGrid Name="ClientsList" AutoGenerateColumns="False" Margin="0,0,361,152">
             <DataGrid.Columns>

CopyCenter/ClientsWindow.xaml.cs

@@ -61,5 +61,11 @@ namespace CopyCenter
             db.SaveChanges();
             ClientsList.ItemsSource = db.Clients.ToList();
         }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            db = new gr672_liiEntities();
+            ClientsList.ItemsSource = db.Clients.ToList();
+        }
     }
 }

CopyCenter/CopyCenter.csproj

@@ -199,6 +199,7 @@
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="orig.png" />
     <Resource Include="edit_redo.png" />
     <Resource Include="logging-out-2355227_1280.png" />
     <Resource Include="i39C1W5IB.jpg" />

CopyCenter/OrdersWindow.xaml

@@ -7,7 +7,7 @@
         mc:Ignorable="d"
         Title="Заказы" Height="450" Width="800" WindowStartupLocation="CenterScreen" Loaded="Window_Loaded">
     <Grid>
-        <DataGrid Name="OrdersList" AutoGenerateColumns="False" Margin="0,0,0,194">
+        <DataGrid Name="OrdersList" AutoGenerateColumns="False" Margin="0,0,0,189">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Номер" Binding="{Binding NumberOrder}"></DataGridTextColumn>
                 <DataGridTextColumn Header="Вид" Binding="{Binding ViewOrder}"></DataGridTextColumn>
@@ -19,14 +19,9 @@
                 <DataGridTextColumn Header="Номер оплаты" Binding="{Binding idPayment}"></DataGridTextColumn>
             </DataGrid.Columns>
         </DataGrid>
-        <Button Content="" HorizontalAlignment="Right" Margin="1,369,10,0" VerticalAlignment="Top" Width="45" Click="Exit_Click" Height="40">
-            <Button.Background>
-                <ImageBrush ImageSource="edit_redo.png"/>
-            </Button.Background>
-        </Button>
-        <Button Content="Добавить" HorizontalAlignment="Left" Margin="622,242,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Add" Foreground="White"/>
-        <Button Content="Удалить" HorizontalAlignment="Left" Margin="622,350,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Delete" Foreground="White"/>
-        <Button Content="Обновить" HorizontalAlignment="Left" Margin="622,293,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Update" Foreground="White"/>
+        <Button Content="Добавить" HorizontalAlignment="Left" Margin="568,316,0,0" VerticalAlignment="Top" Width="100" Height="44" Click="Add" Foreground="White"/>
+        <Button Content="Удалить" HorizontalAlignment="Left" Margin="673,316,0,0" VerticalAlignment="Top" Width="100" Height="44" Click="Delete" Foreground="White"/>
+        <Button Content="Обновить" HorizontalAlignment="Left" Margin="621,360,0,0" VerticalAlignment="Top" Width="100" Height="44" Click="Update" Foreground="White" RenderTransformOrigin="0.46,1.114"/>
         <TextBox Name="Number" HorizontalAlignment="Left" Height="31" Margin="116,251,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="146"/>
         <TextBox Name="View" HorizontalAlignment="Left" Height="31" Margin="116,287,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="146"/>
         <TextBox Name="Date" HorizontalAlignment="Left" Height="31" Margin="116,323,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="146"/>
@@ -35,10 +30,19 @@
         <TextBlock HorizontalAlignment="Left" Margin="10,287,0,0" TextWrapping="Wrap" Text="Вид" VerticalAlignment="Top" Height="31" Width="94"/>
         <TextBlock HorizontalAlignment="Left" Margin="10,323,0,0" TextWrapping="Wrap" Text="Дата" VerticalAlignment="Top" Height="31" Width="94"/>
         <TextBlock HorizontalAlignment="Left" Margin="10,359,0,0" TextWrapping="Wrap" Text="Стоимость" VerticalAlignment="Top" Height="31" Width="94"/>
-        <ComboBox x:Name="comboBox2" HorizontalAlignment="Left" Margin="278,251,0,0" VerticalAlignment="Top" Width="115" Height="31"/>
-        <ComboBox x:Name="comboBox3" HorizontalAlignment="Left" Margin="278,359,0,0" VerticalAlignment="Top" Width="115" Height="31"/>
-        <ComboBox x:Name="comboBox4" HorizontalAlignment="Left" Margin="278,325,0,0" VerticalAlignment="Top" Width="115" Height="29"/>
-        <ComboBox x:Name="comboBox1" HorizontalAlignment="Left" Margin="278,287,0,0" VerticalAlignment="Top" Width="115" Height="31"></ComboBox>
-
+        <ComboBox x:Name="comboBox2" HorizontalAlignment="Left" Margin="398,248,0,0" VerticalAlignment="Top" Width="146" Height="31"/>
+        <ComboBox x:Name="comboBox3" HorizontalAlignment="Left" Margin="398,359,0,0" VerticalAlignment="Top" Width="146" Height="31"/>
+        <ComboBox x:Name="comboBox4" HorizontalAlignment="Left" Margin="398,325,0,0" VerticalAlignment="Top" Width="146" Height="29"/>
+        <ComboBox x:Name="comboBox1" HorizontalAlignment="Left" Margin="398,287,0,0" VerticalAlignment="Top" Width="146" Height="31"></ComboBox>
+        <TextBlock HorizontalAlignment="Left" Margin="278,251,0,0" TextWrapping="Wrap" Text="Клиент" VerticalAlignment="Top" Height="31" Width="94"/>
+        <TextBlock HorizontalAlignment="Left" Margin="278,359,0,0" TextWrapping="Wrap" Text="Пользователь" VerticalAlignment="Top" Height="31" Width="94"/>
+        <TextBlock HorizontalAlignment="Left" Margin="278,325,0,0" TextWrapping="Wrap" Text="Услуга" VerticalAlignment="Top" Height="31" Width="94"/>
+        <TextBlock HorizontalAlignment="Left" Margin="278,287,0,0" TextWrapping="Wrap" Text="Оплата" VerticalAlignment="Top" Height="31" Width="94"/>
+        <TextBox HorizontalAlignment="Left" Height="45" Margin="568,251,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="153"/>
+        <Button HorizontalAlignment="Left" Margin="726,251,0,0" VerticalAlignment="Top" Width="45" Height="44">
+            <StackPanel>
+                <Image Source ="orig.png" Height="46" Width="69"/>
+            </StackPanel>
+        </Button>
     </Grid>
 </Window>