From 256f8f98affa7491b1fbbf1c1a7f6c0277bf7e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9?= Date: Fri, 19 May 2023 22:47:00 +0400 Subject: [PATCH] =?UTF-8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=201=20?= =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D0=BD=D0=B0=20=D0=B2=D1=81?= =?UTF-8?q?=D1=91=20=D0=B8=20=D0=BD=D0=B0=20=D1=8D=D1=82=D0=BE,=20=D0=B8?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D1=8D=D1=82=D0=BE,=20=D0=B8=20=D0=BD=D0=B0?= =?UTF-8?q?=20=D1=8D=D1=82=D0=BE,=20=D0=B8=20=D0=BD=D0=B0=20=D1=82=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HardwareShopDatabase.cs | 3 ++- .../Controllers/PurchaseController.cs | 6 +++--- .../HardwareShopWorkerApp/Controllers/HomeController.cs | 9 +++++---- .../HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs b/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs index e9c4188..d8fd53e 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs @@ -3,6 +3,7 @@ using HardwareShopDatabaseImplement.Models.ManyToMany; using HardwareShopDatabaseImplement.Models.Storekeeper; using HardwareShopDatabaseImplement.Models.Worker; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Options; namespace HardwareShopDatabaseImplement { @@ -10,7 +11,7 @@ namespace HardwareShopDatabaseImplement { protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { - optionsBuilder.UseNpgsql("Host=localhost;Port=5432;Database=Computer_Hardware_Store1;Username=user;Password=12345"); + optionsBuilder.UseNpgsql("Host=localhost;Port=5432;Database=Computer_Hardware_Store4;Username=postgres;Password=1234"); AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true); } diff --git a/HardwareShop/HardwareShopRestApi/Controllers/PurchaseController.cs b/HardwareShop/HardwareShopRestApi/Controllers/PurchaseController.cs index 864ef1a..1816218 100644 --- a/HardwareShop/HardwareShopRestApi/Controllers/PurchaseController.cs +++ b/HardwareShop/HardwareShopRestApi/Controllers/PurchaseController.cs @@ -49,12 +49,12 @@ namespace HardwareShopRestApi.Controllers } } - [HttpGet] - public List? GetPurchases(int userId) + [HttpPost] + public List? GetPurchases(PurchaseSearchModel model) { try { - return _purchaseLogic.ReadList(new() { UserId = userId }); + return _purchaseLogic.ReadList(model); } catch (Exception ex) { diff --git a/HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs b/HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs index 5820093..1b41b80 100644 --- a/HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs +++ b/HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs @@ -327,7 +327,7 @@ namespace HardwareShopWorkerApp.Controllers { return Redirect("~/Home/Enter"); } - return View(APIClient.GetRequest>($"api/purchase/getpurchases?userId={APIClient.User.Id}")); + return View(APIClient.PostRequestWithResult>($"api/purchase/getpurchases", new() { UserId = APIClient.User.Id })); } [HttpPost] @@ -358,7 +358,8 @@ namespace HardwareShopWorkerApp.Controllers { return Redirect("~/Home/Enter"); } - ViewBag.Purchases = APIClient.GetRequest>($"api/purchase/getpurchases?userId={APIClient.User.Id}"); + + ViewBag.Purchases = APIClient.PostRequestWithResult> ($"api/purchase/getpurchases", new() {UserId = APIClient.User.Id }); return View(); } @@ -521,8 +522,8 @@ namespace HardwareShopWorkerApp.Controllers if (buildId <= 0) { throw new Exception($"Идентификтаор сборки не может быть ниже или равен 0"); - } - ViewBag.Purchase = APIClient.GetRequest>($"api/purchase/GetPurchasesNotDelivery?userId={APIClient.User.Id}"); + } + ViewBag.Purchases = APIClient.PostRequestWithResult>($"api/purchase/getpurchases", new() { UserId = APIClient.User.Id, PurchaseStatus = PurchaseStatus.Выполняется }); return View(APIClient.GetRequest>>($"api/build/GetBuildPurchase?buildId={buildId}")); } diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml index 3df23d3..44d23f5 100644 --- a/HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml +++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml @@ -79,7 +79,7 @@