Fixed schedule page weekdays

Author: coder13

src/pages/Competition/Person/index.tsx

@@ -135,7 +135,9 @@ export default function PersonPage() {
     .map((a) => {
       const venue = a?.activity?.room?.id
         ? wcif?.schedule.venues?.find((v) =>
-            v.rooms.some((r) => r.id === a.activity?.room?.id || a.activity?.parent?.room?.id)
+            v.rooms.some(
+              (r) => r.id === a.activity?.room?.id || r.id === a.activity?.parent?.room?.id
+            )
           )
         : wcif?.schedule.venues?.[0];
 

src/pages/Competition/Schedule.tsx

@@ -27,21 +27,47 @@ export default function Round() {
 
   const scheduleDays = activities
     .map((a) => {
+      const room = a.room || a.parent?.room;
+      const venue =
+        wcif?.schedule.venues?.find((v) => v.rooms.some((r) => r.id === room?.id)) ||
+        wcif?.schedule.venues?.[0];
+
       const dateTime = new Date(a.startTime);
       return {
         approxDateTime: dateTime.getTime(),
-        date: formatDate(dateTime) || 'foo',
+        date: dateTime.toLocaleDateString([], {
+          weekday: 'long',
+          year: 'numeric',
+          month: 'numeric',
+          day: 'numeric',
+          timeZone: venue?.timezone,
+        }),
         dateParts: formatToParts(dateTime),
       };
     })
     .filter((v, i, arr) => arr.findIndex(({ date }) => date === v.date) === i)
     .sort((a, b) => a.approxDateTime - b.approxDateTime);
 
   const activitiesWithParsedDate = activities
-    .map((a) => ({
-      ...a,
-      date: formatDate(new Date(a.startTime)),
-    }))
+    .map((a) => {
+      const room = a.room || a.parent?.room;
+      const venue =
+        wcif?.schedule.venues?.find((v) => v.rooms.some((r) => r.id === room?.id)) ||
+        wcif?.schedule.venues?.[0];
+
+      const dateTime = new Date(a.startTime);
+
+      return {
+        ...a,
+        date: dateTime.toLocaleDateString([], {
+          weekday: 'long',
+          year: 'numeric',
+          month: 'numeric',
+          day: 'numeric',
+          timeZone: venue?.timezone,
+        }),
+      };
+    })
     .sort((a, b) => byDate(a, b));
 
   const getActivitiesByDate = useCallback(
@@ -71,9 +97,7 @@ export default function Round() {
               const venue = wcif?.schedule?.venues?.find((v) =>
                 v.rooms.some(
                   (r) =>
-                    r.id === activity.parent?.parent?.room?.id ||
-                    r.id === activity.parent?.room?.id ||
-                    activity?.room?.id
+                    r.id === activity.parent?.parent?.room?.id || r.id === activity.parent?.room?.id
                 )
               );
               const timeZone = venue?.timezone ?? wcif?.schedule.venues?.[0]?.timezone ?? '';