Browse Source

сохранение заказа

unknown 8 months ago
parent
commit
f7220ae283
52 changed files with 280 additions and 180 deletions
  1. BIN
      .vs/Sessioa/FileContentIndex/1e05898c-1a45-43ab-8715-3da4d5174677.vsidx
  2. BIN
      .vs/Sessioa/FileContentIndex/6fcfd169-de8d-494f-99b5-0ff7acfb2394.vsidx
  3. BIN
      .vs/Sessioa/FileContentIndex/7dd430b7-6e7d-4187-b7bb-c5707159632d.vsidx
  4. BIN
      .vs/Sessioa/FileContentIndex/a608482a-47b0-4308-937a-aac62a3e0b48.vsidx
  5. BIN
      .vs/Sessioa/FileContentIndex/aad06f70-e7d0-4b06-aaff-4201be832805.vsidx
  6. BIN
      .vs/Sessioa/v17/.suo
  7. 1 1
      Sessioa/BaseModel/ModelBase.Designer.cs
  8. 4 5
      Sessioa/BaseModel/ModelBase.edmx
  9. 1 1
      Sessioa/BaseModel/Order.cs
  10. 4 2
      Sessioa/MainWindow.xaml
  11. 3 2
      Sessioa/Pages/Autorization.xaml
  12. 8 2
      Sessioa/Pages/OrderCard.xaml
  13. 42 12
      Sessioa/Pages/OrderCard.xaml.cs
  14. 4 2
      Sessioa/Pages/OrderNew.xaml
  15. 11 0
      Sessioa/Pages/OrderNew.xaml.cs
  16. 1 1
      Sessioa/Pages/ProductCard.xaml
  17. 2 0
      Sessioa/Pages/ProductsPage.xaml
  18. 10 0
      Sessioa/Properties/Resources.Designer.cs
  19. 3 0
      Sessioa/Properties/Resources.resx
  20. BIN
      Sessioa/Resources/logo.png
  21. 1 0
      Sessioa/Sessioa.csproj
  22. BIN
      Sessioa/bin/Debug/Sessioa.exe
  23. BIN
      Sessioa/bin/Debug/Sessioa.pdb
  24. BIN
      Sessioa/obj/Debug/MainWindow.baml
  25. 2 2
      Sessioa/obj/Debug/MainWindow.g.cs
  26. 2 2
      Sessioa/obj/Debug/MainWindow.g.i.cs
  27. BIN
      Sessioa/obj/Debug/Pages/Autorization.baml
  28. 7 7
      Sessioa/obj/Debug/Pages/Autorization.g.cs
  29. 7 7
      Sessioa/obj/Debug/Pages/Autorization.g.i.cs
  30. BIN
      Sessioa/obj/Debug/Pages/OrderCard.baml
  31. 34 23
      Sessioa/obj/Debug/Pages/OrderCard.g.cs
  32. 34 23
      Sessioa/obj/Debug/Pages/OrderCard.g.i.cs
  33. BIN
      Sessioa/obj/Debug/Pages/OrderNew.baml
  34. 13 5
      Sessioa/obj/Debug/Pages/OrderNew.g.cs
  35. 13 5
      Sessioa/obj/Debug/Pages/OrderNew.g.i.cs
  36. BIN
      Sessioa/obj/Debug/Pages/ProductCard.baml
  37. 1 1
      Sessioa/obj/Debug/Pages/ProductCard.g.cs
  38. 1 1
      Sessioa/obj/Debug/Pages/ProductCard.g.i.cs
  39. BIN
      Sessioa/obj/Debug/Pages/ProductsPage.baml
  40. 34 34
      Sessioa/obj/Debug/Pages/ProductsPage.g.cs
  41. 34 34
      Sessioa/obj/Debug/Pages/ProductsPage.g.i.cs
  42. BIN
      Sessioa/obj/Debug/Sessioa.Properties.Resources.resources
  43. BIN
      Sessioa/obj/Debug/Sessioa.csproj.GenerateResource.cache
  44. BIN
      Sessioa/obj/Debug/Sessioa.exe
  45. BIN
      Sessioa/obj/Debug/Sessioa.g.resources
  46. BIN
      Sessioa/obj/Debug/Sessioa.pdb
  47. 1 6
      Sessioa/obj/Debug/Sessioa_MarkupCompile.i.lref
  48. BIN
      Sessioa/obj/Debug/TempPE/BaseModel.ModelBase.Designer.cs.dll
  49. BIN
      Sessioa/obj/Debug/TempPE/BaseModel.ModelBase.cs.dll
  50. BIN
      Sessioa/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
  51. 1 1
      Sessioa/obj/Debug/edmxResourcesToEmbed/BaseModel/ModelBase.csdl
  52. 1 1
      Sessioa/obj/Debug/edmxResourcesToEmbed/BaseModel/ModelBase.ssdl

BIN
.vs/Sessioa/FileContentIndex/01f7b105-1d29-4624-9a60-747b97f27a71.vsidx → .vs/Sessioa/FileContentIndex/1e05898c-1a45-43ab-8715-3da4d5174677.vsidx


BIN
.vs/Sessioa/FileContentIndex/6fcfd169-de8d-494f-99b5-0ff7acfb2394.vsidx


BIN
.vs/Sessioa/FileContentIndex/7dd430b7-6e7d-4187-b7bb-c5707159632d.vsidx


BIN
.vs/Sessioa/FileContentIndex/a608482a-47b0-4308-937a-aac62a3e0b48.vsidx


BIN
.vs/Sessioa/FileContentIndex/aad06f70-e7d0-4b06-aaff-4201be832805.vsidx


BIN
.vs/Sessioa/v17/.suo


+ 1 - 1
Sessioa/BaseModel/ModelBase.Designer.cs

@@ -1,4 +1,4 @@
-// Создание кода T4 для модели "\\main\RDP\43П\шечковано\Desktop\gg\Sessioa\Sessioa\BaseModel\ModelBase.edmx" включено. 
+// Создание кода T4 для модели "C:\Users\шечковано\Downloads\UP_wpf\Sessioa\BaseModel\ModelBase.edmx" включено. 
 // Чтобы включить формирование кода прежних версий, измените значение свойства "Стратегия создания кода" конструктора
 // на "Legacy ObjectContext". Это свойство доступно в окне "Свойства", если модель
 // открыта в конструкторе.

+ 4 - 5
Sessioa/BaseModel/ModelBase.edmx

@@ -4,7 +4,7 @@
   <edmx:Runtime>
     <!-- SSDL content -->
     <edmx:StorageModels>
