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

Feature/IO-2894 Modify Shift Memo
2024-08-29 22:00:14 +00:00
parent 3c6faf8473 f3f16b78d5
commit 91e2e7931b
4 changed files with 13 additions and 15 deletions
--- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx
+++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
@@ -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.clockon || record.clockoff ? t(record.memo) : record.memo)
+      render: (text, record) => (record.memo.startsWith("timetickets.labels") ? t(record.memo) : record.memo)
    },
    ...(Enhanced_Payroll.treatment === "on"
      ? [