add total pages

GTBitsOfGood · Oct 4, 2023 · 1bf3f3b · 1bf3f3b
1 parent a037946
commit 1bf3f3b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/mobile/components/Overlays/PaginatedOverlay.tsx b/mobile/components/Overlays/PaginatedOverlay.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement } from "react";
+import React, { useState, ReactElement, useEffect } from "react";
 import { StyleSheet, View, Text } from "react-native";
 import { Ionicons } from "@expo/vector-icons";
 import IconButton from "../IconButton";
@@ -13,6 +13,7 @@ interface PaginatedOverlayProps {
   headerTitle: string;
   navigationProp?: any;
   currentPage: number;
+  totalPages: number;
   errorMessage?: string;
   paginationButtonFunction?: (direction: ButtonDirection) => void;
 }
@@ -21,6 +22,7 @@ export default function PaginatedOverlay({
   navigationProp,
   headerTitle,
   currentPage,
+  totalPages,
   paginationButtonFunction,
   errorMessage,
 }: PaginatedOverlayProps) {
@@ -48,7 +50,9 @@ export default function PaginatedOverlay({
                 }
               }}
             ></IconButton>
-            <Text style={styles.pageText}>{currentPage}</Text>
+            <Text style={styles.pageText}>
+              {currentPage} / {totalPages}
+            </Text>
             <IconButton
               icon={
                 <View style={styles.backgroundCircle}>

diff --git a/mobile/screens/Admin/AdminUserListScreen.tsx b/mobile/screens/Admin/AdminUserListScreen.tsx
@@ -17,6 +17,7 @@ export default function AdminUserList(props: any) {
   const [error, setError] = useState("");
   const [searchText, setSearchText] = useState("");
   const [totalUserCount, setTotalUserCount] = useState<number>(0);
+  const [totalPages, setTotalPages] = useState<number>(0);
 
   const removeUserFromList = (errorMessage: string, userId: Types.ObjectId) => {
     if (errorMessage) {
@@ -40,6 +41,7 @@ export default function AdminUserList(props: any) {
     if (result) {
       setAllUsers([[...result.users]]);
       setTotalUserCount(result.totalCount);
+      setTotalPages(result.totalCount / PAGE_SIZE + 1);
     }
   }
 
@@ -100,6 +102,7 @@ export default function AdminUserList(props: any) {
           : "Viewing Users"
       }
       currentPage={currentPage + 1}
+      totalPages={totalPages}
       errorMessage={error}
       pageBody={
         <View style={styles.container}>

diff --git a/mobile/screens/Analytics/AnalyticsUserList.tsx b/mobile/screens/Analytics/AnalyticsUserList.tsx
@@ -13,18 +13,24 @@ export default function AnalyticsUserList(props: any) {
   const [allUsers, setAllUsers] = useState<User[][]>([]);
   const [currentPage, setCurrentPage] = useState(0);
   const [error, setError] = useState("");
+  const [totalPages, setTotalPages] = useState<number>(0);
+
   const filter = completed
     ? UserFilter.WITH_800_HOURS_USERS
     : UserFilter.WITHOUT_800_HOURS_USERS;
 
   useEffect(() => {
     async function loadUsers() {
-      const users = await ErrorWrapper({
+      const result = await ErrorWrapper({
         functionToExecute: adminGetUsers,
         errorHandler: setError,
         parameters: [PAGE_SIZE, undefined, filter, ""],
       });
-      setAllUsers([users]);
+      // setAllUsers([users]);
+      if (result) {
+        setAllUsers([[...result.users]]);
+        setTotalPages(result.totalCount / PAGE_SIZE + 1);
+      }
     }
     BackHandler.addEventListener("hardwareBackPress", function () {
       props.navigation.navigate(Screens.ADMIN_DASHBOARD_SCREEN);
@@ -70,6 +76,7 @@ export default function AnalyticsUserList(props: any) {
           : "Users Who Did Not Complete Training"
       }
       currentPage={currentPage + 1}
+      totalPages={totalPages}
       errorMessage={error}
       pageBody={
         <View style={styles.container}>