SMA-108: fixed the date

MatejFrnka · Apr 29, 2024 · 501f8c6 · 501f8c6
1 parent 0e9bd08
commit 501f8c6
Showing 1 changed file with 18 additions and 24 deletions.
diff --git a/frontend/sportsmatch-app/src/components/RateGameComponent.tsx b/frontend/sportsmatch-app/src/components/RateGameComponent.tsx
@@ -34,7 +34,7 @@ export default function RateGameComponent(p: Props) {
         console.error(error as ApiError)
       }
     }
-    init()
+    init()    
   })
 
   useEffect(() => {
@@ -53,21 +53,6 @@ export default function RateGameComponent(p: Props) {
     init()
   }, [])
 
-  const dayOfTheWeek = (year: number, month: number, day: number) => {
-    const daysOfTheWeek = [
-      'Sunday',
-      'Monday',
-      'Tuesday',
-      'Wednesday',
-      'Thursday',
-      'Friday',
-      'Saturday',
-    ]
-    const date = new Date(year, month - 1, day)
-    const dateIndex = date.getDay()
-    return daysOfTheWeek[dateIndex]
-  }
-
   const userProfilePicture = 'pictures/unknown-user-placeholder.png'
   const opponentProfilePicture = 'pictures/unknown-user-placeholder.png'
 
@@ -106,6 +91,18 @@ export default function RateGameComponent(p: Props) {
     const value = parseInt(e.target.value) || 0
     setOpponentScore(value)
   }
+
+  const getDateAndTime = (type: string, date: string) => {
+    const dateStart: string[] = date.split(' ')
+    if (type === 'date') {
+      return dateStart[0]
+    } else if (type === 'time') {
+      return dateStart[1]
+    } else {
+      return null
+    }
+  }
+
   return (
     <>
       <div className="container-sm rate-game-window-wrapper">
@@ -117,14 +114,11 @@ export default function RateGameComponent(p: Props) {
             {myEvent ? (
               <>
                 <span>
-                  {dayOfTheWeek(
-                    parseInt(myEvent.dateStart[0]),
-                    parseInt(myEvent.dateStart[1]),
-                    parseInt(myEvent.dateStart[2]),
-                  )}
-                  , {myEvent.dateStart[3]}:{myEvent.dateStart[4]}
-                  {' - '}
-                  {myEvent.dateEnd[3]}:{myEvent.dateEnd[4]}
+                  {'on ' + getDateAndTime('date', myEvent.dateStart) +
+                    ' at ' +
+                    getDateAndTime('time', myEvent.dateStart) +
+                    ' - ' +
+                    getDateAndTime('time', myEvent.dateEnd)}
                 </span>
                 <br />
                 <span>{myEvent.placeDTO?.name}</span>{' '}