Procházet zdrojové kódy

Исправлено2

polinakulakova114@gmail.com před 2 roky
rodič
revize
b3a91aa1fa

binární
.vs/mateo/v16/.suo


+ 0 - 1
UnitTestmateo/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("UnitTestmateo")]

+ 5 - 5
UnitTestmateo/UnitTest.cs

@@ -1,5 +1,5 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using mateo;
+using mateo;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace UnitTestmateo
 {
@@ -56,7 +56,7 @@ namespace UnitTestmateo
         {
             Assert.AreEqual(mainWindow.AddOldAttractionSumm(6, 1), 100);
 
-            decimal summ = mainWindow.AddBabyAttractionSumm(1,1) + mainWindow.AddBabyAttractionSumm(4,1);
+            decimal summ = mainWindow.AddBabyAttractionSumm(1, 1) + mainWindow.AddBabyAttractionSumm(4, 1);
             Assert.AreEqual(summ, 500);
 
             Assert.AreNotEqual(mainWindow.AddBabyAttractionSumm(7, 1), 400);
@@ -79,7 +79,7 @@ namespace UnitTestmateo
         [TestMethod]
         public void TicketsMinus_ReturnQuantity()
         {
-            Assert.AreEqual(mainWindow.TicketsMinusInt(30),29);
+            Assert.AreEqual(mainWindow.TicketsMinusInt(30), 29);
             Assert.AreEqual(mainWindow.TicketsPlusInt(21), 22);
         }
 
@@ -120,7 +120,7 @@ namespace UnitTestmateo
             Assert.IsTrue(sys.Report1("16.12.2021 00:00:00", ""));
             Assert.IsTrue(sys.Report1("", "Место раскопок"));
             Assert.IsFalse(sys.Report1("23.12.2021 00:00:00", "Место раскопок"));
-            Assert.IsFalse(sys.Report1("", " ")); 
+            Assert.IsFalse(sys.Report1("", " "));
         }
 
         #endregion

+ 1 - 7
mateo/App.xaml.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
+using System.Windows;
 
 namespace mateo
 {

+ 2 - 8
mateo/DB.cs

@@ -1,17 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace mateo
+namespace mateo
 {
     public class DB
     {
         public static mateoEntities _context;
         public static mateoEntities GetContext()
         {
-            if (_context==null)
+            if (_context == null)
             {
                 _context = new mateoEntities();
             }

+ 10 - 19
mateo/First.xaml.cs

@@ -1,19 +1,10 @@
 using System;
-using System.Collections.Generic;
+using System.Data;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using System.Data;
-using System.Data.SqlClient;
-using System.Text.RegularExpressions;
 
 namespace mateo
 {
@@ -188,26 +179,26 @@ namespace mateo
         private void txtchangedLogin(object sender, TextChangedEventArgs e)
         {
             if (vvod_login.Text != "") txtlogin.Visibility = Visibility.Hidden;
-            else if(vvod_login.Text == "") txtlogin.Visibility = Visibility.Visible;
+            else if (vvod_login.Text == "") txtlogin.Visibility = Visibility.Visible;
 
 
-            if(vvod_LNAME.Text!="") txtlastreg.Visibility = Visibility.Hidden;
+            if (vvod_LNAME.Text != "") txtlastreg.Visibility = Visibility.Hidden;
             else if (vvod_LNAME.Text == "") txtlastreg.Visibility = Visibility.Visible;
-            
-            if(vvod_FNAME.Text!="") txtfirstreg.Visibility = Visibility.Hidden;
+
+            if (vvod_FNAME.Text != "") txtfirstreg.Visibility = Visibility.Hidden;
             else if (vvod_FNAME.Text == "") txtfirstreg.Visibility = Visibility.Visible;
-            
-            if(vvod_MNAME.Text!="") txtmiddlereg.Visibility = Visibility.Hidden;
+
+            if (vvod_MNAME.Text != "") txtmiddlereg.Visibility = Visibility.Hidden;
             else if (vvod_MNAME.Text == "") txtmiddlereg.Visibility = Visibility.Visible;
 
-            if(vvod_login_reg.Text!="") txtloginreg.Visibility = Visibility.Hidden;
+            if (vvod_login_reg.Text != "") txtloginreg.Visibility = Visibility.Hidden;
             else if (vvod_login_reg.Text == "") txtloginreg.Visibility = Visibility.Visible;
         }
 
         private void passchangedPass(object sender, RoutedEventArgs e)
         {
             if (vvod_pass.Password != "") txtpass.Visibility = Visibility.Hidden;
-            else if(vvod_pass.Password == "") txtpass.Visibility = Visibility.Visible;
+            else if (vvod_pass.Password == "") txtpass.Visibility = Visibility.Visible;
 
             if (vvod_pass_reg.Password != "") txtpassreg.Visibility = Visibility.Hidden;
             else if (vvod_pass_reg.Password == "") txtpassreg.Visibility = Visibility.Visible;

+ 23 - 29
mateo/MainWindow.xaml.cs

@@ -1,19 +1,11 @@
 using Microsoft.Win32;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using Word = Microsoft.Office.Interop.Word;
 
 namespace mateo
@@ -34,7 +26,7 @@ namespace mateo
             string imageLoc;
             OpenFileDialog dld = new OpenFileDialog();
             dld.Filter = "JPG Files (*.jpg)|*.jpg|PNG Files (*.png)|*.png|JPEG Files (*.jpeg)|*.jpeg";
-            if (dld.ShowDialog()==true)
+            if (dld.ShowDialog() == true)
             {
                 imageLoc = dld.FileName;
                 imgProfile.Source = new BitmapImage(new Uri(imageLoc));
@@ -120,7 +112,7 @@ namespace mateo
             catch (Exception ex)
             {
                 MessageBox.Show(ex.ToString(), "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
-            }                
+            }
             return 0;
         }
 
@@ -180,7 +172,7 @@ namespace mateo
             summ = Summ(summ);
 
             return tf;
-        } 
+        }
         public bool TicketsPlus(int quantity)
         {
             bool tf = false;
@@ -210,7 +202,7 @@ namespace mateo
 
             return quantity;
         }
-        
+
         public int TicketsPlusInt(int quantity)
         {
             if (quantity == 30) MessageBox.Show("Превышено количество билетов", "Информация", MessageBoxButton.OK, MessageBoxImage.Information);
@@ -230,7 +222,8 @@ namespace mateo
 
         public void Update() //функция для обновления информации о пользователе
         {
-            try {
+            try
+            {
                 //фио
                 var fio = DB.GetContext().Users.FirstOrDefault(x => x.IDUsers == DB.Iduser);
                 txtNameProfile.Text = fio.LastName + " " + fio.FirstName + " " + fio.MiddleName;
@@ -251,7 +244,7 @@ namespace mateo
                 //История платежей
                 datagridHistoryProfile.ItemsSource = DB.GetContext().History.Where(x => x.FKUser == DB.Iduser).ToList();
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 MessageBox.Show(ex.ToString(), "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
             }
@@ -265,14 +258,14 @@ namespace mateo
             {
                 listAllAttraction.ItemsSource = DB.GetContext().Attraction.Where(x => x.FKStatusAttraction != 2).ToList();
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 MessageBox.Show(ex.ToString(), "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
             }
 
             //Update();
         }
-       
+
         #region раздел Услуги
         private void btnUslugiClick(object sender, RoutedEventArgs e)
         {
@@ -303,7 +296,7 @@ namespace mateo
                     if (attraction.PriceBaby == 0 || attraction.PriceBaby == null) stackPriceBaby.Visibility = Visibility.Hidden;
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 MessageBox.Show(ex.ToString(), "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
             }
@@ -354,18 +347,18 @@ namespace mateo
 
         private void btnTickets(object sender, RoutedEventArgs e) //вывод добавленных билетов
         {
-                stackAttraction.Visibility = Visibility.Hidden;
-                listAllAttraction.Visibility = Visibility.Hidden;
-                gridProfile.Visibility = Visibility.Hidden;
-                gridPlusBalance.Visibility = Visibility.Hidden;
-                gridTickets.Visibility = Visibility.Visible;
+            stackAttraction.Visibility = Visibility.Hidden;
+            listAllAttraction.Visibility = Visibility.Hidden;
+            gridProfile.Visibility = Visibility.Hidden;
+            gridPlusBalance.Visibility = Visibility.Hidden;
+            gridTickets.Visibility = Visibility.Visible;
             try
             {
                 listTickets.ItemsSource = DB.GetContext().Tickets.Where(x => x.FKUser == DB.Iduser && x.FKStatusPuy == 2).ToList();
                 decimal summ = 0;
                 summ = Summ(summ);
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 MessageBox.Show(ex.ToString(), "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
             }
@@ -380,7 +373,7 @@ namespace mateo
                     TicketsMinus(tickets.Quantity);
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 MessageBox.Show(ex.ToString(), "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
             }
@@ -395,7 +388,7 @@ namespace mateo
                     TicketsPlus(tickets.Quantity);
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 MessageBox.Show(ex.ToString(), "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
             }
@@ -424,7 +417,7 @@ namespace mateo
                     else txtSumm.Text = String.Format("Сумма: {0:0,00}", summ);
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 MessageBox.Show(ex.ToString(), "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
             }
@@ -572,7 +565,7 @@ namespace mateo
                     }
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 MessageBox.Show(ex.ToString(), "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
             }
@@ -605,7 +598,8 @@ namespace mateo
 
         private void BtnDeletePhoto(object sender, RoutedEventArgs e) //удаление фото в тч из бд
         {
-            try {
+            try
+            {
                 var fio = DB.GetContext().Users.FirstOrDefault(x => x.IDUsers == DB.Iduser);
                 fio.Image = null;
                 DB.GetContext().SaveChanges();
@@ -613,7 +607,7 @@ namespace mateo
                 btnAddPhoto.Content = "добавить фото";
                 Update();
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 MessageBox.Show(ex.ToString(), "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
             }

+ 0 - 2
mateo/Properties/AssemblyInfo.cs

@@ -1,6 +1,4 @@
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 

+ 9 - 17
mateo/SysAdmin.xaml.cs

@@ -3,16 +3,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 using Word = Microsoft.Office.Interop.Word;
 
 namespace mateo
@@ -42,7 +34,7 @@ namespace mateo
             comboboxNameAttraction.ItemsSource = DB.GetContext().Attraction.ToList();//для отчета
 
 
-            
+
         }
 
         #region Для тестов
@@ -99,7 +91,7 @@ namespace mateo
                 else MessageBox.Show("Пустые поля!", "Информация", MessageBoxButton.OK, MessageBoxImage.Information);
                 return tf;
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 MessageBox.Show(ex.ToString(), "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
                 return false;
@@ -150,7 +142,7 @@ namespace mateo
 
                 return tf;
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 MessageBox.Show(ex.ToString(), "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
                 return false;
@@ -159,8 +151,8 @@ namespace mateo
 
         public bool Report1(string dateP, string nameA)
         {
-            DateTime datetime = DateTime.Now; 
-            if (dateP !="") datetime = Convert.ToDateTime(dateP);
+            DateTime datetime = DateTime.Now;
+            if (dateP != "") datetime = Convert.ToDateTime(dateP);
 
 
             bool tf = false;
@@ -312,7 +304,7 @@ namespace mateo
 
                 }
             }
-            
+
             return tf;
         }
         #endregion
@@ -333,7 +325,7 @@ namespace mateo
 
         private void BtnAddAttractionClick(object sender, RoutedEventArgs e) //добавляем новый аттракцион в бд
         {
-            AddAttraction(DB.Idemployees,txtName_Attraction.Text,txtDescription_Attraction.Text,txtQuantity_Attraction.Text,txtPriceOld_Attraction.Text,txtPriceBaby_Attraction.Text,image,comboboxStatus_Attraction.Text,comboboxType_Attraction.Text);
+            AddAttraction(DB.Idemployees, txtName_Attraction.Text, txtDescription_Attraction.Text, txtQuantity_Attraction.Text, txtPriceOld_Attraction.Text, txtPriceBaby_Attraction.Text, image, comboboxStatus_Attraction.Text, comboboxType_Attraction.Text);
         }
         #endregion
 
@@ -383,7 +375,7 @@ namespace mateo
 
         private void BtnSaveChangeClick(object sender, RoutedEventArgs e) //вносим изменения из gridChangeAttraction в бд
         {
-            if (txtChange_NameAttraction.Text != "" && txtChange_Description.Text != "" && txtChange_Quantity.Text != "" && txtChange_PriceOldAttraction.Text != "" && 
+            if (txtChange_NameAttraction.Text != "" && txtChange_Description.Text != "" && txtChange_Quantity.Text != "" && txtChange_PriceOldAttraction.Text != "" &&
                 txtChange_PriceBabyAttraction.Text != "" && imageChange_Attraction.Source != null && comboboxChange_StatusAttraction.Text != "" && comboboxChange_TypeAttraction.Text != "")
             {
                 var attr = DB.GetContext().Attraction.Where(x => x.IDAttraction == idattraction).FirstOrDefault();
@@ -501,7 +493,7 @@ namespace mateo
                 if (comboboxNameAttraction.SelectedItem == null) nameA = "";
                 else nameA = comboboxNameAttraction.SelectedItem.ToString();
                 Report1(dateP, nameA);
-                
+
             }
             catch (Exception ex)
             {