From 1c4e1a32c6ec1322eb555464a057739ef5f0aadf Mon Sep 17 00:00:00 2001 From: ameerulrasyid Date: Mon, 24 Feb 2025 16:27:41 +0800 Subject: [PATCH] update item request inv master --- .../Admin/InventoryMasterController.cs | 2 +- .../Controllers/ItemMovementController.cs | 2 +- Areas/Inventory/Models/RequestModel.cs | 3 +- .../InventoryMaster/ItemRequestMaster.cshtml | 801 +++++++++++++++++- .../Views/InventoryMaster/QrMaster.cshtml | 251 ++++-- .../Inventory/Views/_InventoryPartial.cshtml | 2 +- .../Views/_InventoryPartialUser.cshtml | 2 +- Controllers/API/Inventory/InvMainAPI.cs | 5 +- PSTW_CentralSystem.csproj | 4 - 9 files changed, 994 insertions(+), 78 deletions(-) diff --git a/Areas/Inventory/Controllers/Admin/InventoryMasterController.cs b/Areas/Inventory/Controllers/Admin/InventoryMasterController.cs index 89b0e99..2675868 100644 --- a/Areas/Inventory/Controllers/Admin/InventoryMasterController.cs +++ b/Areas/Inventory/Controllers/Admin/InventoryMasterController.cs @@ -45,7 +45,7 @@ namespace PSTW_CentralSystem.Areas.Inventory.Controllers.Admin { return View(); } - public IActionResult QrScanner() + public IActionResult QrMaster() { return View(); } diff --git a/Areas/Inventory/Controllers/ItemMovementController.cs b/Areas/Inventory/Controllers/ItemMovementController.cs index fe1eb52..2615623 100644 --- a/Areas/Inventory/Controllers/ItemMovementController.cs +++ b/Areas/Inventory/Controllers/ItemMovementController.cs @@ -15,7 +15,7 @@ namespace PSTW_CentralSystem.Areas.Inventory.Controllers { return View(); } - public ActionResult Qr() + public ActionResult QrUser() { return View(); } diff --git a/Areas/Inventory/Models/RequestModel.cs b/Areas/Inventory/Models/RequestModel.cs index d773fd6..293adc1 100644 --- a/Areas/Inventory/Models/RequestModel.cs +++ b/Areas/Inventory/Models/RequestModel.cs @@ -18,7 +18,8 @@ namespace PSTW_CentralSystem.Areas.Inventory.Models [ForeignKey("UserId")] public virtual UserModel? User { get; set; } public string? ProductCategory { get; set; } - public string? remark { get; set; } + public string? remarkUser { get; set; } + public string? remarkMasterInv { get; set; } public string? status { get; set; } public DateTime requestDate { get; set; } public DateTime? approvalDate { get; set; } diff --git a/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml b/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml index 5f28270..825a62b 100644 --- a/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml +++ b/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml @@ -1 +1,800 @@ - \ No newline at end of file +@{ + ViewData["Title"] = "Product Request"; + Layout = "~/Views/Shared/_Layout.cshtml"; +} +@await Html.PartialAsync("~/Areas/Inventory/Views/_InventoryPartial.cshtml"); +
+
+
+

Pending Request

+ @* *@ +
+
+ @*
+ +
*@ +
+
+
+
+
+

Item Request

+ @* *@ +
+
+ @*
+ +
*@ +
+
+
+ + +@section Scripts { + @{ + await Html.RenderPartialAsync("_ValidationScriptsPartial"); + } + +} \ No newline at end of file diff --git a/Areas/Inventory/Views/InventoryMaster/QrMaster.cshtml b/Areas/Inventory/Views/InventoryMaster/QrMaster.cshtml index 8e61127..ea72ea8 100644 --- a/Areas/Inventory/Views/InventoryMaster/QrMaster.cshtml +++ b/Areas/Inventory/Views/InventoryMaster/QrMaster.cshtml @@ -33,8 +33,8 @@

QR & Barcode Scanner

-

Scan Result:

-
+ +

Scan Result:

@@ -112,82 +112,198 @@
- - @*
*@ - @*

Welcome, Admin! You have full access.

*@ - @*

Welcome, User! You have limited access.

*@ - @*

Guest View: Please log in.

*@ - @*
*@ - - - - - - + -
-
-
+
+
- @*Right Side*@ -
-
-
-

REGISTRATION ITEM

-
-
-
+ @*Right Side*@ +
+
+
+
+

Add Item Movement

+
- -
- -
-
- -
-
-
- - -
- -
- -
-
- - @* Remark *@ -
- -
- -
-
- - -
- - @* Submit and Reset Buttons *@ -
-
- - -
+
+ +
+
+
+ +
+ +
+
+
+ + +
+ +
+
+ +
+
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ + @* Submit and Reset Buttons *@ +
+
+ + +
+
+
+ +
+ +
+
+
+
+
+ + +
+ +
+
+ +
+
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ + @* Submit and Reset Buttons *@ +
+
+ + +
+
+
+
+
+ +
+
+
+
+
+ + +
+ +
+
+ +
+
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ + @* Submit and Reset Buttons *@ +
+
+ + +
+
+
+
+
+ + +
- +
+
@@ -227,6 +343,7 @@ storelist: null, selectedUser: "", selectedStore: "", + selectedAction: "", companies: [ { diff --git a/Areas/Inventory/Views/_InventoryPartial.cshtml b/Areas/Inventory/Views/_InventoryPartial.cshtml index 52b5bf1..0179e8e 100644 --- a/Areas/Inventory/Views/_InventoryPartial.cshtml +++ b/Areas/Inventory/Views/_InventoryPartial.cshtml @@ -89,7 +89,7 @@
- +

diff --git a/Areas/Inventory/Views/_InventoryPartialUser.cshtml b/Areas/Inventory/Views/_InventoryPartialUser.cshtml index 08ceac0..1c181a1 100644 --- a/Areas/Inventory/Views/_InventoryPartialUser.cshtml +++ b/Areas/Inventory/Views/_InventoryPartialUser.cshtml @@ -15,7 +15,7 @@
- +

diff --git a/Controllers/API/Inventory/InvMainAPI.cs b/Controllers/API/Inventory/InvMainAPI.cs index 3db2258..5fa111c 100644 --- a/Controllers/API/Inventory/InvMainAPI.cs +++ b/Controllers/API/Inventory/InvMainAPI.cs @@ -811,8 +811,10 @@ namespace PSTW_CentralSystem.Controllers.API.Inventory } [HttpPost("RejectRequest/{id}")] - public async Task RejectRequest(int id) + public async Task RejectRequest(int id, [FromBody] RequestModel request) { + + var Request = await _centralDbContext.Requests.FindAsync(id); if (Request == null) { @@ -820,6 +822,7 @@ namespace PSTW_CentralSystem.Controllers.API.Inventory } Request.status = "Rejected"; + Request.remarkMasterInv = request.remarkMasterInv; Request.approvalDate = DateTime.UtcNow; _centralDbContext.SaveChanges(); diff --git a/PSTW_CentralSystem.csproj b/PSTW_CentralSystem.csproj index c18ba39..5d87e57 100644 --- a/PSTW_CentralSystem.csproj +++ b/PSTW_CentralSystem.csproj @@ -6,10 +6,6 @@ enable - - - -