From 3ec456afbd62e51b7da8a488dc9031ee1ef85bc0 Mon Sep 17 00:00:00 2001
From: ArifHilmi <arifhilmi007@gmail.com>
Date: Tue, 4 Mar 2025 15:55:25 +0800
Subject: [PATCH] Qr & Movement Display

---
 .../Views/ItemMovement/ItemMovementUser.cshtml     |  2 +-
 Areas/Inventory/Views/ItemMovement/QrUser.cshtml   | 14 +++++++++++---
 Controllers/API/Inventory/InvMainAPI.cs            |  4 +++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Areas/Inventory/Views/ItemMovement/ItemMovementUser.cshtml b/Areas/Inventory/Views/ItemMovement/ItemMovementUser.cshtml
index 2b526f9..383bc23 100644
--- a/Areas/Inventory/Views/ItemMovement/ItemMovementUser.cshtml
+++ b/Areas/Inventory/Views/ItemMovement/ItemMovementUser.cshtml
@@ -181,7 +181,7 @@
                                 <div class="col-md-4 text-center">
                                     <!-- Conditionally render End Icon -->
                                     <i v-if="movement.lastStation" class="fas fa-map-marker-alt"></i>
-                                    <i v-v-else-if="movement.toOther !== 'On Delivery'" class="fas fa-warehouse fa-2x"></i>
+                                    <i v-else-if="movement.toOther !== 'On Delivery'" class="fas fa-warehouse fa-2x"></i>
                                     <i v-else class="fas fa-user fa-2x"></i>
                                     <p><strong>End</strong></p>
                                     <p v-if="movement.lastUser !== null"><strong>User:</strong> {{ movement.lastUserName }}</p>
diff --git a/Areas/Inventory/Views/ItemMovement/QrUser.cshtml b/Areas/Inventory/Views/ItemMovement/QrUser.cshtml
index 6d96455..93cf6c5 100644
--- a/Areas/Inventory/Views/ItemMovement/QrUser.cshtml
+++ b/Areas/Inventory/Views/ItemMovement/QrUser.cshtml
@@ -109,10 +109,18 @@
                         </p>
                     </div>
 
-                    <!-- PIC -->
+                    <!-- Station -->
                     <div class="col-12 mb-3">
                         <p class="h5 fw-bold">
                             <i class="fas fa-user-tie me-2 text-secondary"></i>PIC:
+                            <span class="text-muted">{{thisItem.currentUserFullName}}</span>
+                        </p>
+                    </div>
+
+                    <!-- Station -->
+                    <div class="col-12 mb-3">
+                        <p class="h5 fw-bold">
+                            <i class="fas fa-user-tie me-2 text-secondary"></i>Station:
                             <span class="text-muted">{{thisItem.currentStation || 'No Station Deploy (Self Assign)' }}</span>
                         </p>
                     </div>
@@ -219,7 +227,7 @@
                                     <div class="form-group row">
                                         <div class="col-sm-8 offset-sm-5">
                                             <button type="submit" v-on:click="ReturnMessage" class="btn btn-primary m-1">Return Item</button>
-                                            <button type="submit" v-on:click="StationMessage" class="btn btn-primary m-1" v-if="thisItem.currentStationId == null">Deploy Station</button>
+                                            <button type="submit" v-on:click="StationMessage" class="btn btn-primary m-1">{{ thisItem?.currentStationId == null ? "Deploy Station" : "Change Station" }}</button>
                                         </div>
                                     </div>
                                         
@@ -235,7 +243,7 @@
                 <div class="modal-dialog" role="document">
                     <div class="modal-content">
                         <div class="modal-header">
-                            <h5 class="modal-title" id="stationModalLabel">Deploy Station</h5>
+                            <h5 class="modal-title" id="stationModalLabel">{{ thisItem?.currentStationId == null ? "Deploy Station" : "Change Station" }}</h5>
                             <button type="button" class="close" data-dismiss="modal" v-on:click="closeStationMessageModal" aria-label="Close">
                                 <span aria-hidden="true">&times;</span>
                             </button>
diff --git a/Controllers/API/Inventory/InvMainAPI.cs b/Controllers/API/Inventory/InvMainAPI.cs
index 9e510d6..ce9a5d4 100644
--- a/Controllers/API/Inventory/InvMainAPI.cs
+++ b/Controllers/API/Inventory/InvMainAPI.cs
@@ -523,6 +523,7 @@ namespace PSTW_CentralSystem.Controllers.API.Inventory
                 item.Product!.ProductShortName,
                 item.Product!.ImageProduct,
                 CurrentUser = item.Movement?.FromUser?.UserName,
+                CurrentUserFullName = item.Movement?.FromUser?.FullName,
                 CurrentUserId = item.Movement?.FromUser?.Id,
                 CurrentStore = item.Movement?.FromStore?.StoreName,
                 CurrentStoreId = item.Movement?.FromStore?.Id,
@@ -1223,9 +1224,10 @@ namespace PSTW_CentralSystem.Controllers.API.Inventory
                     receiveItems.ItemStatus = 3;
                     _centralDbContext.Items.Update(receiveItems);
 
-                    await _centralDbContext.SaveChangesAsync(); // Simpan perubahan
                 }
 
+                await _centralDbContext.SaveChangesAsync();
+
                 return Json(updatedList);
             }
             catch (Exception ex)