-      <Schema Namespace="Хранилище UP_ShechkovaModel" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
+    <Schema Namespace="Хранилище UP_ShechkovaModel" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
         <EntityType Name="Manufacturer">
           <Key>
             <PropertyRef Name="ManufacturerId" />
@@ -19,7 +19,7 @@
           <Property Name="OrderID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="OrderStatus" Type="int" Nullable="false" />
           <Property Name="OrderDate" Type="datetime" Nullable="false" />
-          <Property Name="OrderDeliveryDate" Type="datetime" Nullable="false" />
+          <Property Name="OrderDeliveryDate" Type="datetime" />
           <Property Name="OrderPickupPoint" Type="int" Nullable="false" />
           <Property Name="UserID" Type="int" />
           <Property Name="IssueCode" Type="int" Nullable="false" />
@@ -251,8 +251,7 @@
             <End Role="Product" EntitySet="Product" />
           </AssociationSet>
         </EntityContainer>
-      </Schema>
-    </edmx:StorageModels>
+      </Schema></edmx:StorageModels>
     <!-- CSDL content -->
     <edmx:ConceptualModels>
       <Schema Namespace="UP_ShechkovaModel" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
@@ -271,7 +270,7 @@
           <Property Name="OrderID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="OrderStatus" Type="Int32" Nullable="false" />
           <Property Name="OrderDate" Type="DateTime" Nullable="false" Precision="3" />
-          <Property Name="OrderDeliveryDate" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="OrderDeliveryDate" Type="DateTime" Precision="3" />
           <Property Name="OrderPickupPoint" Type="Int32" Nullable="false" />
           <Property Name="UserID" Type="Int32" />
           <Property Name="IssueCode" Type="Int32" Nullable="false" />

+ 1 - 1
Sessioa/BaseModel/Order.cs

@@ -23,7 +23,7 @@ namespace Sessioa.BaseModel
         public int OrderID { get; set; }
         public int OrderStatus { get; set; }
         public System.DateTime OrderDate { get; set; }
-        public System.DateTime OrderDeliveryDate { get; set; }
+        public Nullable<System.DateTime> OrderDeliveryDate { get; set; }
         public int OrderPickupPoint { get; set; }
         public Nullable<int> UserID { get; set; }
         public int IssueCode { get; set; }

+ 4 - 2
Sessioa/MainWindow.xaml

@@ -5,8 +5,10 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Sessioa"
         mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800"
-        FontFamily="Comic Sans MS">
+        Title="ООО «Пиши-стирай»" Height="450" Width="800"
+        FontFamily="Comic Sans MS"
+        FontSize="16"
+        Icon="/Resources/logo.png">
     <Grid>
         <Frame Name="FrameMain" NavigationUIVisibility="Hidden"/>
     </Grid>

+ 3 - 2
Sessioa/Pages/Autorization.xaml

@@ -6,8 +6,9 @@
       xmlns:local="clr-namespace:Sessioa.Pages"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
-      Title="Autorization"
-      FontFamily="Comic Sans MS">
+      Title="Авторизация"
+      FontFamily="Comic Sans MS"
+      FontSize="16">
 
     <Grid>
         <Grid.RowDefinitions>

+ 8 - 2
Sessioa/Pages/OrderCard.xaml

@@ -6,7 +6,9 @@
       xmlns:local="clr-namespace:Sessioa.Pages"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
-      Title="OrderCard">
+      FontFamily="Comic Sans MS"
+      FontSize="16"
+      Title="Корзина с товарами">
     <Page.Resources>
         <BitmapImage x:Key="defaultImage" UriSource="/Resources/picture.png"/>
     </Page.Resources>
@@ -17,7 +19,11 @@
             <RowDefinition/>
             <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"/>
+        <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" HorizontalAlignment="Right" Margin="30,0" VerticalAlignment="Center">
+            <TextBlock Text="Пункт выдачи: " Style="{StaticResource TextBlock}" VerticalAlignment="Center"/>
+            <ComboBox Name="CB_Punkt" MaxHeight="50" MinWidth="250" Margin="5"/>
+        </StackPanel>
         <ListBox Name="LB_ProductsOrder" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Grid.Row="1">
             <ListBox.ItemTemplate>
                 <DataTemplate>

+ 42 - 12
Sessioa/Pages/OrderCard.xaml.cs

@@ -15,9 +15,6 @@ namespace Sessioa.Pages
     {
         List<Product> products = (List<Product>)Application.Current.Properties["ListOrderUser"];
         Dictionary<string, int> keyValuePairs = (Dictionary<string, int>)(Application.Current.Properties["ListOrderCountUser"]);
-        //{
-        //    {"djkdkla", 19 }
-        //};
         User user = null;
         public OrderCard(User userSign)
         {
@@ -42,13 +39,10 @@ namespace Sessioa.Pages
                     catch { }
                 }
             }
+            CB_Punkt.ItemsSource = BaseClass.C_Base.PointsOfIssue.ToList();
+            CB_Punkt.DisplayMemberPath = "PointName";
+            CB_Punkt.SelectedValuePath = "PointID";
             ItogoSkidka();
-            //keyValuePairs.Add("dawlk", 2718);
-            //foreach(KeyValuePair<string, int> pair in keyValuePairs)
-            //{
-            //    pair.Key; //1
-            //    pair.Value; //2
-            //}
         }
 
         private void countPr_Loaded(object sender, RoutedEventArgs e)
@@ -91,9 +85,45 @@ namespace Sessioa.Pages
         {
             Application.Current.Properties["ListOrderUser"] = new List<Product>();
             Application.Current.Properties["ListOrderCountUser"] = new Dictionary<string, int>();
-            MessageBoxResult mbr = MessageBox.Show("Заказ оформлен.", "Уведомление", MessageBoxButton.OK, MessageBoxImage.Information);
-            if (mbr == MessageBoxResult.OK)
-                FrameClass.C_Frame.Navigate(new ProductsPage(user));
+            if(CB_Punkt.SelectedIndex == -1)
+                MessageBox.Show("Выберите пункт выдачи.", "Предупреждение", MessageBoxButton.OK, MessageBoxImage.Warning);
+            else
+            {
+                try
+                {
+                    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)
+                    {
+                        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);
+                }
+            }
         }
 
         private void Back_B_Click(object sender, RoutedEventArgs e)

+ 4 - 2
Sessioa/Pages/OrderNew.xaml

@@ -6,7 +6,9 @@
       xmlns:local="clr-namespace:Sessioa.Pages"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
-      Title="OrderNew">
+      Title="Заказы"
+      FontFamily="Comic Sans MS"
+      FontSize="16">
     <Page.Resources>
         <BitmapImage x:Key="defaultImage" UriSource="/Resources/picture.png"/>
     </Page.Resources>
