Merge branch 'Lab5_Base' into Lab6_Base

This commit is contained in:
Данияр Аглиуллов 2023-03-13 23:03:48 +04:00
commit 63e641cd62
2 changed files with 10 additions and 2 deletions

View File

@ -66,8 +66,15 @@ namespace ConfectioneryListImplement
public ClientViewModel? Insert(ClientBindingModel model)
{
model.Id = _source.Clients.Count > 0 ? _source.Clients.Max(x => x.Id) + 1 : 1;
var res = Client.Create(model);
model.Id = 1;
foreach (var component in _source.Components)
{
if (model.Id <= component.Id)
{
model.Id = component.Id + 1;
}
}
var res = Client.Create(model);
if (res != null)
{
_source.Clients.Add(res);

View File

@ -89,6 +89,7 @@ namespace ConfectioneryDatabaseImplement.Models
return new()
{
PastryName = context.Pastries.FirstOrDefault(x => x.Id == PastryId)?.PastryName ?? string.Empty,
ClientId = ClientId,
ClientFIO = Client?.ClientFIO ?? string.Empty,
ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty,
PastryId = PastryId,