From a7ffd18754bd9591065b9cc24e4e5b403da18779 Mon Sep 17 00:00:00 2001
From: ArifHilmi <arifhilmi007@gmail.com>
Date: Fri, 28 Feb 2025 08:33:49 +0800
Subject: [PATCH] update ui/ux movement

---
 .../Views/ItemMovement/ItemMovementUser.cshtml  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Areas/Inventory/Views/ItemMovement/ItemMovementUser.cshtml b/Areas/Inventory/Views/ItemMovement/ItemMovementUser.cshtml
index 463cfb5..52216f1 100644
--- a/Areas/Inventory/Views/ItemMovement/ItemMovementUser.cshtml
+++ b/Areas/Inventory/Views/ItemMovement/ItemMovementUser.cshtml
@@ -88,12 +88,10 @@
 
             <!-- Hide all details unless button is clicked -->
             <div v-show="categoryVisible[itemId]" class="card-body">
-                <div v-for="(movement, index) in group.movements.sort((a, b) => a.id - b.id).reverse()"
-                     :key="movement.id"
-                     class="movement-row">
-
+                <div v-for="(movement, index) in group.movements.sort((a, b) => a.id - b.id).reverse()" :key="movement.id" class="movement-row">
                     <!-- 📌 Show Only Latest Movement -->
                     <div v-if="index === 0" class="row">
+                        <strong>Latest Movement</strong>
                         <div class="col-md-12 d-flex flex-wrap align-items-center gap-3 p-2 border-bottom">
                             <!-- Movement Type -->
                             <h3 :class="movement.toOther === 'On Delivery' ? 'text-primary' : 'text-warning'"
@@ -131,9 +129,11 @@
                             </button>
 
                             <!-- Completion Status -->
-                            <h4 :class="movement.movementComplete == 1 ? 'text-success' : 'text-danger'" class="text-nowrap ms-3">
-                                {{ movement.movementComplete == 1 ? 'Complete' : 'Incomplete' }}
+                            <h4 :class="movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'text-success' : 'text-danger'"
+                                class="text-nowrap ms-3">
+                                {{ movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'Complete' : (movement.latestStatus === 'Ready To Deploy' ? 'Canceled' : 'Incomplete') }}
                             </h4>
+
                         </div>
 
                         <div v-show="detailsVisible[movement.id]" class="col-md-12 mt-2">
@@ -221,8 +221,9 @@
                             </button>
 
                             <!-- Completion Status -->
-                            <h4 :class="movement.movementComplete == 1 ? 'text-success' : 'text-danger'" class="text-nowrap ms-3">
-                                {{ movement.movementComplete == 1 ? 'Complete' : 'Incomplete' }}
+                            <h4 :class="movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'text-success' : 'text-danger'"
+                                class="text-nowrap ms-3">
+                                {{ movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'Complete' : (movement.latestStatus === 'Ready To Deploy' ? 'Canceled' : 'Incomplete') }}
                             </h4>
                         </div>