Done

AbstractShopBusinessLogic/BusinessLogics/ClientLogic.cs

@@ -0,0 +1,118 @@
+using DinerContracts.BindingModels;
+using DinerContracts.BusinessLogicsContracts;
+using DinerContracts.SearchModels;
+using DinerContracts.StoragesContracts;
+using DinerContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+
+namespace DinerBusinessLogic.BusinessLogics
+{
+    public class ClientLogic : IClientLogic
+    {
+        private readonly ILogger _logger;
+        private readonly IClientStorage _clientStorage;
+        public ClientLogic(ILogger<ClientLogic> logger, IClientStorage clientStorage)
+        {
+            _logger = logger;
+            _clientStorage = clientStorage;
+        }
+        public bool Create(ClientBindingModel model)
+        {
+            CheckModel(model);
+            if (_clientStorage.Insert(model) == null)
+            {
+                _logger.LogWarning("Insert operation failed");
+                return false;
+            }
+            return true;
+        }
+
+        public bool Delete(ClientBindingModel model)
+        {
+            CheckModel(model, false);
+            _logger.LogInformation("Delete. Id:{Id}", model.Id);
+            if (_clientStorage.Delete(model) == null)
+            {
+                _logger.LogWarning("Delete operation failed");
+                return false;
+            }
+            return true;
+        }
+
+        public ClientViewModel? ReadElement(ClientSearchModel model)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            _logger.LogInformation("ReadList. ClientFIO:{ClientFIO}. Id:{Id}", model.ClientFIO, model?.Id);
+
+            var element = _clientStorage.GetElement(model);
+            if (element == null)
+            {
+                _logger.LogWarning("ReadElement element not found");
+                return null;
+            }
+            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+            return element;
+        }
+
+        public List<ClientViewModel>? ReadList(ClientSearchModel? model)
+        {
+            _logger.LogInformation("ReadList. ClientFIO:{ClientFIO}. Id:{Id}", model?.ClientFIO, model?.Id);
+            var list = model == null ? _clientStorage.GetFullList() : _clientStorage.GetFilteredList(model);
+            if (list == null)
+            {
+                _logger.LogWarning("ReadList return null list");
+                return null;
+            }
+            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
+            return list;
+        }
+
+        public bool Update(ClientBindingModel model)
+        {
+            CheckModel(model);
+            if (_clientStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            return true;
+        }
+        private void CheckModel(ClientBindingModel model, bool withParams = true)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (!withParams)
+            {
+                return;
+            }
+            if (string.IsNullOrEmpty(model.ClientFIO))
+            {
+                throw new ArgumentNullException("Отсутствие ФИО в учётной записи", nameof(model.ClientFIO));
+            }
+            if (string.IsNullOrEmpty(model.Email))
+            {
+                throw new ArgumentNullException("Отсутствие почты в учётной записи (логина)", nameof(model.Email));
+            }
+            if (string.IsNullOrEmpty(model.Password))
+            {
+                throw new ArgumentNullException("Отсутствие пароля в учётной записи", nameof(model.Password));
+            }
+
+            _logger.LogInformation("WorkPiece. ClientFIO:{ClientFIO}. Email:{Email}. Password:{Password}. Id:{Id}",
+                model.ClientFIO, model.Email, model.Password, model.Id);
+            var element = _clientStorage.GetElement(new ClientSearchModel
+            {
+                Email = model.Email,
+            });
+            if (element != null && element.Id != model.Id)
+            {
+                throw new InvalidOperationException("Аккаунт с таким логином уже есть");
+            }
+        }
+    }
+}

AbstractShopBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -3,7 +3,6 @@ using DinerContracts.BusinessLogicsContracts;
 using DinerContracts.SearchModels;
 using DinerContracts.StoragesContracts;
 using DinerContracts.ViewModels;
-using DinerDataModels.Models;
 using DinerDataModels.Enum;
 using Microsoft.Extensions.Logging;
 
@@ -13,15 +12,10 @@ namespace DinerBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        private readonly IShopStorage _shopStorage;
-        private readonly IShopLogic _shopLogic;
-
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage)
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
         {
-            _orderStorage = orderStorage;
             _logger = logger;
-            _shopStorage = shopStorage;
-          
+            _orderStorage = orderStorage;
         }
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
         {
@@ -35,7 +29,6 @@ namespace DinerBusinessLogic.BusinessLogics
             _logger.LogInformation("ReadList. Count:{Count}", list.Count);
             return list;
         }
-
         public bool CreateOrder(OrderBindingModel model)
         {
             CheckModel(model);
@@ -48,7 +41,6 @@ namespace DinerBusinessLogic.BusinessLogics
             }
             return true;
         }
-
         public bool TakeOrderInWork(OrderBindingModel model)
         {
             return ChangeStatus(model, OrderStatus.Выполняется);
@@ -59,25 +51,8 @@ namespace DinerBusinessLogic.BusinessLogics
         }
         public bool DeliveryOrder(OrderBindingModel model)
         {
-            var order = _orderStorage.GetElement(new OrderSearchModel
-            {
-                Id = model.Id,
-            });
-            if (order == null)
-            {
-                throw new ArgumentNullException(nameof(order));
-            }
-            if (!_shopStorage.RestockingShops(new SupplyBindingModel
-            {
-                SnackId = order.SnackId,
-                Count = order.Count
-            }))
-            {
-                throw new ArgumentException("Недостаточно места");
-            }
             return ChangeStatus(model, OrderStatus.Выдан);
         }
-  
         private void CheckModel(OrderBindingModel model, bool withParams = true)
         {
             if (model == null)
@@ -100,7 +75,11 @@ namespace DinerBusinessLogic.BusinessLogics
             {
                 throw new ArgumentNullException("Сумма заказа должна быть больше 0", nameof(model.Sum));
             }
-            _logger.LogInformation("Order. ProductId: {ProductId}. Count: {Count}. Sum: {Sum}. Id: {Id}", model.SnackId, model.Count, model.Sum, model.Id);
+            if (model.ClientId < 0)
+            {
+                throw new ArgumentNullException("Некорректный идентификатор у клиента", nameof(model.ClientId));
+            }
+            _logger.LogInformation("Order. ProductId: {ProductId}. Count: {Count}. Sum: {Sum}. Id: {Id}. ClientId: {ClientId}", model.SnackId, model.Count, model.Sum, model.Id, model.ClientId);
             var element = _orderStorage.GetElement(new OrderSearchModel
             {
                 Id = model.Id

AbstractShopBusinessLogic/BusinessLogics/ReportLogic.cs

@@ -1,18 +1,10 @@
-using DinerBusinessLogic.OfficePackage.HelperModels;
-using DinerBusinessLogic.OfficePackage;
+using DinerBusinessLogic.OfficePackage;
+using DinerBusinessLogic.OfficePackage.HelperModels;
 using DinerContracts.BindingModels;
 using DinerContracts.BusinessLogicsContracts;
 using DinerContracts.SearchModels;
 using DinerContracts.StoragesContracts;
 using DinerContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using DinerBusinessLogic.OfficePackage.HelperModels.Word;
-using DinerBusinessLogic.OfficePackage.HelperModels.Excel;
-using DinerBusinessLogic.OfficePackage.HelperModels.PDF;
 
 namespace DinerBusinessLogic.BusinessLogics
 {
@@ -21,63 +13,94 @@ namespace DinerBusinessLogic.BusinessLogics
         private readonly IComponentStorage _componentStorage;
         private readonly ISnackStorage _snackStorage;
         private readonly IOrderStorage _orderStorage;
-        private readonly IShopStorage _shopStorage;
         private readonly AbstractSaveToExcel _saveToExcel;
         private readonly AbstractSaveToWord _saveToWord;
         private readonly AbstractSaveToPdf _saveToPdf;
-
-        public ReportLogic(ISnackStorage snackStorage, IComponentStorage componentStorage, IOrderStorage orderStorage, IShopStorage shopStorage,
-            AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
+        public ReportLogic(ISnackStorage snackStorage, IComponentStorage componentStorage, IOrderStorage orderStorage,
+        AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
         {
             _snackStorage = snackStorage;
             _componentStorage = componentStorage;
             _orderStorage = orderStorage;
-            _shopStorage = shopStorage;
-
             _saveToExcel = saveToExcel;
             _saveToWord = saveToWord;
             _saveToPdf = saveToPdf;
         }
-        public List<ReportSnackComponentViewModel> GetSnackComponents()
+        /// <summary>
+        /// Получение списка компонент с указанием, в каких изделиях используются
+        /// </summary>
+        /// <returns></returns>
+        public List<ReportSnackComponentViewModel> GetSnackComponent()
         {
-            return _snackStorage.GetFullList().Select(x => new ReportSnackComponentViewModel
+            var snacks = _snackStorage.GetFullList();
+            var list = new List<ReportSnackComponentViewModel>();
+            foreach (var snack in snacks)
             {
-                SnackName = x.SnackName,
-                Components = x.SnackComponents.Select(x => (x.Value.Item1.ComponentName, x.Value.Item2)).ToList(),
-                TotalCount = x.SnackComponents.Select(x => x.Value.Item2).Sum()
-            }).ToList();
+                var record = new ReportSnackComponentViewModel
+                {
+                    SnackName = snack.SnackName,
+                    Components = new List<Tuple<string, int>>(),
+                    TotalCount = 0
+                }; foreach (var component in snack.SnackComponents)
+                {
+                    record.Components.Add(new Tuple<string, int>(component.Value.Item1.ComponentName, component.Value.Item2));
+                    record.TotalCount += component.Value.Item2;
+                }
+                list.Add(record);
+            }
+            return list;
         }
+        /// <summary>
+        /// Получение списка заказов за определенный период
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
         public List<ReportOrdersViewModel> GetOrders(ReportBindingModel model)
         {
-            return _orderStorage.GetFilteredList(new OrderSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo })
-                    .Select(x => new ReportOrdersViewModel
-                    {
-                        Id = x.Id,
-                        DateCreate = x.DateCreate,
-                        SnackName = x.SnackName,
-                        Sum = x.Sum,
-                        Status= x.Status.ToString()
-                    })
-                    .ToList();
+            return _orderStorage.GetFilteredList(new OrderSearchModel
+            {
+                DateFrom = model.DateFrom,
+                DateTo = model.DateTo
+            })
+            .Select(x => new ReportOrdersViewModel
+            {
+                Id = x.Id,
+                DateCreate = x.DateCreate,
+                SnackName = x.SnackName,
+                Sum = x.Sum,
+                OrderStatus = x.Status.ToString()
+            })
+           .ToList();
         }
-        public void SaveSnacksToWordFile(ReportBindingModel model)
+        /// <summary>
+        /// Сохранение компонент в файл-Word
+        /// </summary>
+        /// <param name="model"></param>
+        public void SaveComponentsToWordFile(ReportBindingModel model)
         {
-            _saveToWord.CreateSnackDoc(new WordSnackInfo
+            _saveToWord.CreateDoc(new WordInfo
             {
                 FileName = model.FileName,
-                Title = "Список закуска",
+                Title = "Список изделий",
                 Snacks = _snackStorage.GetFullList()
             });
         }
+        /// <summary>
+        /// Сохранение компонент с указаеним продуктов в файл-Excel
+        /// </summary>
+        /// <param name="model"></param>
         public void SaveSnackComponentToExcelFile(ReportBindingModel model)
         {
             _saveToExcel.CreateReport(new ExcelInfo
             {
                 FileName = model.FileName,
-                Title = "Список закусок",
-                SnackComponents = GetSnackComponents()
+                Title = "Список компонент",
+                SnackComponents = GetSnackComponent()
             });
         }
+        /// <summary>/// Сохранение заказов в файл-Pdf
+        /// </summary>
+        /// <param name="model"></param>
         public void SaveOrdersToPdfFile(ReportBindingModel model)
         {
             _saveToPdf.CreateDoc(new PdfInfo
@@ -89,55 +112,5 @@ namespace DinerBusinessLogic.BusinessLogics
                 Orders = GetOrders(model)
             });
         }
-
-        public List<ReportShopsViewModel> GetShops()
-        {
-            return _shopStorage.GetFullList().Select(x => new ReportShopsViewModel
-            {
-                ShopName = x.ShopName,
-                Snacks = x.ShopSnacks.Select(x => (x.Value.Item1.SnackName, x.Value.Item2)).ToList(),
-                TotalCount = x.ShopSnacks.Select(x => x.Value.Item2).Sum()
-            }).ToList();
-        }
-
-        public List<ReportGroupOrdersViewModel> GetGroupedOrders()
-        {
-            return _orderStorage.GetFullList().GroupBy(x => x.DateCreate.Date).Select(x => new ReportGroupOrdersViewModel
-            {
-                Date = x.Key,
-                OrdersCount = x.Count(),
-                OrdersSum = x.Select(y => y.Sum).Sum()
-            }).ToList();
-        }
-
-        public void SaveShopsToWordFile(ReportBindingModel model)
-        {
-            _saveToWord.CreateShopsDoc(new WordShopInfo
-            {
-                FileName = model.FileName,
-                Title = "Список магазинов",
-                Shops = _shopStorage.GetFullList()
-            });
-        }
-
-        public void SaveShopsToExcelFile(ReportBindingModel model)
-        {
-            _saveToExcel.CreateShopSnacksReport(new ExcelShop
-            {
-                FileName = model.FileName,
-                Title = "Наполненость магазинов",
-                ShopSnacks = GetShops()
-            });
-        }
-
-        public void SaveGroupedOrdersToPdfFile(ReportBindingModel model)
-        {
-            _saveToPdf.CreateGroupedOrdersDoc(new PdfGroupedOrdersInfo
-            {
-                FileName = model.FileName,
-                Title = "Список заказов сгруппированных по дате заказов",
-                GroupedOrders = GetGroupedOrders()
-            });
-        }
     }
 }

AbstractShopBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -1,185 +0,0 @@
-using Microsoft.Extensions.Logging;
-using DinerContracts.BindingModels;
-using DinerContracts.BusinessLogicsContracts;
-using DinerContracts.SearchModels;
-using DinerContracts.StoragesContracts;
-using DinerContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using DinerListImplement.Implements;
-
-namespace DinerBusinessLogic.BusinessLogics
-{
-    public class ShopLogic : IShopLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IShopStorage _shopStorage;
-        private readonly ISnackStorage _snackStorage;
-
-        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage, ISnackStorage snackStorage)
-        {
-            _logger = logger;
-            _shopStorage = shopStorage;
-            _snackStorage = snackStorage;
-        }
-
-        public List<ShopViewModel>? ReadList(ShopSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{ Id}", model?.ShopName, model?.Id);
-            var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-
-        public ShopViewModel? ReadElement(ShopSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id);
-            var element = _shopStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
-
-        public bool Create(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Update(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Delete(ShopBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_shopStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool MakeSupply(SupplyBindingModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (model.Count <= 0)
-            {
-                throw new ArgumentException("Количество изделий должно быть больше 0");
-            }
-            var shop = _shopStorage.GetElement(new ShopSearchModel
-            {
-                Id = model.ShopId
-            });
-            if (shop == null)
-            {
-                throw new ArgumentException("Магазина не существует");
-            }
-            if (shop.ShopSnacks.ContainsKey(model.SnackId))
-            {
-                var oldValue = shop.ShopSnacks[model.SnackId];
-                oldValue.Item2 += model.Count;
-                shop.ShopSnacks[model.SnackId] = oldValue;
-            }
-            else
-            {
-                var snack = _snackStorage.GetElement(new SnackSearchModel
-                {
-                    Id = model.SnackId
-                });
-                if (snack == null)
-                {
-                    throw new ArgumentException($"Поставка: Товар с id:{model.SnackId} не найденн");
-                }
-                shop.ShopSnacks.Add(model.SnackId, (snack, model.Count));
-            }
-			_shopStorage.Update(new ShopBindingModel()
-			{
-				Id = shop.Id,
-				ShopName = shop.ShopName,
-				Adress = shop.Adress,
-				OpeningDate = shop.OpeningDate,
-				ShopSnacks = shop.ShopSnacks,
-				SnackMaxCount = shop.SnackMaxCount,
-			});
-			return true;
-        }
-
-        private void CheckModel(ShopBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.Adress))
-            {
-                throw new ArgumentException("Адрес магазина длжен быть заполнен", nameof(model.Adress));
-            }
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                throw new ArgumentException("Название магазина должно быть заполнено", nameof(model.ShopName));
-            }
-            _logger.LogInformation("Shop. ShopName:{ShopName}.Adres:{Adres}.OpeningDate:{OpeningDate}.Id:{ Id}", model.ShopName, model.Adress, model.OpeningDate, model.Id);
-            var element = _shopStorage.GetElement(new ShopSearchModel
-            {
-                ShopName = model.ShopName
-            });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Магазин с таким названием уже есть");
-            }
-        }
-        public bool Sale(SupplySearchModel model)
-        {
-            if (!model.SnackId.HasValue || !model.Count.HasValue)
-            {
-                return false;
-            }
-            _logger.LogInformation("Check snack count in all shops");
-            if (_shopStorage.Sale(model))
-            {
-                _logger.LogInformation("Selling sucsess");
-                return true;
-            }
-            _logger.LogInformation("Selling failed");
-            return false;
-        }
-    }
-}

AbstractShopBusinessLogic/DinerBusinessLogic.csproj

@@ -7,7 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
+    <PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.14">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="NPOI" Version="2.6.2" />
     <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
@@ -15,7 +21,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\AbstractShopContracts\DinerContracts.csproj" />
-    <ProjectReference Include="..\Diner\AbstractShopListImplement\DinerListImplement.csproj" />
   </ItemGroup>
 
 </Project>

AbstractShopBusinessLogic/Implements/SaveToWord.cs

@@ -1,193 +0,0 @@
-using DocumentFormat.OpenXml;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Wordprocessing;
-using DinerBusinessLogic.OfficePackage;
-using DinerBusinessLogic.OfficePackage.HelperEnums;
-using DinerBusinessLogic.OfficePackage.HelperModels;
-using DinerBusinessLogic.OfficePackage.HelperModels.Word;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerBusinessLogic.Implements
-{
-    public class SaveToWord : AbstractSaveToWord
-    {
-        private WordprocessingDocument? _wordDocument;
-        private Body? _docBody;
-
-        private static JustificationValues GetJustificationValues(WordJustificationType type)
-        {
-            return type switch
-            {
-                WordJustificationType.Both => JustificationValues.Both,
-                WordJustificationType.Center => JustificationValues.Center,
-                _ => JustificationValues.Left,
-            };
-        }
-        private static SectionProperties CreateSectionProperties()
-        {
-            var properties = new SectionProperties();
-
-            var pageSize = new PageSize
-            {
-                Orient = PageOrientationValues.Portrait
-            };
-
-            properties.AppendChild(pageSize);
-
-            return properties;
-        }
-        private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
-        {
-            if (paragraphProperties == null)
-            {
-                return null;
-            }
-
-            var properties = new ParagraphProperties();
-
-            properties.AppendChild(new Justification()
-            {
-                Val = GetJustificationValues(paragraphProperties.JustificationType)
-            });
-
-            properties.AppendChild(new SpacingBetweenLines
-            {
-                LineRule = LineSpacingRuleValues.Auto
-            });
-
-            properties.AppendChild(new Indentation());
-
-            var paragraphMarkRunProperties = new ParagraphMarkRunProperties();
-            if (!string.IsNullOrEmpty(paragraphProperties.Size))
-            {
-                paragraphMarkRunProperties.AppendChild(new FontSize { Val = paragraphProperties.Size });
-            }
-            properties.AppendChild(paragraphMarkRunProperties);
-
-            return properties;
-        }
-        protected override void CreateWord(IDocument info)
-        {
-            _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document);
-            MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
-            mainPart.Document = new Document();
-            _docBody = mainPart.Document.AppendChild(new Body());
-        }
-        protected override void CreateParagraph(WordParagraph paragraph)
-        {
-            if (_docBody == null || paragraph == null)
-            {
-                return;
-            }
-            var docParagraph = new Paragraph();
-
-            docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
-
-            foreach (var run in paragraph.Texts)
-            {
-                var docRun = new Run();
-
-                var properties = new RunProperties();
-                properties.AppendChild(new FontSize { Val = run.Item2.Size });
-                if (run.Item2.Bold)
-                {
-                    properties.AppendChild(new Bold());
-                }
-                docRun.AppendChild(properties);
-
-                docRun.AppendChild(new Text { Text = run.Item1, Space = SpaceProcessingModeValues.Preserve });
-
-                docParagraph.AppendChild(docRun);
-            }
-
-            _docBody.AppendChild(docParagraph);
-        }
-        protected override void SaveWord(IDocument info)
-        {
-            if (_docBody == null || _wordDocument == null)
-            {
-                return;
-            }
-            _docBody.AppendChild(CreateSectionProperties());
-
-            _wordDocument.MainDocumentPart!.Document.Save();
-
-            _wordDocument.Dispose();
-        }
-
-        private Table? _lastTable;
-        protected override void CreateTable(List<string> columns)
-        {
-            if (_docBody == null)
-                return;
-
-            _lastTable = new Table();
-
-            var tableProp = new TableProperties();
-            tableProp.AppendChild(new TableLayout { Type = TableLayoutValues.Fixed });
-            tableProp.AppendChild(new TableBorders(
-                    new TopBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new LeftBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new RightBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new BottomBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new InsideHorizontalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new InsideVerticalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 }
-                ));
-            tableProp.AppendChild(new TableWidth { Type = TableWidthUnitValues.Auto });
-            _lastTable.AppendChild(tableProp);
-
-            TableGrid tableGrid = new TableGrid();
-            foreach (var column in columns)
-            {
-                tableGrid.AppendChild(new GridColumn() { Width = column });
-            }
-            _lastTable.AppendChild(tableGrid);
-
-            _docBody.AppendChild(_lastTable);
-        }
-        protected override void CreateRow(WordRowParameters rowParameters)
-        {
-            if (_docBody == null || _lastTable == null)
-                return;
-
-            TableRow docRow = new TableRow();
-            foreach (var column in rowParameters.Texts)
-            {
-                var docParagraph = new Paragraph();
-                WordParagraph paragraph = new WordParagraph
-                {
-                    Texts = new List<(string, WordTextProperties)> { (column, rowParameters.TextProperties) },
-                    TextProperties = rowParameters.TextProperties
-                };
-
-                docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
-
-                foreach (var run in paragraph.Texts)
-                {
-                    var docRun = new Run();
-
-                    var properties = new RunProperties();
-                    properties.AppendChild(new FontSize { Val = run.Item2.Size });
-                    if (run.Item2.Bold)
-                    {
-                        properties.AppendChild(new Bold());
-                    }
-                    docRun.AppendChild(properties);
-
-                    docRun.AppendChild(new Text { Text = run.Item1, Space = SpaceProcessingModeValues.Preserve });
-
-                    docParagraph.AppendChild(docRun);
-                }
-
-                TableCell docCell = new TableCell();
-                docCell.AppendChild(docParagraph);
-                docRow.AppendChild(docCell);
-            }
-            _lastTable.AppendChild(docRow);
-        }
-    }
-}

AbstractShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

@@ -1,20 +1,18 @@
 using DinerBusinessLogic.OfficePackage.HelperEnums;
 using DinerBusinessLogic.OfficePackage.HelperModels;
