cruds

HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs

@@ -1,6 +1,7 @@
 using HardwareShopContracts.BindingModels;
 using HardwareShopContracts.ViewModels;
 using HardwareShopDatabaseImplement.Models;
+using HardwareShopDatabaseImplement.Models.Storekeeper;
 using HardwareShopDataModels.Enums;
 using Microsoft.AspNetCore.Mvc;
 
@@ -14,6 +15,7 @@ namespace HardwareShopStorekeeperApp.Controllers
         {
             _logger = logger;
         }
+
         public IActionResult CreateOrder()
         {
             if (APIClient.User == null)
@@ -131,13 +133,109 @@ namespace HardwareShopStorekeeperApp.Controllers
             APIClient.PostRequest("api/good/creategood", goodModel);
         }
 
-        public IActionResult LinkBuilds()
+        public IActionResult UpdateGood(int goodid)
+        {
+            if (APIClient.User == null)
+            {
+                throw new Exception("Вы как сюда попали? Сюда вход только авторизованным");
+            }
+            ViewBag.Components = APIClient.GetRequest<List<ComponentViewModel>>($"api/component/getcomponents?userId={APIClient.User.Id}");
+            return View(goodid);
+        }
+
+        [HttpPost]
+        public void UpdateGood([FromBody] GoodBindingModel goodModel)
+        {
+            if (APIClient.User == null)
+            {
+                throw new Exception("Вы как сюда попали? Сюда вход только авторизованным");
+            }
+            if (string.IsNullOrEmpty(goodModel.GoodName))
+            {
+                throw new Exception("Название не должно быть пустым");
+            }
+            if (goodModel.Price <= 0)
+            {
+                throw new Exception("Цена должна быть больше 0");
+            }
+            goodModel.UserId = APIClient.User.Id;
+            APIClient.PostRequest("api/good/updatedata", goodModel);
+        }
+
+        [HttpGet]
+        public Tuple<GoodViewModel, List<Tuple<ComponentViewModel?, int>>>? GetGoodUpdate(int goodid)
+        {
+            if (APIClient.User == null)
+            {
+                throw new Exception("Вы как сюда попали? Сюда вход только авторизованным");
+            }
+            var result = APIClient.GetRequest<Tuple<GoodViewModel,
+                List<Tuple<ComponentViewModel?, int>>>?>($"api/good/getgoodupdate?id={goodid}");
+            return result;
+        }
+
+        [HttpPost]
+        public void DeleteGood(int good)
+        {
+            if (APIClient.User == null)
+            {
+                throw new Exception("Вы как сюда попали? Сюда вход только авторизованным");
+            }
+            if (good <= 0)
+            {
+                throw new Exception($"Идентификтаор товара не может быть меньше или равен 0");
+            }
+            APIClient.PostRequest("api/good/deletegood", new GoodBindingModel
+            {
+                Id = good
+            });
+        }
+
+        public IActionResult LinkBuilds(int componentid)
         {
             if (APIClient.User == null)
             {
                 return Redirect("~/Home/Enter");
             }
-            return View();
+            ViewBag.Builds = APIClient.GetRequest<List<BuildViewModel>>($"api/build/getbuilds");
+            return View(componentid);
+        }
+
+        [HttpPost]
+        public void LinkBuilds([FromBody] ComponentBindingModel componentModel)
+        {
+            if (APIClient.User == null)
+            {
+                throw new Exception("Вы как сюда попали? Сюда вход только авторизованным");
+            }
+            componentModel.UserId = APIClient.User.Id;
+            APIClient.PostRequest("api/component/updatedata", componentModel);
+        }
+
+        [HttpGet]
+        public BuildViewModel? GetBuild(int buildId)
+        {
+            if (APIClient.User == null)
+            {
+                throw new Exception("Вы как сюда попали? Сюда вход только авторизованным");
+            }
+            if (buildId <= 0)
+            {
+                throw new Exception($"Идентификтаор сборки не может быть меньше или равен 0");
+            }
+            var result = APIClient.GetRequest<BuildViewModel>($"api/build/getbuild?buildId={buildId}");
+            return result;
+        }
+
+        [HttpGet]
+        public List<Tuple<BuildViewModel, int>>? GetComponentBuilds(int componentid)
+        {
+            if (APIClient.User == null)
+            {
+                throw new Exception("Вы как сюда попали? Сюда вход только авторизованным");
+            }
+            var result = APIClient.GetRequest<List<Tuple<BuildViewModel, int>>?>($"api/component/getcomponentbuilds?id={componentid}");
+            return result;
         }
 
         public IActionResult CreateComponent()

HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml

@@ -16,7 +16,6 @@
 	@{
 		<p>
 			<a asp-action="CreateComponent" class="btn btn-primary mx-2">Создать комплектующее</a>
-			<a asp-action="LinkBuilds" class="btn btn-primary mx-2">Привязка сборок</a>
 		</p>
 		<table class="table">
 			<thead>
@@ -50,6 +49,12 @@
 						</td>
 						<td>
 							<div>
+								<a asp-controller="Storekeeper"
+									asp-action="LinkBuilds"
+									asp-route-componentid="@item.Id"
+									class="btn btn-success">
+									<i class="fa fa-pen-to-square" aria-hidden="true"></i>
+								</a>
 								<button onclick="getComponent(@item.Id)" type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#updateModal">
 									<i class="fa fa-pencil" aria-hidden="true"></i>
 								</button>

HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateComponent.cshtml

@@ -10,15 +10,15 @@
 <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="name">
+		<input type="text" class="form-control" name="name" required>
 	</div>
 	<div class="col-sm-3">
 		<label class="form-label">Стоимость</label>
-		<input type="number" step="0.01" class="form-control" name="cost" min="0.01">
+		<input type="number" step="0.01" class="form-control" name="cost" min="0.01" required>
 	</div>
 	<div class="col-sm-3">
 		<label class="form-label">Дата приобретения</label>
-		<input type="datetime-local" class="form-control" name="date">
+		<input type="datetime-local" class="form-control" name="date" required>
 	</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>

HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateGood.cshtml

@@ -11,16 +11,15 @@
 <div 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="name" id="name" required>
+		<input type="text" class="form-control" name="name" id="name" >
 	</div>
 	<div class="col-sm-3">
 		<label class="form-label">Цена</label>
-		<input type="number" step="0.01" class="form-control" name="price" id="price" readonly min="0.01" value="0" required>
+		<input type="number" step="0.01" class="form-control" name="price" id="price" readonly min="0.01" value="0" >
 	</div>
 	<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>
@@ -28,6 +27,7 @@
 				<th scope="col">Комплектующее</th>
 				<th scope="col">Количество</th>
 				<th scope="col">Сумма</th>
+				<th scope="col">Действие</th>
 			</tr>
 		</thead>
 		<tbody id="result">
@@ -49,7 +49,7 @@
 				<label class="form-label">Комплектующее</label>
 				<select id="component" name="component" class="form-control" asp-items="@(new SelectList(@ViewBag.Components, "Id", "ComponentName"))"></select>
 				<label class="form-label">Количество</label>
-				<input type="number" class="form-control" name="count" id="count" min="1" value="1" required>
+				<input type="number" class="form-control" name="count" id="count" min="1" value="1" >
 			</div>
 			<div class="modal-footer">
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Закрыть</button>
@@ -65,7 +65,6 @@
 		let list = [];
 		const name = document.getElementById("name");
 		const submitComponentBtn = document.getElementById("savecomponent");
-		const editBtn = document.getElementById("editcomponent");
 		const saveBtn = document.getElementById("creategood");
 		const countElem = document.getElementById("count");
 		const resultTable = document.getElementById("result");
@@ -75,6 +74,7 @@
 			console.log('try to add component')
 			var count = $('#count').val();
 			var component = $('#component').val();
+			if (component && count)
 			$.ajax({
 				method: "GET",
 				url: `/Storekeeper/GetComponent`,
@@ -93,11 +93,17 @@
 					reloadTable()
 					countElem.value = '1'
 				}
-			});
+			}).fail(function(xhr, textStatus, errorThrown) {
+				alert(xhr.responseText);
+			})
 		})
 
 		saveBtn.addEventListener("click", () => {
 			console.log('try to add good')
+			if (list.length == 0) {
+				alert('failed add good. components are empty')
+				return
+			}
 			let components = []
 			let counts = []
 			list.forEach((x) => { 
@@ -113,18 +119,32 @@
 						"GoodComponentsComponents": components, "GoodComponentsCounts": counts })
 				}
 			).done(() => window.location.href = '/Storekeeper/Goods')