@@ -30,7 +32,7 @@
                             </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"/>
+                                <TextBlock Text="{Binding OrderDeliveryDate, StringFormat=Дата выдачи: {0:d}}" Style="{StaticResource TextBlock}" Foreground="#498C51" Language="ru-RU" Loaded="TextBlock_Loaded" Uid="{Binding OrderID}"/>
                             </StackPanel>
                         </Grid>
                     </Border>

+ 11 - 0
Sessioa/Pages/OrderNew.xaml.cs

@@ -50,5 +50,16 @@ namespace Sessioa.Pages
         {
             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)
+            {
+                tb.Text = "Заказ еще не выдан";
+                tb.Foreground = new SolidColorBrush(Color.FromRgb(255, 0, 0));
+            }
+        }
     }
 }

+ 1 - 1
Sessioa/Pages/ProductCard.xaml

@@ -6,7 +6,7 @@
       xmlns:local="clr-namespace:Sessioa.Pages"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
-      Title="ProductCard"
+      Title="Карточка продукта"
       FontSize="16"
       FontFamily="Comic Sans MS">
 

+ 2 - 0
Sessioa/Pages/ProductsPage.xaml

@@ -6,6 +6,8 @@
       xmlns:local="clr-namespace:Sessioa.Pages"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
+      FontFamily="Comic Sans MS"
+      FontSize="16"
       Title="ProductsPage">
     <Page.Resources>
         <BitmapImage x:Key="defaultImage" UriSource="/Resources/picture.png"/>

+ 10 - 0
Sessioa/Properties/Resources.Designer.cs

