admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feature/IO-2894-Modify-Shift-Memo (pull request #1677)

Browse Source 
IO-2894 Null check
This commit is contained in:
Allan Carr
2024-09-03 15:54:13 +00:00
parent 4b96d5a707 2a2d399a98
commit f1e84c348b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/time-ticket-list/time-ticket-list.component.jsx
View File

@@ -165,7 +165,7 @@ export function TimeTicketList({
key: "memo",
sorter: (a, b) => alphaSort(a.memo, b.memo),
sortOrder: state.sortedInfo.columnKey === "memo" && state.sortedInfo.order,
render: (text, record) => (record.memo.startsWith("timetickets.labels") ? t(record.memo) : record.memo)
render: (text, record) => (record.memo?.startsWith("timetickets.labels") ? t(record.memo) : record.memo)
},
...(Enhanced_Payroll.treatment === "on"
? [

2
client/src/components/time-ticket-shift-active/time-ticket-shift-active.component.jsx
View File

@@ -39,7 +39,7 @@ export default function TimeTicketShiftActive({ timetickets, refetch, isTechCons
renderItem={(ticket) => (
<List.Item>
<Card
title={ticket.memo.startsWith("timetickets.labels") ? t(ticket.memo) : ticket.memo}
title={ticket.memo?.startsWith("timetickets.labels") ? t(ticket.memo) : ticket.memo}
actions={[
<TechClockOffButton
jobId={ticket.jobid}