From 56f30fa60c7bd604b9001dbd6d2e23f04b977c97 Mon Sep 17 00:00:00 2001
From: Keannu Bernasol <noehbernasol0@gmail.com>
Date: Mon, 18 Dec 2023 00:01:32 +0800
Subject: [PATCH] Fix alignment of ID label on tables and remove remarks from
 search criteria

---
 .../EquipmentInstancesFilteredListPage.tsx      |  4 +++-
 .../EquipmentInstancesListPage.tsx              | 17 +++++++----------
 .../EquipmentListPage/EquipmentListPage.tsx     |  4 +++-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/Pages/EquipmentInstancesListPage/EquipmentInstancesFilteredListPage.tsx b/src/Pages/EquipmentInstancesListPage/EquipmentInstancesFilteredListPage.tsx
index 87f26eb..303f2ee 100644
--- a/src/Pages/EquipmentInstancesListPage/EquipmentInstancesFilteredListPage.tsx
+++ b/src/Pages/EquipmentInstancesListPage/EquipmentInstancesFilteredListPage.tsx
@@ -74,7 +74,9 @@ export default function EquipmentInstancesFilteredListPage() {
           <Table sx={{ minWidth: "32rem" }} size="medium">
             <TableHead>
               <TableRow style={{ backgroundColor: colors.header_color }}>
-                <TableCell style={styles.text_light}>ID</TableCell>
+                <TableCell align="center" style={styles.text_light}>
+                  ID
+                </TableCell>
                 <TableCell align="center" style={styles.text_light}>
                   Name
                 </TableCell>
diff --git a/src/Pages/EquipmentInstancesListPage/EquipmentInstancesListPage.tsx b/src/Pages/EquipmentInstancesListPage/EquipmentInstancesListPage.tsx
index 78cdb4a..3f32ba8 100644
--- a/src/Pages/EquipmentInstancesListPage/EquipmentInstancesListPage.tsx
+++ b/src/Pages/EquipmentInstancesListPage/EquipmentInstancesListPage.tsx
@@ -118,7 +118,9 @@ export default function EquipmentInstancesListPage() {
           <Table sx={{ minWidth: "32rem" }} size="medium">
             <TableHead>
               <TableRow style={{ backgroundColor: colors.header_color }}>
-                <TableCell style={styles.text_light}>ID</TableCell>
+                <TableCell align="center" style={styles.text_light}>
+                  ID
+                </TableCell>
                 <TableCell align="center" style={styles.text_light}>
                   Name
                 </TableCell>
@@ -145,15 +147,10 @@ export default function EquipmentInstancesListPage() {
                         equipment.category
                           .toLowerCase()
                           .includes(filter.toLowerCase()) ||
-                        equipment.remarks
-                        ? equipment.remarks
-                            .toLowerCase()
-                            .includes(filter.toLowerCase())
-                        : false ||
-                          equipment.last_updated
-                            .toLowerCase()
-                            .includes(filter?.toLowerCase()) ||
-                          equipment.status.toLowerCase() == filter.toLowerCase()
+                        equipment.last_updated
+                          .toLowerCase()
+                          .includes(filter?.toLowerCase()) ||
+                        equipment.status.toLowerCase() == filter.toLowerCase()
                       : // If filter keyword is null then we just pass through everything as if we did not filter at all
                         true
                   )
diff --git a/src/Pages/EquipmentListPage/EquipmentListPage.tsx b/src/Pages/EquipmentListPage/EquipmentListPage.tsx
index 704a795..69054b8 100644
--- a/src/Pages/EquipmentListPage/EquipmentListPage.tsx
+++ b/src/Pages/EquipmentListPage/EquipmentListPage.tsx
@@ -72,7 +72,9 @@ export default function EquipmentListPage() {
           <Table sx={{ minWidth: "32rem" }} size="medium">
             <TableHead>
               <TableRow style={{ backgroundColor: colors.header_color }}>
-                <TableCell style={styles.text_light}>ID</TableCell>
+                <TableCell align="center" style={styles.text_light}>
+                  ID
+                </TableCell>
                 <TableCell align="center" style={styles.text_light}>
                   Name
                 </TableCell>