From e4e9447a0b007c4677943903ec8be817ca29ea25 Mon Sep 17 00:00:00 2001 From: dasha Date: Fri, 19 May 2023 22:07:03 +0400 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=D0=B8=2013?= =?UTF-8?q?=20=D1=8D=D1=82=D0=B0=D0=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OfficePackage/AbstractSaveToExcel.cs | 1 - .../Controllers/StorekeeperController.cs | 10 +++++++ .../Views/Storekeeper/LinkBuilds.cshtml | 28 +++++++++++++++++-- .../HardwareShopDatabase.cs | 2 +- .../Implements/Worker/PurchaseStorage.cs | 23 +++++++++------ .../Controllers/BuildController.cs | 1 + .../Controllers/CommentController.cs | 19 ++++++++++++- .../Controllers/PurchaseController.cs | 16 ++++++++++- .../Controllers/HomeController.cs | 5 ++-- .../Views/Home/Comments.cshtml | 6 +--- .../Views/Home/LinkPurchase.cshtml | 2 +- .../Views/Home/listComponents.cshtml | 2 +- 12 files changed, 92 insertions(+), 23 deletions(-) diff --git a/HardwareShop/HardwareShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs index 10da8a0..a4b6f26 100644 --- a/HardwareShop/HardwareShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs +++ b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -129,7 +129,6 @@ namespace HardwareShopBusinessLogic.OfficePackage } } - rowIndex++; } SaveExcel(info); diff --git a/HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs b/HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs index 2010afc..be11702 100644 --- a/HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs +++ b/HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs @@ -443,5 +443,15 @@ namespace HardwareShopStorekeeperApp.Controllers reportModel.UserEmail = APIClient.User.Email; APIClient.PostRequest("api/report/componentsreportsendonmail", reportModel); } + + [HttpGet] + public List GetCommentsOnBuild(int buildId) + { + if (APIClient.User == null) + { + throw new Exception("Вы как сюда попали? Сюда вход только авторизованным"); + } + return APIClient.GetRequest>($"api/comment/GetCommentsOnBuild?buildId={buildId}")!; + } } } diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/LinkBuilds.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/LinkBuilds.cshtml index b8c9e6c..95e60d1 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/LinkBuilds.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/LinkBuilds.cshtml @@ -41,6 +41,9 @@
+ + + @@ -62,6 +65,21 @@ const saveBtn = document.getElementById("linkbuilds"); const countElem = document.getElementById("count"); const resultTable = document.getElementById("result"); + const selectBuilds = document.getElementById("build"); + const comments = document.getElementById("comments"); + + selectBuilds.addEventListener('change', function() { getCommentsOnBuild() }); + + function getCommentsOnBuild() { + $.ajax({ + method: "GET", + url: `/Storekeeper/GetCommentsOnBuild`, + data: { buildId: selectBuilds.value }, + success: function (result) { + reloadCommentsTable(result) + } + }); + } submitBuildBtn.addEventListener("click", () => { console.log('try to add build') @@ -121,13 +139,19 @@ }) } + function reloadCommentsTable(result) { + comments.innerHTML = '' + result.forEach((elem) => { + comments.innerHTML += `` + }) + } + 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", @@ -142,7 +166,6 @@ 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 }) @@ -154,6 +177,7 @@ }; } getComponentBuilds(); + getCommentsOnBuild(); } \ No newline at end of file diff --git a/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs b/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs index 80230f2..e9c4188 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs +++ b/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=5432;Database=Computer_Hardware_Store1;Username=user;Password=12345"); AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true); } diff --git a/HardwareShop/HardwareShopDatabaseImplement/Implements/Worker/PurchaseStorage.cs b/HardwareShop/HardwareShopDatabaseImplement/Implements/Worker/PurchaseStorage.cs index 6545a62..9cb20ab 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/Implements/Worker/PurchaseStorage.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/Implements/Worker/PurchaseStorage.cs @@ -22,7 +22,7 @@ namespace HardwareShopDatabaseImplement.Implements.Worker public List GetFilteredList(PurchaseSearchModel model) { using var context = new HardwareShopDatabase(); - if (model.UserId.HasValue && !model.PurchaseStatus.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue) + if (model.UserId.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue) { return context.Purchases .Include(x => x.Builds) @@ -36,21 +36,28 @@ namespace HardwareShopDatabaseImplement.Implements.Worker .Select(x => x.GetViewModel) .ToList(); } - if (model.UserId.HasValue) + if (model.UserId.HasValue && model.PurchaseStatus.HasValue) { + return context.Purchases + .Include(x => x.Goods) + .ThenInclude(x => x.Good) + .Where(x => x.PurchaseStatus == model.PurchaseStatus && x.UserId == model.UserId) + .Select(x => x.GetViewModel) + .ToList(); + } + if (model.UserId.HasValue) return context.Purchases .Include(x => x.Goods) .ThenInclude(x => x.Good) .Where(x => x.UserId == model.UserId) .Select(x => x.GetViewModel) .ToList(); - } return context.Purchases - .Include(x => x.Goods) - .ThenInclude(x => x.Good) - .Where(x => x.PurchaseStatus == model.PurchaseStatus) - .Select(x => x.GetViewModel) - .ToList(); + .Include(x => x.Goods) + .ThenInclude(x => x.Good) + .Where(x => x.PurchaseStatus == model.PurchaseStatus) + .Select(x => x.GetViewModel) + .ToList(); } public List GetReportFilteredList(PurchaseSearchModel model) diff --git a/HardwareShop/HardwareShopRestApi/Controllers/BuildController.cs b/HardwareShop/HardwareShopRestApi/Controllers/BuildController.cs index 83259f9..7e710c0 100644 --- a/HardwareShop/HardwareShopRestApi/Controllers/BuildController.cs +++ b/HardwareShop/HardwareShopRestApi/Controllers/BuildController.cs @@ -202,6 +202,7 @@ namespace HardwareShopRestApi.Controllers PurchaseStatus = purchase.PurchaseStatus, DatePurchase = purchase.DatePurchase, PurchaseGoods = purchase.PurchaseGoods, + UserId = purchase.UserId }); return true; } diff --git a/HardwareShop/HardwareShopRestApi/Controllers/CommentController.cs b/HardwareShop/HardwareShopRestApi/Controllers/CommentController.cs index 64aa4ca..e668a96 100644 --- a/HardwareShop/HardwareShopRestApi/Controllers/CommentController.cs +++ b/HardwareShop/HardwareShopRestApi/Controllers/CommentController.cs @@ -37,7 +37,24 @@ namespace HardwareShopRestApi.Controllers } } - [HttpGet] + [HttpGet] + public List? GetCommentsOnBuild(int buildId) + { + try + { + return _commentLogic.ReadList(new CommentSearchModel + { + BuildId = buildId + }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения списка комментариев пользоватля"); + throw; + } + } + + [HttpGet] public CommentViewModel? GetComment(int commentId) { try diff --git a/HardwareShop/HardwareShopRestApi/Controllers/PurchaseController.cs b/HardwareShop/HardwareShopRestApi/Controllers/PurchaseController.cs index 6574119..864ef1a 100644 --- a/HardwareShop/HardwareShopRestApi/Controllers/PurchaseController.cs +++ b/HardwareShop/HardwareShopRestApi/Controllers/PurchaseController.cs @@ -63,7 +63,21 @@ namespace HardwareShopRestApi.Controllers } } - [HttpGet] + [HttpGet] + public List? GetPurchasesNotDelivery(int userId) + { + try + { + return _purchaseLogic.ReadList(new() { UserId = userId, PurchaseStatus = PurchaseStatus.Выполняется }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения списка товаров"); + throw; + } + } + + [HttpGet] public PurchaseViewModel? GetPurchase(int purchaseId) { try diff --git a/HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs b/HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs index c93ef27..5820093 100644 --- a/HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs +++ b/HardwareShop/HardwareShopWorkerApp/Controllers/HomeController.cs @@ -438,7 +438,8 @@ namespace HardwareShopWorkerApp.Controllers APIClient.PostRequest("api/purchase/UpdateStatusPurchase", new PurchaseBindingModel { Id = id, - PurchaseStatus = (PurchaseStatus)status + PurchaseStatus = (PurchaseStatus)status, + UserId = APIClient.User.Id }); } @@ -521,7 +522,7 @@ namespace HardwareShopWorkerApp.Controllers { throw new Exception($"Идентификтаор сборки не может быть ниже или равен 0"); } - ViewBag.Purchase = APIClient.GetRequest>($"api/purchase/getpurchases?userId={APIClient.User.Id}"); + ViewBag.Purchase = APIClient.GetRequest>($"api/purchase/GetPurchasesNotDelivery?userId={APIClient.User.Id}"); return View(APIClient.GetRequest>>($"api/build/GetBuildPurchase?buildId={buildId}")); } diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/Comments.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/Comments.cshtml index 215a004..076a5df 100644 --- a/HardwareShop/HardwareShopWorkerApp/Views/Home/Comments.cshtml +++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/Comments.cshtml @@ -30,7 +30,7 @@ Текст
Комментарии
${elem.text}
- Название сборки к которой относится комментарий + Сборка Действия @@ -101,10 +101,6 @@
-
- - -
diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml index 9730923..3df23d3 100644 --- a/HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml +++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/LinkPurchase.cshtml @@ -2,7 +2,7 @@ @model List> @{ - ViewData["Title"] = "Привязка сборок"; + ViewData["Title"] = "Link purchase"; Layout = "~/Views/Shared/_LayoutWorker.cshtml"; } diff --git a/HardwareShop/HardwareShopWorkerApp/Views/Home/listComponents.cshtml b/HardwareShop/HardwareShopWorkerApp/Views/Home/listComponents.cshtml index ed1dc8d..9a4d755 100644 --- a/HardwareShop/HardwareShopWorkerApp/Views/Home/listComponents.cshtml +++ b/HardwareShop/HardwareShopWorkerApp/Views/Home/listComponents.cshtml @@ -1,6 +1,6 @@ @using HardwareShopContracts.ViewModels @{ - ViewData["Title"] = "Получение списка"; + ViewData["Title"] = "List components"; Layout = "~/Views/Shared/_LayoutWorker.cshtml"; }