From 97178360636f64800faa9511ced57ef14cf6fcd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=BA=20=D0=98=D0=B3=D0=BE=D1=80=D1=8C?=
 <igors-2011@mail.ru>
Date: Tue, 23 May 2023 01:18:14 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=BD=D1=8B=D0=B9=20crud=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/HomeController.cs             | 68 +++++++++++++------
 .../Views/Home/CreateWork.cshtml              | 20 ++++++
 .../CarServiceWebApp/Views/Home/Enter.cshtml  |  2 +-
 .../CarServiceWebApp/Views/Home/Work.cshtml   |  5 +-
 .../CarServiceWebApp/Views/Home/Works.cshtml  | 39 ++++++-----
 5 files changed, 93 insertions(+), 41 deletions(-)
 create mode 100644 CarService/CarServiceWebApp/Views/Home/CreateWork.cshtml

diff --git a/CarService/CarServiceWebApp/Controllers/HomeController.cs b/CarService/CarServiceWebApp/Controllers/HomeController.cs
index db8e0bb..5c3f2f6 100644
--- a/CarService/CarServiceWebApp/Controllers/HomeController.cs
+++ b/CarService/CarServiceWebApp/Controllers/HomeController.cs
@@ -38,9 +38,7 @@ namespace CarServiceWebApp.Controllers
 		/// <returns></returns>
 		[HttpGet]
 		public IActionResult Enter()
-		{
-			return View();
-		}
+		=> View();
 		/// <summary>
 		/// Ввод данных в форму для входа
 		/// </summary>
@@ -94,10 +92,7 @@ namespace CarServiceWebApp.Controllers
 		/// </summary>
 		/// <returns></returns>
 		[HttpGet]
-		public IActionResult Register()
-		{
-			return View();
-		}
+		public IActionResult Register() => View();
 		/// <summary>
 		/// Ввод данных при регистрации пользователя
 		/// </summary>
@@ -116,31 +111,64 @@ namespace CarServiceWebApp.Controllers
 			}
 			return Redirect("~/Home/Enter");
 		}
+		/// <summary>
+		/// Отображение формы CRUD работы
+		/// </summary>
+		/// <param name="Id"></param>
+		/// <returns></returns>
 		[HttpGet]
 		public IActionResult Work(int Id)
 		{
 			ViewBag.Work = _workLogic.ReadElement(new() { Id = Id });
 			return View();
 		}
+		/// <summary>
+		/// Обновление работы
+		/// </summary>
+		/// <param name="model"></param>
+		/// <returns></returns>
 		[HttpPost]
-		public IActionResult UpdateWork(Work work)
+		public IActionResult UpdateWork(WorkBindingModel model)
 		{
-			//ViewBag.Work = _workLogic.ReadElement(new() { Id = Id });
-			return View();
+			_workLogic.Update(model);
+			return Redirect("~/Home/Works");
 		}
+		/// <summary>
+		/// Удаление работы
+		/// </summary>
+		/// <param name="model"></param>
+		/// <returns></returns>
 		[HttpPost]
-		public IActionResult DeleteWork(int Id)
+		public IActionResult DeleteWork(WorkBindingModel model)
 		{
-			ViewBag.Work = _workLogic.ReadElement(new() { Id = Id });
-			return View();
+			_workLogic.Delete(model);
+			return Redirect("~/Home/Works");
+		}
+		/// <summary>
+		/// Отображение формы добавления работы
+		/// </summary>
+		/// <returns></returns>
+		//[HttpGet]
+		public IActionResult CreateWork() => View();
+		/// <summary>
+		/// Добавление работы
+		/// </summary>
+		/// <param name="model"></param>
+		/// <returns></returns>
+		[HttpPost]
+		public IActionResult CreateWork(WorkBindingModel model)
+		{
+			try
+			{
+				_workLogic.Create(model);
+			}
+			catch (Exception ex)
+			{
+				ViewBag.Exception = ex.Message;
+				return View();
+			}
+			return Redirect("~/Home/Works");
 		}
-
-
-
-
-
-
-
 		/// <summary>
 		/// Вывод ошибок
 		/// </summary>
