Bladeren bron

nineth commit

Фельдбейн Артур Станиславович 3 jaren geleden
bovenliggende
commit
7140ccb062

BIN
Kafe/.vs/Kafe/v17/.suo


+ 1 - 0
Kafe/Kafe/Kafe.csproj

@@ -94,6 +94,7 @@
     <Compile Include="Order.cs">
       <DependentUpon>Model.tt</DependentUpon>
     </Compile>
+    <Compile Include="Partial.cs" />
     <Compile Include="PayStatus.cs">
       <DependentUpon>Model.tt</DependentUpon>
     </Compile>

+ 16 - 0
Kafe/Kafe/Partial.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Kafe
+{
+    public partial class Order
+    {
+        public double Cost => DishOrder.Sum(x => x.Dish.Cost * x.Count);
+
+
+
+    }
+}

+ 5 - 5
Kafe/Kafe/Windows/OrderWindow.xaml

@@ -27,10 +27,10 @@
 
                             <StackPanel Orientation="Horizontal"  Grid.Column ="1">
                                 <TextBlock Text="Блюда: "/>
-                                <ItemsControl ItemsSource="{Binding OrderDIshes}">
+                                <ItemsControl ItemsSource="{Binding DishOrder}">
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate>
-                                            <TextBlock Text="{Binding Dishes.Title}"/>
+                                            <TextBlock Text="{Binding Dish.Title}"/>
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
@@ -52,9 +52,9 @@
                                 <TextBlock >
                                     <TextBlock.Text>
                                         <MultiBinding StringFormat="{}{0} {1} {2}">
-                                            <Binding Path="Emploee.Surname"/>
-                                            <Binding Path="Emploee.Firstname"/>
-                                            <Binding Path="Emploee.Middlename"/>
+                                            <Binding Path="Employee.LastName"/>
+                                            <Binding Path="Employee.FirstName"/>
+                                            <Binding Path="Employee.MiddleName"/>
                                         </MultiBinding>
                                     </TextBlock.Text>
                                 </TextBlock>

BIN
Kafe/Kafe/bin/Debug/Kafe.exe


BIN
Kafe/Kafe/bin/Debug/Kafe.pdb


+ 1 - 1
Kafe/Kafe/obj/Debug/Kafe.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-8597fbd35eb0a5d7c4ce5af9599581d81507aaab
+30f72c5fea1d648605a16679b7ae0b423cd0cd43

+ 2 - 0
Kafe/Kafe/obj/Debug/Kafe.csproj.FileListAbsolute.txt

@@ -33,3 +33,5 @@ Z:\git\Kafe\Kafe\obj\Debug\Windows\ShiftWindow.g.cs
 Z:\git\Kafe\Kafe\obj\Debug\Windows\EmployeeWindow.baml
 Z:\git\Kafe\Kafe\obj\Debug\Windows\OrderWindow.baml
 Z:\git\Kafe\Kafe\obj\Debug\Windows\ShiftWindow.baml
+Z:\git\Kafe\Kafe\obj\Debug\Windows\RegistrationWindow.g.cs
+Z:\git\Kafe\Kafe\obj\Debug\Windows\RegistrationWindow.baml

BIN
Kafe/Kafe/obj/Debug/Kafe.exe


BIN
Kafe/Kafe/obj/Debug/Kafe.g.resources


BIN
Kafe/Kafe/obj/Debug/Kafe.pdb


+ 3 - 3
Kafe/Kafe/obj/Debug/Kafe_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 Z:\git\Kafe\Kafe\App.xaml
-71000609079
+8-430067157
 22035508349
-24-2049304479
+26-229095518
 18-1273807529
-MainWindow.xaml;Windows\AdminWindow.xaml;Windows\CookerWindow.xaml;Windows\EmployeeWindow.xaml;Windows\OrderWindow.xaml;Windows\ShiftWindow.xaml;Windows\WaiterWindow.xaml;
+MainWindow.xaml;Windows\AdminWindow.xaml;Windows\CookerWindow.xaml;Windows\EmployeeWindow.xaml;Windows\OrderWindow.xaml;Windows\RegistrationWindow.xaml;Windows\ShiftWindow.xaml;Windows\WaiterWindow.xaml;
 
 False
 

+ 1 - 1
Kafe/Kafe/obj/Debug/Kafe_MarkupCompile.i.cache

@@ -12,7 +12,7 @@ DEBUG;TRACE
 Z:\git\Kafe\Kafe\App.xaml
 8-430067157
 22035508349
-26-547084837
+271983783160
 18-1273807529
 MainWindow.xaml;Windows\AdminWindow.xaml;Windows\CookerWindow.xaml;Windows\EmployeeWindow.xaml;Windows\OrderWindow.xaml;Windows\RegistrationWindow.xaml;Windows\ShiftWindow.xaml;Windows\WaiterWindow.xaml;
 

+ 1 - 1
Kafe/Kafe/obj/Debug/Kafe_MarkupCompile.i.lref