-using DinerBusinessLogic.OfficePackage.HelperModels.Excel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DinerBusinessLogic.OfficePackage
 {
     public abstract class AbstractSaveToExcel
     {
+
+        /// <summary>
+        /// Создание отчета
+        /// </summary>
+        /// <param name="info"></param>
         public void CreateReport(ExcelInfo info)
         {
             CreateExcel(info);
-
             InsertCellInWorksheet(new ExcelCellParameters
             {
                 ColumnName = "A",
@@ -22,13 +20,11 @@ namespace DinerBusinessLogic.OfficePackage
                 Text = info.Title,
                 StyleInfo = ExcelStyleInfoType.Title
             });
-
             MergeCells(new ExcelMergeParameters
             {
                 CellFromName = "A1",
                 CellToName = "C1"
             });
-
             uint rowIndex = 2;
             foreach (var pc in info.SnackComponents)
             {
@@ -39,29 +35,26 @@ namespace DinerBusinessLogic.OfficePackage
                     Text = pc.SnackName,
                     StyleInfo = ExcelStyleInfoType.Text
                 });
-                rowIndex++;
-
-                foreach (var (Component, Count) in pc.Components)
+                rowIndex++; foreach (var component in pc.Components)
                 {
                     InsertCellInWorksheet(new ExcelCellParameters
                     {
                         ColumnName = "B",
                         RowIndex = rowIndex,
-                        Text = Component,
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
+                        Text = component.Item1,
+                        StyleInfo =
+                    ExcelStyleInfoType.TextWithBroder
                     });
-
                     InsertCellInWorksheet(new ExcelCellParameters
                     {
                         ColumnName = "C",
                         RowIndex = rowIndex,
-                        Text = Count.ToString(),
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
+                        Text = component.Item2.ToString(),
+                        StyleInfo =
+                    ExcelStyleInfoType.TextWithBroder
                     });
-
                     rowIndex++;
                 }
-
                 InsertCellInWorksheet(new ExcelCellParameters
                 {
                     ColumnName = "A",
@@ -78,85 +71,28 @@ namespace DinerBusinessLogic.OfficePackage
                 });
                 rowIndex++;
             }
-
             SaveExcel(info);
         }
-
-        public void CreateShopSnacksReport(ExcelShop info)
-        {
-            CreateExcel(info);
-
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = 1,
-                Text = info.Title,
-                StyleInfo = ExcelStyleInfoType.Title
-            });
-
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A1",
-                CellToName = "C1"
-            });
-
-            uint rowIndex = 2;
-            foreach (var sr in info.ShopSnacks)
-            {
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = sr.ShopName,
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-
-                foreach (var (Snack, Count) in sr.Snacks)
-                {
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "B",
-                        RowIndex = rowIndex,
-                        Text = Snack,
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
-                    });
-
-
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "C",
-                        RowIndex = rowIndex,
-                        Text = Count.ToString(),
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
-                    });
-
-                    rowIndex++;
-                }
-
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = "Итого",
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = sr.TotalCount.ToString(),
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-            }
-
-            SaveExcel(info);
-        }
-
-        protected abstract void CreateExcel(IDocument info);
-        protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams);
+        /// <summary>
+        /// Создание excel-файла
+        /// </summary>
+        /// <param name="info"></param>
+        protected abstract void CreateExcel(ExcelInfo info);
+        /// <summary>
+        /// Добавляем новую ячейку в лист
+        /// </summary>
+        /// <param name="cellParameters"></param>
+        protected abstract void InsertCellInWorksheet(ExcelCellParameters
+        excelParams);
+        /// <summary>
+        /// Объединение ячеек
+        /// </summary>
+        /// <param name="mergeParameters"></param>
         protected abstract void MergeCells(ExcelMergeParameters excelParams);
-        protected abstract void SaveExcel(IDocument info);
+        /// <summary>
+        /// Сохранение файла
+        /// </summary>
+        /// <param name="info"></param>
+        protected abstract void SaveExcel(ExcelInfo info);
     }
 }

AbstractShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

@@ -1,11 +1,5 @@
 using DinerBusinessLogic.OfficePackage.HelperEnums;
 using DinerBusinessLogic.OfficePackage.HelperModels;
-using DinerBusinessLogic.OfficePackage.HelperModels.PDF;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DinerBusinessLogic.OfficePackage
 {
@@ -14,14 +8,26 @@ namespace DinerBusinessLogic.OfficePackage
         public void CreateDoc(PdfInfo info)
         {
             CreatePdf(info);
-            CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-            CreateParagraph(new PdfParagraph { Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+
+            CreateParagraph(new PdfParagraph
+            {
+                Text = info.Title,
+                Style = "NormalTitle",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
+            });
+
+            CreateParagraph(new PdfParagraph
+            {
+                Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}",
+                Style = "Normal",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
+            });
 
             CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm", "3cm" });
 
             CreateRow(new PdfRowParameters
             {
-                Texts = new List<string> { "Номер", "Дата заказа", "Закуска", "Статус", "Сумма" },
+                Texts = new List<string> { "Номер", "Дата заказа", "Изделие", "Сумма", "Статус заказа" },
                 Style = "NormalTitle",
                 ParagraphAlignment = PdfParagraphAlignmentType.Center
             });
@@ -30,49 +36,47 @@ namespace DinerBusinessLogic.OfficePackage
             {
                 CreateRow(new PdfRowParameters
                 {
-                    Texts = new List<string> { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.SnackName, order.Status.ToString(), order.Sum.ToString() },
+                    Texts = new List<string> { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.SnackName, order.Sum.ToString(), order.OrderStatus },
                     Style = "Normal",
                     ParagraphAlignment = PdfParagraphAlignmentType.Left
                 });
             }
-            CreateParagraph(new PdfParagraph { Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Rigth });
 
-            SavePdf(info);
-        }
-
-        public void CreateGroupedOrdersDoc(PdfGroupedOrdersInfo info)
-        {
-            CreatePdf(info);
-            CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-
-            CreateTable(new List<string> { "4cm", "3cm", "2cm" });
-            CreateRow(new PdfRowParameters
+            CreateParagraph(new PdfParagraph
             {
-                Texts = new List<string> { "Дата заказа", "Кол-во", "Сумма" },
-                Style = "NormalTitle",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
+                Text = $"\nИтого: {info.Orders.Sum(x => x.Sum)}\t",
+                Style = "Normal",
+                ParagraphAlignment = PdfParagraphAlignmentType.Rigth
             });
 
-
-            foreach (var groupedOrder in info.GroupedOrders)
-            {
-                CreateRow(new PdfRowParameters
-                {
-                    Texts = new List<string> { groupedOrder.Date.ToShortDateString(), groupedOrder.OrdersCount.ToString(), groupedOrder.OrdersSum.ToString() },
-                    Style = "Normal",
-                    ParagraphAlignment = PdfParagraphAlignmentType.Left
-                });
-            }
-
-            CreateParagraph(new PdfParagraph { Text = $"Итого: {info.GroupedOrders.Sum(x => x.OrdersSum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-
             SavePdf(info);
         }
-
-        protected abstract void CreatePdf(IDocument info);
+        /// <summary>
+        /// Создание doc-файла
+        /// </summary>
+        /// <param name="info"></param>
+        protected abstract void CreatePdf(PdfInfo info);
+        /// <summary>
+        /// Создание параграфа с текстом
+        /// </summary>
+        /// <param name="title"></param>
+        /// <param name="style"></param>
         protected abstract void CreateParagraph(PdfParagraph paragraph);
+        /// <summary>
+        /// Создание таблицы
+        /// </summary>
+        /// <param name="title"></param>
+        /// <param name="style"></param>
         protected abstract void CreateTable(List<string> columns);
+        /// <summary>
+        /// Создание и заполнение строки
+        /// </summary>
+        /// <param name="rowParameters"></param>
         protected abstract void CreateRow(PdfRowParameters rowParameters);
-        protected abstract void SavePdf(IDocument info);
+        /// <summary>
+        /// Сохранение файла
+        /// </summary>
+        /// <param name="info"></param>
+        protected abstract void SavePdf(PdfInfo info);
     }
 }

AbstractShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs

@@ -1,20 +1,13 @@
 using DinerBusinessLogic.OfficePackage.HelperEnums;
 using DinerBusinessLogic.OfficePackage.HelperModels;
-using DinerBusinessLogic.OfficePackage.HelperModels.Word;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DinerBusinessLogic.OfficePackage
 {
     public abstract class AbstractSaveToWord
     {
-        public void CreateSnackDoc(WordSnackInfo info)
+        public void CreateDoc(WordInfo info)
         {
             CreateWord(info);
-
             CreateParagraph(new WordParagraph
             {
                 Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) },
@@ -24,15 +17,11 @@ namespace DinerBusinessLogic.OfficePackage
                     JustificationType = WordJustificationType.Center
                 }
             });
-
             foreach (var snack in info.Snacks)
             {
                 CreateParagraph(new WordParagraph
                 {
-                    Texts = new List<(string, WordTextProperties)> { 
-                        (snack.SnackName, new WordTextProperties { Size = "24", Bold = true}), 
-                        ("\t"+snack.Price.ToString(), new WordTextProperties{Size = "24"}) 
-                    },
+                    Texts = new List<(string, WordTextProperties)> { (snack.SnackName + "| ", new WordTextProperties { Bold = true, Size = "24", }), (snack.Price.ToString(), new WordTextProperties { Size = "24"}) },
                     TextProperties = new WordTextProperties
                     {
                         Size = "24",
@@ -40,54 +29,23 @@ namespace DinerBusinessLogic.OfficePackage
                     }
                 });
             }
-
             SaveWord(info);
         }
-
-        public void CreateShopsDoc(WordShopInfo info)
-        {
-            CreateWord(info);
-            CreateParagraph(new WordParagraph
-            {
-                Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    JustificationType = WordJustificationType.Center
-                }
-            });
-
-            CreateTable(new List<string> { "3000", "3000", "3000" });
-            CreateRow(new WordRowParameters
-            {
-                Texts = new List<string> { "Название", "Адрес", "Дата открытия" },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    Bold = true,
-                    JustificationType = WordJustificationType.Center
-                }
-            });
-
-            foreach (var shop in info.Shops)
-            {
-                CreateRow(new WordRowParameters
-                {
-                    Texts = new List<string> { shop.ShopName, shop.Adress, shop.OpeningDate.ToString() },
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "22",
-                        JustificationType = WordJustificationType.Both
-                    }
-                });
-            }
-
-            SaveWord(info);
-        }
-        protected abstract void CreateWord(IDocument info);
+        /// <summary>
+        /// Создание doc-файла
+        /// </summary>
+        /// <param name="info"></param>
+        protected abstract void CreateWord(WordInfo info);
+        /// <summary>
+        /// Создание абзаца с текстом
+        /// </summary>
+        /// <param name="paragraph"></param>
+        /// <returns></returns>
         protected abstract void CreateParagraph(WordParagraph paragraph);
-        protected abstract void SaveWord(IDocument info);
-        protected abstract void CreateTable(List<string> colums);
-        protected abstract void CreateRow(WordRowParameters rowParameters);
+        /// <summary>
+        /// Сохранение файла
+        /// </summary>
+        /// <param name="info"></param>
+        protected abstract void SaveWord(WordInfo info);
     }
 }

AbstractShopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerBusinessLogic.OfficePackage.HelperEnums
+namespace DinerBusinessLogic.OfficePackage.HelperEnums
 {
     public enum ExcelStyleInfoType
     {

AbstractShopBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs

@@ -11,4 +11,4 @@ namespace DinerBusinessLogic.OfficePackage.HelperEnums
         Center,
         Both
     }
-}
+}

AbstractShopBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs

@@ -1,18 +1,17 @@
 using DinerBusinessLogic.OfficePackage.HelperEnums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DinerBusinessLogic.OfficePackage.HelperModels
 {
     public class ExcelCellParameters
     {
         public string ColumnName { get; set; } = string.Empty;
+
         public uint RowIndex { get; set; }
+
         public string Text { get; set; } = string.Empty;
+
         public string CellReference => $"{ColumnName}{RowIndex}";
+
         public ExcelStyleInfoType StyleInfo { get; set; }
     }
 }

AbstractShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs

@@ -1,17 +1,13 @@
-using DinerBusinessLogic.OfficePackage.HelperEnums;
-using DinerContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using DinerContracts.ViewModels;
 
 namespace DinerBusinessLogic.OfficePackage.HelperModels
 {
-    public class ExcelInfo : IDocument
+    public class ExcelInfo
     {
         public string FileName { get; set; } = string.Empty;
+
         public string Title { get; set; } = string.Empty;
+
         public List<ReportSnackComponentViewModel> SnackComponents { get; set; } = new();
     }
 }

AbstractShopBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs

@@ -1,15 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+
 namespace DinerBusinessLogic.OfficePackage.HelperModels
 {
     public class ExcelMergeParameters
     {
         public string CellFromName { get; set; } = string.Empty;
+
         public string CellToName { get; set; } = string.Empty;
+
         public string Merge => $"{CellFromName}:{CellToName}";
     }
 }

AbstractShopBusinessLogic/OfficePackage/HelperModels/ExcelShop.cs

@@ -1,16 +0,0 @@
-using DinerContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerBusinessLogic.OfficePackage.HelperModels.Excel
-{
-    public class ExcelShop : IDocument
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<ReportShopsViewModel> ShopSnacks { get; set; } = new();
-    }
-}

AbstractShopBusinessLogic/OfficePackage/HelperModels/PdfGroupedOrdersInfo.cs

@@ -1,18 +0,0 @@
-using DinerContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerBusinessLogic.OfficePackage.HelperModels.PDF
-{
-    public class PdfGroupedOrdersInfo : IDocument
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public DateTime DateFrom { get; set; }
-        public DateTime DateTo { get; set; }
-        public List<ReportGroupOrdersViewModel> GroupedOrders { get; set; } = new();
-    }
-}

AbstractShopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs

@@ -1,19 +1,17 @@
-using DinerBusinessLogic.OfficePackage.HelperEnums;
-using DinerContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using DinerContracts.ViewModels;
 
 namespace DinerBusinessLogic.OfficePackage.HelperModels
 {
-    public class PdfInfo : IDocument
+    public class PdfInfo
     {
         public string FileName { get; set; } = string.Empty;
+
         public string Title { get; set; } = string.Empty;
+
         public DateTime DateFrom { get; set; }
+
         public DateTime DateTo { get; set; }
+
         public List<ReportOrdersViewModel> Orders { get; set; } = new();
     }
 }

AbstractShopBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs

@@ -1,16 +1,13 @@
 using DinerBusinessLogic.OfficePackage.HelperEnums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DinerBusinessLogic.OfficePackage.HelperModels
 {
     public class PdfParagraph
     {
         public string Text { get; set; } = string.Empty;
+
         public string Style { get; set; } = string.Empty;
+
         public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
     }
 }

AbstractShopBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs

@@ -1,16 +1,13 @@
 using DinerBusinessLogic.OfficePackage.HelperEnums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DinerBusinessLogic.OfficePackage.HelperModels
 {
     public class PdfRowParameters
     {
         public List<string> Texts { get; set; } = new();
+
         public string Style { get; set; } = string.Empty;
+
         public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
     }
 }

AbstractShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs

@@ -1,14 +1,8 @@
-using DinerBusinessLogic.OfficePackage.HelperEnums;
-using DinerContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using DinerContracts.ViewModels;
 
 namespace DinerBusinessLogic.OfficePackage.HelperModels
 {
-    public class WordSnackInfo : IDocument
+    public class WordInfo
     {
         public string FileName { get; set; } = string.Empty;
         public string Title { get; set; } = string.Empty;

AbstractShopBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+
 namespace DinerBusinessLogic.OfficePackage.HelperModels
 {
     public class WordParagraph

AbstractShopBusinessLogic/OfficePackage/HelperModels/WordRowParameters.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerBusinessLogic.OfficePackage.HelperModels.Word
-{
-    public class WordRowParameters
-    {
-        public List<string> Texts { get; set; } = new();
-        public WordTextProperties TextProperties { get; set; } = new();
-    }
-}

AbstractShopBusinessLogic/OfficePackage/HelperModels/WordShopInfo.cs

@@ -1,16 +0,0 @@
-using DinerContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerBusinessLogic.OfficePackage.HelperModels.Word
-{
-    public class WordShopInfo : IDocument
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<ShopViewModel> Shops { get; set; } = new();
-    }
-}

AbstractShopBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs

@@ -1,16 +1,13 @@
 using DinerBusinessLogic.OfficePackage.HelperEnums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DinerBusinessLogic.OfficePackage.HelperModels
 {
     public class WordTextProperties
     {
         public string Size { get; set; } = string.Empty;
+
         public bool Bold { get; set; }
+
         public WordJustificationType JustificationType { get; set; }
     }
 }

AbstractShopBusinessLogic/OfficePackage/IDocument.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerBusinessLogic.OfficePackage
-{
-    public interface IDocument
-    {
-        public string FileName { get; set; }
-        public string Title { get; set; }
-    }
-}

AbstractShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs

@@ -1,128 +1,172 @@
-using DocumentFormat.OpenXml.Office2010.Excel;
-using DocumentFormat.OpenXml.Office2013.Excel;
-using DocumentFormat.OpenXml.Packaging;
-using DocumentFormat.OpenXml.Spreadsheet;
-using DocumentFormat.OpenXml;
-using DinerBusinessLogic.OfficePackage;
+
 using DinerBusinessLogic.OfficePackage.HelperEnums;
 using DinerBusinessLogic.OfficePackage.HelperModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Office2013.Excel;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
 
-namespace DinerBusinessLogic.Implements
+
+namespace DinerBusinessLogic.OfficePackage.Implements
 {
     public class SaveToExcel : AbstractSaveToExcel
     {
         private SpreadsheetDocument? _spreadsheetDocument;
         private SharedStringTablePart? _shareStringPart;
         private Worksheet? _worksheet;
-
+        /// <summary>
+        /// Настройка стилей для файла
+        /// </summary>
+        /// <param name="workbookpart"></param>
         private static void CreateStyles(WorkbookPart workbookpart)
         {
             var sp = workbookpart.AddNewPart<WorkbookStylesPart>();
             sp.Stylesheet = new Stylesheet();
-
             var fonts = new Fonts() { Count = 2U, KnownFonts = true };
-
             var fontUsual = new Font();
             fontUsual.Append(new FontSize() { Val = 12D });
-            fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
+            fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Theme = 1U });
             fontUsual.Append(new FontName() { Val = "Times New Roman" });
             fontUsual.Append(new FontFamilyNumbering() { Val = 2 });
             fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor });
-
             var fontTitle = new Font();
             fontTitle.Append(new Bold());
             fontTitle.Append(new FontSize() { Val = 14D });
-            fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
+            fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Theme = 1U });
             fontTitle.Append(new FontName() { Val = "Times New Roman" });
             fontTitle.Append(new FontFamilyNumbering() { Val = 2 });
             fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor });
-
             fonts.Append(fontUsual);
             fonts.Append(fontTitle);
-
             var fills = new Fills() { Count = 2U };
-
             var fill1 = new Fill();
-            fill1.Append(new PatternFill() { PatternType = PatternValues.None });
-
-            var fill2 = new Fill();
-            fill2.Append(new PatternFill() { PatternType = PatternValues.Gray125 });
-
+            fill1.Append(new PatternFill() { PatternType = PatternValues.None }); var fill2 = new Fill();
+            fill2.Append(new PatternFill()
+            {
+                PatternType = PatternValues.Gray125
+            });
             fills.Append(fill1);
             fills.Append(fill2);
-
             var borders = new Borders() { Count = 2U };
-
             var borderNoBorder = new Border();
             borderNoBorder.Append(new LeftBorder());
             borderNoBorder.Append(new RightBorder());
             borderNoBorder.Append(new TopBorder());
             borderNoBorder.Append(new BottomBorder());
             borderNoBorder.Append(new DiagonalBorder());
-
             var borderThin = new Border();
-
             var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin };
-            leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
-
-            var rightBorder = new RightBorder() { Style = BorderStyleValues.Thin };
-            rightBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
-
+            leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Indexed = 64U });
+            var rightBorder = new RightBorder()
+            {
+                Style = BorderStyleValues.Thin
+            };
+            rightBorder.Append(new
+           DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Indexed = 64U });
             var topBorder = new TopBorder() { Style = BorderStyleValues.Thin };
-            topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
-
-            var bottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin };
-            bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
-
+            topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Indexed = 64U });
+            var bottomBorder = new BottomBorder()
+            {
+                Style = BorderStyleValues.Thin
+            };
+            bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Indexed = 64U });
             borderThin.Append(leftBorder);
             borderThin.Append(rightBorder);
             borderThin.Append(topBorder);
             borderThin.Append(bottomBorder);
             borderThin.Append(new DiagonalBorder());
-
             borders.Append(borderNoBorder);
             borders.Append(borderThin);
-
             var cellStyleFormats = new CellStyleFormats() { Count = 1U };
-            var cellFormatStyle = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U };
-
+            var cellFormatStyle = new CellFormat()
+            {
+                NumberFormatId = 0U,
+                FontId = 0U,
+                FillId = 0U,
+                BorderId = 0U
+            };
             cellStyleFormats.Append(cellFormatStyle);
-
             var cellFormats = new CellFormats() { Count = 3U };
-            var cellFormatFont = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U, FormatId = 0U, ApplyFont = true };
-            var cellFormatFontAndBorder = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 1U, FormatId = 0U, ApplyFont = true, ApplyBorder = true };
-            var cellFormatTitle = new CellFormat() { NumberFormatId = 0U, FontId = 1U, FillId = 0U, BorderId = 0U, FormatId = 0U, Alignment = new Alignment() { Vertical = VerticalAlignmentValues.Center, WrapText = true, Horizontal = HorizontalAlignmentValues.Center }, ApplyFont = true };
-
+            var cellFormatFont = new CellFormat()
+            {
+                NumberFormatId = 0U,
+                FontId = 0U,
+                FillId = 0U,
+                BorderId = 0U,
+                FormatId = 0U,
+                ApplyFont = true
+            };
+            var cellFormatFontAndBorder = new CellFormat()
+            {
+                NumberFormatId = 0U,
+                FontId = 0U,
+                FillId = 0U,
+                BorderId = 1U,
+                FormatId = 0U,
+                ApplyFont = true,
+                ApplyBorder = true
+            };
+            var cellFormatTitle = new CellFormat()
+            {
+                NumberFormatId = 0U,
+                FontId = 1U,
+                FillId = 0U,
+                BorderId = 0U,
+                FormatId = 0U,
+                Alignment = new Alignment()
+                {
+                    Vertical = VerticalAlignmentValues.Center,
+                    WrapText = true,
+                    Horizontal = HorizontalAlignmentValues.Center
+                },
+                ApplyFont = true
+            };
             cellFormats.Append(cellFormatFont);
             cellFormats.Append(cellFormatFontAndBorder);
-            cellFormats.Append(cellFormatTitle);
-
-            var cellStyles = new CellStyles() { Count = 1U };
-
-            cellStyles.Append(new CellStyle() { Name = "Normal", FormatId = 0U, BuiltinId = 0U });
-
-            var differentialFormats = new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats() { Count = 0U };
-
-            var tableStyles = new TableStyles() { Count = 0U, DefaultTableStyle = "TableStyleMedium2", DefaultPivotStyle = "PivotStyleLight16" };
+            cellFormats.Append(cellFormatTitle); var cellStyles = new CellStyles() { Count = 1U };
+            cellStyles.Append(new CellStyle()
+            {
+                Name = "Normal",
+                FormatId = 0U,
+                BuiltinId = 0U
+            });
+            var differentialFormats = new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats()
+            { Count = 0U };
 
+            var tableStyles = new TableStyles()
+            {
+                Count = 0U,
+                DefaultTableStyle = "TableStyleMedium2",
+                DefaultPivotStyle = "PivotStyleLight16"
+            };
             var stylesheetExtensionList = new StylesheetExtensionList();
-
-            var stylesheetExtension1 = new StylesheetExtension() { Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" };
+            var stylesheetExtension1 = new StylesheetExtension()
+            {
+                Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}"
+            };
             stylesheetExtension1.AddNamespaceDeclaration("x14", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
-            stylesheetExtension1.Append(new SlicerStyles() { DefaultSlicerStyle = "SlicerStyleLight1" });
-
-            var stylesheetExtension2 = new StylesheetExtension() { Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}" };
+            stylesheetExtension1.Append(new SlicerStyles()
+            {
+                DefaultSlicerStyle = "SlicerStyleLight1"
+            });
+            var stylesheetExtension2 = new StylesheetExtension()
+            {
+                Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}"
+            };
             stylesheetExtension2.AddNamespaceDeclaration("x15", "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main");
-            stylesheetExtension2.Append(new TimelineStyles() { DefaultTimelineStyle = "TimeSlicerStyleLight1" });
-
+            stylesheetExtension2.Append(new TimelineStyles()
+            {
+                DefaultTimelineStyle = "TimeSlicerStyleLight1"
+            });
             stylesheetExtensionList.Append(stylesheetExtension1);
             stylesheetExtensionList.Append(stylesheetExtension2);
-
             sp.Stylesheet.Append(fonts);
             sp.Stylesheet.Append(fills);
             sp.Stylesheet.Append(borders);
