mr.solder5 hace 5 años
padre
commit
ca39513495
Se han modificado 2 ficheros con 22 adiciones y 15 borrados
  1. 3 9
      CopyCenter/OrdersWindow.xaml
  2. 19 6
      CopyCenter/OrdersWindow.xaml.cs

+ 3 - 9
CopyCenter/OrdersWindow.xaml

@@ -31,20 +31,14 @@
         <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="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>
 
-
-
     </Grid>
 </Window>

+ 19 - 6
CopyCenter/OrdersWindow.xaml.cs

@@ -28,6 +28,18 @@ namespace CopyCenter
             comboBox1.ItemsSource = db.Services.ToList();
             comboBox1.DisplayMemberPath = "NameService";
             comboBox1.SelectedValuePath = "idService";
+
+            comboBox2.ItemsSource = db.Clients.ToList();
+            comboBox2.DisplayMemberPath = "NameClient";
+            comboBox2.SelectedValuePath = "idClient";
+
+            comboBox4.ItemsSource = db.Users.ToList();
+            comboBox4.DisplayMemberPath = "Login";
+            comboBox4.SelectedValuePath = "idUser";
+
+            comboBox3.ItemsSource = db.Payments.ToList();
+            comboBox3.DisplayMemberPath = "NumberPayment";
+            comboBox3.SelectedValuePath = "idPayment";
         } 
     
         private void Exit_Click(object sender, RoutedEventArgs e)
@@ -44,10 +56,10 @@ namespace CopyCenter
             order.ViewOrder = View.Text;
             order.OrderDate = Convert.ToDateTime(Date.Text);
             order.CostOrder = Convert.ToInt32(Price.Text);
-            order.idClient = Convert.ToInt32(idClient.Text);
+            order.idClient = Convert.ToInt32(comboBox2.SelectedValue.ToString());
             order.idService = Convert.ToInt32(comboBox1.SelectedValue.ToString());
-            order.idUser = Convert.ToInt32(idUser.Text);
-            order.idPayment = Convert.ToInt32(idPayment.Text);
+            order.idUser = Convert.ToInt32(comboBox4.SelectedValue.ToString());
+            order.idPayment = Convert.ToInt32(comboBox3.SelectedValue.ToString());
             db.Orders.Add(order);
             db.SaveChanges();
             OrdersList.ItemsSource = db.Orders.ToList();
@@ -73,9 +85,10 @@ namespace CopyCenter
             uRow.ViewOrder = View.Text;
             uRow.OrderDate = Convert.ToDateTime(Date.Text);
             uRow.CostOrder = Convert.ToInt32(Price.Text);
-            uRow.idClient = Convert.ToInt32(idClient.Text);
-            uRow.idUser = Convert.ToInt32(idUser.Text);
-            uRow.idPayment = Convert.ToInt32(idPayment.Text);
+            uRow.idClient = Convert.ToInt32(comboBox2.SelectedValue.ToString());
+            uRow.idService = Convert.ToInt32(comboBox1.SelectedValue.ToString());
+            uRow.idUser = Convert.ToInt32(comboBox4.SelectedValue.ToString());
+            uRow.idPayment = Convert.ToInt32(comboBox3.SelectedValue.ToString());
             db.SaveChanges();
             OrdersList.ItemsSource = db.Orders.ToList();
         }