fix: use correct timezone in class details, minor refactoring

one-zero-eight · Mar 25, 2024 · a87c412 · a87c412
1 parent 7700b21
commit a87c412
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/backend/src/bot/handlers/views/trainings_day-trainings.tsx b/backend/src/bot/handlers/views/trainings_day-trainings.tsx
@@ -4,7 +4,7 @@ import type { View } from '.'
 import views from '.'
 import type { Ctx } from '~/bot/context'
 import { TIMEZONE } from '~/constants'
-import { getDateDayInTimezone, getDayBoundaries } from '~/utils/dates'
+import { clockTime, getDateDayInTimezone, getDayBoundaries } from '~/utils/dates'
 
 const VIEW_ID = 'trainings/day-trainings'
 
@@ -41,18 +41,8 @@ export default {
         {ctx.t['Views.DayTrainings.Message']}
         <keyboard>
           {trainings.map((training) => {
-            const timeStart = training.startsAt.toLocaleString('en-US', {
-              hour: '2-digit',
-              minute: '2-digit',
-              hour12: false,
-              timeZone: TIMEZONE,
-            })
-            const timeEnd = training.endsAt.toLocaleString('en-US', {
-              hour: '2-digit',
-              minute: '2-digit',
-              hour12: false,
-              timeZone: TIMEZONE,
-            })
+            const timeStart = clockTime(training.startsAt, TIMEZONE)
+            const timeEnd = clockTime(training.endsAt, TIMEZONE)
             const statusEmoji = training.checkedIn
               ? '🟢'
               : training.checkInAvailable

diff --git a/backend/src/translations/_en.tsx b/backend/src/translations/_en.tsx
@@ -52,7 +52,7 @@ export default {
       <b>{title}</b><br/>
       <br/>
       <b>Date:</b> {dateLong(startsAt)}<br/>
-      <b>Time:</b> {clockTime(startsAt)}—{clockTime(endsAt)}<br/>
+      <b>Time:</b> {clockTime(startsAt, TIMEZONE)}—{clockTime(endsAt, TIMEZONE)}<br/>
       <b>Accreditted:</b> {accredited ? 'Yes' : 'No'}<br/>
       {(teachers.length > 0) && (
         <>

diff --git a/backend/src/utils/dates.ts b/backend/src/utils/dates.ts
@@ -81,10 +81,11 @@ export function getDayBoundaries({
   return [boundaryStart, boundaryEnd]
 }
 
-export function clockTime(date: Date): string {
-  return `${
-    date.getHours().toString().padStart(2, '0')
-  }:${
-    date.getMinutes().toString().padStart(2, '0')
-  }`
+export function clockTime(date: Date, timezone?: string): string {
+  return date.toLocaleString('en-US', {
+    hour: '2-digit',
+    minute: '2-digit',
+    hour12: false,
+    timeZone: timezone,
+  })
 }