@@ -133,6 +177,11 @@ namespace DinerBusinessLogic.Implements
             sp.Stylesheet.Append(tableStyles);
             sp.Stylesheet.Append(stylesheetExtensionList);
         }
+        /// <summary>
+        /// Получение номера стиля из типа
+        /// </summary>
+        /// <param name="styleInfo"></param>
+        /// <returns></returns>
         private static uint GetStyleValue(ExcelStyleInfoType styleInfo)
         {
             return styleInfo switch
@@ -143,30 +192,24 @@ namespace DinerBusinessLogic.Implements
                 _ => 0U,
             };
         }
-        protected override void CreateExcel(IDocument info)
+        protected override void CreateExcel(ExcelInfo info)
         {
             _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook);
             // Создаем книгу (в ней хранятся листы)
             var workbookpart = _spreadsheetDocument.AddWorkbookPart();
-            workbookpart.Workbook = new Workbook();
-
-            CreateStyles(workbookpart);
-
+            workbookpart.Workbook = new Workbook(); CreateStyles(workbookpart);
             // Получаем/создаем хранилище текстов для книги
             _shareStringPart = _spreadsheetDocument.WorkbookPart!.GetPartsOfType<SharedStringTablePart>().Any()
-                ? _spreadsheetDocument.WorkbookPart.GetPartsOfType<SharedStringTablePart>().First()
-                : _spreadsheetDocument.WorkbookPart.AddNewPart<SharedStringTablePart>();
-
+            ?_spreadsheetDocument.WorkbookPart.GetPartsOfType<SharedStringTablePart>().First():
+           _spreadsheetDocument.WorkbookPart.AddNewPart<SharedStringTablePart>();
             // Создаем SharedStringTable, если его нет
             if (_shareStringPart.SharedStringTable == null)
             {
                 _shareStringPart.SharedStringTable = new SharedStringTable();
             }
-
             // Создаем лист в книгу
             var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
             worksheetPart.Worksheet = new Worksheet(new SheetData());
-
             // Добавляем лист в книгу
             var sheets = _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
             var sheet = new Sheet()
@@ -176,7 +219,6 @@ namespace DinerBusinessLogic.Implements
                 Name = "Лист"
             };
             sheets.Append(sheet);
-
             _worksheet = worksheetPart.Worksheet;
         }
         protected override void InsertCellInWorksheet(ExcelCellParameters excelParams)
@@ -190,7 +232,6 @@ namespace DinerBusinessLogic.Implements
             {
                 return;
             }
-
             // Ищем строку, либо добавляем ее
             Row row;
             if (sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).Any())
@@ -202,10 +243,8 @@ namespace DinerBusinessLogic.Implements
                 row = new Row() { RowIndex = excelParams.RowIndex };
                 sheetData.Append(row);
             }
-
-            // Ищем нужную ячейку  
-            Cell cell;
-            if (row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).Any())
+            // Ищем нужную ячейку
+            Cell cell; if (row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).Any())
             {
                 cell = row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).First();
             }
@@ -213,7 +252,7 @@ namespace DinerBusinessLogic.Implements
             {
                 // Все ячейки должны быть последовательно друг за другом расположены
                 // нужно определить, после какой вставлять
-                Cell? refCell = null;
+                 Cell? refCell = null;
                 foreach (Cell rowCell in row.Elements<Cell>())
                 {
                     if (string.Compare(rowCell.CellReference!.Value, excelParams.CellReference, true) > 0)
@@ -222,17 +261,16 @@ namespace DinerBusinessLogic.Implements
                         break;
                     }
                 }
-
-                var newCell = new Cell() { CellReference = excelParams.CellReference };
+                var newCell = new Cell()
+                {
+                    CellReference = excelParams.CellReference
+                };
                 row.InsertBefore(newCell, refCell);
-
                 cell = newCell;
             }
-
             // вставляем новый текст
             _shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text)));
             _shareStringPart.SharedStringTable.Save();
-
             cell.CellValue = new CellValue((_shareStringPart.SharedStringTable.Elements<SharedStringItem>().Count() - 1).ToString());
             cell.DataType = new EnumValue<CellValues>(CellValues.SharedString);
             cell.StyleIndex = GetStyleValue(excelParams.StyleInfo);
@@ -244,7 +282,6 @@ namespace DinerBusinessLogic.Implements
                 return;
             }
             MergeCells mergeCells;
-
             if (_worksheet.Elements<MergeCells>().Any())
             {
                 mergeCells = _worksheet.Elements<MergeCells>().First();
@@ -252,24 +289,23 @@ namespace DinerBusinessLogic.Implements
             else
             {
                 mergeCells = new MergeCells();
-
                 if (_worksheet.Elements<CustomSheetView>().Any())
                 {
-                    _worksheet.InsertAfter(mergeCells, _worksheet.Elements<CustomSheetView>().First());
+                    _worksheet.InsertAfter(mergeCells,
+                   _worksheet.Elements<CustomSheetView>().First());
                 }
                 else
                 {
                     _worksheet.InsertAfter(mergeCells, _worksheet.Elements<SheetData>().First());
                 }
             }
-
             var mergeCell = new MergeCell()
             {
                 Reference = new StringValue(excelParams.Merge)
             };
             mergeCells.Append(mergeCell);
         }
-        protected override void SaveExcel(IDocument info)
+        protected override void SaveExcel(ExcelInfo info)
         {
             if (_spreadsheetDocument == null)
             {
@@ -278,5 +314,6 @@ namespace DinerBusinessLogic.Implements
             _spreadsheetDocument.WorkbookPart!.Workbook.Save();
             _spreadsheetDocument.Dispose();
         }
+
     }
 }

AbstractShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs

@@ -1,24 +1,19 @@
-using MigraDoc.DocumentObjectModel;
+using DinerBusinessLogic.OfficePackage.HelperEnums;
+using DinerBusinessLogic.OfficePackage.HelperModels;
+using MigraDoc.DocumentObjectModel;
 using MigraDoc.DocumentObjectModel.Tables;
 using MigraDoc.Rendering;
-using DinerBusinessLogic.OfficePackage;
-using DinerBusinessLogic.OfficePackage.HelperEnums;
-using DinerBusinessLogic.OfficePackage.HelperModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace DinerBusinessLogic.Implements
+
+namespace DinerBusinessLogic.OfficePackage.Implements
 {
     public class SaveToPdf : AbstractSaveToPdf
     {
         private Document? _document;
         private Section? _section;
         private Table? _table;
-
-        private static ParagraphAlignment GetParagraphAlignment(PdfParagraphAlignmentType type)
+        private static ParagraphAlignment
+       GetParagraphAlignment(PdfParagraphAlignmentType type)
         {
             return type switch
             {
@@ -28,20 +23,22 @@ namespace DinerBusinessLogic.Implements
                 _ => ParagraphAlignment.Justify,
             };
         }
+        /// <summary>
+        /// Создание стилей для документа
+        /// </summary>
+        /// <param name="document"></param>
         private static void DefineStyles(Document document)
         {
             var style = document.Styles["Normal"];
             style.Font.Name = "Times New Roman";
             style.Font.Size = 14;
-
             style = document.Styles.AddStyle("NormalTitle", "Normal");
             style.Font.Bold = true;
         }
-        protected override void CreatePdf(IDocument info)
+        protected override void CreatePdf(PdfInfo info)
         {
             _document = new Document();
             DefineStyles(_document);
-
             _section = _document.AddSection();
         }
         protected override void CreateParagraph(PdfParagraph pdfParagraph)
@@ -62,7 +59,6 @@ namespace DinerBusinessLogic.Implements
                 return;
             }
             _table = _document.LastSection.AddTable();
-
             foreach (var elem in columns)
             {
                 _table.AddColumn(elem);
@@ -78,24 +74,20 @@ namespace DinerBusinessLogic.Implements
             for (int i = 0; i < rowParameters.Texts.Count; ++i)
             {
                 row.Cells[i].AddParagraph(rowParameters.Texts[i]);
-
                 if (!string.IsNullOrEmpty(rowParameters.Style))
                 {
                     row.Cells[i].Style = rowParameters.Style;
                 }
-
                 Unit borderWidth = 0.5;
-
                 row.Cells[i].Borders.Left.Width = borderWidth;
                 row.Cells[i].Borders.Right.Width = borderWidth;
                 row.Cells[i].Borders.Top.Width = borderWidth;
                 row.Cells[i].Borders.Bottom.Width = borderWidth;
-
                 row.Cells[i].Format.Alignment = GetParagraphAlignment(rowParameters.ParagraphAlignment);
                 row.Cells[i].VerticalAlignment = VerticalAlignment.Center;
             }
         }
-        protected override void SavePdf(IDocument info)
+        protected override void SavePdf(PdfInfo info)
         {
             var renderer = new PdfDocumentRenderer(true)
             {

AbstractShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs

@@ -0,0 +1,120 @@
+using DinerBusinessLogic.OfficePackage.HelperEnums;
+using DinerBusinessLogic.OfficePackage.HelperModels;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+
+namespace DinerBusinessLogic.OfficePackage.Implements
+{
+    public class SaveToWord : AbstractSaveToWord
+    {
+        private WordprocessingDocument? _wordDocument;
+        private Body? _docBody;
+        /// <summary>
+        /// Получение типа выравнивания
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        private static JustificationValues
+       GetJustificationValues(WordJustificationType type)
+        {
+            return type switch
+            {
+                WordJustificationType.Both => JustificationValues.Both,
+                WordJustificationType.Center => JustificationValues.Center,
+                _ => JustificationValues.Left,
+            };
+        }
+        /// <summary>
+        /// Настройки страницы
+        /// </summary>
+        /// <returns></returns>
+        private static SectionProperties CreateSectionProperties()
+        {
+            var properties = new SectionProperties();
+            var pageSize = new PageSize
+            {
+                Orient = PageOrientationValues.Portrait
+            };
+            properties.AppendChild(pageSize);
+            return properties;
+        }
+        /// <summary>
+        /// Задание форматирования для абзаца
+        /// </summary>
+        /// <param name="paragraphProperties"></param>
+        /// <returns></returns>
+        private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
+        {
+            if (paragraphProperties == null)
+            {
+                return null;
+            }
+            var properties = new ParagraphProperties();
+            properties.AppendChild(new Justification()
+            {
+                Val = GetJustificationValues(paragraphProperties.JustificationType)
+            });
+            properties.AppendChild(new SpacingBetweenLines
+            {
+                LineRule = LineSpacingRuleValues.Auto
+            });
+            properties.AppendChild(new Indentation());
+            var paragraphMarkRunProperties = new ParagraphMarkRunProperties();
+            if (!string.IsNullOrEmpty(paragraphProperties.Size))
+            {
+                paragraphMarkRunProperties.AppendChild(new FontSize
+                {
+                    Val = paragraphProperties.Size
+                });
+            }
+            properties.AppendChild(paragraphMarkRunProperties);
+            return properties;
+        }
+        protected override void CreateWord(WordInfo info)
+        {
+            _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document);
+            MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
+            mainPart.Document = new Document();
+            _docBody = mainPart.Document.AppendChild(new Body());
+        }
+        protected override void CreateParagraph(WordParagraph paragraph)
+        {
+            if (_docBody == null || paragraph == null)
+            {
+                return;
+            }
+            var docParagraph = new Paragraph();
+
+            docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
+            foreach (var run in paragraph.Texts)
+            {
+                var docRun = new Run();
+                var properties = new RunProperties();
+                properties.AppendChild(new FontSize { Val = run.Item2.Size });
+                if (run.Item2.Bold)
+                {
+                    properties.AppendChild(new Bold());
+                }
+                docRun.AppendChild(properties);
+                docRun.AppendChild(new Text
+                {
+                    Text = run.Item1,
+                    Space = SpaceProcessingModeValues.Preserve
+                });
+                docParagraph.AppendChild(docRun);
+            }
+            _docBody.AppendChild(docParagraph);
+        }
+        protected override void SaveWord(WordInfo info)
+        {
+            if (_docBody == null || _wordDocument == null)
+            {
+                return;
+            }
+            _docBody.AppendChild(CreateSectionProperties());
+            _wordDocument.MainDocumentPart!.Document.Save();
+            _wordDocument.Dispose();
+        }
+    }
+}

AbstractShopContracts/BindingModels/ClientBindingModel.cs

@@ -0,0 +1,10 @@
+namespace DinerContracts.BindingModels
+{
+    public class ClientBindingModel
+    {
+        public int Id { get; set; }
+        public string ClientFIO { get; set; } = string.Empty;
+        public string Email { get; set; } = string.Empty;
+        public string Password { get; set; } = string.Empty;
+    }
+}

AbstractShopContracts/BindingModels/OrderBindingModel.cs

@@ -8,7 +8,8 @@ namespace DinerContracts.BindingModels
     {
         public int Id { get; set; }
         public int SnackId { get; set; }
-        public string SnackName { get; set; }
+        public int ClientId { get; set; }
+        public string SnackName { get; set; } = string.Empty;
         public int Count { get; set; }
         public double Sum { get; set; }
         public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;

AbstractShopContracts/BindingModels/ReportBindingModel.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerContracts.BindingModels
+namespace DinerContracts.BindingModels
 {
     public class ReportBindingModel
     {

AbstractShopContracts/BindingModels/ShopBindingModel.cs

@@ -1,19 +0,0 @@
-using DinerDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerContracts.BindingModels
-{
-    public class ShopBindingModel : IShopModel
-    {
-        public int Id { get; set; }
-        public string ShopName { get; set; } = string.Empty;
-        public string Adress { get; set; } = string.Empty;
-        public DateTime OpeningDate { get; set; } = DateTime.Now;
-        public Dictionary<int, (ISnackModel, int)> ShopSnacks { get; set; } = new();
-        public int SnackMaxCount { get; set; }
-    }
-}

AbstractShopContracts/BindingModels/SupplyBindingModel.cs

@@ -1,16 +0,0 @@
-using DinerDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerContracts.BindingModels
-{
-    public class SupplyBindingModel : ISupplyModel
-    {
-        public int ShopId { get; set; }
-        public int SnackId { get; set; }
-        public int Count { get; set; }
-    }
-}

AbstractShopContracts/BusinessLogicsContracts/IClientLogic.cs

@@ -0,0 +1,15 @@
+using DinerContracts.BindingModels;
+using DinerContracts.SearchModels;
+using DinerContracts.ViewModels;
+
+namespace DinerContracts.BusinessLogicsContracts
+{
+    public interface IClientLogic
+    {
+        List<ClientViewModel>? ReadList(ClientSearchModel? model);
+        ClientViewModel? ReadElement(ClientSearchModel model);
+        bool Create(ClientBindingModel model);
+        bool Update(ClientBindingModel model);
+        bool Delete(ClientBindingModel model);
+    }
+}

AbstractShopContracts/BusinessLogicsContracts/IReportLogic.cs

@@ -1,20 +1,40 @@
 using DinerContracts.BindingModels;
 using DinerContracts.ViewModels;
-using DinerContracts.SearchModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace DinerContracts.BusinessLogicsContracts
 {
     public interface IReportLogic
     {
-        List<ReportSnackComponentViewModel> GetSnackComponents();
+        /// <summary>
+        /// Получение списка компонент с указанием, в каких изделиях используются
+        /// </summary>
+        /// <returns></returns>
+        List<ReportSnackComponentViewModel> GetSnackComponent();
+        /// <summary>
+        /// Получение списка заказов за определенный период
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
         List<ReportOrdersViewModel> GetOrders(ReportBindingModel model);
-        List<ReportShopsViewModel> GetShops();
-        List<ReportGroupOrdersViewModel> GetGroupedOrders();
-        void SaveSnacksToWordFile(ReportBindingModel model);
+        /// <summary>
+        /// Сохранение компонент в файл-Word
+        /// </summary>
+        /// <param name="model"></param>
+        void SaveComponentsToWordFile(ReportBindingModel model);
+        /// <summary>
+        /// Сохранение компонент с указаеним продуктов в файл-Excel
+        /// </summary>
+        /// <param name="model"></param>
         void SaveSnackComponentToExcelFile(ReportBindingModel model);
+        /// <summary>
+        /// Сохранение заказов в файл-Pdf
+        /// </summary>
+        /// <param name="model"></param>
         void SaveOrdersToPdfFile(ReportBindingModel model);
-        void SaveShopsToWordFile(ReportBindingModel model);
-        void SaveShopsToExcelFile(ReportBindingModel model);
-        void SaveGroupedOrdersToPdfFile(ReportBindingModel model);
     }
 }

AbstractShopContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -1,22 +0,0 @@
-using DinerContracts.BindingModels;
-using DinerContracts.SearchModels;
-using DinerContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerContracts.BusinessLogicsContracts
-{
-    public interface IShopLogic
-    {
-        List<ShopViewModel>? ReadList(ShopSearchModel? model);
-        ShopViewModel? ReadElement(ShopSearchModel model);
-        bool Create(ShopBindingModel model);
-        bool Update(ShopBindingModel model);
-        bool Delete(ShopBindingModel model);
-        bool MakeSupply(SupplyBindingModel model);
-        bool Sale(SupplySearchModel model);
-    }
-}

AbstractShopContracts/DinerContracts.csproj

@@ -6,6 +6,15 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.14">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\AbstractShopDataModels\DinerDataModels.csproj" />
   </ItemGroup>

AbstractShopContracts/SearchModels/ClientSearchModel.cs

@@ -0,0 +1,10 @@
+namespace DinerContracts.SearchModels
+{
+    public class ClientSearchModel
+    {
+        public int? Id { get; set; }
+        public string? ClientFIO { get; set; }
+        public string? Email { get; set; }
+        public string? Password { get; set; }
+    }
+}

AbstractShopContracts/SearchModels/OrderSearchModel.cs

@@ -3,6 +3,7 @@
     public class OrderSearchModel
     {
         public int? Id { get; set; }
+        public int? ClientId { get; set; }
         public DateTime? DateFrom { get; set; }
         public DateTime? DateTo { get; set; }
     }

AbstractShopContracts/SearchModels/ShopSearchModel.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerContracts.SearchModels
-{
-    public class ShopSearchModel
-    {
-        public int? Id { get; set; }
-        public string? ShopName { get; set; }
-    }
-}

AbstractShopContracts/SearchModels/SupplySearchModel.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerContracts.SearchModels
-{
-    public class SupplySearchModel
-    {
-        public int? SnackId { get; set; }
-        public int? Count { get; set; }
-    }
-}

AbstractShopContracts/StoragesContracts/IClientStorage.cs

@@ -0,0 +1,16 @@
+using DinerContracts.BindingModels;
+using DinerContracts.SearchModels;
+using DinerContracts.ViewModels;
+
+namespace DinerContracts.StoragesContracts
+{
+    public interface IClientStorage
+    {
+        List<ClientViewModel> GetFullList();
+        List<ClientViewModel> GetFilteredList(ClientSearchModel model);
+        ClientViewModel? GetElement(ClientSearchModel model);
+        ClientViewModel? Insert(ClientBindingModel model);
+        ClientViewModel? Update(ClientBindingModel model);
+        ClientViewModel? Delete(ClientBindingModel model);
+    }
+}

AbstractShopContracts/StoragesContracts/IShopStorage.cs

@@ -1,23 +0,0 @@
-using DinerContracts.BindingModels;
-using DinerContracts.SearchModels;
-using DinerContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerContracts.StoragesContracts
-{
-    public interface IShopStorage
-    {
-        List<ShopViewModel> GetFullList();
-        List<ShopViewModel> GetFilteredList(ShopSearchModel model);
-        ShopViewModel? GetElement(ShopSearchModel model);
-        ShopViewModel? Insert(ShopBindingModel model);
-        ShopViewModel? Update(ShopBindingModel model);
-        ShopViewModel? Delete(ShopBindingModel model);
-        bool Sale(SupplySearchModel model);
-        bool RestockingShops(SupplyBindingModel model);
-    }
-}

AbstractShopContracts/ViewModels/ClientViewModel.cs

@@ -0,0 +1,21 @@
+using DinerDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DinerContracts.ViewModels
+{
+    public class ClientViewModel : IClientModel
+    {
+        public int Id { get; set; }
+        [DisplayName("ФИО клиента")]
+        public string ClientFIO { get; set; } = string.Empty;
+        [DisplayName("Логин (эл. почта)")]
+        public string Email { get; set; } = string.Empty;
+        [DisplayName("Пароль")]
+        public string Password { get; set; } = string.Empty;
+    }
+}

AbstractShopContracts/ViewModels/OrderViewModel.cs

@@ -8,9 +8,13 @@ namespace DinerContracts.ViewModels
     {
         [DisplayName("Номер")]
         public int Id { get; set; }
+        public int ClientId { get; set; }
         public int SnackId { get; set; }
         [DisplayName("Изделие")]
         public string SnackName { get; set; } = string.Empty;
+       
+        [DisplayName("Клиент")]
+        public string ClientFIO { get; set; } = string.Empty;
         [DisplayName("Количество")]
         public int Count { get; set; }
         [DisplayName("Сумма")]

AbstractShopContracts/ViewModels/ReportGroupOrdersViewModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerContracts.ViewModels
-{
-    public class ReportGroupOrdersViewModel
-    {
-        public DateTime Date { get; set; } = DateTime.Now;
-        public int OrdersCount { get; set; }
-        public double OrdersSum { get; set; }
-    }
-}

AbstractShopContracts/ViewModels/ReportOrdersViewModel.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel;
 
 namespace DinerContracts.ViewModels
 {
@@ -12,6 +8,6 @@ namespace DinerContracts.ViewModels
         public DateTime DateCreate { get; set; }
         public string SnackName { get; set; } = string.Empty;
         public double Sum { get; set; }
-        public string Status { get; set; } = string.Empty;
+        public string OrderStatus { get; set; } = string.Empty;
     }
 }

AbstractShopContracts/ViewModels/ReportShopReinforcedViewModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerContracts.ViewModels
-{
-   public class ReportShopsViewModel
-    {
-        public string ShopName { get; set; } =  string.Empty;
-        public int TotalCount { get; set; }
-        public List<(string Snack, int count)> Snacks { get; set; } = new();
-    }
-}

AbstractShopContracts/ViewModels/ReportSnackComponentViewModel.cs

@@ -1,15 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerContracts.ViewModels
+namespace DinerContracts.ViewModels
 {
     public class ReportSnackComponentViewModel
     {
         public string SnackName { get; set; } = string.Empty;
         public int TotalCount { get; set; }
-        public List<(string Component, int Count)> Components { get; set; } = new();
+        public List<Tuple<string, int>> Components { get; set; } = new();
     }
 }

AbstractShopContracts/ViewModels/ShopViewModel.cs

@@ -1,24 +0,0 @@
-using DinerDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerContracts.ViewModels
-{
-    public class ShopViewModel : IShopModel
-    {
-        public int Id { get; set; }
-        [DisplayName("Название")]
-        public string ShopName { get; set; } = string.Empty;
-        [DisplayName("Адрес")]
-        public string Adress { get; set; } = string.Empty;
-        [DisplayName("Дата открытия")]
-        public DateTime OpeningDate { get; set; }
-        public Dictionary<int, (ISnackModel, int)> ShopSnacks { get; set; } = new();
-        [DisplayName("Вместимость")]
-        public int SnackMaxCount { get; set; }
-    }
-}

AbstractShopDataModels/DinerDataModels.csproj

@@ -6,4 +6,13 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.14">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>

AbstractShopDataModels/Models/IClientModel.cs

@@ -0,0 +1,9 @@
+namespace DinerDataModels.Models
+{
+    public interface IClientModel : IId
+    {
+        string ClientFIO { get; }
+        string Email { get; }
+        string Password { get; }
+    }
+}

AbstractShopDataModels/Models/IOrderModel.cs

@@ -5,6 +5,7 @@ namespace DinerDataModels.Models
     public interface IOrderModel : IId
     {
         int Id { get; }
+        int ClientId { get; }
         int Count { get; }
         double Sum { get; }
         OrderStatus Status { get; }

AbstractShopDataModels/Models/IShopModel.cs

@@ -1,19 +0,0 @@
-using DinerDataModels;
-using DinerDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerDataModels.Models
-{
-    public interface IShopModel : IId
-    {
-        string ShopName { get; }
-        string Adress { get; }
-        DateTime OpeningDate { get; }
-        Dictionary<int, (ISnackModel, int)> ShopSnacks { get; }
-        public int SnackMaxCount { get; }
-    }
-}

AbstractShopDataModels/Models/ISupplyModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerDataModels.Models
-{
-    public interface ISupplyModel
-    {
-        int ShopId { get; }
-        int SnackId { get; }
-        int Count { get; }
-    }
-}

Diner/AbstractShopListImplement/DataListSingleton.cs

@@ -13,13 +13,13 @@ namespace DinerListImplement
         public List<Component> Components { get; set; }
         public List<Order> Orders { get; set; }
         public List<Snack> Products { get; set; }
-        public List<Shop> Shops { get; set; }
+        public List<Client> Clients { get; set; }
         private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             Products = new List<Snack>();
-            Shops = new List<Shop>();
+            Clients = new List<Client>();
         }
         public static DataListSingleton GetInstance()
         {

Diner/AbstractShopListImplement/DinerListImplement.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -6,6 +6,15 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.14">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\AbstractShopContracts\DinerContracts.csproj" />
     <ProjectReference Include="..\..\AbstractShopDataModels\DinerDataModels.csproj" />

Diner/AbstractShopListImplement/Implements/ClientStorage.cs

@@ -0,0 +1,112 @@
+using DinerContracts.BindingModels;
+using DinerContracts.SearchModels;
+using DinerContracts.StoragesContracts;
+using DinerContracts.ViewModels;
+using DinerListImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DinerListImplement.Implements
+{
+    public class ClientStorage : IClientStorage
+    {
+        private readonly DataListSingleton _source;
+        public ClientStorage()
+        {
+            _source = DataListSingleton.GetInstance();
+        }
+        public ClientViewModel? Delete(ClientBindingModel model)
+        {
+            for (int i = 0; i < _source.Clients.Count; ++i)
+            {
+                if (_source.Clients[i].Id == model.Id)
+                {
+                    var element = _source.Clients[i];
+                    _source.Clients.RemoveAt(i);
+                    return element.GetViewModel;
+                }
+            }
+            return null;
+        }
+
+        public ClientViewModel? GetElement(ClientSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.Email) && !model.Id.HasValue)
+            {
+                return null;
+            }
+            foreach (var client in _source.Clients)
+            {
+                if ((!string.IsNullOrEmpty(model.Email) && client.Email == model.Email) ||
+                    (model.Id.HasValue && client.Id == model.Id))
+                {
+                    return client.GetViewModel;
+                }
+            }
+            return null;
+        }
+
+        public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
+        {
+            var result = new List<ClientViewModel>();
+            if (string.IsNullOrEmpty(model.Email))
+            {
+                return result;
+            }
+            foreach (var client in _source.Clients)
+            {
+                if (client.Email.Contains(model.Email))
+                {
+                    result.Add(client.GetViewModel);
+                }
+            }
+            return result;
+        }
+
+        public List<ClientViewModel> GetFullList()
+        {
+            var result = new List<ClientViewModel>();
+            foreach (var client in _source.Clients)
+            {
+                result.Add(client.GetViewModel);
+            }
+            return result;
+        }
+
+        public ClientViewModel? Insert(ClientBindingModel model)
+        {
+            model.Id = 1;
+            foreach (var client in _source.Clients)
+            {
+                if (model.Id <= client.Id)
+                {
+                    model.Id = client.Id + 1;
+                }
+            }
+            var newClient = Client.Create(model);
+            if (newClient == null)
+            {
+                return null;
+            }
+            _source.Clients.Add(newClient);
+            return newClient.GetViewModel;
+        }
+
+        public ClientViewModel? Update(ClientBindingModel model)
+        {
+            foreach (var client in _source.Clients)
+            {
+                if (client.Id == model.Id)
+                {
+                    client.Update(model);
+
+                    return client.GetViewModel;
+                }
+            }
+            return null;
+        }
+    }
+}

Diner/AbstractShopListImplement/Implements/OrderStorage.cs

@@ -30,16 +30,48 @@ namespace DinerListImplement.Implements
             {
                 return result;
             }
-            foreach (var order in _source.Orders)
+            if (!model.Id.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue)
             {
-                if (order.Id == model.Id)
+                foreach (var order in _source.Orders)
                 {
-                    result.Add(AttachDinerName(order.GetViewModel));
+                    if (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo)
+                    {
+                        result.Add(order.GetViewModel);
+                    }
                 }
+                return result;
             }
-            return result;
+            else if (model.Id.HasValue)
+                foreach (var order in _source.Orders)
+                {
+                    if (order.Id == model.Id)
+                    {
+                        if (order.Id == model.Id)
+                        {
+                            return new() { AttachSnackName(order.GetViewModel) };
+                        }
+                    }
+                }
 
+            else if (model.ClientId.HasValue)
+            {
+                var resultClie = new List<OrderViewModel>();
+
+                foreach (var order in _source.Orders)
+                {
+                    if (order.ClientId == model.ClientId)
+                    {
+                        result.Add(AttachSnackName(order.GetViewModel));
+                    }
+                }
+
+                return result;
+            }
+
+            return new();
         }
+
+
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
             if (!model.Id.HasValue)
@@ -111,5 +143,24 @@ namespace DinerListImplement.Implements
             }
             return model;
         }
+
+        private OrderViewModel? AttachSnackName(OrderViewModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            var snack = _source.Products.FirstOrDefault(x => x.Id == model.SnackId);
+            var client = _source.Clients.FirstOrDefault(x => x.Id == model.ClientId);
+            if (snack != null)
+            {
+                model.SnackName = snack.SnackName;
+            }
+            if (client != null)
+            {
+                model.ClientFIO = client.ClientFIO;
+            }
+            return model;
+        }
     }
 }

