d.agliullov/ISEbd-21_Agliullov.D.A._Confectionery
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Lab5_Base' into Lab6_Base

Browse Source
This commit is contained in:
Данияр Аглиуллов 2023-03-13 23:03:48 +04:00
commit 63e641cd62
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ConfectionaryListImplement/ClientStorage.cs
View File

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

1
ConfectioneryDatabaseImplement/Order.cs
View File

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