diff --git a/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/OrderStorage.cs b/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/OrderStorage.cs index 0113bc8..86d4410 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/OrderStorage.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/OrderStorage.cs @@ -59,7 +59,7 @@ namespace BlacksmithWorkshopListImplement.Implements foreach (var order in _source.Orders) { - if (order.Id == model.Id || model.DateFrom <= order.DateCreate && order.DateCreate <= model.DateTo) + if (order.Id == model.Id || model.DateFrom <= order.DateCreate && order.DateCreate <= model.DateTo || order.ClientId == model.ClientId) { result.Add(order.GetViewModel); } @@ -119,7 +119,16 @@ namespace BlacksmithWorkshopListImplement.Implements orderViewModel.ManufactureName = manufacture.ManufactureName; } } - return orderViewModel; + foreach (var client in _source.Clients) + { + if (client.Id == order.ClientId) + { + orderViewModel.ClientFIO = client.ClientFIO; + } + } + return orderViewModel; + + } } }