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

fix

Browse Source
This commit is contained in:
Николай 2023-04-02 19:52:02 +04:00
parent f749e8fcb4
commit 0d9306c597
6 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HardwareShop/HardwareShopClientApp/Controllers/HomeController.cs
View File

@ -83,7 +83,6 @@ namespace HardwareShopClientApp.Controllers
if ((int)APIClient.User.Role == 1) if ((int)APIClient.User.Role == 1)
{ {
return RedirectToAction("MainWorker", "Worker"); return RedirectToAction("MainWorker", "Worker");
return RedirectToAction("WorkerReport", "Worker");
} }
else else
{ {

2
HardwareShop/HardwareShopClientApp/Controllers/WorkerController.cs
View File

@ -35,7 +35,7 @@ namespace HardwareShopClientApp.Controllers
[HttpGet] [HttpGet]
public IActionResult Purchases() public IActionResult Purchases()
{ {
return View(APIClient.GetRequest<List<PurchaseViewModel>>($"api/client/getpurchases?UserId={APIClient.User.Id}")); return View();
} }
[HttpPost] [HttpPost]

2
HardwareShop/HardwareShopClientApp/Views/Worker/Comments.cshtml
View File

@ -42,7 +42,7 @@
<form method="post" class="d-flex justify-content-evenly"> <form method="post" class="d-flex justify-content-evenly">
<div class=" col-sm-8"> <div class=" col-sm-8">
<div class="text-center"> <div class="text-center">
<h2 class="display-4">Сборки</h2> <h2 class="display-4">Комментарии</h2>
</div> </div>
<div class="text-center" name="id"> <div class="text-center" name="id">
<table class="table"> <table class="table">

1
HardwareShop/HardwareShopClientApp/Views/Worker/Purchases.cshtml
View File

@ -68,7 +68,6 @@
<tbody> <tbody>
</tbody> </tbody>
</table> </table>
}
</div> </div>
</div> </div>
<div class="text-center d-flex flex-column mt-5"> <div class="text-center d-flex flex-column mt-5">

2
HardwareShop/HardwareShopClientApp/Views/Worker/listComponents.cshtml
View File

@ -84,7 +84,7 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Комментарий</h5> <h5 class="modal-title" id="exampleModalLabel">Покупка</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">

2
HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs
View File

@ -10,7 +10,7 @@ namespace HardwareShopDatabaseImplement
{ {
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{ {
optionsBuilder.UseNpgsql("Host=localhost;Port=5433;Database=Computer_Hardware_Store;Username=user;Password=12345"); optionsBuilder.UseNpgsql("Host=localhost;Port=5432;Database=Computer_Hardware_Store;Username=postgres;Password=1234");
} }
protected override void OnModelCreating(ModelBuilder modelBuilder) protected override void OnModelCreating(ModelBuilder modelBuilder)