From 9ab410c5afe60269a8b2313565dc0344b9c44393 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: Sun, 2 Apr 2023 13:41:20 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D0=B5=D1=82=D1=8B=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BD=D0=B8=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/WorkerController.cs | 30 +++- .../Views/Worker/Build.cshtml | 75 +++++++++ .../Views/Worker/Builds.cshtml | 126 ++++++++------- .../Views/Worker/Comments.cshtml | 150 +++++++++++------- .../Views/Worker/Purchase.cshtml | 10 +- .../Views/Worker/Purchases.cshtml | 2 +- .../Views/Worker/WorkerReport.cshtml | 10 ++ .../Views/Worker/listComponents.cshtml | 147 ++++++++++------- 8 files changed, 376 insertions(+), 174 deletions(-) create mode 100644 HardwareShop/HardwareShopClientApp/Views/Worker/Build.cshtml diff --git a/HardwareShop/HardwareShopClientApp/Controllers/WorkerController.cs b/HardwareShop/HardwareShopClientApp/Controllers/WorkerController.cs index e43cbaf..c50da31 100644 --- a/HardwareShop/HardwareShopClientApp/Controllers/WorkerController.cs +++ b/HardwareShop/HardwareShopClientApp/Controllers/WorkerController.cs @@ -17,10 +17,7 @@ namespace HardwareShopClientApp.Controllers _logger = logger; } - public IActionResult Builds() - { - return View(); - } + public IActionResult Comments() { @@ -69,5 +66,30 @@ namespace HardwareShopClientApp.Controllers { return View(); } + + [HttpGet] + public IActionResult Builds() + { + return View(); + } + + [HttpPost] + public void Builds(int id) + { + //return View(); + //string login = (string)TempData["UserId"]; + + Response.Redirect("Build"); + } + + [HttpGet] + public IActionResult Build() + { + //return View(); + //string login = (string)TempData["UserId"]; + + return View(); + } + } } \ No newline at end of file diff --git a/HardwareShop/HardwareShopClientApp/Views/Worker/Build.cshtml b/HardwareShop/HardwareShopClientApp/Views/Worker/Build.cshtml new file mode 100644 index 0000000..323d46c --- /dev/null +++ b/HardwareShop/HardwareShopClientApp/Views/Worker/Build.cshtml @@ -0,0 +1,75 @@ + + +@using HardwareShopContracts.ViewModels +@{ + ViewData["Title"] = "Build"; +} + +@model List + +@section Header { +
+ +
+} +
+
+
+

Товар

+
+
+ + +
+ +
+ + + + + + + + + + + +
+ Номер + + Комплектующее + + Цена + + Логин пользователя +
+
+ + + diff --git a/HardwareShop/HardwareShopClientApp/Views/Worker/Builds.cshtml b/HardwareShop/HardwareShopClientApp/Views/Worker/Builds.cshtml index 5bfc6f8..cd83230 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Worker/Builds.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Worker/Builds.cshtml @@ -1,62 +1,76 @@ -@{ +@using HardwareShopContracts.ViewModels +@{ ViewData["Title"] = "Builds"; } +@model List + @section Header {
- -
+ + } -
-

Регистрация

-
-
-
- - -
-
- - -
-
- - -
-
- - -
- - -
- +
+
+
+

Сборки

+
+
+ + + + + + + + + + + + +
+ Номер + + Дата оплаты + + Сумма + + Статус + + Логин пользователя +
+
+
+
+ + + + +
+
diff --git a/HardwareShop/HardwareShopClientApp/Views/Worker/Comments.cshtml b/HardwareShop/HardwareShopClientApp/Views/Worker/Comments.cshtml index cebb316..f09f392 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Worker/Comments.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Worker/Comments.cshtml @@ -1,62 +1,102 @@ -@{ +@using HardwareShopContracts.ViewModels +@{ ViewData["Title"] = "Comments"; } +@model List + @section Header {
- -
+ + } -
-

Регистрация

-
-
-
- - -
-
- - -
-
- - -
-
- - -
- - -
+
+
+
+

Сборки

+
+
+ + + + + + + + + + + +
+ Номер + + Текст + + Название сборки + + Логин пользователя +
+
+
+
+ + + + +
+ + +
diff --git a/HardwareShop/HardwareShopClientApp/Views/Worker/Purchase.cshtml b/HardwareShop/HardwareShopClientApp/Views/Worker/Purchase.cshtml index 1318430..f1750e1 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Worker/Purchase.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Worker/Purchase.cshtml @@ -55,7 +55,7 @@ Цена - Пользователь + Логин пользователя Количество @@ -79,25 +79,25 @@