фильрация/сортировка заказов

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=ngknn.ru;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" />
   </connectionStrings>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">

Sessioa/BaseModel/Order.cs

@@ -11,7 +11,8 @@ namespace Sessioa.BaseModel
 {
     using System;
     using System.Collections.Generic;
-    
+    using System.ComponentModel.DataAnnotations.Schema;
+
     public partial class Order
     {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
@@ -33,5 +34,10 @@ namespace Sessioa.BaseModel
         public virtual PointsOfIssue PointsOfIssue { get; set; }
         public virtual StatusOrder StatusOrder { get; set; }
         public virtual User User { get; set; }
+
+        [NotMapped]
+        public decimal Cost { get; set; }
+        [NotMapped]
+        public decimal Discount { get; set; }
     }
 }

Sessioa/MainWindow.xaml

@@ -8,7 +8,8 @@
         Title="ООО «Пиши-стирай»" Height="450" Width="800"
         FontFamily="Comic Sans MS"
         FontSize="16"
-        Icon="/Resources/logo.png">
+        Icon="/Resources/logo.png"
+        WindowState="Maximized">
     <Grid>
         <Frame Name="FrameMain" NavigationUIVisibility="Hidden"/>
     </Grid>

Sessioa/Pages/OrderNew.xaml

@@ -18,7 +18,7 @@
             <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"/>
-        <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Right">
+        <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Right" Margin="15,0">
             <ComboBox Name="Sort" MaxHeight="60" Width="250" Margin="10,0" SelectionChanged="Sort_SelectionChanged"/>
             <ComboBox Name="Filt" MaxHeight="60" Width="250" SelectionChanged="Filt_SelectionChanged"/>
         </StackPanel>

Sessioa/Pages/OrderNew.xaml.cs

@@ -1,5 +1,6 @@
 using Sessioa.BaseModel;
 using Sessioa.Classes;
+using System;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
@@ -16,17 +17,28 @@ namespace Sessioa.Pages
     public partial class OrderNew : Page
     {
         User user = null;
-        List<string> sortList = new List<string>() { "По убыванию стоимости", "По возрастанию стоимости"};
+        List<string> sortList = new List<string>() { "Без сортировки", "По убыванию стоимости", "По возрастанию стоимости" };
+        List<string> filtList = new List<string>() { "Без фильтрации", "0-10%", "11-14%", "15% >" };
+        List<Order> orders = new List<Order>();
         public OrderNew(User userSign)
         {
             InitializeComponent();
             user = userSign;
             if (userSign.UserRole == 2 || userSign.UserRole == 3)
             {
-                LB_OrderProduct.ItemsSource = BaseClass.C_Base.Order.Include(x => x.PointsOfIssue).Include(x => x.User).ToList();
+                orders = BaseClass.C_Base.Order.Include(x => x.PointsOfIssue).Include(x => x.User).Include(x => x.OrderProduct).ToList();
+                LB_OrderProduct.ItemsSource = orders;
             }
             else if (userSign.UserRole == 1)
-                LB_OrderProduct.ItemsSource = BaseClass.C_Base.Order.Include(x => x.PointsOfIssue).Where(x => x.UserID == userSign.UserID).ToList();
+            {
+                orders = BaseClass.C_Base.Order.Include(x => x.PointsOfIssue).Where(x => x.UserID == userSign.UserID).Include(x => x.OrderProduct).ToList();
+                LB_OrderProduct.ItemsSource = orders;
+            }
+            Sort.ItemsSource = sortList;
+            Sort.SelectedItem = sortList[0];
+
+            Filt.ItemsSource = filtList;
+            Filt.SelectedItem = filtList[0];
         }
 
         private void UserOrder_Loaded(object sender, RoutedEventArgs e)
@@ -87,7 +99,7 @@ namespace Sessioa.Pages
             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);
+                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));
             }
@@ -95,12 +107,80 @@ namespace Sessioa.Pages
 
         private void Sort_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-
+            Sett();
         }
 
         private void Filt_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