@@ -1,5 +1,5 @@
 
 
-FZ:\git\Kafe\Kafe\Windows\EmployeeWindow.xaml;;
+FZ:\git\Kafe\Kafe\Windows\OrderWindow.xaml;;
 FZ:\git\Kafe\Kafe\Windows\RegistrationWindow.xaml;;
 

+ 1 - 0
Kafe/Kafe/obj/Debug/Kafe_MarkupCompile.lref

@@ -7,4 +7,5 @@ FZ:\git\Kafe\Kafe\Windows\WaiterWindow.xaml;;
 FZ:\git\Kafe\Kafe\Windows\EmployeeWindow.xaml;;
 FZ:\git\Kafe\Kafe\Windows\OrderWindow.xaml;;
 FZ:\git\Kafe\Kafe\Windows\ShiftWindow.xaml;;
+FZ:\git\Kafe\Kafe\Windows\RegistrationWindow.xaml;;
 

BIN
Kafe/Kafe/obj/Debug/Windows/OrderWindow.baml


+ 15 - 1
Kafe/Kafe/obj/Debug/Windows/OrderWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Windows\OrderWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F98B79AAE04AFA8AFC41F861143CBFC9D62127301063336080F51AF21788EA7E"
+#pragma checksum "..\..\..\Windows\OrderWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "47841EDD13CC15FD23F409E01DFF284EB436275865CD2ACC597BD7D2540A4E62"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -40,6 +40,14 @@ namespace Kafe.Windows {
     /// </summary>
     public partial class OrderWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
+        
+        #line 10 "..\..\..\Windows\OrderWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ListView OrderList;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -68,6 +76,12 @@ namespace Kafe.Windows {
         [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) {
+            switch (connectionId)
+            {
+            case 1:
+            this.OrderList = ((System.Windows.Controls.ListView)(target));
+            return;
+            }
             this._contentLoaded = true;
         }
     }

+ 30 - 24
Kafe/Kafe/obj/Debug/Windows/OrderWindow.g.i.cs

@@ -1,5 +1,4 @@
-// Updated by XamlIntelliSenseFileGenerator 09.04.2022 17:01:11
-#pragma checksum "..\..\..\Windows\OrderWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F98B79AAE04AFA8AFC41F861143CBFC9D62127301063336080F51AF21788EA7E"
+#pragma checksum "..\..\..\Windows\OrderWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "47841EDD13CC15FD23F409E01DFF284EB436275865CD2ACC597BD7D2540A4E62"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -33,51 +32,58 @@ using System.Windows.Shapes;
 using System.Windows.Shell;
 
 
-namespace Kafe.Windows
-{
-
-
+namespace Kafe.Windows {
+    
+    
     /// <summary>
     /// OrderWindow
     /// </summary>
-    public partial class OrderWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector
-    {
-
+    public partial class OrderWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+        
+        
+        #line 10 "..\..\..\Windows\OrderWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ListView OrderList;
+        
+        #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("/Kafe;component/windows/orderwindow.xaml", System.UriKind.Relative);
-
-#line 1 "..\..\..\Windows\OrderWindow.xaml"
+            
+            #line 1 "..\..\..\Windows\OrderWindow.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.OrderList = ((System.Windows.Controls.ListView)(target));
+            return;
+            }
             this._contentLoaded = true;
         }
-
-        internal System.Windows.Controls.ListView OrderList;
     }
 }
 

BIN
Kafe/Kafe/obj/Debug/Windows/RegistrationWindow.baml


+ 75 - 0
Kafe/Kafe/obj/Debug/Windows/RegistrationWindow.g.cs

@@ -0,0 +1,75 @@
+#pragma checksum "..\..\..\Windows\RegistrationWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "913F5EF68536356A30C5C90C9850251103EB7BD04177EB995CEFF4C204A8E8CE"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
+//
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using Kafe.Windows;
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Shell;
+
+
+namespace Kafe.Windows {
+    
+    
+    /// <summary>
+    /// RegistrationWindow
+    /// </summary>
+    public partial class RegistrationWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+        
+        private bool _contentLoaded;
+        
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Uri resourceLocater = new System.Uri("/Kafe;component/windows/registrationwindow.xaml", System.UriKind.Relative);
+            
+            #line 1 "..\..\..\Windows\RegistrationWindow.xaml"
+            System.Windows.Application.LoadComponent(this, resourceLocater);
+            
+            #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) {
+            this._contentLoaded = true;
+        }
+    }
+}
+

+ 1 - 1
Kafe/Kafe/obj/Debug/Windows/RegistrationWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Windows\RegistrationWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "10470D721175CA9D2A3566EF621E5062ED9FF17621C746C3474B5B9863B3045A"
+#pragma checksum "..\..\..\Windows\RegistrationWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "913F5EF68536356A30C5C90C9850251103EB7BD04177EB995CEFF4C204A8E8CE"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.

BIN
~$$NEW DB.~vsdx