mr.solder5 před 5 roky
rodič
revize
9fe69e43c6

+ 1 - 1
CopyCenter/ClientsWindow.xaml

@@ -24,7 +24,7 @@
         <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"/>
+        <ComboBox x:Name="comboBox1" HorizontalAlignment="Left" Margin="462,124,0,0" VerticalAlignment="Top" Width="115" Height="34"/>
 
 
 

+ 1 - 1
CopyCenter/OrdersWindow.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="OrdersList" AutoGenerateColumns="False" Margin="0,0,0,194">
             <DataGrid.Columns>

+ 6 - 0
CopyCenter/OrdersWindow.xaml.cs

@@ -93,5 +93,11 @@ namespace CopyCenter
             OrdersList.ItemsSource = db.Orders.ToList();
         }
 
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            db = new gr672_liiEntities();
+            OrdersList.ItemsSource = db.Orders.ToList();
+        }
+
     }
 }

+ 8 - 5
CopyCenter/ServicesWindow.xaml

@@ -23,11 +23,14 @@
         <Button Content="Добавить" HorizontalAlignment="Left" Margin="385,369,0,0" VerticalAlignment="Top" Width="100" Height="40" Click="Button_Click" 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="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="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"/>
+        <TextBox Name="Name" HorizontalAlignment="Left" Height="40" Margin="576,27,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
+        <TextBox Name="Price" HorizontalAlignment="Left" Height="40" Margin="576,117,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
+        <TextBox Name="Description" HorizontalAlignment="Left" Height="40" Margin="576,72,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100"/>
+        <TextBlock HorizontalAlignment="Left" Margin="437,27,0,0" TextWrapping="Wrap" Text="Наименование" VerticalAlignment="Top" Height="40" Width="101"/>
+        <TextBlock HorizontalAlignment="Left" Margin="437,117,0,0" TextWrapping="Wrap" Text="Стоимость" VerticalAlignment="Top" Height="40" Width="101"/>
+        <TextBlock HorizontalAlignment="Left" Margin="437,72,0,0" TextWrapping="Wrap" Text="Описание" VerticalAlignment="Top" Height="40" Width="101"/>
+        <TextBlock HorizontalAlignment="Left" Margin="437,167,0,0" TextWrapping="Wrap" Text="Номер услуги" VerticalAlignment="Top" Height="40" Width="101"/>
+        <ComboBox x:Name="comboBox1" HorizontalAlignment="Left" Margin="576,167,0,0" VerticalAlignment="Top" Width="115" Height="31"/>
 
     </Grid>
 </Window>

+ 5 - 2
CopyCenter/ServicesWindow.xaml.cs

@@ -24,6 +24,9 @@ namespace CopyCenter
         {
             InitializeComponent();
             db = new gr672_liiEntities();
+            comboBox1.ItemsSource = db.CategoryServices.ToList();
+            comboBox1.DisplayMemberPath = "NameCategory";
+            comboBox1.SelectedValuePath = "idCategory";
         }
 
         private void Exit_Click(object sender, RoutedEventArgs e)
@@ -39,7 +42,7 @@ namespace CopyCenter
             service.NameService = Name.Text;            
             service.PriceService = Convert.ToInt32(Price.Text);
             service.DescriptionService = Description.Text;
-            service.idCategory = Convert.ToInt32(idCategory.Text);
+            service.idCategory = Convert.ToInt32(comboBox1.SelectedValue.ToString());
             db.Services.Add(service);
             db.SaveChanges();
             ServicesList.ItemsSource = db.Services.ToList();
@@ -52,7 +55,7 @@ namespace CopyCenter
             uRow.NameService = Name.Text;
             uRow.PriceService = Convert.ToInt32(Price.Text);
             uRow.DescriptionService = Description.Text;
-            uRow.idCategory = Convert.ToInt32(idCategory.Text);
+            uRow.idCategory = Convert.ToInt32(comboBox1.SelectedValue.ToString());
             db.SaveChanges();
             ServicesList.ItemsSource = db.Services.ToList();
         }