+            Sett();
+        }
+        private void Sett()
+        {
+            foreach (Order od in orders)
+            {
+                decimal itogoBezSkidki = 0;
+                decimal itogoSoSkidkoy = 0;
+                List<OrderProduct> tmpOP = BaseClass.C_Base.OrderProduct.Where(x => x.OrderID == od.OrderID).ToList();
+                foreach (OrderProduct opItem in tmpOP)
+                {
+                    Product prAdd = BaseClass.C_Base.Product.FirstOrDefault(x => x.ProductArticleNumber == opItem.ProductArticleNumber);
+                    itogoBezSkidki += prAdd.ProductCost * opItem.ProductCount;
+                    if (prAdd.ProductDiscountAmount != null && prAdd.ProductDiscountAmount != 0)
+                    {
+                        itogoSoSkidkoy += (prAdd.ProductCost - (prAdd.ProductCost * ((decimal)prAdd.ProductDiscountAmount / 100))) * opItem.ProductCount;
+                    }
+                    else
+                        itogoSoSkidkoy += prAdd.ProductCost * opItem.ProductCount;
+                }
+                od.Cost = itogoSoSkidkoy;
+                od.Discount = Math.Round((1 - (itogoSoSkidkoy / itogoBezSkidki)) * 100, 2);
+            }
+
+            if (user.UserRole == 2 || user.UserRole == 3)
+                orders = BaseClass.C_Base.Order.Include(x => x.PointsOfIssue).Include(x => x.User).Include(x => x.OrderProduct).ToList();
+            else if (user.UserRole == 1)
+                orders = BaseClass.C_Base.Order.Include(x => x.PointsOfIssue).Where(x => x.UserID == user.UserID).Include(x => x.OrderProduct).ToList();
+
+            switch (Filt.SelectedIndex)
+            {
+
+                case 1:
+                    {
+                        orders = orders.Where(x => x.Discount <= 10).ToList();
+                        break;
+                    }
+                case 2:
+                    {
+                        orders = orders.Where(x => x.Discount > 10 && x.Discount <= 14).ToList();
+                        break;
+                    }
+                case 3:
+                    {
+                        orders = orders.Where(x => x.Discount >= 15).ToList();
+                        break;
+                    }
+            }
+            switch (Sort.SelectedIndex)
+            {
+                case 1:
+                    {
+                        orders = orders.OrderByDescending(x => x.Cost).ToList();
+                        LB_OrderProduct.ItemsSource = orders;
+                        break;
+                    }
+                case 2:
+                    {
+                        orders = orders.OrderBy(x => x.Cost).ToList();
+                        LB_OrderProduct.ItemsSource = orders;
+                        break;
+                    }
+                default:
+                    {
+                        break;
+                    }
+            }
 
+            LB_OrderProduct.ItemsSource = orders;
         }
     }
 }

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=ngknn.ru;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" />
   </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>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия: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>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия: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"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "891DD812E4D54C27AB680B508E6C363140720F56670861F4EB712F17EEBFF294"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия: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 {
     public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
         
-        #line 13 "..\..\MainWindow.xaml"
+        #line 14 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Frame FrameMain;
         

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

@@ -1,11 +1,11 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "36E0648BE417237A16015C17865BB7DDF762D1398859DAF327A02750A82A6CEB"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "891DD812E4D54C27AB680B508E6C363140720F56670861F4EB712F17EEBFF294"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия: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 {
     public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
         
-        #line 13 "..\..\MainWindow.xaml"
+        #line 14 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Frame FrameMain;
         

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

@@ -1,11 +1,11 @@
 #pragma checksum "..\..\..\Pages\Autorization.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7DD1C1B23FFAFD9843770395D560B8523394A5F156CA8A9FDF1D6FDF95FC2DBD"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия: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>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия: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}" "F6D9777AAFFE27442DFD46A673FA0681D52B4EF1F20D88B3576E37ED97A89173"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия: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.i.cs

@@ -1,11 +1,11 @@
 #pragma checksum "..\..\..\Pages\OrderCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F6D9777AAFFE27442DFD46A673FA0681D52B4EF1F20D88B3576E37ED97A89173"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия: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/OrderNew.g.cs

@@ -1,12 +1,11 @@
-// Updated by XamlIntelliSenseFileGenerator 19.03.2024 20:58:57
-#pragma checksum "..\..\..\Pages\OrderNew.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "88FBC162292BFAA71E117BC9C5469C3997F5DD381BBB5615379F5ACA63CA8FD1"
+#pragma checksum "..\..\..\Pages\OrderNew.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "11D8F8A7E9D29B67ADC88C2329BA49794C208575F4CA75CDD4AACA7EEBCA3AF0"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -33,136 +32,161 @@ 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 20 "..\..\..\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 22 "..\..\..\Pages\OrderNew.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox Sort;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 23 "..\..\..\Pages\OrderNew.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox Filt;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 25 "..\..\..\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 20 "..\..\..\Pages\OrderNew.xaml"
+            this.B_Back.Click += new System.Windows.RoutedEventHandler(this.B_Back_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 2:
+            this.Sort = ((System.Windows.Controls.ComboBox)(target));
+            
+            #line 22 "..\..\..\Pages\OrderNew.xaml"
+            this.Sort.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.Sort_SelectionChanged);
+            
+            #line default
+            #line hidden
+            return;
+            case 3:
+            this.Filt = ((System.Windows.Controls.ComboBox)(target));
+            
+            #line 23 "..\..\..\Pages\OrderNew.xaml"
+            this.Filt.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.Filt_SelectionChanged);
+            
+            #line default
+            #line hidden
+            return;
+            case 4:
+            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 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;
+            case 5:
+            
+            #line 28 "..\..\..\Pages\OrderNew.xaml"
+            ((System.Windows.Controls.Border)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Border_Loaded);
+            
+            #line default
+            #line hidden
+            break;
+            case 6:
+            
+            #line 29 "..\..\..\Pages\OrderNew.xaml"
+            ((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseDown);
+            
+            #line default
+            #line hidden
+            break;
+            case 7:
+            
+            #line 36 "..\..\..\Pages\OrderNew.xaml"
+            ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserOrder_Loaded);
+            
+            #line default
+            #line hidden
+            break;
+            case 8:
+            
+            #line 40 "..\..\..\Pages\OrderNew.xaml"
+            ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.TextBlock_Loaded);
+            
+            #line default
+            #line hidden
+            break;
+            case 9:
+            
+            #line 41 "..\..\..\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}" "88FBC162292BFAA71E117BC9C5469C3997F5DD381BBB5615379F5ACA63CA8FD1"
+#pragma checksum "..\..\..\Pages\OrderNew.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "11D8F8A7E9D29B67ADC88C2329BA49794C208575F4CA75CDD4AACA7EEBCA3AF0"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия: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 OrderNew : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
         
         
-        #line 19 "..\..\..\Pages\OrderNew.xaml"
+        #line 20 "..\..\..\Pages\OrderNew.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button B_Back;
         
