AnnaLioness/PIbd21.LyovushkinaA.A.LawFirm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ПИбд-21, Лёвушкина Анна, лаб6 сложная #21

Closed
AnnaLioness wants to merge 6 commits from лаб6_сложная into лаб5_сложная
pull from: лаб6_сложная
merge into: AnnaLioness:лаб5_сложная
Conversation 0 Commits 6 Files Changed 45 -33
2 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a068fda7c7 - Show all commits

13
LawFirm/AbstractLawFirmDatabaseImplement/Implements/OrderStorage.cs
View File

@ -16,19 +16,6 @@ namespace AbstractLawFirmDatabaseImplement.Implements
{ {
public OrderViewModel? GetElement(OrderSearchModel model) public OrderViewModel? GetElement(OrderSearchModel model)
{ {
/*if (!model.Id.HasValue)
{
return null;
}
using var context = new AbstractLawFirmDatabase();
return context.Orders
.Include(x => x.Document)
.Include(x => x.Client)
.Include(x => x.Implementer)
.FirstOrDefault(x =>
(model.Status == null || model.Status != null && model.Status.Contains(x.Status)) &&
model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId ||
model.Id.HasValue && x.Id == model.Id)?.GetViewModel;*/
if (!model.Id.HasValue && (!model.ImplementerId.HasValue || !model.Status.HasValue)) if (!model.Id.HasValue && (!model.ImplementerId.HasValue || !model.Status.HasValue))
{ {
return null; return null;

20
LawFirm/AbstractLawFirmListImplement/Implements/OrderStorage.cs
View File

@ -75,26 +75,6 @@ namespace AbstractLawFirmListImplement.Implements
} }
public OrderViewModel? GetElement(OrderSearchModel model) public OrderViewModel? GetElement(OrderSearchModel model)
{ {
/*if (!model.Id.HasValue)
{
return null;
}
foreach (var order in _source.Orders)
{
if (model.Id.HasValue && order.Id == model.Id)
{
return order.GetViewModel;
}
else if (model.ImplementerId.HasValue && model.Status != null && order.ImplementerId == model.ImplementerId && model.Status.Contains(order.Status))
{
return GetViewModel(order);
}
else if (model.ImplementerId.HasValue && model.ImplementerId == order.ImplementerId)
{
return GetViewModel(order);
}
}
return null;*/
if (!model.Id.HasValue) if (!model.Id.HasValue)
{ {
return null; return null;