chubykina_polina/PIbd-22_Chubykina_P.P._Confectionery
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-22 Chubykina P.P. LabWork_06 #9

Closed
chubykina_polina wants to merge 9 commits from LabWork_06 into LabWork_05
pull from: LabWork_06
merge into: chubykina_polina:LabWork_05
Conversation 0 Commits 9 Files Changed 46 +7 -3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d1973efdce - Show all commits

4
Confectionery/ConfectioneryDatabaseImplement/Implements/OrderStorage.cs
View File

@ -78,7 +78,7 @@ namespace ConfectioneryDatabaseImplement.Implements
public OrderViewModel? GetElement(OrderSearchModel model)
{
if (!model.Id.HasValue)
if (!model.Id.HasValue && !model.ImplementerId.HasValue)
{
return null;
}
@ -125,7 +125,7 @@ namespace ConfectioneryDatabaseImplement.Implements
return context.Orders
.Include(x => x.Pastry)
.Include(x => x.Client)
.Include(x => x.Implementer)
.Include(x => x.Implementer)
.FirstOrDefault(x => x.Id == model.Id)
?.GetViewModel;
}

6
Confectionery/ConfectioneryDatabaseImplement/Models/Order.cs
View File

@ -37,6 +37,7 @@ namespace ConfectioneryDatabaseImplement.Models
Id = model.Id,
PastryId = model.PastryId,
ClientId = model.ClientId,
ImplementerId = model.ImplementerId,
Count = model.Count,
Sum = model.Sum,
Status = model.Status,
@ -53,6 +54,7 @@ namespace ConfectioneryDatabaseImplement.Models
}
Status = model.Status;
DateImplement = model.DateImplement;
ImplementerId = model.ImplementerId;
}
public OrderViewModel GetViewModel => new()
@ -60,13 +62,15 @@ namespace ConfectioneryDatabaseImplement.Models
Id = Id,
PastryId = PastryId,
ClientId = ClientId,
ImplementerId = ImplementerId,
Count = Count,
Sum = Sum,
Status = Status,
DateCreate = DateCreate,
DateImplement = DateImplement,
PastryName = Pastry.PastryName,
ClientFIO = Client.ClientFIO
ClientFIO = Client.ClientFIO,
ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty
};
}
}