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() { - ID + + ID + Name 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() {
- ID + + ID + Name @@ -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() {
- ID + + ID + Name