+			.fail(function(xhr, textStatus, errorThrown) {
+				alert(xhr.responseText);
+			})
 		})
 
 		function reloadTable() {
 			resultTable.innerHTML = ''
 			let price = 0;
+			let count = 0;
 			list.forEach((elem) => {
-				console.log(elem);
+				resultTable.innerHTML += `<tr><td>${elem.component.componentName}</td><td>${elem.count}</td><td>${Math.round(elem.component.cost * elem.count * 100) / 100}</td><td> \
-				resultTable.innerHTML += `<tr><td>${elem.component.componentName}</td><td>${elem.count}</td><td>${Math.round(elem.component.cost * elem.count * 100) / 100}</td></tr>`
+					<div> \
+						<button onclick="deleteComponent(${count})" type="button" class="btn btn-danger"> \
+							<i class="fa fa-trash" aria-hidden="true"></i> \
+						</button> \
+						</div><td/></tr>`
+				count++;
 				price += elem.component.cost * elem.count
 			})
 			totalPrice.value = Math.round(price * 100) / 100
 		}
 
+		function deleteComponent(id) {
+			list = list.filter(value => value.component.componentName != resultTable.rows[id].cells[0].innerText)
+			reloadTable()
+		}
+		
 	</script>
 }

HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateOrder.cshtml

@@ -10,7 +10,7 @@
 <form method="post" class="d-flex flex-column align-items-center">
 	<div class="col-sm-3">
 		<label class="form-label">Товар</label>
-		<select id="good" name="good" class="form-control" asp-items="@(new SelectList(@ViewBag.Goods, "Id", "GoodName"))"></select>
+		<select id="good" name="good" class="form-control" asp-items="@(new SelectList(@ViewBag.Goods, "Id", "GoodName"))" required></select>
 	</div>	
 	<div class="col-sm-3">
 		<label class="form-label">Количество</label>
@@ -18,7 +18,7 @@
 	</div>
 	<div class="col-sm-3">
 		<label class="form-label">Сумма</label>
-		<input type="number" step="0.01" class="form-control" name="sum" id="sum" value="0" readonly required>
+		<input type="number" step="0.01" class="form-control" name="sum" id="sum" value="0" min="0,01" readonly required>
 	</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>
@@ -46,6 +46,9 @@
 					success: function (result) {
 						$("#sum").val(result);
 					}
+				})
+				.fail(function(xhr, textStatus, errorThrown) {
+					alert(xhr.responseText);
 				});
 			};
 		}

HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml

@@ -14,8 +14,6 @@
 <div class="text-center">
 	<p>
 		<a asp-action="CreateGood" class="btn btn-primary mx-2">Создать товар</a>
-		<a asp-action="Goods" class="btn btn-primary mx-2">Изменить товар</a>
-		<a asp-action="Goods" class="btn btn-primary mx-2">Удалить товар</a>
 	</p>
 	<table class="table">
 		<thead>
@@ -26,20 +24,49 @@
 				<th>
 					Цена
 				</th>
+				<th>
+					Действия
+				</th>
 			</tr>
 		</thead>
 		<tbody>
 			@foreach (var item in Model)
-				{
+			{
-					<tr>
+				<tr>
-						<td>
+					<td>
-							@Html.DisplayFor(modelItem => item.GoodName)
+						@Html.DisplayFor(modelItem => item.GoodName)
-						</td>
+					</td>
-						<td>
+					<td>
-							@Html.DisplayFor(modelItem => item.Price)
+						@Html.DisplayFor(modelItem => item.Price)
-						</td>
+					</td>
-					</tr>
+					<td>
-				}
+						<div>
+							<a asp-controller="Storekeeper"
+								asp-action="UpdateGood"
+								asp-route-goodid="@item.Id"
+								class="btn btn-primary">
+								<i class="fa fa-pencil" aria-hidden="true"></i>
+							</a>
+							<button onclick="deleteGood(@item.Id)" type="button" class="btn btn-danger">
+								<i class="fa fa-trash" aria-hidden="true"></i>
+							</button>
+						</div>
+					</td>
+				</tr>
+			}
 		</tbody>
 	</table>
 </div>
