some iterations

duplixx · Nov 1, 2024 · 62c574c · 62c574c
1 parent 99fdd0d
commit 62c574c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/src/components/EventManagement/EventAttendance/EventStatistics.test.tsx b/src/components/EventManagement/EventAttendance/EventStatistics.test.tsx
@@ -94,7 +94,6 @@ const recurringMocks = [
           startDate: new Date().toISOString(),
           attendees: mockMemberData,
         },
-        getRecurringEvents: undefined, // Explicitly set undefined here
       },
     },
   },
@@ -109,14 +108,19 @@ const recurringMocks = [
           _id: `event${i}`,
           title: `Event ${i}`,
           startDate: new Date(2023, 4, i + 1).toISOString(),
+          endDate: new Date(2023, 4, i + 1).toISOString(),
+          frequency: 'WEEKLY',
+          interval: 1,
           attendees: mockMemberData.map((member) => ({
-            ...member,
             _id: `${member._id}_${i}`,
-            eventsAttended: member?.eventsAttended?.map((event) => ({
-              ...event,
-              _id: `${event._id}_${i}`,
-            })),
+            gender: member.gender as
+              | 'MALE'
+              | 'FEMALE'
+              | 'OTHER'
+              | 'PREFER_NOT_TO_SAY',
           })),
+          isPublic: true,
+          isRegisterable: true,
         })),
       },
     },
@@ -137,6 +141,7 @@ const renderModal = (
           attendanceRate: 40,
         }}
         memberData={mockMemberData}
+        t={(key: string) => key}
       />
     </MockedProvider>,
   );
@@ -255,7 +260,6 @@ describe('AttendanceStatisticsModal', () => {
       });
 
       fireEvent.click(screen.getByTestId('export-dropdown'));
-      // Add assertions related to the export functionality here
     });
 
     it('closes modal when close button is clicked', async () => {

diff --git a/src/components/EventManagement/EventAttendance/EventStatistics.tsx b/src/components/EventManagement/EventAttendance/EventStatistics.tsx
@@ -22,11 +22,6 @@ import type {
 } from './InterfaceEvents';
 import { toast } from 'react-toastify';
 
-const CHART_COLORS = {
-  primary: '#1f77b4', // Color-blind friendly blue
-  secondary: '#ff7f0e', // Color-blind friendly orange
-  tertiary: '#2ca02c', // Color-blind friendly green
-};
 export const AttendanceStatisticsModal: React.FC<
   InterfaceAttendanceStatisticsModalProps
 > = ({ show, handleClose, statistics, memberData, t }): JSX.Element => {

diff --git a/src/components/EventManagement/EventAttendance/InterfaceEvents.ts b/src/components/EventManagement/EventAttendance/InterfaceEvents.ts
@@ -14,7 +14,7 @@ export interface InterfaceMember {
   createdAt: string;
   firstName: string;
   lastName: string;
-  email: string;
+  email: `${string}@${string}.${string}`;
   gender: string;
   eventsAttended?: {
     _id: string;
@@ -69,8 +69,13 @@ export interface InterfaceRecurringEvent {
   _id: string;
   title: string;
   startDate: string;
+  endDate: string;
+  frequency: InterfaceEvent['recurrenceRule']['frequency'];
+  interval: InterfaceEvent['recurrenceRule']['interval'];
   attendees: {
     _id: string;
-    gender: string;
+    gender: 'MALE' | 'FEMALE' | 'OTHER' | 'PREFER_NOT_TO_SAY';
   }[];
+  isPublic: boolean;
+  isRegisterable: boolean;
 }