diff --git a/src/components/displays/selfServe/SelfServeTaskList.vue b/src/components/displays/selfServe/SelfServeTaskList.vue index b658fb8b..60cf46b7 100644 --- a/src/components/displays/selfServe/SelfServeTaskList.vue +++ b/src/components/displays/selfServe/SelfServeTaskList.vue @@ -29,6 +29,32 @@ const hasTaskDescription = (task: any) => { const trimmedDescription = description.trim(); return trimmedDescription.length > 0 && trimmedDescription !== "-"; }; + +const getImageAttachments = (task: any) => { + if (!Array.isArray(task?.attachments)) { + return []; + } + + return task.attachments.filter((attachment: any) => isImageAttachment(attachment)); +}; + +const getPrimaryImageAttachment = (task: any) => getImageAttachments(task)[0] || null; + +const getNonImageAttachments = (task: any) => { + if (!Array.isArray(task?.attachments)) { + return []; + } + + return task.attachments.filter((attachment: any) => !isImageAttachment(attachment)); +}; + +const getVisibleServices = (task: any) => { + if (!Array.isArray(task?.services)) { + return []; + } + + return task.services.filter((service: any) => String(service || "").trim().toUpperCase() !== "MACHINE"); +}; + + diff --git a/src/components/displays/selfServe/SelfServeTasksStep.vue b/src/components/displays/selfServe/SelfServeTasksStep.vue index 3649a60a..09912351 100644 --- a/src/components/displays/selfServe/SelfServeTasksStep.vue +++ b/src/components/displays/selfServe/SelfServeTasksStep.vue @@ -33,12 +33,12 @@ const emitDownloadAttachment = (taskId: number, attachmentId: number) => {

{{ $t("self_wash.loading_data") }}

-
-
-

{{ $t("self_wash.wash_in_progress") }}

-

+
+
+

{{ $t("self_wash.wash_in_progress") }}

+

{{ formattedElapsed }} -

+

{
+ + diff --git a/src/views/dashboards/userDashboard/wash/MyWashStart.vue b/src/views/dashboards/userDashboard/wash/MyWashStart.vue index 6dac70de..82bb62d1 100644 --- a/src/views/dashboards/userDashboard/wash/MyWashStart.vue +++ b/src/views/dashboards/userDashboard/wash/MyWashStart.vue @@ -783,11 +783,11 @@ watch(() => forceNearestDepartmentEvaluationId.value, () => { :clickable="clickableSteps[steps.WASH_IN_PROGRESS]()" :visible="currentStep === steps.WASH_IN_PROGRESS" > -
-

{{ $t("self_wash.wash_in_progress") }}

-

+
+

{{ $t("self_wash.wash_in_progress") }}

+

{{ formattedElapsed }} -

+

forceNearestDepartmentEvaluationId.value, () => { + +