Diner/AbstractShopListImplement/Implements/ShopStorage.cs

@@ -1,122 +0,0 @@
-using DinerContracts.BindingModels;
-using DinerContracts.SearchModels;
-using DinerContracts.StoragesContracts;
-using DinerContracts.ViewModels;
-using DinerListImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerListImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataListSingleton _source;
-
-        public ShopStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            var result = new List<ShopViewModel>();
-            foreach (var shop in _source.Shops)
-            {
-                result.Add(shop.GetViewModel);
-            }
-            return result;
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            var result = new List<ShopViewModel>();
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                return result;
-            }
-            foreach (var shop in _source.Shops)
-            {
-                if (shop.ShopName.Contains(model.ShopName))
-                {
-                    result.Add(shop.GetViewModel);
-                }
-            }
-            return result;
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            foreach (var shop in _source.Shops)
-            {
-                if ((!string.IsNullOrEmpty(model.ShopName) && shop.ShopName == model.ShopName) ||
-                    (model.Id.HasValue && shop.Id == model.Id))
-                {
-                    return shop.GetViewModel;
-                }
-            }
-            return null;
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            model.Id = 1;
-            foreach (var shop in _source.Shops)
-            {
-                if (model.Id <= shop.Id)
-                {
-                    model.Id = shop.Id + 1;
-                }
-            }
-            var newShop = Shop.Create(model);
-            if (newShop == null)
-            {
-                return null;
-            }
-            _source.Shops.Add(newShop);
-            return newShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            foreach (var shop in _source.Shops)
-            {
-                if (shop.Id == model.Id)
-                {
-                    shop.Update(model);
-                    return shop.GetViewModel;
-                }
-            }
-            return null;
-        }
-
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            for (int i = 0; i < _source.Shops.Count; ++i)
-            {
-                if (_source.Shops[i].Id == model.Id)
-                {
-                    var element = _source.Shops[i];
-                    _source.Shops.RemoveAt(i);
-                    return element.GetViewModel;
-                }
-            }
-            return null;
-        }
-        public bool Sale(SupplySearchModel model)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool RestockingShops(SupplyBindingModel model)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

Diner/AbstractShopListImplement/Models/Client.cs

@@ -0,0 +1,53 @@
+using DinerContracts.BindingModels;
+using DinerContracts.ViewModels;
+using DinerDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DinerListImplement.Models
+{
+    public class Client : IClientModel
+    {
+        public int Id { get; private set; }
+        public string ClientFIO { get; private set; } = string.Empty;
+        public string Email { get; private set; } = string.Empty;
+        public string Password { get; private set; } = string.Empty;
+
+        public static Client? Create(ClientBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Client()
+            {
+                Id = model.Id,
+                ClientFIO = model.ClientFIO,
+                Email = model.Email,
+                Password = model.Password
+            };
+        }
+
+        public void Update(ClientBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ClientFIO = model.ClientFIO;
+            Email = model.Email;
+            Password = model.Password;
+        }
+
+        public ClientViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ClientFIO = ClientFIO,
+            Email = Email,
+            Password = Password
+        };
+    }
+}

Diner/AbstractShopListImplement/Models/Order.cs

@@ -8,6 +8,7 @@ namespace DinerListImplement.Models
     public class Order : IOrderModel
     {
         public int Id { get; private set; }
+        public int ClientId { get; private set; }
         public string SnackName { get; private set; }
         public int SnackID { get; private set; }
         public int Count { get; private set; }
@@ -25,6 +26,7 @@ namespace DinerListImplement.Models
             {
                 Id = model.Id,
                 SnackName = model.SnackName,
+                ClientId = model.ClientId,
                 SnackID = model.SnackId,
                 Count = model.Count,
                 Sum = model.Sum,
@@ -39,15 +41,21 @@ namespace DinerListImplement.Models
             {
                 return;
             }
+            Id = model.Id;
+            SnackID = model.SnackId;
+            SnackName = model.SnackName;
+            Count = model.Count;
+            Sum = model.Sum;
             Status = model.Status;
-            if (model.Status == OrderStatus.Выдан) DateImplement = model.DateImplement;
-            if (model.Status == OrderStatus.Выдан) DateImplement = model.DateImplement;
+            DateCreate = model.DateCreate;
+            DateImplement = model.DateImplement;
         }
         public OrderViewModel GetViewModel => new()
         {
             Id = Id,
             SnackId = SnackID,
             SnackName = SnackName,
+            ClientId = ClientId,
             Count = Count,
             Sum = Sum,
             Status = Status,

Diner/AbstractShopListImplement/Models/Shop.cs

@@ -1,59 +0,0 @@
-using DinerDataModels.Models;
-using DinerContracts.BindingModels;
-using DinerContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DinerListImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; private set; }
-        public string ShopName { get; private set; } = string.Empty;
-        public string Adress { get; private set; } = string.Empty;
-        public DateTime OpeningDate { get; private set; }
-        public Dictionary<int, (ISnackModel, int)> ShopSnacks { get; private set; } = new();
-        public int SnackMaxCount { get; private set; }
-
-        public static Shop? Create(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Adress = model.Adress,
-                OpeningDate = model.OpeningDate,
-                SnackMaxCount = model.SnackMaxCount,
-            };
-        }
-
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ShopName = model.ShopName;
-            Adress = model.Adress;
-            OpeningDate = model.OpeningDate;
-            SnackMaxCount = model.SnackMaxCount;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Adress = Adress,
-            OpeningDate = OpeningDate,
-            ShopSnacks = ShopSnacks,
-            SnackMaxCount = SnackMaxCount,
-        };
-    }
-}

Diner/Diner.sln

