Show multi-cube submission

Author: coder13

src/containers/PersonalSchedule/Assignments.tsx

@@ -111,10 +111,13 @@ export function Assignments({ wcif, person, showStationNumber }: AssignmentsProp
                       const isOver = now > roundedEndTime;
                       const isCurrent = now > roundedStartTime && now < roundedEndTime;
 
-                      if (
-                        assignment.type === 'extra' ||
-                        !('room' in activity || 'parent' in activity)
-                      ) {
+                      const room =
+                        'room' in activity
+                          ? activity.room
+                          : 'parent' in activity
+                            ? activity.parent?.room
+                            : undefined;
+                      if (assignment.type === 'extra') {
                         return (
                           <ExtraAssignment
                             key={`${date}-${roundedStartTime.toLocaleString()}-${
@@ -125,6 +128,7 @@ export function Assignments({ wcif, person, showStationNumber }: AssignmentsProp
                             isCurrent={isCurrent}
                             startTime={roundedStartTime}
                             endTime={roundedEndTime}
+                            room={room}
                             timeZone={wcif.schedule.venues[0]?.timezone}
                           />
                         );
@@ -134,29 +138,19 @@ export function Assignments({ wcif, person, showStationNumber }: AssignmentsProp
                         return null;
                       }
 
+                      if (!room) {
+                        return null;
+                      }
+
                       const { eventId, roundNumber, attemptNumber } = parseActivityCodeFlexible(
                         assignment.activity?.activityCode || '',
                       );
 
                       const venue = wcif?.schedule.venues?.find((v) =>
-                        v.rooms.some((r) => {
-                          if (activity.room) {
-                            return r.id === activity.room.id;
-                          } else if (activity.parent?.room) {
-                            return r.id === activity.parent.room.id;
-                          }
-
-                          return false;
-                        }),
+                        v.rooms.some((r) => r.id === room.id),
                       );
                       const timeZone = venue?.timezone || 'UTC';
 
-                      const room = activity?.room || activity?.parent?.room;
-
-                      if (!room) {
-                        return null;
-                      }
-
                       const stage = getRoomData(room, activity);
 
                       let howManyNextAssignmentsAreSameRoundAttempt = 0;

src/containers/PersonalSchedule/PersonalExtraAssignment.tsx

@@ -1,4 +1,5 @@
 import classNames from 'classnames';
+import { Pill } from '@/components/Pill';
 import { worldsAssignmentMap } from './constants';
 
 export interface ExtraAssignmentProps {
@@ -9,6 +10,10 @@ export interface ExtraAssignmentProps {
   isCurrent: boolean;
   startTime: Date;
   endTime: Date;
+  room?: {
+    name: string;
+    color: string;
+  };
   timeZone?: string;
 }
 
@@ -18,6 +23,7 @@ export const ExtraAssignment = ({
   isCurrent,
   startTime,
   endTime,
+  room,
   timeZone,
 }: ExtraAssignmentProps) => {
   const formattedStartTime = startTime.toLocaleTimeString([], {
@@ -44,7 +50,19 @@ export const ExtraAssignment = ({
         {worldsAssignmentMap[assignment.assignmentCode] || assignment.assignmentCode}
       </td>
       <td></td>
-      <td></td>
+      {room ? (
+        <td className="py-2 text-center text-xs sm:text-sm" style={{}}>
+          <Pill
+            className="min-w-[7em]"
+            style={{
+              backgroundColor: room.color ? `${room.color}70` : 'inherit',
+            }}>
+            {room.name}
+          </Pill>
+        </td>
+      ) : (
+        <td />
+      )}
     </tr>
   );
 };

src/containers/PersonalSchedule/utils.ts

@@ -1,15 +1,9 @@
 import { Activity, Assignment, Competition, Person } from '@wca/helpers';
 import { getWorldAssignmentsExtension } from '@/extensions/com.competitiongroups.worldsassignments';
-import { isUnofficialEvent } from '@/extensions/com.delegatedashboard.unofficialEvents';
+import i18n from '@/i18n';
 import { getAllActivities, getRooms } from '@/lib/activities';
 import { isUnofficialParsedActivityCode, parseActivityCodeFlexible } from '@/lib/activityCodes';
-import {
-  eventById,
-  events,
-  getEventShortName,
-  isOfficialEventId,
-  shortEventNameById,
-} from '@/lib/events';
+import { eventById, isOfficialEventId } from '@/lib/events';
 import { formatNumericDate, getNumericDateFormatter } from '@/lib/time';
 import { byDate } from '@/lib/utils';
 
@@ -23,6 +17,13 @@ export const getNormalAssignments = (wcif: Competition, person: Person) => {
           ...assignment,
           activity: allActivities.find(({ id }) => id === assignment.activityId),
         }))
+        .filter(
+          (assignment) =>
+            !(
+              assignment.activity?.activityCode === 'other-multi' &&
+              assignment.assignmentCode === 'competitor'
+            ),
+        )
         .sort((a, b) => byDate(a.activity, b.activity))
     : [];
 
@@ -57,13 +58,43 @@ const getExtraAssignments = (person: Person) => {
   );
 };
 
+const getCubeSubmissionAssignments = (wcif: Competition, person: Person) => {
+  const allActivities = getAllActivities(wcif);
+
+  if (!person.registration?.eventIds.includes('333mbf')) {
+    return [];
+  }
+
+  const cubeSubmissionAssignments = allActivities.filter(
+    (activity) => activity.activityCode === 'other-multi',
+  );
+
+  return cubeSubmissionAssignments.map(
+    (
+      activity,
+    ): Assignment & {
+      type: 'extra';
+      activity: Activity;
+    } => ({
+      type: 'extra',
+      assignmentCode: i18n.t('competition.personalSchedule.submitMultiCubes'),
+      activityId: activity.id,
+      stationNumber: null,
+      activity,
+    }),
+  );
+};
+
 export const getAllAssignments = (wcif: Competition, person: Person) => {
   const normalAssignments = getNormalAssignments(wcif, person);
   const extraAssignments = getExtraAssignments(person);
+  const mbldCubeSubmissionAssignments = getCubeSubmissionAssignments(wcif, person);
 
-  const allAssignments = [...normalAssignments, ...extraAssignments].sort((a, b) =>
-    byDate(a.activity, b.activity),
-  );
+  const allAssignments = [
+    ...normalAssignments,
+    ...extraAssignments,
+    ...mbldCubeSubmissionAssignments,
+  ].sort((a, b) => byDate(a.activity, b.activity));
 
   return allAssignments;
 };
@@ -173,6 +204,9 @@ export const formatBriefActivityName = (activity: Activity) => {
   const parsed = parseActivityCodeFlexible(activity.activityCode);
   const { eventId, roundNumber, attemptNumber } = parsed;
 
+  if (activity.activityCode === 'other-multi') {
+    return i18n.t('common.wca.events.other-mbld');
+  }
   if (isOfficialEventId(eventId)) {
     const event = eventById(eventId);
     return _formatBriefActivityName(event.shortName, roundNumber, attemptNumber);

src/i18n/en/translation.yaml

@@ -25,6 +25,7 @@ common:
       '444bf': '4x4x4 Blindfolded'
       '555bf': '5x5x5 Blindfolded'
       '333mbf': '3x3x3 Multi-Blind'
+      'other-mbld': 'MBLD Submission'
     timeLimit: 'Time Limit'
     cutoff: 'Cutoff'
     cumulativeTimelimit: Time Limit <b>{{time}}</b> with rounds
@@ -175,6 +176,7 @@ competition:
     group: Group
     stage: $t(common.stage)
     station: Station
+    submitMultiCubes: Submit Multi Cubes
   personalRecords:
     viewSchedule: View Personal Assignments
     type: Type

src/i18n/fr/translation.yaml

@@ -23,6 +23,7 @@ common:
       444bf: Cube 4x4x4 à l'aveugle
       555bf: Cube 5x5x5 à l'aveugle
       333mbf: 3x3x3 résolutions multiples à l'aveugle
+      other-mbld: Soumission Multi
     timeLimit: Limite de temps
     cutoff: Cutoff
     advancement:
@@ -161,6 +162,7 @@ competition:
     group: 'Groupe'
     stage: 'Scène'
     station: 'Station'
+    submitMultiCubes: 'Soumettre cubes de multi'
   personalRecords:
     viewSchedule: 'Voir les affectations personnelles'
     type: 'Type'