From 866527c21268a68457d393136ab7a34c353b4f2c Mon Sep 17 00:00:00 2001
From: ChiragBellara <chiragbellara7@gmail.com>
Date: Wed, 3 Dec 2025 16:44:54 -0800
Subject: [PATCH 1/7] Added Dropdowns and fixed conditions to fitler table

---
 .../ItemList/ItemListView.module.css          |  9 ++-
 .../BMDashboard/ItemList/SelectForm.jsx       | 10 ++-
 .../BMDashboard/ItemList/SelectItem.jsx       | 76 +++++++++++++------
 .../ToolItemList/ToolItemListView.jsx         | 76 +++++++++++++++----
 .../ToolItemList/ToolItemListView.module.css  |  7 +-
 .../ToolItemList/ToolItemsTable.jsx           |  4 +-
 6 files changed, 135 insertions(+), 47 deletions(-)

diff --git a/src/components/BMDashboard/ItemList/ItemListView.module.css b/src/components/BMDashboard/ItemList/ItemListView.module.css
index 4a829def15..30562f8431 100644
--- a/src/components/BMDashboard/ItemList/ItemListView.module.css
+++ b/src/components/BMDashboard/ItemList/ItemListView.module.css
@@ -24,6 +24,10 @@
   height: 2rem;
 }
 
+.itemsCell td{
+  vertical-align: middle;
+}
+
 .itemsCell button {
   cursor: pointer;
 }
@@ -52,8 +56,7 @@
 
 .selectInput label {
   font-weight: bold;
-  text-align: right;
-  min-width: 100px;
+  text-align: center;
   white-space: nowrap;
   margin-bottom: 8px;
 }
