From 6f767abec167e4d2f9b58c0ff248b26dddfd1559 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Sun, 2 Oct 2022 02:56:01 +0200
Subject: [PATCH] frontend use exact time in every case

---
 frontend/src/lib/components/jobs/JobDetail.svelte | 2 +-
 frontend/src/lib/utils.ts                         | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/frontend/src/lib/components/jobs/JobDetail.svelte b/frontend/src/lib/components/jobs/JobDetail.svelte
index cbed387439..bd29bf98ee 100644
--- a/frontend/src/lib/components/jobs/JobDetail.svelte
+++ b/frontend/src/lib/components/jobs/JobDetail.svelte
@@ -114,7 +114,7 @@
 			</div>
 		</div>
 		<div class="bg-white grid grid-cols-2 gap-x-2 col-span-2">
-			<div class="w-full text-gray-500 text-xs text-left flex flex-col gap-1 mx-4">
+			<div class="w-full text-gray-500 text-xs text-left flex flex-col gap-1 mx-4 overflow-hidden">
 				<div>
 					<Icon class="text-gray-700" data={faUser} scale={SMALL_ICON_SCALE} /><span class="mx-2">
 						By {job.created_by}</span
diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts
index c23d24aa43..0c41624c98 100644
--- a/frontend/src/lib/utils.ts
+++ b/frontend/src/lib/utils.ts
@@ -43,8 +43,10 @@ export function displayDaysAgo(dateString: string): string {
 		let dAgo = daysAgo(date)
 		if (dAgo == 0) {
 			return `yday at ${date.toLocaleTimeString()}`
+		} else if (dAgo > 7) {
+			return `${dAgo + 1} days ago at ${date.toLocaleTimeString()}`
 		} else {
-			return `${dAgo + 1} days ago`
+			return displayDate(dateString)
 		}
 	}
 }
@@ -54,9 +56,8 @@ export function displayDate(dateString: string | undefined): string {
 	if (date.toString() === 'Invalid Date') {
 		return ''
 	} else {
-		return `${date.getFullYear()}/${
-			date.getMonth() + 1
-		}/${date.getDate()} at ${date.toLocaleTimeString()}`
+		return `${date.getFullYear()}/${date.getMonth() + 1
+			}/${date.getDate()} at ${date.toLocaleTimeString()}`
 	}
 }