Add total number of pages

backend/server/mongodb/actions/User.ts

@@ -102,7 +102,7 @@
     }),
   };
 
   let query: any;
 
   if (!filter || filter === UserFilter.NONPROFIT_USERS) {
     query = {
@@ -154,7 +154,9 @@
     };
   }
 
-  const users = await UserModel.find(query).limit(pageSize);
+  const users = await UserModel.find(query, null, { sort: { _id: 1 } }).limit(
+    pageSize
+  );
   const totalCount = await UserModel.countDocuments(query);
 
   return { users, totalCount };

mobile/components/Overlays/PaginatedOverlay.tsx

@@ -11,8 +11,9 @@
   pageBody: ReactElement;
   footer?: ReactElement;
   headerTitle: string;
   navigationProp?: any;
   currentPage: number;
+  totalPages: number;
   errorMessage?: string;
   paginationButtonFunction?: (direction: ButtonDirection) => void;
 }
@@ -21,6 +22,7 @@
   navigationProp,
   headerTitle,
   currentPage,
+  totalPages,
   paginationButtonFunction,
   errorMessage,
 }: PaginatedOverlayProps) {
@@ -48,7 +50,9 @@
                 }
               }}
             ></IconButton>
-            <Text style={styles.pageText}>{currentPage}</Text>
+            <Text style={styles.pageText}>
+              {currentPage} / {totalPages}
+            </Text>
             <IconButton
               icon={
                 <View style={styles.backgroundCircle}>

mobile/screens/Admin/AdminUserListScreen.tsx

@@ -16,7 +16,7 @@ export default function AdminUserList(props: any) {
   const [currentPage, setCurrentPage] = useState(0);
   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) {
@@ -39,7 +39,7 @@ export default function AdminUserList(props: any) {
 
     if (result) {
       setAllUsers([[...result.users]]);
-      setTotalUserCount(result.totalCount);
+      setTotalPages(Math.ceil(result.totalCount / PAGE_SIZE));
     }
   }
 
@@ -100,6 +100,7 @@ export default function AdminUserList(props: any) {
           : "Viewing Users"
       }
       currentPage={currentPage + 1}
+      totalPages={totalPages}
       errorMessage={error}
       pageBody={
         <View style={styles.container}>
@@ -123,7 +124,6 @@ export default function AdminUserList(props: any) {
               onEndEditing={loadUsers}
             />
           </View>
-          <Text>Total Users: {totalUserCount}</Text>
           {allUsers.length > 0 &&
             allUsers[currentPage].map((user, index) => {
               return (

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(Math.ceil(result.totalCount / PAGE_SIZE));
+      }
     }
     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}>

mobile/screens/Onboarding/LandingScreen.tsx

@@ -62,7 +62,9 @@ export default function LandingScreen(props: any) {
             </View>
           ) : null}
           <View style={styles.quoteContainer}>
-            <Text style={styles.quoteText}>{`"Not all wounds are visible"`}</Text>
+            <Text
+              style={styles.quoteText}
+            >{`"Not all wounds are visible"`}</Text>
           </View>
         </View>
       }

mobile/screens/Training/AddTrainingLogScreen.tsx

@@ -47,7 +47,7 @@ export default function AddTrainingLogScreen(props: any) {
     } else if (Number(totalHours) < 0) {
       setError("Total hours cannot be negative!");
       return;
-    } else if (Number(totalHours) > 24) { 
+    } else if (Number(totalHours) > 24) {
       setError("Total hours can't exceed 24.");
       return;
     } else if (skillKeysSelected.length === 0) {