типо сортировку заказов начала

Sessioa/App.config

@@ -9,7 +9,7 @@
   </startup>
   <connectionStrings>
     <add name="UP_ShechkovaEntities" connectionString="metadata=res://*/BaseModel.BaseUP.csdl|res://*/BaseModel.BaseUP.ssdl|res://*/BaseModel.BaseUP.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=sql;initial catalog=UP_Shechkova;persist security info=True;user id=33П;password=12357;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
-    <add name="BaseU" connectionString="metadata=res://*/BaseModel.ModelBase.csdl|res://*/BaseModel.ModelBase.ssdl|res://*/BaseModel.ModelBase.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=sql;initial catalog=UP_Shechkova;persist security info=True;user id=33П;password=12357;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+    <add name="BaseU" connectionString="metadata=res://*/BaseModel.ModelBase.csdl|res://*/BaseModel.ModelBase.ssdl|res://*/BaseModel.ModelBase.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=ngknn.ru;initial catalog=UP_Shechkova;persist security info=True;user id=33П;password=12357;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">

Sessioa/Pages/OrderCard.xaml

@@ -16,13 +16,18 @@
         <Grid.RowDefinitions>
             <RowDefinition/>
             <RowDefinition Height="8.5*"/>
-            <RowDefinition/>
+            <RowDefinition Height="2.5*"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        <Button Name="B_Back" Content="Назад" Style="{StaticResource ButtonAct}" Margin="10,0" MaxHeight="50" MinWidth="90" MaxWidth="150" Click="B_Back_Click"  VerticalAlignment="Center" HorizontalAlignment="Left"/>
+        <StackPanel Orientation="Horizontal">
+            <Button Name="B_Back" Content="Назад" Style="{StaticResource ButtonAct}" Margin="10,0" MaxHeight="50" MinWidth="90" MaxWidth="150" Click="B_Back_Click"  VerticalAlignment="Center" HorizontalAlignment="Left"/>
+            <TextBlock x:Name="OrderTitle" Style="{StaticResource TextBlockMain}" VerticalAlignment="Center" Margin="0,0,10,0"/>
+            <TextBlock x:Name="OrderCode" Style="{StaticResource TextBlockMain}" VerticalAlignment="Center" Loaded="OrderCode_Loaded"/>
+        </StackPanel>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="30,0" VerticalAlignment="Center">
             <TextBlock Text="Пункт выдачи: " Style="{StaticResource TextBlock}" VerticalAlignment="Center"/>
             <ComboBox Name="CB_Punkt" MaxHeight="50" MinWidth="250" Margin="5"/>
+            <TextBlock Name="TB_Punkt" Style="{StaticResource TextBlock}" VerticalAlignment="Center" Visibility="Collapsed"/>
         </StackPanel>
         <ListBox Name="LB_ProductsOrder" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Grid.Row="1">
             <ListBox.ItemTemplate>
@@ -63,21 +68,34 @@
                                     <ColumnDefinition/>
                                     <ColumnDefinition/>
                                 </Grid.ColumnDefinitions>
-                                <Button Name="Back_B" Content="-" Style="{StaticResource ButtonAct}" MaxHeight="30" MinWidth="30" MaxWidth="50" Click="Back_B_Click" Uid="{Binding ProductArticleNumber}" HorizontalAlignment="Center"/>
+                                <Button Name="Back_B" Content="-" Style="{StaticResource ButtonAct}" MaxHeight="30" MinWidth="30" MaxWidth="50" Click="Back_B_Click" Uid="{Binding ProductArticleNumber}" HorizontalAlignment="Center" Loaded="Back_B_Loaded"/>
                                 <TextBlock x:Name="CountProduct" Grid.Column="1" Text="1" Style="{StaticResource TextBlockBold}" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="22" Loaded="CountProduct_Loaded" Uid="{Binding ProductArticleNumber}"/>
-                                <Button Name="Next_B" Content="+" Style="{StaticResource ButtonAct}" Grid.Column="2" MaxHeight="30" MinWidth="30" MaxWidth="50" Click="Next_B_Click" Uid="{Binding ProductArticleNumber}" HorizontalAlignment="Center"/>
+                                <Button Name="Next_B" Content="+" Style="{StaticResource ButtonAct}" Grid.Column="2" MaxHeight="30" MinWidth="30" MaxWidth="50" Click="Next_B_Click" Uid="{Binding ProductArticleNumber}" HorizontalAlignment="Center" Loaded="Next_B_Loaded"/>
                             </Grid>
                         </Border>
                     </Grid>
                 </DataTemplate>
             </ListBox.ItemTemplate>
+            <ListBox.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Name="DelProduct" Header="Удалить из корзины" Click="DelProduct_Click"/>
+                </ContextMenu>
+            </ListBox.ContextMenu>
         </ListBox>
         <StackPanel Orientation="Vertical" Grid.Row="2" HorizontalAlignment="Right" Margin="20,0">
-            <TextBlock x:Name="TB_ItogoSkidka" Style="{StaticResource TextBlockMain}"/>
-            <StackPanel Orientation="Horizontal">
+            <TextBlock x:Name="TB_ItogoSkidka" Style="{StaticResource TextBlockMain}" HorizontalAlignment="Right"/>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
                 <TextBlock Text="ИТОГО: " Style="{StaticResource TextBlockMain}"/>
                 <TextBlock x:Name="TB_Itogo" Style="{StaticResource TextBlockMain}" />
             </StackPanel>
+            <StackPanel x:Name="SP_EditOrder" Loaded="SP_EditOrder_Loaded" Orientation="Horizontal">
+                <TextBlock Text="Статус заказа: " Style="{StaticResource TextBlockMain}"/>
+                <ComboBox Name="StateOrder" MaxHeight="50" MinWidth="150" Margin="5"/>
+            </StackPanel>
+            <StackPanel x:Name="SP_EditDate" Loaded="SP_EditOrder_Loaded" Orientation="Horizontal">
+                <TextBlock Text="Дата выдачи: " Style="{StaticResource TextBlockMain}"/>
+                <DatePicker Name="DP_Order" MaxHeight="50" MinWidth="150" Margin="5"/>
+            </StackPanel>
         </StackPanel>
         <Button Name="B_Save" Content="Оформить заказ" Style="{StaticResource ButtonSt}" Margin="10,5" MaxHeight="50" MinWidth="90" MaxWidth="150" Click="B_Save_Click" Grid.Row="3"/>
     </Grid>

Sessioa/Pages/OrderCard.xaml.cs

