diff --git a/SoftwareInstallation/SoftwareInstallation/FormMain.cs b/SoftwareInstallation/SoftwareInstallation/FormMain.cs
index 6e85782..741aead 100644
--- a/SoftwareInstallation/SoftwareInstallation/FormMain.cs
+++ b/SoftwareInstallation/SoftwareInstallation/FormMain.cs
@@ -93,7 +93,7 @@ namespace SoftwareInstallationView
try
{
var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel
- {
+ {
Id = id
});
@@ -122,7 +122,7 @@ namespace SoftwareInstallationView
try
{
var operationResult = _orderLogic.FinishOrder(new OrderBindingModel
- {
+ {
Id = id
});
@@ -151,7 +151,7 @@ namespace SoftwareInstallationView
try
{
var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel
- {
+ {
Id = id
});
diff --git a/SoftwareInstallation/SoftwareInstallationClientApp/Views/Home/Index.cshtml b/SoftwareInstallation/SoftwareInstallationClientApp/Views/Home/Index.cshtml
index 6bccf58..b4dd104 100644
--- a/SoftwareInstallation/SoftwareInstallationClientApp/Views/Home/Index.cshtml
+++ b/SoftwareInstallation/SoftwareInstallationClientApp/Views/Home/Index.cshtml
@@ -29,7 +29,7 @@
Номер
- Изделие
+ Название изделия
|
Дата создания
diff --git a/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Models/Order.cs b/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Models/Order.cs
index 8a5a370..e28f528 100644
--- a/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Models/Order.cs
+++ b/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Models/Order.cs
@@ -66,18 +66,25 @@ namespace SoftwareInstallationDataBaseImplement.Models
DateImplement = model.DateImplement;
}
- public OrderViewModel GetViewModel => new()
+ public OrderViewModel GetViewModel
{
- Id = Id,
- PackageId = PackageId,
- ClientId = ClientId,
- ClientFIO = Client.ClientFIO,
- PackageName = PackageName,
- Count = Count,
- Sum = Sum,
- Status = Status,
- DateCreate = DateCreate,
- DateImplement = DateImplement
- };
+ get
+ {
+ using var context = new SoftwareInstallationDataBase();
+ return new OrderViewModel
+ {
+ Id = Id,
+ PackageId = PackageId,
+ ClientId = ClientId,
+ ClientFIO = context.Clients.FirstOrDefault(x => x.Id == ClientId)?.ClientFIO ?? string.Empty,
+ PackageName = context.Packages.FirstOrDefault(x => x.Id == PackageId)?.PackageName ?? string.Empty,
+ Count = Count,
+ Sum = Sum,
+ Status = Status,
+ DateCreate = DateCreate,
+ DateImplement = DateImplement
+ };
+ }
+ }
}
}
|