wfe

CopyCenter/ClientsWindow.xaml

@@ -7,7 +7,7 @@
         mc:Ignorable="d"
         Title="Клиенты" Height="450" Width="800" WindowStartupLocation="CenterScreen">
     <Grid>
-        <DataGrid Name="ClientsList" AutoGenerateColumns="False">
+        <DataGrid Name="ClientsList" AutoGenerateColumns="False" Margin="0,0,361,152">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Наименование" Binding="{Binding NameClient}"></DataGridTextColumn>
                 <DataGridTextColumn Header="Тип клиента" Binding="{Binding TypeClient}"></DataGridTextColumn>
@@ -21,8 +21,10 @@
         <Button Content="Добавить" HorizontalAlignment="Left" Margin="385,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Add" Foreground="White"/>
         <Button Content="Удалить" HorizontalAlignment="Left" Margin="503,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Delete" Foreground="White"/>
         <Button Content="Обновить" HorizontalAlignment="Left" Margin="622,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Update" Foreground="White"/>
-        <TextBox Name="Name" HorizontalAlignment="Left" Height="40" Margin="385,324,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
-        <TextBox Name="TypeClient" HorizontalAlignment="Left" Height="40" Margin="503,324,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
+        <TextBox Name="Name" HorizontalAlignment="Left" Height="31" Margin="599,77,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="149"/>
+        <TextBox Name="TypeClient" HorizontalAlignment="Left" Height="34" Margin="599,124,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="149"/>
+        <TextBlock HorizontalAlignment="Left" Margin="483,77,0,0" TextWrapping="Wrap" Text="Наименование" VerticalAlignment="Top" Height="31" Width="94"/>
+        <ComboBox HorizontalAlignment="Left" Margin="462,124,0,0" VerticalAlignment="Top" Width="115" Height="34"/>
 
 
 

CopyCenter/OrdersWindow.xaml

@@ -7,7 +7,7 @@
         mc:Ignorable="d"
         Title="Заказы" Height="450" Width="800" WindowStartupLocation="CenterScreen">
     <Grid>
-        <DataGrid Name="OrdersList" AutoGenerateColumns="False">
+        <DataGrid Name="OrdersList" AutoGenerateColumns="False" Margin="0,0,0,194">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Номер" Binding="{Binding NumberOrder}"></DataGridTextColumn>
                 <DataGridTextColumn Header="Вид" Binding="{Binding ViewOrder}"></DataGridTextColumn>
@@ -17,7 +17,6 @@
                 <DataGridTextColumn Header="Номер услуги" Binding="{Binding idService}"></DataGridTextColumn>
                 <DataGridTextColumn Header="Номер пользователя" Binding="{Binding idUser}"></DataGridTextColumn>
                 <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">
@@ -25,17 +24,25 @@
                 <ImageBrush ImageSource="edit_redo.png"/>
             </Button.Background>
         </Button>
-        <Button Content="Добавить" HorizontalAlignment="Left" Margin="385,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Add" Foreground="White"/>
-        <Button Content="Удалить" HorizontalAlignment="Left" Margin="503,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Delete" Foreground="White"/>
-        <Button Content="Обновить" HorizontalAlignment="Left" Margin="622,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Update" Foreground="White"/>
-        <TextBox Name="Number" HorizontalAlignment="Left" Height="40" Margin="267,269,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
-        <TextBox Name="View" HorizontalAlignment="Left" Height="40" Margin="385,269,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
-        <TextBox Name="Date" HorizontalAlignment="Left" Height="40" Margin="503,269,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
-        <TextBox Name="Price" HorizontalAlignment="Left" Height="40" Margin="622,269,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
-        <TextBox Name="idClient" HorizontalAlignment="Left" Height="40" Margin="267,314,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
-        <TextBox Name="idService" HorizontalAlignment="Left" Height="40" Margin="385,314,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
-        <TextBox Name="idUser" HorizontalAlignment="Left" Height="40" Margin="503,314,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
-        <TextBox Name="idPayment" HorizontalAlignment="Left" Height="40" Margin="622,314,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
+        <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"/>
+        <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"/>
+        <TextBox Name="Price" HorizontalAlignment="Left" Height="31" Margin="116,359,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="146"/>
+        <TextBox Name="idClient" HorizontalAlignment="Left" Height="31" Margin="398,251,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="146"/>
+        <!--<TextBox Name="idService" HorizontalAlignment="Left" Height="31" Margin="398,287,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="146"/>-->
+        <TextBox Name="idUser" HorizontalAlignment="Left" Height="29" Margin="398,325,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="146"/>
+        <TextBox Name="idPayment" HorizontalAlignment="Left" Height="31" Margin="398,359,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="146"/>
+        <TextBlock HorizontalAlignment="Left" Margin="10,251,0,0" TextWrapping="Wrap" Text="Номер" VerticalAlignment="Top" Height="31" Width="94"/>
+        <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 HorizontalAlignment="Left" Margin="278,251,0,0" VerticalAlignment="Top" Width="115" Height="31"/>
+        <ComboBox HorizontalAlignment="Left" Margin="278,359,0,0" VerticalAlignment="Top" Width="115" Height="31"/>
+        <ComboBox 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>
 
 
 

