Merge pull request 'Expense Type label to be renamed to Expense Category.' (#461) from Kartik_Enhancement#1446 into OnFieldWork_V1

Reviewed-on: #461
Merged

src/components/Expenses/ExpenseFilterPanel.jsx

@@ -31,7 +31,7 @@ const ExpenseFilterPanel = forwardRef(({ onApply, handleGroupBy, setFilterdata }
       { id: "submittedBy", name: "Submitted By" },
       { id: "project", name: "Project" },
       { id: "paymentMode", name: "Payment Mode" },
-      { id: "expensesType", name: "Expense Type" },
+      { id: "expensesType", name: "Expense Category" },
       { id: "createdAt", name: "Submitted Date" },
     ].sort((a, b) => a.name.localeCompare(b.name));
   }, []);

src/components/Expenses/ExpenseList.jsx

@@ -21,6 +21,7 @@ import { useHasUserPermission } from "../../hooks/useHasUserPermission";
 import { useSelector } from "react-redux";
 import ExpenseFilterChips from "./ExpenseFilterChips";
 import { defaultFilter } from "./ExpenseSchema";
+import { useNavigate } from "react-router-dom";
 
 const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
   const [deletingId, setDeletingId] = useState(null);
@@ -30,6 +31,7 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
   const IsExpesneApprpve = useHasUserPermission(APPROVE_EXPENSE);
   const [currentPage, setCurrentPage] = useState(1);
   const debouncedSearch = useDebounce(searchText, 500);
+  const navigate = useNavigate();
 
 
   const { mutate: DeleteExpense, isPending } = useDeleteExpense();
@@ -78,9 +80,8 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
           displayField = "Status";
           break;
         case "submittedBy":
-          key = `${item?.createdBy?.firstName ?? ""} ${
+          key = `${item?.createdBy?.firstName ?? ""} ${item.createdBy?.lastName ?? ""
-            item.createdBy?.lastName ?? ""
+            }`.trim();
-          }`.trim();
           displayField = "Submitted By";
           break;
         case "project":
@@ -93,7 +94,7 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
           break;
         case "expensesType":
           key = item?.expensesType?.name || "Unknown Type";
-          displayField = "Expense Type";
+          displayField = "Expense Category";
           break;
         case "createdAt":
           key = item?.createdAt?.split("T")[0] || "Unknown Date";
@@ -141,7 +142,8 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
         `${e.createdBy?.firstName ?? ""} ${e.createdBy?.lastName ?? ""
           }`.trim() || "N/A",
       customRender: (e) => (
-        <div className="d-flex align-items-center">
+        <div className="d-flex align-items-center cursor-pointer"
+          onClick={() => navigate(`/employee/${e.createdBy?.id}`)}>
           <Avatar
             size="xs"
             classAvatar="m-0"
@@ -226,19 +228,19 @@ const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => {
 
       <div className="card page-min-h px-sm-4">
         {/* Filter Chips */}
-            <ExpenseFilterChips
+        <ExpenseFilterChips
-              filters={filters}
+          filters={filters}
-              filterData={filterData}
+          filterData={filterData}
-              removeFilterChip={removeFilterChip}
+          removeFilterChip={removeFilterChip}
-              groupBy={groupBy}              
+          groupBy={groupBy}
-            />
+        />
         <div
           className="card-datatable table-responsive "
           id="horizontal-example"
         >
-      
+
-            
+
-        
+
           <div className="dataTables_wrapper no-footer px-2 ">
             <table className="table border-top dataTable text-nowrap">
               <thead>