Fixed times on portal schedules

FIRSTIsrael · Jan 31, 2025 · c358537 · c358537
1 parent e9a38f0
commit c358537
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/apps/backend/src/routers/public/portal/divisions/schedule.ts b/apps/backend/src/routers/public/portal/divisions/schedule.ts
@@ -3,7 +3,7 @@ import asyncHandler from 'express-async-handler';
 import { ObjectId } from 'mongodb';
 import dayjs from 'dayjs';
 import * as db from '@lems/database';
-import { PortalActivity, PortalSchedule, RobotGameMatch } from '@lems/types';
+import { PortalActivity, PortalSchedule } from '@lems/types';
 
 const router = express.Router({ mergeParams: true });
 
@@ -40,7 +40,7 @@ router.get(
     const rows = {};
 
     for (const session of sessions) {
-      const startTime = dayjs(session.scheduledTime).format('HH:mm');
+      const startTime = dayjs(session.scheduledTime).unix();
       const team = teams.find(team => String(team._id) === String(session.teamId));
       const room = rooms.find(room => String(room._id) === String(session.roomId));
 
@@ -115,7 +115,8 @@ router.get(
         if (!acc[match.stage][match.round]) {
           acc[match.stage][match.round] = { columns, rows: {} };
         }
-        acc[match.stage][match.round].rows[dayjs(match.scheduledTime).format('HH:mm')] = {
+        const startTime = dayjs(match.scheduledTime).unix();
+        acc[match.stage][match.round].rows[startTime] = {
           number: match.number,
           data: matchTeams
         };

diff --git a/apps/portal/pages/events/[id]/schedule/field.tsx b/apps/portal/pages/events/[id]/schedule/field.tsx
@@ -1,4 +1,5 @@
 import { GetServerSideProps, GetServerSidePropsContext, NextPage } from 'next';
+import dayjs from 'dayjs';
 import {
   TableContainer,
   Table,
@@ -83,7 +84,7 @@ const Page: NextPage<Props> = ({ event }) => {
                           sx={{ '&:last-child td, &:last-child th': { border: 0 } }}
                         >
                           <TableCell>{teams.number}</TableCell>
-                          <TableCell>{time}</TableCell>
+                          <TableCell>{dayjs.unix(Number(time)).format('HH:mm')}</TableCell>
                           {round.schedule.columns.map(column => {
                             const team = teams.data.find(t => t?.column === column.id);
                             return (

diff --git a/apps/portal/pages/events/[id]/schedule/judging.tsx b/apps/portal/pages/events/[id]/schedule/judging.tsx
@@ -1,4 +1,5 @@
 import { GetServerSideProps, GetServerSidePropsContext, NextPage } from 'next';
+import dayjs from 'dayjs';
 import {
   TableContainer,
   Table,
@@ -9,8 +10,7 @@ import {
   TableBody,
   Paper,
   Container,
-  Box,
-  Stack
+  Box
 } from '@mui/material';
 import { PortalEvent, PortalJudgingSchedule } from '@lems/types';
 import { fetchEvent } from '../../../../lib/api';
@@ -64,7 +64,7 @@ const Page: NextPage<Props> = ({ event }) => {
                   {Object.entries(schedule.rows).map(([time, session]) => (
                     <TableRow key={time} sx={{ '&:last-child td, &:last-child th': { border: 0 } }}>
                       <TableCell>{session.number}</TableCell>
-                      <TableCell>{time}</TableCell>
+                      <TableCell>{dayjs.unix(Number(time)).format('HH:mm')}</TableCell>
                       {schedule.columns.map(column => {
                         const team = session.data.find(t => t?.column === column.id);
                         return (

diff --git a/libs/types/src/lib/portal/requests.ts b/libs/types/src/lib/portal/requests.ts
@@ -93,7 +93,7 @@ export type PortalActivity<T extends 'match' | 'session' | 'general'> = T extend
 export interface PortalSchedule {
   columns: { id: string; name: string }[];
   rows: Record<
-    string,
+    number,
     {
       number: number;
       data: ((PortalTeam & { column: string }) | null)[];