🚸 (results) Improve submitted at field parsing

baptisteArno · Mar 5, 2024 · 77bc138 · 77bc138
1 parent 022a320
commit 77bc138
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/packages/lib/results/convertResultsToTableData.ts b/packages/lib/results/convertResultsToTableData.ts
@@ -70,10 +70,19 @@ export const convertResultsToTableData = (
     }, {}),
   }))
 
-const convertDateToReadable = (date: Date): string =>
-  date.toDateString().split(' ').slice(1, 3).join(' ') +
-  ', ' +
-  date.toLocaleTimeString([], {
+const convertDateToReadable = (date: Date): string => {
+  const isThisYear = new Date().getFullYear() === date.getFullYear()
+
+  const dateString = date.toLocaleDateString('default', {
+    month: 'short',
+    day: 'numeric',
+    year: isThisYear ? undefined : 'numeric', // Only show the year if it's not the current year
+  })
+
+  const timeString = date.toLocaleTimeString('default', {
     hour: '2-digit',
     minute: '2-digit',
   })
+
+  return `${dateString}, ${timeString}`
+}