fix(dashboard): exclude past assignments from meeting counter

Co-authored-by: ux-git <ux-git@users.noreply.github.com>
Co-authored-by: Max Makaluk <70341920+FussuChalice@users.noreply.github.com>

Author: ux-git

src/features/meetings/my_assignments/useAssignments.ts

@@ -10,9 +10,9 @@ import {
 import { DisplayRange } from './indextypes';
 import { localStorageGetItem } from '@utils/common';
 import { assignmentsHistoryState } from '@states/schedules';
-import { addWeeks, formatDate, getWeekDate } from '@utils/date';
+import { addWeeks, formatDate } from '@utils/date';
 import { AssignmentHistoryType } from '@definition/schedules';
-import { schedulesGetMeetingDate } from '@services/app/schedules';
+import { resolveAssignmentDate } from '@utils/assignments';
 
 const useMyAssignments = () => {
   const navigate = useNavigate();
@@ -41,31 +41,9 @@ const useMyAssignments = () => {
     const now = new Date();
     const maxDate = addWeeks(now, displayRange);
 
-    const remapAssignmentsDate = assignmentsHistory.map((record) => {
-      const obj = structuredClone(record);
-
-      const isMidweek = obj.assignment.key.startsWith('MM_');
-
-      const meetingDate = schedulesGetMeetingDate({
-        week: obj.weekOf,
-        meeting: isMidweek ? 'midweek' : 'weekend',
-        dataView: obj.assignment.dataView,
-      });
-
-      if (meetingDate.date.length > 0) {
-        obj.weekOf = meetingDate.date;
-        obj.weekOfFormatted = formatDate(
-          new Date(meetingDate.date),
-          shortDateFormat
-        );
-      }
-
-      if (obj.weekOf.length === 0) {
-        obj.weekOf = formatDate(getWeekDate(), 'yyyy/MM/dd');
-      }
-
-      return obj;
-    });
+    const remapAssignmentsDate = assignmentsHistory.map((record) =>
+      resolveAssignmentDate(record, shortDateFormat)
+    );
 
     const filterAssignments = (uid: string) => {
       return remapAssignmentsDate.filter(

src/pages/dashboard/meetings/index.tsx

@@ -30,7 +30,7 @@ const MeetingsCard = ({ assignmentCount }: MeetingsCardProps) => {
         <DashboardMenu
           icon={<IconAssignment color="var(--black)" />}
           primaryText={t('tr_viewMyAssignments')}
-          badgeText={assignmentCount.toString()}
+          badgeText={assignmentCount ? assignmentCount.toString() : ''}
           onClick={handleOpenMyAssignments}
         />
       </ListItem>

src/pages/dashboard/useDashboard.tsx

@@ -4,12 +4,14 @@ import {
   congNewState,
   firstnameState,
   settingsState,
+  shortDateFormatState,
   userLocalUIDState,
 } from '@states/settings';
 import { isMyAssignmentOpenState } from '@states/app';
 import { assignmentsHistoryState } from '@states/schedules';
-import { formatDate, getWeekDate } from '@utils/date';
+import { formatDate } from '@utils/date';
 import { isTest } from '@constants/index';
+import { resolveAssignmentDate } from '@utils/assignments';
 
 const useDashboard = () => {
   const setIsMyAssignmentOpen = useSetAtom(isMyAssignmentOpenState);
@@ -18,6 +20,7 @@ const useDashboard = () => {
   const isCongNew = useAtomValue(congNewState);
   const userUID = useAtomValue(userLocalUIDState);
   const assignmentsHistory = useAtomValue(assignmentsHistoryState);
+  const shortDateFormat = useAtomValue(shortDateFormatState);
   const settings = useAtomValue(settingsState);
 
   const isMigrated = useMemo(() => {
@@ -31,16 +34,20 @@ const useDashboard = () => {
   const [newCongSnack, setNewCongSnack] = useState(initialSnackValue);
 
   const countFutureAssignments = useMemo(() => {
-    const now = formatDate(getWeekDate(), 'yyyy/MM/dd');
+    const now = new Date();
 
-    const personAssignments = assignmentsHistory.filter(
+    const remapAssignmentsDate = assignmentsHistory.map((record) =>
+      resolveAssignmentDate(record, shortDateFormat)
+    );
+
+    const personAssignments = remapAssignmentsDate.filter(
       (record) =>
         record.assignment.person === userUID &&
-        formatDate(new Date(record.weekOf), 'yyyy/MM/dd') >= now
+        record.weekOf >= formatDate(now, 'yyyy/MM/dd')
     );
 
     return personAssignments.length;
-  }, [assignmentsHistory, userUID]);
+  }, [assignmentsHistory, shortDateFormat, userUID]);
 
   const handleCloseNewCongNotice = async () => {
     setNewCongSnack(false);

src/utils/assignments.ts

@@ -1,6 +1,9 @@
 import { AssignmentCode } from '@definition/assignment';
 import { PersonType, AssignmentType } from '@definition/person';
+import { AssignmentHistoryType } from '@definition/schedules';
 import { personIsFR, personIsFS } from '@services/app/persons';
+import { formatDate, getWeekDate } from './date';
+import { schedulesGetMeetingDate } from '@services/app/schedules';
 
 const duplicateAssignmentsCode = new Set([
   AssignmentCode.MINISTRY_HOURS_CREDIT,
@@ -156,3 +159,32 @@ export const toggleAssignment = (
 
   return newPerson;
 };
+
+export const resolveAssignmentDate = (
+  record: AssignmentHistoryType,
+  shortDateFormat: string
+) => {
+  const obj = structuredClone(record);
+
+  const isMidweek = obj.assignment.key.startsWith('MM_');
+
+  const meetingDate = schedulesGetMeetingDate({
+    week: obj.weekOf,
+    meeting: isMidweek ? 'midweek' : 'weekend',
+    dataView: obj.assignment.dataView,
+  });
+
+  if (meetingDate.date.length > 0) {
+    obj.weekOf = meetingDate.date;
+    obj.weekOfFormatted = formatDate(
+      new Date(meetingDate.date),
+      shortDateFormat
+    );
+  }
+
+  if (obj.weekOf.length === 0) {
+    obj.weekOf = formatDate(getWeekDate(), 'yyyy/MM/dd');
+  }
+
+  return obj;
+};