+
+@section Scripts
+{
+	<script>
+		function deleteGood(goodId) {
+			$.ajax({
+				method: "POST",
+				url: "/Storekeeper/DeleteGood",
+				data: { good: goodId }
+			}).done(() => window.location.href = "/Storekeeper/Goods");
+		}
+	</script>
+}

HardwareShop/HardwareShopClientApp/Views/Storekeeper/LinkBuilds.cshtml

@@ -8,32 +8,28 @@
     <h1 class="display-4">Привязка сборок</h1>
 </div>
 
-<form method="post" class="d-flex flex-column align-items-center">
+<div class="d-flex flex-column align-items-center">
 	<div class="col-sm-3">
-		<label class="form-label">Комплектующее</label>
-		<select class="form-control" name="component"></select>
-
 		<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" data-bs-toggle="modal" data-bs-target="#exampleModal">Изменить</button>
-			<button type="button" class="btn btn-primary mx-2 mt-3">Отвязать</button>
 		</div>
 	</div>
 	<h1 class="display-6">Привязанные сборки</h1>
 	<table class="table table-hover">
 		<thead>
 			<tr>
-				<th id="name" scope="col">Сборка</th>
+				<th scope="col">Сборка</th>
-				<th id="price" scope="col">Количество</th>
+				<th scope="col">Количество</th>
+				<th scope="col">Действие</th>
 			</tr>
 		</thead>
-		<tbody>
+		<tbody id="result">
 		</tbody>
 	</table>
 	<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>
+		<button type="button" class="btn btn-primary mt-3 px-4" id="linkbuilds">Сохранить</button>
 	</div>
-</form>
+</div>
 
 <div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
 	<div class="modal-dialog">
@@ -44,14 +40,120 @@
 			</div>
 			<div class="modal-body">
 				<label class="form-label">Сборка</label>
-				<select class="form-control" name="build"></select>
+				<select id="build" name="build" class="form-control" asp-items="@(new SelectList(@ViewBag.Builds, "Id", "BuildName"))" required></select>
 				<label class="form-label">Количество</label>
-				<input type="number" class="form-control" name="count" min="1">
+				<input type="number" class="form-control" name="count" id="count" min="1" value="1" required>
 			</div>
 			<div class="modal-footer">
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Закрыть</button>
-				<button type="submit" class="btn btn-primary">Сохранить</button>
+				<button type="button" class="btn btn-primary" data-bs-dismiss="modal" id="savebuild">Сохранить</button>
 			</div>
 		</div>
 	</div>
 </div>
