From cb08738c203fc42e5f6ad418048c4201a50b890b Mon Sep 17 00:00:00 2001 From: Jayanthi Date: Thu, 1 May 2025 15:11:39 -0700 Subject: [PATCH 1/3] Add days to delivery delay parser --- .../src/composables/deliveryDelayParser.ts | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/Frontend/src/composables/deliveryDelayParser.ts b/src/Frontend/src/composables/deliveryDelayParser.ts index c06f11fb6..843249952 100644 --- a/src/Frontend/src/composables/deliveryDelayParser.ts +++ b/src/Frontend/src/composables/deliveryDelayParser.ts @@ -1,6 +1,16 @@ -export function parseDeliveryDelay(delay: string): { hours: number; minutes: number; seconds: number } { - const [hours, minutes, seconds] = delay.split(":").map(Number); - return { hours, minutes, seconds }; +export function parseDeliveryDelay(delay: string): { days: number; hours: number; minutes: number; seconds: number } { + // Split on period first to handle multi-digit days + const parts = delay.split("."); + let days = 0; + let timeComponent = delay; + + if (parts.length > 1) { + days = parseInt(parts[0], 10); + timeComponent = parts[1]; + } + + const [hours, minutes, seconds] = timeComponent.split(":").map(Number); + return { days, hours, minutes, seconds }; } function getFriendly(time: number, text: string): string { @@ -8,7 +18,7 @@ function getFriendly(time: number, text: string): string { } export function getTimeoutFriendly(delivery_delay: string): string { - const { hours, minutes, seconds } = parseDeliveryDelay(delivery_delay); + const { days, hours, minutes, seconds } = parseDeliveryDelay(delivery_delay); - return `${getFriendly(hours, "h")}${getFriendly(minutes, "m")}${getFriendly(seconds, "s")}`; + return `${getFriendly(days, "d")}${getFriendly(hours, "h")}${getFriendly(minutes, "m")}${getFriendly(seconds, "s")}`; } From 11fb607625fb1d8029481c03ad8cdb94d4775412 Mon Sep 17 00:00:00 2001 From: Jayanthi Date: Thu, 1 May 2025 15:12:05 -0700 Subject: [PATCH 2/3] remove back to messages link --- .../src/components/messages2/SagaDiagram/SagaHeader.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Frontend/src/components/messages2/SagaDiagram/SagaHeader.vue b/src/Frontend/src/components/messages2/SagaDiagram/SagaHeader.vue index 6ed2a4589..b533a0c45 100644 --- a/src/Frontend/src/components/messages2/SagaDiagram/SagaHeader.vue +++ b/src/Frontend/src/components/messages2/SagaDiagram/SagaHeader.vue @@ -1,6 +1,4 @@