@@ -14,18 +14,26 @@ namespace Sessioa.Pages
     public partial class OrderCard : Page
     {
         List<Product> products = (List<Product>)Application.Current.Properties["ListOrderUser"];
+        List<PointsOfIssue> points = BaseClass.C_Base.PointsOfIssue.ToList();
+        List<StatusOrder> statesOrder = BaseClass.C_Base.StatusOrder.ToList();
         Dictionary<string, int> keyValuePairs = (Dictionary<string, int>)(Application.Current.Properties["ListOrderCountUser"]);
         User user = null;
+        Order orderEdit = null;
+        bool state = false;
         public OrderCard(User userSign)
         {
             InitializeComponent();
             user = userSign;
             LB_ProductsOrder.ItemsSource = products;
-            if (keyValuePairs.Count == 0)
+            OrderTitle.Text = $"Заказ #{BaseClass.C_Base.Order.OrderByDescending(x => x.OrderID).First().OrderID + 1}";
+            if (keyValuePairs != null)
             {
-                foreach (Product product in products)
+                if (keyValuePairs.Count == 0)
                 {
-                    keyValuePairs.Add($"{product.ProductArticleNumber}", 1);
+                    foreach (Product product in products)
+                    {
+                        keyValuePairs.Add($"{product.ProductArticleNumber}", 1);
+                    }
                 }
             }
             else
@@ -39,12 +47,50 @@ namespace Sessioa.Pages
                     catch { }
                 }
             }
-            CB_Punkt.ItemsSource = BaseClass.C_Base.PointsOfIssue.ToList();
+            CB_Punkt.ItemsSource = points;
             CB_Punkt.DisplayMemberPath = "PointName";
             CB_Punkt.SelectedValuePath = "PointID";
             ItogoSkidka();
         }
