diff --git a/ComputerShopContracts/BindingModels/RequestBindingModel.cs b/ComputerShopContracts/BindingModels/RequestBindingModel.cs index eef6ad9..6eb6316 100644 --- a/ComputerShopContracts/BindingModels/RequestBindingModel.cs +++ b/ComputerShopContracts/BindingModels/RequestBindingModel.cs @@ -13,8 +13,7 @@ namespace ComputerShopContracts.BindingModels public int UserId { get; set; } - //!!!ДОБАВИТЬ ССЫЛКУ НА СБОРКУ - + public int AssemblyId { get; set; } public DateTime DateMake { get; set; } = DateTime.Now; diff --git a/ComputerShopContracts/SearchModels/RequestSearchModel.cs b/ComputerShopContracts/SearchModels/RequestSearchModel.cs index c696ba4..d63f114 100644 --- a/ComputerShopContracts/SearchModels/RequestSearchModel.cs +++ b/ComputerShopContracts/SearchModels/RequestSearchModel.cs @@ -11,7 +11,8 @@ namespace ComputerShopContracts.SearchModels public int? Id { get; set; } public int? UserId { get; set; } - //!!!ДОБАВИТЬ ПОИСК ПО СБОРКЕ (СУЩНОСТИ ОЛЕГА) + //поиск по сборкам + public int? AssemblyId { get; set; } //!!!мб надо добавить поиск по заказам diff --git a/ComputerShopContracts/ViewModels/RequestViewModel.cs b/ComputerShopContracts/ViewModels/RequestViewModel.cs index dec0ec2..d420d64 100644 --- a/ComputerShopContracts/ViewModels/RequestViewModel.cs +++ b/ComputerShopContracts/ViewModels/RequestViewModel.cs @@ -19,7 +19,7 @@ namespace ComputerShopContracts.ViewModels //!!!МБ ДОБАВИТЬ НИК ПОЛЬЗОВАТЕЛЯ, СОЗДАВШЕГО ЗАЯВКУ - //!!!МБ ДОБАВИТЬ ID СБОРКИ + public int AssemblyId { get; set; } public Dictionary RequestOrders { get; set; } = new(); diff --git a/ComputerShopDataModels/Models/IRequestModel.cs b/ComputerShopDataModels/Models/IRequestModel.cs index ed3c073..4c0dd4c 100644 --- a/ComputerShopDataModels/Models/IRequestModel.cs +++ b/ComputerShopDataModels/Models/IRequestModel.cs @@ -14,12 +14,10 @@ namespace ComputerShopDataModels.Models //ID пользователя, создавшего заявку int UserId { get; } - - - - - //!!!ДОБАВИТЬ ССЫЛКУ НА СБОРКУ ИЗ ЧАСТИ ОЛЕГА - + /// + /// ID сборки + /// + int AssemblyId { get; } Dictionary RequestOrders { get; } diff --git a/ComputerShopDatabaseImplement/ComputerShopDatabaseImplement.csproj b/ComputerShopDatabaseImplement/ComputerShopDatabaseImplement.csproj index b721344..e13cf1a 100644 --- a/ComputerShopDatabaseImplement/ComputerShopDatabaseImplement.csproj +++ b/ComputerShopDatabaseImplement/ComputerShopDatabaseImplement.csproj @@ -6,6 +6,12 @@ enable + + + + + + @@ -20,8 +26,4 @@ - - - -