CopyCenter/OrdersWindow.xaml.cs

@@ -20,12 +20,16 @@ namespace CopyCenter
     public partial class OrdersWindow : Window
     {
         gr672_liiEntities db;
+
         public OrdersWindow()
         {
             InitializeComponent();
             db = new gr672_liiEntities();
-        }
-
+            comboBox1.ItemsSource = db.Services.ToList();
+            comboBox1.DisplayMemberPath = "NameService";
+            comboBox1.SelectedValuePath = "idService";
+        } 
+    
         private void Exit_Click(object sender, RoutedEventArgs e)
         {
             MenuWindow mw = new MenuWindow();
@@ -41,12 +45,13 @@ namespace CopyCenter
             order.OrderDate = Convert.ToDateTime(Date.Text);
             order.CostOrder = Convert.ToInt32(Price.Text);
             order.idClient = Convert.ToInt32(idClient.Text);
-            order.idService = Convert.ToInt32(idService.Text);
+            order.idService = Convert.ToInt32(comboBox1.SelectedValue.ToString());
             order.idUser = Convert.ToInt32(idUser.Text);
             order.idPayment = Convert.ToInt32(idPayment.Text);
             db.Orders.Add(order);
             db.SaveChanges();
             OrdersList.ItemsSource = db.Orders.ToList();
+
         }
 
         private void Delete(object sender, RoutedEventArgs e)
@@ -69,11 +74,11 @@ namespace CopyCenter
             uRow.OrderDate = Convert.ToDateTime(Date.Text);
             uRow.CostOrder = Convert.ToInt32(Price.Text);
             uRow.idClient = Convert.ToInt32(idClient.Text);
-            uRow.idService = Convert.ToInt32(idService.Text);
             uRow.idUser = Convert.ToInt32(idUser.Text);
             uRow.idPayment = Convert.ToInt32(idPayment.Text);
             db.SaveChanges();
             OrdersList.ItemsSource = db.Orders.ToList();
         }
+
     }
 }

CopyCenter/ServicesWindow.xaml

@@ -7,7 +7,7 @@
         mc:Ignorable="d"
         Title="Услуги" Height="450" Width="800" WindowStartupLocation="CenterScreen" Loaded="Window_Loaded">
     <Grid>
-        <DataGrid Name="ServicesList" AutoGenerateColumns="False">
+        <DataGrid Name="ServicesList" AutoGenerateColumns="False" Margin="0,0,465,262">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Наименование" Binding="{Binding NameService}"></DataGridTextColumn>
                 <DataGridTextColumn Header="Стоимость" Binding="{Binding PriceService}"></DataGridTextColumn>
@@ -26,7 +26,8 @@
         <TextBox Name="Name" HorizontalAlignment="Left" Height="40" Margin="385,324,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
         <TextBox Name="Price" HorizontalAlignment="Left" Height="40" Margin="503,324,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
         <TextBox Name="Description" HorizontalAlignment="Left" Height="40" Margin="622,325,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
-        <TextBox Name="idCategory" HorizontalAlignment="Left" Height="40" Margin="669,269,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
+        <TextBox Name="idCategory" HorizontalAlignment="Left" Height="40" Margin="576,39,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
+        <TextBlock HorizontalAlignment="Left" Margin="437,39,0,0" TextWrapping="Wrap" Text="Наименование" VerticalAlignment="Top" Height="40" Width="101"/>
 
     </Grid>
 </Window>