mr.solder5 před 5 roky
rodič
revize
29733a0f2b

+ 1 - 2
CopyCenter/AuthorizationWindow.xaml.cs

@@ -20,11 +20,10 @@ namespace CopyCenter
     public partial class AuthorizationWindow : Window
     {
 
-        gr672_liiEntities db;
+        gr672_liiEntities db = new gr672_liiEntities();
         public AuthorizationWindow()
         {
             InitializeComponent();
-            db = new gr672_liiEntities();
         }
 
 

+ 17 - 7
CopyCenter/CardsWindow.xaml.cs

@@ -19,14 +19,11 @@ namespace CopyCenter
     /// </summary>
     public partial class CardsWindow : Window
     {
-        gr672_liiEntities db;
+        gr672_liiEntities db = new gr672_liiEntities();
         public CardsWindow()
         {
             InitializeComponent();
-            db = new gr672_liiEntities();
-            comboBox1.ItemsSource = db.Clients.ToList();
-            comboBox1.DisplayMemberPath = "NameClient";
-            comboBox1.SelectedValuePath = "idClient";
+           
         }
 
         private void Exit_Click(object sender, RoutedEventArgs e)
@@ -80,8 +77,10 @@ namespace CopyCenter
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            db = new gr672_liiEntities();
-            CardsList.ItemsSource = db.Cards.ToList();
+            CardsList.ItemsSource = db.Cards.ToList();       
+            comboBox1.ItemsSource = db.Clients.ToList();
+            comboBox1.DisplayMemberPath = "NameClient";
+            comboBox1.SelectedValuePath = "idClient";
         }
 
         public bool Insert(string Number, string TypeCard, string idClient)
@@ -92,6 +91,16 @@ namespace CopyCenter
                 MessageBox.Show("Введено неверное значение");
                 return false;
             }
+            Card card = new Card();
+
+            card.NumberCard = Convert.ToInt32(Number);
+
+            card.TypeCard = TypeCard;
+
+            card.idClient = Convert.ToInt32(comboBox1.SelectedValue.ToString());
+
+            db.Cards.Add(card);
+            db.SaveChanges();
             MessageBox.Show("Успешно добавлена дисконтная карта");
             return true;
         }
@@ -117,6 +126,7 @@ namespace CopyCenter
                 MessageBox.Show("Введено неверное значение");
                 return false;
             }
+
             int num = 0;
             int.TryParse(ID.Text, out num);
             var uRow = db.Cards.Where(w => w.idCard == num).FirstOrDefault();

+ 2 - 2
CopyCenter/RegistrationWindow.xaml.cs

@@ -19,11 +19,11 @@ namespace CopyCenter
     /// </summary>
     public partial class RegistrationWindow : Window
     {
-        gr672_liiEntities db;
+        gr672_liiEntities db = new gr672_liiEntities();
         public RegistrationWindow()
         {
             InitializeComponent();
-            db = new gr672_liiEntities();
+
         }
 
         private void Registration_Click(object sender, RoutedEventArgs e)

+ 15 - 4
CopyCenterTests/UnitTest1.cs

@@ -20,10 +20,19 @@ namespace CopyCenterTests
             Assert.IsFalse(Authorization.Auth("", ""));
             Assert.IsTrue(Authorization.Auth("PaNDa", "123"));
 
+
+        }
+        [TestMethod]
+        public void RegistrTest()
+        {
             RegistrationWindow Registration = new RegistrationWindow();
             Assert.IsFalse(Registration.Reg("", "", "", "", "", ""));
             //Assert.IsTrue(Registration.Reg("PaNDa", "123", "Иванов", "Иван", "Иванович", "454545"));
+        }
 
+        [TestMethod]
+        public void CardInsertTest()
+        {
             CardsWindow Card = new CardsWindow();
             Assert.IsFalse(Card.Insert("", "", ""));
             Assert.IsTrue(Card.Insert("5", "Скидочная", "23"));
@@ -32,15 +41,17 @@ namespace CopyCenterTests
             //Assert.IsFalse(Cards.Delete("", "", ""));
             //Assert.IsTrue(Cards.Delete("5", "Скидочная", "23"));
 
+
+
+        }
+        [TestMethod]
+        public void CardUpdateTest()
+        {
             CardsWindow Card1 = new CardsWindow();
             Assert.IsFalse(Card1.Update("", "", ""));
             Assert.IsTrue(Card1.Update("5", "Скидочная", "23"));
 
-
         }
-
-        
-        
     }
 }