From f0064abfbe8306f2756c6a208f024119916a1f64 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Wed, 9 Jul 2025 15:16:31 -0700 Subject: [PATCH] IO-3296 Schedule Delivery Dashboard Signed-off-by: Allan Carr --- .../scheduled-delivery-today.component.jsx | 10 +++++----- .../scheduled-in-today.component.jsx | 6 +++--- .../scheduled-out-today.component.jsx | 10 +++++----- client/src/translations/en_us/common.json | 3 +++ client/src/translations/es/common.json | 3 +++ client/src/translations/fr/common.json | 3 +++ 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx b/client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx index 8728de179..12c2f6569 100644 --- a/client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx +++ b/client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx @@ -138,7 +138,7 @@ export default function DashboardScheduledDeliveryToday({ data, ...cardProps }) .filter(onlyUnique) .map((s) => { return { - text: s || "No Alt. Transport*", + text: s || t("dashboard.errors.atp"), value: [s] }; }) @@ -154,7 +154,7 @@ export default function DashboardScheduledDeliveryToday({ data, ...cardProps }) dataIndex: "status", key: "status", ellipsis: true, - sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport), + sorter: (a, b) => alphaSort(a.status, b.status), sortOrder: state.sortedInfo.columnKey === "status" && state.sortedInfo.order, filters: (scheduledDeliveryToday && @@ -163,7 +163,7 @@ export default function DashboardScheduledDeliveryToday({ data, ...cardProps }) .filter(onlyUnique) .map((s) => { return { - text: s || "No Status*", + text: s || t("dashboard.errors.status"), value: [s] }; }) @@ -306,7 +306,7 @@ export default function DashboardScheduledDeliveryToday({ data, ...cardProps }) .filter(onlyUnique) .map((s) => { return { - text: s || "No Ins. Co.*", + text: s || t("dashboard.errors.insco"), value: [s] }; }) @@ -328,7 +328,7 @@ export default function DashboardScheduledDeliveryToday({ data, ...cardProps }) .filter(onlyUnique) .map((s) => { return { - text: s || "No Alt. Transport*", + text: s || t("dashboard.errors.atp"), value: [s] }; }) diff --git a/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx b/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx index 7fc1be35d..05d76983e 100644 --- a/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx +++ b/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx @@ -169,7 +169,7 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) { .filter(onlyUnique) .map((s) => { return { - text: s || "No Alt. Transport", + text: s || t("dashboard.errors.atp"), value: [s] }; }) @@ -313,7 +313,7 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) { .filter(onlyUnique) .map((s) => { return { - text: s || "No Ins. Co.*", + text: s || t("dashboard.errors.insco"), value: [s] }; }) @@ -335,7 +335,7 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) { .filter(onlyUnique) .map((s) => { return { - text: s || "No Alt. Transport", + text: s || t("dashboard.errors.atp"), value: [s] }; }) diff --git a/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx b/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx index da0871260..fdfcc53a5 100644 --- a/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx +++ b/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx @@ -138,7 +138,7 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) { .filter(onlyUnique) .map((s) => { return { - text: s || "No Alt. Transport*", + text: s || t("dashboard.errors.atp"), value: [s] }; }) @@ -154,7 +154,7 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) { dataIndex: "status", key: "status", ellipsis: true, - sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport), + sorter: (a, b) => alphaSort(a.status, b.status), sortOrder: state.sortedInfo.columnKey === "status" && state.sortedInfo.order, filters: (scheduledOutToday && @@ -163,7 +163,7 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) { .filter(onlyUnique) .map((s) => { return { - text: s || "No Status*", + text: s || t("dashboard.errors.status"), value: [s] }; }) @@ -306,7 +306,7 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) { .filter(onlyUnique) .map((s) => { return { - text: s || "No Ins. Co.*", + text: s || t("dashboard.errors.insco"), value: [s] }; }) @@ -328,7 +328,7 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) { .filter(onlyUnique) .map((s) => { return { - text: s || "No Alt. Transport*", + text: s || t("dashboard.errors.atp"), value: [s] }; }) diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 4e829ba4e..6ddb4b631 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -975,7 +975,10 @@ "addcomponent": "Add Component" }, "errors": { + "atp": "No Alt. Transport*", + "insco": "No Ins. Co.*", "refreshrequired": "You must refresh the dashboard data to see this component.", + "status": "No Status*", "updatinglayout": "Error saving updated layout {{message}}" }, "labels": { diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index e5e31c56e..b67df8cd7 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -975,7 +975,10 @@ "addcomponent": "" }, "errors": { + "atp": "", + "insco": "", "refreshrequired": "", + "status": "", "updatinglayout": "" }, "labels": { diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index d458240bc..1302c4606 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -975,7 +975,10 @@ "addcomponent": "" }, "errors": { + "atp": "", + "insco": "", "refreshrequired": "", + "status": "", "updatinglayout": "" }, "labels": {