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 9391d8edb..b73e5dbe7 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
@@ -44,7 +44,7 @@ function LogLevelHierarchy(level) {
return "orange";
case "INFO":
return "blue";
- case "WARNING":
+ case "WARN":
return "yellow";
case "ERROR":
return "red";
diff --git a/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx b/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
index 0ef0faf80..c9bbc0dd2 100644
--- a/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
+++ b/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
@@ -29,7 +29,7 @@ const DateTimePicker = ({
const handleChange = useCallback(
(newDate) => {
if (onChange) {
- onChange(bodyshop?.timezone ? dayjs(newDate).tz(bodyshop.timezone, true) : newDate);
+ onChange(bodyshop?.timezone && newDate ? dayjs(newDate).tz(bodyshop.timezone, true) : newDate);
}
setIsManualInput(false);
},
diff --git a/client/src/components/task-list/task-list.component.jsx b/client/src/components/task-list/task-list.component.jsx
index 0c01ef6a8..ba7d71b17 100644
--- a/client/src/components/task-list/task-list.component.jsx
+++ b/client/src/components/task-list/task-list.component.jsx
@@ -144,7 +144,7 @@ function TaskListComponent({
title: t("tasks.fields.created_by"),
dataIndex: "created_by",
key: "created_by",
- width: "10%",
+ width: "8%",
defaultSortOrder: "descend",
sorter: true,
sortOrder: sortcolumn === "created_by" && sortorder,
@@ -166,65 +166,70 @@ function TaskListComponent({
});
}
- if (showRo) {
- columns.push({
- title: t("tasks.fields.job.ro_number"),
- dataIndex: ["job", "ro_number"],
- key: "job.ro_number",
- width: "8%",
- render: (text, record) =>
- record.job ? (
- {record.job.ro_number || t("general.labels.na")}
- ) : (
- t("general.labels.na")
- )
- });
- }
+ columns.push({
+ title: t("tasks.fields.related_items"),
+ key: "related_items",
+ width: "12%",
+ render: (text, record) => {
+ const items = [];
+
+ // Job
+ if (showRo && record.job) {
+ items.push(
+
+ {t("tasks.fields.job.ro_number")}: {record.job.ro_number}
+
+ );
+ }
+ if (showRo && !record.job) {
+ items.push(`${t("tasks.fields.job.ro_number")}: ${t("general.labels.na")}`);
+ }
+
+ // Jobline
+ if (record.jobline?.line_desc) {
+ items.push(
+
+ {t("tasks.fields.jobline")}: {record.jobline.line_desc}
+
+ );
+ }
+
+ // Parts Order
+ if (record.parts_order) {
+ const { order_number, vendor } = record.parts_order;
+ const partsOrderText =
+ order_number && vendor?.name ? `${order_number} - ${vendor.name}` : t("general.labels.na");
+ items.push(
+
+ {t("tasks.fields.parts_order")}: {partsOrderText}
+
+ );
+ }
+
+ // Bill
+ if (record.bill) {
+ const { invoice_number, vendor } = record.bill;
+ const billText = invoice_number && vendor?.name ? `${invoice_number} - ${vendor.name}` : t("general.labels.na");
+ items.push(
+
+ {t("tasks.fields.bill")}: {billText}
+
+ );
+ }
+
+ return items.length > 0 ? {items} : null;
+ }
+ });
columns.push(
- {
- title: t("tasks.fields.jobline"),
- dataIndex: ["jobline", "id"],
- key: "jobline.id",
- width: "8%",
- render: (text, record) => record?.jobline?.line_desc || ""
- },
- {
- title: t("tasks.fields.parts_order"),
- dataIndex: ["parts_order", "id"],
- key: "part_order.id",
- width: "8%",
- render: (text, record) =>
- record.parts_order ? (
-
- {record.parts_order.order_number && record.parts_order.vendor && record.parts_order.vendor.name
- ? `${record.parts_order.order_number} - ${record.parts_order.vendor.name}`
- : t("general.labels.na")}
-
- ) : (
- ""
- )
- },
- {
- title: t("tasks.fields.bill"),
- dataIndex: ["bill", "id"],
- key: "bill.id",
- width: "10%",
- render: (text, record) =>
- record.bill ? (
-
- {record.bill.invoice_number && record.bill.vendor && record.bill.vendor.name
- ? `${record.bill.invoice_number} - ${record.bill.vendor.name}`
- : t("general.labels.na")}
-
- ) : (
- ""
- )
- },
{
title: t("tasks.fields.title"),
dataIndex: "title",
key: "title",
+ minWidth: "20%",
sorter: true,
sortOrder: sortcolumn === "title" && sortorder
},
@@ -258,7 +263,7 @@ function TaskListComponent({
{
title: t("tasks.fields.actions"),
key: "toggleCompleted",
- width: "5%",
+ width: "8%",
render: (text, record) => (