@@ -13,9 +13,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DinerBusinessLogic", "..\Ab
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DinerListImplement", "AbstractShopListImplement\DinerListImplement.csproj", "{A24E7474-4B43-4E81-A6BF-2B7323D5C26A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DinerFileImplement", "DinerFileImplement\DinerFileImplement.csproj", "{13294C1E-C8DF-4E4B-B645-A61900A797EB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DinerFileImplement", "DinerFileImplement\DinerFileImplement.csproj", "{BF814E5C-E62C-4BFC-9B14-3D2F97F21CE6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DinerDatabaseImplement", "DinerDatabaseImplements\DinerDatabaseImplement.csproj", "{BE778091-B058-4BDD-8AEE-2773F4E00979}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DinerDataBaseImplement", "DinerDataBaseImplement\DinerDataBaseImplement.csproj", "{3AC09806-4792-4A84-BCB8-87B29E0E1C8A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DinerRestApi", "DinerRestApi\DinerRestApi.csproj", "{0935B7A1-7345-4780-B439-81EE9FEA7221}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DinerClientApp", "DinerClientApp\DinerClientApp.csproj", "{86D5A8EB-EA84-4F3E-9518-833C7A2DE43F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -43,14 +47,22 @@ Global
 		{A24E7474-4B43-4E81-A6BF-2B7323D5C26A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A24E7474-4B43-4E81-A6BF-2B7323D5C26A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A24E7474-4B43-4E81-A6BF-2B7323D5C26A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{13294C1E-C8DF-4E4B-B645-A61900A797EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{13294C1E-C8DF-4E4B-B645-A61900A797EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{13294C1E-C8DF-4E4B-B645-A61900A797EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{13294C1E-C8DF-4E4B-B645-A61900A797EB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BE778091-B058-4BDD-8AEE-2773F4E00979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE778091-B058-4BDD-8AEE-2773F4E00979}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE778091-B058-4BDD-8AEE-2773F4E00979}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BE778091-B058-4BDD-8AEE-2773F4E00979}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF814E5C-E62C-4BFC-9B14-3D2F97F21CE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF814E5C-E62C-4BFC-9B14-3D2F97F21CE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF814E5C-E62C-4BFC-9B14-3D2F97F21CE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF814E5C-E62C-4BFC-9B14-3D2F97F21CE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3AC09806-4792-4A84-BCB8-87B29E0E1C8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AC09806-4792-4A84-BCB8-87B29E0E1C8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AC09806-4792-4A84-BCB8-87B29E0E1C8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AC09806-4792-4A84-BCB8-87B29E0E1C8A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0935B7A1-7345-4780-B439-81EE9FEA7221}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0935B7A1-7345-4780-B439-81EE9FEA7221}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0935B7A1-7345-4780-B439-81EE9FEA7221}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0935B7A1-7345-4780-B439-81EE9FEA7221}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86D5A8EB-EA84-4F3E-9518-833C7A2DE43F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86D5A8EB-EA84-4F3E-9518-833C7A2DE43F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86D5A8EB-EA84-4F3E-9518-833C7A2DE43F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86D5A8EB-EA84-4F3E-9518-833C7A2DE43F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Diner/Diner/DinerView.csproj

@@ -9,25 +9,25 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="FormSellSnack" />
-  </ItemGroup>
-
-  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.14" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.14">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.14">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="NLog.Extensions.Logging" Version="5.2.2" />
-    <PackageReference Include="ReportViewerCore.WinForms" Version="15.1.7" />
+    <PackageReference Include="ReportViewerCore.WinForms" Version="15.1.19" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\AbstractShopBusinessLogic\DinerBusinessLogic.csproj" />
     <ProjectReference Include="..\..\AbstractShopContracts\DinerContracts.csproj" />
-    <ProjectReference Include="..\..\AbstractShopDataModels\DinerDataModels.csproj" />
     <ProjectReference Include="..\AbstractShopListImplement\DinerListImplement.csproj" />
-    <ProjectReference Include="..\DinerDatabaseImplements\DinerDatabaseImplement.csproj" />
+	 <ProjectReference Include="..\DinerDataBaseImplement\DinerDataBaseImplement.csproj" />
     <ProjectReference Include="..\DinerFileImplement\DinerFileImplement.csproj" />
   </ItemGroup>
 

Diner/Diner/FormClients.Designer.cs

@@ -0,0 +1,87 @@
+namespace Diner
+{
+    partial class FormClients
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            dataGridView = new DataGridView();
+            buttonDelete = new Button();
+            buttonRef = new Button();
+            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+            SuspendLayout();
+            // 
+            // dataGridView
+            // 
+            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridView.Location = new Point(12, 12);
+            dataGridView.Name = "dataGridView";
+            dataGridView.RowHeadersWidth = 51;
+            dataGridView.RowTemplate.Height = 29;
+            dataGridView.Size = new Size(582, 426);
+            dataGridView.TabIndex = 0;
+            // 
+            // buttonDelete
+            // 
+            buttonDelete.Location = new Point(638, 35);
+            buttonDelete.Name = "buttonDelete";
+            buttonDelete.Size = new Size(125, 29);
+            buttonDelete.TabIndex = 1;
+            buttonDelete.Text = "Удалить";
+            buttonDelete.UseVisualStyleBackColor = true;
+            buttonDelete.Click += ButtonDelete_Click;
+            // 
+            // buttonRef
+            // 
+            buttonRef.Location = new Point(638, 103);
+            buttonRef.Name = "buttonRef";
+            buttonRef.Size = new Size(125, 29);
+            buttonRef.TabIndex = 2;
+            buttonRef.Text = "Обновить";
+            buttonRef.UseVisualStyleBackColor = true;
+            buttonRef.Click += ButtonRef_Click;
+            // 
+            // FormClients
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(800, 450);
+            Controls.Add(buttonRef);
+            Controls.Add(buttonDelete);
+            Controls.Add(dataGridView);
+            Name = "FormClients";
+            Text = "Клиенты";
+            Load += FormClients_Load;
+            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+        private DataGridView dataGridView;
+        private Button buttonDelete;
+        private Button buttonRef;
+    }
+}

Diner/Diner/FormClients.cs

@@ -1,7 +1,6 @@
-using Microsoft.Extensions.Logging;
-using Diner;
-using DinerContracts.BindingModels;
+using DinerContracts.BindingModels;
 using DinerContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -12,86 +11,61 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace DinerView
+namespace Diner
 {
-    public partial class FormShops : Form
+    public partial class FormClients : Form
     {
         private readonly ILogger _logger;
-        private readonly IShopLogic _logic;
 
-        public FormShops(ILogger<FormShops> logger, IShopLogic logic)
+        private readonly IClientLogic _clientLogic;
+
+        public FormClients(ILogger<FormClients> logger, IClientLogic clientLogic)
         {
             InitializeComponent();
             _logger = logger;
-            _logic = logic;
+            _clientLogic = clientLogic;
         }
 
-        private void FormShops_Load(object sender, EventArgs e)
+        private void FormClients_Load(object sender, EventArgs e)
         {
             LoadData();
         }
 
         private void LoadData()
         {
+            _logger.LogInformation("Загрузка клиентов");
             try
             {
-                var list = _logic.ReadList(null);
+                var list = _clientLogic.ReadList(null);
+
                 if (list != null)
                 {
                     dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-
-                    dataGridView.Columns["ShopName"].AutoSizeMode =
-                    DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
                 }
-                _logger.LogInformation("Загрузка магазинов");
+
+                _logger.LogInformation("Успешная загрузка клиентов");
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Ошибка загрузки магазинов");
+                _logger.LogError(ex, "Ошибка загрузки клиентов");
                 MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 
-        private void ButtonAdd_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-            if (service is FormShop form)
-            {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
-            }
-        }
-
-        private void ButtonUpd_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-                if (service is FormShop form)
-                {
-                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
-                }
-            }
-        }
-
-        private void ButtonDel_Click(object sender, EventArgs e)
+        private void ButtonDelete_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
                 if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                 {
                     int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    _logger.LogInformation("Удаление магазина");
+
+                    _logger.LogInformation("Удаление клиента");
+
                     try
                     {
-                        if (!_logic.Delete(new ShopBindingModel
+                        if (!_clientLogic.Delete(new ClientBindingModel
                         {
                             Id = id
                         }))
@@ -102,7 +76,7 @@ namespace DinerView
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError(ex, "Ошибка удаления магазина");
+                        _logger.LogError(ex, "Ошибка удаления компонента");
                         MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     }
                 }

Diner/Diner/FormCreateOrder.Designer.cs

@@ -1,144 +1,166 @@
 namespace Diner
 {
-    partial class FormCreateOrder
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
+	partial class FormCreateOrder
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
 
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
 
-        #region Windows Form Designer generated code
+		#region Windows Form Designer generated code
 
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.labelProduct = new System.Windows.Forms.Label();
-            this.labelCount = new System.Windows.Forms.Label();
-            this.labelPrice = new System.Windows.Forms.Label();
-            this.comboBoxProduct = new System.Windows.Forms.ComboBox();
-            this.textBoxCount = new System.Windows.Forms.TextBox();
-            this.textBoxSum = new System.Windows.Forms.TextBox();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // labelProduct
-            // 
-            this.labelProduct.AutoSize = true;
-            this.labelProduct.Location = new System.Drawing.Point(47, 21);
-            this.labelProduct.Name = "labelProduct";
-            this.labelProduct.Size = new System.Drawing.Size(71, 20);
-            this.labelProduct.TabIndex = 0;
-            this.labelProduct.Text = "Изделие:";
-            // 
-            // labelCount
-            // 
-            this.labelCount.AutoSize = true;
-            this.labelCount.Location = new System.Drawing.Point(47, 62);
-            this.labelCount.Name = "labelCount";
-            this.labelCount.Size = new System.Drawing.Size(93, 20);
-            this.labelCount.TabIndex = 1;
-            this.labelCount.Text = "Количество:";
-            // 
-            // labelPrice
-            // 
-            this.labelPrice.AutoSize = true;
-            this.labelPrice.Location = new System.Drawing.Point(47, 104);
-            this.labelPrice.Name = "labelPrice";
-            this.labelPrice.Size = new System.Drawing.Size(58, 20);
-            this.labelPrice.TabIndex = 2;
-            this.labelPrice.Text = "Сумма:";
-            // 
-            // comboBoxProduct
-            // 
-            this.comboBoxProduct.FormattingEnabled = true;
-            this.comboBoxProduct.Location = new System.Drawing.Point(149, 18);
-            this.comboBoxProduct.Name = "comboBoxProduct";
-            this.comboBoxProduct.Size = new System.Drawing.Size(246, 28);
-            this.comboBoxProduct.TabIndex = 3;
-            this.comboBoxProduct.SelectedIndexChanged += new System.EventHandler(this.ComboBoxProduct_SelectedIndexChanged);
-            // 
-            // textBoxCount
-            // 
-            this.textBoxCount.Location = new System.Drawing.Point(149, 59);
-            this.textBoxCount.Name = "textBoxCount";
-            this.textBoxCount.Size = new System.Drawing.Size(246, 27);
-            this.textBoxCount.TabIndex = 4;
-            this.textBoxCount.TextChanged += new System.EventHandler(this.TextBoxCount_TextChanged);
-            // 
-            // textBoxSum
-            // 
-            this.textBoxSum.Location = new System.Drawing.Point(149, 101);
-            this.textBoxSum.Name = "textBoxSum";
-            this.textBoxSum.Size = new System.Drawing.Size(246, 27);
-            this.textBoxSum.TabIndex = 5;
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(178, 153);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(94, 29);
-            this.buttonSave.TabIndex = 6;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(301, 153);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(94, 29);
-            this.buttonCancel.TabIndex = 7;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // FormCreateOrder
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(420, 205);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.textBoxSum);
-            this.Controls.Add(this.textBoxCount);
-            this.Controls.Add(this.comboBoxProduct);
-            this.Controls.Add(this.labelPrice);
-            this.Controls.Add(this.labelCount);
-            this.Controls.Add(this.labelProduct);
-            this.Name = "FormCreateOrder";
-            this.Text = "Заказ";
-            this.Load += new System.EventHandler(this.FormCreateOrder_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			labelProduct = new Label();
+			labelCount = new Label();
+			labelPrice = new Label();
+			comboBoxProduct = new ComboBox();
+			textBoxCount = new TextBox();
+			textBoxSum = new TextBox();
+			buttonSave = new Button();
+			buttonCancel = new Button();
+			comboBoxClient = new ComboBox();
+			label1 = new Label();
+			SuspendLayout();
+			// 
+			// labelProduct
+			// 
+			labelProduct.AutoSize = true;
+			labelProduct.Location = new Point(47, 21);
+			labelProduct.Name = "labelProduct";
+			labelProduct.Size = new Size(71, 20);
+			labelProduct.TabIndex = 0;
+			labelProduct.Text = "Изделие:";
+			// 
+			// labelCount
+			// 
+			labelCount.AutoSize = true;
+			labelCount.Location = new Point(47, 62);
+			labelCount.Name = "labelCount";
+			labelCount.Size = new Size(93, 20);
+			labelCount.TabIndex = 1;
+			labelCount.Text = "Количество:";
+			// 
+			// labelPrice
+			// 
+			labelPrice.AutoSize = true;
+			labelPrice.Location = new Point(47, 104);
+			labelPrice.Name = "labelPrice";
+			labelPrice.Size = new Size(58, 20);
+			labelPrice.TabIndex = 2;
+			labelPrice.Text = "Сумма:";
+			// 
+			// comboBoxProduct
+			// 
+			comboBoxProduct.FormattingEnabled = true;
+			comboBoxProduct.Location = new Point(149, 18);
+			comboBoxProduct.Name = "comboBoxProduct";
+			comboBoxProduct.Size = new Size(246, 28);
+			comboBoxProduct.TabIndex = 3;
+			comboBoxProduct.SelectedIndexChanged += ComboBoxProduct_SelectedIndexChanged;
+			// 
+			// textBoxCount
+			// 
+			textBoxCount.Location = new Point(149, 59);
+			textBoxCount.Name = "textBoxCount";
+			textBoxCount.Size = new Size(246, 27);
+			textBoxCount.TabIndex = 4;
+			textBoxCount.TextChanged += TextBoxCount_TextChanged;
+			// 
+			// textBoxSum
+			// 
+			textBoxSum.Location = new Point(149, 101);
+			textBoxSum.Name = "textBoxSum";
+			textBoxSum.Size = new Size(246, 27);
+			textBoxSum.TabIndex = 5;
+			// 
+			// buttonSave
+			// 
+			buttonSave.Location = new Point(179, 170);
+			buttonSave.Name = "buttonSave";
+			buttonSave.Size = new Size(94, 29);
+			buttonSave.TabIndex = 6;
+			buttonSave.Text = "Сохранить";
+			buttonSave.UseVisualStyleBackColor = true;
+			buttonSave.Click += ButtonSave_Click;
+			// 
+			// buttonCancel
+			// 
+			buttonCancel.Location = new Point(301, 170);
+			buttonCancel.Name = "buttonCancel";
+			buttonCancel.Size = new Size(94, 29);
+			buttonCancel.TabIndex = 7;
+			buttonCancel.Text = "Отмена";
+			buttonCancel.UseVisualStyleBackColor = true;
+			buttonCancel.Click += ButtonCancel_Click;
+			// 
+			// comboBoxClient
+			// 
+			comboBoxClient.FormattingEnabled = true;
+			comboBoxClient.Location = new Point(149, 136);
+			comboBoxClient.Name = "comboBoxClient";
+			comboBoxClient.Size = new Size(246, 28);
+			comboBoxClient.TabIndex = 8;
+			// 
+			// label1
+			// 
+			label1.AutoSize = true;
+			label1.Location = new Point(47, 139);
+			label1.Name = "label1";
+			label1.Size = new Size(61, 20);
+			label1.TabIndex = 9;
+			label1.Text = "Клиент:";
+			// 
+			// FormCreateOrder
+			// 
+			AutoScaleDimensions = new SizeF(8F, 20F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(420, 228);
+			Controls.Add(label1);
+			Controls.Add(comboBoxClient);
+			Controls.Add(buttonCancel);
+			Controls.Add(buttonSave);
+			Controls.Add(textBoxSum);
+			Controls.Add(textBoxCount);
+			Controls.Add(comboBoxProduct);
+			Controls.Add(labelPrice);
+			Controls.Add(labelCount);
+			Controls.Add(labelProduct);
+			Name = "FormCreateOrder";
+			Text = "Заказ";
+			Load += FormCreateOrder_Load;
+			ResumeLayout(false);
+			PerformLayout();
+		}
 
-        }
+		#endregion
 
-        #endregion
-
-        private Label labelProduct;
-        private Label labelCount;
-        private Label labelPrice;
-        private ComboBox comboBoxProduct;
-        private TextBox textBoxCount;
-        private TextBox textBoxSum;
-        private Button buttonSave;
-        private Button buttonCancel;
-    }
+		private Label labelProduct;
+		private Label labelCount;
+		private Label labelPrice;
+		private ComboBox comboBoxProduct;
+		private TextBox textBoxCount;
+		private TextBox textBoxSum;
+		private Button buttonSave;
+		private Button buttonCancel;
+		private ComboBox comboBoxClient;
+		private Label label1;
+	}
 }

Diner/Diner/FormCreateOrder.cs

@@ -6,114 +6,132 @@ using System.Data;
 
 namespace Diner
 {
-    public partial class FormCreateOrder : Form
-    {
-        private readonly ILogger _logger;
-        private readonly ISnackLogic _logicP;
-        private readonly IOrderLogic _logicO;
-        public FormCreateOrder(ILogger<FormCreateOrder> logger, ISnackLogic logicP, IOrderLogic logicO)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicP = logicP;
-            _logicO = logicO;
-        }
-        private void FormCreateOrder_Load(object sender, EventArgs e)
-        {
-            _logger.LogInformation("Загрузка изделий для заказа");
-            try
-            {
-                var list = _logicP.ReadList(null);
-                if (list != null)
-                {
-                    comboBoxProduct.DisplayMember = "Snack";
-                    comboBoxProduct.ValueMember = "Id";
-                    comboBoxProduct.DataSource = list.Select(c => c.SnackName).ToList();
-                    comboBoxProduct.SelectedItem = null;
-                }
+	public partial class FormCreateOrder : Form
+	{
+		private readonly ILogger _logger;
+		private readonly ISnackLogic _logicP;
+		private readonly IOrderLogic _logicO;
+		private readonly IClientLogic _logicCl;
+		public FormCreateOrder(ILogger<FormCreateOrder> logger, ISnackLogic logicP, IOrderLogic logicO, IClientLogic logicCl)
+		{
+			InitializeComponent();
+			_logger = logger;
+			_logicP = logicP;
+			_logicO = logicO;
+			_logicCl = logicCl;
+		}
+		private void FormCreateOrder_Load(object sender, EventArgs e)
+		{
+			_logger.LogInformation("Загрузка изделий для заказа");
+			try
+			{
+				var list = _logicP.ReadList(null);
+				var listClients = _logicCl.ReadList(null);
+				if (list != null)
+				{
+					comboBoxProduct.DisplayMember = "SnackName";
+					comboBoxProduct.ValueMember = "Id";
+					comboBoxProduct.DataSource = list;
+					comboBoxProduct.SelectedItem = null;
+				}
 
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка изделий");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void CalcSum()
-        {
-            if (comboBoxProduct.SelectedValue != null && !string.IsNullOrEmpty(textBoxCount.Text))
-            {
-                try
-                {
-                    int id = Convert.ToInt32(comboBoxProduct.SelectedIndex + 1);
-                    var product = _logicP.ReadElement(new SnackSearchModel
-                    {
-                        Id = id
-                    });
-                    int count = Convert.ToInt32(textBoxCount.Text);
-                    textBoxSum.Text = Math.Round(count * (product?.Price ?? 0), 2).ToString();
-                    _logger.LogInformation("Расчет суммы заказа");
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка расчета суммы заказа");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
-                }
-            }
-        }
-        private void TextBoxCount_TextChanged(object sender, EventArgs e)
-        {
-            CalcSum();
-        }
-        private void ComboBoxProduct_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            CalcSum();
-        }
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxCount.Text))
-            {
-                MessageBox.Show("Заполните поле Количество", "Ошибка",
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (comboBoxProduct.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите изделие", "Ошибка",
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Создание заказа");
-            try
-            {
-                var operationResult = _logicO.CreateOrder(new OrderBindingModel
-                {
-                    SnackId = Convert.ToInt32(comboBoxProduct.SelectedIndex + 1),
-                    SnackName = comboBoxProduct.SelectedValue.ToString(),
-                    Count = Convert.ToInt32(textBoxCount.Text),
-                    Sum = Convert.ToDouble(textBoxSum.Text)
-                });
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при создании заказа. Дополнительная информация в логах.");
-                }
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение",
-               MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания заказа");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-               MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
+				if (listClients != null)
+				{
+					comboBoxClient.DisplayMember = "ClientFIO";
+					comboBoxClient.ValueMember = "Id";
+					comboBoxClient.DataSource = listClients;
+					comboBoxClient.SelectedItem = null;
+				}
+
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка загрузки списка изделий");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
+		}
+		private void CalcSum()
+		{
+			if (comboBoxProduct.SelectedValue != null && !string.IsNullOrEmpty(textBoxCount.Text))
+			{
+				try
+				{
+					int id = Convert.ToInt32(comboBoxProduct.SelectedIndex + 1);
+					var product = _logicP.ReadElement(new SnackSearchModel
+					{
+						Id = id
+					});
+					int count = Convert.ToInt32(textBoxCount.Text);
+					textBoxSum.Text = Math.Round(count * (product?.Price ?? 0), 2).ToString();
+					_logger.LogInformation("Расчет суммы заказа");
+				}
+				catch (Exception ex)
+				{
+					_logger.LogError(ex, "Ошибка расчета суммы заказа");
+					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+					MessageBoxIcon.Error);
+				}
+			}
+		}
+		private void TextBoxCount_TextChanged(object sender, EventArgs e)
+		{
+			CalcSum();
+		}
+		private void ComboBoxProduct_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			CalcSum();
+		}
+		private void ButtonSave_Click(object sender, EventArgs e)
+		{
+			if (string.IsNullOrEmpty(textBoxCount.Text))
+			{
+				MessageBox.Show("Заполните поле Количество", "Ошибка",
+			   MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			if (comboBoxProduct.SelectedValue == null)
+			{
+				MessageBox.Show("Выберите изделие", "Ошибка",
+			   MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			if (comboBoxClient.SelectedValue == null)
+			{
+				MessageBox.Show("Выберите заказчика", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+
+				return;
+			}
+			_logger.LogInformation("Создание заказа");
+			try
+			{
+				var operationResult = _logicO.CreateOrder(new OrderBindingModel
+				{
+					SnackId = Convert.ToInt32(comboBoxProduct.SelectedIndex + 1),
+					SnackName = comboBoxProduct.SelectedValue.ToString(),
+					ClientId = Convert.ToInt32(comboBoxClient.SelectedValue),
+					Count = Convert.ToInt32(textBoxCount.Text),
+					Sum = Convert.ToDouble(textBoxSum.Text)
+				});
+				if (!operationResult)
+				{
+					throw new Exception("Ошибка при создании заказа. Дополнительная информация в логах.");
+				}
+				MessageBox.Show("Сохранение прошло успешно", "Сообщение",
+			   MessageBoxButtons.OK, MessageBoxIcon.Information);
+				DialogResult = DialogResult.OK;
+				Close();
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка создания заказа");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+			   MessageBoxIcon.Error);
+			}
+		}
+		private void ButtonCancel_Click(object sender, EventArgs e)
+		{
+			DialogResult = DialogResult.Cancel;
+			Close();
+		}
+	}
 }

Diner/Diner/FormCreateSupply.Designer.cs

@@ -1,142 +0,0 @@
-namespace Diner
-{
-    partial class FormCreateSupply
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            comboBoxShop = new ComboBox();
-            labelShop = new Label();
-            labelPizza = new Label();
-            comboBoxSnack = new ComboBox();
-            labelCount = new Label();
-            textBoxCount = new TextBox();
-            buttonCancel = new Button();
-            buttonSave = new Button();
-            SuspendLayout();
-            // 
-            // comboBoxShop
-            // 
-            comboBoxShop.FormattingEnabled = true;
-            comboBoxShop.Location = new Point(115, 12);
-            comboBoxShop.Name = "comboBoxShop";
-            comboBoxShop.Size = new Size(344, 28);
-            comboBoxShop.TabIndex = 0;
-            // 
-            // labelShop
-            // 
-            labelShop.AutoSize = true;
-            labelShop.Location = new Point(12, 15);
-            labelShop.Name = "labelShop";
-            labelShop.Size = new Size(76, 20);
-            labelShop.TabIndex = 1;
-            labelShop.Text = "Магазин: ";
-            // 
-            // labelPizza
-            // 
-            labelPizza.AutoSize = true;
-            labelPizza.Location = new Point(12, 49);
-            labelPizza.Name = "labelPizza";
-            labelPizza.Size = new Size(75, 20);
-            labelPizza.TabIndex = 2;
-            labelPizza.Text = "Изделие: ";
-            // 
-            // comboBoxSnack
-            // 
-            comboBoxSnack.FormattingEnabled = true;
-            comboBoxSnack.Location = new Point(115, 46);
-            comboBoxSnack.Name = "comboBoxSnack";
-            comboBoxSnack.Size = new Size(344, 28);
-            comboBoxSnack.TabIndex = 3;
-            // 
-            // labelCount
-            // 
-            labelCount.AutoSize = true;
-            labelCount.Location = new Point(12, 83);
-            labelCount.Name = "labelCount";
-            labelCount.Size = new Size(97, 20);
-            labelCount.TabIndex = 4;
-            labelCount.Text = "Количество: ";
-            // 
-            // textBoxCount
-            // 
-            textBoxCount.Location = new Point(115, 80);
-            textBoxCount.Name = "textBoxCount";
-            textBoxCount.Size = new Size(344, 27);
-            textBoxCount.TabIndex = 5;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(300, 113);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(116, 39);
-            buttonCancel.TabIndex = 6;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += ButtonCancel_Click;
-            // 
-            // buttonSave
-            // 
-            buttonSave.Location = new Point(168, 113);
-            buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(116, 39);
-            buttonSave.TabIndex = 7;
-            buttonSave.Text = "Сохранить";
-            buttonSave.UseVisualStyleBackColor = true;
-            buttonSave.Click += ButtonSave_Click;
-            // 
-            // FormCreateSupply
-            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(471, 164);
-            Controls.Add(buttonSave);
-            Controls.Add(buttonCancel);
-            Controls.Add(textBoxCount);
-            Controls.Add(labelCount);
-            Controls.Add(comboBoxSnack);
-            Controls.Add(labelPizza);
-            Controls.Add(labelShop);
-            Controls.Add(comboBoxShop);
-            Name = "FormCreateSupply";
-            Text = "Создание поставки";
-            Load += FormCreateSupply_Load;
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private ComboBox comboBoxShop;
-        private Label labelShop;
-        private Label labelPizza;
-        private ComboBox comboBoxSnack;
-        private Label labelCount;
-        private TextBox textBoxCount;
-        private Button buttonCancel;
-        private Button buttonSave;
-    }
-}

Diner/Diner/FormCreateSupply.cs

@@ -1,99 +0,0 @@
-using Microsoft.Extensions.Logging;
-using DinerContracts.BindingModels;
-using DinerContracts.BusinessLogicsContracts;
-using DinerContracts.ViewModels;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
-
-namespace Diner
-{
-    public partial class FormCreateSupply : Form
-    {
-        private readonly ILogger _logger;
-        private readonly ISnackLogic _logicP;
-        private readonly IShopLogic _logicS;
-        private List<ShopViewModel> _shopList = new List<ShopViewModel>();
-        private List<SnackViewModel> _snackList = new List<SnackViewModel>();
-
-        public FormCreateSupply(ILogger<FormCreateSupply> logger, ISnackLogic logicP, IShopLogic logicS)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicP = logicP;
-            _logicS = logicS;
-        }
-
-        private void FormCreateSupply_Load(object sender, EventArgs e)
-        {
-            _shopList = _logicS.ReadList(null);
-            _snackList = _logicP.ReadList(null);
-            if (_shopList != null)
-            {
-                comboBoxShop.DisplayMember = "ShopName";
-                comboBoxShop.ValueMember = "Id";
-                comboBoxShop.DataSource = _shopList;
-                comboBoxShop.SelectedItem = null;
-                _logger.LogInformation("Загрузка магазинов для поставок");
-            }
-            if (_snackList != null)
-            {
-                comboBoxSnack.DisplayMember = "SnackName";
-                comboBoxSnack.ValueMember = "Id";
-                comboBoxSnack.DataSource = _snackList;
-                comboBoxSnack.SelectedItem = null;
-                _logger.LogInformation("Загрузка закуски для поставок");
-            }
-        }
-
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (comboBoxShop.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (comboBoxSnack.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите закуску", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Создание поставки");
-            try
-            {
-                var operationResult = _logicS.MakeSupply(new SupplyBindingModel
-                {
-                    ShopId = Convert.ToInt32(comboBoxShop.SelectedValue),
-                    SnackId = Convert.ToInt32(comboBoxSnack.SelectedValue),
-                    Count = Convert.ToInt32(textBoxCount.Text)
-                });
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при создании поставки. Дополнительная информация в логах.");
-                }
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания поставки");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

Diner/Diner/FormCreateSupply.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

Diner/Diner/FormMain.Designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain));
             dataGridView = new DataGridView();
             buttonCreateOrder = new Button();
             buttonTakeOrderInWork = new Button();
@@ -39,20 +38,11 @@
             toolStripLabel1 = new ToolStripDropDownButton();
             componentsToolStripMenuItem = new ToolStripMenuItem();
             snacksToolStripMenuItem = new ToolStripMenuItem();
-            магазиныToolStripMenuItem = new ToolStripMenuItem();
             toolStripDropDownButton1 = new ToolStripDropDownButton();
-            поставкаToolStripMenuItem = new ToolStripMenuItem();
-            SellToolStripMenuItem = new ToolStripMenuItem();
-            отчётыToolStripMenuItem = new ToolStripDropDownButton();
-            изделияToolStripMenuItem = new ToolStripMenuItem();
-            списокИзделийToolStripMenuItem = new ToolStripMenuItem();
-            закускаСИнгридентамиToolStripMenuItem = new ToolStripMenuItem();
-            магазинToolStripMenuItem = new ToolStripMenuItem();
-            информацияToolStripMenuItem = new ToolStripMenuItem();
-            загруженностьToolStripMenuItem = new ToolStripMenuItem();
-            заказыToolStripMenuItem = new ToolStripMenuItem();
-            заказыToolStripMenuItem1 = new ToolStripMenuItem();
-            заказыПоГруппамToolStripMenuItem = new ToolStripMenuItem();
+            списокЗакусокToolStripMenuItem = new ToolStripMenuItem();
+            закускиПоКомпонентамToolStripMenuItem = new ToolStripMenuItem();
+            списокЗаказовToolStripMenuItem = new ToolStripMenuItem();
+            клиентыToolStripMenuItem = new ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             toolStrip1.SuspendLayout();
             SuspendLayout();
@@ -121,7 +111,7 @@
             // toolStrip1
             // 
             toolStrip1.ImageScalingSize = new Size(20, 20);
-            toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripLabel1, toolStripDropDownButton1, отчётыToolStripMenuItem });
+            toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripLabel1, toolStripDropDownButton1 });
             toolStrip1.Location = new Point(0, 0);
             toolStrip1.Name = "toolStrip1";
             toolStrip1.Size = new Size(1280, 27);
@@ -130,7 +120,7 @@
             // 
             // toolStripLabel1
             // 
-            toolStripLabel1.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem, snacksToolStripMenuItem, магазиныToolStripMenuItem });
+            toolStripLabel1.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem, snacksToolStripMenuItem, клиентыToolStripMenuItem });
             toolStripLabel1.Name = "toolStripLabel1";
             toolStripLabel1.Size = new Size(117, 24);
             toolStripLabel1.Text = "Справочники";
@@ -149,108 +139,42 @@
             snacksToolStripMenuItem.Text = "Закуски";
             snacksToolStripMenuItem.Click += ProductToolStripMenuItem_Click;
             // 
-            // магазиныToolStripMenuItem
-            // 
-            магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
-            магазиныToolStripMenuItem.Size = new Size(182, 26);
-            магазиныToolStripMenuItem.Text = "Магазины";
-            магазиныToolStripMenuItem.Click += shopsToolStripMenuItem_Click;
-            // 
             // toolStripDropDownButton1
             // 
             toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text;
-            toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { поставкаToolStripMenuItem, SellToolStripMenuItem });
+            toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { списокЗакусокToolStripMenuItem, закускиПоКомпонентамToolStripMenuItem, списокЗаказовToolStripMenuItem });
             toolStripDropDownButton1.ImageTransparentColor = Color.Magenta;
             toolStripDropDownButton1.Name = "toolStripDropDownButton1";
-            toolStripDropDownButton1.Size = new Size(95, 24);
-            toolStripDropDownButton1.Text = "Операции";
+            toolStripDropDownButton1.Size = new Size(73, 24);
+            toolStripDropDownButton1.Text = "Отчёты";
             // 
-            // поставкаToolStripMenuItem
+            // списокЗакусокToolStripMenuItem
             // 
-            поставкаToolStripMenuItem.Name = "поставкаToolStripMenuItem";
-            поставкаToolStripMenuItem.Size = new Size(156, 26);
-            поставкаToolStripMenuItem.Text = "Поставка";
-            поставкаToolStripMenuItem.Click += transactionToolStripMenuItem_Click;
+            списокЗакусокToolStripMenuItem.Name = "списокЗакусокToolStripMenuItem";
+            списокЗакусокToolStripMenuItem.Size = new Size(267, 26);
+            списокЗакусокToolStripMenuItem.Text = "Список закусок";
+            списокЗакусокToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
             // 
-            // SellToolStripMenuItem
+            // закускиПоКомпонентамToolStripMenuItem
             // 
-            SellToolStripMenuItem.Name = "SellToolStripMenuItem";
-            SellToolStripMenuItem.Size = new Size(156, 26);
-            SellToolStripMenuItem.Text = "Продажа";
-            SellToolStripMenuItem.Click += SellToolStripMenuItem_Click;
+            закускиПоКомпонентамToolStripMenuItem.Name = "закускиПоКомпонентамToolStripMenuItem";
+            закускиПоКомпонентамToolStripMenuItem.Size = new Size(267, 26);
+            закускиПоКомпонентамToolStripMenuItem.Text = "Закуски по компонентам";
+            закускиПоКомпонентамToolStripMenuItem.Click += ComponentSnacksToolStripMenuItem_Click;
             // 
-            // отчётыToolStripMenuItem
+            // списокЗаказовToolStripMenuItem
             // 
-            отчётыToolStripMenuItem.DisplayStyle = ToolStripItemDisplayStyle.Text;
-            отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { изделияToolStripMenuItem, магазинToolStripMenuItem, заказыToolStripMenuItem });
-            отчётыToolStripMenuItem.Image = (Image)resources.GetObject("отчётыToolStripMenuItem.Image");
-            отчётыToolStripMenuItem.ImageTransparentColor = Color.Magenta;
-            отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem";
-            отчётыToolStripMenuItem.Size = new Size(73, 24);
-            отчётыToolStripMenuItem.Text = "Отчёты";
+            списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem";
+            списокЗаказовToolStripMenuItem.Size = new Size(267, 26);
+            списокЗаказовToolStripMenuItem.Text = "Список заказов";
+            списокЗаказовToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
             // 
-            // изделияToolStripMenuItem
+            // клиентыToolStripMenuItem
             // 
