diff --git a/FurnitureFactory/FurnitureContracts/BindingModels/UserBindingModel.cs b/FurnitureFactory/FurnitureContracts/BindingModels/UserBindingModel.cs new file mode 100644 index 0000000..9aacac6 --- /dev/null +++ b/FurnitureFactory/FurnitureContracts/BindingModels/UserBindingModel.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using FurnitureFactoryDataModels.Models; +namespace FurnitureContracts.BindingModels +{ + internal class UserBindingModel : IUserModel + { + public int Login { get; set; } + + public int Password { get; set; } + + public string UserName { get; set; } = string.Empty; + + public int RoleID { get; set; } + } +} diff --git a/FurnitureFactory/FurnitureContracts/SearchModels/FurnitureSearchModel.cs b/FurnitureFactory/FurnitureContracts/SearchModels/FurnitureSearchModel.cs new file mode 100644 index 0000000..b45a12d --- /dev/null +++ b/FurnitureFactory/FurnitureContracts/SearchModels/FurnitureSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureContracts.SearchModels +{ + public class FurnitureSearchModel + { + public string? Name { get; set; } + public int? Id { get; set; } + } +} diff --git a/FurnitureFactory/FurnitureContracts/SearchModels/HeadsetModuleSearchModel.cs b/FurnitureFactory/FurnitureContracts/SearchModels/HeadsetModuleSearchModel.cs new file mode 100644 index 0000000..3455e8b --- /dev/null +++ b/FurnitureFactory/FurnitureContracts/SearchModels/HeadsetModuleSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureContracts.SearchModels +{ + internal class HeadsetModuleSearchModel + { + public string? Name { get; set; } + public int? Id { get; set; } + } +} diff --git a/FurnitureFactory/FurnitureContracts/SearchModels/MaterialSearchModel.cs b/FurnitureFactory/FurnitureContracts/SearchModels/MaterialSearchModel.cs new file mode 100644 index 0000000..050f1fa --- /dev/null +++ b/FurnitureFactory/FurnitureContracts/SearchModels/MaterialSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureContracts.SearchModels +{ + public class MaterialSearchModel + { + public string? Name { get; set; } + public int? Id { get; set; } + } +} diff --git a/FurnitureFactory/FurnitureContracts/SearchModels/UserSearchModel.cs b/FurnitureFactory/FurnitureContracts/SearchModels/UserSearchModel.cs new file mode 100644 index 0000000..b57875a --- /dev/null +++ b/FurnitureFactory/FurnitureContracts/SearchModels/UserSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureContracts.SearchModels +{ + internal class UserSearchModel + { + public string? Name { get; set; } + public int? Id { get; set; } + } +} diff --git a/FurnitureFactory/FurnitureContracts/ViewModel/FurnitureViewModel.cs b/FurnitureFactory/FurnitureContracts/ViewModel/FurnitureViewModel.cs new file mode 100644 index 0000000..e2e9f88 --- /dev/null +++ b/FurnitureFactory/FurnitureContracts/ViewModel/FurnitureViewModel.cs @@ -0,0 +1,26 @@ +using FurnitureFactoryDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureContracts.ViewModel +{ + public class FurnitureViewModel : IFurnitureModel + { + [DisplayName("Название")] + public string Name { get; set; } = string.Empty; + [DisplayName("Цвет")] + + public string Color { get; set; } = string.Empty; + [DisplayName("Тип")] + + public string Type { get; set; } = string.Empty; + + public Dictionary FurnitureMaterial { get; set; } + + public int Id { get; set; } + } +} diff --git a/FurnitureFactory/FurnitureContracts/ViewModel/HeadsetModuleViewModel.cs b/FurnitureFactory/FurnitureContracts/ViewModel/HeadsetModuleViewModel.cs new file mode 100644 index 0000000..4455263 --- /dev/null +++ b/FurnitureFactory/FurnitureContracts/ViewModel/HeadsetModuleViewModel.cs @@ -0,0 +1,22 @@ +using FurnitureFactoryDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureContracts.ViewModel +{ + public class HeadsetModuleViewModel : IHeadsetModuleModel + { + [DisplayName("Стиль")] + public string Style { get; set; } = string.Empty; + [DisplayName("Цена")] + public int Cost { get; set; } + + public int UserID { get; set; } + + public int Id { get; set; } + } +} diff --git a/FurnitureFactory/FurnitureContracts/ViewModel/HeadsetViewModel.cs b/FurnitureFactory/FurnitureContracts/ViewModel/HeadsetViewModel.cs index 6b8ef44..24b84aa 100644 --- a/FurnitureFactory/FurnitureContracts/ViewModel/HeadsetViewModel.cs +++ b/FurnitureFactory/FurnitureContracts/ViewModel/HeadsetViewModel.cs @@ -10,6 +10,7 @@ namespace FurnitureContracts.ViewModel { public class HeadsetViewModel : IHeadsetModel { + [DisplayName("Цена")] public int Cost { get; set; } [DisplayName("Размер")] diff --git a/FurnitureFactory/FurnitureContracts/ViewModel/MaterialViewModel.cs b/FurnitureFactory/FurnitureContracts/ViewModel/MaterialViewModel.cs new file mode 100644 index 0000000..c1d9d65 --- /dev/null +++ b/FurnitureFactory/FurnitureContracts/ViewModel/MaterialViewModel.cs @@ -0,0 +1,23 @@ +using FurnitureFactoryDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureContracts.ViewModel +{ + + public class MaterialViewModel : IMaterialModel + { + [DisplayName("Название")] + public string Name { get; set; } = string.Empty; + [DisplayName("Цена")] + public int Cost { get; set; } + + public int userID { get; set; } + + public int Id { get; set; } + } +} diff --git a/FurnitureFactory/FurnitureContracts/ViewModel/SalesSalonsViewModel.cs b/FurnitureFactory/FurnitureContracts/ViewModel/SalesSalonsViewModel.cs index e2f0189..0f99057 100644 --- a/FurnitureFactory/FurnitureContracts/ViewModel/SalesSalonsViewModel.cs +++ b/FurnitureFactory/FurnitureContracts/ViewModel/SalesSalonsViewModel.cs @@ -7,7 +7,7 @@ namespace FurnitureContracts.ViewModel { [DisplayName("Название")] public string Name { get; set; } = string.Empty; - [DisplayName("Адресс")] + [DisplayName("Адрес")] public string Address { get; set; } = string.Empty; public Dictionary OrdersId { get; set; } public int Id { get; set; } diff --git a/FurnitureFactory/FurnitureContracts/ViewModel/UserViewModel.cs b/FurnitureFactory/FurnitureContracts/ViewModel/UserViewModel.cs new file mode 100644 index 0000000..aa3ac44 --- /dev/null +++ b/FurnitureFactory/FurnitureContracts/ViewModel/UserViewModel.cs @@ -0,0 +1,23 @@ +using FurnitureFactoryDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureContracts.ViewModel +{ + internal class UserViewModel : IUserModel + { + [DisplayName("Логин")] + public int Login { get; set; } + [DisplayName("Пароль")] + public int Password { get; set; } + [DisplayName("Имя пользователя")] + + public string UserName { get; set; } = string.Empty; + + public int RoleID { get; set; } + } +} diff --git a/FurnitureFactory/FurnitureFactoryDataModels/Models/User.cs b/FurnitureFactory/FurnitureFactoryDataModels/Models/IUserModel.cs similarity index 90% rename from FurnitureFactory/FurnitureFactoryDataModels/Models/User.cs rename to FurnitureFactory/FurnitureFactoryDataModels/Models/IUserModel.cs index 96fe569..e5bf5ae 100644 --- a/FurnitureFactory/FurnitureFactoryDataModels/Models/User.cs +++ b/FurnitureFactory/FurnitureFactoryDataModels/Models/IUserModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace FurnitureFactoryDataModels.Models { - internal interface User + public interface IUserModel { int Login { get;} int Password { get; }