diff --git a/ComputerHardwareStore/ComputerHardwareStore/ComputerHardwareStore.csproj b/ComputerHardwareStore/ComputerHardwareStore/ComputerHardwareStore.csproj index 9e06d61..cc7eb0f 100644 --- a/ComputerHardwareStore/ComputerHardwareStore/ComputerHardwareStore.csproj +++ b/ComputerHardwareStore/ComputerHardwareStore/ComputerHardwareStore.csproj @@ -34,6 +34,27 @@ + + + + + + + + ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + + ..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll + + + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + \ No newline at end of file diff --git a/ComputerHardwareStore/ComputerHardwareStore/Program.cs b/ComputerHardwareStore/ComputerHardwareStore/Program.cs new file mode 100644 index 0000000..3a62f00 --- /dev/null +++ b/ComputerHardwareStore/ComputerHardwareStore/Program.cs @@ -0,0 +1,9 @@ +namespace ComputerHardwareStore +{ + internal static class Program + { + static void Main() + { + } + } +} diff --git a/ComputerHardwareStore/ComputerHardwareStore/packages.config b/ComputerHardwareStore/ComputerHardwareStore/packages.config new file mode 100644 index 0000000..7ea5118 --- /dev/null +++ b/ComputerHardwareStore/ComputerHardwareStore/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/BuildBindingModel.cs b/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/BuildBindingModel.cs index a90636c..e437bec 100644 --- a/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/BuildBindingModel.cs +++ b/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/BuildBindingModel.cs @@ -2,12 +2,12 @@ namespace ComputerHardwareStoreContracts.BindingModels { - public class BuildBindingModel : IBindingModel + public class BuildBindingModel : IBuildModel { public int Id { get; set; } - public string BuildName { get; set; } = string.Empty; + public string Name { get; set; } = string.Empty; public double Price { get; set; } public int VendorId { get; set; } - public Dictionary BuildComponent { get; set; } = new(); + public Dictionary BuildComponents { get; set; } = new(); } } diff --git a/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/ComponentBindingModel.cs b/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/ComponentBindingModel.cs index 56ae673..af0759b 100644 --- a/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/ComponentBindingModel.cs +++ b/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/ComponentBindingModel.cs @@ -7,5 +7,6 @@ namespace ComputerHardwareStoreContracts.BindingModels public int Id { get; set; } public string Name { get; set; } = string.Empty; public double Cost { get; set; } + public int StoreKeeperId { get; set; } } } diff --git a/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/OrderBindingModel.cs b/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/OrderBindingModel.cs index fb0a72d..720bc7b 100644 --- a/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/OrderBindingModel.cs +++ b/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/OrderBindingModel.cs @@ -1,4 +1,5 @@ -using ComputerHardwareStoreDataModels.Models; +using ComputerHardwareStoreDataModels.Enums; +using ComputerHardwareStoreDataModels.Models; namespace ComputerHardwareStoreContracts.BindingModels { @@ -7,9 +8,10 @@ namespace ComputerHardwareStoreContracts.BindingModels public int Id { get; set; } public int CannedId { get; set; } public int Count { get; set; } - public double Sum { get; set; } + public double Cost { get; set; } public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; public DateTime DateCreate { get; set; } = DateTime.Now; public DateTime? DateImplement { get; set; } + public Dictionary OrderProduct { get; set; } = new(); } } diff --git a/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/ProductBindingModel.cs b/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/ProductBindingModel.cs index 78b8a2e..618993d 100644 --- a/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/ProductBindingModel.cs +++ b/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/ProductBindingModel.cs @@ -5,7 +5,7 @@ namespace ComputerHardwareStoreContracts.BindingModels public class ProductBindingModel : IProductModel { public int Id { get; set; } - public string ProductName { get; set; } = string.Empty; + public string Name { get; set; } = string.Empty; public double Price { get; set; } public Dictionary ProductComponents { get; set; } = new(); } diff --git a/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/StoreKeeperBindingModel.cs b/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/StoreKeeperBindingModel.cs index 144ade0..32aeb14 100644 --- a/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/StoreKeeperBindingModel.cs +++ b/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/StoreKeeperBindingModel.cs @@ -6,7 +6,7 @@ namespace ComputerHardwareStoreContracts.BindingModels { public int Id { get; set; } public string Name { get; set; } = string.Empty; - public string Email { get; set; } = string.Empty; + public string Login { get; set; } = string.Empty; public string Password { get; set; } = string.Empty; } } diff --git a/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/VendorBindingModel.cs b/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/VendorBindingModel.cs index 9f4dc29..1346bd3 100644 --- a/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/VendorBindingModel.cs +++ b/ComputerHardwareStore/ComputerHardwareStoreContracts/BindingModels/VendorBindingModel.cs @@ -6,7 +6,7 @@ namespace ComputerHardwareStoreContracts.BindingModels { public int Id { get; set; } public string Name { get; set; } = string.Empty; - public string Email { get; set; } = string.Empty; + public string Login { get; set; } = string.Empty; public string Password { get; set; } = string.Empty; } } diff --git a/ComputerHardwareStore/ComputerHardwareStoreContracts/BusinessLogicsContracts/IVendorLogic.cs b/ComputerHardwareStore/ComputerHardwareStoreContracts/BusinessLogicsContracts/IVendorLogic.cs index 5f12939..97f9eb5 100644 --- a/ComputerHardwareStore/ComputerHardwareStoreContracts/BusinessLogicsContracts/IVendorLogic.cs +++ b/ComputerHardwareStore/ComputerHardwareStoreContracts/BusinessLogicsContracts/IVendorLogic.cs @@ -1,4 +1,4 @@ -using HardwareStoreContracts.BindingModels; +using ComputerHardwareStoreContracts.BindingModels; using ComputerHardwareStoreContracts.SearchModels; using ComputerHardwareStoreContracts.ViewModels; diff --git a/ComputerHardwareStore/ComputerHardwareStoreContracts/ViewModels/BuildViewModel.cs b/ComputerHardwareStore/ComputerHardwareStoreContracts/ViewModels/BuildViewModel.cs index 5b5b5b7..763cf75 100644 --- a/ComputerHardwareStore/ComputerHardwareStoreContracts/ViewModels/BuildViewModel.cs +++ b/ComputerHardwareStore/ComputerHardwareStoreContracts/ViewModels/BuildViewModel.cs @@ -11,6 +11,6 @@ namespace ComputerHardwareStoreContracts.ViewModels [DisplayName("Стоимость")] public double Price { get; } public int VendorId { get; } - public Dictionary BuildComponent { get; } = new(); + public Dictionary BuildComponents { get; } = new(); } } diff --git a/ComputerHardwareStore/ComputerHardwareStoreContracts/ViewModels/ProductViewModel.cs b/ComputerHardwareStore/ComputerHardwareStoreContracts/ViewModels/ProductViewModel.cs index 276e98a..00cc4c2 100644 --- a/ComputerHardwareStore/ComputerHardwareStoreContracts/ViewModels/ProductViewModel.cs +++ b/ComputerHardwareStore/ComputerHardwareStoreContracts/ViewModels/ProductViewModel.cs @@ -12,6 +12,6 @@ namespace ComputerHardwareStoreContracts.ViewModels public double Price { get; set; } public Dictionary CannedComponents { get; set; } = new(); - public Dictionary ProductComponent => throw new NotImplementedException(); + public Dictionary ProductComponents => throw new NotImplementedException(); } } diff --git a/ComputerHardwareStore/ComputerHardwareStoreDataModels/Models/IBuildModel.cs b/ComputerHardwareStore/ComputerHardwareStoreDataModels/Models/IBuildModel.cs index e8dfc3a..6485ba0 100644 --- a/ComputerHardwareStore/ComputerHardwareStoreDataModels/Models/IBuildModel.cs +++ b/ComputerHardwareStore/ComputerHardwareStoreDataModels/Models/IBuildModel.cs @@ -5,6 +5,6 @@ string Name { get; } double Price { get; } int VendorId { get; } - public Dictionary BuildComponent { get; } + public Dictionary BuildComponents { get; } } } diff --git a/ComputerHardwareStore/ComputerHardwareStoreDataModels/Models/IProductModel.cs b/ComputerHardwareStore/ComputerHardwareStoreDataModels/Models/IProductModel.cs index a460250..a38ae89 100644 --- a/ComputerHardwareStore/ComputerHardwareStoreDataModels/Models/IProductModel.cs +++ b/ComputerHardwareStore/ComputerHardwareStoreDataModels/Models/IProductModel.cs @@ -4,6 +4,6 @@ { string Name { get; } double Price { get; } - public Dictionary ProductComponent { get; } + public Dictionary ProductComponents { get; } } }