+        public OrderCard(User userSign, int order_ID)
+        {
+            InitializeComponent();
+            state = true;
+            user = userSign;
+            if (user.UserRole < 2)
+            {
+                B_Save.Visibility = Visibility.Collapsed;
+            }
+            orderEdit = BaseClass.C_Base.Order.FirstOrDefault(x => x.OrderID == order_ID);
+            OrderTitle.Text = $"Заказ #{orderEdit.OrderID}";
+            if (orderEdit != null)
+            {
+                foreach (OrderProduct op in BaseClass.C_Base.OrderProduct.Where(x => x.OrderID == orderEdit.OrderID).ToList())
+                {
+                    products.Add(op.Product);
+                    try
+                    {
+                        keyValuePairs.Add($"{op.Product.ProductArticleNumber}", op.ProductCount);
+                    }
+                    catch { }
+                }
+            }
+            LB_ProductsOrder.ItemsSource = products;
+            B_Save.Content = "Сохранить";
+            CB_Punkt.Visibility = Visibility.Collapsed;
+            TB_Punkt.Visibility = Visibility.Visible;
+            TB_Punkt.Text = $"{points[orderEdit.OrderPickupPoint - 1].PointName}";
 
+            StateOrder.ItemsSource = statesOrder;
+            StateOrder.DisplayMemberPath = "StatusTitle";
+            StateOrder.SelectedValuePath = "StatusId";
+            StateOrder.SelectedItem = statesOrder[BaseClass.C_Base.Order.FirstOrDefault(x => x.OrderID == order_ID).OrderStatus - 1];
+
+            if (orderEdit.OrderDeliveryDate != null)
+                DP_Order.SelectedDate = orderEdit.OrderDeliveryDate;
+            OrderCode.Text = $"Код выдачи: {orderEdit.IssueCode}";
+            ItogoSkidka();
+        }
         private void countPr_Loaded(object sender, RoutedEventArgs e)
         {
             TextBlock textBlock = (TextBlock)sender;
@@ -77,53 +123,74 @@ namespace Sessioa.Pages
 
         private void B_Back_Click(object sender, RoutedEventArgs e)
         {
-            Application.Current.Properties["ListOrderCountUser"] = keyValuePairs;
-            FrameClass.C_Frame.Navigate(new ProductsPage(user));
+            if (state == false)
+            {
+                Application.Current.Properties["ListOrderCountUser"] = keyValuePairs;
+                FrameClass.C_Frame.Navigate(new ProductsPage(user));
+            }
+            else
+            {
+                Application.Current.Properties["ListOrderCountUser"] = new Dictionary<string, int>();
+                Application.Current.Properties["ListOrderUser"] = new List<Product>();
+                FrameClass.C_Frame.Navigate(new OrderNew(user));
+            }
         }
 
         private void B_Save_Click(object sender, RoutedEventArgs e)
         {
-            Application.Current.Properties["ListOrderUser"] = new List<Product>();
-            Application.Current.Properties["ListOrderCountUser"] = new Dictionary<string, int>();
-            if(CB_Punkt.SelectedIndex == -1)
-                MessageBox.Show("Выберите пункт выдачи.", "Предупреждение", MessageBoxButton.OK, MessageBoxImage.Warning);
-            else
+            if (state == false)
             {
-                try
+                Application.Current.Properties["ListOrderUser"] = new List<Product>();
+                Application.Current.Properties["ListOrderCountUser"] = new Dictionary<string, int>();
+                if (CB_Punkt.SelectedIndex == -1)
+                    MessageBox.Show("Выберите пункт выдачи.", "Предупреждение", MessageBoxButton.OK, MessageBoxImage.Warning);
+                else
                 {
-                    Random rnd = new Random();
-                    int code = rnd.Next(100, 999);
-                    Order newOrder = new Order()
-                    {
-                        //OrderID = BaseClass.C_Base.Order.OrderByDescending(x => x.OrderID).FirstOrDefault().OrderID + 1,
-                        OrderStatus = 2,
-                        OrderDate = DateTime.Now,
-                        OrderPickupPoint = ((PointsOfIssue)CB_Punkt.SelectedItem).PointID,
-                        UserID = user.UserID,
-                        IssueCode = code
-                    };
-                    BaseClass.C_Base.Order.Add(newOrder);
-                    BaseClass.C_Base.SaveChanges();
-                    foreach (KeyValuePair<string, int> pair in keyValuePairs)
+                    try
                     {
-                        OrderProduct op = new OrderProduct()
+                        Random rnd = new Random();
+                        int code = rnd.Next(100, 999);
+                        Order newOrder = new Order()
                         {
-                            OrderID = newOrder.OrderID,
-                            ProductArticleNumber = pair.Key,
-                            ProductCount = pair.Value
+                            //OrderID = BaseClass.C_Base.Order.OrderByDescending(x => x.OrderID).FirstOrDefault().OrderID + 1,
+                            OrderStatus = 2,
+                            OrderDate = DateTime.Now,
+                            OrderPickupPoint = ((PointsOfIssue)CB_Punkt.SelectedItem).PointID,
+                            UserID = user.UserID,
+                            IssueCode = code
                         };
-                        BaseClass.C_Base.OrderProduct.Add(op);
+                        BaseClass.C_Base.Order.Add(newOrder);
+                        BaseClass.C_Base.SaveChanges();
+                        foreach (KeyValuePair<string, int> pair in keyValuePairs)
+                        {
+                            OrderProduct op = new OrderProduct()
+                            {
+                                OrderID = newOrder.OrderID,
+                                ProductArticleNumber = pair.Key,
+                                ProductCount = pair.Value
+                            };
+                            BaseClass.C_Base.OrderProduct.Add(op);
+                        }
+                        BaseClass.C_Base.SaveChanges();
+                        MessageBoxResult res = MessageBox.Show($"Заказ оформлен. Код для выдачи: {code}. Отследить заказ можно в разделе \"Заказы\" на странице товаров.", "Уведомление", MessageBoxButton.OK, MessageBoxImage.Information);
+                        if (res == MessageBoxResult.OK)
+                            FrameClass.C_Frame.Navigate(new ProductsPage(user));
+                    }
+                    catch
+                    {
+                        MessageBoxResult res = MessageBox.Show("что-то сломалось.", "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
                     }
-                    BaseClass.C_Base.SaveChanges();
-                    MessageBoxResult res = MessageBox.Show($"Заказ оформлен. Код для выдачи: {code}. Отследить заказ можно в разделе \"Мои заказы\" на странице продуктов.", "Уведомление", MessageBoxButton.OK, MessageBoxImage.Information);
-                    if (res == MessageBoxResult.OK)
-                        FrameClass.C_Frame.Navigate(new ProductsPage(user));
-                }
-                catch
-                {
-                    MessageBoxResult res = MessageBox.Show("что-то сломалось.", "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             }
+            else
+            {
+                orderEdit.OrderStatus = ((StatusOrder)StateOrder.SelectedItem).StatusId;
+                if (DP_Order.SelectedDate != null)
+                    orderEdit.OrderDeliveryDate = DP_Order.SelectedDate;
+                BaseClass.C_Base.SaveChanges();
+                MessageBoxResult res = MessageBox.Show("Изменения внесены.", "Уведомление", MessageBoxButton.OK, MessageBoxImage.Information);
+                FrameClass.C_Frame.Navigate(new OrderNew(user));
+            }
         }
 
         private void Back_B_Click(object sender, RoutedEventArgs e)
@@ -189,11 +256,11 @@ namespace Sessioa.Pages
         public void ItogoSkidka()
         {
             decimal itogoBezSkidki = 0;
-            foreach(Product item in products)
+            foreach (Product item in products)
             {
-                foreach(KeyValuePair<string, int> pair in keyValuePairs)
+                foreach (KeyValuePair<string, int> pair in keyValuePairs)
                 {
-                    if(pair.Key == item.ProductArticleNumber)
+                    if (pair.Key == item.ProductArticleNumber)
                     {
                         itogoBezSkidki += item.ProductCost * pair.Value;
                     }
@@ -206,7 +273,7 @@ namespace Sessioa.Pages
                 {
                     if (pair.Key == item.ProductArticleNumber)
                     {
-                        if(item.ProductDiscountAmount != null)
+                        if (item.ProductDiscountAmount != null)
                         {
                             itogoSoSkidkoy += (item.ProductCost - (item.ProductCost * ((decimal)item.ProductDiscountAmount / 100))) * pair.Value;
                         }
@@ -219,5 +286,49 @@ namespace Sessioa.Pages
             TB_ItogoSkidka.Text = $"Скидка {ITOGO}%";
             TB_Itogo.Text = $"{(double)itogoSoSkidkoy} ₽";
         }
+
+        private void SP_EditOrder_Loaded(object sender, RoutedEventArgs e)
+        {
+            StackPanel sp = (StackPanel)sender;
+            if (state == false || user.UserRole < 2)
+                sp.Visibility = Visibility.Collapsed;
+        }
+
+        private void Back_B_Loaded(object sender, RoutedEventArgs e)
+        {
+            Button btn = (Button)sender;
+            if (state == true)
+                btn.Visibility = Visibility.Collapsed;
+        }
+
+        private void Next_B_Loaded(object sender, RoutedEventArgs e)
+        {
+            Button btn = (Button)sender;
+            if (state == true)
+                btn.Visibility = Visibility.Collapsed;
+        }
+
+        private void OrderCode_Loaded(object sender, RoutedEventArgs e)
+        {
+            TextBlock tb = (TextBlock)sender;
+            if (state == false)
+                tb.Visibility = Visibility.Collapsed;
+        }
+
+        private void DelProduct_Click(object sender, RoutedEventArgs e)
+        {
+            foreach(KeyValuePair<string, int> item in keyValuePairs)
+            {
+                Product tmp = BaseClass.C_Base.Product.FirstOrDefault(x => x.ProductArticleNumber == ((Product)LB_ProductsOrder.SelectedItem).ProductArticleNumber);
+                if(item.Key == tmp.ProductArticleNumber)
+                {
+                    keyValuePairs.Remove(item.Key);
+                    products.Remove(tmp);
+                    break;
+                }
+            }
+            LB_ProductsOrder.ItemsSource = null;
+            LB_ProductsOrder.ItemsSource = products;
+        }
     }
 }

Sessioa/Pages/OrderNew.xaml

@@ -14,14 +14,19 @@
     </Page.Resources>
     <Grid>
         <Grid.RowDefinitions>
+            <RowDefinition Height="0.1*"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
         <Button Name="B_Back" Content="Назад" Style="{StaticResource ButtonAct}" Margin="10,0" MaxHeight="50" MinWidth="90" MaxWidth="150" Click="B_Back_Click"  VerticalAlignment="Top" HorizontalAlignment="Left"/>
-        <ListBox x:Name="LB_OrderProduct" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Margin="200,30">
+        <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Right">
+            <ComboBox Name="Sort" MaxHeight="60" Width="250" Margin="10,0" SelectionChanged="Sort_SelectionChanged"/>
+            <ComboBox Name="Filt" MaxHeight="60" Width="250" SelectionChanged="Filt_SelectionChanged"/>
+        </StackPanel>
+        <ListBox x:Name="LB_OrderProduct" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Margin="200,0" Grid.Row="1">
             <ListBox.ItemTemplate>
                 <DataTemplate>
-                    <Border BorderBrush="Black" BorderThickness="2" CornerRadius="5">
-                        <Grid>
+                    <Border BorderBrush="Black" BorderThickness="2" CornerRadius="5" Background="White" Uid="{Binding OrderID}" Loaded="Border_Loaded">
+                        <Grid MouseDown="Border_MouseDown">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="0.3*"/>
                                 <ColumnDefinition Width="2*"/>
@@ -31,8 +36,9 @@
                                 <TextBlock Name="UserOrder" Loaded="UserOrder_Loaded" Style="{StaticResource TextBlock}" Uid="{Binding User.UserID}"/>
                             </StackPanel>
                             <StackPanel Grid.Column="1" HorizontalAlignment="Right" Margin="15,0">
-                                <TextBlock Text="{Binding OrderDate, StringFormat=Дата создания заказа: {0:d}}" Style="{StaticResource TextBlock}" Foreground="#eb9c00" Language="ru-RU" Margin="0,0,0,10"/>
-                                <TextBlock Text="{Binding OrderDeliveryDate, StringFormat=Дата выдачи: {0:d}}" Style="{StaticResource TextBlock}" Foreground="#498C51" Language="ru-RU" Loaded="TextBlock_Loaded" Uid="{Binding OrderID}"/>
+                                <TextBlock Text="{Binding OrderDate, StringFormat=Дата создания заказа: {0:d}}" Style="{StaticResource TextBlock}" Language="ru-RU"/>
+                                <TextBlock Text="{Binding OrderDeliveryDate, StringFormat=Дата выдачи: {0:d}}" Style="{StaticResource TextBlock}" Language="ru-RU" Loaded="TextBlock_Loaded" Uid="{Binding OrderID}"/>
+                                <TextBlock Name="TB_StatusOrder" Style="{StaticResource TextBlock}" Loaded="TB_StatusOrder_Loaded"  Uid="{Binding OrderID}"/>
                             </StackPanel>
                         </Grid>
                     </Border>

Sessioa/Pages/OrderNew.xaml.cs

@@ -1,20 +1,12 @@
-using System;
+using Sessioa.BaseModel;
+using Sessioa.Classes;
 using System.Collections.Generic;
+using System.Data.Entity;
 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 Sessioa.BaseModel;
-using Sessioa.Classes;
-using System.Data.Entity;
 
 namespace Sessioa.Pages
 {
@@ -24,13 +16,14 @@ namespace Sessioa.Pages
     public partial class OrderNew : Page
     {
         User user = null;
+        List<string> sortList = new List<string>() { "По убыванию стоимости", "По возрастанию стоимости"};
         public OrderNew(User userSign)
         {
             InitializeComponent();
             user = userSign;
-            if(userSign.UserRole == 2)
+            if (userSign.UserRole == 2 || userSign.UserRole == 3)
             {
-                LB_OrderProduct.ItemsSource = BaseClass.C_Base.Order.Include(x => x.PointsOfIssue).Include(x=>x.User).ToList();
+                LB_OrderProduct.ItemsSource = BaseClass.C_Base.Order.Include(x => x.PointsOfIssue).Include(x => x.User).ToList();
             }
             else if (userSign.UserRole == 1)
                 LB_OrderProduct.ItemsSource = BaseClass.C_Base.Order.Include(x => x.PointsOfIssue).Where(x => x.UserID == userSign.UserID).ToList();
@@ -39,7 +32,7 @@ namespace Sessioa.Pages
         private void UserOrder_Loaded(object sender, RoutedEventArgs e)
         {
             TextBlock tb = (TextBlock)sender;
-            if(tb.Uid != null && user.UserRole == 2)
+            if (tb.Uid != null && (user.UserRole == 2 || user.UserRole == 3))
             {
                 User us = BaseClass.C_Base.User.FirstOrDefault(x => x.UserID.ToString() == tb.Uid);
                 tb.Text = $"Заказчик: {us.UserSurname} {us.UserName[0]}.{(us.UserPatronymic != null && us.UserPatronymic != string.Empty ? $"{us.UserPatronymic[0]}." : "")}";
@@ -48,18 +41,66 @@ namespace Sessioa.Pages
 
         private void B_Back_Click(object sender, RoutedEventArgs e)
         {
+            Application.Current.Properties["ListOrderUser"] = new List<Product>();
+            Application.Current.Properties["ListOrderCountUser"] = new Dictionary<string, int>();
             FrameClass.C_Frame.Navigate(new ProductsPage(user));
         }
 
         private void TextBlock_Loaded(object sender, RoutedEventArgs e)
         {
             TextBlock tb = (TextBlock)sender;
-            Order tmp = BaseClass.C_Base.Order.FirstOrDefault(x=>x.OrderID.ToString() == tb.Uid);
-            if(tmp.OrderDeliveryDate == null)
+            Order tmp = BaseClass.C_Base.Order.FirstOrDefault(x => x.OrderID.ToString() == tb.Uid);
+            if (tmp.OrderDeliveryDate == null)
+            {
+                tb.Text = "Дата выдачи не указана";
+                tb.Foreground = new SolidColorBrush(Color.FromRgb(235, 156, 0));
+            }
+        }
+
+        private void Border_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ClickCount > 1)
+            {
+                FrameClass.C_Frame.Navigate(new OrderCard(user, ((Order)LB_OrderProduct.SelectedItem).OrderID));
+            }
+        }
+
+        private void TB_StatusOrder_Loaded(object sender, RoutedEventArgs e)
+        {
+            TextBlock tb = (TextBlock)sender;
+            Order tmp = BaseClass.C_Base.Order.FirstOrDefault(x => x.OrderID.ToString() == tb.Uid);
+            if (tmp.OrderStatus == 2)
             {
-                tb.Text = "Заказ еще не выдан";
+                tb.Text = "Статус: Новый";
+                tb.Foreground = new SolidColorBrush(Color.FromRgb(73, 140, 81));
+            }
+            else
+            {
+                tb.Text = "Статус: Завершен";
                 tb.Foreground = new SolidColorBrush(Color.FromRgb(255, 0, 0));
             }
         }
+
+        private void Border_Loaded(object sender, RoutedEventArgs e)
+        {
+            Border brd = (Border)sender;
+            List<OrderProduct> op = BaseClass.C_Base.OrderProduct.Where(x => x.OrderID.ToString() == brd.Uid).ToList();
+            foreach (OrderProduct opItem in op)
+            {
+                Product prd = BaseClass.C_Base.Product.FirstOrDefault(x=>x.ProductArticleNumber == opItem.ProductArticleNumber);
+                if (prd.ProductQuantityInStock < 3)
+                    brd.BorderBrush = new SolidColorBrush(Color.FromRgb(255, 140, 0));
+            }
+        }
+
+        private void Sort_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+
+        }
+
+        private void Filt_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+
+        }
     }
 }

Sessioa/Pages/ProductsPage.xaml

@@ -72,7 +72,7 @@
             <TextBlock Text=" из " Style="{StaticResource TextBlock}"/>
             <TextBlock Name="TB_CountAll" Style="{StaticResource TextBlock}"/>
         </StackPanel>
-        <TextBlock Name="UserSign" HorizontalAlignment="Right" Style="{StaticResource TextBlock}" Margin="30,0"/>
+        <TextBlock Name="UserSign" HorizontalAlignment="Right" VerticalAlignment="Center" Style="{StaticResource TextBlock}" Margin="30,0"/>
         <StackPanel Orientation="Horizontal">
             <Button Name="SignOf" Content="Выйти" Style="{StaticResource ButtonAct}" Margin="10,0" MaxHeight="50" MinWidth="90" MaxWidth="150" Click="SignOf_Click" HorizontalAlignment="Left"/>
             <Button Name="NewProduct" Content="Добавить продукт" Style="{StaticResource ButtonSt}" Margin="10,0" MaxHeight="50" MinWidth="90" MaxWidth="150" Click="NewProduct_Click" HorizontalAlignment="Left" Visibility="Collapsed" Loaded="NewProduct_Loaded"/>

Sessioa/Pages/ProductsPage.xaml.cs

@@ -35,10 +35,13 @@ namespace Sessioa.Pages
             user = userSign;
             UserSign.Text = $"Вход выолнен: {user.UserSurname} {user.UserName} {user.UserPatronymic}";
             Init();
-            if(listOrder.Count > 0)
+            if(listOrder != null)
             {
-                OrderActUser.Visibility = Visibility.Visible;
-                OrderActUser.Content = $"Корзина({listOrder.Count})";
+                if (listOrder.Count > 0)
+                {
+                    OrderActUser.Visibility = Visibility.Visible;
+                    OrderActUser.Content = $"Корзина({listOrder.Count})";
+                }
             }
         }
         private void Init()
@@ -158,7 +161,7 @@ namespace Sessioa.Pages
             MenuItem mt = (MenuItem)(sender);
             if (user == null)
                 mt.Visibility = Visibility.Collapsed;
-            else if (user.UserRole == 1)
+            else if (user.UserRole != 2)
                 mt.Visibility = Visibility.Collapsed;
         }
 
@@ -167,7 +170,7 @@ namespace Sessioa.Pages
             MenuItem dt = (MenuItem)(sender);
             if (user == null)
                 dt.Visibility = Visibility.Collapsed;
-            else if (user.UserRole == 1)
+            else if (user.UserRole != 2)
                 dt.Visibility = Visibility.Collapsed;
         }
 
@@ -219,7 +222,7 @@ namespace Sessioa.Pages
             Button button = (Button)sender;
             if (user != null)
             {
-                if (user.UserRole == 2)
+                if (user.UserRole > 0)
                     button.Visibility = Visibility.Visible;
                 else if (BaseClass.C_Base.Order.Where(x => x.UserID == user.UserID).Count() > 0)
                     button.Visibility = Visibility.Visible;

Sessioa/bin/Debug/Sessioa.exe.config

@@ -9,7 +9,7 @@
   </startup>
   <connectionStrings>
     <add name="UP_ShechkovaEntities" connectionString="metadata=res://*/BaseModel.BaseUP.csdl|res://*/BaseModel.BaseUP.ssdl|res://*/BaseModel.BaseUP.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=sql;initial catalog=UP_Shechkova;persist security info=True;user id=33П;password=12357;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
-    <add name="BaseU" connectionString="metadata=res://*/BaseModel.ModelBase.csdl|res://*/BaseModel.ModelBase.ssdl|res://*/BaseModel.ModelBase.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=sql;initial catalog=UP_Shechkova;persist security info=True;user id=33П;password=12357;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+    <add name="BaseU" connectionString="metadata=res://*/BaseModel.ModelBase.csdl|res://*/BaseModel.ModelBase.ssdl|res://*/BaseModel.ModelBase.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=ngknn.ru;initial catalog=UP_Shechkova;persist security info=True;user id=33П;password=12357;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">

Sessioa/obj/Debug/App.g.cs

@@ -1,11 +1,11 @@
 #pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8EEEB997777A6EA415311DAB712AD0817BD6326FAB9663B962347AEFF985D603"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Sessioa/obj/Debug/App.g.i.cs

@@ -1,11 +1,11 @@
 #pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8EEEB997777A6EA415311DAB712AD0817BD6326FAB9663B962347AEFF985D603"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Sessioa/obj/Debug/MainWindow.g.cs

@@ -1,11 +1,11 @@
 #pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "36E0648BE417237A16015C17865BB7DDF762D1398859DAF327A02750A82A6CEB"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Sessioa/obj/Debug/MainWindow.g.i.cs

@@ -1,11 +1,11 @@
 #pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "36E0648BE417237A16015C17865BB7DDF762D1398859DAF327A02750A82A6CEB"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Sessioa/obj/Debug/Pages/Autorization.g.cs

@@ -1,11 +1,11 @@
 #pragma checksum "..\..\..\Pages\Autorization.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7DD1C1B23FFAFD9843770395D560B8523394A5F156CA8A9FDF1D6FDF95FC2DBD"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Sessioa/obj/Debug/Pages/Autorization.g.i.cs

@@ -1,11 +1,11 @@
 #pragma checksum "..\..\..\Pages\Autorization.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7DD1C1B23FFAFD9843770395D560B8523394A5F156CA8A9FDF1D6FDF95FC2DBD"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Sessioa/obj/Debug/Pages/OrderCard.g.cs

@@ -1,11 +1,11 @@
-#pragma checksum "..\..\..\Pages\OrderCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "77191A462C4716E56D42C1987C29748CCAE76DC8AD1342AE362151609893C4CA"
+#pragma checksum "..\..\..\Pages\OrderCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F6D9777AAFFE27442DFD46A673FA0681D52B4EF1F20D88B3576E37ED97A89173"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -41,7 +41,7 @@ namespace Sessioa.Pages {
     public partial class OrderCard : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
         
         
-        #line 22 "..\..\..\Pages\OrderCard.xaml"
+        #line 23 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button B_Back;
         
@@ -49,15 +49,39 @@ namespace Sessioa.Pages {
         #line hidden
         
         
+        #line 24 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock OrderTitle;
+        
+        #line default
+        #line hidden
+        
+        
         #line 25 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock OrderCode;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 29 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox CB_Punkt;
         
         #line default
         #line hidden
         
         
-        #line 27 "..\..\..\Pages\OrderCard.xaml"
+        #line 30 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock TB_Punkt;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 32 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox LB_ProductsOrder;
         
@@ -65,7 +89,15 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 76 "..\..\..\Pages\OrderCard.xaml"
+        #line 81 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.MenuItem DelProduct;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 86 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock TB_ItogoSkidka;
         
@@ -73,7 +105,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 79 "..\..\..\Pages\OrderCard.xaml"
+        #line 89 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock TB_Itogo;
         
@@ -81,7 +113,39 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 82 "..\..\..\Pages\OrderCard.xaml"
+        #line 91 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.StackPanel SP_EditOrder;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 93 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox StateOrder;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 95 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.StackPanel SP_EditDate;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 97 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.DatePicker DP_Order;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 100 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button B_Save;
         
@@ -121,28 +185,76 @@ namespace Sessioa.Pages {
             case 1:
             this.B_Back = ((System.Windows.Controls.Button)(target));
             
-            #line 22 "..\..\..\Pages\OrderCard.xaml"
+            #line 23 "..\..\..\Pages\OrderCard.xaml"
             this.B_Back.Click += new System.Windows.RoutedEventHandler(this.B_Back_Click);
             
             #line default
             #line hidden
             return;
             case 2:
-            this.CB_Punkt = ((System.Windows.Controls.ComboBox)(target));
+            this.OrderTitle = ((System.Windows.Controls.TextBlock)(target));
             return;
             case 3:
+            this.OrderCode = ((System.Windows.Controls.TextBlock)(target));
+            
+            #line 25 "..\..\..\Pages\OrderCard.xaml"
+            this.OrderCode.Loaded += new System.Windows.RoutedEventHandler(this.OrderCode_Loaded);
+            
+            #line default
+            #line hidden
+            return;
+            case 4:
+            this.CB_Punkt = ((System.Windows.Controls.ComboBox)(target));
+            return;
+            case 5:
+            this.TB_Punkt = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 6:
             this.LB_ProductsOrder = ((System.Windows.Controls.ListBox)(target));
             return;
-            case 10:
+            case 13:
+            this.DelProduct = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 81 "..\..\..\Pages\OrderCard.xaml"
+            this.DelProduct.Click += new System.Windows.RoutedEventHandler(this.DelProduct_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 14:
             this.TB_ItogoSkidka = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 11:
+            case 15:
             this.TB_Itogo = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 12:
+            case 16:
+            this.SP_EditOrder = ((System.Windows.Controls.StackPanel)(target));
+            
+            #line 91 "..\..\..\Pages\OrderCard.xaml"
+            this.SP_EditOrder.Loaded += new System.Windows.RoutedEventHandler(this.SP_EditOrder_Loaded);
+            
+            #line default
+            #line hidden
+            return;
+            case 17:
+            this.StateOrder = ((System.Windows.Controls.ComboBox)(target));
+            return;
+            case 18:
+            this.SP_EditDate = ((System.Windows.Controls.StackPanel)(target));
+            
+            #line 95 "..\..\..\Pages\OrderCard.xaml"
+            this.SP_EditDate.Loaded += new System.Windows.RoutedEventHandler(this.SP_EditOrder_Loaded);
+            
+            #line default
+            #line hidden
+            return;
+            case 19:
+            this.DP_Order = ((System.Windows.Controls.DatePicker)(target));
+            return;
+            case 20:
             this.B_Save = ((System.Windows.Controls.Button)(target));
             
-            #line 82 "..\..\..\Pages\OrderCard.xaml"
+            #line 100 "..\..\..\Pages\OrderCard.xaml"
             this.B_Save.Click += new System.Windows.RoutedEventHandler(this.B_Save_Click);
             
             #line default
@@ -161,51 +273,63 @@ namespace Sessioa.Pages {
         void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target) {
             switch (connectionId)
             {
-            case 4:
+            case 7:
             
-            #line 52 "..\..\..\Pages\OrderCard.xaml"
+            #line 57 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.countPr_Loaded);
             
             #line default
             #line hidden
             break;
-            case 5:
+            case 8:
             
-            #line 53 "..\..\..\Pages\OrderCard.xaml"
+            #line 58 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.countDPr_Loaded);
             
             #line default
             #line hidden
             break;
-            case 6:
+            case 9:
             
-            #line 56 "..\..\..\Pages\OrderCard.xaml"
+            #line 61 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Discount_Loaded);
             
             #line default
             #line hidden
             break;
-            case 7:
+            case 10:
             
-            #line 66 "..\..\..\Pages\OrderCard.xaml"
+            #line 71 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Back_B_Click);
             
+            #line default
+            #line hidden
+            
+            #line 71 "..\..\..\Pages\OrderCard.xaml"
+            ((System.Windows.Controls.Button)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Back_B_Loaded);
+            
             #line default
             #line hidden
             break;
-            case 8:
+            case 11:
             
-            #line 67 "..\..\..\Pages\OrderCard.xaml"
+            #line 72 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.CountProduct_Loaded);
             
             #line default
             #line hidden
             break;
-            case 9:
+            case 12:
             
-            #line 68 "..\..\..\Pages\OrderCard.xaml"
+            #line 73 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Next_B_Click);
             
+            #line default
+            #line hidden
+            
+            #line 73 "..\..\..\Pages\OrderCard.xaml"
+            ((System.Windows.Controls.Button)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Next_B_Loaded);
+            
             #line default
             #line hidden
             break;

Sessioa/obj/Debug/Pages/OrderCard.g.i.cs

@@ -1,11 +1,11 @@
-#pragma checksum "..\..\..\Pages\OrderCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "77191A462C4716E56D42C1987C29748CCAE76DC8AD1342AE362151609893C4CA"
+#pragma checksum "..\..\..\Pages\OrderCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F6D9777AAFFE27442DFD46A673FA0681D52B4EF1F20D88B3576E37ED97A89173"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -41,7 +41,7 @@ namespace Sessioa.Pages {
     public partial class OrderCard : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
         
         
-        #line 22 "..\..\..\Pages\OrderCard.xaml"
+        #line 23 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button B_Back;
         
@@ -49,15 +49,39 @@ namespace Sessioa.Pages {
         #line hidden
         
         
+        #line 24 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock OrderTitle;
+        
+        #line default
+        #line hidden
+        
+        
         #line 25 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock OrderCode;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 29 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox CB_Punkt;
         
         #line default
         #line hidden
         
         
-        #line 27 "..\..\..\Pages\OrderCard.xaml"
+        #line 30 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock TB_Punkt;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 32 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox LB_ProductsOrder;
         
@@ -65,7 +89,15 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 76 "..\..\..\Pages\OrderCard.xaml"
+        #line 81 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.MenuItem DelProduct;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 86 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock TB_ItogoSkidka;
         
@@ -73,7 +105,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 79 "..\..\..\Pages\OrderCard.xaml"
+        #line 89 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock TB_Itogo;
         
@@ -81,7 +113,39 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 82 "..\..\..\Pages\OrderCard.xaml"
+        #line 91 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.StackPanel SP_EditOrder;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 93 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox StateOrder;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 95 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.StackPanel SP_EditDate;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 97 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.DatePicker DP_Order;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 100 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button B_Save;
         
@@ -121,28 +185,76 @@ namespace Sessioa.Pages {
             case 1:
             this.B_Back = ((System.Windows.Controls.Button)(target));
             
-            #line 22 "..\..\..\Pages\OrderCard.xaml"
+            #line 23 "..\..\..\Pages\OrderCard.xaml"
             this.B_Back.Click += new System.Windows.RoutedEventHandler(this.B_Back_Click);
             
             #line default
             #line hidden
             return;
             case 2:
-            this.CB_Punkt = ((System.Windows.Controls.ComboBox)(target));
+            this.OrderTitle = ((System.Windows.Controls.TextBlock)(target));
             return;
             case 3:
+            this.OrderCode = ((System.Windows.Controls.TextBlock)(target));
+            
+            #line 25 "..\..\..\Pages\OrderCard.xaml"
+            this.OrderCode.Loaded += new System.Windows.RoutedEventHandler(this.OrderCode_Loaded);
+            
+            #line default
+            #line hidden
+            return;
+            case 4:
+            this.CB_Punkt = ((System.Windows.Controls.ComboBox)(target));
+            return;
+            case 5:
+            this.TB_Punkt = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 6:
             this.LB_ProductsOrder = ((System.Windows.Controls.ListBox)(target));
             return;
-            case 10:
+            case 13:
+            this.DelProduct = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 81 "..\..\..\Pages\OrderCard.xaml"
+            this.DelProduct.Click += new System.Windows.RoutedEventHandler(this.DelProduct_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 14:
             this.TB_ItogoSkidka = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 11:
+            case 15:
             this.TB_Itogo = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 12:
+            case 16:
+            this.SP_EditOrder = ((System.Windows.Controls.StackPanel)(target));
+            
+            #line 91 "..\..\..\Pages\OrderCard.xaml"
+            this.SP_EditOrder.Loaded += new System.Windows.RoutedEventHandler(this.SP_EditOrder_Loaded);
+            
+            #line default
+            #line hidden
+            return;
+            case 17:
+            this.StateOrder = ((System.Windows.Controls.ComboBox)(target));
+            return;
+            case 18:
+            this.SP_EditDate = ((System.Windows.Controls.StackPanel)(target));
+            
+            #line 95 "..\..\..\Pages\OrderCard.xaml"
+            this.SP_EditDate.Loaded += new System.Windows.RoutedEventHandler(this.SP_EditOrder_Loaded);
+            
+            #line default
+            #line hidden
+            return;
+            case 19:
+            this.DP_Order = ((System.Windows.Controls.DatePicker)(target));
+            return;
+            case 20:
             this.B_Save = ((System.Windows.Controls.Button)(target));
             
-            #line 82 "..\..\..\Pages\OrderCard.xaml"
+            #line 100 "..\..\..\Pages\OrderCard.xaml"
             this.B_Save.Click += new System.Windows.RoutedEventHandler(this.B_Save_Click);
             
             #line default
@@ -161,51 +273,63 @@ namespace Sessioa.Pages {
         void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target) {
             switch (connectionId)
             {
-            case 4:
+            case 7:
             
-            #line 52 "..\..\..\Pages\OrderCard.xaml"
+            #line 57 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.countPr_Loaded);
             
             #line default
             #line hidden
             break;
-            case 5:
+            case 8:
             
-            #line 53 "..\..\..\Pages\OrderCard.xaml"
+            #line 58 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.countDPr_Loaded);
             
             #line default
             #line hidden
             break;
-            case 6:
+            case 9:
             
-            #line 56 "..\..\..\Pages\OrderCard.xaml"
+            #line 61 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Discount_Loaded);
             
             #line default
             #line hidden
             break;
-            case 7:
+            case 10:
             
-            #line 66 "..\..\..\Pages\OrderCard.xaml"
+            #line 71 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Back_B_Click);
             
+            #line default
+            #line hidden
+            
+            #line 71 "..\..\..\Pages\OrderCard.xaml"
+            ((System.Windows.Controls.Button)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Back_B_Loaded);
+            
             #line default
             #line hidden
             break;
-            case 8:
+            case 11:
             
-            #line 67 "..\..\..\Pages\OrderCard.xaml"
+            #line 72 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.CountProduct_Loaded);
             
             #line default
             #line hidden
             break;
-            case 9:
+            case 12:
             
-            #line 68 "..\..\..\Pages\OrderCard.xaml"
+            #line 73 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Next_B_Click);
             
+            #line default
+            #line hidden
+            
+            #line 73 "..\..\..\Pages\OrderCard.xaml"
+            ((System.Windows.Controls.Button)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Next_B_Loaded);
+            
             #line default
             #line hidden
             break;

Sessioa/obj/Debug/Pages/OrderNew.g.cs

@@ -1,11 +1,12 @@
-#pragma checksum "..\..\..\Pages\OrderNew.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6DE62066C217B83ACF306C8D8543437A62871D70BC01A053B01501E8617E438E"
+// Updated by XamlIntelliSenseFileGenerator 19.03.2024 20:58:57
+#pragma checksum "..\..\..\Pages\OrderNew.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "88FBC162292BFAA71E117BC9C5469C3997F5DD381BBB5615379F5ACA63CA8FD1"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -32,103 +33,136 @@ using System.Windows.Shapes;
 using System.Windows.Shell;
 
 
-namespace Sessioa.Pages {
-    
-    
+namespace Sessioa.Pages
+{
+
+
     /// <summary>
     /// OrderNew
     /// </summary>
-    public partial class OrderNew : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
-        
-        
-        #line 19 "..\..\..\Pages\OrderNew.xaml"
+    public partial class OrderNew : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector
+    {
+
+
+#line 19 "..\..\..\Pages\OrderNew.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button B_Back;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 20 "..\..\..\Pages\OrderNew.xaml"
+
+#line default
+#line hidden
+
+
+#line 20 "..\..\..\Pages\OrderNew.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox LB_OrderProduct;
-        
-        #line default
-        #line hidden
-        
+
+#line default
+#line hidden
+
         private bool _contentLoaded;
-        
+
         /// <summary>
         /// InitializeComponent
         /// </summary>
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
+        public void InitializeComponent()
+        {
+            if (_contentLoaded)
+            {
                 return;
             }
             _contentLoaded = true;
             System.Uri resourceLocater = new System.Uri("/Sessioa;component/pages/ordernew.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\Pages\OrderNew.xaml"
+
+#line 1 "..\..\..\Pages\OrderNew.xaml"
             System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
+
+#line default
+#line hidden
         }
-        
+
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
+        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target)
+        {
             switch (connectionId)
             {
-            case 1:
-            this.B_Back = ((System.Windows.Controls.Button)(target));
-            
-            #line 19 "..\..\..\Pages\OrderNew.xaml"
-            this.B_Back.Click += new System.Windows.RoutedEventHandler(this.B_Back_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this.LB_OrderProduct = ((System.Windows.Controls.ListBox)(target));
-            return;
+                case 1:
+                    this.B_Back = ((System.Windows.Controls.Button)(target));
+
+#line 19 "..\..\..\Pages\OrderNew.xaml"
+                    this.B_Back.Click += new System.Windows.RoutedEventHandler(this.B_Back_Click);
+
+#line default
+#line hidden
+                    return;
+                case 2:
+                    this.LB_OrderProduct = ((System.Windows.Controls.ListBox)(target));
+                    return;
             }
             this._contentLoaded = true;
         }
-        
+
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target) {
+        void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target)
+        {
             switch (connectionId)
             {
-            case 3:
-            
-            #line 31 "..\..\..\Pages\OrderNew.xaml"
-            ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserOrder_Loaded);
-            
-            #line default
-            #line hidden
-            break;
-            case 4:
-            
-            #line 35 "..\..\..\Pages\OrderNew.xaml"
-            ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.TextBlock_Loaded);
-            
-            #line default
-            #line hidden
-            break;
+                case 3:
+
+#line 23 "..\..\..\Pages\OrderNew.xaml"
+                    ((System.Windows.Controls.Border)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Border_Loaded);
+
+#line default
+#line hidden
+                    break;
+                case 4:
+
+#line 24 "..\..\..\Pages\OrderNew.xaml"
+                    ((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseDown);
+
+#line default
+#line hidden
+                    break;
+                case 5:
+
+#line 31 "..\..\..\Pages\OrderNew.xaml"
+                    ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserOrder_Loaded);
+
+#line default
+#line hidden
+                    break;
+                case 6:
+
+#line 35 "..\..\..\Pages\OrderNew.xaml"
+                    ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.TextBlock_Loaded);
+
+#line default
+#line hidden
+                    break;
+                case 7:
+
+#line 36 "..\..\..\Pages\OrderNew.xaml"
+                    ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.TB_StatusOrder_Loaded);
+
+#line default
+#line hidden
+                    break;
             }
         }
+
+        internal System.Windows.Controls.ComboBox Sort;
+        internal System.Windows.Controls.ComboBox Filt;
     }
 }
 

Sessioa/obj/Debug/Pages/OrderNew.g.i.cs

@@ -1,11 +1,11 @@
-#pragma checksum "..\..\..\Pages\OrderNew.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6DE62066C217B83ACF306C8D8543437A62871D70BC01A053B01501E8617E438E"
+#pragma checksum "..\..\..\Pages\OrderNew.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "88FBC162292BFAA71E117BC9C5469C3997F5DD381BBB5615379F5ACA63CA8FD1"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -113,17 +113,41 @@ namespace Sessioa.Pages {
             {
             case 3:
             
+            #line 23 "..\..\..\Pages\OrderNew.xaml"
+            ((System.Windows.Controls.Border)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Border_Loaded);
+            
+            #line default
+            #line hidden
+            break;
+            case 4:
+            
+            #line 24 "..\..\..\Pages\OrderNew.xaml"
+            ((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseDown);
+            
+            #line default
+            #line hidden
+            break;
+            case 5:
+            
             #line 31 "..\..\..\Pages\OrderNew.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserOrder_Loaded);
             
             #line default
             #line hidden
             break;
-            case 4:
+            case 6:
             
             #line 35 "..\..\..\Pages\OrderNew.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.TextBlock_Loaded);
             
+            #line default
+            #line hidden
+            break;
+            case 7:
+            
+            #line 36 "..\..\..\Pages\OrderNew.xaml"
+            ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.TB_StatusOrder_Loaded);
+            
             #line default
             #line hidden
             break;

Sessioa/obj/Debug/Pages/ProductCard.g.cs

@@ -1,11 +1,11 @@
 #pragma checksum "..\..\..\Pages\ProductCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EA196B0C2978C4E9849AECD88945A5451B9703871249AD7CC347ADF9EEDE0FEC"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Sessioa/obj/Debug/Pages/ProductCard.g.i.cs

@@ -1,11 +1,11 @@
 #pragma checksum "..\..\..\Pages\ProductCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EA196B0C2978C4E9849AECD88945A5451B9703871249AD7CC347ADF9EEDE0FEC"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Sessioa/obj/Debug/Pages/ProductsPage.g.cs

@@ -1,11 +1,11 @@
-#pragma checksum "..\..\..\Pages\ProductsPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B6F272295A0DF61B52BD9DEDD41F6D02B8B68CA57AB530F6C1159E7E21795DB0"
+#pragma checksum "..\..\..\Pages\ProductsPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3D21C455E832A5432CB5B6E708EBCAACEFD7CF074474BDBFD499225009DB56BA"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Sessioa/obj/Debug/Pages/ProductsPage.g.i.cs

@@ -1,11 +1,11 @@
-#pragma checksum "..\..\..\Pages\ProductsPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B6F272295A0DF61B52BD9DEDD41F6D02B8B68CA57AB530F6C1159E7E21795DB0"
+#pragma checksum "..\..\..\Pages\ProductsPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3D21C455E832A5432CB5B6E708EBCAACEFD7CF074474BDBFD499225009DB56BA"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Sessioa/obj/Debug/Sessioa.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-6c6e7fb39e0f59fb2f88d11695db3d7bac652f97
+bdce278c4b38f1b8bd61628c74a958bf11fc74ff3c0f4792efb97d3f17d8cdfa

Sessioa/obj/Debug/Sessioa.csproj.FileListAbsolute.txt

@@ -64,3 +64,36 @@ C:\Users\шечковано\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa.exe
 C:\Users\шечковано\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa.pdb
 C:\Users\шечковано\Downloads\UP_wpf\Sessioa\obj\Debug\Pages\OrderCard.g.cs
 C:\Users\шечковано\Downloads\UP_wpf\Sessioa\obj\Debug\Pages\OrderCard.baml
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\bin\Debug\Sessioa.exe.config
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\bin\Debug\Sessioa.exe
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\bin\Debug\Sessioa.pdb
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\bin\Debug\EntityFramework.dll
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\bin\Debug\EntityFramework.SqlServer.dll
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\bin\Debug\EntityFramework.xml
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\bin\Debug\EntityFramework.SqlServer.xml
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\bin\Debug\ru\EntityFramework.resources.dll
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa.csproj.AssemblyReference.cache
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\MainWindow.g.cs
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Pages\Autorization.g.cs
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Pages\OrderCard.g.cs
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Pages\OrderNew.g.cs
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Pages\ProductCard.g.cs
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Pages\ProductsPage.g.cs
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\App.g.cs
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa_Content.g.cs
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa_MarkupCompile.cache
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa_MarkupCompile.lref
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\App.baml
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\MainWindow.baml
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Pages\Autorization.baml
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Pages\OrderCard.baml
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Pages\OrderNew.baml
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Pages\ProductCard.baml
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Pages\ProductsPage.baml
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa.g.resources
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa.Properties.Resources.resources
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa.csproj.GenerateResource.cache
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa.csproj.CoreCompileInputs.cache
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa.csproj.CopyComplete
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa.exe
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa.pdb

Sessioa/obj/Debug/Sessioa_Content.g.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Sessioa/obj/Debug/Sessioa_Content.g.i.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Sessioa/obj/Debug/Sessioa_MarkupCompile.cache

@@ -4,16 +4,16 @@
 winexe
 C#
 .cs
-C:\Users\шечковано\Downloads\UP_wpf\Sessioa\obj\Debug\
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\
 Sessioa
 none
 false
 DEBUG;TRACE
-C:\Users\шечковано\Downloads\UP_wpf\Sessioa\App.xaml
+C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\App.xaml
 6-99224500
 2-1121443055
 251484281289
-20-1197076445
+20173418577
 MainWindow.xaml;Pages\Autorization.xaml;Pages\OrderCard.xaml;Pages\OrderNew.xaml;Pages\ProductCard.xaml;Pages\ProductsPage.xaml;
 
 False

Sessioa/obj/Debug/Sessioa_MarkupCompile.lref

@@ -1,9 +1,9 @@
 
-FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\App.xaml;;
-FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\MainWindow.xaml;;
-FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\Pages\Autorization.xaml;;
-FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\Pages\OrderNew.xaml;;
-FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\Pages\ProductCard.xaml;;
-FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\Pages\ProductsPage.xaml;;
-FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\Pages\OrderCard.xaml;;
+FC:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\App.xaml;;
+FC:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\MainWindow.xaml;;
+FC:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\Pages\Autorization.xaml;;
+FC:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\Pages\OrderCard.xaml;;
+FC:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\Pages\OrderNew.xaml;;
+FC:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\Pages\ProductCard.xaml;;
+FC:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\Pages\ProductsPage.xaml;;