Merge pull request #81 from Jambrose777/fixing-bugs-for-NAC

Fixing bugs for nac

Author: coder13

src/containers/PersonalSchedule/utils.ts

@@ -105,20 +105,24 @@ const getFmcAttemptAssignments = (wcif: Competition, person: Person) => {
     return parsed.eventId === '333fm' && parsed.attemptNumber !== null;
   });
 
-  return fmcAttemptActivities.map(
-    (
-      activity,
-    ): Assignment & {
-      type: 'extra';
-      activity: Activity;
-    } => ({
-      type: 'extra',
-      assignmentCode: 'competitor',
-      activityId: activity.id,
-      stationNumber: null,
-      activity,
-    }),
-  );
+  const personActivities = person.assignments?.map((ass) => ass.activityId);
+
+  return fmcAttemptActivities
+    .filter((activity) => personActivities?.includes(activity.id))
+    .map(
+      (
+        activity,
+      ): Assignment & {
+        type: 'extra';
+        activity: Activity;
+      } => ({
+        type: 'extra',
+        assignmentCode: 'competitor',
+        activityId: activity.id,
+        stationNumber: null,
+        activity,
+      }),
+    );
 };
 
 export const getAllAssignments = (wcif: Competition, person: Person) => {
@@ -148,14 +152,15 @@ export const getGroupedAssignmentsByDate = (wcif: Competition, person: Person) =
 
   const scheduledDays = allAssignments
     .map((a) => {
-      if (a.type === 'extra') {
-        return {
-          approxDateTime: 0,
-          date: '',
-          dateParts: [],
-          assignments: [],
-        };
-      }
+      // Commenting out for NAC26, extra assignments are valid even if the day does not have any other assignments
+      // if (a.type === 'extra') {
+      //   return {
+      //     approxDateTime: 0,
+      //     date: '',
+      //     dateParts: [],
+      //     assignments: [],
+      //   };
+      // }
 
       if (!a.activity) {
         return {

src/lib/activityCodes.ts

@@ -52,7 +52,10 @@ export const parseActivityCodeFlexible = (
   activityCode: string,
 ): ParsedActivityCode | UnofficialParsedActivityCode => {
   const eventId = activityCode.split('-')[0];
-  if (activityCode.startsWith('other') || !isOfficialEventId(eventId)) {
+  if (activityCode.startsWith('other')) {
+    return parseOtherActivityCode(activityCode);
+  }
+  if (!isOfficialEventId(eventId)) {
     return parseUnofficialActivityCode(activityCode);
   }
 
@@ -62,6 +65,19 @@ export const parseActivityCodeFlexible = (
 const normalizeEventId = (eventId: string): string =>
   eventId.replace('other-', '').replace('unofficial-', '');
 
+export const parseOtherActivityCode = (activityCode: string): UnofficialParsedActivityCode => {
+  const regex = /other-(?:(\w+))?(?:-g(\d+))?/;
+  const [, e, g] = activityCode.match(regex) as string[];
+
+  return {
+    rawEventId: e,
+    eventId: `other-${e}`,
+    roundNumber: 1,
+    groupNumber: g ? parseInt(g, 10) : null,
+    attemptNumber: null,
+  };
+};
+
 export const parseUnofficialActivityCode = (activityCode: string): UnofficialParsedActivityCode => {
   const regex = /^([\w-]+?)(?:-r(\d+))?(?:-g(\d+))?(?:-a(\d+))?$/;
   const matches = activityCode.match(regex);