diff --git a/Areas/Inventory/Controllers/Admin/InventoryMasterController.cs b/Areas/Inventory/Controllers/Admin/InventoryMasterController.cs index 4fa54ad..300725f 100644 --- a/Areas/Inventory/Controllers/Admin/InventoryMasterController.cs +++ b/Areas/Inventory/Controllers/Admin/InventoryMasterController.cs @@ -26,6 +26,10 @@ namespace PSTW_CentralSystem.Areas.Inventory.Controllers.Admin { return View(); } + public IActionResult ItemRequestAdmin() + { + return View(); + } public IActionResult ProductRegistration() { diff --git a/Areas/Inventory/Models/RequestModel.cs b/Areas/Inventory/Models/RequestModel.cs index 73ebe84..58e9fd4 100644 --- a/Areas/Inventory/Models/RequestModel.cs +++ b/Areas/Inventory/Models/RequestModel.cs @@ -16,6 +16,7 @@ namespace PSTW_CentralSystem.Areas.Inventory.Models public int UserId { get; set; } [ForeignKey("UserId")] public virtual UserModel? User { get; set; } + public string? ProductCategory { get; set; } public string? remark { get; set; } public string? status { get; set; } public DateTime requestDate { get; set; } diff --git a/Areas/Inventory/Views/InventoryMaster/ItemRequest.cshtml b/Areas/Inventory/Views/InventoryMaster/ItemRequest.cshtml index dd974c3..d769aa7 100644 --- a/Areas/Inventory/Views/InventoryMaster/ItemRequest.cshtml +++ b/Areas/Inventory/Views/InventoryMaster/ItemRequest.cshtml @@ -149,13 +149,14 @@ status: "", requestDate : null, approvalDate : null, - selectedCategory: "", + productCategory: "", productName: null, productCategory: null, stations: [], selectedProduct: "", selectedStation: "", + selectedCategory: "", showRequestModal: false, loading: false, request: [], @@ -202,6 +203,7 @@ ProductId: this.productId, StationId: this.stationId, UserId: this.userId, + ProductCategory: this.productCategory, RequestQuantitiy: this.quantity, Document: this.document, remark: this.remark, diff --git a/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml b/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml new file mode 100644 index 0000000..dd974c3 --- /dev/null +++ b/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml @@ -0,0 +1,783 @@ + +@{ + ViewData["Title"] = "Product Request"; + Layout = "~/Views/Shared/_Layout.cshtml"; +} +@await Html.PartialAsync("~/Areas/Inventory/Views/_InventoryPartial.cshtml"); +
+
+
+ +
+
+ @*
+
+ Loading... +
+
*@ +
+
+
+ + +@section Scripts { +@{ + await Html.RenderPartialAsync("_ValidationScriptsPartial"); +} + +} \ No newline at end of file