diff --git a/ComputerStoreContracts/ViewModels/PCViewModel.cs b/ComputerStoreContracts/ViewModels/PCViewModel.cs index 99555bf..17f350b 100644 --- a/ComputerStoreContracts/ViewModels/PCViewModel.cs +++ b/ComputerStoreContracts/ViewModels/PCViewModel.cs @@ -18,9 +18,11 @@ namespace ComputerStoreContracts.ViewModels [DisplayName("PC's price")] public double Price { get; set; } - [DisplayName("Employee ID")] public int EmployeeID { get; set; } + [DisplayName("Employee's username")] + public string EmployeeUsername { get; set; } = string.Empty; + [DisplayName("Request ID")] public int RequestID { get; set; } public Dictionary PCComponents { get; set; } = new(); diff --git a/ComputerStoreContracts/ViewModels/ProductViewModel.cs b/ComputerStoreContracts/ViewModels/ProductViewModel.cs index 3574266..720c0b4 100644 --- a/ComputerStoreContracts/ViewModels/ProductViewModel.cs +++ b/ComputerStoreContracts/ViewModels/ProductViewModel.cs @@ -18,9 +18,11 @@ namespace ComputerStoreContracts.ViewModels [DisplayName("Product's price")] public double Price { get; set; } - [DisplayName("Employee ID")] public int EmployeeID { get; set; } + [DisplayName("Employee's username")] + public string EmployeeUsername { get; set; } = string.Empty; + [DisplayName("Consignment ID")] public int ConsignmentID { get; set; } diff --git a/ComputerStoreDatabaseImplement/Models/PC.cs b/ComputerStoreDatabaseImplement/Models/PC.cs index e7698cd..62fb725 100644 --- a/ComputerStoreDatabaseImplement/Models/PC.cs +++ b/ComputerStoreDatabaseImplement/Models/PC.cs @@ -77,6 +77,7 @@ namespace ComputerStoreDatabaseImplement.Models Name = Name, Price = Price, EmployeeID = EmployeeID, + EmployeeUsername = Employee.Username, RequestID = RequestID, PCComponents = PCComponents }; diff --git a/ComputerStoreDatabaseImplement/Models/Product.cs b/ComputerStoreDatabaseImplement/Models/Product.cs index d5a6267..ed957fc 100644 --- a/ComputerStoreDatabaseImplement/Models/Product.cs +++ b/ComputerStoreDatabaseImplement/Models/Product.cs @@ -76,6 +76,7 @@ namespace ComputerStoreDatabaseImplement.Models Name = Name, Price = Price, EmployeeID = EmployeeID, + EmployeeUsername = Employee.Username, ConsignmentID = ConsignmentID, ProductComponents = ProductComponents };