+
+@section Scripts
+{
+	<script>
+		const componentid = @Model;
+		let component;
+		let list = [];
+		const submitBuildBtn = document.getElementById("savebuild");
+		const saveBtn = document.getElementById("linkbuilds");
+		const countElem = document.getElementById("count");
+		const resultTable = document.getElementById("result");
+
+		submitBuildBtn.addEventListener("click", () => {
+			console.log('try to add build')
+			var count = $('#count').val();
+			var build = $('#build').val();
+			$.ajax({
+				method: "GET",
+				url: `/Storekeeper/GetBuild`,
+				data: { buildId: build },
+				success: function (result) {
+					let flag = false
+					if (list.length > 0) {
+						list.forEach((elem) => {
+							if (elem.build.id === parseInt(result.id)) {
+								console.log('build already added')
+								flag = true
+							}
+						})
+					}
+					if (!flag) list.push({ build: result, count: count })
+					reloadTable()
+					countElem.value = '1'
+				}
+			});
+		})
+
+		saveBtn.addEventListener("click", () => {
+			console.log('try to link builds')
+			let builds = []
+			let counts = []
+			list.forEach((x) => { 
+				builds.push(x.build); 
+				counts.push(parseInt(x.count)) 
+			})
+			$.ajax(
+				{
+					url: `/Storekeeper/LinkBuilds`,
+					type: 'POST',
+					contentType: 'application/json',
+					data: JSON.stringify({ "Id": componentid, "ComponentName": component.componentName, 
+					"Cost": component.cost, "ComponentBuildsBuilds": builds, "ComponentBuildsCounts": counts })
+				}
+			).done(() => window.location.href = '/Storekeeper/Components')
+		})
+
+		function reloadTable() {
+			resultTable.innerHTML = ''
+			let count = 0;
+			list.forEach((elem) => {
+				resultTable.innerHTML += `<tr><td>${elem.build.buildName}</td><td>${elem.count}</td><td> \
+					<div> \
+						<button onclick="deleteBuild(${count})" type="button" class="btn btn-danger"> \
+							<i class="fa fa-trash" aria-hidden="true"></i> \
+						</button> \
+						</div><td/></tr>`
+				count++;
+			})
+		}
+
+		function deleteBuild(id) {
+			list = list.filter(value => value.build.buildName != resultTable.rows[id].cells[0].innerText)
+			reloadTable()
+		}
+
+		function getComponentBuilds() {
+			console.log(componentid)
+			if (componentid) {
+				$.ajax({
+					method: "GET",
+					url: "/Storekeeper/GetComponent",
+					data: { Id: componentid },
+					success: function (result) {
+						component = result
+					}
+				});
+				$.ajax({
+					method: "GET",
+					url: "/Storekeeper/GetComponentBuilds",
+					data: { componentid: componentid },
+					success: function (result) {
+						console.log(result)
+						if (result) {
+							result.forEach(elem => {
+								list.push({ build: elem.item1, count: elem.item2 })
+							})
+							reloadTable()
+						}
+					}
+				});
+			};
+		}
+		getComponentBuilds();
+
+	</script>
+}

HardwareShop/HardwareShopClientApp/Views/Storekeeper/Orders.cshtml

@@ -118,19 +118,25 @@
 						data: { id: order }
 					}
 				).done(() => window.location.href='/Storekeeper/Orders')
+				.fail(function(xhr, textStatus, errorThrown) {
+					alert(xhr.responseText);
+				})
 			})
 			inwork.addEventListener("click", () => {
-				console.log('try to delete order')
+				console.log('try to update order status')
 				$.ajax(
 					{
 						url: `/Storekeeper/UpdateOrder`,
 						type: 'POST',
 						data: { id : order, status : 1 }
 					}
-				).done(() => window.location.href='/Storekeeper/Orders')
+				).done((result) => window.location.href='/Storekeeper/Orders')
+				.fail(function(xhr, textStatus, errorThrown) {
+					alert(xhr.responseText);
+				})
 			})
 			ready.addEventListener("click", () => {
-				console.log('try to delete order')
+				console.log('try to update order status')
 				$.ajax(
 					{
 						url: `/Storekeeper/UpdateOrder`,
@@ -138,9 +144,12 @@
 						data: { id : order, status : 2 }
 					}
 				).done(() => window.location.href='/Storekeeper/Orders')
+				.fail(function(xhr, textStatus, errorThrown) {
+					alert(xhr.responseText);
+				})
 			})
 			done.addEventListener("click", () => {
-				console.log('try to delete order')
+				console.log('try to update order status')
 				$.ajax(
 					{
 						url: `/Storekeeper/UpdateOrder`,
@@ -148,6 +157,9 @@
 						data: { id : order, status : 3 }
 					}
 				).done(() => window.location.href='/Storekeeper/Orders')
+				.fail(function(xhr, textStatus, errorThrown) {
+					alert(xhr.responseText);
+				})
 			})
 		};
 	}

HardwareShop/HardwareShopClientApp/Views/Storekeeper/UpdateGood.cshtml