-            изделияToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокИзделийToolStripMenuItem, закускаСИнгридентамиToolStripMenuItem });
-            изделияToolStripMenuItem.Name = "изделияToolStripMenuItem";
-            изделияToolStripMenuItem.Size = new Size(224, 26);
-            изделияToolStripMenuItem.Text = "Закуска";
-            // 
-            // списокИзделийToolStripMenuItem
-            // 
-            списокИзделийToolStripMenuItem.Name = "списокИзделийToolStripMenuItem";
-            списокИзделийToolStripMenuItem.Size = new Size(260, 26);
-            списокИзделийToolStripMenuItem.Text = "Список закусок";
-            списокИзделийToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
-            // 
-            // закускаСИнгридентамиToolStripMenuItem
-            // 
-            закускаСИнгридентамиToolStripMenuItem.Name = "закускаСИнгридентамиToolStripMenuItem";
-            закускаСИнгридентамиToolStripMenuItem.Size = new Size(260, 26);
-            закускаСИнгридентамиToolStripMenuItem.Text = "Закуска с ингридентами";
-            закускаСИнгридентамиToolStripMenuItem.Click += ComponentSnackToolStripMenuItem_Click;
-            // 
-            // магазинToolStripMenuItem
-            // 
-            магазинToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { информацияToolStripMenuItem, загруженностьToolStripMenuItem });
-            магазинToolStripMenuItem.Name = "магазинToolStripMenuItem";
-            магазинToolStripMenuItem.Size = new Size(224, 26);
-            магазинToolStripMenuItem.Text = "Магазин";
-            // 
-            // информацияToolStripMenuItem
-            // 
-            информацияToolStripMenuItem.Name = "информацияToolStripMenuItem";
-            информацияToolStripMenuItem.Size = new Size(224, 26);
-            информацияToolStripMenuItem.Text = "Информация";
-            информацияToolStripMenuItem.Click += InfoToolStripMenuItem_Click;
-            // 
-            // загруженностьToolStripMenuItem
-            // 
-            загруженностьToolStripMenuItem.Name = "загруженностьToolStripMenuItem";
-            загруженностьToolStripMenuItem.Size = new Size(224, 26);
-            загруженностьToolStripMenuItem.Text = "Загруженность";
-            загруженностьToolStripMenuItem.Click += BusyShopsToolStripMenuItem_Click;
-            // 
-            // заказыToolStripMenuItem
-            // 
-            заказыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { заказыToolStripMenuItem1, заказыПоГруппамToolStripMenuItem });
-            заказыToolStripMenuItem.Name = "заказыToolStripMenuItem";
-            заказыToolStripMenuItem.Size = new Size(224, 26);
-            заказыToolStripMenuItem.Text = "Заказы";
-            // 
-            // заказыToolStripMenuItem1
-            // 
-            заказыToolStripMenuItem1.Name = "заказыToolStripMenuItem1";
-            заказыToolStripMenuItem1.Size = new Size(226, 26);
-            заказыToolStripMenuItem1.Text = "Заказы";
-            заказыToolStripMenuItem1.Click += OrdersToolStripMenuItem_Click;
-            // 
-            // заказыПоГруппамToolStripMenuItem
-            // 
-            заказыПоГруппамToolStripMenuItem.Name = "заказыПоГруппамToolStripMenuItem";
-            заказыПоГруппамToolStripMenuItem.Size = new Size(226, 26);
-            заказыПоГруппамToolStripMenuItem.Text = "Заказы по группам";
-            заказыПоГруппамToolStripMenuItem.Click += GroupOrdersToolStripMenuItem_Click;
+            клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
+            клиентыToolStripMenuItem.Size = new Size(182, 26);
+            клиентыToolStripMenuItem.Text = "Клиенты";
+            клиентыToolStripMenuItem.Click += ClientsToolStripMenuItem_Click;
             // 
             // FormMain
             // 
@@ -286,19 +210,10 @@
         private ToolStripDropDownButton toolStripLabel1;
         private ToolStripMenuItem componentsToolStripMenuItem;
         private ToolStripMenuItem snacksToolStripMenuItem;
-        private ToolStripMenuItem магазиныToolStripMenuItem;
         private ToolStripDropDownButton toolStripDropDownButton1;
-        private ToolStripMenuItem поставкаToolStripMenuItem;
-        private ToolStripMenuItem SellToolStripMenuItem;
-        private ToolStripDropDownButton отчётыToolStripMenuItem;
-        private ToolStripMenuItem изделияToolStripMenuItem;
-        private ToolStripMenuItem списокИзделийToolStripMenuItem;
-        private ToolStripMenuItem закускаСИнгридентамиToolStripMenuItem;
-        private ToolStripMenuItem магазинToolStripMenuItem;
-        private ToolStripMenuItem информацияToolStripMenuItem;
-        private ToolStripMenuItem загруженностьToolStripMenuItem;
-        private ToolStripMenuItem заказыToolStripMenuItem;
-        private ToolStripMenuItem заказыToolStripMenuItem1;
-        private ToolStripMenuItem заказыПоГруппамToolStripMenuItem;
+        private ToolStripMenuItem списокЗакусокToolStripMenuItem;
+        private ToolStripMenuItem закускиПоКомпонентамToolStripMenuItem;
+        private ToolStripMenuItem списокЗаказовToolStripMenuItem;
+        private ToolStripMenuItem клиентыToolStripMenuItem;
     }
 }

Diner/Diner/FormMain.cs

@@ -1,16 +1,16 @@
 using DinerContracts.BindingModels;
 using DinerContracts.BusinessLogicsContracts;
 using DinerDataModels.Enum;
-using DinerView;
 using Microsoft.Extensions.Logging;
-using DinerBusinessLogic.BusinessLogics;
 
 namespace Diner
 {
     public partial class FormMain : Form
     {
         private readonly ILogger _logger;
+
         private readonly IOrderLogic _orderLogic;
+
         private readonly IReportLogic _reportLogic;
         public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic)
         {
@@ -33,6 +33,10 @@ namespace Diner
                 {
                     dataGridView.DataSource = list;
                     dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["SnackId"].Visible = false;
+                    dataGridView.Columns["ClientId"].Visible = false;
+                    dataGridView.Columns["SnackName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
                 }
                 _logger.LogInformation("Загрузка заказов");
             }
@@ -72,12 +76,18 @@ namespace Diner
             if (dataGridView.SelectedRows.Count == 1)
             {
                 int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                _logger.LogInformation("Заказ No{id}. Меняется статус на 'В работе'", id);
+                _logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id);
                 try
                 {
                     var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel
                     {
-                        Id = id
+                        Id = id,
+                        SnackId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value),
+                        SnackName = dataGridView.SelectedRows[0].Cells["SnackName"].Value.ToString(),
+                        Status = Enum.Parse<OrderStatus>(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
+                        Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value),
+                        Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
+                        DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
                     });
                     if (!operationResult)
                     {
@@ -97,12 +107,18 @@ namespace Diner
             if (dataGridView.SelectedRows.Count == 1)
             {
                 int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                _logger.LogInformation("Заказ No{id}. Меняется статус на 'Готов'", id);
+                _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id);
                 try
                 {
                     var operationResult = _orderLogic.FinishOrder(new OrderBindingModel
                     {
-                        Id = id
+                        Id = id,
+                        SnackId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value),
+                        SnackName = dataGridView.SelectedRows[0].Cells["SnackName"].Value.ToString(),
+                        Status = Enum.Parse<OrderStatus>(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
+                        Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value),
+                        Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
+                        DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
                     });
                     if (!operationResult)
                     {
@@ -117,17 +133,53 @@ namespace Diner
                 }
             }
         }
+        private void ButtonIssuedOrder_Click(object sender, EventArgs e)
+        {
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id);
+                try
+                {
+                    var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel
+                    {
+                        Id = id,
+                        SnackId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value),
+                        SnackName = dataGridView.SelectedRows[0].Cells["SnackName"].Value.ToString(),
+                        Status = Enum.Parse<OrderStatus>(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
+                        Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value),
+                        Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
+                        DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
+                    });
+                    if (!operationResult)
+                    {
+                        throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
+                    }
+                    _logger.LogInformation("Заказ №{id} выдан", id);
+                    LoadData();
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка отметки о выдачи заказа");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+        private void ButtonRef_Click(object sender, EventArgs e)
+        {
+            LoadData();
+        }
         private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e)
         {
             using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
             if (dialog.ShowDialog() == DialogResult.OK)
             {
-                _reportLogic.SaveSnacksToWordFile(new ReportBindingModel { FileName = dialog.FileName });
+                _reportLogic.SaveComponentsToWordFile(new ReportBindingModel { FileName = dialog.FileName });
                 MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
         }
 
-        private void ComponentSnackToolStripMenuItem_Click(object sender, EventArgs e)
+        private void ComponentSnacksToolStripMenuItem_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormReportSnackComponents));
             if (service is FormReportSnackComponents form)
@@ -144,84 +196,11 @@ namespace Diner
                 form.ShowDialog();
             }
         }
-        private void ButtonIssuedOrder_Click(object sender, EventArgs e)
+        private void ClientsToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                _logger.LogInformation("Заказ No{id}. Меняется статус на 'Выдан'", id);
-                try
-                {
-                    var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel
-                    {
-                        Id = id
-                    });
-                    if (!operationResult)
-                    {
-                        throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-                    }
-                    _logger.LogInformation("Заказ No{id} выдан", id);
-                    LoadData();
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка отметки о выдачи заказа");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-        private void ButtonRef_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-        private void shopsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
-            if (service is FormShops form)
-            {
-                form.ShowDialog();
-            }
-        }
+            var service = Program.ServiceProvider?.GetService(typeof(FormClients));
 
-        private void transactionToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormCreateSupply));
-            if (service is FormCreateSupply form)
-            {
-                form.ShowDialog();
-            }
-        }
-        private void SellToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormSellSnack));
-            if (service is FormSellSnack form)
-            {
-                form.ShowDialog();
-            }
-        }
-        private void InfoToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                _reportLogic.SaveShopsToWordFile(new ReportBindingModel { FileName = dialog.FileName });
-                MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            }
-        }
-
-        private void BusyShopsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportShop));
-            if (service is FormReportShop form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void GroupOrdersToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportGroupedOrders));
-            if (service is FormReportGroupedOrders form)
+            if (service is FormClients form)
             {
                 form.ShowDialog();
             }

Diner/Diner/FormMain.resx

@@ -120,16 +120,4 @@
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="отчётыToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEKSURBVEhL3ZG9DsFQHMXvczDZvIOtXsHObuhqkViI3Quw
-        6CYmNoMYJJ0NBiFFIoIytOuf0+TeXP3yde+iyS+3OcP53Z4y3/dJJ4HAsiwyTVMp6BQCBIZhKAWdEcHV
-        vSlBmeB82NFy1KLluEWOPRC5MoHdMWhazwi4RJlALgf4EuT6BI+5kCsTrGddUY658E+QvyXYHq9UnRyC
-        U87f4aUApcXhnrI9Jzg/laQKFntXlHM+lSQK5psL5fvbp/JvJLGCQqmSWM5JkiCT84igXGtSrruKLQ0T
-        luAdmZxHBG37FFuWBC/j5XKOmX8WAH7rcI6ZMffPgjQwN2bXJgDo/COBTpjneQ2dML0PY3cISreGe8HM
-        qgAAAABJRU5ErkJggg==
-</value>
-  </data>
 </root>

Diner/Diner/FormReportGroupedOrders.Designer.cs

@@ -1,86 +0,0 @@
-namespace Diner
-{
-    partial class FormReportGroupedOrders
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.panel = new System.Windows.Forms.Panel();
-            this.buttonToPDF = new System.Windows.Forms.Button();
-            this.buttonMake = new System.Windows.Forms.Button();
-            this.panel.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // panel
-            // 
-            this.panel.Controls.Add(this.buttonToPDF);
-            this.panel.Controls.Add(this.buttonMake);
-            this.panel.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel.Location = new System.Drawing.Point(0, 0);
-            this.panel.Name = "panel";
-            this.panel.Size = new System.Drawing.Size(970, 52);
-            this.panel.TabIndex = 1;
-            // 
-            // buttonToPDF
-            // 
-            this.buttonToPDF.Location = new System.Drawing.Point(486, 12);
-            this.buttonToPDF.Name = "buttonToPDF";
-            this.buttonToPDF.Size = new System.Drawing.Size(411, 29);
-            this.buttonToPDF.TabIndex = 5;
-            this.buttonToPDF.Text = "В PDF";
-            this.buttonToPDF.UseVisualStyleBackColor = true;
-            this.buttonToPDF.Click += new System.EventHandler(this.buttonToPDF_Click);
-            // 
-            // buttonMake
-            // 
-            this.buttonMake.Location = new System.Drawing.Point(49, 12);
-            this.buttonMake.Name = "buttonMake";
-            this.buttonMake.Size = new System.Drawing.Size(377, 29);
-            this.buttonMake.TabIndex = 4;
-            this.buttonMake.Text = "Сформировать";
-            this.buttonMake.UseVisualStyleBackColor = true;
-            this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click);
-            // 
-            // FormReportGroupedOrders
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(970, 450);
-            this.Controls.Add(this.panel);
-            this.Name = "FormReportGroupedOrders";
-            this.Text = "Отчёт по группированным заказам ";
-            this.panel.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private Panel panel;
-        private Button buttonToPDF;
-        private Button buttonMake;
-    }
-}

Diner/Diner/FormReportGroupedOrders.cs

@@ -1,78 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Microsoft.Reporting.WinForms;
-using DinerContracts.BindingModels;
-using DinerContracts.BusinessLogicsContracts;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Diner
-{
-    public partial class FormReportGroupedOrders : Form
-    {
-        private readonly ReportViewer reportViewer;
-        private readonly ILogger _logger;
-        private readonly IReportLogic _logic;
-
-        public FormReportGroupedOrders(ILogger<FormReportGroupedOrders> logger, IReportLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-            reportViewer = new ReportViewer
-            {
-                Dock = DockStyle.Fill
-            };
-            reportViewer.LocalReport.LoadReportDefinition(new FileStream("C:\\Users\\ogoro\\source\\repos\\PIbd_23_Kislitsa_E.D_Diner\\Diner\\Diner\\ReportGroupedOrders.rdlc", FileMode.Open));
-            Controls.Clear();
-            Controls.Add(reportViewer);
-            Controls.Add(panel);
-        }
-        private void ButtonMake_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                var dataSource = _logic.GetGroupedOrders();
-                var source = new ReportDataSource("DataSetGroupedOrders", dataSource);
-                reportViewer.LocalReport.DataSources.Clear();
-                reportViewer.LocalReport.DataSources.Add(source);
-
-                reportViewer.RefreshReport();
-                _logger.LogInformation("Загрузка списка группированных заказов");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка группированных заказов на период");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonToPDF_Click(object sender, EventArgs e)
-        {
-            using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _logic.SaveGroupedOrdersToPdfFile(new ReportBindingModel
-                    {
-                        FileName = dialog.FileName,
-                    });
-                    _logger.LogInformation("Сохранение списка группированных заказов");
-                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка сохранения списка группированных заказов");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-    }
-}

Diner/Diner/FormReportGroupedOrders.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

Diner/Diner/FormReportOrders.Designer.cs

@@ -29,18 +29,18 @@
         private void InitializeComponent()
         {
             this.panel = new System.Windows.Forms.Panel();
-            this.labelFrom = new System.Windows.Forms.Label();
-            this.dateTimePickerFrom = new System.Windows.Forms.DateTimePicker();
+            this.buttonToPdf = new System.Windows.Forms.Button();
+            this.buttonMake = new System.Windows.Forms.Button();
             this.dateTimePickerTo = new System.Windows.Forms.DateTimePicker();
             this.labelTo = new System.Windows.Forms.Label();
-            this.buttonMake = new System.Windows.Forms.Button();
-            this.buttonToPDF = new System.Windows.Forms.Button();
+            this.dateTimePickerFrom = new System.Windows.Forms.DateTimePicker();
+            this.labelFrom = new System.Windows.Forms.Label();
             this.panel.SuspendLayout();
             this.SuspendLayout();
             // 
             // panel
             // 
-            this.panel.Controls.Add(this.buttonToPDF);
+            this.panel.Controls.Add(this.buttonToPdf);
             this.panel.Controls.Add(this.buttonMake);
             this.panel.Controls.Add(this.dateTimePickerTo);
             this.panel.Controls.Add(this.labelTo);
@@ -48,84 +48,92 @@
             this.panel.Controls.Add(this.labelFrom);
             this.panel.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel.Location = new System.Drawing.Point(0, 0);
+            this.panel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.panel.Name = "panel";
-            this.panel.Size = new System.Drawing.Size(958, 52);
+            this.panel.Size = new System.Drawing.Size(1031, 40);
             this.panel.TabIndex = 0;
             // 
-            // labelFrom
+            // buttonToPdf
             // 
-            this.labelFrom.AutoSize = true;
-            this.labelFrom.Location = new System.Drawing.Point(12, 14);
-            this.labelFrom.Name = "labelFrom";
-            this.labelFrom.Size = new System.Drawing.Size(18, 20);
-            this.labelFrom.TabIndex = 0;
-            this.labelFrom.Text = "C";
-            // 
-            // dateTimePickerFrom
-            // 
-            this.dateTimePickerFrom.Location = new System.Drawing.Point(36, 9);
-            this.dateTimePickerFrom.Name = "dateTimePickerFrom";
-            this.dateTimePickerFrom.Size = new System.Drawing.Size(199, 27);
-            this.dateTimePickerFrom.TabIndex = 1;
-            // 
-            // dateTimePickerTo
-            // 
-            this.dateTimePickerTo.Location = new System.Drawing.Point(300, 9);
-            this.dateTimePickerTo.Name = "dateTimePickerTo";
-            this.dateTimePickerTo.Size = new System.Drawing.Size(199, 27);
-            this.dateTimePickerTo.TabIndex = 3;
-            // 
-            // labelTo
-            // 
-            this.labelTo.AutoSize = true;
-            this.labelTo.Location = new System.Drawing.Point(254, 14);
-            this.labelTo.Name = "labelTo";
-            this.labelTo.Size = new System.Drawing.Size(27, 20);
-            this.labelTo.TabIndex = 2;
-            this.labelTo.Text = "по";
+            this.buttonToPdf.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonToPdf.Location = new System.Drawing.Point(878, 8);
+            this.buttonToPdf.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.buttonToPdf.Name = "buttonToPdf";
+            this.buttonToPdf.Size = new System.Drawing.Size(139, 27);
+            this.buttonToPdf.TabIndex = 5;
+            this.buttonToPdf.Text = "В Pdf";
+            this.buttonToPdf.UseVisualStyleBackColor = true;
+            this.buttonToPdf.Click += new System.EventHandler(this.ButtonToPdf_Click);
             // 
             // buttonMake
             // 
-            this.buttonMake.Location = new System.Drawing.Point(542, 10);
+            this.buttonMake.Location = new System.Drawing.Point(476, 8);
+            this.buttonMake.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.buttonMake.Name = "buttonMake";
-            this.buttonMake.Size = new System.Drawing.Size(165, 29);
+            this.buttonMake.Size = new System.Drawing.Size(139, 27);
             this.buttonMake.TabIndex = 4;
             this.buttonMake.Text = "Сформировать";
             this.buttonMake.UseVisualStyleBackColor = true;
             this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click);
             // 
-            // buttonToPDF
+            // dateTimePickerTo
             // 
-            this.buttonToPDF.Location = new System.Drawing.Point(781, 9);
-            this.buttonToPDF.Name = "buttonToPDF";
-            this.buttonToPDF.Size = new System.Drawing.Size(165, 29);
-            this.buttonToPDF.TabIndex = 5;
-            this.buttonToPDF.Text = "В PDF";
-            this.buttonToPDF.UseVisualStyleBackColor = true;
-            this.buttonToPDF.Click += new System.EventHandler(this.ButtonToPdf_Click);
+            this.dateTimePickerTo.Location = new System.Drawing.Point(237, 7);
+            this.dateTimePickerTo.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.dateTimePickerTo.Name = "dateTimePickerTo";
+            this.dateTimePickerTo.Size = new System.Drawing.Size(163, 23);
+            this.dateTimePickerTo.TabIndex = 3;
+            // 
+            // labelTo
+            // 
+            this.labelTo.AutoSize = true;
+            this.labelTo.Location = new System.Drawing.Point(208, 10);
+            this.labelTo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.labelTo.Name = "labelTo";
+            this.labelTo.Size = new System.Drawing.Size(21, 15);
+            this.labelTo.TabIndex = 2;
+            this.labelTo.Text = "по";
+            // 
+            // dateTimePickerFrom
+            // 
+            this.dateTimePickerFrom.Location = new System.Drawing.Point(37, 7);
+            this.dateTimePickerFrom.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.dateTimePickerFrom.Name = "dateTimePickerFrom";
+            this.dateTimePickerFrom.Size = new System.Drawing.Size(163, 23);
+            this.dateTimePickerFrom.TabIndex = 1;
+            // 
+            // labelFrom
+            // 
+            this.labelFrom.AutoSize = true;
+            this.labelFrom.Location = new System.Drawing.Point(14, 10);
+            this.labelFrom.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.labelFrom.Name = "labelFrom";
+            this.labelFrom.Size = new System.Drawing.Size(15, 15);
+            this.labelFrom.TabIndex = 0;
+            this.labelFrom.Text = "С";
             // 
             // FormReportOrders
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(958, 450);
+            this.ClientSize = new System.Drawing.Size(1031, 647);
             this.Controls.Add(this.panel);
+            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Name = "FormReportOrders";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "Заказы";
             this.panel.ResumeLayout(false);
             this.panel.PerformLayout();
             this.ResumeLayout(false);
-
         }
 
         #endregion
-
-        private Panel panel;
-        private Button buttonToPDF;
-        private Button buttonMake;
-        private DateTimePicker dateTimePickerTo;
-        private Label labelTo;
-        private DateTimePicker dateTimePickerFrom;
-        private Label labelFrom;
+        private System.Windows.Forms.Panel panel;
+        private System.Windows.Forms.Button buttonToPdf;
+        private System.Windows.Forms.Button buttonMake;
+        private System.Windows.Forms.DateTimePicker dateTimePickerTo;
+        private System.Windows.Forms.Label labelTo;
+        private System.Windows.Forms.DateTimePicker dateTimePickerFrom;
+        private System.Windows.Forms.Label labelFrom;
     }
 }

Diner/Diner/FormReportOrders.cs

@@ -1,25 +1,17 @@
-using Microsoft.Extensions.Logging;
-using Microsoft.Reporting.WinForms;
-using DinerContracts.BindingModels;
+using DinerContracts.BindingModels;
 using DinerContracts.BusinessLogicsContracts;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+using Microsoft.Extensions.Logging;
+using Microsoft.Reporting.WinForms;
 
 namespace Diner
 {
     public partial class FormReportOrders : Form
     {
         private readonly ReportViewer reportViewer;
-        private readonly ILogger _logger;
-        private readonly IReportLogic _logic;
 
+        private readonly ILogger _logger;
+
+        private readonly IReportLogic _logic;
         public FormReportOrders(ILogger<FormReportOrders> logger, IReportLogic logic)
         {
             InitializeComponent();
@@ -29,7 +21,7 @@ namespace Diner
             {
                 Dock = DockStyle.Fill
             };
-            reportViewer.LocalReport.LoadReportDefinition(new FileStream("C:\\Users\\ogoro\\source\\repos\\PIbd_23_Kislitsa_E.D_Diner\\Diner\\Diner\\ReportOrder.rdlc", FileMode.Open));
+            reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrders.rdlc", FileMode.Open));
             Controls.Clear();
             Controls.Add(reportViewer);
             Controls.Add(panel);
@@ -64,6 +56,7 @@ namespace Diner
                 MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
+
         private void ButtonToPdf_Click(object sender, EventArgs e)
         {
             if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
@@ -92,5 +85,6 @@ namespace Diner
                 }
             }
         }
+
     }
 }

Diner/Diner/FormReportOrders.resx

@@ -1,4 +1,64 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">

Diner/Diner/FormReportShop.Designer.cs

@@ -1,116 +0,0 @@
-namespace Diner
-{
-    partial class FormReportShop
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.buttonSaveToExcel = new System.Windows.Forms.Button();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.ColumnShop = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ColumnPizza = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // buttonSaveToExcel
-            // 
-            this.buttonSaveToExcel.Location = new System.Drawing.Point(0, 6);
-            this.buttonSaveToExcel.Name = "buttonSaveToExcel";
-            this.buttonSaveToExcel.Size = new System.Drawing.Size(223, 29);
-            this.buttonSaveToExcel.TabIndex = 3;
-            this.buttonSaveToExcel.Text = "Сохранить в Excel";
-            this.buttonSaveToExcel.UseVisualStyleBackColor = true;
-            this.buttonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.AllowUserToAddRows = false;
-            this.dataGridView.AllowUserToDeleteRows = false;
-            this.dataGridView.AllowUserToOrderColumns = true;
-            this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.ColumnShop,
-            this.ColumnPizza,
-            this.ColumnCount});
-            this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.dataGridView.Location = new System.Drawing.Point(0, 47);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.ReadOnly = true;
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(598, 403);
-            this.dataGridView.TabIndex = 2;
-            // 
-            // ColumnShop
-            // 
-            this.ColumnShop.FillWeight = 130F;
-            this.ColumnShop.HeaderText = "Магазин";
-            this.ColumnShop.MinimumWidth = 6;
-            this.ColumnShop.Name = "ColumnShop";
-            this.ColumnShop.ReadOnly = true;
-            // 
-            // ColumnPizza
-            // 
-            this.ColumnPizza.FillWeight = 140F;
-            this.ColumnPizza.HeaderText = "Пицца";
-            this.ColumnPizza.MinimumWidth = 6;
-            this.ColumnPizza.Name = "ColumnPizza";
-            this.ColumnPizza.ReadOnly = true;
-            // 
-            // ColumnCount
-            // 
-            this.ColumnCount.FillWeight = 90F;
-            this.ColumnCount.HeaderText = "Количество";
-            this.ColumnCount.MinimumWidth = 6;
-            this.ColumnCount.Name = "ColumnCount";
-            this.ColumnCount.ReadOnly = true;
-            // 
-            // FormReportShop
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(598, 450);
-            this.Controls.Add(this.buttonSaveToExcel);
-            this.Controls.Add(this.dataGridView);
-            this.Name = "FormReportShop";
-            this.Text = "Наполненость магазинов";
-            this.Load += new System.EventHandler(this.FormReportShop_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private Button buttonSaveToExcel;
-        private DataGridView dataGridView;
-        private DataGridViewTextBoxColumn ColumnShop;
-        private DataGridViewTextBoxColumn ColumnPizza;
-        private DataGridViewTextBoxColumn ColumnCount;
-    }
-}

