diff --git a/src/components/Expenses/ExpenseFilterPanel.jsx b/src/components/Expenses/ExpenseFilterPanel.jsx index 44a03780..441b051e 100644 --- a/src/components/Expenses/ExpenseFilterPanel.jsx +++ b/src/components/Expenses/ExpenseFilterPanel.jsx @@ -23,11 +23,11 @@ const ExpenseFilterPanel = ({ onApply, handleGroupBy }) => { const groupByList = useMemo(() => [ { id: "transactionDate", name: "Transaction Date" }, { id: "status", name: "Status" }, - { id: "paidBy", name: "Paid By" }, + { id: "submittedBy", name: "Submitted By" }, { id: "project", name: "Project" }, { id: "paymentMode", name: "Payment Mode" }, { id: "expensesType", name: "Expense Type" }, - {id: "createdAt",name:"Submitted"} + {id: "createdAt",name:"Submitted Date"} ], []); const [selectedGroup, setSelectedGroup] = useState(groupByList[0]); diff --git a/src/components/Expenses/ExpenseList.jsx b/src/components/Expenses/ExpenseList.jsx index cb9567df..4a55cfc9 100644 --- a/src/components/Expenses/ExpenseList.jsx +++ b/src/components/Expenses/ExpenseList.jsx @@ -4,14 +4,18 @@ import Avatar from "../common/Avatar"; import { useExpenseContext } from "../../pages/Expense/ExpensePage"; import { formatDate, formatUTCToLocalTime } from "../../utils/dateUtils"; import Pagination from "../common/Pagination"; -import { APPROVE_EXPENSE, EXPENSE_DRAFT, EXPENSE_REJECTEDBY } from "../../utils/constants"; +import { + APPROVE_EXPENSE, + EXPENSE_DRAFT, + EXPENSE_REJECTEDBY, +} from "../../utils/constants"; import { getColorNameFromHex, useDebounce } from "../../utils/appUtils"; import { ExpenseTableSkeleton } from "./ExpenseSkeleton"; import ConfirmModal from "../common/ConfirmModal"; import { useHasUserPermission } from "../../hooks/useHasUserPermission"; import { useSelector } from "react-redux"; -const ExpenseList = ({ filters, groupBy = "transactionDate",searchText }) => { +const ExpenseList = ({ filters, groupBy = "transactionDate", searchText }) => { const [deletingId, setDeletingId] = useState(null); const [IsDeleteModalOpen, setIsDeleteModalOpen] = useState(false); const { setViewExpense, setManageExpenseModal } = useExpenseContext(); @@ -62,9 +66,9 @@ const ExpenseList = ({ filters, groupBy = "transactionDate",searchText }) => { case "status": key = item.status?.displayName || "Unknown"; break; - case "paidBy": - key = `${item.paidBy?.firstName ?? ""} ${ - item.paidBy?.lastName ?? "" + case "submittedBy": + key = `${item.createdBy?.firstName ?? ""} ${ + item.createdBy?.lastName ?? "" }`.trim(); break; case "project": @@ -76,7 +80,7 @@ const ExpenseList = ({ filters, groupBy = "transactionDate",searchText }) => { case "expensesType": key = item.expensesType?.name || "Unknown Type"; break; - case "createdAt": + case "createdAt": key = item.createdAt?.split("T")[0] || "Unknown Type"; break; default: @@ -102,23 +106,23 @@ const ExpenseList = ({ filters, groupBy = "transactionDate",searchText }) => { align: "text-start", }, { - key: "paidBy", - label: "Paid By", + key: "Submitted By", + label: "Submitted By", align: "text-start", getValue: (e) => - `${e.paidBy?.firstName ?? ""} ${e.paidBy?.lastName ?? ""}`.trim() || + `${e.createdBy?.firstName ?? ""} ${e.createdBy?.lastName ?? ""}`.trim() || "N/A", customRender: (e) => (