@@ -0,0 +1,179 @@
+@using HardwareShopContracts.ViewModels
+
+@model int
+
+@{
+    ViewData["Title"] = "Товар";
+    Layout = "~/Views/Shared/_LayoutStorekeeper.cshtml";
+}
+
+<div class="text-center">
+	<h2 class="display-4">Редактирование товара</h2>
+</div>
+
+<div 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="name" id="name" required>
+	</div>
+	<div class="col-sm-3">
+		<label class="form-label">Цена</label>
+		<input type="number" step="0.01" class="form-control" name="price" id="price" readonly min="0.01" value="0" required>
+	</div>
+	<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>
+	</div>
+	<table class="table table-hover">
+		<thead>
+			<tr>
+				<th scope="col">Комплектующее</th>
+				<th scope="col">Количество</th>
+				<th scope="col">Сумма</th>
+				<th scope="col">Действие</th>
+			</tr>
+		</thead>
+		<tbody id="result">
+		</tbody>
+	</table>
+	<div class="col-sm-2 d-flex justify-content-evenly align-items-baseline">
+		<button type="button" class="btn btn-primary mt-3 px-4" id="editgood">Сохранить</button>
+	</div>
+</div>
+
+<div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h5 class="modal-title" id="exampleModalLabel">Комплектующее</h5>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
+			</div>
+			<div class="modal-body">
+				<label class="form-label">Комплектующее</label>
+				<select id="component" name="component" class="form-control" asp-items="@(new SelectList(@ViewBag.Components, "Id", "ComponentName"))"></select>
+				<label class="form-label">Количество</label>
+				<input type="number" class="form-control" name="count" id="count" min="1" value="1" required>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Закрыть</button>
+				<button type="button" class="btn btn-primary" data-bs-dismiss="modal" id="savecomponent">Сохранить</button>
+			</div>
+		</div>
+	</div>
+</div>
+
+@section Scripts 
+{
+    <script>
+		const goodid = @Model
+		// components & counts
+		let list = [];
+		const name = document.getElementById("name");
+		const submitComponentBtn = document.getElementById("savecomponent");
+		const saveBtn = document.getElementById("editgood");
+		const countElem = document.getElementById("count");
+		const resultTable = document.getElementById("result");
+		const totalPrice = document.getElementById("price");
+
+		submitComponentBtn.addEventListener("click", () => {
+			console.log('try to add component')
+			var count = $('#count').val();
+			var component = $('#component').val();
+			$.ajax({
+				method: "GET",
+				url: `/Storekeeper/GetComponent`,
+				data: { Id: component },
+				success: function (result) {
+					let flag = false
+					if (list.length > 0) {
+						list.forEach((elem) => {
+							if (elem.component.id === parseInt(result.id)) {
+								console.log('component already added')
+								flag = true
+							}
+						})
+					}
+					if (!flag) list.push({ component: result, count: count })
+					reloadTable()
+					countElem.value = '1'
+				}
+			}).fail(function(xhr, textStatus, errorThrown) {
+				alert(xhr.responseText);
+			});
+		})
+
+		saveBtn.addEventListener("click", () => {
+			console.log('try to update good')
+			if (list.length == 0) {
+				console.log('failed update good')
+				return
+			}
+			let components = []
+			let counts = []
+			list.forEach((x) => { 
+				components.push(x.component); 
+				counts.push(parseInt(x.count)) 
+			})
+			$.ajax(
+				{
+					url: `/Storekeeper/UpdateGood`,
+					type: 'POST',
+					contentType: 'application/json',
+					data: JSON.stringify({ "Id": goodid, "GoodName": name.value,"Price": parseFloat(totalPrice.value), 
+						"GoodComponentsComponents": components, "GoodComponentsCounts": counts })
+				}
+			).done(() => window.location.href = '/Storekeeper/Goods')
+			.fail(function(xhr, textStatus, errorThrown) {
+				alert(xhr.responseText);
+			})
+		})
+
+		function reloadTable() {
+			resultTable.innerHTML = ''
+			let price = 0;
+			let count = 0;
+			list.forEach((elem) => {
+				resultTable.innerHTML += `<tr><td>${elem.component.componentName}</td><td>${elem.count}</td><td>${Math.round(elem.component.cost * elem.count * 100) / 100}</td><td> \
+					<div> \
+						<button onclick="deleteComponent(${count})" type="button" class="btn btn-danger"> \
+							<i class="fa fa-trash" aria-hidden="true"></i> \
+						</button> \
+						</div><td/></tr>`
+				count++;
+				price += elem.component.cost * elem.count
+			})
+			totalPrice.value = Math.round(price * 100) / 100
+		}
+
+		function deleteComponent(id) {
+			list = list.filter(value => value.component.componentName != resultTable.rows[id].cells[0].innerText)
+			reloadTable()
+		}
+
+		function getGood() {
+			if (goodid) {
+				$.ajax({
+					method: "GET",
+					url: "/Storekeeper/GetGoodUpdate",
+					data: { goodid: goodid },
+					success: function (result) {
+						if (result) {
+							name.value = result.item1.goodName
+							totalPrice.value = result.item1.price
+							result.item2.forEach(elem => {
+								list.push({ component: elem.item1, count: elem.item2 })
+							})
+							reloadTable()
+						}
+						else 
+							alert("Ошибка получения товара")
+					}
+				})
+				.fail(function(xhr, textStatus, errorThrown) {
+					alert(xhr.responseText);
+				})
+			};
+		}
+		getGood();
+    </script>
+}