@@ -60,6 +60,16 @@ namespace Sessioa.Properties {
             }
         }
         
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap logo {
+            get {
+                object obj = ResourceManager.GetObject("logo", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
         /// </summary>

+ 3 - 0
Sessioa/Properties/Resources.resx

@@ -118,6 +118,9 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="picture" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\picture.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

BIN
Sessioa/Resources/logo.png


+ 1 - 0
Sessioa/Sessioa.csproj

@@ -210,6 +210,7 @@
       <DependentUpon>ModelBase.edmx</DependentUpon>
       <LastGenOutput>ModelBase.cs</LastGenOutput>
     </Content>
+    <Resource Include="Resources\logo.png" />
     <Resource Include="bin\Debug\Photos\А112Т4.jpg" />
     <Resource Include="bin\Debug\Photos\T564P5.jpg" />
     <Resource Include="bin\Debug\Photos\R259E6.jpg" />

BIN
Sessioa/bin/Debug/Sessioa.exe


BIN
Sessioa/bin/Debug/Sessioa.pdb


BIN
Sessioa/obj/Debug/MainWindow.baml


+ 2 - 2
Sessioa/obj/Debug/MainWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "39038BCE65EBDFD87C170FC46F0D64E430506EFE4CE69C511D40B250B32048B1"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "36E0648BE417237A16015C17865BB7DDF762D1398859DAF327A02750A82A6CEB"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -41,7 +41,7 @@ namespace Sessioa {
     public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
         
-        #line 11 "..\..\MainWindow.xaml"
+        #line 13 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Frame FrameMain;
         

+ 2 - 2
Sessioa/obj/Debug/MainWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "39038BCE65EBDFD87C170FC46F0D64E430506EFE4CE69C511D40B250B32048B1"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "36E0648BE417237A16015C17865BB7DDF762D1398859DAF327A02750A82A6CEB"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -41,7 +41,7 @@ namespace Sessioa {
     public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
         
-        #line 11 "..\..\MainWindow.xaml"
+        #line 13 "..\..\MainWindow.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Frame FrameMain;
         

BIN
Sessioa/obj/Debug/Pages/Autorization.baml


+ 7 - 7
Sessioa/obj/Debug/Pages/Autorization.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Pages\Autorization.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7B1D53502A2CF205C7FD1E25FEBDAD4499213702066FF7F38893DF8D41700C3E"
+#pragma checksum "..\..\..\Pages\Autorization.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7DD1C1B23FFAFD9843770395D560B8523394A5F156CA8A9FDF1D6FDF95FC2DBD"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -41,7 +41,7 @@ namespace Sessioa.Pages {
     public partial class Autorization : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
         
         
-        #line 23 "..\..\..\Pages\Autorization.xaml"
+        #line 24 "..\..\..\Pages\Autorization.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button Mode;
         
@@ -49,7 +49,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 27 "..\..\..\Pages\Autorization.xaml"
+        #line 28 "..\..\..\Pages\Autorization.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox Login;
         
@@ -57,7 +57,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 28 "..\..\..\Pages\Autorization.xaml"
+        #line 29 "..\..\..\Pages\Autorization.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox Password;
         
@@ -65,7 +65,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 29 "..\..\..\Pages\Autorization.xaml"
+        #line 30 "..\..\..\Pages\Autorization.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button Sign;
         
@@ -105,7 +105,7 @@ namespace Sessioa.Pages {
             case 1:
             this.Mode = ((System.Windows.Controls.Button)(target));
             
-            #line 23 "..\..\..\Pages\Autorization.xaml"
+            #line 24 "..\..\..\Pages\Autorization.xaml"
             this.Mode.Click += new System.Windows.RoutedEventHandler(this.Mode_Click);
             
             #line default
@@ -120,7 +120,7 @@ namespace Sessioa.Pages {
             case 4:
             this.Sign = ((System.Windows.Controls.Button)(target));
             
-            #line 29 "..\..\..\Pages\Autorization.xaml"
+            #line 30 "..\..\..\Pages\Autorization.xaml"
             this.Sign.Click += new System.Windows.RoutedEventHandler(this.Sign_Click);
             
             #line default

+ 7 - 7
Sessioa/obj/Debug/Pages/Autorization.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Pages\Autorization.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7B1D53502A2CF205C7FD1E25FEBDAD4499213702066FF7F38893DF8D41700C3E"
+#pragma checksum "..\..\..\Pages\Autorization.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7DD1C1B23FFAFD9843770395D560B8523394A5F156CA8A9FDF1D6FDF95FC2DBD"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -41,7 +41,7 @@ namespace Sessioa.Pages {
     public partial class Autorization : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
         
         
-        #line 23 "..\..\..\Pages\Autorization.xaml"
+        #line 24 "..\..\..\Pages\Autorization.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button Mode;
         
@@ -49,7 +49,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 27 "..\..\..\Pages\Autorization.xaml"
+        #line 28 "..\..\..\Pages\Autorization.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox Login;
         
@@ -57,7 +57,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 28 "..\..\..\Pages\Autorization.xaml"
+        #line 29 "..\..\..\Pages\Autorization.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox Password;
         
@@ -65,7 +65,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 29 "..\..\..\Pages\Autorization.xaml"
+        #line 30 "..\..\..\Pages\Autorization.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button Sign;
         
@@ -105,7 +105,7 @@ namespace Sessioa.Pages {
             case 1:
             this.Mode = ((System.Windows.Controls.Button)(target));
             
-            #line 23 "..\..\..\Pages\Autorization.xaml"
+            #line 24 "..\..\..\Pages\Autorization.xaml"
             this.Mode.Click += new System.Windows.RoutedEventHandler(this.Mode_Click);
             
             #line default
@@ -120,7 +120,7 @@ namespace Sessioa.Pages {
             case 4:
             this.Sign = ((System.Windows.Controls.Button)(target));
             
-            #line 29 "..\..\..\Pages\Autorization.xaml"
+            #line 30 "..\..\..\Pages\Autorization.xaml"
             this.Sign.Click += new System.Windows.RoutedEventHandler(this.Sign_Click);
             
             #line default

BIN
Sessioa/obj/Debug/Pages/OrderCard.baml


+ 34 - 23
Sessioa/obj/Debug/Pages/OrderCard.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Pages\OrderCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D391515CA45B2C79684D90E280978511C4FFF6BCE60B081F8F0B35197087B400"
+#pragma checksum "..\..\..\Pages\OrderCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "77191A462C4716E56D42C1987C29748CCAE76DC8AD1342AE362151609893C4CA"
 //------------------------------------------------------------------------------
 // <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 20 "..\..\..\Pages\OrderCard.xaml"
+        #line 22 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button B_Back;
         
@@ -49,7 +49,15 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 21 "..\..\..\Pages\OrderCard.xaml"
+        #line 25 "..\..\..\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"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox LB_ProductsOrder;
         
@@ -57,7 +65,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 70 "..\..\..\Pages\OrderCard.xaml"
+        #line 76 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock TB_ItogoSkidka;
         
@@ -65,7 +73,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 73 "..\..\..\Pages\OrderCard.xaml"
+        #line 79 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock TB_Itogo;
         
@@ -73,7 +81,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 76 "..\..\..\Pages\OrderCard.xaml"
+        #line 82 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button B_Save;
         
@@ -113,25 +121,28 @@ namespace Sessioa.Pages {
             case 1:
             this.B_Back = ((System.Windows.Controls.Button)(target));
             
-            #line 20 "..\..\..\Pages\OrderCard.xaml"
+            #line 22 "..\..\..\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));
+            return;
+            case 3:
             this.LB_ProductsOrder = ((System.Windows.Controls.ListBox)(target));
             return;
-            case 9:
+            case 10:
             this.TB_ItogoSkidka = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 10:
+            case 11:
             this.TB_Itogo = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 11:
+            case 12:
             this.B_Save = ((System.Windows.Controls.Button)(target));
             
-            #line 76 "..\..\..\Pages\OrderCard.xaml"
+            #line 82 "..\..\..\Pages\OrderCard.xaml"
             this.B_Save.Click += new System.Windows.RoutedEventHandler(this.B_Save_Click);
             
             #line default
@@ -150,49 +161,49 @@ namespace Sessioa.Pages {
         void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target) {
             switch (connectionId)
             {
-            case 3:
+            case 4:
             
-            #line 46 "..\..\..\Pages\OrderCard.xaml"
+            #line 52 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.countPr_Loaded);
             
             #line default
             #line hidden
             break;
-            case 4:
+            case 5:
             
-            #line 47 "..\..\..\Pages\OrderCard.xaml"
+            #line 53 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.countDPr_Loaded);
             
             #line default
             #line hidden
             break;
-            case 5:
+            case 6:
             
-            #line 50 "..\..\..\Pages\OrderCard.xaml"
+            #line 56 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Discount_Loaded);
             
             #line default
             #line hidden
             break;
-            case 6:
+            case 7:
             
-            #line 60 "..\..\..\Pages\OrderCard.xaml"
+            #line 66 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Back_B_Click);
             
             #line default
             #line hidden
             break;
-            case 7:
+            case 8:
             
-            #line 61 "..\..\..\Pages\OrderCard.xaml"
+            #line 67 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.CountProduct_Loaded);
             
             #line default
             #line hidden
             break;
-            case 8:
+            case 9:
             
-            #line 62 "..\..\..\Pages\OrderCard.xaml"
+            #line 68 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Next_B_Click);
             
             #line default

+ 34 - 23
Sessioa/obj/Debug/Pages/OrderCard.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Pages\OrderCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D391515CA45B2C79684D90E280978511C4FFF6BCE60B081F8F0B35197087B400"
+#pragma checksum "..\..\..\Pages\OrderCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "77191A462C4716E56D42C1987C29748CCAE76DC8AD1342AE362151609893C4CA"
 //------------------------------------------------------------------------------
 // <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 20 "..\..\..\Pages\OrderCard.xaml"
+        #line 22 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button B_Back;
         
@@ -49,7 +49,15 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 21 "..\..\..\Pages\OrderCard.xaml"
+        #line 25 "..\..\..\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"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox LB_ProductsOrder;
         
@@ -57,7 +65,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 70 "..\..\..\Pages\OrderCard.xaml"
+        #line 76 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock TB_ItogoSkidka;
         
@@ -65,7 +73,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 73 "..\..\..\Pages\OrderCard.xaml"
+        #line 79 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock TB_Itogo;
         
@@ -73,7 +81,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 76 "..\..\..\Pages\OrderCard.xaml"
+        #line 82 "..\..\..\Pages\OrderCard.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button B_Save;
         
@@ -113,25 +121,28 @@ namespace Sessioa.Pages {
             case 1:
             this.B_Back = ((System.Windows.Controls.Button)(target));
             
-            #line 20 "..\..\..\Pages\OrderCard.xaml"
+            #line 22 "..\..\..\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));
+            return;
+            case 3:
             this.LB_ProductsOrder = ((System.Windows.Controls.ListBox)(target));
             return;
-            case 9:
+            case 10:
             this.TB_ItogoSkidka = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 10:
+            case 11:
             this.TB_Itogo = ((System.Windows.Controls.TextBlock)(target));
             return;
-            case 11:
+            case 12:
             this.B_Save = ((System.Windows.Controls.Button)(target));
             
-            #line 76 "..\..\..\Pages\OrderCard.xaml"
+            #line 82 "..\..\..\Pages\OrderCard.xaml"
             this.B_Save.Click += new System.Windows.RoutedEventHandler(this.B_Save_Click);
             
             #line default
@@ -150,49 +161,49 @@ namespace Sessioa.Pages {
         void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target) {
             switch (connectionId)
             {
-            case 3:
+            case 4:
             
-            #line 46 "..\..\..\Pages\OrderCard.xaml"
+            #line 52 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.countPr_Loaded);
             
             #line default
             #line hidden
             break;
-            case 4:
+            case 5:
             
-            #line 47 "..\..\..\Pages\OrderCard.xaml"
+            #line 53 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.countDPr_Loaded);
             
             #line default
             #line hidden
             break;
-            case 5:
+            case 6:
             
-            #line 50 "..\..\..\Pages\OrderCard.xaml"
+            #line 56 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Discount_Loaded);
             
             #line default
             #line hidden
             break;
-            case 6:
+            case 7:
             
-            #line 60 "..\..\..\Pages\OrderCard.xaml"
+            #line 66 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Back_B_Click);
             
             #line default
             #line hidden
             break;
-            case 7:
+            case 8:
             
-            #line 61 "..\..\..\Pages\OrderCard.xaml"
+            #line 67 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.CountProduct_Loaded);
             
             #line default
             #line hidden
             break;
-            case 8:
+            case 9:
             
-            #line 62 "..\..\..\Pages\OrderCard.xaml"
+            #line 68 "..\..\..\Pages\OrderCard.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Next_B_Click);
             
             #line default

BIN
Sessioa/obj/Debug/Pages/OrderNew.baml


+ 13 - 5
Sessioa/obj/Debug/Pages/OrderNew.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Pages\OrderNew.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "35B21B75EB849F87A79AC8BC9A864EB5C2CE2FD2ABF3634C074A4FE53BA47216"
+#pragma checksum "..\..\..\Pages\OrderNew.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6DE62066C217B83ACF306C8D8543437A62871D70BC01A053B01501E8617E438E"
 //------------------------------------------------------------------------------
 // <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 17 "..\..\..\Pages\OrderNew.xaml"
+        #line 19 "..\..\..\Pages\OrderNew.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button B_Back;
         
@@ -49,7 +49,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 18 "..\..\..\Pages\OrderNew.xaml"
+        #line 20 "..\..\..\Pages\OrderNew.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox LB_OrderProduct;
         
@@ -89,7 +89,7 @@ namespace Sessioa.Pages {
             case 1:
             this.B_Back = ((System.Windows.Controls.Button)(target));
             
-            #line 17 "..\..\..\Pages\OrderNew.xaml"
+            #line 19 "..\..\..\Pages\OrderNew.xaml"
             this.B_Back.Click += new System.Windows.RoutedEventHandler(this.B_Back_Click);
             
             #line default
@@ -113,9 +113,17 @@ namespace Sessioa.Pages {
             {
             case 3:
             
-            #line 29 "..\..\..\Pages\OrderNew.xaml"
+            #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;

+ 13 - 5
Sessioa/obj/Debug/Pages/OrderNew.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Pages\OrderNew.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "35B21B75EB849F87A79AC8BC9A864EB5C2CE2FD2ABF3634C074A4FE53BA47216"
+#pragma checksum "..\..\..\Pages\OrderNew.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6DE62066C217B83ACF306C8D8543437A62871D70BC01A053B01501E8617E438E"
 //------------------------------------------------------------------------------
 // <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 17 "..\..\..\Pages\OrderNew.xaml"
+        #line 19 "..\..\..\Pages\OrderNew.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button B_Back;
         
@@ -49,7 +49,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 18 "..\..\..\Pages\OrderNew.xaml"
+        #line 20 "..\..\..\Pages\OrderNew.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox LB_OrderProduct;
         
@@ -89,7 +89,7 @@ namespace Sessioa.Pages {
             case 1:
             this.B_Back = ((System.Windows.Controls.Button)(target));
             
-            #line 17 "..\..\..\Pages\OrderNew.xaml"
+            #line 19 "..\..\..\Pages\OrderNew.xaml"
             this.B_Back.Click += new System.Windows.RoutedEventHandler(this.B_Back_Click);
             
             #line default
@@ -113,9 +113,17 @@ namespace Sessioa.Pages {
             {
             case 3:
             
-            #line 29 "..\..\..\Pages\OrderNew.xaml"
+            #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;

BIN
Sessioa/obj/Debug/Pages/ProductCard.baml


+ 1 - 1
Sessioa/obj/Debug/Pages/ProductCard.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Pages\ProductCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "43C506454601EF8FC4F406672E300742ED7E4B1B1B67AD00F734BD5F8D998B83"
+#pragma checksum "..\..\..\Pages\ProductCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EA196B0C2978C4E9849AECD88945A5451B9703871249AD7CC347ADF9EEDE0FEC"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.

+ 1 - 1
Sessioa/obj/Debug/Pages/ProductCard.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Pages\ProductCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "43C506454601EF8FC4F406672E300742ED7E4B1B1B67AD00F734BD5F8D998B83"
+#pragma checksum "..\..\..\Pages\ProductCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EA196B0C2978C4E9849AECD88945A5451B9703871249AD7CC347ADF9EEDE0FEC"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.

BIN
Sessioa/obj/Debug/Pages/ProductsPage.baml


+ 34 - 34
Sessioa/obj/Debug/Pages/ProductsPage.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Pages\ProductsPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "847F414E763CB014DA97A4CD88D3CEAF3CBA2C00BB7347758B122722CDA23B72"
+#pragma checksum "..\..\..\Pages\ProductsPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B6F272295A0DF61B52BD9DEDD41F6D02B8B68CA57AB530F6C1159E7E21795DB0"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -41,7 +41,7 @@ namespace Sessioa.Pages {
     public partial class ProductsPage : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
         
         
-        #line 20 "..\..\..\Pages\ProductsPage.xaml"
+        #line 22 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox LB_Product;
         
@@ -49,7 +49,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 52 "..\..\..\Pages\ProductsPage.xaml"
+        #line 54 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem AddOrder;
         
@@ -57,7 +57,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 53 "..\..\..\Pages\ProductsPage.xaml"
+        #line 55 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem EditProduct;
         
@@ -65,7 +65,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 54 "..\..\..\Pages\ProductsPage.xaml"
+        #line 56 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem DeleteProduct;
         
@@ -73,7 +73,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 64 "..\..\..\Pages\ProductsPage.xaml"
+        #line 66 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox SearchTB;
         
@@ -81,7 +81,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 65 "..\..\..\Pages\ProductsPage.xaml"
+        #line 67 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox CB_Sort;
         
@@ -89,7 +89,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 66 "..\..\..\Pages\ProductsPage.xaml"
+        #line 68 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox CB_Filtr;
         
@@ -97,7 +97,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 69 "..\..\..\Pages\ProductsPage.xaml"
+        #line 71 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock TB_CountActual;
         
@@ -105,7 +105,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 71 "..\..\..\Pages\ProductsPage.xaml"
+        #line 73 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock TB_CountAll;
         
@@ -113,7 +113,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 73 "..\..\..\Pages\ProductsPage.xaml"
+        #line 75 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock UserSign;
         
@@ -121,7 +121,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 75 "..\..\..\Pages\ProductsPage.xaml"
+        #line 77 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button SignOf;
         
@@ -129,7 +129,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 76 "..\..\..\Pages\ProductsPage.xaml"
+        #line 78 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button NewProduct;
         
@@ -137,7 +137,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 77 "..\..\..\Pages\ProductsPage.xaml"
+        #line 79 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button OrdersUser;
         
@@ -145,7 +145,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 78 "..\..\..\Pages\ProductsPage.xaml"
+        #line 80 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button OrderActUser;
         
@@ -187,7 +187,7 @@ namespace Sessioa.Pages {
             return;
             case 6:
             
-            #line 51 "..\..\..\Pages\ProductsPage.xaml"
+            #line 53 "..\..\..\Pages\ProductsPage.xaml"
             ((System.Windows.Controls.ContextMenu)(target)).Loaded += new System.Windows.RoutedEventHandler(this.ContextMenu_Loaded);
             
             #line default
@@ -196,7 +196,7 @@ namespace Sessioa.Pages {
             case 7:
             this.AddOrder = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 52 "..\..\..\Pages\ProductsPage.xaml"
+            #line 54 "..\..\..\Pages\ProductsPage.xaml"
             this.AddOrder.Click += new System.Windows.RoutedEventHandler(this.AddOrder_Click);
             
             #line default
@@ -205,13 +205,13 @@ namespace Sessioa.Pages {
             case 8:
             this.EditProduct = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 53 "..\..\..\Pages\ProductsPage.xaml"
+            #line 55 "..\..\..\Pages\ProductsPage.xaml"
             this.EditProduct.Loaded += new System.Windows.RoutedEventHandler(this.EditProduct_Loaded);
             
             #line default
             #line hidden
             
-            #line 53 "..\..\..\Pages\ProductsPage.xaml"
+            #line 55 "..\..\..\Pages\ProductsPage.xaml"
             this.EditProduct.Click += new System.Windows.RoutedEventHandler(this.EditProduct_Click);
             
             #line default
@@ -220,13 +220,13 @@ namespace Sessioa.Pages {
             case 9:
             this.DeleteProduct = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 54 "..\..\..\Pages\ProductsPage.xaml"
+            #line 56 "..\..\..\Pages\ProductsPage.xaml"
             this.DeleteProduct.Loaded += new System.Windows.RoutedEventHandler(this.DeleteProduct_Loaded);
             
             #line default
             #line hidden
             
-            #line 54 "..\..\..\Pages\ProductsPage.xaml"
+            #line 56 "..\..\..\Pages\ProductsPage.xaml"
             this.DeleteProduct.Click += new System.Windows.RoutedEventHandler(this.DeleteProduct_Click);
             
             #line default
@@ -235,7 +235,7 @@ namespace Sessioa.Pages {
             case 10:
             this.SearchTB = ((System.Windows.Controls.TextBox)(target));
             
-            #line 64 "..\..\..\Pages\ProductsPage.xaml"
+            #line 66 "..\..\..\Pages\ProductsPage.xaml"
             this.SearchTB.TextChanged += new System.Windows.Controls.TextChangedEventHandler(this.SearchTB_TextChanged);
             
             #line default
@@ -244,7 +244,7 @@ namespace Sessioa.Pages {
             case 11:
             this.CB_Sort = ((System.Windows.Controls.ComboBox)(target));
             
-            #line 65 "..\..\..\Pages\ProductsPage.xaml"
+            #line 67 "..\..\..\Pages\ProductsPage.xaml"
             this.CB_Sort.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.CB_Sort_SelectionChanged);
             
             #line default
@@ -253,7 +253,7 @@ namespace Sessioa.Pages {
             case 12:
             this.CB_Filtr = ((System.Windows.Controls.ComboBox)(target));
             
-            #line 66 "..\..\..\Pages\ProductsPage.xaml"
+            #line 68 "..\..\..\Pages\ProductsPage.xaml"
             this.CB_Filtr.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.CB_Filtr_SelectionChanged);
             
             #line default
@@ -271,7 +271,7 @@ namespace Sessioa.Pages {
             case 16:
             this.SignOf = ((System.Windows.Controls.Button)(target));
             
-            #line 75 "..\..\..\Pages\ProductsPage.xaml"
+            #line 77 "..\..\..\Pages\ProductsPage.xaml"
             this.SignOf.Click += new System.Windows.RoutedEventHandler(this.SignOf_Click);
             
             #line default
@@ -280,13 +280,13 @@ namespace Sessioa.Pages {
             case 17:
             this.NewProduct = ((System.Windows.Controls.Button)(target));
             
-            #line 76 "..\..\..\Pages\ProductsPage.xaml"
+            #line 78 "..\..\..\Pages\ProductsPage.xaml"
             this.NewProduct.Click += new System.Windows.RoutedEventHandler(this.NewProduct_Click);
             
             #line default
             #line hidden
             
-            #line 76 "..\..\..\Pages\ProductsPage.xaml"
+            #line 78 "..\..\..\Pages\ProductsPage.xaml"
             this.NewProduct.Loaded += new System.Windows.RoutedEventHandler(this.NewProduct_Loaded);
             
             #line default
@@ -295,13 +295,13 @@ namespace Sessioa.Pages {
             case 18:
             this.OrdersUser = ((System.Windows.Controls.Button)(target));
             
-            #line 77 "..\..\..\Pages\ProductsPage.xaml"
+            #line 79 "..\..\..\Pages\ProductsPage.xaml"
             this.OrdersUser.Click += new System.Windows.RoutedEventHandler(this.OrdersUser_Click);
             
             #line default
             #line hidden
             
-            #line 77 "..\..\..\Pages\ProductsPage.xaml"
+            #line 79 "..\..\..\Pages\ProductsPage.xaml"
             this.OrdersUser.Loaded += new System.Windows.RoutedEventHandler(this.OrdersUser_Loaded);
             
             #line default
@@ -310,7 +310,7 @@ namespace Sessioa.Pages {
             case 19:
             this.OrderActUser = ((System.Windows.Controls.Button)(target));
             
-            #line 78 "..\..\..\Pages\ProductsPage.xaml"
+            #line 80 "..\..\..\Pages\ProductsPage.xaml"
             this.OrderActUser.Click += new System.Windows.RoutedEventHandler(this.OrderActUser_Click);
             
             #line default
@@ -331,7 +331,7 @@ namespace Sessioa.Pages {
             {
             case 2:
             
-            #line 23 "..\..\..\Pages\ProductsPage.xaml"
+            #line 25 "..\..\..\Pages\ProductsPage.xaml"
             ((System.Windows.Controls.Border)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Border_Loaded);
             
             #line default
@@ -339,7 +339,7 @@ namespace Sessioa.Pages {
             break;
             case 3:
             
-            #line 41 "..\..\..\Pages\ProductsPage.xaml"
+            #line 43 "..\..\..\Pages\ProductsPage.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.countPr_Loaded);
             
             #line default
@@ -347,7 +347,7 @@ namespace Sessioa.Pages {
             break;
             case 4:
             
-            #line 42 "..\..\..\Pages\ProductsPage.xaml"
+            #line 44 "..\..\..\Pages\ProductsPage.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.countPr_Loaded_1);
             
             #line default
@@ -355,7 +355,7 @@ namespace Sessioa.Pages {
             break;
             case 5:
             
-            #line 45 "..\..\..\Pages\ProductsPage.xaml"
+            #line 47 "..\..\..\Pages\ProductsPage.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Discount_Loaded);
             
             #line default

+ 34 - 34
Sessioa/obj/Debug/Pages/ProductsPage.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Pages\ProductsPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "847F414E763CB014DA97A4CD88D3CEAF3CBA2C00BB7347758B122722CDA23B72"
+#pragma checksum "..\..\..\Pages\ProductsPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B6F272295A0DF61B52BD9DEDD41F6D02B8B68CA57AB530F6C1159E7E21795DB0"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -41,7 +41,7 @@ namespace Sessioa.Pages {
     public partial class ProductsPage : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
         
         
-        #line 20 "..\..\..\Pages\ProductsPage.xaml"
+        #line 22 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox LB_Product;
         
@@ -49,7 +49,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 52 "..\..\..\Pages\ProductsPage.xaml"
+        #line 54 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem AddOrder;
         
@@ -57,7 +57,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 53 "..\..\..\Pages\ProductsPage.xaml"
+        #line 55 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem EditProduct;
         
@@ -65,7 +65,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 54 "..\..\..\Pages\ProductsPage.xaml"
+        #line 56 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem DeleteProduct;
         
@@ -73,7 +73,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 64 "..\..\..\Pages\ProductsPage.xaml"
+        #line 66 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox SearchTB;
         
@@ -81,7 +81,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 65 "..\..\..\Pages\ProductsPage.xaml"
+        #line 67 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox CB_Sort;
         
@@ -89,7 +89,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 66 "..\..\..\Pages\ProductsPage.xaml"
+        #line 68 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox CB_Filtr;
         
@@ -97,7 +97,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 69 "..\..\..\Pages\ProductsPage.xaml"
+        #line 71 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock TB_CountActual;
         
@@ -105,7 +105,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 71 "..\..\..\Pages\ProductsPage.xaml"
+        #line 73 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock TB_CountAll;
         
@@ -113,7 +113,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 73 "..\..\..\Pages\ProductsPage.xaml"
+        #line 75 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock UserSign;
         
@@ -121,7 +121,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 75 "..\..\..\Pages\ProductsPage.xaml"
+        #line 77 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button SignOf;
         
@@ -129,7 +129,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 76 "..\..\..\Pages\ProductsPage.xaml"
+        #line 78 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button NewProduct;
         
@@ -137,7 +137,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 77 "..\..\..\Pages\ProductsPage.xaml"
+        #line 79 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button OrdersUser;
         
@@ -145,7 +145,7 @@ namespace Sessioa.Pages {
         #line hidden
         
         
-        #line 78 "..\..\..\Pages\ProductsPage.xaml"
+        #line 80 "..\..\..\Pages\ProductsPage.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button OrderActUser;
         
@@ -187,7 +187,7 @@ namespace Sessioa.Pages {
             return;
             case 6:
             
-            #line 51 "..\..\..\Pages\ProductsPage.xaml"
+            #line 53 "..\..\..\Pages\ProductsPage.xaml"
             ((System.Windows.Controls.ContextMenu)(target)).Loaded += new System.Windows.RoutedEventHandler(this.ContextMenu_Loaded);
             
             #line default
@@ -196,7 +196,7 @@ namespace Sessioa.Pages {
             case 7:
             this.AddOrder = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 52 "..\..\..\Pages\ProductsPage.xaml"
+            #line 54 "..\..\..\Pages\ProductsPage.xaml"
             this.AddOrder.Click += new System.Windows.RoutedEventHandler(this.AddOrder_Click);
             
             #line default
@@ -205,13 +205,13 @@ namespace Sessioa.Pages {
             case 8:
             this.EditProduct = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 53 "..\..\..\Pages\ProductsPage.xaml"
+            #line 55 "..\..\..\Pages\ProductsPage.xaml"
             this.EditProduct.Loaded += new System.Windows.RoutedEventHandler(this.EditProduct_Loaded);
             
             #line default
             #line hidden
             
-            #line 53 "..\..\..\Pages\ProductsPage.xaml"
+            #line 55 "..\..\..\Pages\ProductsPage.xaml"
             this.EditProduct.Click += new System.Windows.RoutedEventHandler(this.EditProduct_Click);
             
             #line default
@@ -220,13 +220,13 @@ namespace Sessioa.Pages {
             case 9:
             this.DeleteProduct = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 54 "..\..\..\Pages\ProductsPage.xaml"
+            #line 56 "..\..\..\Pages\ProductsPage.xaml"
             this.DeleteProduct.Loaded += new System.Windows.RoutedEventHandler(this.DeleteProduct_Loaded);
             
             #line default
             #line hidden
             
-            #line 54 "..\..\..\Pages\ProductsPage.xaml"
+            #line 56 "..\..\..\Pages\ProductsPage.xaml"
             this.DeleteProduct.Click += new System.Windows.RoutedEventHandler(this.DeleteProduct_Click);
             
             #line default
@@ -235,7 +235,7 @@ namespace Sessioa.Pages {
             case 10:
             this.SearchTB = ((System.Windows.Controls.TextBox)(target));
             
-            #line 64 "..\..\..\Pages\ProductsPage.xaml"
+            #line 66 "..\..\..\Pages\ProductsPage.xaml"
             this.SearchTB.TextChanged += new System.Windows.Controls.TextChangedEventHandler(this.SearchTB_TextChanged);
             
             #line default
@@ -244,7 +244,7 @@ namespace Sessioa.Pages {
             case 11:
             this.CB_Sort = ((System.Windows.Controls.ComboBox)(target));
             
-            #line 65 "..\..\..\Pages\ProductsPage.xaml"
+            #line 67 "..\..\..\Pages\ProductsPage.xaml"
             this.CB_Sort.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.CB_Sort_SelectionChanged);
             
             #line default
@@ -253,7 +253,7 @@ namespace Sessioa.Pages {
             case 12:
             this.CB_Filtr = ((System.Windows.Controls.ComboBox)(target));
             
-            #line 66 "..\..\..\Pages\ProductsPage.xaml"
+            #line 68 "..\..\..\Pages\ProductsPage.xaml"
             this.CB_Filtr.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.CB_Filtr_SelectionChanged);
             
             #line default
@@ -271,7 +271,7 @@ namespace Sessioa.Pages {
             case 16:
             this.SignOf = ((System.Windows.Controls.Button)(target));
             
-            #line 75 "..\..\..\Pages\ProductsPage.xaml"
+            #line 77 "..\..\..\Pages\ProductsPage.xaml"
             this.SignOf.Click += new System.Windows.RoutedEventHandler(this.SignOf_Click);
             
             #line default
@@ -280,13 +280,13 @@ namespace Sessioa.Pages {
             case 17:
             this.NewProduct = ((System.Windows.Controls.Button)(target));
             
-            #line 76 "..\..\..\Pages\ProductsPage.xaml"
+            #line 78 "..\..\..\Pages\ProductsPage.xaml"
             this.NewProduct.Click += new System.Windows.RoutedEventHandler(this.NewProduct_Click);
             
             #line default
             #line hidden
             
-            #line 76 "..\..\..\Pages\ProductsPage.xaml"
+            #line 78 "..\..\..\Pages\ProductsPage.xaml"
             this.NewProduct.Loaded += new System.Windows.RoutedEventHandler(this.NewProduct_Loaded);
             
             #line default
@@ -295,13 +295,13 @@ namespace Sessioa.Pages {
             case 18:
             this.OrdersUser = ((System.Windows.Controls.Button)(target));
             
-            #line 77 "..\..\..\Pages\ProductsPage.xaml"
+            #line 79 "..\..\..\Pages\ProductsPage.xaml"
             this.OrdersUser.Click += new System.Windows.RoutedEventHandler(this.OrdersUser_Click);
             
             #line default
             #line hidden
             
-            #line 77 "..\..\..\Pages\ProductsPage.xaml"
+            #line 79 "..\..\..\Pages\ProductsPage.xaml"
             this.OrdersUser.Loaded += new System.Windows.RoutedEventHandler(this.OrdersUser_Loaded);
             
             #line default
@@ -310,7 +310,7 @@ namespace Sessioa.Pages {
             case 19:
             this.OrderActUser = ((System.Windows.Controls.Button)(target));
             
-            #line 78 "..\..\..\Pages\ProductsPage.xaml"
+            #line 80 "..\..\..\Pages\ProductsPage.xaml"
             this.OrderActUser.Click += new System.Windows.RoutedEventHandler(this.OrderActUser_Click);
             
             #line default
@@ -331,7 +331,7 @@ namespace Sessioa.Pages {
             {
             case 2:
             
-            #line 23 "..\..\..\Pages\ProductsPage.xaml"
+            #line 25 "..\..\..\Pages\ProductsPage.xaml"
             ((System.Windows.Controls.Border)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Border_Loaded);
             
             #line default
@@ -339,7 +339,7 @@ namespace Sessioa.Pages {
             break;
             case 3:
             
-            #line 41 "..\..\..\Pages\ProductsPage.xaml"
+            #line 43 "..\..\..\Pages\ProductsPage.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.countPr_Loaded);
             
             #line default
@@ -347,7 +347,7 @@ namespace Sessioa.Pages {
             break;
             case 4:
             
-            #line 42 "..\..\..\Pages\ProductsPage.xaml"
+            #line 44 "..\..\..\Pages\ProductsPage.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.countPr_Loaded_1);
             
             #line default
@@ -355,7 +355,7 @@ namespace Sessioa.Pages {
             break;
             case 5:
             
-            #line 45 "..\..\..\Pages\ProductsPage.xaml"
+            #line 47 "..\..\..\Pages\ProductsPage.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Discount_Loaded);
             
             #line default

BIN
Sessioa/obj/Debug/Sessioa.Properties.Resources.resources


BIN
Sessioa/obj/Debug/Sessioa.csproj.GenerateResource.cache


BIN
Sessioa/obj/Debug/Sessioa.exe


BIN
Sessioa/obj/Debug/Sessioa.g.resources


BIN
Sessioa/obj/Debug/Sessioa.pdb


+ 1 - 6
Sessioa/obj/Debug/Sessioa_MarkupCompile.i.lref

@@ -1,9 +1,4 @@
 
-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;;
 

BIN
Sessioa/obj/Debug/TempPE/BaseModel.ModelBase.Designer.cs.dll


BIN
Sessioa/obj/Debug/TempPE/BaseModel.ModelBase.cs.dll


BIN
Sessioa/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll


+ 1 - 1
Sessioa/obj/Debug/edmxResourcesToEmbed/BaseModel/ModelBase.csdl

@@ -15,7 +15,7 @@
     <Property Name="OrderID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
     <Property Name="OrderStatus" Type="Int32" Nullable="false" />
     <Property Name="OrderDate" Type="DateTime" Nullable="false" Precision="3" />
-    <Property Name="OrderDeliveryDate" Type="DateTime" Nullable="false" Precision="3" />
+    <Property Name="OrderDeliveryDate" Type="DateTime" Precision="3" />
     <Property Name="OrderPickupPoint" Type="Int32" Nullable="false" />
     <Property Name="UserID" Type="Int32" />
     <Property Name="IssueCode" Type="Int32" Nullable="false" />

+ 1 - 1
Sessioa/obj/Debug/edmxResourcesToEmbed/BaseModel/ModelBase.ssdl

@@ -14,7 +14,7 @@
     <Property Name="OrderID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
     <Property Name="OrderStatus" Type="int" Nullable="false" />
     <Property Name="OrderDate" Type="datetime" Nullable="false" />
-    <Property Name="OrderDeliveryDate" Type="datetime" Nullable="false" />
+    <Property Name="OrderDeliveryDate" Type="datetime" />
     <Property Name="OrderPickupPoint" Type="int" Nullable="false" />
     <Property Name="UserID" Type="int" />
     <Property Name="IssueCode" Type="int" Nullable="false" />