diff --git a/FurnitureFactory/FurnitureContracts/BindingModels/MaterialBindingModel.cs b/FurnitureFactory/FurnitureContracts/BindingModels/MaterialBindingModel.cs index 1e3e2c0..c23a1bb 100644 --- a/FurnitureFactory/FurnitureContracts/BindingModels/MaterialBindingModel.cs +++ b/FurnitureFactory/FurnitureContracts/BindingModels/MaterialBindingModel.cs @@ -13,7 +13,7 @@ namespace FurnitureContracts.BindingModels public int Cost { get; set; } - public int userID { get; set; } + public int UserID { get; set; } public int Id { get; set; } } diff --git a/FurnitureFactory/FurnitureContracts/ViewModel/MaterialViewModel.cs b/FurnitureFactory/FurnitureContracts/ViewModel/MaterialViewModel.cs index c1d9d65..360a16c 100644 --- a/FurnitureFactory/FurnitureContracts/ViewModel/MaterialViewModel.cs +++ b/FurnitureFactory/FurnitureContracts/ViewModel/MaterialViewModel.cs @@ -16,7 +16,7 @@ namespace FurnitureContracts.ViewModel [DisplayName("Цена")] public int Cost { get; set; } - public int userID { get; set; } + public int UserID { get; set; } public int Id { get; set; } } diff --git a/FurnitureFactory/FurnitureDataBaseImplement/FurnitureDataBaseImplement.csproj b/FurnitureFactory/FurnitureDataBaseImplement/FurnitureDataBaseImplement.csproj index ee8f2e4..416ed03 100644 --- a/FurnitureFactory/FurnitureDataBaseImplement/FurnitureDataBaseImplement.csproj +++ b/FurnitureFactory/FurnitureDataBaseImplement/FurnitureDataBaseImplement.csproj @@ -11,9 +11,7 @@ - - diff --git a/FurnitureFactory/FurnitureDataBaseImplement/Models/Material.cs b/FurnitureFactory/FurnitureDataBaseImplement/Models/Material.cs new file mode 100644 index 0000000..0a78734 --- /dev/null +++ b/FurnitureFactory/FurnitureDataBaseImplement/Models/Material.cs @@ -0,0 +1,21 @@ +using FurnitureFactoryDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureDataBaseImplement.Models +{ + public class Material : IMaterialModel + { + + public string Name { get; set; } = string.Empty; + + public int Cost { get; set; } + + public int UserID { get; set; } + + public int Id { get; set; } + } +} diff --git a/FurnitureFactory/FurnitureFactoryDataModels/Models/IFurnitureModel.cs b/FurnitureFactory/FurnitureFactoryDataModels/Models/IFurnitureModel.cs index 581c336..04d8277 100644 --- a/FurnitureFactory/FurnitureFactoryDataModels/Models/IFurnitureModel.cs +++ b/FurnitureFactory/FurnitureFactoryDataModels/Models/IFurnitureModel.cs @@ -11,6 +11,7 @@ namespace FurnitureFactoryDataModels.Models string Name { get;} string Color { get; } string Type { get; } + int UserID { get; } public Dictionary FurnitureMaterial { get; } } } diff --git a/FurnitureFactory/FurnitureFactoryDataModels/Models/IHeadsetModuleModel.cs b/FurnitureFactory/FurnitureFactoryDataModels/Models/IHeadsetModuleModel.cs index a97791f..9f97f3d 100644 --- a/FurnitureFactory/FurnitureFactoryDataModels/Models/IHeadsetModuleModel.cs +++ b/FurnitureFactory/FurnitureFactoryDataModels/Models/IHeadsetModuleModel.cs @@ -10,6 +10,7 @@ namespace FurnitureFactoryDataModels.Models { string Style { get;} int Cost { get;} - int ManagerID { get;} + int UserID { get;} + public Dictionary HeadsetModuleMaterial { get; } } } diff --git a/FurnitureFactory/FurnitureFactoryDataModels/Models/IMaterialModel.cs b/FurnitureFactory/FurnitureFactoryDataModels/Models/IMaterialModel.cs index 796d8b9..e236f35 100644 --- a/FurnitureFactory/FurnitureFactoryDataModels/Models/IMaterialModel.cs +++ b/FurnitureFactory/FurnitureFactoryDataModels/Models/IMaterialModel.cs @@ -10,6 +10,6 @@ namespace FurnitureFactoryDataModels.Models { string Name { get; } int Cost { get; } - int userID { get; } + int UserID { get; } } }