diff --git a/client/src/components/time-ticket-list/time-ticket-list.component.jsx b/client/src/components/time-ticket-list/time-ticket-list.component.jsx index 40af8ca48..7cebf2672 100644 --- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx +++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx @@ -85,7 +85,7 @@ export function TimeTicketList({ text: (() => { const emp = bodyshop.employees.find((e) => e.id === s); - return `${emp.first_name} ${emp.last_name}`; + return `${emp?.first_name} ${emp?.last_name}`; })(), // value: [s], }; diff --git a/client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx b/client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx index da4e1bbab..f68eadb6d 100644 --- a/client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx +++ b/client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx @@ -131,6 +131,7 @@ const JobRelatedTicketsTable = ({ return { id: `${item.jobKey}${costCenter}`, + costCenter, item, actHrs: actHrs.toFixed(1), prodHrs: prodHrs.toFixed(1), @@ -151,7 +152,9 @@ const JobRelatedTicketsTable = ({ sortOrder: state.sortedInfo.columnKey === "empname" && state.sortedInfo.order, render: (text, record) => - `${record.item.employee.first_name} ${record.item.employee.last_name}`, + `${record.item.employee.first_name} ${record.item.employee.last_name} ${ + record.costCenter ? `(${record.costCenter})` : "" + }`.trim(), }, { title: t("timetickets.fields.actualhrs"), @@ -215,7 +218,7 @@ const JobRelatedTicketsTable = ({ const handleTableChange = (pagination, filters, sorter) => { setState({ ...state, filteredInfo: filters, sortedInfo: sorter }); }; - + console.log(data); return (