HardwareShop/HardwareShopContracts/BindingModels/ComponentBindingModel.cs

@@ -1,4 +1,5 @@
-using HardwareShopDataModels.Models;
+using HardwareShopContracts.ViewModels;
+using HardwareShopDataModels.Models;
 
 namespace HardwareShopContracts.BindingModels
 {
@@ -19,5 +20,17 @@ namespace HardwareShopContracts.BindingModels
             get;
             set;
         } = new();
+
+        public List<BuildViewModel> ComponentBuildsBuilds
+        {
+            get;
+            set;
+        } = new();
+
+        public List<int> ComponentBuildsCounts
+        {
+            get;
+            set;
+        } = new();
     }
 }

HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs

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

HardwareShop/HardwareShopDatabaseImplement/Implements/Storekeeper/ComponentStorage.cs

@@ -18,6 +18,13 @@ namespace HardwareShopDatabaseImplement.Implements.Storekeeper
                 .FirstOrDefault(rec => rec.Id == model.Id);
             if (element != null)
             {
+                var componentGoods = context.GoodsComponents.Where(x => x.ComponentId == element.Id).ToList();
+                componentGoods.ForEach(x =>
+                {
+                    var good = context.Goods.FirstOrDefault(rec => rec.Id == x.GoodId);
+                    if (good != null)
+                        context.Goods.Remove(good);
+                });
                 context.Components.Remove(element);
                 context.SaveChanges();
                 return element.GetViewModel;

HardwareShop/HardwareShopDatabaseImplement/Models/Storekeeper/Component.cs

@@ -85,12 +85,34 @@ namespace HardwareShopDatabaseImplement.Models.Storekeeper
             var componentBuilds = context.ComponentsBuilds.Where(rec => rec.ComponentId == model.Id).ToList();
             if (componentBuilds != null && componentBuilds.Count > 0)
             {   // удалили те, которых нет в модели
-                context.ComponentsBuilds.RemoveRange(componentBuilds.Where(rec => !model.ComponentBuilds.ContainsKey(rec.BuildId)));
+                context.ComponentsBuilds.RemoveRange(componentBuilds.Where(rec =>
+                {
+                    bool flag = !model.ComponentBuilds.ContainsKey(rec.BuildId);
+                    if (flag)
+                    {
+                        var build = context.Builds.First(x => x.Id == rec.Build.Id);
+                        if (build != null)
+                        {
+                            build.Price -= rec.Component.Cost * rec.Count;
+                        }
+                        context.SaveChanges();
+                    }
+                    return flag;
+                })); 
                 context.SaveChanges();
                 componentBuilds = context.ComponentsBuilds.Where(rec => rec.ComponentId == model.Id).ToList();
                 // обновили количество у существующих записей
                 foreach (var updateBuild in componentBuilds)
                 { 
+                    var build = context.Builds.First(x => x.Id == updateBuild.Build.Id);
+                    if (updateBuild.Count > model.ComponentBuilds[updateBuild.BuildId].Item2)
+                    {
+                        build.Price -= (updateBuild.Count - model.ComponentBuilds[updateBuild.BuildId].Item2) * updateBuild.Component.Cost;
+                    }
+                    else if (updateBuild.Count < model.ComponentBuilds[updateBuild.BuildId].Item2)
+                    {
+                        build.Price += (model.ComponentBuilds[updateBuild.BuildId].Item2 - updateBuild.Count) * updateBuild.Component.Cost;
+                    }
                     updateBuild.Count = model.ComponentBuilds[updateBuild.BuildId].Item2;
                     model.ComponentBuilds.Remove(updateBuild.BuildId);
                 }

HardwareShop/HardwareShopRestApi/Controllers/BuildController.cs

@@ -24,10 +24,12 @@ namespace HardwareShopRestApi.Controllers
         }
 
 		[HttpGet]
-        public List<BuildViewModel>? GetBuilds(int userId)
+        public List<BuildViewModel>? GetBuilds(int userId = 0)
         {
             try
             {
+                if (userId == 0)
+                    return _buildLogic.ReadList(null);
                 return _buildLogic.ReadList(new BuildSearchModel
                 {
                     UserId = userId
@@ -40,7 +42,6 @@ namespace HardwareShopRestApi.Controllers
             }
         }
 
-
         [HttpGet]
         public BuildViewModel? GetBuild(int buildId)
         {

HardwareShop/HardwareShopRestApi/Controllers/ComponentController.cs

@@ -2,6 +2,8 @@
 using HardwareShopContracts.BusinessLogicsContracts;
 using HardwareShopContracts.SearchModels;
 using HardwareShopContracts.ViewModels;
+using HardwareShopDatabaseImplement.Models.Storekeeper;
+using HardwareShopDataModels.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace HardwareShopRestApi.Controllers
@@ -48,6 +50,28 @@ namespace HardwareShopRestApi.Controllers
             }
         }
 
+        [HttpGet]
+        public List<Tuple<BuildViewModel, int>>? GetComponentBuilds(int id)
+        {
+            try
+            {
+                var component = _component.ReadElement(new() { Id = id });
+                if (component == null)
+                    return null;
+                var tuple = component.ComponentBuilds.Select(x => Tuple.Create(new BuildViewModel
+                {
+                    Id = x.Value.Item1.Id,
+                    BuildName = x.Value.Item1.BuildName,
+                }, x.Value.Item2)).ToList();
+                return tuple;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения сборок комплектующего");
+                throw;
+            }
+        }
+
         [HttpPost]
         public void CreateComponent(ComponentBindingModel model)
         {
@@ -67,6 +91,11 @@ namespace HardwareShopRestApi.Controllers
         {
             try
             {
+                for (int i = 0; i < model.ComponentBuildsCounts.Count; i++)
+                {
+                    model.ComponentBuilds.Add(model.ComponentBuildsBuilds[i].Id,
+                        (model.ComponentBuildsBuilds[i] as IBuildModel, model.ComponentBuildsCounts[i]));
+                }
                 _component.Update(model);
             }
             catch (Exception ex)

HardwareShop/HardwareShopRestApi/Controllers/GoodController.cs

@@ -62,6 +62,30 @@ namespace HardwareShopRestApi.Controllers
             }
         }
 
+        [HttpGet]
+        public Tuple<GoodViewModel, List<Tuple<ComponentViewModel, int>>>? GetGoodUpdate(int id)
+        {
+            try
+            {
+                var good = _good.ReadElement(new() { Id = id });
+                if (good == null)
+                    return null;
+                var tuple = Tuple.Create(good,
+                    good.GoodComponents.Select(x => Tuple.Create(new ComponentViewModel 
+                    { 
+                        Id = x.Value.Item1.Id,
+                        ComponentName = x.Value.Item1.ComponentName,
+                        Cost = x.Value.Item1.Cost
+                    }, x.Value.Item2)).ToList());
+                return tuple;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения товара");
+                throw;
+            }
+        }
+
         [HttpPost]
         public void CreateGood(GoodBindingModel model)
         {
@@ -86,6 +110,11 @@ namespace HardwareShopRestApi.Controllers
         {
             try
             {
+                for (int i = 0; i < model.GoodComponentsCounts.Count; i++)
+                {
+                    model.GoodComponents.Add(model.GoodComponentsComponents[i].Id,
+                        (model.GoodComponentsComponents[i] as IComponentModel, model.GoodComponentsCounts[i]));
+                }
                 _good.Update(model);
             }
             catch (Exception ex)