From cef5209f67b2ad3dbd06f0628c65f49786135604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9?= Date: Sat, 1 Apr 2023 21:39:41 +0400 Subject: [PATCH] fix --- .../HardwareShopContracts/ViewModels/BuildViewModel.cs | 4 ++-- .../HardwareShopContracts/ViewModels/CommentViewModel.cs | 4 ++-- .../HardwareShopContracts/ViewModels/PurchaseViewModel.cs | 4 ++-- .../HardwareShopDatabaseImplement/Models/Worker/Build.cs | 2 +- .../HardwareShopDatabaseImplement/Models/Worker/Comment.cs | 2 +- .../HardwareShopDatabaseImplement/Models/Worker/Purchase.cs | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/HardwareShop/HardwareShopContracts/ViewModels/BuildViewModel.cs b/HardwareShop/HardwareShopContracts/ViewModels/BuildViewModel.cs index 8dcd7c2..68f0c74 100644 --- a/HardwareShop/HardwareShopContracts/ViewModels/BuildViewModel.cs +++ b/HardwareShop/HardwareShopContracts/ViewModels/BuildViewModel.cs @@ -12,8 +12,8 @@ namespace HardwareShopContracts.ViewModels [DisplayName("Название компонента")] public string BuildName { get; set; } = string.Empty; - [DisplayName("Клиент")] - public string UserEmail { get; set; } = string.Empty; + [DisplayName("Логин работника")] + public string UserLogin { get; set; } = string.Empty; public int UserId { get; set; } diff --git a/HardwareShop/HardwareShopContracts/ViewModels/CommentViewModel.cs b/HardwareShop/HardwareShopContracts/ViewModels/CommentViewModel.cs index 06e1526..15343a3 100644 --- a/HardwareShop/HardwareShopContracts/ViewModels/CommentViewModel.cs +++ b/HardwareShop/HardwareShopContracts/ViewModels/CommentViewModel.cs @@ -17,7 +17,7 @@ namespace HardwareShopContracts.ViewModels public int UserId { get; set; } - [DisplayName("Email клиента")] - public string UserEmail { get; set; } = string.Empty; + [DisplayName("Логин работника")] + public string UserLogin { get; set; } = string.Empty; } } diff --git a/HardwareShop/HardwareShopContracts/ViewModels/PurchaseViewModel.cs b/HardwareShop/HardwareShopContracts/ViewModels/PurchaseViewModel.cs index 7e31133..2a6967a 100644 --- a/HardwareShop/HardwareShopContracts/ViewModels/PurchaseViewModel.cs +++ b/HardwareShop/HardwareShopContracts/ViewModels/PurchaseViewModel.cs @@ -18,8 +18,8 @@ namespace HardwareShopContracts.ViewModels public int UserId { get; set; } - [DisplayName("Email клиента")] - public string UserEmail { get; set; } = string.Empty; + [DisplayName("Логин работника")] + public string UserLogin { get; set; } = string.Empty; public Dictionary? PurchaseBuilds { get; set; } diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Build.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Build.cs index 45e3ac5..9132609 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Build.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Build.cs @@ -75,7 +75,7 @@ namespace HardwareShopDatabaseImplement.Models.Worker Id = Id, BuildName = BuildName, Price = Price, - UserEmail = User.Email, + UserLogin = User.Login, UserId = UserId, BuildComponents = BuildComponents }; diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Comment.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Comment.cs index d4e0854..64b74b6 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Comment.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Comment.cs @@ -52,7 +52,7 @@ namespace HardwareShopDatabaseImplement.Models.Worker BuildId = BuildId, BuildName = Build.BuildName, UserId = UserId, - UserEmail = User.Email, + UserLogin = User.Login, }; } } diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Purchase.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Purchase.cs index 856450f..4c573fc 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Purchase.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/Models/Worker/Purchase.cs @@ -96,7 +96,7 @@ namespace HardwareShopDatabaseImplement.Models.Worker PurchaseStatus = PurchaseStatus, DatePurchase = DatePurchase, UserId = UserId, - UserEmail = User.Email, + UserLogin = User.Login, PurchaseBuilds = PurchaseBuilds, PurchaseGoods = PurchaseGoods };