Типо говно сделано(на самом недел дохрена недоработок)+осталис тесты

Hotel_Course_Project/AdminPage.xaml.cs

@@ -168,10 +168,7 @@ namespace Hotel_Course_Project
 
         private void ClientSeacrhTB_TextChanged(object sender, TextChangedEventArgs e)
         {
-            if (ClientSeacrhTB.Text == "")
-            {
-                Page_Loaded(sender, e);
-            }
+            
         }
 
         private void PaySeacrhTB_TextChanged(object sender, TextChangedEventArgs e)

Hotel_Course_Project/ClientAddOnOrderWindow.xaml.cs

@@ -1,16 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq;
 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;
 
 namespace Hotel_Course_Project
 {

Hotel_Course_Project/Helper.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Hotel_Course_Project
+namespace Hotel_Course_Project
 {
     internal class Helper
     {

Hotel_Course_Project/HostelsPage.xaml

@@ -84,14 +84,6 @@
 
                     <Button x:Name="AddClientfBtn" Click="AddClientBtn_Click">Добавить</Button>
 
-                    <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center">
-                        <TextBlock VerticalAlignment="Center">Сортировка</TextBlock>
-                        <ComboBox VerticalAlignment="Center" Name="SortClientCB" SelectionChanged="SortClientCB_SelectionChanged">
-                            <ComboBoxItem IsSelected="True" Name="activeC">Активные клиенты</ComboBoxItem>
-                            <ComboBoxItem Name="nonActiveC">Удалённые клиенты</ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-
                     <StackPanel Grid.Column="2" Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center">Поиск</TextBlock>
                         <TextBox  Name="ClientSeacrhTB" TextChanged="ClientSeacrhTB_TextChanged" VerticalAlignment="Center" Width="100"></TextBox>

Hotel_Course_Project/HostelsPage.xaml.cs

@@ -18,7 +18,8 @@ namespace Hotel_Course_Project
         }
         private void Page_Loaded(object sender, RoutedEventArgs e)
         {
-            OrderList.ItemsSource = DataBase.db.Order.ToList();
+            OrderList.ItemsSource = DataBase.db.Order.ToList().OrderByDescending(item => item.DateEnd);
+            ClientList.ItemsSource = DataBase.db.Client.Where(item => item.Id_PersStatus == 1).ToList();
         }
 
         private void AddOrderBtn_Click(object sender, RoutedEventArgs e)
@@ -34,37 +35,43 @@ namespace Hotel_Course_Project
 
         private void OrderSeacrhTB_TextChanged(object sender, TextChangedEventArgs e)
         {
-
+            if (OrderSeacrhTB.Text == "")
+            {
+                Page_Loaded(sender, e);
+            }
         }
 
         private void OrderSrchBtn_Click(object sender, RoutedEventArgs e)
         {
-
+            var seacrhed = DataBase.db.Order.Where(item => (item.Client.LName + " " + item.Client.FName + " " + item.Client.MName + " " + item.DateStart + " " + item.Pay.PayType.Name + " " + item.Pay.EndSum + " " + item.DateEnd).Contains(OrderSeacrhTB.Text)).ToList();
+            OrderList.ItemsSource = seacrhed;
         }
 
         private void AddClientBtn_Click(object sender, RoutedEventArgs e)
         {
-
-        }
-
-        private void SortClientCB_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-
+            PChanger.MainFrame.Navigate(new ClientChangeOrAddPage(null));
+            Page_Loaded(sender, e);
         }
 
         private void ClientSeacrhTB_TextChanged(object sender, TextChangedEventArgs e)
         {
-
+            if (ClientSeacrhTB.Text == "")
+            {
+                Page_Loaded(sender, e);
+            }
         }
 
-        private void ClientSelectBtn_Click(object sender, RoutedEventArgs e)
+        private void ClientSrchBtn_Click(object sender, RoutedEventArgs e)
         {
-
+            var seacrhed = DataBase.db.Client.Where(item => (item.LName + " " + item.FName + " " + item.MName).Contains(ClientSeacrhTB.Text)).ToList();
+            ClientList.ItemsSource = seacrhed.Where(item => item.Id_PersStatus == 1).ToList();
         }
 
-        private void ClientSrchBtn_Click(object sender, RoutedEventArgs e)
+        private void ClientSelectBtn_Click(object sender, RoutedEventArgs e)
         {
-
+            Client client = (sender as Button).DataContext as Client;
+            PChanger.MainFrame.Navigate(new ClientChangeOrAddPage(client));
+            Page_Loaded(sender, e);
         }
     }
 }

