Added changes

PalisadoesFoundation · Nov 7, 2024 · 82e9baa · 82e9baa
1 parent 9851494
commit 82e9baa
Show file tree

Hide file tree

Showing 9 changed files with 116 additions and 92 deletions.
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
@@ -769,7 +769,8 @@
     "Task Assigned": "Task Assigned",
     "Member": "Member",
     "Admin": "Admin",
-    "loading": "Loading..."
+    "loading": "Loading...",
+    "noAttendees": "Attendees not Found"
   },
   "onSpotAttendee": {
     "title": "On-spot Attendee",

diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json
@@ -1074,7 +1074,8 @@
     "Task Assigned": "Tâche assignée",
     "Member": "Membre",
     "Admin": "Administrateur",
-    "loading": "Chargement..."
+    "loading": "Chargement...",
+    "noAttendees": "Aucun participant trouvé"
   },
   "onSpotAttendee": {
     "title": "Participant sur place",

diff --git a/public/locales/hi/translation.json b/public/locales/hi/translation.json
@@ -1074,7 +1074,8 @@
     "Task Assigned": "सौंपा गया कार्य",
     "Member": "सदस्य",
     "Admin": "व्यवस्थापक",
-    "loading": "लोड हो रहा है"
+    "loading": "लोड हो रहा है",
+    "noAttendees": "कोई प्रतिभागी नहीं मिला"
   },
   "onSpotAttendee": {
     "title": "ऑन-स्पॉट प्रतिभागी",

diff --git a/public/locales/sp/translation.json b/public/locales/sp/translation.json
@@ -1076,7 +1076,8 @@
     "Task Assigned": "Tarea asignada",
     "Member": "Miembro",
     "Admin": "Administrador",
-    "loading": "Cargando..."
+    "loading": "Cargando...",
+    "noAttendees": "No se encontraron asistentes"
   },
   "onSpotAttendee": {
     "title": "Asistente en el lugar",

diff --git a/public/locales/zh/translation.json b/public/locales/zh/translation.json
@@ -1074,7 +1074,8 @@
     "Task Assigned": "分配的任务",
     "Member": "成员",
     "Admin": "管理员",
-    "loading": "加载中..."
+    "loading": "加载中...",
+    "noAttendees": "未找到参与者"
   },
   "onSpotAttendee": {
     "title": "现场参与者",

diff --git a/src/GraphQl/Queries/OrganizationQueries.ts b/src/GraphQl/Queries/OrganizationQueries.ts
@@ -27,8 +27,6 @@ export const ORGANIZATION_POST_LIST = gql`
             _id
             title
             text
-            imageUrl
-            videoUrl
             creator {
               _id
               firstName

diff --git a/src/GraphQl/Queries/Queries.ts b/src/GraphQl/Queries/Queries.ts
@@ -428,7 +428,13 @@ export const ORGANIZATIONS_LIST = gql`
 
 // Query to take the Members of a particular organization
 export const MEMBERS_LIST = gql`
-  query Organizations($id: ID!) {
+  query Organizations(
+    $id: ID!
+    $after: String
+    $before: String
+    $first: Int
+    $last: Int
+  ) {
     organizations(id: $id) {
       _id
       members {
@@ -439,13 +445,13 @@ export const MEMBERS_LIST = gql`
         email
         createdAt
         gender
-        organizationsBlockedBy {
-          _id
-        }
-        eventsAttended {
-          _id
-        }
-        tagsAssignedWith(organizationId: $id) {
+        tagsAssignedWith(
+          after: $after
+          before: $before
+          first: $first
+          last: $last
+          organizationId: $id
+        ) {
           edges {
             cursor
             node {

diff --git a/src/components/EventManagement/EventAttendance/EventAttendance.tsx b/src/components/EventManagement/EventAttendance/EventAttendance.tsx
@@ -266,86 +266,100 @@ function EventAttendance(): JSX.Element {
             </TableRow>
           </TableHead>
           <TableBody>
-            {filteredAttendees.map((member: InterfaceMember, index: number) => (
-              <TableRow
-                key={index}
-                data-testid={`attendee-row-${index}`}
-                className="my-6"
-              >
-                <TableCell
-                  component="th"
-                  scope="row"
-                  data-testid={`attendee-index-${index}`}
-                >
-                  {index + 1}
+            {filteredAttendees.length === 0 ? (
+              <TableRow>
+                <TableCell colSpan={5} align="center">
+                  {t('noAttendees')}
                 </TableCell>
-                <TableCell align="left" data-testid={`attendee-name-${index}`}>
-                  <Link
-                    to={`/member/${currentUrl}`}
-                    state={{ id: member._id }}
-                    className={styles.membername}
+              </TableRow>
+            ) : (
+              filteredAttendees.map(
+                (member: InterfaceMember, index: number) => (
+                  <TableRow
+                    key={index}
+                    data-testid={`attendee-row-${index}`}
+                    className="my-6"
                   >
-                    {member.firstName} {member.lastName}
-                  </Link>
-                </TableCell>
-                <TableCell
-                  align="left"
-                  data-testid={`attendee-status-${index}`}
-                >
-                  {member.__typename === 'User' ? t('Member') : t('Admin')}
-                </TableCell>
-                <Tooltip
-                  componentsProps={{
-                    tooltip: {
-                      sx: {
-                        backgroundColor: 'white',
-                        fontSize: '2em',
-                        maxHeight: '170px',
-                        overflowY: 'scroll',
-                        scrollbarColor: 'white',
-                        border: '1px solid green',
-                        borderRadius: '6px',
-                        boxShadow: '0 0 5px rgba(0,0,0,0.1)',
-                      },
-                    },
-                  }}
-                  title={member.eventsAttended?.map(
-                    (event: { _id: string }, index: number) => (
-                      <AttendedEventList
-                        key={event._id}
-                        eventId={event._id}
+                    <TableCell
+                      component="th"
+                      scope="row"
+                      data-testid={`attendee-index-${index}`}
+                    >
+                      {index + 1}
+                    </TableCell>
+                    <TableCell
+                      align="left"
+                      data-testid={`attendee-name-${index}`}
+                    >
+                      <Link
+                        to={`/member/${currentUrl}`}
+                        state={{ id: member._id }}
+                        className={styles.membername}
+                      >
+                        {member.firstName} {member.lastName}
+                      </Link>
+                    </TableCell>
+                    <TableCell
+                      align="left"
+                      data-testid={`attendee-status-${index}`}
+                    >
+                      {member.__typename === 'User' ? t('Member') : t('Admin')}
+                    </TableCell>
+                    <Tooltip
+                      componentsProps={{
+                        tooltip: {
+                          sx: {
+                            backgroundColor: 'white',
+                            fontSize: '2em',
+                            maxHeight: '170px',
+                            overflowY: 'scroll',
+                            scrollbarColor: 'white',
+                            border: '1px solid green',
+                            borderRadius: '6px',
+                            boxShadow: '0 0 5px rgba(0,0,0,0.1)',
+                          },
+                        },
+                      }}
+                      title={member.eventsAttended?.map(
+                        (event: { _id: string }, index: number) => (
+                          <AttendedEventList
+                            key={event._id}
+                            eventId={event._id}
+                            data-testid={`attendee-events-attended-${index}`}
+                          />
+                        ),
+                      )}
+                    >
+                      <TableCell
+                        align="left"
                         data-testid={`attendee-events-attended-${index}`}
-                      />
-                    ),
-                  )}
-                >
-                  <TableCell
-                    align="left"
-                    data-testid={`attendee-events-attended-${index}`}
-                  >
-                    <span className={styles.eventsAttended}>
-                      {member.eventsAttended
-                        ? member.eventsAttended.length
-                        : '0'}
-                    </span>
-                  </TableCell>
-                </Tooltip>
-                <TableCell
-                  align="left"
-                  data-testid={`attendee-task-assigned-${index}`}
-                >
-                  {member.tagsAssignedWith ? (
-                    member.tagsAssignedWith.edges.map(
-                      (edge: { node: { name: string } }, tagIndex: number) => (
-                        <div key={tagIndex}>{edge.node.name}</div>
-                      ),
-                    )
-                  ) : (
-                    <div>None</div>
-                  )}
-                </TableCell>
-              </TableRow>
-            ))}
+                      >
+                        <span className={styles.eventsAttended}>
+                          {member.eventsAttended
+                            ? member.eventsAttended.length
+                            : '0'}
+                        </span>
+                      </TableCell>
+                    </Tooltip>
+                    <TableCell
+                      align="left"
+                      data-testid={`attendee-task-assigned-${index}`}
+                    >
+                      {member.tagsAssignedWith ? (
+                        member.tagsAssignedWith.edges.map(
+                          (
+                            edge: { node: { name: string } },
+                            tagIndex: number,
+                          ) => <div key={tagIndex}>{edge.node.name}</div>,
+                        )
+                      ) : (
+                        <div>None</div>
+                      )}
+                    </TableCell>
+                  </TableRow>
+                ),
+              )
+            )}
           </TableBody>
         </Table>
       </TableContainer>

diff --git a/src/components/EventManagement/EventAttendance/InterfaceEvents.ts b/src/components/EventManagement/EventAttendance/InterfaceEvents.ts
@@ -24,6 +24,7 @@ export interface InterfaceMember {
   _id: string;
   tagsAssignedWith: {
     edges: {
+      cursor: string;
       node: {
         name: string;
       };