diff --git a/SushiBar/ImplementationExtensions/SushiBarBusinessLogic.dll b/SushiBar/ImplementationExtensions/SushiBarBusinessLogic.dll new file mode 100644 index 0000000..7216e8b Binary files /dev/null and b/SushiBar/ImplementationExtensions/SushiBarBusinessLogic.dll differ diff --git a/SushiBar/ImplementationExtensions/SushiBarContracts.dll b/SushiBar/ImplementationExtensions/SushiBarContracts.dll index 35e4dce..67c7228 100644 Binary files a/SushiBar/ImplementationExtensions/SushiBarContracts.dll and b/SushiBar/ImplementationExtensions/SushiBarContracts.dll differ diff --git a/SushiBar/ImplementationExtensions/SushiBarDataModels.dll b/SushiBar/ImplementationExtensions/SushiBarDataModels.dll index 453b3b0..e6fc413 100644 Binary files a/SushiBar/ImplementationExtensions/SushiBarDataModels.dll and b/SushiBar/ImplementationExtensions/SushiBarDataModels.dll differ diff --git a/SushiBar/ImplementationExtensions/SushiBarDatabaseImplement.dll b/SushiBar/ImplementationExtensions/SushiBarDatabaseImplement.dll deleted file mode 100644 index 90e6bd9..0000000 Binary files a/SushiBar/ImplementationExtensions/SushiBarDatabaseImplement.dll and /dev/null differ diff --git a/SushiBar/ImplementationExtensions/SushiBarFileImplement.dll b/SushiBar/ImplementationExtensions/SushiBarFileImplement.dll index e167b36..2f54643 100644 Binary files a/SushiBar/ImplementationExtensions/SushiBarFileImplement.dll and b/SushiBar/ImplementationExtensions/SushiBarFileImplement.dll differ diff --git a/SushiBar/ImplementationExtensions/SushiBarListImplement.dll b/SushiBar/ImplementationExtensions/SushiBarListImplement.dll index ad39bf7..cef2804 100644 Binary files a/SushiBar/ImplementationExtensions/SushiBarListImplement.dll and b/SushiBar/ImplementationExtensions/SushiBarListImplement.dll differ diff --git a/SushiBar/SushiBarContracts/ViewModels/ComponentViewModel.cs b/SushiBar/SushiBarContracts/ViewModels/ComponentViewModel.cs index 3abbbc7..9a1948e 100644 --- a/SushiBar/SushiBarContracts/ViewModels/ComponentViewModel.cs +++ b/SushiBar/SushiBarContracts/ViewModels/ComponentViewModel.cs @@ -17,7 +17,7 @@ namespace SushiBarContracts.ViewModels [Column(title: "Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ComponentName { get; set; } = string.Empty; - [Column(title: "Цена", width: 150)] + [Column(title: "Цена ", width: 150)] public double Cost { get; set; } } diff --git a/SushiBar/SushiBarContracts/ViewModels/SushiViewModel.cs b/SushiBar/SushiBarContracts/ViewModels/SushiViewModel.cs index 5346691..d254838 100644 --- a/SushiBar/SushiBarContracts/ViewModels/SushiViewModel.cs +++ b/SushiBar/SushiBarContracts/ViewModels/SushiViewModel.cs @@ -13,7 +13,7 @@ namespace SushiBarContracts.ViewModels { [Column(visible: false)] public int Id { get; set; } - [Column(title: "Название сущи", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + [Column(title: "Название суши", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string SushiName { get; set; } = string.Empty; [Column(title: "Цена", width: 70)] public double Price { get; set; } diff --git a/SushiBar/SushiBarFileImplement/ImplementationExtension.cs b/SushiBar/SushiBarFileImplement/ImplementationExtension.cs index d4068f5..428ef94 100644 --- a/SushiBar/SushiBarFileImplement/ImplementationExtension.cs +++ b/SushiBar/SushiBarFileImplement/ImplementationExtension.cs @@ -15,7 +15,7 @@ namespace SushiBarFileImplement public void RegisterServices() { - //TODO DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); diff --git a/SushiBar/SushiBarFileImplement/SushiBarFileImplement.csproj b/SushiBar/SushiBarFileImplement/SushiBarFileImplement.csproj index 3438638..d9a548c 100644 --- a/SushiBar/SushiBarFileImplement/SushiBarFileImplement.csproj +++ b/SushiBar/SushiBarFileImplement/SushiBarFileImplement.csproj @@ -7,6 +7,7 @@ + diff --git a/SushiBar/SushiBarListImplement/BackUpInfo.cs b/SushiBar/SushiBarListImplement/BackUpInfo.cs new file mode 100644 index 0000000..9ae4479 --- /dev/null +++ b/SushiBar/SushiBarListImplement/BackUpInfo.cs @@ -0,0 +1,22 @@ +using SushiBarContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SushiBarListImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + throw new NotImplementedException(); + } + + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + throw new NotImplementedException(); + } + } +} \ No newline at end of file diff --git a/SushiBar/SushiBarListImplement/ImplementationExtension.cs b/SushiBar/SushiBarListImplement/ImplementationExtension.cs new file mode 100644 index 0000000..a83413e --- /dev/null +++ b/SushiBar/SushiBarListImplement/ImplementationExtension.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SushiBarContracts.DI; +using SushiBarContracts.StoragesContracts; +using SushiBarListImplement.Implements; + +namespace SushiBarListImplement +{ + internal class ImplementationExtension : IImplementationExtension + { + public int Priority => 0; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/SushiBar/SushiBarListImplement/SushiBarListImplement.csproj b/SushiBar/SushiBarListImplement/SushiBarListImplement.csproj index 3438638..d9a548c 100644 --- a/SushiBar/SushiBarListImplement/SushiBarListImplement.csproj +++ b/SushiBar/SushiBarListImplement/SushiBarListImplement.csproj @@ -7,6 +7,7 @@ + diff --git a/SushiBar/SushiBarView/FormComponents.Designer.cs b/SushiBar/SushiBarView/FormComponents.Designer.cs index 8842f1c..5d23904 100644 --- a/SushiBar/SushiBarView/FormComponents.Designer.cs +++ b/SushiBar/SushiBarView/FormComponents.Designer.cs @@ -38,12 +38,10 @@ // // dataGridView // - dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; dataGridView.BackgroundColor = SystemColors.Window; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.Location = new Point(2, 2); dataGridView.Name = "dataGridView"; - dataGridView.RowTemplate.Height = 25; dataGridView.Size = new Size(443, 446); dataGridView.TabIndex = 0; // diff --git a/SushiBar/SushiBarView/SushiBarView.csproj b/SushiBar/SushiBarView/SushiBarView.csproj index d7ebe89..2889477 100644 --- a/SushiBar/SushiBarView/SushiBarView.csproj +++ b/SushiBar/SushiBarView/SushiBarView.csproj @@ -24,6 +24,7 @@ +