From b426a6373da8e1719f91cb772efb6940fd756de0 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?=
 <raspaev.niko@mail.ru>
Date: Fri, 19 May 2023 14:06:33 +0400
Subject: [PATCH] fix frontend and update user

---
 .../Views/Storekeeper/ListBuilds.cshtml       |  4 +-
 .../Controllers/HomeController.cs             | 35 +++++++-
 .../Views/Home/Builds.cshtml                  |  8 +-
 .../Views/Home/Comments.cshtml                |  2 +-
 .../Views/Home/CreatePurchase.cshtml          |  1 -
 .../Views/Home/LinkPurchase.cshtml            | 12 +--
 .../Views/Home/Privacy.cshtml                 | 29 +++++++
 .../Views/Home/Purchases.cshtml               |  2 +-
 .../Views/Home/UpdatePurchase.cshtml          |  1 -
 .../Views/Home/WorkerReport.cshtml            | 81 +++++--------------
 .../Views/Home/listComponents.cshtml          |  4 +-
 .../Views/Shared/_LayoutWorker.cshtml         |  3 +
 12 files changed, 103 insertions(+), 79 deletions(-)
 create mode 100644 HardwareShop/HardwareShopWorkerApp/Views/Home/Privacy.cshtml

diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/ListBuilds.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/ListBuilds.cshtml
index cfc8c7b..c89f385 100644
--- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/ListBuilds.cshtml
+++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/ListBuilds.cshtml
@@ -24,8 +24,8 @@
 		</tbody>
 	</table>
 	<div class="col d-flex justify-content-evenly align-items-baseline">
-		<button type="button" class="btn btn-primary btn-lg m-2" id="savedoc">Сохранить в doc-формате</button>
-		<button type="button" class="btn btn-primary btn-lg m-2" id="saveexcel">Сохранить в xls-формате</button>
+		<button type="button" class="btn btn-primary   m-2" id="savedoc">Сохранить в doc-формате</button>
+		<button type="button" class="btn btn-primary   m-2" id="saveexcel">Сохранить в xls-формате</button>
 	</div>
 </div>
 
diff --git a/HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs b/HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs
index 484b7bf..dba2e79 100644
--- a/HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs
+++ b/HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs
@@ -1,4 +1,5 @@
-using HardwareShopContracts.BindingModels;
+using DocumentFormat.OpenXml.Spreadsheet;
+using HardwareShopContracts.BindingModels;
 using HardwareShopContracts.SearchModels;
 using HardwareShopContracts.ViewModels;
 using HardwareShopDatabaseImplement.Models;
@@ -56,9 +57,39 @@ namespace HardwareShopWorkerApp.Controllers
 			return View();
 		}
 