@@ -62,7 +65,7 @@
 .selectInput select {
   height: 38px;
   width: 100%;
-  min-width: 220px;
+  min-width: 180px;
   max-width: 240px;
   padding: 5px;
   border: 1px solid #ccc;
diff --git a/src/components/BMDashboard/ItemList/SelectForm.jsx b/src/components/BMDashboard/ItemList/SelectForm.jsx
index 27f62b6848..47f6f1f7db 100644
--- a/src/components/BMDashboard/ItemList/SelectForm.jsx
+++ b/src/components/BMDashboard/ItemList/SelectForm.jsx
@@ -1,7 +1,13 @@
 import { Form, FormGroup, Label, Input } from 'reactstrap';
 import styles from './ItemListView.module.css';
 
-export default function SelectForm({ items, setSelectedProject, setSelectedItem }) {
+export default function SelectForm({
+  items,
+  setSelectedProject,
+  setSelectedItem,
+  setSelectedCondition,
+  setSelectedToolStatus,
+}) {
   let projectsSet = [];
   if (items.length) {
     projectsSet = [...new Set(items.map(el => el.project?.name))];
@@ -9,6 +15,8 @@ export default function SelectForm({ items, setSelectedProject, setSelectedItem
 
   const handleChange = event => {
     setSelectedItem('all');
+    setSelectedCondition('all');
+    setSelectedToolStatus('all');
     setSelectedProject(event.target.value);
   };
 
diff --git a/src/components/BMDashboard/ItemList/SelectItem.jsx b/src/components/BMDashboard/ItemList/SelectItem.jsx
index 88901967ed..529bd94085 100644
--- a/src/components/BMDashboard/ItemList/SelectItem.jsx
+++ b/src/components/BMDashboard/ItemList/SelectItem.jsx
@@ -6,44 +6,72 @@ export default function SelectItem({
   selectedProject,
   selectedItem,
   setSelectedItem,
+  selectedToolStatus,
+  setSelectedToolStatus,
+  selectedCondition,
+  setSelectedCondition,
   label,
 }) {
   let itemSet = [];
   if (items?.length) {
-    if (selectedProject === 'all') {
-      itemSet = [
-        ...new Set(
-          items
-            .filter(m => m.itemType?.name) // Filter out items with null/undefined names
-            .map(m => m.itemType.name),
-        ),
-      ];
-    } else {
-      itemSet = [
-        ...new Set(
-          items
-            .filter(mat => mat.project?.name === selectedProject && mat.itemType?.name)
-            .map(m => m.itemType.name),
-        ),
-      ];
+    if (label === 'Tool') {
+      if (selectedProject === 'all') {
+        itemSet = [...new Set(items.filter(m => m.itemType?.name).map(m => m.itemType.name))];
+      } else {
+        itemSet = [
+          ...new Set(
+            items
+              .filter(mat => mat.project?.name === selectedProject && mat.itemType?.name)
+              .map(m => m.itemType.name),
+          ),
+        ];
+      }
+    } else if (label === 'Tool Status') {
+      itemSet = ['Using', 'Available', 'Under Maintenance'];
+    } else if (label === 'Condition') {
+      if (selectedProject === 'all') {
+        itemSet = [...new Set(items.filter(m => m.condition).map(m => m.condition))];
+      } else {
+        itemSet = [
+          ...new Set(
+            items
+              .filter(mat => mat.project?.name === selectedProject && mat.condition)
+              .map(m => m.condition),
+          ),
+        ];
+      }
     }
   }
 
   return (
     <Form>
-      <FormGroup className={`${styles.selectInput}`}>
-        <Label htmlFor="select-material" style={{ marginLeft: '10px' }}>
-          {label ? `${label}:` : 'Material:'}
-        </Label>
+      <FormGroup className={styles.selectInput}>
+        <Label htmlFor="select-material">{label ? `${label}:` : 'Material:'}</Label>
+
         <Input
           id="select-item"
           name="select-item"
           type="select"
-          value={selectedItem}
-          onChange={e => setSelectedItem(e.target.value)}
-          disabled={!items.length}
+          value={
+            label === 'Tool'
+              ? selectedItem
+              : label === 'Tool Status'
+              ? selectedToolStatus
+              : selectedCondition
+          }
+          onChange={e => {
+            const val = e.target.value;
+            if (label === 'Tool') {
+              setSelectedItem(val);
+            } else if (label === 'Tool Status') {
+              setSelectedToolStatus(val);
+            } else if (label === 'Condition') {
+              setSelectedCondition(val);
+            }
+          }}
+          disabled={!itemSet.length}
         >
-          {items.length ? (
+          {itemSet.length ? (
             <>
               <option value="all" key="all-option">
                 All
diff --git a/src/components/BMDashboard/ToolItemList/ToolItemListView.jsx b/src/components/BMDashboard/ToolItemList/ToolItemListView.jsx
index 4278d478d8..f0457ef7ed 100644
--- a/src/components/BMDashboard/ToolItemList/ToolItemListView.jsx
+++ b/src/components/BMDashboard/ToolItemList/ToolItemListView.jsx
@@ -5,6 +5,7 @@ import SelectForm from '../ItemList/SelectForm';
 import SelectItem from '../ItemList/SelectItem';
 import ToolItemsTable from './ToolItemsTable';
 import styles from './ToolItemListView.module.css';
+import { set } from 'lodash';
 
 export function ToolItemListView({
   itemType,
@@ -16,6 +17,8 @@ export function ToolItemListView({
   const [filteredItems, setFilteredItems] = useState(items);
   const [selectedProject, setSelectedProject] = useState('all');
   const [selectedItem, setSelectedItem] = useState('all');
+  const [selectedToolStatus, setSelectedToolStatus] = useState('all');
+  const [selectedCondition, setSelectedCondition] = useState('all');
   const [isError, setIsError] = useState(false);
 
   useEffect(() => {
@@ -23,23 +26,36 @@ export function ToolItemListView({
   }, [items]);
 
   useEffect(() => {
-    let filterItems;
     if (!items) return;
-    if (selectedProject === 'all' && selectedItem === 'all') {
-      setFilteredItems([...items]);
-    } else if (selectedProject !== 'all' && selectedItem === 'all') {
-      filterItems = items.filter(item => item.project?.name === selectedProject);
-      setFilteredItems([...filterItems]);
-    } else if (selectedProject === 'all' && selectedItem !== 'all') {
-      filterItems = items.filter(item => item.itemType?.name === selectedItem);
-      setFilteredItems([...filterItems]);
-    } else {
-      filterItems = items.filter(
-        item => item.project?.name === selectedProject && item.itemType?.name === selectedItem,
-      );
-      setFilteredItems([...filterItems]);
+
+    let filterItems = [...items];
+
+    if (selectedProject !== 'all') {
+      filterItems = filterItems.filter(item => item.project?.name === selectedProject);
+    }
+
+    if (selectedItem !== 'all') {
+      filterItems = filterItems.filter(item => item.itemType?.name === selectedItem);
+    }
+
+    if (selectedToolStatus !== 'all') {
+      filterItems = filterItems.filter(item => {
+        if (selectedToolStatus === 'Using') return item.using === true;
+        if (selectedToolStatus === 'Available') return item.available === true;
+        if (selectedToolStatus === 'Under Maintenance') {
+          // UPDATE LOGIC TO MATCH THE CONDITIONS
+          return !item.using && !item.available;
+        }
+        return true;
+      });
     }
-  }, [selectedProject, selectedItem, items]);
+
+    if (selectedCondition !== 'all') {
+      filterItems = filterItems.filter(item => item.condition === selectedCondition);
+    }
+
+    setFilteredItems(filterItems);
+  }, [items, selectedProject, selectedItem, selectedToolStatus, selectedCondition]);
 
   useEffect(() => {
     setIsError(Object.entries(errors).length > 0);
@@ -64,14 +80,42 @@ export function ToolItemListView({
                 items={items}
                 setSelectedProject={setSelectedProject}
                 setSelectedItem={setSelectedItem}
+                setSelectedCondition={setSelectedCondition}
+                setSelectedToolStatus={setSelectedToolStatus}
               />
               <SelectItem
                 items={items}
                 selectedProject={selectedProject}
                 selectedItem={selectedItem}
                 setSelectedItem={setSelectedItem}
+                selectedToolStatus={selectedToolStatus}
+                setSelectedToolStatus={setSelectedToolStatus}
+                selectedCondition={selectedCondition}
+                setSelectedCondition={setSelectedCondition}
                 label="Tool"
               />
+              <SelectItem
+                items={items}
+                selectedProject={selectedProject}
+                selectedItem={selectedItem}
+                setSelectedItem={setSelectedItem}
+                selectedToolStatus={selectedToolStatus}
+                setSelectedToolStatus={setSelectedToolStatus}
+                selectedCondition={selectedCondition}
+                setSelectedCondition={setSelectedCondition}
+                label="Tool Status"
+              />
+              <SelectItem
+                items={items}
+                selectedProject={selectedProject}
+                selectedItem={selectedItem}
+                setSelectedItem={setSelectedItem}
+                selectedToolStatus={selectedToolStatus}
+                setSelectedToolStatus={setSelectedToolStatus}
+                selectedCondition={selectedCondition}
+                setSelectedCondition={setSelectedCondition}
+                label="Condition"
+              />
             </>
           )}
         </span>
@@ -79,6 +123,8 @@ export function ToolItemListView({
           <ToolItemsTable
             selectedProject={selectedProject}
             selectedItem={selectedItem}
+            selectedToolStatus={selectedToolStatus}
+            selectedCondition={selectedCondition}
             filteredItems={filteredItems}
             UpdateItemModal={UpdateItemModal}
             dynamicColumns={dynamicColumns}
diff --git a/src/components/BMDashboard/ToolItemList/ToolItemListView.module.css b/src/components/BMDashboard/ToolItemList/ToolItemListView.module.css
index 094c0fa9da..ab99726db5 100644
--- a/src/components/BMDashboard/ToolItemList/ToolItemListView.module.css
+++ b/src/components/BMDashboard/ToolItemList/ToolItemListView.module.css
@@ -7,6 +7,7 @@
 
 .itemsTableContainer {
   overflow-x: scroll;
+  align-items: center;
 }
 
 .itemsListContainer section {
@@ -20,7 +21,7 @@
   font-size: small;
 }
 
-.itemsListContainer th {
+.itemsTable th {
   height: 2rem;
 }
 
@@ -47,8 +48,8 @@
 }
 
 .conditionCell {
-  padding-left: 15px;
+  vertical-align: middle;
   display: flex;
   gap: 20px;
-  justify-content: flex-start;
+  justify-content: center;
 }
diff --git a/src/components/BMDashboard/ToolItemList/ToolItemsTable.jsx b/src/components/BMDashboard/ToolItemList/ToolItemsTable.jsx
index 952dba7ef4..9aa0eed233 100644
--- a/src/components/BMDashboard/ToolItemList/ToolItemsTable.jsx
+++ b/src/components/BMDashboard/ToolItemList/ToolItemsTable.jsx
@@ -9,6 +9,8 @@ import styles from './ToolItemListView.module.css';
 export default function ToolItemsTable({
   selectedProject,
   selectedItem,
+  selectedToolStatus,
+  selectedCondition,
   filteredItems,
   UpdateItemModal,
   dynamicColumns,
@@ -93,7 +95,7 @@ export default function ToolItemsTable({
       />
       <UpdateItemModal modal={updateModal} setModal={setUpdateModal} record={updateRecord} />
       <div className={`${styles.itemsTableContainer}`}>
-        <Table>
+        <Table className={`${styles.itemsTable}`}>
           <thead>
             <tr>
               {selectedProject === 'all' ? (

From fc162e056c1db906d6e33d3f9e3d7beac0b60a37 Mon Sep 17 00:00:00 2001
From: ChiragBellara <chiragbellara7@gmail.com>
Date: Fri, 5 Dec 2025 19:28:53 -0800
Subject: [PATCH 2/7] Fixed the filtering logic and display conditions

---
 .../BMDashboard/ItemList/SelectItem.jsx         | 12 ++++++------
 .../ToolItemList/ToolItemListView.jsx           | 17 ++++++++++++-----
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/components/BMDashboard/ItemList/SelectItem.jsx b/src/components/BMDashboard/ItemList/SelectItem.jsx
index 529bd94085..101ac9757a 100644
--- a/src/components/BMDashboard/ItemList/SelectItem.jsx
+++ b/src/components/BMDashboard/ItemList/SelectItem.jsx
@@ -53,20 +53,20 @@ export default function SelectItem({
           name="select-item"
           type="select"
           value={
-            label === 'Tool'
-              ? selectedItem
+            label === 'Condition'
+              ? selectedCondition
               : label === 'Tool Status'
               ? selectedToolStatus
-              : selectedCondition
+              : selectedItem
           }
           onChange={e => {
             const val = e.target.value;
-            if (label === 'Tool') {
-              setSelectedItem(val);
-            } else if (label === 'Tool Status') {
+            if (label === 'Tool Status') {
               setSelectedToolStatus(val);
             } else if (label === 'Condition') {
               setSelectedCondition(val);
+            } else {
+              setSelectedItem(val);
             }
           }}
           disabled={!itemSet.length}
diff --git a/src/components/BMDashboard/ToolItemList/ToolItemListView.jsx b/src/components/BMDashboard/ToolItemList/ToolItemListView.jsx
index f0457ef7ed..cc120cbe54 100644
--- a/src/components/BMDashboard/ToolItemList/ToolItemListView.jsx
+++ b/src/components/BMDashboard/ToolItemList/ToolItemListView.jsx
@@ -40,13 +40,20 @@ export function ToolItemListView({
 
     if (selectedToolStatus !== 'all') {
       filterItems = filterItems.filter(item => {
-        if (selectedToolStatus === 'Using') return item.using === true;
-        if (selectedToolStatus === 'Available') return item.available === true;
-        if (selectedToolStatus === 'Under Maintenance') {
-          // UPDATE LOGIC TO MATCH THE CONDITIONS
-          return !item.using && !item.available;
+        if (selectedToolStatus === 'Using') {
+          return item.itemType?.using?.includes(item._id);
+        } else if (selectedToolStatus === 'Available') {
+          return (
+            item.itemType?.available?.includes(item._id) &&
+            item.condition !== 'Lost' &&
+            item.condition !== 'Needs Replacing'
+          );
         }
         return true;
+        // if (selectedToolStatus === 'Under Maintenance') {
+        //   // UPDATE LOGIC TO MATCH THE CONDITIONS
+        //   return !item.using && !item.available;
+        // }
       });
     }
 

From 116cb618d54a39afcbfbe498c6cab3739ead9f94 Mon Sep 17 00:00:00 2001
From: ChiragBellara <chiragbellara7@gmail.com>
Date: Sat, 6 Dec 2025 11:05:08 -0800
Subject: [PATCH 3/7] Fixed table sorting for Condition and Tool Status columns

---
 .../ToolItemList/ToolItemsTable.jsx           | 59 +++++++++++++++++--
 1 file changed, 55 insertions(+), 4 deletions(-)

diff --git a/src/components/BMDashboard/ToolItemList/ToolItemsTable.jsx b/src/components/BMDashboard/ToolItemList/ToolItemsTable.jsx
index 9aa0eed233..b39f5d26ce 100644
--- a/src/components/BMDashboard/ToolItemList/ToolItemsTable.jsx
+++ b/src/components/BMDashboard/ToolItemList/ToolItemsTable.jsx
@@ -21,6 +21,7 @@ export default function ToolItemsTable({
   const [recordType, setRecordType] = useState('');
   const [updateModal, setUpdateModal] = useState(false);
   const [updateRecord, setUpdateRecord] = useState(null);
+
   const [projectNameCol, setProjectNameCol] = useState({
     iconsToDisplay: faSort,
     sortOrder: 'default',
@@ -29,6 +30,14 @@ export default function ToolItemsTable({
     iconsToDisplay: faSort,
     sortOrder: 'default',
   });
+  const [conditionCol, setConditionCol] = useState({
+    iconsToDisplay: faSort,
+    sortOrder: 'default',
+  });
+  const [toolStatusCol, setToolStatusCol] = useState({
+    iconsToDisplay: faSort,
+    sortOrder: 'default',
+  });
 
   useEffect(() => {
     setData(filteredItems);
@@ -37,7 +46,9 @@ export default function ToolItemsTable({
   useEffect(() => {
     setInventoryItemTypeCol({ iconsToDisplay: faSort, sortOrder: 'default' });
     setProjectNameCol({ iconsToDisplay: faSort, sortOrder: 'default' });
-  }, [selectedProject, selectedItem]);
+    setConditionCol({ iconsToDisplay: faSort, sortOrder: 'default' });
+    setToolStatusCol({ iconsToDisplay: faSort, sortOrder: 'default' });
+  }, [selectedProject, selectedItem, selectedCondition, selectedToolStatus]);
 
   const handleEditRecordsClick = (selectedEl, type) => {
     if (type === 'Update') {
@@ -63,6 +74,8 @@ export default function ToolItemsTable({
         setProjectNameCol({ iconsToDisplay: faSortDown, sortOrder: 'desc' });
       }
       setInventoryItemTypeCol({ iconsToDisplay: faSort, sortOrder: 'default' });
+      setConditionCol({ iconsToDisplay: faSort, sortOrder: 'default' });
+      setToolStatusCol({ iconsToDisplay: faSort, sortOrder: 'default' });
     } else if (columnName === 'InventoryItemType') {
       if (
         inventoryItemTypeCol.sortOrder === 'default' ||
@@ -79,6 +92,34 @@ export default function ToolItemsTable({
         setInventoryItemTypeCol({ iconsToDisplay: faSortDown, sortOrder: 'desc' });
       }
       setProjectNameCol({ iconsToDisplay: faSort, sortOrder: 'default' });
+      setConditionCol({ iconsToDisplay: faSort, sortOrder: 'default' });
+      setToolStatusCol({ iconsToDisplay: faSort, sortOrder: 'default' });
+    } else if (columnName === 'ToolStatusColumn') {
+      // Add logic for sorting by Status if needed
+      const usingRows = newSortedData.filter(item => item.itemType?.using?.includes(item._id));
+      const notUsingRows = newSortedData.filter(item => !item.itemType?.using?.includes(item._id));
+      if (toolStatusCol.sortOrder === 'default' || toolStatusCol.sortOrder === 'desc') {
+        newSortedData.splice(0, newSortedData.length, ...notUsingRows, ...usingRows);
+        setToolStatusCol({ iconsToDisplay: faSortUp, sortOrder: 'asc' });
+      } else if (toolStatusCol.sortOrder === 'asc') {
+        setToolStatusCol({ iconsToDisplay: faSortDown, sortOrder: 'desc' });
+        newSortedData.splice(0, newSortedData.length, ...usingRows, ...notUsingRows);
+      }
+      setProjectNameCol({ iconsToDisplay: faSort, sortOrder: 'default' });
+      setInventoryItemTypeCol({ iconsToDisplay: faSort, sortOrder: 'default' });
+      setConditionCol({ iconsToDisplay: faSort, sortOrder: 'default' });
+    } else if (columnName === 'ConditionColumn') {
+      // Add logic for sorting by Condition if needed
+      if (conditionCol.sortOrder === 'default' || conditionCol.sortOrder === 'desc') {
+        newSortedData.sort((a, b) => (a.condition || '').localeCompare(b.condition || ''));
+        setConditionCol({ iconsToDisplay: faSortUp, sortOrder: 'asc' });
+      } else if (conditionCol.sortOrder === 'asc') {
+        newSortedData.sort((a, b) => (b.condition || '').localeCompare(a.condition || ''));
+        setConditionCol({ iconsToDisplay: faSortDown, sortOrder: 'desc' });
+      }
+      setProjectNameCol({ iconsToDisplay: faSort, sortOrder: 'default' });
+      setInventoryItemTypeCol({ iconsToDisplay: faSort, sortOrder: 'default' });
+      setToolStatusCol({ iconsToDisplay: faSort, sortOrder: 'default' });
     }
 
     setData(newSortedData);
@@ -112,9 +153,19 @@ export default function ToolItemsTable({
               ) : (
                 <th>Name</th>
               )}
-              {dynamicColumns.map(({ label }) => (
-                <th key={label}>{label}</th>
-              ))}
+              {dynamicColumns.map(
+                ({ label }) =>
+                  (label == 'Condition' && (
+                    <th onClick={() => sortData('ConditionColumn')} key={label}>
+                      {label} <FontAwesomeIcon icon={conditionCol.iconsToDisplay} size="lg" />
+                    </th>
+                  )) ||
+                  (label == 'Using' && (
+                    <th onClick={() => sortData('ToolStatusColumn')} key={label}>
+                      {label} <FontAwesomeIcon icon={toolStatusCol.iconsToDisplay} size="lg" />
+                    </th>
+                  )) || <th key={label}>{label}</th>,
+              )}
               <th>Updates</th>
               <th>Purchases</th>
             </tr>

From 8581b5b9fc0829d44055398b851df78d631330a0 Mon Sep 17 00:00:00 2001
From: ChiragBellara <chiragbellara7@gmail.com>
Date: Mon, 8 Dec 2025 21:09:15 -0800
Subject: [PATCH 4/7] Added state persistence and fixed the under mantainance
 condition

---
 .../ToolItemList/ToolItemListView.jsx         | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/components/BMDashboard/ToolItemList/ToolItemListView.jsx b/src/components/BMDashboard/ToolItemList/ToolItemListView.jsx
index cc120cbe54..c1bbf35fc5 100644
--- a/src/components/BMDashboard/ToolItemList/ToolItemListView.jsx
+++ b/src/components/BMDashboard/ToolItemList/ToolItemListView.jsx
@@ -5,7 +5,6 @@ import SelectForm from '../ItemList/SelectForm';
 import SelectItem from '../ItemList/SelectItem';
 import ToolItemsTable from './ToolItemsTable';
 import styles from './ToolItemListView.module.css';
-import { set } from 'lodash';
 
 export function ToolItemListView({
   itemType,
@@ -21,6 +20,32 @@ export function ToolItemListView({
   const [selectedCondition, setSelectedCondition] = useState('all');
   const [isError, setIsError] = useState(false);
 
+  useEffect(() => {
+    try {
+      const sp = localStorage.getItem('toolsSelectedProject');
+      const si = localStorage.getItem('toolsSelectedItem');
+      const sts = localStorage.getItem('toolsSelectedStatus');
+      const sc = localStorage.getItem('toolsSelectedCondition');
+
+      if (sp) setSelectedProject(sp);
+      if (si) setSelectedItem(si);
+      if (sts) setSelectedToolStatus(sts);
+      if (sc) setSelectedCondition(sc);
+    } catch (e) {}
+  }, []);
+
+  // Save filters / sort whenever they change
+  useEffect(() => {
+    try {
+      localStorage.setItem('toolsSelectedProject', selectedProject);
+      localStorage.setItem('toolsSelectedItem', selectedItem);
+      localStorage.setItem('toolsSelectedStatus', selectedToolStatus);
+      localStorage.setItem('toolsSelectedCondition', selectedCondition);
+    } catch (e) {
+      // ignore
+    }
+  }, [selectedProject, selectedItem, selectedToolStatus, selectedCondition]);
+
   useEffect(() => {
     if (items) setFilteredItems([...items]);
   }, [items]);
@@ -48,12 +73,9 @@ export function ToolItemListView({
             item.condition !== 'Lost' &&
             item.condition !== 'Needs Replacing'
           );
+        } else if (selectedToolStatus === 'Under Maintenance') {
+          return item.condition === 'Worn' || item.condition === 'Damaged';
         }
-        return true;
-        // if (selectedToolStatus === 'Under Maintenance') {
-        //   // UPDATE LOGIC TO MATCH THE CONDITIONS
-        //   return !item.using && !item.available;
-        // }
       });
     }
 

From 114b06b9d8c8b539deebad1cc1a4cb99b746301b Mon Sep 17 00:00:00 2001
From: ChiragBellara <chiragbellara7@gmail.com>
Date: Tue, 9 Dec 2025 15:54:20 -0800
Subject: [PATCH 5/7] Changed state persistence to logic session based.

---
 .../ToolItemList/ToolItemListView.jsx            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/BMDashboard/ToolItemList/ToolItemListView.jsx b/src/components/BMDashboard/ToolItemList/ToolItemListView.jsx
index c1bbf35fc5..88580b6ac8 100644
--- a/src/components/BMDashboard/ToolItemList/ToolItemListView.jsx
+++ b/src/components/BMDashboard/ToolItemList/ToolItemListView.jsx
@@ -22,10 +22,10 @@ export function ToolItemListView({
 
   useEffect(() => {
     try {
-      const sp = localStorage.getItem('toolsSelectedProject');
-      const si = localStorage.getItem('toolsSelectedItem');
-      const sts = localStorage.getItem('toolsSelectedStatus');
-      const sc = localStorage.getItem('toolsSelectedCondition');
+      const sp = sessionStorage.getItem('toolsSelectedProject');
+      const si = sessionStorage.getItem('toolsSelectedItem');
+      const sts = sessionStorage.getItem('toolsSelectedStatus');
+      const sc = sessionStorage.getItem('toolsSelectedCondition');
 
       if (sp) setSelectedProject(sp);
       if (si) setSelectedItem(si);
@@ -37,10 +37,10 @@ export function ToolItemListView({
   // Save filters / sort whenever they change
   useEffect(() => {
     try {
-      localStorage.setItem('toolsSelectedProject', selectedProject);
-      localStorage.setItem('toolsSelectedItem', selectedItem);
-      localStorage.setItem('toolsSelectedStatus', selectedToolStatus);
-      localStorage.setItem('toolsSelectedCondition', selectedCondition);
+      sessionStorage.setItem('toolsSelectedProject', selectedProject);
+      sessionStorage.setItem('toolsSelectedItem', selectedItem);
+      sessionStorage.setItem('toolsSelectedStatus', selectedToolStatus);
+      sessionStorage.setItem('toolsSelectedCondition', selectedCondition);
     } catch (e) {
       // ignore
     }

From 1caf038981a9fbbe418ce28cf4f2beccb18cd147 Mon Sep 17 00:00:00 2001
From: ChiragBellara <chiragbellara7@gmail.com>
Date: Mon, 15 Dec 2025 12:02:55 -0800
Subject: [PATCH 6/7] Fixed Header console error

---
 src/components/Header/Header.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx
index bae1f5fd03..1a45c2d9a2 100644
--- a/src/components/Header/Header.jsx
+++ b/src/components/Header/Header.jsx
@@ -160,7 +160,7 @@ export function Header(props) {
   const [hasProfileLoaded, setHasProfileLoaded] = useState(false);
   const dismissalKey = `lastDismissed_${userId}`;
   const [lastDismissed, setLastDismissed] = useState(localStorage.getItem(dismissalKey));
-   const [isAckLoading, setIsAckLoading] = useState(false);
+  //  const [isAckLoading, setIsAckLoading] = useState(false);
   const unreadNotifications = props.notification?.unreadNotifications; // List of unread notifications
   const dispatch = useDispatch();
   const history = useHistory();

From 4c0d84a068a61e5f3b640e46158ac2a8e03e08a4 Mon Sep 17 00:00:00 2001
From: ChiragBellara <chiragbellara7@gmail.com>
Date: Mon, 15 Dec 2025 12:54:47 -0800
Subject: [PATCH 7/7] Fixed the dark mode issue on Tools table

---
 public/index.css                                       | 10 +++++++++-
 .../BMDashboard/ItemList/ItemListView.module.css       |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/public/index.css b/public/index.css
index 339428ae6c..0476544525 100644
--- a/public/index.css
+++ b/public/index.css
@@ -171,13 +171,21 @@ body.bm-dashboard-dark .table {
 }
 
 body.dark-mode .table th,
-body.dark-mode .table td,
+body.dark-mode .table td {
+  color: #ffffff !important;
+  border-color: #3a506b;
+}
+
 body.bm-dashboard-dark .table th,
 body.bm-dashboard-dark .table td {
   color: #ffffff !important;
   border-color: #3a506b;
 }
 
+body.bm-dashboard-dark .table th{
+  background-color: #2e5061 !important;
+}
+
 body.dark-mode .table-striped > tbody > tr:nth-of-type(odd),
 body.bm-dashboard-dark .table-striped > tbody > tr:nth-of-type(odd) {
   background-color: rgba(46, 80, 97, 0.5);
diff --git a/src/components/BMDashboard/ItemList/ItemListView.module.css b/src/components/BMDashboard/ItemList/ItemListView.module.css
index 30562f8431..739df2c5fd 100644
--- a/src/components/BMDashboard/ItemList/ItemListView.module.css
+++ b/src/components/BMDashboard/ItemList/ItemListView.module.css
@@ -1,3 +1,7 @@
+table thead th, table td {
+  vertical-align: middle !important;
+}
+
 .itemsListContainer {
   width: 100%;
   max-width: 1536px;