diff --git a/ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs b/ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs index e4868b2..23bfaec 100644 --- a/ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs +++ b/ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs @@ -12,7 +12,7 @@ namespace ElectronicsShopDataBaseImplement optionsBuilder) { if (optionsBuilder.IsConfigured == false) { - optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-E2VPEN3\SQLEXPRESS;Initial Catalog=ElectronicsShopDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); + optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-O0N00SH\SQLEXPRESS;Initial Catalog=ElectronicsShopDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); } base.OnConfiguring(optionsBuilder); } diff --git a/ElectronicsShop/ElectronicsShopDataBaseImplement/Implements/ProductStorage.cs b/ElectronicsShop/ElectronicsShopDataBaseImplement/Implements/ProductStorage.cs index 6cae2bf..a0b0560 100644 --- a/ElectronicsShop/ElectronicsShopDataBaseImplement/Implements/ProductStorage.cs +++ b/ElectronicsShop/ElectronicsShopDataBaseImplement/Implements/ProductStorage.cs @@ -3,6 +3,7 @@ using ElectronicsShopContracts.SearchModels; using ElectronicsShopContracts.StorageContracts; using ElectronicsShopContracts.ViewModels; using ElectronicsShopDataBaseImplement.Models; +using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; using System.Linq; @@ -21,7 +22,9 @@ namespace ElectronicsShopDataBaseImplement.Implements using var context = new Database(); context.Products.Add(newComponent); context.SaveChanges(); - return newComponent.GetViewModel; + return context.Products + .Include(x => x.CostItem) + .FirstOrDefault(x => x.ID == model.ID)?.GetViewModel; } public ProductViewModel? Update(ProductBindingModel model) { @@ -72,7 +75,9 @@ namespace ElectronicsShopDataBaseImplement.Implements public List GetFullList() { using var context = new Database(); - return context.Products.Select(x => x.GetViewModel).ToList(); + return context.Products + .Include(x => x.CostItem) + .Select(x => x.GetViewModel).ToList(); } } } diff --git a/ElectronicsShop/ElectronicsShopEmployeeApp/Controllers/HomeController.cs b/ElectronicsShop/ElectronicsShopEmployeeApp/Controllers/HomeController.cs index 7d782b7..c83582a 100644 --- a/ElectronicsShop/ElectronicsShopEmployeeApp/Controllers/HomeController.cs +++ b/ElectronicsShop/ElectronicsShopEmployeeApp/Controllers/HomeController.cs @@ -23,7 +23,7 @@ namespace ElectronicsShopEmployeeApp.Controllers { if (APIEmployee.Employee == null) { return Redirect("~/Home/Enter"); } - return View(APIEmployee.GetRequset>($"api/main/getproducts?_employeeid={APIEmployee.Employee.ID}")); + return View(APIEmployee.GetRequset>($"api/main/getproducts")); } [HttpGet] @@ -141,7 +141,7 @@ namespace ElectronicsShopEmployeeApp.Controllers { } [HttpPost] - public double Calc(int costitem, double productprice) { + public double Calc(int costitem, double productprice) { var _costItem = APIEmployee.GetRequset($"api/employee/getcostitem?_costitemid={costitem}"); return productprice + (_costItem?.Price ?? 500); } diff --git a/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/CreateProduct.cshtml b/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/CreateProduct.cshtml index b8a45f3..4c93c7b 100644 --- a/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/CreateProduct.cshtml +++ b/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/CreateProduct.cshtml @@ -15,7 +15,7 @@
Статья затрат:
- +
@@ -31,9 +31,9 @@
-
-
- +
+
+
@@ -43,8 +43,8 @@ $('#costitem').on('change', function () { check(); }); - $('#productprice'.on('change', function () { - check(): + $('#productprice').on('change', function () { + check(); }); function check() { diff --git a/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/Index.cshtml b/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/Index.cshtml index a7b936a..85d737c 100644 --- a/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/Index.cshtml +++ b/ElectronicsShop/ElectronicsShopEmployeeApp/Views/Home/Index.cshtml @@ -18,7 +18,7 @@ return; }

- Создать Товар + Создать товар

@@ -38,7 +38,7 @@ - @foreach (var item in Model) { + @foreach (var item in Model) { - } + }
@Html.DisplayFor(modelItem => item.ID) @@ -53,7 +53,7 @@ @Html.DisplayFor(modelItem => item.Price)
} diff --git a/ElectronicsShop/ElectronicsShopRestAPI/Controllers/MainController.cs b/ElectronicsShop/ElectronicsShopRestAPI/Controllers/MainController.cs index d69e43b..68848a2 100644 --- a/ElectronicsShop/ElectronicsShopRestAPI/Controllers/MainController.cs +++ b/ElectronicsShop/ElectronicsShopRestAPI/Controllers/MainController.cs @@ -23,13 +23,6 @@ namespace ElectronicsShopRestAPI.Controllers { _order = orderLogic; } - - - [HttpGet] - public ProductViewModel? GetProduct(int ProductID) { - return null; - } - [HttpGet] public List? GetProducts() { try { @@ -41,8 +34,6 @@ namespace ElectronicsShopRestAPI.Controllers { } } - // клиент должен получать свои заказы - // сотрудник должен получать все заказы [HttpGet] public List? GetOrders(int _clientID) { try @@ -72,12 +63,5 @@ namespace ElectronicsShopRestAPI.Controllers { throw; } } - - [HttpPost] - public void CreateProduct(OrderBindingModel model) { - return; - } - //Мейби нужны будут удаления, обновления, выбор конкретного заказа или продукта. Короче потом... - //А также для статей затрат. } }