Hotel_Course_Project/MainWindow.xaml.cs

@@ -31,7 +31,7 @@ namespace Hotel_Course_Project
             }
             else
             {
-            var visibleBackBtn = PChanger.MainFrame.CanGoBack ? BackBtn.Visibility = Visibility.Visible : BackBtn.Visibility = Visibility.Collapsed;            
+                var visibleBackBtn = PChanger.MainFrame.CanGoBack ? BackBtn.Visibility = Visibility.Visible : BackBtn.Visibility = Visibility.Collapsed;
             }
         }
 

Hotel_Course_Project/OrderChangeOrAddPage.xaml.cs

@@ -1,17 +1,7 @@
 using System;
-using System.Collections.Generic;
 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;
 
 namespace Hotel_Course_Project
 {
@@ -20,19 +10,30 @@ namespace Hotel_Course_Project
     /// </summary>
     public partial class OrderChangeOrAddPage : Page
     {
+        Order _order;
         Staff _hostel;
         public OrderChangeOrAddPage(Order order, Staff hostel)
         {
             InitializeComponent();
             DataContext = order;
+            _order = order;
             _hostel = hostel;
             if (DataContext == null)
             {
-            SOrderDateStart.Text = DateTime.Now.Date.ToString();
-            SOrderDateEnd.DisplayDateStart = DateTime.Now.AddDays(1);
-            SOrderDateEnd.DisplayDateEnd = DateTime.Now.AddMonths(12);
-            PaySP.Visibility = Visibility.Collapsed;
-            AddOrChangeBtn.Visibility = Visibility.Collapsed;
+                SOrderDateStart.Text = DateTime.Now.Date.ToString();
+                SOrderDateEnd.DisplayDateStart = DateTime.Now.AddDays(1);
+                SOrderDateEnd.DisplayDateEnd = DateTime.Now.AddMonths(12);
+                PaySP.Visibility = Visibility.Collapsed;
+                AddOrChangeBtn.Visibility = Visibility.Collapsed;
+            }
+            else
+            {
+                SClientBtn.Visibility = Visibility.Collapsed;
+                SRoomBtn.Visibility = Visibility.Collapsed;
+                SOrderDateEnd.IsEnabled = false;
+                PayMakeBtn.Visibility = Visibility.Collapsed;
+                AddOrChangeBtn.Content = "Отменить";
+                AddOrChangeBtn.Content = "Назад";
             }
         }
 
@@ -40,7 +41,7 @@ namespace Hotel_Course_Project
         {
             ClientAddOnOrderWindow clientAddOnOrder = new ClientAddOnOrderWindow();
             clientAddOnOrder.ShowDialog();
-            if(clientAddOnOrder.DialogResult == true)
+            if (clientAddOnOrder.DialogResult == true)
             {
                 SClient.Text = "" + Helper.SelectedClientOnOrder.LName + " " + Helper.SelectedClientOnOrder.FName[0] + ".";
                 if (Helper.SelectedClientOnOrder.MName != null)
@@ -63,7 +64,7 @@ namespace Hotel_Course_Project
         {
             RoomAddOnOrderWindow roomAddOnOrder = new RoomAddOnOrderWindow();
             roomAddOnOrder.ShowDialog();
-            if(roomAddOnOrder.DialogResult == true)
+            if (roomAddOnOrder.DialogResult == true)
             {
                 SRoom.Text = "№" + Helper.SelectedRoomOnOrder.NumRoom + " дневная оплата: " + Helper.SelectedRoomOnOrder.CostPerDay;
                 SRoomBtn.Content = "Изменить";
@@ -81,21 +82,21 @@ namespace Hotel_Course_Project
 
         private void PayMakeBtn_Click(object sender, RoutedEventArgs e)
         {
-            if(SOrderDateEnd.SelectedDate == null)
+            if (SOrderDateEnd.SelectedDate == null)
             {
                 MessageBox.Show("ВЫберите конец периода съёма комнаты");
             }
-            else if(SRoom.Text == string.Empty)
+            else if (SRoom.Text == string.Empty)
             {
                 MessageBox.Show("Комната не выбрана");
             }
             else
             {
                 DateTime dateEnd = (DateTime)SOrderDateEnd.SelectedDate;
-                int dateDiff = dateEnd.Subtract(DateTime.Parse(SOrderDateStart.Text.ToString())).Days+1;
+                int dateDiff = dateEnd.Subtract(DateTime.Parse(SOrderDateStart.Text.ToString())).Days + 1;
                 PayAddOnOrderWindow payAddOnOrder = new PayAddOnOrderWindow(dateDiff, (decimal)Helper.SelectedRoomOnOrder.CostPerDay);
                 payAddOnOrder.ShowDialog();
-                if(payAddOnOrder.DialogResult == true)
+                if (payAddOnOrder.DialogResult == true)
                 {
                     PayMakeBtn.Visibility = Visibility.Hidden;
                     PaySP.Visibility = Visibility.Visible;
@@ -109,7 +110,7 @@ namespace Hotel_Course_Project
                 }
                 else
                 {
-                    PayMakeBtn.Visibility = Visibility.Visible; 
+                    PayMakeBtn.Visibility = Visibility.Visible;
                     PaySP.Visibility = Visibility.Hidden;
                     SPayEndSum.Text = string.Empty;
                     SPayType.Text = string.Empty;
@@ -119,34 +120,52 @@ namespace Hotel_Course_Project
 
         private void AddOrChangeBtn_Click(object sender, RoutedEventArgs e)
         {
-            Order order = new Order()
+            if (DataContext == null)
+            {
+                Order order = new Order()
+                {
+                    Id_Client = Helper.SelectedClientOnOrder.Id,
+                    Id_Staff = _hostel.Id,
+                    Id_OrderStatus = 2,
+                    Id_Pay = Helper.idNewPay,
+                    DateStart = DateTime.Parse(SOrderDateStart.Text.ToString()),
+                    DateEnd = (DateTime)SOrderDateEnd.SelectedDate,
+                    Id_Room = Helper.SelectedRoomOnOrder.Id
+                };
+                DataBase.db.Order.Add(order);
+                var lastId = DataBase.db.Order.OrderByDescending(item => item.Id).FirstOrDefault().Id;
+                DataBase.db.SaveChanges();
+                MessageBox.Show("Заказ добавлен");
+                PChanger.MainFrame.GoBack();
+            }
+            else
             {
-                Id_Client = Helper.SelectedClientOnOrder.Id,
-                Id_Staff = _hostel.Id,
-                Id_OrderStatus = 2,
-                Id_Pay = Helper.idNewPay,
-                DateStart = DateTime.Parse(SOrderDateStart.Text.ToString()),
-                DateEnd = (DateTime)SOrderDateEnd.SelectedDate,
-                Id_Room = Helper.SelectedRoomOnOrder.Id                 
-            };
-            DataBase.db.Order.Add(order);
-            var lastId = DataBase.db.Order.OrderByDescending(item => item.Id).FirstOrDefault().Id;
-            DataBase.db.SaveChanges();
-            MessageBox.Show("Заказ добавлен");
-            PChanger.MainFrame.GoBack();
+                PChanger.MainFrame.GoBack();
+            }
         }
 
         private void CancelOrderBtn_Click(object sender, RoutedEventArgs e)
         {
-            if(PayMakeBtn.Visibility == Visibility.Hidden)
+            if (DataContext == null)
             {
-                DataBase.db.Pay.Remove(Helper.pay);
-                DataBase.db.SaveChanges();
-                PChanger.MainFrame.GoBack();
+                if (PayMakeBtn.Visibility == Visibility.Hidden)
+                {
+                    DataBase.db.Pay.Remove(Helper.pay);
+                    DataBase.db.SaveChanges();
+                    PChanger.MainFrame.GoBack();
+                }
+                else
+                {
+                    PChanger.MainFrame.GoBack();
+                }
             }
             else
             {
-            PChanger.MainFrame.GoBack();
+
+                _order.Id_OrderStatus = 3;
+                MessageBox.Show("Заказ отменён");
+                DataBase.db.SaveChanges();
+                PChanger.MainFrame.GoBack();
             }
         }
 

Hotel_Course_Project/PayAddOnOrderWindow.xaml.cs

@@ -1,16 +1,6 @@
 using System;
-using System.Collections.Generic;
 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;
 
 namespace Hotel_Course_Project
 {
@@ -42,7 +32,7 @@ namespace Hotel_Course_Project
             {
                 EndSum = _numDays * _costPerDay,
                 Id_PayType = idPayType,
-                PayDate = DateTime.Now.Date                
+                PayDate = DateTime.Now.Date
             };
             DataBase.db.Pay.Add(pay);
             Helper.pay = pay;

Hotel_Course_Project/RoomAddOnOrderWindow.xaml.cs

@@ -1,16 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq;
 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;
 
 namespace Hotel_Course_Project
 {