From 2e589c44a679bc1994765d07afb206af0ddbabb3 Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Mon, 8 Jan 2024 15:44:04 -0500 Subject: [PATCH] Fix IO-2535 Signed-off-by: Dave Richer --- .../dms-log-events.component.jsx | 2 +- .../job-detail-cards.dates.component.jsx | 26 +++++++++---------- .../job-lines-expander.component.jsx | 8 +++--- ...e-existing-appointments-list.component.jsx | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/client/src/components/dms-log-events/dms-log-events.component.jsx b/client/src/components/dms-log-events/dms-log-events.component.jsx index b791cd177..3cca7eb38 100644 --- a/client/src/components/dms-log-events/dms-log-events.component.jsx +++ b/client/src/components/dms-log-events/dms-log-events.component.jsx @@ -28,7 +28,7 @@ export function DmsLogEvents({ socket, logs, bodyshop }) { items={logs.map((log, idx) => ({ key: idx, color: LogLevelHierarchy(log.level), - label: ( + children: ( {log.level} {dayjs(log.timestamp).format("MM/DD/YYYY HH:mm:ss")} diff --git a/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx index 973eec6f2..ebb1ae042 100644 --- a/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx +++ b/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx @@ -16,7 +16,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) { ? [ { key: "date_last_contacted", - label: ( + children: ( <> {data.date_last_contacted} @@ -29,7 +29,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) { ? [ { key: "date_open", - label: ( + children: ( <> {data.date_open} @@ -42,7 +42,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) { ? [ { key: "date_estimated", - label: ( + children: ( <> {data.date_estimated} @@ -55,7 +55,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) { ? [ { key: "date_scheduled", - label: ( + children: ( <> {data.date_scheduled} @@ -68,7 +68,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) { ? [ { key: "scheduled_in", - label: ( + children: ( <> {data.scheduled_in} @@ -81,7 +81,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) { ? [ { key: "actual_in", - label: ( + children: ( <> {data.actual_in} @@ -94,7 +94,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) { ? [ { key: "date_repairstarted", - label: ( + children: ( <> {data.date_repairstarted} @@ -107,7 +107,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) { ? [ { key: "scheduled_completion", - label: ( + children: ( <> {data.scheduled_completion} @@ -120,7 +120,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) { ? [ { key: "actual_completion", - label: ( + children: ( <> {data.actual_completion} @@ -133,7 +133,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) { ? [ { key: "scheduled_delivery", - label: ( + children: ( <> {data.scheduled_delivery} @@ -146,7 +146,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) { ? [ { key: "actual_delivery", - label: ( + children: ( <> {data.actual_delivery} @@ -159,7 +159,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) { ? [ { key: "date_invoiced", - label: ( + children: ( <> {data.date_invoiced} @@ -172,7 +172,7 @@ export default function JobDetailCardsDatesComponent({loading, data}) { ? [ { key: "date_exported", - label: ( + children: ( <> {data.date_exported} diff --git a/client/src/components/job-detail-lines/job-lines-expander.component.jsx b/client/src/components/job-detail-lines/job-lines-expander.component.jsx index 51b70e3eb..2d3f932ed 100644 --- a/client/src/components/job-detail-lines/job-lines-expander.component.jsx +++ b/client/src/components/job-detail-lines/job-lines-expander.component.jsx @@ -32,7 +32,7 @@ export default function JobLinesExpander({jobline, jobid}) { data.parts_order_lines.length > 0 ? data.parts_order_lines.map((line) => ({ key: line.id, - label: ( + children: ( } wrap> 0 ? data.billlines.map((line) => ({ key: line.id, - label: ( + children: ( ({ key: item.id, color: item.canceled ? "red" : item.arrived ? "green" : "blue", - label: ( + children: ( <> {item.canceled ? t("appointments.labels.cancelledappointment")