diff --git a/CarService/CarServiceWebApp/Views/Home/CreateWork.cshtml b/CarService/CarServiceWebApp/Views/Home/CreateWork.cshtml
new file mode 100644
index 0000000..7b30578
--- /dev/null
+++ b/CarService/CarServiceWebApp/Views/Home/CreateWork.cshtml
@@ -0,0 +1,20 @@
+<form method="post">
+	<div hidden><input type="text" name="Id" /></div>
+	<div hidden><input type="text" name="WorkerId" value="@CurrentUser.UserId" /></div>
+	<div class="row">
+		<div class="col-4">Название:</div>
+		<div class="col-8"><input type="text" name="Name" /></div>
+	</div>
+	<div class="row">
+		<div class="col-4">Цена:</div>
+		<div class="col-8"><input type="text" name="Price" /></div>
+	</div>
+	<div class="row">
+		<div class="col-4">Длительность:</div>
+		<div class="col-8"><input type="text" name="Duration" /></div>
+	</div>
+	<div class="row">
+		<div><button asp-controller="Home" asp-action="CreateWork" class="btn btn-primary">Добавить</button></div>
+	</div>
+</form>
+<div>@ViewBag.Exception</div>
\ No newline at end of file
diff --git a/CarService/CarServiceWebApp/Views/Home/Enter.cshtml b/CarService/CarServiceWebApp/Views/Home/Enter.cshtml
index 77a8f67..463ef5b 100644
--- a/CarService/CarServiceWebApp/Views/Home/Enter.cshtml
+++ b/CarService/CarServiceWebApp/Views/Home/Enter.cshtml
@@ -1,5 +1,5 @@
 @{
-	ViewData["Title"] = "Enter";
+	ViewData["Title"] = "Вход";
 }
 
 <div class="text-center">
diff --git a/CarService/CarServiceWebApp/Views/Home/Work.cshtml b/CarService/CarServiceWebApp/Views/Home/Work.cshtml
index 5661d93..4973cf6 100644
--- a/CarService/CarServiceWebApp/Views/Home/Work.cshtml
+++ b/CarService/CarServiceWebApp/Views/Home/Work.cshtml
@@ -1,5 +1,6 @@
 <form method="post">
 	<div hidden><input type="text" name="Id" value="@ViewBag.Work.Id" /></div>
+	<div hidden><input type="text" name="WorkerId" value="@ViewBag.Work.WorkerId" /></div>
 	<div class="row">
 		<div class="col-4">Название:</div>
 		<div class="col-8"><input type="text" name="Name" value="@ViewBag.Work.Name" /></div>
@@ -13,10 +14,10 @@
 		<div class="col-8"><input type="text" name="Duration" value="@ViewBag.Work.Duration" /></div>
 	</div>
 	<div class="row">
-		<div><button asp-controller="Home" asp-action="UpdateWork"class="btn btn-primary">Изменить</button></div>
+		<div><button asp-controller="Home" asp-action="UpdateWork" class="btn btn-primary">Изменить</button></div>
 	</div>
 	<div class="row">
-		<div><button asp-controller="Home" asp-action="DeleteWork"class="btn btn-primary">Удалить</button></div>
+		<div><button asp-controller="Home" asp-action="DeleteWork" class="btn btn-primary">Удалить</button></div>
 	</div>
 	<div class="row">
 		<div><button asp-controller="Home" asp-action="Works" type="submit" class="btn btn-primary">Отмена</button></div>
diff --git a/CarService/CarServiceWebApp/Views/Home/Works.cshtml b/CarService/CarServiceWebApp/Views/Home/Works.cshtml
index 10a5d13..20d02d1 100644
--- a/CarService/CarServiceWebApp/Views/Home/Works.cshtml
+++ b/CarService/CarServiceWebApp/Views/Home/Works.cshtml
@@ -6,26 +6,29 @@
 	<h1 class="display-4">Работы</h1>
 	@if (ViewBag.Works.Count != 0)
 	{
-		<table>
-			<thead>
-				<tr>
-					<th>Название</th>
-					<th>Цена (в рублях)</th>
-					<th>Длительность (в часах)</th>
-				</tr>
-			</thead>
-			<tbody>
-				@foreach (var work in ViewBag.Works)
-				{
+		<center>
+			<table>
+				<thead>
 					<tr>
-						<td>@work.Name</td>
-						<td>@work.Price</td>
-						<td>@work.Duration</td>
-						<td><a href="/Home/Work/@work.Id">Изменить</a></td>
+						<th>Название</th>
+						<th>Цена (в рублях)</th>
+						<th>Длительность (в часах)</th>
 					</tr>
-				}
-			</tbody>
-		</table>
+				</thead>
+				<tbody>
+					@foreach (var work in ViewBag.Works)
+					{
+						<tr>
+							<td>@work.Name</td>
+							<td>@work.Price</td>
+							<td>@work.Duration</td>
+							<td><a href="/Home/Work/@work.Id">Изменить</a></td>
+						</tr>
+					}
+				</tbody>
+			</table>
+		</center>
 	}
+	<div><center><a asp-controller="Home" asp-action="CreateWork" class="btn btn-primary">Добавить</a></center></div>
 	<div>@ViewBag.Exception</div>
 </div>
\ No newline at end of file