From 0f2b065c669e5e6afd308048c2453ef95e985a07 Mon Sep 17 00:00:00 2001 From: ArifHilmi Date: Mon, 24 Feb 2025 21:53:19 +0800 Subject: [PATCH] update & fix request --- Areas/Inventory/Models/ItemMovementModel.cs | 6 +- .../Views/ItemMovement/ItemRequest.cshtml | 181 +++++++++++++++--- .../Views/ItemMovement/QrUser.cshtml | 105 +++++++++- Controllers/API/Inventory/InvMainAPI.cs | 51 ++++- .../Images/{Ts02Abc.jpg => SL1500 3G.jpg} | Bin wwwroot/Media/Inventory/request/2 Request.jpg | Bin 0 -> 86553 bytes 6 files changed, 303 insertions(+), 40 deletions(-) rename wwwroot/Media/Inventory/Images/{Ts02Abc.jpg => SL1500 3G.jpg} (100%) create mode 100644 wwwroot/Media/Inventory/request/2 Request.jpg diff --git a/Areas/Inventory/Models/ItemMovementModel.cs b/Areas/Inventory/Models/ItemMovementModel.cs index 435d490..a7caef2 100644 --- a/Areas/Inventory/Models/ItemMovementModel.cs +++ b/Areas/Inventory/Models/ItemMovementModel.cs @@ -8,13 +8,13 @@ namespace PSTW_CentralSystem.Areas.Inventory.Models { [Key] public int Id { get; set; } - public int ItemId { get; set; } + public int? ItemId { get; set; } public int? ToStation { get; set; } public int? ToStore { get; set; } public int? ToUser { get; set; } [Comment("Repair, Calibration, Faulty, Ready To Deploy, On Delivery")] public string? ToOther { get; set; } - public DateTime sendDate { get; set; } + public DateTime? sendDate { get; set; } [Comment("Register, StockIn, Stock Out")] public string? Action { get; set; } public int? Quantity { get; set; } @@ -26,7 +26,7 @@ namespace PSTW_CentralSystem.Areas.Inventory.Models public int? LastStation{ get; set; } [Comment("Repair, Calibration, Faulty, Ready To Deploy, On Delivery")] public string? LatestStatus { get; set; } - public DateTime receiveDate { get; set; } + public DateTime? receiveDate { get; set; } public bool MovementComplete { get; set; } = false; //public virtual ItemModel? Item { get; set; } //[ForeignKey("ToStore")] diff --git a/Areas/Inventory/Views/ItemMovement/ItemRequest.cshtml b/Areas/Inventory/Views/ItemMovement/ItemRequest.cshtml index 562064e..710dcb0 100644 --- a/Areas/Inventory/Views/ItemMovement/ItemRequest.cshtml +++ b/Areas/Inventory/Views/ItemMovement/ItemRequest.cshtml @@ -23,9 +23,9 @@ -
+

Pending Request

@@ -36,6 +36,21 @@
*@
+ + +
+
+

Complete Request

+
+
+ @*
+
+ Loading... +
+
*@ +
+
+