Zhelovanov_Dmitrii/Pibd-23_Zhelovanov_D.Y._BlacksmithWorkshop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR Conflict LabWork05 #6

Merged
Zhelovanov_Dmitrii merged 3 commits from LabWork04 into LabWork05 2023-05-17 12:03:41 +04:00
Conversation 0 Commits 3 Files Changed 1 +11 -2
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c1df34a0ee - Show all commits

13
BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/OrderStorage.cs
View File

@ -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;
}
}
}