diff --git a/FurnitureFactory/FurnitureContracts/BindingModels/HeadsetBindingModel.cs b/FurnitureFactory/FurnitureContracts/BindingModels/HeadsetBindingModel.cs index 36878f1..86d3e54 100644 --- a/FurnitureFactory/FurnitureContracts/BindingModels/HeadsetBindingModel.cs +++ b/FurnitureFactory/FurnitureContracts/BindingModels/HeadsetBindingModel.cs @@ -7,6 +7,7 @@ namespace FurnitureContracts.BindingModels public string Size { get; set; } = string.Empty; public int Cost { get; set; } public int Id { get; set; } + public int ManagerId { get; set; } public Dictionary HeadsetModuleId { get; set; } } } diff --git a/FurnitureFactory/FurnitureContracts/BindingModels/ManagerBindingModel.cs b/FurnitureFactory/FurnitureContracts/BindingModels/ManagerBindingModel.cs new file mode 100644 index 0000000..b5f76a5 --- /dev/null +++ b/FurnitureFactory/FurnitureContracts/BindingModels/ManagerBindingModel.cs @@ -0,0 +1,14 @@ +using FurnitureFactoryDataModels.Models; + +namespace FurnitureContracts.BindingModels +{ + public class ManagerBindingModel : IManagerModel + { + public string UserName { get; set; } = string.Empty; + public string Login { get; } + public string Password { get; } + public string Role { get; } + + public int Id { get; set; } + } +} diff --git a/FurnitureFactory/FurnitureContracts/BindingModels/OrdersBindingModel.cs b/FurnitureFactory/FurnitureContracts/BindingModels/OrdersBindingModel.cs index 925f3ae..2fb2cd4 100644 --- a/FurnitureFactory/FurnitureContracts/BindingModels/OrdersBindingModel.cs +++ b/FurnitureFactory/FurnitureContracts/BindingModels/OrdersBindingModel.cs @@ -7,7 +7,7 @@ namespace FurnitureContracts.BindingModels public DateTime Date { get; set; } = DateTime.Now; public string Status { get; set; } = string.Empty; public int Id { get; set; } + public int ManagerId { get; set; } public Dictionary FurnitureId { get; set; } - public Dictionary HeadsetId { get; set; } } } diff --git a/FurnitureFactory/FurnitureContracts/BindingModels/RoleBindingModel.cs b/FurnitureFactory/FurnitureContracts/BindingModels/RoleBindingModel.cs deleted file mode 100644 index e7459a7..0000000 --- a/FurnitureFactory/FurnitureContracts/BindingModels/RoleBindingModel.cs +++ /dev/null @@ -1,10 +0,0 @@ -using FurnitureFactoryDataModels.Models; - -namespace FurnitureContracts.BindingModels -{ - public class RoleBindingModel : IRoleModel - { - public string Name { get; set; } = string.Empty; - public int Id { get; set; } - } -} diff --git a/FurnitureFactory/FurnitureContracts/BindingModels/SalesSalonsBindingModel.cs b/FurnitureFactory/FurnitureContracts/BindingModels/SalesSalonsBindingModel.cs index b1daf8f..4e33517 100644 --- a/FurnitureFactory/FurnitureContracts/BindingModels/SalesSalonsBindingModel.cs +++ b/FurnitureFactory/FurnitureContracts/BindingModels/SalesSalonsBindingModel.cs @@ -8,5 +8,6 @@ namespace FurnitureContracts.BindingModels public string Address { get; set; } = string.Empty; public Dictionary OrdersId { get; set; } public int Id { get; set; } + public int ManagerId { get; set; } } } diff --git a/FurnitureFactory/FurnitureContracts/BusinessLogicsContracts/IManagerLogic.cs b/FurnitureFactory/FurnitureContracts/BusinessLogicsContracts/IManagerLogic.cs new file mode 100644 index 0000000..ebf86de --- /dev/null +++ b/FurnitureFactory/FurnitureContracts/BusinessLogicsContracts/IManagerLogic.cs @@ -0,0 +1,15 @@ +using FurnitureContracts.BindingModels; +using FurnitureContracts.SearchModels; +using FurnitureContracts.ViewModel; + +namespace FurnitureContracts.BusinessLogicsContracts +{ + public interface IManagerLogic + { + List? ReadList(ManagerSearchModel? model); + ManagerViewModel? ReadElement(ManagerSearchModel model); + bool Create(ManagerBindingModel model); + bool Update(ManagerBindingModel model); + bool Delete(ManagerBindingModel model); + } +} \ No newline at end of file diff --git a/FurnitureFactory/FurnitureContracts/BusinessLogicsContracts/IRoleLogic.cs b/FurnitureFactory/FurnitureContracts/BusinessLogicsContracts/IRoleLogic.cs deleted file mode 100644 index 486ad47..0000000 --- a/FurnitureFactory/FurnitureContracts/BusinessLogicsContracts/IRoleLogic.cs +++ /dev/null @@ -1,15 +0,0 @@ -using FurnitureContracts.BindingModels; -using FurnitureContracts.SearchModels; -using FurnitureContracts.ViewModel; - -namespace FurnitureContracts.BusinessLogicsContracts -{ - public interface IRoleLogic - { - List? ReadList(SalesSalonsSearchModel? model); - RoleViewModel? ReadElement(SalesSalonsSearchModel model); - bool Create(SalesSalonsBindingModel model); - bool Update(SalesSalonsBindingModel model); - bool Delete(SalesSalonsBindingModel model); - } -} \ No newline at end of file diff --git a/FurnitureFactory/FurnitureContracts/SearchModels/RoleSearchModel.cs b/FurnitureFactory/FurnitureContracts/SearchModels/ManagerSearchModel.cs similarity index 72% rename from FurnitureFactory/FurnitureContracts/SearchModels/RoleSearchModel.cs rename to FurnitureFactory/FurnitureContracts/SearchModels/ManagerSearchModel.cs index 2280a4d..a6d47d8 100644 --- a/FurnitureFactory/FurnitureContracts/SearchModels/RoleSearchModel.cs +++ b/FurnitureFactory/FurnitureContracts/SearchModels/ManagerSearchModel.cs @@ -6,9 +6,9 @@ using System.Threading.Tasks; namespace FurnitureContracts.SearchModels { - public class RoleSearchModel + public class ManagerSearchModel { - public string? Name { get; set; } + public string? UserName { get; set; } public int? Id { get; set; } } } diff --git a/FurnitureFactory/FurnitureContracts/StoragesContracts/IManagerStorage.cs b/FurnitureFactory/FurnitureContracts/StoragesContracts/IManagerStorage.cs new file mode 100644 index 0000000..84d3593 --- /dev/null +++ b/FurnitureFactory/FurnitureContracts/StoragesContracts/IManagerStorage.cs @@ -0,0 +1,21 @@ +using FurnitureContracts.BindingModels; +using FurnitureContracts.SearchModels; +using FurnitureContracts.ViewModel; + +namespace FurnitureContracts.StoragesContracts +{ + public interface IManagerStorage + { + List GetFullList(); + + List GetFilteredList(ManagerSearchModel model); + + ManagerViewModel? GetElement(ManagerSearchModel model); + + ManagerViewModel? Insert(ManagerBindingModel model); + + ManagerViewModel? Update(ManagerBindingModel model); + + ManagerViewModel? Delete(ManagerBindingModel model); + } +} diff --git a/FurnitureFactory/FurnitureContracts/StoragesContracts/IRoleStorage.cs b/FurnitureFactory/FurnitureContracts/StoragesContracts/IRoleStorage.cs deleted file mode 100644 index f4e4c5f..0000000 --- a/FurnitureFactory/FurnitureContracts/StoragesContracts/IRoleStorage.cs +++ /dev/null @@ -1,21 +0,0 @@ -using FurnitureContracts.BindingModels; -using FurnitureContracts.SearchModels; -using FurnitureContracts.ViewModel; - -namespace FurnitureContracts.StoragesContracts -{ - public interface IRoleStorage - { - List GetFullList(); - - List GetFilteredList(RoleSearchModel model); - - RoleViewModel? GetElement(RoleSearchModel model); - - RoleViewModel? Insert(RoleBindingModel model); - - RoleViewModel? Update(RoleBindingModel model); - - RoleViewModel? Delete(RoleBindingModel model); - } -} diff --git a/FurnitureFactory/FurnitureContracts/ViewModel/ManagerViewModel.cs b/FurnitureFactory/FurnitureContracts/ViewModel/ManagerViewModel.cs new file mode 100644 index 0000000..bae41a0 --- /dev/null +++ b/FurnitureFactory/FurnitureContracts/ViewModel/ManagerViewModel.cs @@ -0,0 +1,16 @@ +using FurnitureFactoryDataModels.Models; +using System.ComponentModel; + +namespace FurnitureContracts.ViewModel +{ + public class ManagerViewModel : IManagerModel + { + [DisplayName("Имя пользователя")] + public string UserName { get; set; } = string.Empty; + public int Id { get; set; } + [DisplayName("Логин")] + public string Login { get; set; } = string.Empty; + public string Password { get; } + public string Role { get; } + } +} diff --git a/FurnitureFactory/FurnitureContracts/ViewModel/OrdersViewModel.cs b/FurnitureFactory/FurnitureContracts/ViewModel/OrdersViewModel.cs index c1f0e4e..47e379c 100644 --- a/FurnitureFactory/FurnitureContracts/ViewModel/OrdersViewModel.cs +++ b/FurnitureFactory/FurnitureContracts/ViewModel/OrdersViewModel.cs @@ -16,7 +16,7 @@ namespace FurnitureContracts.ViewModel [DisplayName("Статус")] public string Status { get; set; } = string.Empty; public int Id { get; set; } + public int ManagerId { get; set; } public Dictionary FurnitureId { get; set; } - public Dictionary HeadsetId { get; set; } } } diff --git a/FurnitureFactory/FurnitureContracts/ViewModel/RoleViewModel.cs b/FurnitureFactory/FurnitureContracts/ViewModel/RoleViewModel.cs deleted file mode 100644 index faed6b1..0000000 --- a/FurnitureFactory/FurnitureContracts/ViewModel/RoleViewModel.cs +++ /dev/null @@ -1,12 +0,0 @@ -using FurnitureFactoryDataModels.Models; -using System.ComponentModel; - -namespace FurnitureContracts.ViewModel -{ - public class RoleViewModel : IRoleModel - { - [DisplayName("Название роли")] - public string Name { get; set; } = string.Empty; - public int Id { get; set; } - } -} diff --git a/FurnitureFactory/FurnitureContracts/ViewModel/SalesSalonsViewModel.cs b/FurnitureFactory/FurnitureContracts/ViewModel/SalesSalonsViewModel.cs index e2f0189..1678090 100644 --- a/FurnitureFactory/FurnitureContracts/ViewModel/SalesSalonsViewModel.cs +++ b/FurnitureFactory/FurnitureContracts/ViewModel/SalesSalonsViewModel.cs @@ -11,5 +11,6 @@ namespace FurnitureContracts.ViewModel public string Address { get; set; } = string.Empty; public Dictionary OrdersId { get; set; } public int Id { get; set; } + public int ManagerId { get; set; } } } diff --git a/FurnitureFactory/FurnitureDataBaseImplement/FurnitureDataBaseImplement.csproj b/FurnitureFactory/FurnitureDataBaseImplement/FurnitureDataBaseImplement.csproj index f2c9493..ee8f2e4 100644 --- a/FurnitureFactory/FurnitureDataBaseImplement/FurnitureDataBaseImplement.csproj +++ b/FurnitureFactory/FurnitureDataBaseImplement/FurnitureDataBaseImplement.csproj @@ -8,7 +8,12 @@ - + + + + + + diff --git a/FurnitureFactory/FurnitureDataBaseImplement/Models/Orders.cs b/FurnitureFactory/FurnitureDataBaseImplement/Models/Orders.cs new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/FurnitureFactory/FurnitureDataBaseImplement/Models/Orders.cs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/FurnitureFactory/FurnitureFactory.sln b/FurnitureFactory/FurnitureFactory.sln index b7762ee..6103753 100644 --- a/FurnitureFactory/FurnitureFactory.sln +++ b/FurnitureFactory/FurnitureFactory.sln @@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FurnitureFactoryDataModels" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FurnitureContracts", "FurnitureContracts\FurnitureContracts.csproj", "{E269E4B8-5EAD-4BB2-A8BA-44FE9D202FB6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FurnitureDataBaseImplement", "FurnitureDataBaseImplement\FurnitureDataBaseImplement.csproj", "{1EFC8085-D7CE-40ED-B78D-5176861AB618}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -29,10 +27,6 @@ Global {E269E4B8-5EAD-4BB2-A8BA-44FE9D202FB6}.Debug|Any CPU.Build.0 = Debug|Any CPU {E269E4B8-5EAD-4BB2-A8BA-44FE9D202FB6}.Release|Any CPU.ActiveCfg = Release|Any CPU {E269E4B8-5EAD-4BB2-A8BA-44FE9D202FB6}.Release|Any CPU.Build.0 = Release|Any CPU - {1EFC8085-D7CE-40ED-B78D-5176861AB618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EFC8085-D7CE-40ED-B78D-5176861AB618}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EFC8085-D7CE-40ED-B78D-5176861AB618}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EFC8085-D7CE-40ED-B78D-5176861AB618}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FurnitureFactory/FurnitureFactoryDataModels/Models/IHeadsetModel.cs b/FurnitureFactory/FurnitureFactoryDataModels/Models/IHeadsetModel.cs index c2c291f..cc3dbf6 100644 --- a/FurnitureFactory/FurnitureFactoryDataModels/Models/IHeadsetModel.cs +++ b/FurnitureFactory/FurnitureFactoryDataModels/Models/IHeadsetModel.cs @@ -11,5 +11,6 @@ namespace FurnitureFactoryDataModels.Models int Cost { get;} string Size { get; } public Dictionary HeadsetModuleId { get; } + int ManagerId { get; } } } diff --git a/FurnitureFactory/FurnitureFactoryDataModels/Models/IHeadsetModuleModel.cs b/FurnitureFactory/FurnitureFactoryDataModels/Models/IHeadsetModuleModel.cs index bce3924..a97791f 100644 --- a/FurnitureFactory/FurnitureFactoryDataModels/Models/IHeadsetModuleModel.cs +++ b/FurnitureFactory/FurnitureFactoryDataModels/Models/IHeadsetModuleModel.cs @@ -10,6 +10,6 @@ namespace FurnitureFactoryDataModels.Models { string Style { get;} int Cost { get;} - int UserID { get;} + int ManagerID { get;} } } diff --git a/FurnitureFactory/FurnitureFactoryDataModels/Models/IRoleModel.cs b/FurnitureFactory/FurnitureFactoryDataModels/Models/IManagerModel.cs similarity index 51% rename from FurnitureFactory/FurnitureFactoryDataModels/Models/IRoleModel.cs rename to FurnitureFactory/FurnitureFactoryDataModels/Models/IManagerModel.cs index 9f95834..672c57d 100644 --- a/FurnitureFactory/FurnitureFactoryDataModels/Models/IRoleModel.cs +++ b/FurnitureFactory/FurnitureFactoryDataModels/Models/IManagerModel.cs @@ -6,8 +6,11 @@ using System.Threading.Tasks; namespace FurnitureFactoryDataModels.Models { - public interface IRoleModel : IId + public interface IManagerModel : IId { - string Name { get; } + string Login { get; } + string Password { get; } + string Role { get; } + string UserName { get; } } } \ No newline at end of file diff --git a/FurnitureFactory/FurnitureFactoryDataModels/Models/IOrdersModel.cs b/FurnitureFactory/FurnitureFactoryDataModels/Models/IOrdersModel.cs index 51baf6e..ae73ff5 100644 --- a/FurnitureFactory/FurnitureFactoryDataModels/Models/IOrdersModel.cs +++ b/FurnitureFactory/FurnitureFactoryDataModels/Models/IOrdersModel.cs @@ -11,6 +11,6 @@ namespace FurnitureFactoryDataModels.Models DateTime Date { get; } string Status { get; } public Dictionary FurnitureId { get; } - public Dictionary HeadsetId { get; } + int ManagerId { get; } } } diff --git a/FurnitureFactory/FurnitureFactoryDataModels/Models/ISalesSalonsModel.cs b/FurnitureFactory/FurnitureFactoryDataModels/Models/ISalesSalonsModel.cs index 8d96804..f851406 100644 --- a/FurnitureFactory/FurnitureFactoryDataModels/Models/ISalesSalonsModel.cs +++ b/FurnitureFactory/FurnitureFactoryDataModels/Models/ISalesSalonsModel.cs @@ -11,5 +11,6 @@ namespace FurnitureFactoryDataModels.Models string Name { get; } string Address { get; } public Dictionary OrdersId { get; } + int ManagerId { get; } } } diff --git a/FurnitureFactory/FurnitureFactoryDataModels/Models/IUserModel.cs b/FurnitureFactory/FurnitureFactoryDataModels/Models/IUserModel.cs index e5bf5ae..2453e95 100644 --- a/FurnitureFactory/FurnitureFactoryDataModels/Models/IUserModel.cs +++ b/FurnitureFactory/FurnitureFactoryDataModels/Models/IUserModel.cs @@ -8,7 +8,7 @@ namespace FurnitureFactoryDataModels.Models { public interface IUserModel { - int Login { get;} + string Login { get;} int Password { get; } string UserName { get; } int RoleID { get; }