Diner/Diner/FormReportShop.cs

@@ -1,76 +0,0 @@
-using Microsoft.Extensions.Logging;
-using DinerContracts.BindingModels;
-using DinerContracts.BusinessLogicsContracts;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Diner
-{
-    public partial class FormReportShop : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IReportLogic _logic;
-
-        public FormReportShop(ILogger<FormReportShop> logger, IReportLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-        private void FormReportShop_Load(object sender, EventArgs e)
-        {
-            try
-            {
-                var dict = _logic.GetShops();
-                if (dict != null)
-                {
-                    dataGridView.Rows.Clear();
-                    foreach (var elem in dict)
-                    {
-                        dataGridView.Rows.Add(new object[] { elem.ShopName, "", "" });
-                        foreach (var listElem in elem.Snacks)
-                        {
-                            dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
-                        }
-                        dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount });
-                        dataGridView.Rows.Add(Array.Empty<object>());
-                    }
-                }
-                _logger.LogInformation("Загрузка списка закусок по магазинам");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка закусок по магазинам");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonSaveToExcel_Click(object sender, EventArgs e)
-        {
-            using var dialog = new SaveFileDialog { Filter = "xlsx|*.xlsx" };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _logic.SaveShopsToExcelFile(new ReportBindingModel
-                    {
-                        FileName = dialog.FileName
-                    });
-                    _logger.LogInformation("Сохранение списка закусок по магазинам");
-                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка сохранения списка закусок по магазинам");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-    }
-}

Diner/Diner/FormReportShop.resx

@@ -1,69 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="ColumnShop.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ColumnPizza.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ColumnCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-</root>

Diner/Diner/FormReportSnackComponents.Designer.cs

@@ -20,93 +20,84 @@
             base.Dispose(disposing);
         }
 
-		#region Windows Form Designer generated code
+        #region Windows Form Designer generated code
 
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			dataGridView = new DataGridView();
-			buttonSaveToExcel = new Button();
-			ColumnSnack = new DataGridViewTextBoxColumn();
-			ColumnComponent = new DataGridViewTextBoxColumn();
-			ColumnCount = new DataGridViewTextBoxColumn();
-			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-			SuspendLayout();
-			// 
-			// dataGridView
-			// 
-			dataGridView.AllowUserToAddRows = false;
-			dataGridView.AllowUserToDeleteRows = false;
-			dataGridView.AllowUserToOrderColumns = true;
-			dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
-			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnSnack, ColumnComponent, ColumnCount });
-			dataGridView.Dock = DockStyle.Bottom;
-			dataGridView.Location = new Point(0, 48);
-			dataGridView.Name = "dataGridView";
-			dataGridView.ReadOnly = true;
-			dataGridView.RowHeadersWidth = 51;
-			dataGridView.RowTemplate.Height = 29;
-			dataGridView.Size = new Size(565, 403);
-			dataGridView.TabIndex = 0;
-			// 
-			// buttonSaveToExcel
-			// 
-			buttonSaveToExcel.Location = new Point(14, 13);
-			buttonSaveToExcel.Name = "buttonSaveToExcel";
-			buttonSaveToExcel.Size = new Size(537, 29);
-			buttonSaveToExcel.TabIndex = 1;
-			buttonSaveToExcel.Text = "Сохранить в Excel";
-			buttonSaveToExcel.UseVisualStyleBackColor = true;
-			buttonSaveToExcel.Click += ButtonSaveToExcel_Click;
-			// 
-			// ColumnSnack
-			// 
-			ColumnSnack.FillWeight = 130F;
-			ColumnSnack.HeaderText = "Закуска";
-			ColumnSnack.MinimumWidth = 6;
-			ColumnSnack.Name = "ColumnSnack";
-			ColumnSnack.ReadOnly = true;
-			// 
-			// ColumnComponent
-			// 
-			ColumnComponent.FillWeight = 140F;
-			ColumnComponent.HeaderText = "Ингридиент";
-			ColumnComponent.MinimumWidth = 6;
-			ColumnComponent.Name = "ColumnComponent";
-			ColumnComponent.ReadOnly = true;
-			// 
-			// ColumnCount
-			// 
-			ColumnCount.FillWeight = 90F;
-			ColumnCount.HeaderText = "Количество";
-			ColumnCount.MinimumWidth = 6;
-			ColumnCount.Name = "ColumnCount";
-			ColumnCount.ReadOnly = true;
-			// 
-			// FormReportSnackComponents
-			// 
-			AutoScaleDimensions = new SizeF(8F, 20F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(565, 451);
-			Controls.Add(buttonSaveToExcel);
-			Controls.Add(dataGridView);
-			Name = "FormReportSnackComponents";
-			Text = "Закуска с ингридиентами";
-			Load += FormReportSnackComponents_Load;
-			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-			ResumeLayout(false);
-		}
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            buttonSaveToExcel = new Button();
+            dataGridView = new DataGridView();
+            ColumnSnack = new DataGridViewTextBoxColumn();
+            ColumComponent = new DataGridViewTextBoxColumn();
+            ColumnCount = new DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+            SuspendLayout();
+            // 
+            // buttonSaveToExcel
+            // 
+            buttonSaveToExcel.Location = new Point(33, 25);
+            buttonSaveToExcel.Name = "buttonSaveToExcel";
+            buttonSaveToExcel.Size = new Size(256, 29);
+            buttonSaveToExcel.TabIndex = 0;
+            buttonSaveToExcel.Text = "Сохранить в Excel";
+            buttonSaveToExcel.UseVisualStyleBackColor = true;
+            buttonSaveToExcel.Click += ButtonSaveToExcel_Click;
+            // 
+            // dataGridView
+            // 
+            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnSnack, ColumComponent, ColumnCount });
+            dataGridView.Dock = DockStyle.Bottom;
+            dataGridView.Location = new Point(0, 73);
+            dataGridView.Name = "dataGridView";
+            dataGridView.RowHeadersWidth = 51;
+            dataGridView.RowTemplate.Height = 29;
+            dataGridView.Size = new Size(800, 395);
+            dataGridView.TabIndex = 1;
+            // 
+            // ColumnSnack
+            // 
+            ColumnSnack.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+            ColumnSnack.HeaderText = "Изделие";
+            ColumnSnack.MinimumWidth = 6;
+            ColumnSnack.Name = "ColumnSnack";
+            // 
+            // ColumComponent
+            // 
+            ColumComponent.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+            ColumComponent.HeaderText = "Компонент";
+            ColumComponent.MinimumWidth = 6;
+            ColumComponent.Name = "ColumComponent";
+            // 
+            // ColumnCount
+            // 
+            ColumnCount.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+            ColumnCount.HeaderText = "Количество";
+            ColumnCount.MinimumWidth = 6;
+            ColumnCount.Name = "ColumnCount";
+            // 
+            // FormReportSnackComponents
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(800, 468);
+            Controls.Add(dataGridView);
+            Controls.Add(buttonSaveToExcel);
+            Name = "FormReportSnackComponents";
+            Text = "Компоненты по изделиям";
+            Load += FormReportSnackComponents_Load;
+            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+            ResumeLayout(false);
+        }
 
-		#endregion
-
-		private DataGridView dataGridView;
+        #endregion
         private Button buttonSaveToExcel;
-		private DataGridViewTextBoxColumn ColumnSnack;
-		private DataGridViewTextBoxColumn ColumnComponent;
-		private DataGridViewTextBoxColumn ColumnCount;
-	}
+        private DataGridView dataGridView;
+        private DataGridViewTextBoxColumn ColumnSnack;
+        private DataGridViewTextBoxColumn ColumComponent;
+        private DataGridViewTextBoxColumn ColumnCount;
+    }
 }

Diner/Diner/FormReportSnackComponents.cs

@@ -1,6 +1,6 @@
-using Microsoft.Extensions.Logging;
-using DinerContracts.BindingModels;
+using DinerContracts.BindingModels;
 using DinerContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -28,7 +28,7 @@ namespace Diner
         {
             try
             {
-                var dict = _logic.GetSnackComponents();
+                var dict = _logic.GetSnackComponent();
                 if (dict != null)
                 {
                     dataGridView.Rows.Clear();
@@ -43,17 +43,22 @@ namespace Diner
                         dataGridView.Rows.Add(Array.Empty<object>());
                     }
                 }
-                _logger.LogInformation("Загрузка списка пиццы по компонентам");
+                _logger.LogInformation("Загрузка списка изделий по компонентам");
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Ошибка загрузки списка пицц по компонентам");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogError(ex, "Ошибка загрузки списка изделий по компонентам");
+
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+               MessageBoxIcon.Error);
             }
         }
         private void ButtonSaveToExcel_Click(object sender, EventArgs e)
         {
-            using var dialog = new SaveFileDialog { Filter = "xlsx|*.xlsx" };
+            using var dialog = new SaveFileDialog
+            {
+                Filter = "xlsx|*.xlsx"
+            };
             if (dialog.ShowDialog() == DialogResult.OK)
             {
                 try
@@ -62,16 +67,19 @@ namespace Diner
                     {
                         FileName = dialog.FileName
                     });
-                    _logger.LogInformation("Сохранение списка закусок по компонентам");
-                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation("Сохранение списка изделий по компонентам");
+
+                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK,
+                   MessageBoxIcon.Information);
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError(ex, "Ошибка сохранения списка закусок по компонентам");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogError(ex, "Ошибка сохранения списка изделий по компонентам");
+
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+                   MessageBoxIcon.Error);
                 }
             }
         }
     }
-
 }

Diner/Diner/FormReportSnackComponents.resx

@@ -1,64 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
+<root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
@@ -117,13 +57,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="ColumnSnack.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ColumnComponent.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ColumnCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

Diner/Diner/FormSellSnack.Designer.cs

@@ -1,119 +0,0 @@
-namespace DinerView
-{
-    partial class FormSellSnack
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            labelSnack = new Label();
-            comboBoxSnack = new ComboBox();
-            labelCount = new Label();
-            textBoxCount = new TextBox();
-            buttonSell = new Button();
-            buttonCancel = new Button();
-            SuspendLayout();
-            // 
-            // labelSnack
-            // 
-            labelSnack.AutoSize = true;
-            labelSnack.Location = new Point(12, 14);
-            labelSnack.Name = "labelSnack";
-            labelSnack.Size = new Size(68, 20);
-            labelSnack.TabIndex = 0;
-            labelSnack.Text = "Закуска: ";
-            // 
-            // comboBoxSnack
-            // 
-            comboBoxSnack.FormattingEnabled = true;
-            comboBoxSnack.Location = new Point(115, 11);
-            comboBoxSnack.Name = "comboBoxSnack";
-            comboBoxSnack.Size = new Size(239, 28);
-            comboBoxSnack.TabIndex = 1;
-            // 
-            // labelCount
-            // 
-            labelCount.AutoSize = true;
-            labelCount.Location = new Point(12, 55);
-            labelCount.Name = "labelCount";
-            labelCount.Size = new Size(97, 20);
-            labelCount.TabIndex = 2;
-            labelCount.Text = "Количество: ";
-            // 
-            // textBoxCount
-            // 
-            textBoxCount.Location = new Point(115, 52);
-            textBoxCount.Name = "textBoxCount";
-            textBoxCount.Size = new Size(239, 27);
-            textBoxCount.TabIndex = 3;
-            // 
-            // buttonSell
-            // 
-            buttonSell.Location = new Point(128, 99);
-            buttonSell.Name = "buttonSell";
-            buttonSell.Size = new Size(94, 29);
-            buttonSell.TabIndex = 4;
-            buttonSell.Text = "Продать";
-            buttonSell.UseVisualStyleBackColor = true;
-            buttonSell.Click += ButtonSell_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(242, 99);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(94, 29);
-            buttonCancel.TabIndex = 5;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += ButtonCancel_Click;
-            // 
-            // FormSellSnack
-            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(366, 140);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonSell);
-            Controls.Add(textBoxCount);
-            Controls.Add(labelCount);
-            Controls.Add(comboBoxSnack);
-            Controls.Add(labelSnack);
-            Name = "FormSellSnack";
-            Text = "Продажа закуски";
-            Load += FormSellingPizza_Load;
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private Label labelSnack;
-        private ComboBox comboBoxSnack;
-        private Label labelCount;
-        private TextBox textBoxCount;
-        private Button buttonSell;
-        private Button buttonCancel;
-    }
-}

Diner/Diner/FormSellSnack.cs

