AnnZhimol/PIbd-22_Zhimolostnova_A.V._SoftwareInstallation
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lab5

Browse Source
This commit is contained in:
AnnZhimol 2023-03-27 22:49:48 +04:00
parent d4b7ee2b1f
commit d3c3940083
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SoftwareInstallation/SoftwareInstallation/FormMain.cs
View File

@ -93,7 +93,7 @@ namespace SoftwareInstallationView
try try
{ {
var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel
{ {
Id = id Id = id
}); });
@ -122,7 +122,7 @@ namespace SoftwareInstallationView
try try
{ {
var operationResult = _orderLogic.FinishOrder(new OrderBindingModel var operationResult = _orderLogic.FinishOrder(new OrderBindingModel
{ {
Id = id Id = id
}); });
@ -151,7 +151,7 @@ namespace SoftwareInstallationView
try try
{ {
var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel
{ {
Id = id Id = id
}); });

2
SoftwareInstallation/SoftwareInstallationClientApp/Views/Home/Index.cshtml
View File

@ -29,7 +29,7 @@
Номер Номер
</th> </th>
<th> <th>
Изделие Название изделия
</th> </th>
<th> <th>
Дата создания Дата создания

31
SoftwareInstallation/SoftwareInstallationDataBaseImplement/Models/Order.cs
View File

@ -66,18 +66,25 @@ namespace SoftwareInstallationDataBaseImplement.Models
DateImplement = model.DateImplement; DateImplement = model.DateImplement;
} }
public OrderViewModel GetViewModel => new() public OrderViewModel GetViewModel
{ {
Id = Id, get
PackageId = PackageId, {
ClientId = ClientId, using var context = new SoftwareInstallationDataBase();
ClientFIO = Client.ClientFIO, return new OrderViewModel
PackageName = PackageName, {
Count = Count, Id = Id,
Sum = Sum, PackageId = PackageId,
Status = Status, ClientId = ClientId,
DateCreate = DateCreate, ClientFIO = context.Clients.FirstOrDefault(x => x.Id == ClientId)?.ClientFIO ?? string.Empty,
DateImplement = DateImplement PackageName = context.Packages.FirstOrDefault(x => x.Id == PackageId)?.PackageName ?? string.Empty,
}; Count = Count,
Sum = Sum,
Status = Status,
DateCreate = DateCreate,
DateImplement = DateImplement
};
}
}
} }
} }