@@ -49,7 +49,23 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 20 "..\..\..\Pages\OrderNew.xaml"
+        #line 22 "..\..\..\Pages\OrderNew.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox Sort;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 23 "..\..\..\Pages\OrderNew.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox Filt;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 25 "..\..\..\Pages\OrderNew.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox LB_OrderProduct;
         
@@ -89,13 +105,31 @@ namespace Sessioa.Pages {
             case 1:
             this.B_Back = ((System.Windows.Controls.Button)(target));
             
-            #line 19 "..\..\..\Pages\OrderNew.xaml"
+            #line 20 "..\..\..\Pages\OrderNew.xaml"
             this.B_Back.Click += new System.Windows.RoutedEventHandler(this.B_Back_Click);
             
             #line default
             #line hidden
             return;
             case 2:
+            this.Sort = ((System.Windows.Controls.ComboBox)(target));
+            
+            #line 22 "..\..\..\Pages\OrderNew.xaml"
+            this.Sort.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.Sort_SelectionChanged);
+            
+            #line default
+            #line hidden
+            return;
+            case 3:
+            this.Filt = ((System.Windows.Controls.ComboBox)(target));
+            
+            #line 23 "..\..\..\Pages\OrderNew.xaml"
+            this.Filt.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.Filt_SelectionChanged);
+            
+            #line default
+            #line hidden
+            return;
+            case 4:
             this.LB_OrderProduct = ((System.Windows.Controls.ListBox)(target));
             return;
             }
@@ -111,41 +145,41 @@ namespace Sessioa.Pages {
         void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target) {
             switch (connectionId)
             {
-            case 3:
+            case 5:
             
-            #line 23 "..\..\..\Pages\OrderNew.xaml"
+            #line 28 "..\..\..\Pages\OrderNew.xaml"
             ((System.Windows.Controls.Border)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Border_Loaded);
             
             #line default
             #line hidden
             break;
-            case 4:
+            case 6:
             
-            #line 24 "..\..\..\Pages\OrderNew.xaml"
+            #line 29 "..\..\..\Pages\OrderNew.xaml"
             ((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseDown);
             
             #line default
             #line hidden
             break;
-            case 5:
+            case 7:
             
-            #line 31 "..\..\..\Pages\OrderNew.xaml"
+            #line 36 "..\..\..\Pages\OrderNew.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserOrder_Loaded);
             
             #line default
             #line hidden
             break;
-            case 6:
+            case 8:
             
-            #line 35 "..\..\..\Pages\OrderNew.xaml"
+            #line 40 "..\..\..\Pages\OrderNew.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.TextBlock_Loaded);
             
             #line default
             #line hidden
             break;
-            case 7:
+            case 9:
             
-            #line 36 "..\..\..\Pages\OrderNew.xaml"
+            #line 41 "..\..\..\Pages\OrderNew.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.TB_StatusOrder_Loaded);
             
             #line default

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

@@ -1,11 +1,11 @@
 #pragma checksum "..\..\..\Pages\ProductCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EA196B0C2978C4E9849AECD88945A5451B9703871249AD7CC347ADF9EEDE0FEC"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия: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>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия: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}" "3D21C455E832A5432CB5B6E708EBCAACEFD7CF074474BDBFD499225009DB56BA"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия: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}" "3D21C455E832A5432CB5B6E708EBCAACEFD7CF074474BDBFD499225009DB56BA"
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия: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 @@
-bdce278c4b38f1b8bd61628c74a958bf11fc74ff3c0f4792efb97d3f17d8cdfa
+6c6e7fb39e0f59fb2f88d11695db3d7bac652f97

Sessioa/obj/Debug/Sessioa_Content.g.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия: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>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Этот код создан программой.
+//     Исполняемая версия: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\Nadezhdin\Downloads\UP_wpf\Sessioa\obj\Debug\
+C:\Users\шечковано\Downloads\UP_wpf\Sessioa\obj\Debug\
 Sessioa
 none
 false
 DEBUG;TRACE
-C:\Users\Nadezhdin\Downloads\UP_wpf\Sessioa\App.xaml
+C:\Users\шечковано\Downloads\UP_wpf\Sessioa\App.xaml
 6-99224500
 2-1121443055
 251484281289
-20173418577
+20-1197076445
 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\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;;
+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\OrderCard.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;;