@@ -1,83 +0,0 @@
-using Microsoft.Extensions.Logging;
-using DinerContracts.BusinessLogicsContracts;
-using DinerContracts.SearchModels;
-using DinerContracts.StoragesContracts;
-using DinerContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace DinerView
-{
-    public partial class FormSellSnack : Form
-    {
-        private readonly ILogger _logger;
-        private readonly ISnackLogic _logicP;
-        private readonly IShopLogic _logicS;
-        private List<SnackViewModel> _snackList = new List<SnackViewModel>();
-        public FormSellSnack(ILogger<FormSellSnack> logger, ISnackLogic logicP, IShopLogic logicS)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicP = logicP;
-            _logicS = logicS;
-        }
-        private void FormSellingPizza_Load(object sender, EventArgs e)
-        {
-            _snackList = _logicP.ReadList(null);
-            if (_snackList != null)
-            {
-                comboBoxSnack.DisplayMember = "SnackName";
-                comboBoxSnack.ValueMember = "Id";
-                comboBoxSnack.DataSource = _snackList;
-                comboBoxSnack.SelectedItem = null;
-                _logger.LogInformation("Загрузка закуски для продажи");
-            }
-        }
-        private void ButtonSell_Click(object sender, EventArgs e)
-        {
-            if (comboBoxSnack.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите закуску", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Создание покупки");
-            try
-            {
-                bool resout = _logicS.Sale(new SupplySearchModel
-                {
-                    SnackId = Convert.ToInt32(comboBoxSnack.SelectedValue),
-                    Count = Convert.ToInt32(textBoxCount.Text)
-                });
-                if (resout)
-                {
-                    _logger.LogInformation("Проверка пройдена, продажа  проведена");
-                    MessageBox.Show("Продажа проведена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    DialogResult = DialogResult.OK;
-                    Close();
-                }
-                else {
-                    _logger.LogInformation("Проверка не пройдена");
-                    MessageBox.Show("Продажа не может быть создана.", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                }
-            }
-            catch(Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания покупки");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-
-        }
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

Diner/Diner/FormSellSnack.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

Diner/Diner/FormShop.Designer.cs

@@ -1,214 +0,0 @@
-namespace DinerView
-{
-    partial class FormShop
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            labelName = new Label();
-            textBoxName = new TextBox();
-            textBoxAdress = new TextBox();
-            labelAdress = new Label();
-            buttonCancel = new Button();
-            buttonSave = new Button();
-            dataGridView = new DataGridView();
-            id = new DataGridViewTextBoxColumn();
-            DinerName = new DataGridViewTextBoxColumn();
-            Count = new DataGridViewTextBoxColumn();
-            label1 = new Label();
-            dateTimeOpen = new DateTimePicker();
-            label2 = new Label();
-            numericUpSnackMaxCount = new NumericUpDown();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)numericUpSnackMaxCount).BeginInit();
-            SuspendLayout();
-            // 
-            // labelName
-            // 
-            labelName.AutoSize = true;
-            labelName.Location = new Point(11, 15);
-            labelName.Name = "labelName";
-            labelName.Size = new Size(84, 20);
-            labelName.TabIndex = 0;
-            labelName.Text = "Название: ";
-            // 
-            // textBoxName
-            // 
-            textBoxName.Location = new Point(102, 12);
-            textBoxName.Name = "textBoxName";
-            textBoxName.Size = new Size(276, 27);
-            textBoxName.TabIndex = 1;
-            // 
-            // textBoxAdress
-            // 
-            textBoxAdress.Location = new Point(102, 59);
-            textBoxAdress.Name = "textBoxAdress";
-            textBoxAdress.Size = new Size(427, 27);
-            textBoxAdress.TabIndex = 3;
-            // 
-            // labelAdress
-            // 
-            labelAdress.AutoSize = true;
-            labelAdress.Location = new Point(11, 61);
-            labelAdress.Name = "labelAdress";
-            labelAdress.Size = new Size(58, 20);
-            labelAdress.TabIndex = 2;
-            labelAdress.Text = "Адрес: ";
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(451, 457);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(130, 44);
-            buttonCancel.TabIndex = 5;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += buttonCancel_Click;
-            // 
-            // buttonSave
-            // 
-            buttonSave.Location = new Point(315, 457);
-            buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(130, 44);
-            buttonSave.TabIndex = 6;
-            buttonSave.Text = "Сохранить";
-            buttonSave.UseVisualStyleBackColor = true;
-            buttonSave.Click += buttonSave_Click;
-            // 
-            // dataGridView
-            // 
-            dataGridView.AllowUserToAddRows = false;
-            dataGridView.AllowUserToDeleteRows = false;
-            dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Columns.AddRange(new DataGridViewColumn[] { id, DinerName, Count });
-            dataGridView.Location = new Point(12, 197);
-            dataGridView.Name = "dataGridView";
-            dataGridView.ReadOnly = true;
-            dataGridView.RowHeadersBorderStyle = DataGridViewHeaderBorderStyle.None;
-            dataGridView.RowHeadersWidthSizeMode = DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders;
-            dataGridView.RowTemplate.Height = 29;
-            dataGridView.Size = new Size(569, 254);
-            dataGridView.TabIndex = 7;
-            // 
-            // id
-            // 
-            id.HeaderText = "id";
-            id.MinimumWidth = 6;
-            id.Name = "id";
-            id.ReadOnly = true;
-            id.Visible = false;
-            // 
-            // DinerName
-            // 
-            DinerName.HeaderText = "Закуска";
-            DinerName.MinimumWidth = 6;
-            DinerName.Name = "DinerName";
-            DinerName.ReadOnly = true;
-            // 
-            // Count
-            // 
-            Count.HeaderText = "Количество";
-            Count.MinimumWidth = 6;
-            Count.Name = "Count";
-            Count.ReadOnly = true;
-            // 
-            // label1
-            // 
-            label1.AutoSize = true;
-            label1.Location = new Point(12, 103);
-            label1.Name = "label1";
-            label1.Size = new Size(110, 20);
-            label1.TabIndex = 8;
-            label1.Text = "Дата открытия";
-            // 
-            // dateTimeOpen
-            // 
-            dateTimeOpen.Location = new Point(128, 103);
-            dateTimeOpen.Name = "dateTimeOpen";
-            dateTimeOpen.Size = new Size(401, 27);
-            dateTimeOpen.TabIndex = 9;
-            // 
-            // label2
-            // 
-            label2.AutoSize = true;
-            label2.Location = new Point(12, 156);
-            label2.Name = "label2";
-            label2.Size = new Size(107, 20);
-            label2.TabIndex = 10;
-            label2.Text = "Вместимость: ";
-            // 
-            // numericUpSnackMaxCount
-            // 
-            numericUpSnackMaxCount.Location = new Point(128, 154);
-            numericUpSnackMaxCount.Maximum = new decimal(new int[] { 10000, 0, 0, 0 });
-            numericUpSnackMaxCount.Name = "numericUpSnackMaxCount";
-            numericUpSnackMaxCount.Size = new Size(401, 27);
-            numericUpSnackMaxCount.TabIndex = 12;
-            // 
-            // FormShop
-            // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(593, 513);
-            Controls.Add(numericUpSnackMaxCount);
-            Controls.Add(label2);
-            Controls.Add(dateTimeOpen);
-            Controls.Add(label1);
-            Controls.Add(dataGridView);
-            Controls.Add(buttonSave);
-            Controls.Add(buttonCancel);
-            Controls.Add(textBoxAdress);
-            Controls.Add(labelAdress);
-            Controls.Add(textBoxName);
-            Controls.Add(labelName);
-            Name = "FormShop";
-            Text = "Магазин";
-            Load += FormShop_Load;
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ((System.ComponentModel.ISupportInitialize)numericUpSnackMaxCount).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private Label labelName;
-        private TextBox textBoxName;
-        private TextBox textBoxAdress;
-        private Label labelAdress;
-        private Button buttonCancel;
-        private Button buttonSave;
-        private DataGridView dataGridView;
-        private Label label1;
-        private DateTimePicker dateTimeOpen;
-        private DataGridViewTextBoxColumn id;
-        private DataGridViewTextBoxColumn DinerName;
-        private DataGridViewTextBoxColumn Count;
-        private Label label2;
-        private NumericUpDown numericUpSnackMaxCount;
-    }
-}

Diner/Diner/FormShop.cs

@@ -1,130 +0,0 @@
-using DinerDataModels.Models;
-using Microsoft.Extensions.Logging;
-using DinerContracts.BindingModels;
-using DinerContracts.BusinessLogicsContracts;
-using DinerContracts.SearchModels;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace DinerView
-{
-    public partial class FormShop : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _logic;
-        private int? _id;
-        public int Id { set { _id = value; } }
-        private Dictionary<int, (ISnackModel, int)> _ShopSnacks;
-        private DateTime? _openingDate = null;
-
-        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-            _ShopSnacks = new Dictionary<int, (ISnackModel, int)>();
-        }
-
-        private void FormShop_Load(object sender, EventArgs e)
-        {
-            if (_id.HasValue)
-            {
-                _logger.LogInformation("Загрузка магазина");
-                try
-                {
-                    var view = _logic.ReadElement(new ShopSearchModel
-                    {
-                        Id = _id.Value
-                    });
-                    if (view != null)
-                    {
-                        textBoxName.Text = view.ShopName;
-                        textBoxAdress.Text = view.Adress;
-                        dateTimeOpen.Value = view.OpeningDate;
-                        numericUpSnackMaxCount.Value = view.SnackMaxCount;
-                        _ShopSnacks = view.ShopSnacks ?? new Dictionary<int, (ISnackModel, int)>();
-                        LoadData();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка загрузки магазина");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-
-        private void LoadData()
-        {
-            _logger.LogInformation("Загрузка изделий в магазине");
-            try
-            {
-                if (_ShopSnacks != null)
-                {
-                    dataGridView.Rows.Clear();
-                    foreach (var sr in _ShopSnacks)
-                    {
-                        dataGridView.Rows.Add(new object[] { sr.Key, sr.Value.Item1.SnackName, sr.Value.Item2 });
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки изделий магазина");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxName.Text))
-            {
-                MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (string.IsNullOrEmpty(textBoxAdress.Text))
-            {
-                MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Сохранение магазина");
-            try
-            {
-                var model = new ShopBindingModel
-                {
-                    Id = _id ?? 0,
-                    ShopName = textBoxName.Text,
-                    Adress = textBoxAdress.Text,
-                    OpeningDate = dateTimeOpen.Value,
-                    SnackMaxCount = (int)numericUpSnackMaxCount.Value
-                };
-                var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-                }
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка сохранения магазина");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

Diner/Diner/FormShop.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

Diner/Diner/FormShops.Designer.cs

@@ -1,130 +0,0 @@
-namespace DinerView
-{
-    partial class FormShops
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.ToolsPanel = new System.Windows.Forms.Panel();
-            this.buttonRef = new System.Windows.Forms.Button();
-            this.buttonDel = new System.Windows.Forms.Button();
-            this.buttonUpd = new System.Windows.Forms.Button();
-            this.buttonAdd = new System.Windows.Forms.Button();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.ToolsPanel.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // ToolsPanel
-            // 
-            this.ToolsPanel.Controls.Add(this.buttonRef);
-            this.ToolsPanel.Controls.Add(this.buttonDel);
-            this.ToolsPanel.Controls.Add(this.buttonUpd);
-            this.ToolsPanel.Controls.Add(this.buttonAdd);
-            this.ToolsPanel.Location = new System.Drawing.Point(608, 12);
-            this.ToolsPanel.Name = "ToolsPanel";
-            this.ToolsPanel.Size = new System.Drawing.Size(180, 426);
-            this.ToolsPanel.TabIndex = 3;
-            // 
-            // buttonRef
-            // 
-            this.buttonRef.Location = new System.Drawing.Point(31, 206);
-            this.buttonRef.Name = "buttonRef";
-            this.buttonRef.Size = new System.Drawing.Size(126, 36);
-            this.buttonRef.TabIndex = 3;
-            this.buttonRef.Text = "Обновить";
-            this.buttonRef.UseVisualStyleBackColor = true;
-            this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click);
-            // 
-            // buttonDel
-            // 
-            this.buttonDel.Location = new System.Drawing.Point(31, 142);
-            this.buttonDel.Name = "buttonDel";
-            this.buttonDel.Size = new System.Drawing.Size(126, 36);
-            this.buttonDel.TabIndex = 2;
-            this.buttonDel.Text = "Удалить";
-            this.buttonDel.UseVisualStyleBackColor = true;
-            this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click);
-            // 
-            // buttonUpd
-            // 
-            this.buttonUpd.Location = new System.Drawing.Point(31, 76);
-            this.buttonUpd.Name = "buttonUpd";
-            this.buttonUpd.Size = new System.Drawing.Size(126, 36);
-            this.buttonUpd.TabIndex = 1;
-            this.buttonUpd.Text = "Изменить";
-            this.buttonUpd.UseVisualStyleBackColor = true;
-            this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click);
-            // 
-            // buttonAdd
-            // 
-            this.buttonAdd.Location = new System.Drawing.Point(31, 16);
-            this.buttonAdd.Name = "buttonAdd";
-            this.buttonAdd.Size = new System.Drawing.Size(126, 36);
-            this.buttonAdd.TabIndex = 0;
-            this.buttonAdd.Text = "Добавить";
-            this.buttonAdd.UseVisualStyleBackColor = true;
-            this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.AllowUserToAddRows = false;
-            this.dataGridView.AllowUserToDeleteRows = false;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(12, 12);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.ReadOnly = true;
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(590, 426);
-            this.dataGridView.TabIndex = 2;
-            // 
-            // FormShops
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.ToolsPanel);
-            this.Controls.Add(this.dataGridView);
-            this.Name = "FormShops";
-            this.Text = "Магазины";
-            this.Load += new System.EventHandler(this.FormShops_Load);
-            this.ToolsPanel.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private Panel ToolsPanel;
-        private Button buttonRef;
-        private Button buttonDel;
-        private Button buttonUpd;
-        private Button buttonAdd;
-        private DataGridView dataGridView;
-    }
-}

Diner/Diner/FormSnack.cs

@@ -175,7 +175,8 @@ namespace Diner
                     Price = Convert.ToDouble(textBoxPrice.Text),
                     SnackComponents = _productComponents
                 };
-                var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
+                var operationResult = _id.HasValue ? _logic.Update(model) :
+               _logic.Create(model);
                 if (!operationResult)
                 {
                     throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");

Diner/Diner/Program.cs

@@ -1,14 +1,13 @@
 using DinerContracts.BusinessLogicsContracts;
 using DinerContracts.StoragesContracts;
-using DinerDatabaseImplement.Implements;
+using DinerDataBaseImplement.Implements;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
 using DinerBusinessLogic.BusinessLogics;
-using DinerBusinessLogic.Implements;
 using DinerBusinessLogic.OfficePackage;
-
-using DinerView;
+using DinerBusinessLogic.OfficePackage.Implements;
+using DinerListImplement.Implements;
 
 namespace Diner
 {
@@ -37,36 +36,30 @@ namespace Diner
                 option.SetMinimumLevel(LogLevel.Information);
                 option.AddNLog("nlog.config");
             });
-            services.AddTransient<IComponentStorage, ComponentStorage>();
-            services.AddTransient<IOrderStorage, OrderStorage>();
-            services.AddTransient<ISnackStorage, SnackStorage>();
-            services.AddTransient<IShopStorage, ShopStorage>();
-
+            services.AddTransient<IClientStorage, DinerDataBaseImplement.Implements.ClientStorage>();
+            services.AddTransient<IComponentStorage, DinerDataBaseImplement.Implements.ComponentStorage>();
+            services.AddTransient<IOrderStorage, DinerDataBaseImplement.Implements.OrderStorage>();
+            services.AddTransient<ISnackStorage, DinerDataBaseImplement.Implements.SnackStorage>();
+            services.AddTransient<IClientLogic, ClientLogic>();
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<ISnackLogic, SnackLogic>();
             services.AddTransient<IReportLogic, ReportLogic>();
-            services.AddTransient<IShopLogic, ShopLogic>();
 
-            services.AddTransient<AbstractSaveToWord, SaveToWord>();
             services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
+            services.AddTransient<AbstractSaveToWord, SaveToWord>();
             services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
 
+            services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
             services.AddTransient<FormCreateOrder>();
             services.AddTransient<FormSnack>();
             services.AddTransient<FormSnackComponent>();
             services.AddTransient<FormSnacks>();
-            services.AddTransient<FormShop>();
-            services.AddTransient<FormShops>();
-            services.AddTransient<FormCreateSupply>();
-            services.AddTransient<FormSellSnack>();
-            services.AddTransient<FormMain>();
             services.AddTransient<FormReportSnackComponents>();
             services.AddTransient<FormReportOrders>();
-            services.AddTransient<FormReportShop>();
-            services.AddTransient<FormReportGroupedOrders>();
+            services.AddTransient<FormClients>();
         }
     }
 }

Diner/Diner/ReportGroupedOrders.rdlc

@@ -1,441 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2016/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
-  <AutoRefresh>0</AutoRefresh>
-  <DataSources>
-    <DataSource Name="PrecastConcretePlantContractsViewModels">
-      <ConnectionProperties>
-        <DataProvider>System.Data.DataSet</DataProvider>
-        <ConnectString>/* Local Connection */</ConnectString>
-      </ConnectionProperties>
-      <rd:DataSourceID>20791c83-cee8-4a38-bbd0-245fc17cefb3</rd:DataSourceID>
-    </DataSource>
-  </DataSources>
-  <DataSets>
-    <DataSet Name="DataSetGroupedOrders">
-      <Query>
-        <DataSourceName>PrecastConcretePlantContractsViewModels</DataSourceName>
-        <CommandText>/* Local Query */</CommandText>
-      </Query>
-      <Fields>
-        <Field Name="Date">
-          <DataField>Date</DataField>
-          <rd:TypeName>System.DateTime</rd:TypeName>
-        </Field>
-        <Field Name="OrdersCount">
-          <DataField>OrdersCount</DataField>
-          <rd:TypeName>System.Int32</rd:TypeName>
-        </Field>
-        <Field Name="OrdersSum">
-          <DataField>OrdersSum</DataField>
-          <rd:TypeName>System.Decimal</rd:TypeName>
-        </Field>
-      </Fields>
-      <rd:DataSetInfo>
-        <rd:DataSetName>PrecastConcretePlantContracts.ViewModels</rd:DataSetName>
-        <rd:TableName>ReportGroupOrdersViewModel</rd:TableName>
-        <rd:ObjectDataSourceType>PrecastConcretePlantContracts.ViewModels.ReportGroupOrdersViewModel, PrecastConcretePlantContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</rd:ObjectDataSourceType>
-      </rd:DataSetInfo>
-    </DataSet>
-  </DataSets>
-  <ReportSections>
-    <ReportSection>
-      <Body>
-        <ReportItems>
-          <Textbox Name="TextboxTitle">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>Отчёт по заказам</Value>
-                    <Style />
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Center</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Height>0.6cm</Height>
-            <Width>16.51cm</Width>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <VerticalAlign>Middle</VerticalAlign>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-          <Textbox Name="ReportParameterPeriod">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>=Parameters!ReportParameterPeriod.Value</Value>
-                    <Style>
-                      <Format>d</Format>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Center</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <rd:DefaultName>ReportParameterPeriod</rd:DefaultName>
-            <Top>0.6cm</Top>
-            <Height>0.6cm</Height>
-            <Width>16.51cm</Width>
-            <ZIndex>1</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-          <Tablix Name="Tablix1">
-            <TablixBody>
-              <TablixColumns>
-                <TablixColumn>
-                  <Width>3.90406cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>3.97461cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>3.65711cm</Width>
-                </TablixColumn>
-              </TablixColumns>
-              <TablixRows>
-                <TablixRow>
-                  <Height>0.6cm</Height>
-                  <TablixCells>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="TextboxDate">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Дата создания</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="TextboxCount">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Количество заказов</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="TextboxSum">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Общая сумма заказов</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                  </TablixCells>
-                </TablixRow>
-                <TablixRow>
-                  <Height>0.6cm</Height>
-                  <TablixCells>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Date">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!Date.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Date</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="OrdersCount">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!OrdersCount.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>OrdersCount</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="OrdersSum">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!OrdersSum.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>OrdersSum</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                  </TablixCells>
-                </TablixRow>
-              </TablixRows>
-            </TablixBody>
-            <TablixColumnHierarchy>
-              <TablixMembers>
-                <TablixMember />
-                <TablixMember />
-                <TablixMember />
-              </TablixMembers>
-            </TablixColumnHierarchy>
-            <TablixRowHierarchy>
-              <TablixMembers>
-                <TablixMember>
-                  <KeepWithGroup>After</KeepWithGroup>
-                </TablixMember>
-                <TablixMember>
-                  <Group Name="Подробности" />
-                </TablixMember>
-              </TablixMembers>
-            </TablixRowHierarchy>
-            <DataSetName>DataSetGroupedOrders</DataSetName>
-            <Top>1.88242cm</Top>
-            <Left>2.68676cm</Left>
-            <Height>1.2cm</Height>
-            <Width>11.53578cm</Width>
-            <ZIndex>2</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-            </Style>
-          </Tablix>
-          <Textbox Name="TextboxResout">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>Итого:</Value>
-                    <Style />
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Right</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Top>3.29409cm</Top>
-            <Left>8.06542cm</Left>
-            <Height>0.6cm</Height>
-            <Width>2.5cm</Width>
-            <ZIndex>3</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-          <Textbox Name="TextboxFullSum">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>=Sum(Fields!OrdersSum.Value, "DataSetGroupedOrders")</Value>
-                    <Style>
-                      <Format>0.00;(0.00)</Format>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Right</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Top>3.29409cm</Top>
-            <Left>10.70653cm</Left>
-            <Height>0.6cm</Height>
-            <Width>3.48072cm</Width>
-            <ZIndex>4</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-        </ReportItems>
-        <Height>2in</Height>
-        <Style />
-      </Body>
-      <Width>6.5in</Width>
-      <Page>
-        <PageHeight>29.7cm</PageHeight>
-        <PageWidth>21cm</PageWidth>
-        <LeftMargin>2cm</LeftMargin>
-        <RightMargin>2cm</RightMargin>
-        <TopMargin>2cm</TopMargin>
-        <BottomMargin>2cm</BottomMargin>
-        <ColumnSpacing>0.13cm</ColumnSpacing>
-        <Style />
-      </Page>
-    </ReportSection>
-  </ReportSections>
-  <ReportParameters>
-    <ReportParameter Name="ReportParameterPeriod">
-      <DataType>String</DataType>
-      <Nullable>true</Nullable>
-      <Prompt>ReportParameter1</Prompt>
-    </ReportParameter>
-  </ReportParameters>
-  <ReportParametersLayout>
-    <GridLayoutDefinition>
-      <NumberOfColumns>4</NumberOfColumns>
-      <NumberOfRows>2</NumberOfRows>
-      <CellDefinitions>
-        <CellDefinition>
-          <ColumnIndex>0</ColumnIndex>
-          <RowIndex>0</RowIndex>
-          <ParameterName>ReportParameterPeriod</ParameterName>
-        </CellDefinition>
-      </CellDefinitions>
-    </GridLayoutDefinition>
-  </ReportParametersLayout>
-  <rd:ReportUnitType>Cm</rd:ReportUnitType>
-  <rd:ReportID>b5a8ad5e-1151-4687-8576-a5270295c079</rd:ReportID>
-</Report>

Diner/Diner/ReportOrders.rdlc

@@ -33,8 +33,8 @@
           <DataField>Sum</DataField>
           <rd:TypeName>System.Decimal</rd:TypeName>
         </Field>
-        <Field Name="Status">
-          <DataField>Status</DataField>
+        <Field Name="OrderStatus">
+          <DataField>OrderStatus</DataField>
           <rd:TypeName>System.String</rd:TypeName>
         </Field>
       </Fields>
@@ -49,15 +49,18 @@
     <ReportSection>
       <Body>
         <ReportItems>
-          <Textbox Name="TextboxTitle">
+          <Textbox Name="ReportParameterPeriod">
             <CanGrow>true</CanGrow>
             <KeepTogether>true</KeepTogether>
             <Paragraphs>
               <Paragraph>
                 <TextRuns>
                   <TextRun>
-                    <Value>Заказы</Value>
-                    <Style />
+                    <Value>=Parameters!ReportParameterPeriod.Value</Value>
+                    <Style>
+                      <FontSize>14pt</FontSize>
+                      <FontWeight>Bold</FontWeight>
+                    </Style>
                   </TextRun>
                 </TextRuns>
                 <Style>
@@ -65,8 +68,10 @@
                 </Style>
               </Paragraph>
             </Paragraphs>
-            <Height>0.6cm</Height>
-            <Width>16.51cm</Width>
+            <rd:DefaultName>ReportParameterPeriod</rd:DefaultName>
+            <Top>1cm</Top>
+            <Height>1cm</Height>
+            <Width>21cm</Width>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -78,15 +83,18 @@
               <PaddingBottom>2pt</PaddingBottom>
             </Style>
           </Textbox>
-          <Textbox Name="ReportParameterPeriod">
+          <Textbox Name="TextboxTitle">
             <CanGrow>true</CanGrow>
             <KeepTogether>true</KeepTogether>
             <Paragraphs>
               <Paragraph>
                 <TextRuns>
                   <TextRun>
-                    <Value>=Parameters!ReportParameterPeriod.Value</Value>
-                    <Style />
+                    <Value>Заказы</Value>
+                    <Style>
+                      <FontSize>16pt</FontSize>
+                      <FontWeight>Bold</FontWeight>
+                    </Style>
                   </TextRun>
                 </TextRuns>
                 <Style>
@@ -94,10 +102,8 @@
                 </Style>
               </Paragraph>
             </Paragraphs>
-            <rd:DefaultName>ReportParameterPeriod</rd:DefaultName>
-            <Top>0.6cm</Top>
-            <Height>0.6cm</Height>
-            <Width>16.51cm</Width>
+            <Height>1cm</Height>
+            <Width>21cm</Width>
             <ZIndex>1</ZIndex>
             <Style>
               <Border>
@@ -110,21 +116,21 @@
               <PaddingBottom>2pt</PaddingBottom>
             </Style>
           </Textbox>
-          <Tablix Name="Tablix">
+          <Tablix Name="Tablix1">
             <TablixBody>
               <TablixColumns>
-                <TablixColumn>
-                  <Width>2.60583cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>3.262cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>4.8495cm</Width>
-                </TablixColumn>
                 <TablixColumn>
                   <Width>2.5cm</Width>
                 </TablixColumn>
+                <TablixColumn>
+                  <Width>3.21438cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>8.23317cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>3.21438cm</Width>
+                </TablixColumn>
                 <TablixColumn>
                   <Width>2.5cm</Width>
                 </TablixColumn>
@@ -135,7 +141,7 @@
                   <TablixCells>
                     <TablixCell>
                       <CellContents>
-                        <Textbox Name="TextboxId">
+                        <Textbox Name="Textbox5">
                           <CanGrow>true</CanGrow>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
@@ -143,12 +149,15 @@
                               <TextRuns>
                                 <TextRun>
                                   <Value>Номер</Value>
-                                  <Style />
+                                  <Style>
+                                    <FontWeight>Bold</FontWeight>
+                                  </Style>
                                 </TextRun>
                               </TextRuns>
                               <Style />
                             </Paragraph>
                           </Paragraphs>
+                          <rd:DefaultName>Textbox5</rd:DefaultName>
                           <Style>
                             <Border>
                               <Color>LightGrey</Color>
@@ -164,7 +173,7 @@
                     </TablixCell>
                     <TablixCell>
                       <CellContents>
-                        <Textbox Name="TextboxDateCreate">
+                        <Textbox Name="Textbox1">
                           <CanGrow>true</CanGrow>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
@@ -172,12 +181,15 @@
                               <TextRuns>
                                 <TextRun>
                                   <Value>Дата создания</Value>
-                                  <Style />
+                                  <Style>
+                                    <FontWeight>Bold</FontWeight>
+                                  </Style>
                                 </TextRun>
                               </TextRuns>
                               <Style />
                             </Paragraph>
                           </Paragraphs>
+                          <rd:DefaultName>Textbox1</rd:DefaultName>
                           <Style>
                             <Border>
                               <Color>LightGrey</Color>
@@ -193,20 +205,55 @@
                     </TablixCell>
                     <TablixCell>
                       <CellContents>
-                        <Textbox Name="TextboxPizzaName">
+                        <Textbox Name="Textbox3">
                           <CanGrow>true</CanGrow>
                           <KeepTogether>true</KeepTogether>
                           <Paragraphs>
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value>Закуска</Value>
-                                  <Style />
+                                  <Value>Изделие</Value>
+                                  <Style>
+                                    <FontWeight>Bold</FontWeight>
+                                  </Style>
                                 </TextRun>
                               </TextRuns>
                               <Style />
                             </Paragraph>
                           </Paragraphs>
+                          <rd:DefaultName>Textbox3</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="Textbox7">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>Сумма</Value>
+                                  <Style>
+                                    <FontWeight>Bold</FontWeight>
+                                  </Style>
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Textbox7</rd:DefaultName>
                           <Style>
                             <Border>
                               <Color>LightGrey</Color>
@@ -229,8 +276,10 @@
                             <Paragraph>
                               <TextRuns>
                                 <TextRun>
-                                  <Value>Статус</Value>
-                                  <Style />
+                                  <Value>Статус заказа</Value>
+                                  <Style>
+                                    <FontWeight>Bold</FontWeight>
+                                  </Style>
                                 </TextRun>
                               </TextRuns>
                               <Style />
@@ -250,35 +299,6 @@
                         </Textbox>
                       </CellContents>
                     </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="TextboxSum">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Сумма</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
@@ -324,7 +344,9 @@
                               <TextRuns>
                                 <TextRun>
                                   <Value>=Fields!DateCreate.Value</Value>
-                                  <Style />
+                                  <Style>
+                                    <Format>d</Format>
+                                  </Style>
                                 </TextRun>
                               </TextRuns>
                               <Style />
@@ -374,36 +396,6 @@
                         </Textbox>
                       </CellContents>
                     </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Status1">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!Status.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Status1</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
                     <TablixCell>
                       <CellContents>
                         <Textbox Name="Sum">
@@ -434,6 +426,36 @@
                         </Textbox>
                       </CellContents>
                     </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="OrderStatus">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!OrderStatus.Value</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>OrderStatus</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
                   </TablixCells>
                 </TablixRow>
               </TablixRows>
@@ -458,18 +480,18 @@
               </TablixMembers>
             </TablixRowHierarchy>
             <DataSetName>DataSetOrders</DataSetName>
-            <Top>1.9177cm</Top>
-            <Left>0.79267cm</Left>
+            <Top>2.48391cm</Top>
+            <Left>0.55245cm</Left>
             <Height>1.2cm</Height>
-            <Width>15.71733cm</Width>
+            <Width>19.66193cm</Width>
             <ZIndex>2</ZIndex>
             <Style>
               <Border>
-                <Style>None</Style>
+                <Style>Double</Style>
               </Border>
             </Style>
           </Tablix>
-          <Textbox Name="TextboxResout">
+          <Textbox Name="TextboxTotalSum">
             <CanGrow>true</CanGrow>
             <KeepTogether>true</KeepTogether>
             <Paragraphs>
@@ -477,7 +499,9 @@
                 <TextRuns>
                   <TextRun>
                     <Value>Итого:</Value>
-                    <Style />
+                    <Style>
+                      <FontWeight>Bold</FontWeight>
+                    </Style>
                   </TextRun>
                 </TextRuns>
                 <Style>
@@ -485,8 +509,8 @@
                 </Style>
               </Paragraph>
             </Paragraphs>
-            <Top>3.46287cm</Top>
-            <Left>11.51cm</Left>
+            <Top>4cm</Top>
+            <Left>15.21438cm</Left>
             <Height>0.6cm</Height>
             <Width>2.5cm</Width>
             <ZIndex>3</ZIndex>
@@ -500,7 +524,7 @@
               <PaddingBottom>2pt</PaddingBottom>
             </Style>
           </Textbox>
-          <Textbox Name="Textbox10">
+          <Textbox Name="SumTotal">
             <CanGrow>true</CanGrow>
             <KeepTogether>true</KeepTogether>
             <Paragraphs>
@@ -508,15 +532,18 @@
                 <TextRuns>
                   <TextRun>
                     <Value>=Sum(Fields!Sum.Value, "DataSetOrders")</Value>
-                    <Style />
+                    <Style>
+                      <FontWeight>Bold</FontWeight>
+                    </Style>
                   </TextRun>
                 </TextRuns>
-                <Style />
+                <Style>
+                  <TextAlign>Right</TextAlign>
+                </Style>
               </Paragraph>
             </Paragraphs>
-            <rd:DefaultName>Textbox10</rd:DefaultName>
-            <Top>3.46287cm</Top>
-            <Left>14.01cm</Left>
+            <Top>4cm</Top>
+            <Left>17.71438cm</Left>
             <Height>0.6cm</Height>
             <Width>2.5cm</Width>
             <ZIndex>4</ZIndex>
@@ -531,10 +558,10 @@
             </Style>
           </Textbox>
         </ReportItems>
-        <Height>2in</Height>
+        <Height>5.72875cm</Height>
         <Style />
       </Body>
-      <Width>7.48425in</Width>
+      <Width>21cm</Width>
       <Page>
         <PageHeight>29.7cm</PageHeight>
         <PageWidth>21cm</PageWidth>
@@ -568,5 +595,5 @@
     </GridLayoutDefinition>
   </ReportParametersLayout>
   <rd:ReportUnitType>Cm</rd:ReportUnitType>
-  <rd:ReportID>0c9e94bc-df40-42bd-a526-01713dd3057f</rd:ReportID>
+  <rd:ReportID>2de0031a-4d17-449d-922d-d9fc54572312</rd:ReportID>
 </Report>

Diner/DinerClientApp/APIClient.cs

@@ -0,0 +1,51 @@
+using DinerContracts.ViewModels;
+using Newtonsoft.Json;
+using System.Net.Http.Headers;
+using System.Text;
+
+namespace DinerClientApp
+{
+    public class APIClient
+    {
+        private static readonly HttpClient _client = new();
+
+        public static ClientViewModel? Client { get; set; } = null;
+
+        public static void Connect(IConfiguration configuration)
+        {
+            _client.BaseAddress = new Uri(configuration["IPAddress"]);
+            _client.DefaultRequestHeaders.Accept.Clear();
+            _client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+        }
+
+        public static T? GetRequest<T>(string requestUrl)
+        {
+            var response = _client.GetAsync(requestUrl);
+            var result = response.Result.Content.ReadAsStringAsync().Result;
+
+            if (response.Result.IsSuccessStatusCode)
+            {
+                return JsonConvert.DeserializeObject<T>(result);
+            }
+            else
+            {
+                throw new Exception(result);
+            }
+        }
+
+        public static void PostRequest<T>(string requestUrl, T model)
+        {
+			var json = JsonConvert.SerializeObject(model);
+			var data = new StringContent(json, Encoding.UTF8, "application/json");
+
+			var response = _client.PostAsync(requestUrl, data);
+
+			var result = response.Result.Content.ReadAsStringAsync().Result;
+
+			if (!response.Result.IsSuccessStatusCode)
+			{
+				throw new Exception(result);
+			}
+		}
+    }
+}