From b7f07f0859db7b39b07d04d396d46fac8f7d12be Mon Sep 17 00:00:00 2001 From: FLARJ <122087628+FLARJ@users.noreply.github.com> Date: Fri, 7 Apr 2023 16:43:56 +0400 Subject: [PATCH] fix --- .../BindingModels/ManagerBindingModel.cs | 2 +- .../SearchModels/HeadsetSearchModel.cs | 1 + .../FurnitureContracts/ViewModel/ManagerViewModel.cs | 1 - .../Implements/HeadsetStorage.cs | 12 ++++++------ .../Models/Manager.cs | 5 ----- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/FurnitureFactory/FurnitureContracts/BindingModels/ManagerBindingModel.cs b/FurnitureFactory/FurnitureContracts/BindingModels/ManagerBindingModel.cs index adfdfd0..4f5e3e4 100644 --- a/FurnitureFactory/FurnitureContracts/BindingModels/ManagerBindingModel.cs +++ b/FurnitureFactory/FurnitureContracts/BindingModels/ManagerBindingModel.cs @@ -8,7 +8,7 @@ namespace FurnitureContracts.BindingModels public string Login { get; set; } = string.Empty; public string Password { get; set; } = string.Empty; public string Email { get; set; } = string.Empty; - public string Role { get; set; } = string.Empty; + //public string Role { get; set; } = string.Empty; public int Id { get; set; } } } diff --git a/FurnitureFactory/FurnitureContracts/SearchModels/HeadsetSearchModel.cs b/FurnitureFactory/FurnitureContracts/SearchModels/HeadsetSearchModel.cs index ed5445d..e3c7e9c 100644 --- a/FurnitureFactory/FurnitureContracts/SearchModels/HeadsetSearchModel.cs +++ b/FurnitureFactory/FurnitureContracts/SearchModels/HeadsetSearchModel.cs @@ -9,5 +9,6 @@ namespace FurnitureContracts.SearchModels public class HeadsetSearchModel { public int? Id { get; set; } + public string? Size { get; set; } } } diff --git a/FurnitureFactory/FurnitureContracts/ViewModel/ManagerViewModel.cs b/FurnitureFactory/FurnitureContracts/ViewModel/ManagerViewModel.cs index f678e9f..0049928 100644 --- a/FurnitureFactory/FurnitureContracts/ViewModel/ManagerViewModel.cs +++ b/FurnitureFactory/FurnitureContracts/ViewModel/ManagerViewModel.cs @@ -12,7 +12,6 @@ namespace FurnitureContracts.ViewModel [DisplayName("Логин")] public string Login { get; set; } = string.Empty; public string Password { get; set; } = string.Empty; - public string Role { get; set; } = string.Empty; public string Email { get; set; } = string.Empty; } } diff --git a/FurnitureFactory/FurnitureFactoryDataBaseImplement/Implements/HeadsetStorage.cs b/FurnitureFactory/FurnitureFactoryDataBaseImplement/Implements/HeadsetStorage.cs index e4839b1..fc5bca5 100644 --- a/FurnitureFactory/FurnitureFactoryDataBaseImplement/Implements/HeadsetStorage.cs +++ b/FurnitureFactory/FurnitureFactoryDataBaseImplement/Implements/HeadsetStorage.cs @@ -18,11 +18,11 @@ namespace FurnitureFactoryDataBaseImplements.Implements { public class HeadsetStorage : IHeadsetStorage { - int Cost { get; } - string Size { get; } - public Dictionary HeadsetSalesSalons { get; } - int ManagerId { get; } - int HeadsetModuleId { get; } + //int Cost { get; } + //string Size { get; } + //public Dictionary HeadsetSalesSalons { get; } + //int ManagerId { get; } + //int HeadsetModuleId { get; } @@ -72,7 +72,7 @@ namespace FurnitureFactoryDataBaseImplements.Implements public HeadsetViewModel? GetElement(HeadsetSearchModel model) { - if ((string.IsNullOrEmpty(model.Title) && !model.Id.HasValue) || !model.ManagerId.HasValue) + if ((string.IsNullOrEmpty(model.Size) && !model.Id.HasValue) || !model.ManagerId.HasValue) { return null; } diff --git a/FurnitureFactory/FurnitureFactoryDataBaseImplement/Models/Manager.cs b/FurnitureFactory/FurnitureFactoryDataBaseImplement/Models/Manager.cs index 007c784..8a7a85a 100644 --- a/FurnitureFactory/FurnitureFactoryDataBaseImplement/Models/Manager.cs +++ b/FurnitureFactory/FurnitureFactoryDataBaseImplement/Models/Manager.cs @@ -17,8 +17,6 @@ namespace FurnitureFactoryDataBaseImplement.Models [Required] public string UserName { get; set; } = string.Empty; [Required] - public string Role { get; set; } - [Required] public string Email { get; set; } = string.Empty; [Required] public string Login { get; set; } = string.Empty; @@ -39,7 +37,6 @@ namespace FurnitureFactoryDataBaseImplement.Models { Id = model.Id, UserName = model.UserName, - Role = model.Role, Email = model.Email, Login = model.Login, Password = model.Password, @@ -50,7 +47,6 @@ namespace FurnitureFactoryDataBaseImplement.Models public void Update(ManagerBindingModel model) { UserName = model.UserName; - Role = model.Role; Email = model.Email; Login = model.Login; Password = model.Password; @@ -60,7 +56,6 @@ namespace FurnitureFactoryDataBaseImplement.Models { Id = Id, UserName = UserName, - Role = Role, Email = Email, Login = Login, Password = Password