diff --git a/SecuritySystem/SecuritySystemContracts/BindingModels/OrderBindingModel.cs b/SecuritySystem/SecuritySystemContracts/BindingModels/OrderBindingModel.cs index 3ff6f27..5bf8408 100644 --- a/SecuritySystem/SecuritySystemContracts/BindingModels/OrderBindingModel.cs +++ b/SecuritySystem/SecuritySystemContracts/BindingModels/OrderBindingModel.cs @@ -7,6 +7,7 @@ namespace SecuritySystemContracts.BindingModels { public int Id { get; set; } public int SecureId { get; set; } + public int ClientId { get; set; } public int Count { get; set; } public double Sum { get; set; } public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; diff --git a/SecuritySystem/SecuritySystemContracts/ViewModels/OrderViewModel.cs b/SecuritySystem/SecuritySystemContracts/ViewModels/OrderViewModel.cs index 1a300c0..70dbb0a 100644 --- a/SecuritySystem/SecuritySystemContracts/ViewModels/OrderViewModel.cs +++ b/SecuritySystem/SecuritySystemContracts/ViewModels/OrderViewModel.cs @@ -8,7 +8,10 @@ namespace SecuritySystemContracts.ViewModels { [DisplayName("Номер")] public int Id { get; set; } + public int ClientId { get; set; } public int SecureId { get; set; } + [DisplayName("ФИО клиента")] + public string ClientFIO { get; set; } [DisplayName("Изделие")] public string SecureName { get; set; } = string.Empty; [DisplayName("Количество")] diff --git a/SecuritySystem/SecuritySystemDataModels/Models/IOrderModel.cs b/SecuritySystem/SecuritySystemDataModels/Models/IOrderModel.cs index c6fd126..89eaa62 100644 --- a/SecuritySystem/SecuritySystemDataModels/Models/IOrderModel.cs +++ b/SecuritySystem/SecuritySystemDataModels/Models/IOrderModel.cs @@ -5,6 +5,7 @@ namespace SecuritySystemDataModels.Models public interface IOrderModel : IId { int SecureId { get; } + int ClientId { get; } int Count { get; } double Sum { get; } OrderStatus Status { get; } diff --git a/SecuritySystem/SecuritySystemDatabaseImplement/Models/Order.cs b/SecuritySystem/SecuritySystemDatabaseImplement/Models/Order.cs index 326ce18..3f334d3 100644 --- a/SecuritySystem/SecuritySystemDatabaseImplement/Models/Order.cs +++ b/SecuritySystem/SecuritySystemDatabaseImplement/Models/Order.cs @@ -11,7 +11,8 @@ namespace SecuritySystemDatabaseImplement.Models public int Id { get; private set; } [Required] public int SecureId { get; private set; } - + [Required] + public int ClientId { get; private set; } [Required] public int Count { get; private set; } [Required] @@ -20,10 +21,9 @@ namespace SecuritySystemDatabaseImplement.Models public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; [Required] public DateTime DateCreate { get; private set; } = DateTime.Now; - public DateTime? DateImplement { get; private set; } public virtual Secure Secure { get; private set; } - + public virtual Client Client { get; private set; } public static Order? Create(OrderBindingModel? model) { if (model == null) @@ -33,6 +33,7 @@ namespace SecuritySystemDatabaseImplement.Models return new Order { SecureId = model.SecureId, + ClientId = model.ClientId, Count = model.Count, Sum = model.Sum, Status = model.Status, @@ -55,13 +56,15 @@ namespace SecuritySystemDatabaseImplement.Models public OrderViewModel GetViewModel => new() { SecureId = SecureId, + ClientId = ClientId, Count = Count, Sum = Sum, DateCreate = DateCreate, DateImplement = DateImplement, Id = Id, Status = Status, - SecureName = Secure.SecureName + SecureName = Secure.SecureName, + ClientFIO = Client.ClientFIO }; } }