august/Computer_Hardware_Store
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

теперь 1 метод на всё и на это, и на это, и на это, и на то

Browse Source
This commit is contained in:
Николай 2023-05-19 22:47:00 +04:00
parent e4e9447a0b
commit 256f8f98af
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs
View File

@ -3,6 +3,7 @@ using HardwareShopDatabaseImplement.Models.ManyToMany;
using HardwareShopDatabaseImplement.Models.Storekeeper; using HardwareShopDatabaseImplement.Models.Storekeeper;
using HardwareShopDatabaseImplement.Models.Worker; using HardwareShopDatabaseImplement.Models.Worker;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
namespace HardwareShopDatabaseImplement namespace HardwareShopDatabaseImplement
{ {
@ -10,7 +11,7 @@ namespace HardwareShopDatabaseImplement
{ {
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) 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); AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
} }

6
HardwareShop/HardwareShopRestApi/Controllers/PurchaseController.cs
View File

@ -49,12 +49,12 @@ namespace HardwareShopRestApi.Controllers
} }
} }
[HttpGet] [HttpPost]
public List<PurchaseViewModel>? GetPurchases(int userId) public List<PurchaseViewModel>? GetPurchases(PurchaseSearchModel model)
{ {
try try
{ {
return _purchaseLogic.ReadList(new() { UserId = userId }); return _purchaseLogic.ReadList(model);
} }
catch (Exception ex) catch (Exception ex)
{ {

7
HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs
View File

@ -327,7 +327,7 @@ namespace HardwareShopWorkerApp.Controllers
{ {
return Redirect("~/Home/Enter"); return Redirect("~/Home/Enter");
} }
return View(APIClient.GetRequest<List<PurchaseViewModel>>($"api/purchase/getpurchases?userId={APIClient.User.Id}")); return View(APIClient.PostRequestWithResult<PurchaseSearchModel, List<PurchaseViewModel>>($"api/purchase/getpurchases", new() { UserId = APIClient.User.Id }));
} }
[HttpPost] [HttpPost]
@ -358,7 +358,8 @@ namespace HardwareShopWorkerApp.Controllers
{ {
return Redirect("~/Home/Enter"); return Redirect("~/Home/Enter");
} }
ViewBag.Purchases = APIClient.GetRequest<List<PurchaseViewModel>>($"api/purchase/getpurchases?userId={APIClient.User.Id}");
ViewBag.Purchases = APIClient.PostRequestWithResult<PurchaseSearchModel, List<PurchaseViewModel>> ($"api/purchase/getpurchases", new() {UserId = APIClient.User.Id });
return View(); return View();
} }
@ -522,7 +523,7 @@ namespace HardwareShopWorkerApp.Controllers
{ {
throw new Exception($"Идентификтаор сборки не может быть ниже или равен 0"); throw new Exception($"Идентификтаор сборки не может быть ниже или равен 0");
} }
ViewBag.Purchase = APIClient.GetRequest<List<PurchaseViewModel>>($"api/purchase/GetPurchasesNotDelivery?userId={APIClient.User.Id}"); ViewBag.Purchases = APIClient.PostRequestWithResult<PurchaseSearchModel, List<PurchaseViewModel>>($"api/purchase/getpurchases", new() { UserId = APIClient.User.Id, PurchaseStatus = PurchaseStatus.Выполняется });
return View(APIClient.GetRequest<List<Tuple<PurchaseViewModel, int>>>($"api/build/GetBuildPurchase?buildId={buildId}")); return View(APIClient.GetRequest<List<Tuple<PurchaseViewModel, int>>>($"api/build/GetBuildPurchase?buildId={buildId}"));
} }

2
HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml
View File

@ -79,7 +79,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<label class="form-label">Покупка</label> <label class="form-label">Покупка</label>
<select id="purchaseId" name="purchaseId" class="form-control" asp-items="@(new SelectList(@ViewBag.Purchase, "Id","Id"))"></select> <select id="purchaseId" name="purchaseId" class="form-control" asp-items="@(new SelectList(@ViewBag.Purchases, "Id","Id"))"></select>
<div class="form-group"> <div class="form-group">
<label>Количество</label> <label>Количество</label>
<input type="number" class="form-control" required="required" name="count" /> <input type="number" class="form-control" required="required" name="count" />