+        [HttpGet]
         public IActionResult Privacy()
         {
-            return View();
+            if (APIClient.User == null)
+            {
+                return Redirect("~/Home/Enter");
+            }
+            return View(APIClient.User);
+        }
+
+        [HttpPost]
+        public void Privacy(string login, string email, string password)
+        {
+            if (APIClient.User == null)
+            {
+                throw new Exception("Вы как суда попали? Суда вход только авторизованным");
+            }
+            if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(email) || string.IsNullOrEmpty(password))
+            {
+                throw new Exception("Введите логин, пароль и ФИО");
+            }
+            APIClient.PostRequest("api/user/updatedata", new UserBindingModel
+            {
+                Id = APIClient.User.Id,
+                Login = login,
+                Email = email,
+                Password = password
+            });
+
+            APIClient.User.Login = login;
+            APIClient.User.Email = email;
+            APIClient.User.Password = password;
+            Response.Redirect("MainWorker");
         }
 
         [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/Builds.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/Builds.cshtml
index 7aa0654..785b6bb 100644
--- a/HardwareShop/HardwareShopWorkerApp/Views/Home/Builds.cshtml
+++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/Builds.cshtml
@@ -15,7 +15,7 @@
 	<div class=" col-sm-8">
 		<div class="text-center">
 			<h2 class="display-4">Сборки</h2>
-			<button type="button" class="btn btn-primary btn-lg" data-bs-toggle="modal" data-bs-target="#createModal">Добавить</button>
+			<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#createModal">Добавить</button>
 		</div>
 		<div class="text-center" name="id">
 			<table class="table">
@@ -49,13 +49,13 @@
 									@Html.DisplayFor(modelItem => item.BuildName)
 								</td>
 								<td>
-									<button onclick="getBuild(@item.Id)" type="button" class="btn btn-primary btn-lg mb-5" data-bs-toggle="modal" data-bs-target="#updateModal">
+									<button onclick="getBuild(@item.Id)" type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#updateModal">
 										Обновить
 									</button>
-									<a class="btn btn-primary btn-lg mb-5" asp-controller="Home" asp-action="LinkPurchase" asp-route-buildId="@item.Id">
+									<a class="btn btn-primary" asp-controller="Home" asp-action="LinkPurchase" asp-route-buildId="@item.Id">
 										Привязать
 									</a>
-									<button onclick="getBuild(@item.Id)" type="button" class="btn btn-danger btn-lg mb-5" data-bs-toggle="modal" data-bs-target="#deleteModal">
+									<button onclick="getBuild(@item.Id)" type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteModal">
 										Удалить
 									</button>
 								</td>
diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/Comments.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/Comments.cshtml
index b2f545b..c6cfb70 100644
--- a/HardwareShop/HardwareShopWorkerApp/Views/Home/Comments.cshtml
+++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/Comments.cshtml
@@ -17,7 +17,7 @@
 	<div class=" col-sm-8">
 		<div class="text-center">
 			<h2 class="display-4">Комментарии</h2>
-			<button type="button" class="btn btn-primary btn-lg" data-bs-toggle="modal" data-bs-target="#createModal">Добавить</button>
+			<button type="button" class="btn btn-primary  " data-bs-toggle="modal" data-bs-target="#createModal">Добавить</button>
 		</div>
 		<div class="text-center" name="id">
 			<table class="table">
diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/CreatePurchase.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/CreatePurchase.cshtml
index 80a61ba..10270c2 100644
--- a/HardwareShop/HardwareShopWorkerApp/Views/Home/CreatePurchase.cshtml
+++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/CreatePurchase.cshtml
@@ -16,7 +16,6 @@
 	<h1 class="display-6">Товары</h1>
 	<div class="d-flex justify-content-center">
 		<button type="button" class="btn btn-primary mx-2 mt-3" data-bs-toggle="modal" data-bs-target="#exampleModal">Добавить</button>
-		<button type="button" class="btn btn-primary mx-2 mt-3">Удалить</button>
 	</div>
 	<table class="table table-hover">
 		<thead>
diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml
index 2c23262..4a7cc40 100644
--- a/HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml
+++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml
@@ -13,7 +13,7 @@
 <div class="text-center">
 	@{
 		<p>
-			<button type="button" onclick="getBuild()" class="btn btn-primary btn-lg mb-5" data-bs-toggle="modal" data-bs-target="#createModal">Добавить</button>
+			<button type="button" onclick="getBuild()" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#createModal">Добавить</button>
 		</p>
 		<table class="table">
 			<thead>
@@ -224,11 +224,11 @@
 		</div>
 	</div>
 	<div class="text-center d-flex flex-column mt-5">		
-		<button type="button" class="btn btn-primary btn-lg mb-5" data-bs-toggle="modal" data-bs-target="#exampleModal">Добавить</button>
-		<button type="button" class="btn btn-primary btn-lg mb-5" data-bs-toggle="modal" data-bs-target="#exampleModal">Изменить</button>
-		<button type="button" class="btn btn-primary btn-lg mb-5">Удалить</button>
-		<button type="button" class="btn btn-primary btn-lg mb-5">Обновить</button>
-		<button type="submit" class="btn btn-primary btn-lg mb-5">Сохранить</button>
+		<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal">Добавить</button>
+		<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal">Изменить</button>
+		<button type="button" class="btn btn-primary">Удалить</button>
+		<button type="button" class="btn btn-primary">Обновить</button>
+		<button type="submit" class="btn btn-primary">Сохранить</button>
 	</div>
 
 	<div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/Privacy.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/Privacy.cshtml
new file mode 100644
index 0000000..1984ba8
--- /dev/null
+++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/Privacy.cshtml
@@ -0,0 +1,29 @@
+@using HardwareShopContracts.ViewModels;
+
+
+@model UserViewModel
+
+@{
+	ViewData["Title"] = "Privacy Policy";
+	Layout = "~/Views/Shared/_LayoutWorker.cshtml";
+}
+<div class="text-center">
+	<h2 class="display-4">Личные данные</h2>
+</div>
+<form method="post" class="d-flex flex-column align-items-center">
+	<div class="col-sm-3">
+		<label class="form-label">Почта:</label>
+		<input type="text" class="form-control" name="email" value="@Model.Email">
+	</div>
+	<div class="col-sm-3">
+		<label class="form-label">Пароль:</label>
+		<input type="text" class="form-control" name="password" value="@Model.Password">
+	</div>
+	<div class="col-sm-3">
+		<label class="form-label">Логин:</label>
+		<input type="text" class="form-control" name="login" value="@Model.Login">
+	</div>
+	<div class="col-sm-2 d-flex justify-content-evenly align-items-baseline">
+		<button type="submit" class="btn btn-primary mt-3 px-4">Подтвердить</button>
+	</div>
+</form>
\ No newline at end of file
diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/Purchases.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/Purchases.cshtml
index 26cc615..cad04da 100644
--- a/HardwareShop/HardwareShopWorkerApp/Views/Home/Purchases.cshtml
+++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/Purchases.cshtml
@@ -19,7 +19,7 @@
 				<a asp-controller="Home" asp-action="CreatePurchase" class="btn btn-primary mx-2">Добавить</a>
 				<button type="button" class="btn btn-primary mx-2" id="delete">Удалить покупку</button>
 				<button type="button" class="btn btn-primary mx-2" id="done">Выдан</button>
-					<button type="button" class="btn btn-primary mx-2" id="update">Обновить</button>
+					<button type="button" class="btn btn-primary mx-2" id="update">Изменить</button>
 			</p>
 		</div>
 		<div class="text-center">
diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/UpdatePurchase.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/UpdatePurchase.cshtml
index 0ce73e8..0b2b803 100644
--- a/HardwareShop/HardwareShopWorkerApp/Views/Home/UpdatePurchase.cshtml
+++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/UpdatePurchase.cshtml
@@ -17,7 +17,6 @@
 	<h1 class="display-6">Товары</h1>
 	<div class="d-flex justify-content-center">
 		<button type="button" class="btn btn-primary mx-2 mt-3" data-bs-toggle="modal" data-bs-target="#exampleModal">Добавить</button>
-		<button type="button" class="btn btn-primary mx-2 mt-3">Удалить</button>
 	</div>
 	<table class="table table-hover">
 		<thead>
diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/WorkerReport.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/WorkerReport.cshtml
index 8d6a8ce..93ebc95 100644
--- a/HardwareShop/HardwareShopWorkerApp/Views/Home/WorkerReport.cshtml
+++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/WorkerReport.cshtml
@@ -3,29 +3,15 @@
     Layout = "~/Views/Shared/_LayoutWorker.cshtml";
 }
 
-<h4 class="fw-bold">Отчет по покупкам</h4>
-
-<div id="error-div-shell" class="error-div-shell">
-    <div>
-        <p id="error-p" class="error-p mb-2"></p>
+<div class="d-flex flex-column align-items-center">
+    <div class="col-sm-3">
+        <label class="form-label">С</label>
+        <input type="date" class="form-control" name="dateFrom" id="date-from-input">
+        <label class="form-label">По</label>
+        <input type="date" class="form-control" name="dateTo" id="date-to-input">
     </div>
-</div>
-
-<div class="d-flex flex-wrap gap-1 align-items-end mb-2">
-    <div class="mb-2">
-        <p class="mb-0">Дата начала:</p>
-        <input id="date-from-input" class="form-control" type="date" />
-    </div>
-    <div class="mb-2">
-        <p class="mb-0">Дата конца:</p>
-        <input id="date-to-input" class="form-control" type="date" />
-    </div>
-    <button id="generate-button" class="btn btn-primary mb-2">
-        Показать
-    </button>
-    <button id="send-by-mail-button" class="btn btn-primary mb-2">
-        На почту
-    </button>
+    <button type="submit" class="btn btn-primary mt-3 px-4" id="generate-button">Вывод на страницу</button>
+    <button type="submit" class="btn btn-primary mt-3 px-4" id="send-by-mail-button">Отправить на почту</button>
 </div>
 
 <p class="mb-0">
@@ -34,21 +20,20 @@
     <span>&nbsp;по&nbsp;</span>
     <span id="date-to-span" class="fw-bold">...</span>
 </p>
-<div class="mb-2 border">
-    <table class="table mb-0">
-        <thead class="table-head">
-            <tr>
-                <th>Номер покупки</th>
-                <th>Дата покупки</th>
-                <th>Сумма покупки</th>
-                <th>Комментарии</th>
-                <th>Комплектующие</th>
-            </tr>
-        </thead>
-        <tbody id="tbody">
-        </tbody>
-    </table>
-</div>
+
+<table class="table">
+    <thead>
+        <tr>
+            <th scope="col">Номер покупки</th>
+            <th scope="col">Дата покупки</th>
+            <th scope="col">Сумма покупки</th>
+            <th scope="col">Комментарии</th>
+            <th scope="col">Комплектующие</th>
+        </tr>
+    </thead>
+    <tbody id="tbody">
+    </tbody>
+</table>
 
 @section Scripts
     {
@@ -72,9 +57,6 @@
                 "DateFrom": dateFrom,
                 "DateTo": dateTo
             };
-            if (!validate(reportModel)) {
-                return;
-            }
             $.ajax({
                 url: "/home/WorkerReport",
                 type: "POST",
@@ -94,9 +76,6 @@
                 "DateFrom": dateFrom,
                 "DateTo": dateTo
             };
-            if (!validate(reportModel)) {
-                return;
-            }
             $.ajax({
                 url: "/home/SendByMailPurchaseReport",
                 type: "POST",
@@ -159,22 +138,6 @@
 
         // [Other]
 
-        const validate = function (reportModel) {
-            if (isNaN(reportModel["DateFrom"])) {
-                errorP.innerHTML = "Выберите начальную дату";
-                return false;
-            }
-            if (isNaN(reportModel["DateTo"])) {
-                errorP.innerHTML = "Выберите конечную дату";
-                return false;
-            }
-            if (reportModel["DateFrom"] >= reportModel["DateTo"]) {
-                errorP.innerHTML = "Начальная дата должна быть меньше конечной";
-                return false;
-            }
-            return true;
-        }
-
         const getDate = function (iso) {
             const year = iso.substring(0, 4);
             const month = iso.substring(5, 7);
diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/listComponents.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/listComponents.cshtml
index ea4942c..ed1dc8d 100644
--- a/HardwareShop/HardwareShopWorkerApp/Views/Home/listComponents.cshtml
+++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/listComponents.cshtml
@@ -24,8 +24,8 @@
 		</tbody>
 	</table>
 	<div class="col d-flex justify-content-evenly align-items-baseline">
-		<button type="button" class="btn btn-primary btn-lg m-2" id="savedoc">Сохранить в doc-формате</button>
-		<button type="button" class="btn btn-primary btn-lg m-2" id="saveexcel">Сохранить в xls-формате</button>
+		<button type="button" class="btn btn-primary   m-2" id="savedoc">Сохранить в doc-формате</button>
+		<button type="button" class="btn btn-primary   m-2" id="saveexcel">Сохранить в xls-формате</button>
 	</div>
 </div>
 
diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Shared/_LayoutWorker.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Shared/_LayoutWorker.cshtml
index 2b7096b..aa26c35 100644
--- a/HardwareShop/HardwareShopWorkerApp/Views/Shared/_LayoutWorker.cshtml
+++ b/HardwareShop/HardwareShopWorkerApp/Views/Shared/_LayoutWorker.cshtml
@@ -36,6 +36,9 @@
 						<li class="nav-item">
 							<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="WorkerReport">Отчёт</a>
 						</li>
+						<li class="nav-item">
+							<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
+						</li>
 					</ul>
 				</div>
 			</div>