Merged in bug-fixing-19-Jun-24 (pull request #52)

Bug fixing 19 Jun 24

Approved-by: Tiago Ribeiro

src/components/Navbar.tsx

@@ -1,22 +1,35 @@
-import {User} from "@/interfaces/user";
+import { User } from "@/interfaces/user";
 import Link from "next/link";
 import FocusLayer from "@/components/FocusLayer";
-import {preventNavigation} from "@/utils/navigation.disabled";
+import { preventNavigation } from "@/utils/navigation.disabled";
-import {useRouter} from "next/router";
+import { useRouter } from "next/router";
-import {BsList, BsQuestionCircle, BsQuestionCircleFill} from "react-icons/bs";
+import { BsList, BsQuestionCircle, BsQuestionCircleFill } from "react-icons/bs";
 import clsx from "clsx";
 import moment from "moment";
 import MobileMenu from "./MobileMenu";
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
-import {Type} from "@/interfaces/user";
+import { Type } from "@/interfaces/user";
-import {USER_TYPE_LABELS} from "@/resources/user";
+import { USER_TYPE_LABELS } from "@/resources/user";
 import useGroups from "@/hooks/useGroups";
-import {isUserFromCorporate} from "@/utils/groups";
+import { isUserFromCorporate } from "@/utils/groups";
 import Button from "./Low/Button";
 import Modal from "./Modal";
 import Input from "./Low/Input";
 import TicketSubmission from "./High/TicketSubmission";
+import { Module } from "@/interfaces";
+import Badge from "./Low/Badge";
 
+import {
+  BsArrowRepeat,
+  BsBook,
+  BsCheck,
+  BsCheckCircle,
+  BsClipboard,
+  BsHeadphones,
+  BsMegaphone,
+  BsPen,
+  BsXCircle,
+} from "react-icons/bs";
 interface Props {
   user: User;
   navDisabled?: boolean;
@@ -26,7 +39,13 @@ interface Props {
 }
 
 /* eslint-disable @next/next/no-img-element */
-export default function Navbar({user, path, navDisabled = false, focusMode = false, onFocusLayerMouseEnter}: Props) {
+export default function Navbar({
+  user,
+  path,
+  navDisabled = false,
+  focusMode = false,
+  onFocusLayerMouseEnter,
+}: Props) {
   const [isMenuOpen, setIsMenuOpen] = useState(false);
   const [disablePaymentPage, setDisablePaymentPage] = useState(true);
   const [isTicketOpen, setIsTicketOpen] = useState(false);
@@ -39,9 +58,12 @@ export default function Navbar({user, path, navDisabled = false, focusMode = fal
     const momentDate = moment(date);
     const today = moment(new Date());
 
-		if (today.add(1, "days").isAfter(momentDate)) return "!bg-mti-red-ultralight border-mti-red-light";
+    if (today.add(1, "days").isAfter(momentDate))
-		if (today.add(3, "days").isAfter(momentDate)) return "!bg-mti-rose-ultralight border-mti-rose-light";
+      return "!bg-mti-red-ultralight border-mti-red-light";
-		if (today.add(7, "days").isAfter(momentDate)) return "!bg-mti-orange-ultralight border-mti-orange-light";
+    if (today.add(3, "days").isAfter(momentDate))
+      return "!bg-mti-rose-ultralight border-mti-rose-light";
+    if (today.add(7, "days").isAfter(momentDate))
+      return "!bg-mti-orange-ultralight border-mti-orange-light";
   };
 
   const showExpirationDate = () => {
@@ -54,39 +76,102 @@ export default function Navbar({user, path, navDisabled = false, focusMode = fal
   };
 
   useEffect(() => {
-		if (user.type !== "student" && user.type !== "teacher") return setDisablePaymentPage(false);
+    if (user.type !== "student" && user.type !== "teacher")
-		isUserFromCorporate(user.id).then((result) => setDisablePaymentPage(result));
+      return setDisablePaymentPage(false);
+    isUserFromCorporate(user.id).then((result) =>
+      setDisablePaymentPage(result)
+    );
   }, [user]);
 
+  const badges = [
+      {
+        module: "reading",
+        icon: () => <BsBook className="h-4 w-4 text-white" />,
+        achieved: user.levels.reading >= user.desiredLevels.reading,
+      },
+
+      {
+        module: "listening",
+        icon: () => <BsHeadphones className="h-4 w-4 text-white" />,
+        achieved: user.levels.listening >= user.desiredLevels.listening,
+      },
+      {
+        module: "writing",
+        icon: () => <BsPen className="h-4 w-4 text-white" />,
+        achieved: user.levels.writing >= user.desiredLevels.writing,
+      },
+      {
+        module: "speaking",
+        icon: () => <BsMegaphone className="h-4 w-4 text-white" />,
+        achieved: user.levels.speaking >= user.desiredLevels.speaking,
+      },
+      {
+        module: "level",
+        icon: () => <BsClipboard className="h-4 w-4 text-white" />,
+        achieved: user.levels.level >= user.desiredLevels.level,
+      },
+    ];
+
   return (
     <>
-			<Modal isOpen={isTicketOpen} onClose={() => setIsTicketOpen(false)} title="Submit a ticket">
+      <Modal
-				<TicketSubmission user={user} page={router.asPath} onClose={() => setIsTicketOpen(false)} />
+        isOpen={isTicketOpen}
+        onClose={() => setIsTicketOpen(false)}
+        title="Submit a ticket"
+      >
+        <TicketSubmission
+          user={user}
+          page={router.asPath}
+          onClose={() => setIsTicketOpen(false)}
+        />
       </Modal>
 
       {user && (
-				<MobileMenu disableNavigation={disableNavigation} path={path} isOpen={isMenuOpen} onClose={() => setIsMenuOpen(false)} user={user} />
+        <MobileMenu
+          disableNavigation={disableNavigation}
+          path={path}
+          isOpen={isMenuOpen}
+          onClose={() => setIsMenuOpen(false)}
+          user={user}
+        />
       )}
       <header className="-md:justify-between -md:px-4 relative flex w-full items-center bg-transparent py-2 md:gap-12 md:py-4">
-				<Link href={disableNavigation ? "" : "/"} className=" flex items-center gap-8 md:px-8">
+        <Link
+          href={disableNavigation ? "" : "/"}
+          className=" flex items-center gap-8 md:px-8"
+        >
           <img src="/logo.png" alt="EnCoach's Logo" className="w-8 md:w-12" />
           <h1 className="-md:hidden w-1/6 text-2xl font-bold">EnCoach</h1>
         </Link>
         <div className="flex items-center justify-end gap-4 md:mr-8 md:w-5/6">
+          {user.type === "student" &&
+            badges.map((badge) => (
+              <div
+                key={badge.module}
+                className={`${badge.achieved ? `bg-ielts-${badge.module}`: 'bg-mti-gray-anti-flash'} flex h-8 w-8 items-center justify-center rounded-full`}
+              >
+                {badge.icon()}
+              </div>
+            ))}
           {/* OPEN TICKET SYSTEM */}
           <button
             className={clsx(
               "border-mti-purple-light tooltip tooltip-bottom flex h-8 w-8 flex-col items-center justify-center rounded-full border p-1",
-							"hover:bg-mti-purple-light transition duration-300 ease-in-out hover:text-white z-20",
+              "hover:bg-mti-purple-light transition duration-300 ease-in-out hover:text-white z-20"
             )}
             data-tip="Submit a help/feedback ticket"
-						onClick={() => setIsTicketOpen(true)}>
+            onClick={() => setIsTicketOpen(true)}
+          >
             <BsQuestionCircleFill />
           </button>
 
           {showExpirationDate() && (
             <Link
-							href={!!user.subscriptionExpirationDate && !disablePaymentPage ? "/payment" : ""}
+              href={
+                !!user.subscriptionExpirationDate && !disablePaymentPage
+                  ? "/payment"
+                  : ""
+              }
               data-tip="Expiry date"
               className={clsx(
                 "flex w-fit cursor-pointer justify-center rounded-full border px-6 py-2 text-sm font-normal focus:outline-none",
@@ -94,24 +179,40 @@ export default function Navbar({user, path, navDisabled = false, focusMode = fal
                 !user.subscriptionExpirationDate
                   ? "bg-mti-green-ultralight border-mti-green-light"
                   : expirationDateColor(user.subscriptionExpirationDate),
-								"border-mti-gray-platinum bg-white",
+                "border-mti-gray-platinum bg-white"
-							)}>
+              )}
+            >
               {!user.subscriptionExpirationDate && "Unlimited"}
-							{user.subscriptionExpirationDate && moment(user.subscriptionExpirationDate).format("DD/MM/YYYY")}
+              {user.subscriptionExpirationDate &&
+                moment(user.subscriptionExpirationDate).format("DD/MM/YYYY")}
             </Link>
           )}
-					<Link href={disableNavigation ? "" : "/profile"} className="-md:hidden flex items-center justify-end gap-6">
+          <Link
-						<img src={user.profilePicture} alt={user.name} className="h-10 w-10 rounded-full object-cover" />
+            href={disableNavigation ? "" : "/profile"}
+            className="-md:hidden flex items-center justify-end gap-6"
+          >
+            <img
+              src={user.profilePicture}
+              alt={user.name}
+              className="h-10 w-10 rounded-full object-cover"
+            />
             <span className="-md:hidden text-right">
-							{user.type === "corporate" ? `${user.corporateInformation?.companyInformation.name} |` : ""} {user.name} |{" "}
+              {user.type === "corporate"
-							{USER_TYPE_LABELS[user.type]}
+                ? `${user.corporateInformation?.companyInformation.name} |`
+                : ""}{" "}
+              {user.name} | {USER_TYPE_LABELS[user.type]}
             </span>
           </Link>
-					<div className="cursor-pointer md:hidden" onClick={() => setIsMenuOpen(true)}>
+          <div
+            className="cursor-pointer md:hidden"
+            onClick={() => setIsMenuOpen(true)}
+          >
             <BsList className="text-mti-purple-light h-8 w-8" />
           </div>
         </div>
-				{focusMode && <FocusLayer onFocusLayerMouseEnter={onFocusLayerMouseEnter} />}
+        {focusMode && (
+          <FocusLayer onFocusLayerMouseEnter={onFocusLayerMouseEnter} />
+        )}
       </header>
     </>
   );

src/dashboards/Admin.tsx

@@ -2,11 +2,11 @@
 import Modal from "@/components/Modal";
 import useStats from "@/hooks/useStats";
 import useUsers from "@/hooks/useUsers";
-import {User} from "@/interfaces/user";
+import { User } from "@/interfaces/user";
 import UserList from "@/pages/(admin)/Lists/UserList";
-import {dateSorter} from "@/utils";
+import { dateSorter } from "@/utils";
 import moment from "moment";
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
 import {
   BsArrowLeft,
   BsBriefcaseFill,
@@ -23,22 +23,23 @@ import UserCard from "@/components/UserCard";
 import useGroups from "@/hooks/useGroups";
 import IconCard from "./IconCard";
 import useFilterStore from "@/stores/listFilterStore";
-import {useRouter} from "next/router";
+import { useRouter } from "next/router";
 import usePaymentStatusUsers from "@/hooks/usePaymentStatusUsers";
+import CorporateStudentsLevels from "./CorporateStudentsLevels";
 
 interface Props {
   user: User;
 }
 
-export default function AdminDashboard({user}: Props) {
+export default function AdminDashboard({ user }: Props) {
   const [page, setPage] = useState("");
   const [selectedUser, setSelectedUser] = useState<User>();
   const [showModal, setShowModal] = useState(false);
 
-	const {stats} = useStats(user.id);
+  const { stats } = useStats(user.id);
-	const {users, reload} = useUsers();
+  const { users, reload } = useUsers();
-	const {groups} = useGroups();
+  const { groups } = useGroups();
-	const {pending, done} = usePaymentStatusUsers();
+  const { pending, done } = usePaymentStatusUsers();
 
   const appendUserFilters = useFilterStore((state) => state.appendUserFilter);
   const router = useRouter();
@@ -51,17 +52,24 @@ export default function AdminDashboard({user}: Props) {
   useEffect(reload, [page]);
 
   const inactiveCountryManagerFilter = (x: User) =>
-		x.type === "agent" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
+    x.type === "agent" &&
+    (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
 
   const UserDisplay = (displayUser: User) => (
     <div
       onClick={() => setSelectedUser(displayUser)}
-			className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300">
+      className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300"
-			<img src={displayUser.profilePicture} alt={displayUser.name} className="rounded-full w-10 h-10" />
+    >
+      <img
+        src={displayUser.profilePicture}
+        alt={displayUser.name}
+        className="rounded-full w-10 h-10"
+      />
       <div className="flex flex-col gap-1 items-start">
         <span>
           {displayUser.type === "corporate"
-						? displayUser.corporateInformation?.companyInformation?.name || displayUser.name
+            ? displayUser.corporateInformation?.companyInformation?.name ||
+              displayUser.name
             : displayUser.name}
         </span>
         <span className="text-sm opacity-75">{displayUser.email}</span>
@@ -74,25 +82,32 @@ export default function AdminDashboard({user}: Props) {
       x.type === "student" &&
       (!!selectedUser
         ? groups
-						.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
+            .filter(
+              (g) =>
+                g.admin === selectedUser.id ||
+                g.participants.includes(selectedUser.id)
+            )
             .flatMap((g) => g.participants)
             .includes(x.id)
         : true);
 
     return (
-			<>
+      <UserList
+        user={user}
+        filters={[filter]}
+        renderHeader={(total) => (
           <div className="flex flex-col gap-4">
             <div
               onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+            >
               <BsArrowLeft className="text-xl" />
               <span>Back</span>
             </div>
-					<h2 className="text-2xl font-semibold">Students ({users.filter(filter).length})</h2>
+            <h2 className="text-2xl font-semibold">Students ({total})</h2>
           </div>
-
+        )}
-				<UserList user={user} filters={[filter]} />
+      />
-			</>
     );
   };
 
@@ -101,25 +116,32 @@ export default function AdminDashboard({user}: Props) {
       x.type === "teacher" &&
       (!!selectedUser
         ? groups
-						.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
+            .filter(
+              (g) =>
+                g.admin === selectedUser.id ||
+                g.participants.includes(selectedUser.id)
+            )
             .flatMap((g) => g.participants)
             .includes(x.id) || false
         : true);
 
     return (
-			<>
+      <UserList
+        user={user}
+        filters={[filter]}
+        renderHeader={(total) => (
           <div className="flex flex-col gap-4">
             <div
               onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+            >
               <BsArrowLeft className="text-xl" />
               <span>Back</span>
             </div>
-					<h2 className="text-2xl font-semibold">Teachers ({users.filter(filter).length})</h2>
+            <h2 className="text-2xl font-semibold">Teachers ({total})</h2>
           </div>
-
+        )}
-				<UserList user={user} filters={[filter]} />
+      />
-			</>
     );
   };
 
@@ -127,114 +149,167 @@ export default function AdminDashboard({user}: Props) {
     const filter = (x: User) => x.type === "agent";
 
     return (
-			<>
+      <UserList
+        user={user}
+        filters={[filter]}
+        renderHeader={(total) => (
           <div className="flex flex-col gap-4">
             <div
               onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-						<BsArrowLeft className="text-xl" />
+            >
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">Country Managers ({users.filter(filter).length})</h2>
-				</div>
-
-				<UserList user={user} filters={[filter]} />
-			</>
-		);
-	};
-
-	const CorporateList = () => (
-		<>
-			<div className="flex flex-col gap-4">
-				<div
-					onClick={() => setPage("")}
-					className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-					<BsArrowLeft className="text-xl" />
-					<span>Back</span>
-				</div>
-				<h2 className="text-2xl font-semibold">Corporate ({users.filter((x) => x.type === "corporate").length})</h2>
-			</div>
-
-			<UserList user={user} filters={[(x) => x.type === "corporate"]} />
-		</>
-	);
-
-	const CorporatePaidStatusList = ({paid}: {paid: Boolean}) => {
-		const list = paid ? done : pending;
-		const filter = (x: User) => x.type === "corporate" && list.includes(x.id);
-
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
               <BsArrowLeft className="text-xl" />
               <span>Back</span>
             </div>
             <h2 className="text-2xl font-semibold">
-						{paid ? "Payment Done" : "Pending Payment"} ({list.length})
+              Country Managers ({total})
             </h2>
           </div>
-				<UserList user={user} filters={[filter]} />
+        )}
-			</>
+      />
+    );
+  };
+
+  const CorporateList = () => (
+    <UserList
+      user={user}
+      filters={[(x) => x.type === "corporate"]}
+      renderHeader={(total) => (
+        <div className="flex flex-col gap-4">
+          <div
+            onClick={() => setPage("")}
+            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+          >
+            <BsArrowLeft className="text-xl" />
+            <span>Back</span>
+          </div>
+          <h2 className="text-2xl font-semibold">Corporate ({total})</h2>
+        </div>
+      )}
+    />
+  );
+
+  const CorporatePaidStatusList = ({ paid }: { paid: Boolean }) => {
+    const list = paid ? done : pending;
+    const filter = (x: User) => x.type === "corporate" && list.includes(x.id);
+
+    return (
+      <UserList
+        user={user}
+        filters={[filter]}
+        renderHeader={(total) => (
+          <div className="flex flex-col gap-4">
+            <div
+              onClick={() => setPage("")}
+              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+            >
+              <BsArrowLeft className="text-xl" />
+              <span>Back</span>
+            </div>
+            <h2 className="text-2xl font-semibold">
+              {paid ? "Payment Done" : "Pending Payment"} ({total})
+            </h2>
+          </div>
+        )}
+      />
     );
   };
 
   const InactiveCountryManagerList = () => {
     return (
-			<>
+      <UserList
+        user={user}
+        filters={[inactiveCountryManagerFilter]}
+        renderHeader={(total) => (
           <div className="flex flex-col gap-4">
             <div
               onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+            >
               <BsArrowLeft className="text-xl" />
               <span>Back</span>
             </div>
-					<h2 className="text-2xl font-semibold">Inactive Country Managers ({users.filter(inactiveCountryManagerFilter).length})</h2>
+            <h2 className="text-2xl font-semibold">
+              Inactive Country Managers ({total})
+            </h2>
           </div>
-
+        )}
-				<UserList user={user} filters={[inactiveCountryManagerFilter]} />
+      />
-			</>
     );
   };
 
   const InactiveStudentsList = () => {
-		const filter = (x: User) => x.type === "student" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
+    const filter = (x: User) =>
+      x.type === "student" &&
+      (x.status === "disabled" ||
+        moment().isAfter(x.subscriptionExpirationDate));
 
     return (
-			<>
+      <UserList
+        user={user}
+        filters={[filter]}
+        renderHeader={(total) => (
           <div className="flex flex-col gap-4">
             <div
               onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+            >
               <BsArrowLeft className="text-xl" />
               <span>Back</span>
             </div>
-					<h2 className="text-2xl font-semibold">Inactive Students ({users.filter(filter).length})</h2>
+            <h2 className="text-2xl font-semibold">
+              Inactive Students ({total})
+            </h2>
           </div>
-
+        )}
-				<UserList user={user} filters={[filter]} />
+      />
-			</>
     );
   };
 
   const InactiveCorporateList = () => {
-		const filter = (x: User) => x.type === "corporate" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
+    const filter = (x: User) =>
+      x.type === "corporate" &&
+      (x.status === "disabled" ||
+        moment().isAfter(x.subscriptionExpirationDate));
 
+    return (
+      <UserList
+        user={user}
+        filters={[filter]}
+        renderHeader={(total) => (
+          <div className="flex flex-col gap-4">
+            <div
+              onClick={() => setPage("")}
+              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+            >
+              <BsArrowLeft className="text-xl" />
+              <span>Back</span>
+            </div>
+            <h2 className="text-2xl font-semibold">
+              Inactive Corporate ({total})
+            </h2>
+          </div>
+        )}
+      />
+    );
+  };
+
+  const CorporateStudentsLevelsHelper = () => {
     return (
       <>
         <div className="flex flex-col gap-4">
           <div
             onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+          >
             <BsArrowLeft className="text-xl" />
             <span>Back</span>
           </div>
-					<h2 className="text-2xl font-semibold">Inactive Corporate ({users.filter(filter).length})</h2>
+          <h2 className="text-2xl font-semibold">
+            Corporate Students Levels
+          </h2>
         </div>
-
+        <CorporateStudentsLevels />
-				<UserList user={user} filters={[filter]} />
       </>
     );
   };
@@ -273,7 +348,15 @@ export default function AdminDashboard({user}: Props) {
         <IconCard
           Icon={BsGlobeCentralSouthAsia}
           label="Countries"
-					value={[...new Set(users.filter((x) => x.demographicInformation).map((x) => x.demographicInformation?.country))].length}
+          value={
+            [
+              ...new Set(
+                users
+                  .filter((x) => x.demographicInformation)
+                  .map((x) => x.demographicInformation?.country)
+              ),
+            ].length
+          }
           color="purple"
         />
         <IconCard
@@ -281,8 +364,12 @@ export default function AdminDashboard({user}: Props) {
           Icon={BsPersonFill}
           label="Inactive Students"
           value={
-						users.filter((x) => x.type === "student" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate)))
+            users.filter(
-							.length
+              (x) =>
+                x.type === "student" &&
+                (x.status === "disabled" ||
+                  moment().isAfter(x.subscriptionExpirationDate))
+            ).length
           }
           color="rose"
         />
@@ -298,12 +385,22 @@ export default function AdminDashboard({user}: Props) {
           Icon={BsBank}
           label="Inactive Corporate"
           value={
-						users.filter((x) => x.type === "corporate" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate)))
+            users.filter(
-							.length
+              (x) =>
+                x.type === "corporate" &&
+                (x.status === "disabled" ||
+                  moment().isAfter(x.subscriptionExpirationDate))
+            ).length
           }
           color="rose"
         />
-				<IconCard onClick={() => setPage("paymentdone")} Icon={BsCurrencyDollar} label="Payment Done" value={done.length} color="purple" />
+        <IconCard
+          onClick={() => setPage("paymentdone")}
+          Icon={BsCurrencyDollar}
+          label="Payment Done"
+          value={done.length}
+          color="purple"
+        />
         <IconCard
           onClick={() => setPage("paymentpending")}
           Icon={BsCurrencyDollar}
@@ -317,6 +414,12 @@ export default function AdminDashboard({user}: Props) {
           label="Content Management System (CMS)"
           color="green"
         />
+        <IconCard
+          onClick={() => setPage("corporatestudentslevels")}
+          Icon={BsPersonFill}
+          label="Corporate Students Levels"
+          color="purple"
+        />
       </section>
 
       <section className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 w-full justify-between">
@@ -361,7 +464,9 @@ export default function AdminDashboard({user}: Props) {
           <span className="p-4">Unpaid Corporate</span>
           <div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
             {users
-							.filter((x) => x.type === "corporate" && x.status === "paymentDue")
+              .filter(
+                (x) => x.type === "corporate" && x.status === "paymentDue"
+              )
               .map((x) => (
                 <UserDisplay key={x.id} {...x} />
               ))}
@@ -375,8 +480,10 @@ export default function AdminDashboard({user}: Props) {
                 (x) =>
                   x.type === "student" &&
                   x.subscriptionExpirationDate &&
-									moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
+                  moment().isAfter(
-									moment().isBefore(moment(x.subscriptionExpirationDate)),
+                    moment(x.subscriptionExpirationDate).subtract(30, "days")
+                  ) &&
+                  moment().isBefore(moment(x.subscriptionExpirationDate))
               )
               .map((x) => (
                 <UserDisplay key={x.id} {...x} />
@@ -391,8 +498,10 @@ export default function AdminDashboard({user}: Props) {
                 (x) =>
                   x.type === "teacher" &&
                   x.subscriptionExpirationDate &&
-									moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
+                  moment().isAfter(
-									moment().isBefore(moment(x.subscriptionExpirationDate)),
+                    moment(x.subscriptionExpirationDate).subtract(30, "days")
+                  ) &&
+                  moment().isBefore(moment(x.subscriptionExpirationDate))
               )
               .map((x) => (
                 <UserDisplay key={x.id} {...x} />
@@ -407,8 +516,10 @@ export default function AdminDashboard({user}: Props) {
                 (x) =>
                   x.type === "agent" &&
                   x.subscriptionExpirationDate &&
-									moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
+                  moment().isAfter(
-									moment().isBefore(moment(x.subscriptionExpirationDate)),
+                    moment(x.subscriptionExpirationDate).subtract(30, "days")
+                  ) &&
+                  moment().isBefore(moment(x.subscriptionExpirationDate))
               )
               .map((x) => (
                 <UserDisplay key={x.id} {...x} />
@@ -423,8 +534,10 @@ export default function AdminDashboard({user}: Props) {
                 (x) =>
                   x.type === "corporate" &&
                   x.subscriptionExpirationDate &&
-									moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
+                  moment().isAfter(
-									moment().isBefore(moment(x.subscriptionExpirationDate)),
+                    moment(x.subscriptionExpirationDate).subtract(30, "days")
+                  ) &&
+                  moment().isBefore(moment(x.subscriptionExpirationDate))
               )
               .map((x) => (
                 <UserDisplay key={x.id} {...x} />
@@ -436,7 +549,10 @@ export default function AdminDashboard({user}: Props) {
           <div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
             {users
               .filter(
-								(x) => x.type === "student" && x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)),
+                (x) =>
+                  x.type === "student" &&
+                  x.subscriptionExpirationDate &&
+                  moment().isAfter(moment(x.subscriptionExpirationDate))
               )
               .map((x) => (
                 <UserDisplay key={x.id} {...x} />
@@ -448,7 +564,10 @@ export default function AdminDashboard({user}: Props) {
           <div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
             {users
               .filter(
-								(x) => x.type === "teacher" && x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)),
+                (x) =>
+                  x.type === "teacher" &&
+                  x.subscriptionExpirationDate &&
+                  moment().isAfter(moment(x.subscriptionExpirationDate))
               )
               .map((x) => (
                 <UserDisplay key={x.id} {...x} />
@@ -460,7 +579,10 @@ export default function AdminDashboard({user}: Props) {
           <div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
             {users
               .filter(
-								(x) => x.type === "agent" && x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)),
+                (x) =>
+                  x.type === "agent" &&
+                  x.subscriptionExpirationDate &&
+                  moment().isAfter(moment(x.subscriptionExpirationDate))
               )
               .map((x) => (
                 <UserDisplay key={x.id} {...x} />
@@ -473,7 +595,9 @@ export default function AdminDashboard({user}: Props) {
             {users
               .filter(
                 (x) =>
-									x.type === "corporate" && x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)),
+                  x.type === "corporate" &&
+                  x.subscriptionExpirationDate &&
+                  moment().isAfter(moment(x.subscriptionExpirationDate))
               )
               .map((x) => (
                 <UserDisplay key={x.id} {...x} />
@@ -497,7 +621,8 @@ export default function AdminDashboard({user}: Props) {
                   if (shouldReload) reload();
                 }}
                 onViewStudents={
-									selectedUser.type === "corporate" || selectedUser.type === "teacher"
+                  selectedUser.type === "corporate" ||
+                  selectedUser.type === "teacher"
                     ? () => {
                         appendUserFilters({
                           id: "view-students",
@@ -507,7 +632,11 @@ export default function AdminDashboard({user}: Props) {
                           id: "belongs-to-admin",
                           filter: (x: User) =>
                             groups
-															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
+                              .filter(
+                                (g) =>
+                                  g.admin === selectedUser.id ||
+                                  g.participants.includes(selectedUser.id)
+                              )
                               .flatMap((g) => g.participants)
                               .includes(x.id),
                         });
@@ -517,7 +646,8 @@ export default function AdminDashboard({user}: Props) {
                     : undefined
                 }
                 onViewTeachers={
-									selectedUser.type === "corporate" || selectedUser.type === "student"
+                  selectedUser.type === "corporate" ||
+                  selectedUser.type === "student"
                     ? () => {
                         appendUserFilters({
                           id: "view-teachers",
@@ -527,7 +657,11 @@ export default function AdminDashboard({user}: Props) {
                           id: "belongs-to-admin",
                           filter: (x: User) =>
                             groups
-															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
+                              .filter(
+                                (g) =>
+                                  g.admin === selectedUser.id ||
+                                  g.participants.includes(selectedUser.id)
+                              )
                               .flatMap((g) => g.participants)
                               .includes(x.id),
                         });
@@ -537,7 +671,8 @@ export default function AdminDashboard({user}: Props) {
                     : undefined
                 }
                 onViewCorporate={
-									selectedUser.type === "teacher" || selectedUser.type === "student"
+                  selectedUser.type === "teacher" ||
+                  selectedUser.type === "student"
                     ? () => {
                         appendUserFilters({
                           id: "view-corporate",
@@ -547,7 +682,9 @@ export default function AdminDashboard({user}: Props) {
                           id: "belongs-to-admin",
                           filter: (x: User) =>
                             groups
-															.filter((g) => g.participants.includes(selectedUser.id))
+                              .filter((g) =>
+                                g.participants.includes(selectedUser.id)
+                              )
                               .flatMap((g) => [g.admin, ...g.participants])
                               .includes(x.id),
                         });
@@ -571,6 +708,7 @@ export default function AdminDashboard({user}: Props) {
       {page === "inactiveCountryManagers" && <InactiveCountryManagerList />}
       {page === "paymentdone" && <CorporatePaidStatusList paid={true} />}
       {page === "paymentpending" && <CorporatePaidStatusList paid={false} />}
+      {page === "corporatestudentslevels" && <CorporateStudentsLevelsHelper />}
       {page === "" && <DefaultDashboard />}
     </>
   );

src/dashboards/Agent.tsx

@@ -2,30 +2,35 @@
 import Modal from "@/components/Modal";
 import useStats from "@/hooks/useStats";
 import useUsers from "@/hooks/useUsers";
-import { User} from "@/interfaces/user";
+import { User } from "@/interfaces/user";
 import UserList from "@/pages/(admin)/Lists/UserList";
-import {dateSorter} from "@/utils";
+import { dateSorter } from "@/utils";
 import moment from "moment";
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
-import {BsArrowLeft, BsPersonFill, BsBank, BsCurrencyDollar} from "react-icons/bs";
+import {
+  BsArrowLeft,
+  BsPersonFill,
+  BsBank,
+  BsCurrencyDollar,
+} from "react-icons/bs";
 import UserCard from "@/components/UserCard";
 import useGroups from "@/hooks/useGroups";
 
 import IconCard from "./IconCard";
-import usePaymentStatusUsers from '@/hooks/usePaymentStatusUsers';
+import usePaymentStatusUsers from "@/hooks/usePaymentStatusUsers";
 
 interface Props {
   user: User;
 }
 
-export default function AgentDashboard({user}: Props) {
+export default function AgentDashboard({ user }: Props) {
   const [page, setPage] = useState("");
   const [selectedUser, setSelectedUser] = useState<User>();
   const [showModal, setShowModal] = useState(false);
 
-	const {stats} = useStats();
+  const { stats } = useStats();
-	const {users, reload} = useUsers();
+  const { users, reload } = useUsers();
-	const {groups} = useGroups(user.id);
+  const { groups } = useGroups(user.id);
   const { pending, done } = usePaymentStatusUsers();
 
   useEffect(() => {
@@ -34,19 +39,34 @@ export default function AgentDashboard({user}: Props) {
 
   const corporateFilter = (user: User) => user.type === "corporate";
   const referredCorporateFilter = (x: User) =>
-		x.type === "corporate" && !!x.corporateInformation && x.corporateInformation.referralAgent === user.id;
+    x.type === "corporate" &&
+    !!x.corporateInformation &&
+    x.corporateInformation.referralAgent === user.id;
   const inactiveReferredCorporateFilter = (x: User) =>
-		referredCorporateFilter(x) && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
+    referredCorporateFilter(x) &&
+    (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
 
-	const UserDisplay = ({ displayUser, allowClick = true }: {displayUser: User, allowClick?: boolean}) => (
+  const UserDisplay = ({
+    displayUser,
+    allowClick = true,
+  }: {
+    displayUser: User;
+    allowClick?: boolean;
+  }) => (
     <div
       onClick={() => allowClick && setSelectedUser(displayUser)}
-			className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300">
+      className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300"
-			<img src={displayUser.profilePicture} alt={displayUser.name} className="rounded-full w-10 h-10" />
+    >
+      <img
+        src={displayUser.profilePicture}
+        alt={displayUser.name}
+        className="rounded-full w-10 h-10"
+      />
       <div className="flex flex-col gap-1 items-start">
         <span>
           {displayUser.type === "corporate"
-						? displayUser.corporateInformation?.companyInformation?.name || displayUser.name
+            ? displayUser.corporateInformation?.companyInformation?.name ||
+              displayUser.name
             : displayUser.name}
         </span>
         <span className="text-sm opacity-75">{displayUser.email}</span>
@@ -56,37 +76,47 @@ export default function AgentDashboard({user}: Props) {
 
   const ReferredCorporateList = () => {
     return (
-			<>
+      <UserList
+        user={user}
+        filters={[referredCorporateFilter]}
+        renderHeader={(total) => (
           <div className="flex flex-col gap-4">
             <div
               onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+            >
               <BsArrowLeft className="text-xl" />
               <span>Back</span>
             </div>
-					<h2 className="text-2xl font-semibold">Referred Corporate ({users.filter(referredCorporateFilter).length})</h2>
+            <h2 className="text-2xl font-semibold">
+              Referred Corporate ({total})
+            </h2>
           </div>
-
+        )}
-				<UserList user={user} filters={[referredCorporateFilter]} />
+      />
-			</>
     );
   };
 
   const InactiveReferredCorporateList = () => {
     return (
-			<>
+      <UserList
+        user={user}
+        filters={[inactiveReferredCorporateFilter]}
+        renderHeader={(total) => (
           <div className="flex flex-col gap-4">
             <div
               onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+            >
               <BsArrowLeft className="text-xl" />
               <span>Back</span>
             </div>
-					<h2 className="text-2xl font-semibold">Inactive Referred Corporate ({users.filter(inactiveReferredCorporateFilter).length})</h2>
+            <h2 className="text-2xl font-semibold">
+              Inactive Referred Corporate ({total})
+            </h2>
           </div>
-
+        )}
-				<UserList user={user} filters={[inactiveReferredCorporateFilter]} />
+      />
-			</>
     );
   };
 
@@ -94,38 +124,48 @@ export default function AgentDashboard({user}: Props) {
     const filter = (x: User) => x.type === "corporate";
 
     return (
-			<>
+      <UserList
+        user={user}
+        filters={[filter]}
+        renderHeader={(total) => (
           <div className="flex flex-col gap-4">
             <div
               onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+            >
               <BsArrowLeft className="text-xl" />
               <span>Back</span>
             </div>
-					<h2 className="text-2xl font-semibold">Corporate ({users.filter(filter).length})</h2>
+            <h2 className="text-2xl font-semibold">Corporate ({total})</h2>
           </div>
-				<UserList user={user} filters={[filter]} />
+        )}
-			</>
+      />
     );
   };
 
-	const CorporatePaidStatusList = ({ paid }: {paid: Boolean}) => {
+  const CorporatePaidStatusList = ({ paid }: { paid: Boolean }) => {
     const list = paid ? done : pending;
     const filter = (x: User) => x.type === "corporate" && list.includes(x.id);
 
     return (
-			<>
+      <UserList
+        user={user}
+        filters={[filter]}
+        renderHeader={(total) => (
           <div className="flex flex-col gap-4">
             <div
               onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+            >
               <BsArrowLeft className="text-xl" />
               <span>Back</span>
             </div>
-					<h2 className="text-2xl font-semibold">{paid ? 'Payment Done' : 'Pending Payment'} ({list.length})</h2>
+            <h2 className="text-2xl font-semibold">
+              {paid ? "Payment Done" : "Pending Payment"} ({total})
+            </h2>
           </div>
-				<UserList user={user} filters={[filter]} />
+        )}
-			</>
+      />
     );
   };
 
@@ -199,8 +239,10 @@ export default function AgentDashboard({user}: Props) {
               .filter(
                 (x) =>
                   referredCorporateFilter(x) &&
-									moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
+                  moment().isAfter(
-									moment().isBefore(moment(x.subscriptionExpirationDate)),
+                    moment(x.subscriptionExpirationDate).subtract(30, "days")
+                  ) &&
+                  moment().isBefore(moment(x.subscriptionExpirationDate))
               )
               .map((x) => (
                 <UserDisplay key={x.id} displayUser={x} />
@@ -224,9 +266,16 @@ export default function AgentDashboard({user}: Props) {
                   if (shouldReload) reload();
                 }}
                 onViewStudents={
-									selectedUser.type === "corporate" || selectedUser.type === "teacher" ? () => setPage("students") : undefined
+                  selectedUser.type === "corporate" ||
+                  selectedUser.type === "teacher"
+                    ? () => setPage("students")
+                    : undefined
+                }
+                onViewTeachers={
+                  selectedUser.type === "corporate"
+                    ? () => setPage("teachers")
+                    : undefined
                 }
-								onViewTeachers={selectedUser.type === "corporate" ? () => setPage("teachers") : undefined}
                 user={selectedUser}
               />
             </div>
@@ -235,7 +284,9 @@ export default function AgentDashboard({user}: Props) {
       </Modal>
       {page === "referredCorporate" && <ReferredCorporateList />}
       {page === "corporate" && <CorporateList />}
-			{page === "inactiveReferredCorporate" && <InactiveReferredCorporateList />}
+      {page === "inactiveReferredCorporate" && (
+        <InactiveReferredCorporateList />
+      )}
       {page === "paymentdone" && <CorporatePaidStatusList paid={true} />}
       {page === "paymentpending" && <CorporatePaidStatusList paid={false} />}
       {page === "" && <DefaultDashboard />}

src/dashboards/Corporate.tsx

@@ -2,11 +2,11 @@
 import Modal from "@/components/Modal";
 import useStats from "@/hooks/useStats";
 import useUsers from "@/hooks/useUsers";
-import {CorporateUser, Group, Stat, User} from "@/interfaces/user";
+import { CorporateUser, Group, Stat, User } from "@/interfaces/user";
 import UserList from "@/pages/(admin)/Lists/UserList";
-import {dateSorter} from "@/utils";
+import { dateSorter } from "@/utils";
 import moment from "moment";
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
 import {
   BsArrowLeft,
   BsClipboard2Data,
@@ -26,29 +26,29 @@ import {
 } from "react-icons/bs";
 import UserCard from "@/components/UserCard";
 import useGroups from "@/hooks/useGroups";
-import {calculateAverageLevel, calculateBandScore} from "@/utils/score";
+import { calculateAverageLevel, calculateBandScore } from "@/utils/score";
-import {MODULE_ARRAY} from "@/utils/moduleUtils";
+import { MODULE_ARRAY } from "@/utils/moduleUtils";
-import {Module} from "@/interfaces";
+import { Module } from "@/interfaces";
-import {groupByExam} from "@/utils/stats";
+import { groupByExam } from "@/utils/stats";
 import IconCard from "./IconCard";
 import GroupList from "@/pages/(admin)/Lists/GroupList";
 import useFilterStore from "@/stores/listFilterStore";
-import {useRouter} from "next/router";
+import { useRouter } from "next/router";
 import useCodes from "@/hooks/useCodes";
 
 interface Props {
   user: CorporateUser;
 }
 
-export default function CorporateDashboard({user}: Props) {
+export default function CorporateDashboard({ user }: Props) {
   const [page, setPage] = useState("");
   const [selectedUser, setSelectedUser] = useState<User>();
   const [showModal, setShowModal] = useState(false);
 
-	const {stats} = useStats();
+  const { stats } = useStats();
-	const {users, reload} = useUsers();
+  const { users, reload } = useUsers();
-	const {codes} = useCodes(user.id);
+  const { codes } = useCodes(user.id);
-	const {groups} = useGroups(user.id);
+  const { groups } = useGroups(user.id);
 
   const appendUserFilters = useFilterStore((state) => state.appendUserFilter);
   const router = useRouter();
@@ -57,16 +57,26 @@ export default function CorporateDashboard({user}: Props) {
     setShowModal(!!selectedUser && page === "");
   }, [selectedUser, page]);
 
-	const studentFilter = (user: User) => user.type === "student" && groups.flatMap((g) => g.participants).includes(user.id);
+  const studentFilter = (user: User) =>
-	const teacherFilter = (user: User) => user.type === "teacher" && groups.flatMap((g) => g.participants).includes(user.id);
+    user.type === "student" &&
+    groups.flatMap((g) => g.participants).includes(user.id);
+  const teacherFilter = (user: User) =>
+    user.type === "teacher" &&
+    groups.flatMap((g) => g.participants).includes(user.id);
 
-	const getStatsByStudent = (user: User) => stats.filter((s) => s.user === user.id);
+  const getStatsByStudent = (user: User) =>
+    stats.filter((s) => s.user === user.id);
 
   const UserDisplay = (displayUser: User) => (
     <div
       onClick={() => setSelectedUser(displayUser)}
-			className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300">
+      className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300"
-			<img src={displayUser.profilePicture} alt={displayUser.name} className="rounded-full w-10 h-10" />
+    >
+      <img
+        src={displayUser.profilePicture}
+        alt={displayUser.name}
+        className="rounded-full w-10 h-10"
+      />
       <div className="flex flex-col gap-1 items-start">
         <span>{displayUser.name}</span>
         <span className="text-sm opacity-75">{displayUser.email}</span>
@@ -85,19 +95,22 @@ export default function CorporateDashboard({user}: Props) {
         : groups.flatMap((g) => g.participants).includes(x.id));
 
     return (
-			<>
+      <UserList
+        user={user}
+        filters={[filter]}
+        renderHeader={(total) => (
           <div className="flex flex-col gap-4">
             <div
               onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+            >
               <BsArrowLeft className="text-xl" />
               <span>Back</span>
             </div>
-					<h2 className="text-2xl font-semibold">Students ({users.filter(filter).length})</h2>
+            <h2 className="text-2xl font-semibold">Students ({total})</h2>
           </div>
-
+        )}
-				<UserList user={user} filters={[filter]} />
+      />
-			</>
     );
   };
 
@@ -112,35 +125,42 @@ export default function CorporateDashboard({user}: Props) {
         : groups.flatMap((g) => g.participants).includes(x.id));
 
     return (
-			<>
+        <UserList
+          user={user}
+          filters={[filter]}
+          renderHeader={(total) => (
             <div className="flex flex-col gap-4">
               <div
                 onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+                className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+              >
                 <BsArrowLeft className="text-xl" />
                 <span>Back</span>
               </div>
-					<h2 className="text-2xl font-semibold">Teachers ({users.filter(filter).length})</h2>
+              <h2 className="text-2xl font-semibold">Teachers ({total})</h2>
             </div>
-
+          )}
-				<UserList user={user} filters={[filter]} />
+        />
-			</>
     );
   };
 
   const GroupsList = () => {
-		const filter = (x: Group) => x.admin === user.id || x.participants.includes(user.id);
+    const filter = (x: Group) =>
+      x.admin === user.id || x.participants.includes(user.id);
 
     return (
       <>
         <div className="flex flex-col gap-4">
           <div
             onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+          >
             <BsArrowLeft className="text-xl" />
             <span>Back</span>
           </div>
-					<h2 className="text-2xl font-semibold">Groups ({groups.filter(filter).length})</h2>
+          <h2 className="text-2xl font-semibold">
+            Groups ({groups.filter(filter).length})
+          </h2>
         </div>
 
         <GroupList user={user} />
@@ -150,14 +170,29 @@ export default function CorporateDashboard({user}: Props) {
 
   const averageLevelCalculator = (studentStats: Stat[]) => {
     const formattedStats = studentStats
-			.map((s) => ({focus: users.find((u) => u.id === s.user)?.focus, score: s.score, module: s.module}))
+      .map((s) => ({
+        focus: users.find((u) => u.id === s.user)?.focus,
+        score: s.score,
+        module: s.module,
+      }))
       .filter((f) => !!f.focus);
     const bandScores = formattedStats.map((s) => ({
       module: s.module,
-			level: calculateBandScore(s.score.correct, s.score.total, s.module, s.focus!),
+      level: calculateBandScore(
+        s.score.correct,
+        s.score.total,
+        s.module,
+        s.focus!
+      ),
     }));
 
-		const levels: {[key in Module]: number} = {reading: 0, listening: 0, writing: 0, speaking: 0, level: 0};
+    const levels: { [key in Module]: number } = {
+      reading: 0,
+      listening: 0,
+      writing: 0,
+      speaking: 0,
+      level: 0,
+    };
     bandScores.forEach((b) => (levels[b.module] += b.level));
 
     return calculateAverageLevel(levels);
@@ -183,26 +218,46 @@ export default function CorporateDashboard({user}: Props) {
         <IconCard
           Icon={BsClipboard2Data}
           label="Exams Performed"
-					value={stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user)).length}
+          value={
+            stats.filter((s) =>
+              groups.flatMap((g) => g.participants).includes(s.user)
+            ).length
+          }
           color="purple"
         />
         <IconCard
           Icon={BsPaperclip}
           label="Average Level"
-					value={averageLevelCalculator(stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user))).toFixed(1)}
+          value={averageLevelCalculator(
+            stats.filter((s) =>
+              groups.flatMap((g) => g.participants).includes(s.user)
+            )
+          ).toFixed(1)}
+          color="purple"
+        />
+        <IconCard
+          onClick={() => setPage("groups")}
+          Icon={BsPeople}
+          label="Groups"
+          value={groups.length}
           color="purple"
         />
-				<IconCard onClick={() => setPage("groups")} Icon={BsPeople} label="Groups" value={groups.length} color="purple" />
         <IconCard
           Icon={BsPersonCheck}
           label="User Balance"
-					value={`${codes.length}/${user.corporateInformation?.companyInformation?.userAmount || 0}`}
+          value={`${codes.length}/${
+            user.corporateInformation?.companyInformation?.userAmount || 0
+          }`}
           color="purple"
         />
         <IconCard
           Icon={BsClock}
           label="Expiration Date"
-					value={user.subscriptionExpirationDate ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy") : "Unlimited"}
+          value={
+            user.subscriptionExpirationDate
+              ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy")
+              : "Unlimited"
+          }
           color="rose"
         />
       </section>
@@ -235,7 +290,11 @@ export default function CorporateDashboard({user}: Props) {
           <div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
             {users
               .filter(studentFilter)
-							.sort((a, b) => calculateAverageLevel(b.levels) - calculateAverageLevel(a.levels))
+              .sort(
+                (a, b) =>
+                  calculateAverageLevel(b.levels) -
+                  calculateAverageLevel(a.levels)
+              )
               .map((x) => (
                 <UserDisplay key={x.id} {...x} />
               ))}
@@ -248,7 +307,8 @@ export default function CorporateDashboard({user}: Props) {
               .filter(studentFilter)
               .sort(
                 (a, b) =>
-									Object.keys(groupByExam(getStatsByStudent(b))).length - Object.keys(groupByExam(getStatsByStudent(a))).length,
+                  Object.keys(groupByExam(getStatsByStudent(b))).length -
+                  Object.keys(groupByExam(getStatsByStudent(a))).length
               )
               .map((x) => (
                 <UserDisplay key={x.id} {...x} />
@@ -272,7 +332,8 @@ export default function CorporateDashboard({user}: Props) {
                   if (shouldReload) reload();
                 }}
                 onViewStudents={
-									selectedUser.type === "corporate" || selectedUser.type === "teacher"
+                  selectedUser.type === "corporate" ||
+                  selectedUser.type === "teacher"
                     ? () => {
                         appendUserFilters({
                           id: "view-students",
@@ -282,7 +343,11 @@ export default function CorporateDashboard({user}: Props) {
                           id: "belongs-to-admin",
                           filter: (x: User) =>
                             groups
-															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
+                              .filter(
+                                (g) =>
+                                  g.admin === selectedUser.id ||
+                                  g.participants.includes(selectedUser.id)
+                              )
                               .flatMap((g) => g.participants)
                               .includes(x.id),
                         });
@@ -292,7 +357,8 @@ export default function CorporateDashboard({user}: Props) {
                     : undefined
                 }
                 onViewTeachers={
-									selectedUser.type === "corporate" || selectedUser.type === "student"
+                  selectedUser.type === "corporate" ||
+                  selectedUser.type === "student"
                     ? () => {
                         appendUserFilters({
                           id: "view-teachers",
@@ -302,7 +368,11 @@ export default function CorporateDashboard({user}: Props) {
                           id: "belongs-to-admin",
                           filter: (x: User) =>
                             groups
-															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
+                              .filter(
+                                (g) =>
+                                  g.admin === selectedUser.id ||
+                                  g.participants.includes(selectedUser.id)
+                              )
                               .flatMap((g) => g.participants)
                               .includes(x.id),
                         });

src/dashboards/CorporateStudentsLevels.tsx

@@ -0,0 +1,140 @@
+import React from "react";
+import useUsers from "@/hooks/useUsers";
+import useGroups from "@/hooks/useGroups";
+import { User } from "@/interfaces/user";
+import Select from "@/components/Low/Select";
+import ProgressBar from "@/components/Low/ProgressBar";
+import {
+  BsBook,
+  BsClipboard,
+  BsHeadphones,
+  BsMegaphone,
+  BsPen,
+} from "react-icons/bs";
+import { MODULE_ARRAY } from "@/utils/moduleUtils";
+import { capitalize } from "lodash";
+import { getLevelLabel } from "@/utils/score";
+
+const Card = ({ user }: { user: User }) => {
+  return (
+    <div className="border-mti-gray-platinum flex flex-col h-fit w-full cursor-pointer flex-col gap-6 rounded-xl border bg-white p-4 transition duration-300 ease-in-out hover:drop-shadow">
+      <div className="flex flex-col gap-3">
+        <h3 className="text-xl font-semibold">{user.name}</h3>
+      </div>
+      <div className="flex w-full gap-3 flex-wrap">
+        {MODULE_ARRAY.map((module) => {
+          const desiredLevel = user.desiredLevels[module] || 9;
+          const level = user.levels[module] || 0;
+          return (
+            <div
+              className="border-mti-gray-anti-flash flex flex-col gap-2 rounded-xl border p-4 min-w-[250px]"
+              key={module}
+            >
+              <div className="flex items-center gap-2 md:gap-3">
+                <div className="bg-mti-gray-smoke flex h-8 w-8 items-center justify-center rounded-lg md:h-12 md:w-12 md:rounded-xl">
+                  {module === "reading" && (
+                    <BsBook className="text-ielts-reading h-4 w-4 md:h-5 md:w-5" />
+                  )}
+                  {module === "listening" && (
+                    <BsHeadphones className="text-ielts-listening h-4 w-4 md:h-5 md:w-5" />
+                  )}
+                  {module === "writing" && (
+                    <BsPen className="text-ielts-writing h-4 w-4 md:h-5 md:w-5" />
+                  )}
+                  {module === "speaking" && (
+                    <BsMegaphone className="text-ielts-speaking h-4 w-4 md:h-5 md:w-5" />
+                  )}
+                  {module === "level" && (
+                    <BsClipboard className="text-ielts-level h-4 w-4 md:h-5 md:w-5" />
+                  )}
+                </div>
+                <div className="flex w-full flex-col">
+                  <span className="text-sm font-bold md:font-extrabold w-full">
+                    {capitalize(module)}
+                  </span>
+                  <div className="text-mti-gray-dim text-sm font-normal">
+                    {module === "level" && (
+                      <span>
+                        English Level: {getLevelLabel(level).join(" / ")}
+                      </span>
+                    )}
+                    {module !== "level" && (
+                      <div className="flex flex-col">
+                        <span>Level {level} / Level 9</span>
+                        <span>Desired Level: {desiredLevel}</span>
+                      </div>
+                    )}
+                  </div>
+                </div>
+              </div>
+              <div className="md:pl-14">
+                <ProgressBar
+                  color={module}
+                  label=""
+                  mark={Math.round((desiredLevel * 100) / 9)}
+                  markLabel={`Desired Level: ${desiredLevel}`}
+                  percentage={Math.round((level * 100) / 9)}
+                  className="h-2 w-full"
+                />
+              </div>
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
+};
+
+const CorporateStudentsLevels = () => {
+  const { users } = useUsers();
+  const { groups } = useGroups();
+
+  const corporateUsers = users.filter((u) => u.type === "corporate") as User[];
+  const [corporateId, setCorporateId] = React.useState<string>("");
+  const corporate =
+    corporateUsers.find((u) => u.id === corporateId) || corporateUsers[0];
+
+  const groupsFromCorporate = corporate
+    ? groups.filter((g) => g.admin === corporate.id)
+    : [];
+
+  const groupsParticipants = groupsFromCorporate
+    .flatMap((g) => g.participants)
+    .reduce((accm: User[], p) => {
+      const user = users.find((u) => u.id === p) as User;
+      if (user) {
+        return [...accm, user];
+      }
+      return accm;
+    }, []);
+
+  return (
+    <>
+      <Select
+        options={corporateUsers.map((x: User) => ({
+          value: x.id,
+          label: `${x.name} - ${x.email}`,
+        }))}
+        value={corporate ? { value: corporate.id, label: corporate.name } : null}
+        onChange={(value) => setCorporateId(value?.value!)}
+        styles={{
+          menuPortal: (base) => ({ ...base, zIndex: 9999 }),
+          option: (styles, state) => ({
+            ...styles,
+            backgroundColor: state.isFocused
+              ? "#D5D9F0"
+              : state.isSelected
+              ? "#7872BF"
+              : "white",
+            color: state.isFocused ? "black" : styles.color,
+          }),
+        }}
+      />
+      {groupsParticipants.map((u) => (
+        <Card user={u} key={u.id} />
+      ))}
+    </>
+  );
+};
+
+export default CorporateStudentsLevels;

src/dashboards/Teacher.tsx

@@ -2,11 +2,11 @@
 import Modal from "@/components/Modal";
 import useStats from "@/hooks/useStats";
 import useUsers from "@/hooks/useUsers";
-import {CorporateUser, Group, Stat, User} from "@/interfaces/user";
+import { CorporateUser, Group, Stat, User } from "@/interfaces/user";
 import UserList from "@/pages/(admin)/Lists/UserList";
-import {dateSorter} from "@/utils";
+import { dateSorter } from "@/utils";
 import moment from "moment";
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
 import {
   BsArrowLeft,
   BsArrowRepeat,
@@ -31,38 +31,43 @@ import {
 } from "react-icons/bs";
 import UserCard from "@/components/UserCard";
 import useGroups from "@/hooks/useGroups";
-import {calculateAverageLevel, calculateBandScore} from "@/utils/score";
+import { calculateAverageLevel, calculateBandScore } from "@/utils/score";
-import {MODULE_ARRAY} from "@/utils/moduleUtils";
+import { MODULE_ARRAY } from "@/utils/moduleUtils";
-import {Module} from "@/interfaces";
+import { Module } from "@/interfaces";
-import {groupByExam} from "@/utils/stats";
+import { groupByExam } from "@/utils/stats";
 import IconCard from "./IconCard";
 import GroupList from "@/pages/(admin)/Lists/GroupList";
 import useAssignments from "@/hooks/useAssignments";
-import {Assignment} from "@/interfaces/results";
+import { Assignment } from "@/interfaces/results";
 import AssignmentCard from "./AssignmentCard";
 import Button from "@/components/Low/Button";
 import clsx from "clsx";
 import ProgressBar from "@/components/Low/ProgressBar";
 import AssignmentCreator from "./AssignmentCreator";
 import AssignmentView from "./AssignmentView";
-import {getUserCorporate} from "@/utils/groups";
+import { getUserCorporate } from "@/utils/groups";
 
 interface Props {
   user: User;
 }
 
-export default function TeacherDashboard({user}: Props) {
+export default function TeacherDashboard({ user }: Props) {
   const [page, setPage] = useState("");
   const [selectedUser, setSelectedUser] = useState<User>();
   const [showModal, setShowModal] = useState(false);
   const [selectedAssignment, setSelectedAssignment] = useState<Assignment>();
   const [isCreatingAssignment, setIsCreatingAssignment] = useState(false);
-	const [corporateUserToShow, setCorporateUserToShow] = useState<CorporateUser>();
+  const [corporateUserToShow, setCorporateUserToShow] =
+    useState<CorporateUser>();
 
-	const {stats} = useStats();
+  const { stats } = useStats();
-	const {users, reload} = useUsers();
+  const { users, reload } = useUsers();
-	const {groups} = useGroups(user.id);
+  const { groups } = useGroups(user.id);
-	const {assignments, isLoading: isAssignmentsLoading, reload: reloadAssignments} = useAssignments({assigner: user.id});
+  const {
+    assignments,
+    isLoading: isAssignmentsLoading,
+    reload: reloadAssignments,
+  } = useAssignments({ assigner: user.id });
 
   useEffect(() => {
     setShowModal(!!selectedUser && page === "");
@@ -72,15 +77,23 @@ export default function TeacherDashboard({user}: Props) {
     getUserCorporate(user.id).then(setCorporateUserToShow);
   }, [user]);
 
-	const studentFilter = (user: User) => user.type === "student" && groups.flatMap((g) => g.participants).includes(user.id);
+  const studentFilter = (user: User) =>
+    user.type === "student" &&
+    groups.flatMap((g) => g.participants).includes(user.id);
 
-	const getStatsByStudent = (user: User) => stats.filter((s) => s.user === user.id);
+  const getStatsByStudent = (user: User) =>
+    stats.filter((s) => s.user === user.id);
 
   const UserDisplay = (displayUser: User) => (
     <div
       onClick={() => setSelectedUser(displayUser)}
-			className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300">
+      className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300"
-			<img src={displayUser.profilePicture} alt={displayUser.name} className="rounded-full w-10 h-10" />
+    >
+      <img
+        src={displayUser.profilePicture}
+        alt={displayUser.name}
+        className="rounded-full w-10 h-10"
+      />
       <div className="flex flex-col gap-1 items-start">
         <span>{displayUser.name}</span>
         <span className="text-sm opacity-75">{displayUser.email}</span>
@@ -99,35 +112,42 @@ export default function TeacherDashboard({user}: Props) {
         : groups.flatMap((g) => g.participants).includes(x.id));
 
     return (
-			<>
+      <UserList
+        user={user}
+        filters={[filter]}
+        renderHeader={(total) => (
           <div className="flex flex-col gap-4">
             <div
               onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+            >
               <BsArrowLeft className="text-xl" />
               <span>Back</span>
             </div>
-					<h2 className="text-2xl font-semibold">Students ({users.filter(filter).length})</h2>
+            <h2 className="text-2xl font-semibold">Students ({total})</h2>
           </div>
-
+        )}
-				<UserList user={user} filters={[filter]} />
+      />
-			</>
     );
   };
 
   const GroupsList = () => {
-		const filter = (x: Group) => x.admin === user.id || x.participants.includes(user.id);
+    const filter = (x: Group) =>
+      x.admin === user.id || x.participants.includes(user.id);
 
     return (
       <>
         <div className="flex flex-col gap-4">
           <div
             onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+          >
             <BsArrowLeft className="text-xl" />
             <span>Back</span>
           </div>
-					<h2 className="text-2xl font-semibold">Groups ({groups.filter(filter).length})</h2>
+          <h2 className="text-2xl font-semibold">
+            Groups ({groups.filter(filter).length})
+          </h2>
         </div>
 
         <GroupList user={user} />
@@ -137,14 +157,29 @@ export default function TeacherDashboard({user}: Props) {
 
   const averageLevelCalculator = (studentStats: Stat[]) => {
     const formattedStats = studentStats
-			.map((s) => ({focus: users.find((u) => u.id === s.user)?.focus, score: s.score, module: s.module}))
+      .map((s) => ({
+        focus: users.find((u) => u.id === s.user)?.focus,
+        score: s.score,
+        module: s.module,
+      }))
       .filter((f) => !!f.focus);
     const bandScores = formattedStats.map((s) => ({
       module: s.module,
-			level: calculateBandScore(s.score.correct, s.score.total, s.module, s.focus!),
+      level: calculateBandScore(
+        s.score.correct,
+        s.score.total,
+        s.module,
+        s.focus!
+      ),
     }));
 
-		const levels: {[key in Module]: number} = {reading: 0, listening: 0, writing: 0, speaking: 0, level: 0};
+    const levels: { [key in Module]: number } = {
+      reading: 0,
+      listening: 0,
+      writing: 0,
+      speaking: 0,
+      level: 0,
+    };
     bandScores.forEach((b) => (levels[b.module] += b.level));
 
     return calculateAverageLevel(levels);
@@ -152,10 +187,16 @@ export default function TeacherDashboard({user}: Props) {
 
   const AssignmentsPage = () => {
     const activeFilter = (a: Assignment) =>
-			moment(a.endDate).isAfter(moment()) && moment(a.startDate).isBefore(moment()) && a.assignees.length > a.results.length;
+      moment(a.endDate).isAfter(moment()) &&
-		const pastFilter = (a: Assignment) => (moment(a.endDate).isBefore(moment()) || a.assignees.length === a.results.length) && !a.archived;
+      moment(a.startDate).isBefore(moment()) &&
+      a.assignees.length > a.results.length;
+    const pastFilter = (a: Assignment) =>
+      (moment(a.endDate).isBefore(moment()) ||
+        a.assignees.length === a.results.length) &&
+      !a.archived;
     const archivedFilter = (a: Assignment) => a.archived;
-		const futureFilter = (a: Assignment) => moment(a.startDate).isAfter(moment());
+    const futureFilter = (a: Assignment) =>
+      moment(a.startDate).isAfter(moment());
 
     return (
       <>
@@ -170,7 +211,9 @@ export default function TeacherDashboard({user}: Props) {
         />
         <AssignmentCreator
           assignment={selectedAssignment}
-					groups={groups.filter((x) => x.admin === user.id || x.participants.includes(user.id))}
+          groups={groups.filter(
+            (x) => x.admin === user.id || x.participants.includes(user.id)
+          )}
           users={users.filter(
             (x) =>
               x.type === "student" &&
@@ -179,7 +222,7 @@ export default function TeacherDashboard({user}: Props) {
                     .filter((g) => g.admin === selectedUser.id)
                     .flatMap((g) => g.participants)
                     .includes(x.id) || false
-								: groups.flatMap((g) => g.participants).includes(x.id)),
+                : groups.flatMap((g) => g.participants).includes(x.id))
           )}
           assigner={user.id}
           isCreating={isCreatingAssignment}
@@ -192,31 +235,47 @@ export default function TeacherDashboard({user}: Props) {
         <div className="w-full flex justify-between items-center">
           <div
             onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+          >
             <BsArrowLeft className="text-xl" />
             <span>Back</span>
           </div>
           <div
             onClick={reloadAssignments}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+          >
             <span>Reload</span>
-						<BsArrowRepeat className={clsx("text-xl", isAssignmentsLoading && "animate-spin")} />
+            <BsArrowRepeat
+              className={clsx(
+                "text-xl",
+                isAssignmentsLoading && "animate-spin"
+              )}
+            />
           </div>
         </div>
         <section className="flex flex-col gap-4">
-					<h2 className="text-2xl font-semibold">Active Assignments ({assignments.filter(activeFilter).length})</h2>
+          <h2 className="text-2xl font-semibold">
+            Active Assignments ({assignments.filter(activeFilter).length})
+          </h2>
           <div className="flex flex-wrap gap-2">
             {assignments.filter(activeFilter).map((a) => (
-							<AssignmentCard {...a} onClick={() => setSelectedAssignment(a)} key={a.id} />
+              <AssignmentCard
+                {...a}
+                onClick={() => setSelectedAssignment(a)}
+                key={a.id}
+              />
             ))}
           </div>
         </section>
         <section className="flex flex-col gap-4">
-					<h2 className="text-2xl font-semibold">Planned Assignments ({assignments.filter(futureFilter).length})</h2>
+          <h2 className="text-2xl font-semibold">
+            Planned Assignments ({assignments.filter(futureFilter).length})
+          </h2>
           <div className="flex flex-wrap gap-2">
             <div
               onClick={() => setIsCreatingAssignment(true)}
-							className="w-[250px] h-[200px] flex flex-col gap-2 items-center justify-center bg-white hover:bg-mti-purple-ultralight text-mti-purple-light hover:text-mti-purple-dark border border-mti-gray-platinum hover:drop-shadow p-4 cursor-pointer rounded-xl transition ease-in-out duration-300">
+              className="w-[250px] h-[200px] flex flex-col gap-2 items-center justify-center bg-white hover:bg-mti-purple-ultralight text-mti-purple-light hover:text-mti-purple-dark border border-mti-gray-platinum hover:drop-shadow p-4 cursor-pointer rounded-xl transition ease-in-out duration-300"
+            >
               <BsPlus className="text-6xl" />
               <span className="text-lg">New Assignment</span>
             </div>
@@ -233,7 +292,9 @@ export default function TeacherDashboard({user}: Props) {
           </div>
         </section>
         <section className="flex flex-col gap-4">
-					<h2 className="text-2xl font-semibold">Past Assignments ({assignments.filter(pastFilter).length})</h2>
+          <h2 className="text-2xl font-semibold">
+            Past Assignments ({assignments.filter(pastFilter).length})
+          </h2>
           <div className="flex flex-wrap gap-2">
             {assignments.filter(pastFilter).map((a) => (
               <AssignmentCard
@@ -248,7 +309,9 @@ export default function TeacherDashboard({user}: Props) {
           </div>
         </section>
         <section className="flex flex-col gap-4">
-					<h2 className="text-2xl font-semibold">Archived Assignments ({assignments.filter(archivedFilter).length})</h2>
+          <h2 className="text-2xl font-semibold">
+            Archived Assignments ({assignments.filter(archivedFilter).length})
+          </h2>
           <div className="flex flex-wrap gap-2">
             {assignments.filter(archivedFilter).map((a) => (
               <AssignmentCard
@@ -270,14 +333,19 @@ export default function TeacherDashboard({user}: Props) {
     <>
       {corporateUserToShow && (
         <div className="absolute top-4 right-4 bg-neutral-200 px-2 rounded-lg py-1">
-					Linked to: <b>{corporateUserToShow?.corporateInformation?.companyInformation.name || corporateUserToShow.name}</b>
+          Linked to:{" "}
+          <b>
+            {corporateUserToShow?.corporateInformation?.companyInformation
+              .name || corporateUserToShow.name}
+          </b>
         </div>
       )}
       <section
         className={clsx(
           "flex -lg:flex-wrap gap-4 items-center -lg:justify-center lg:justify-start text-center",
-					!!corporateUserToShow && "mt-12 xl:mt-6",
+          !!corporateUserToShow && "mt-12 xl:mt-6"
-				)}>
+        )}
+      >
         <IconCard
           onClick={() => setPage("students")}
           Icon={BsPersonFill}
@@ -288,23 +356,40 @@ export default function TeacherDashboard({user}: Props) {
         <IconCard
           Icon={BsClipboard2Data}
           label="Exams Performed"
-					value={stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user)).length}
+          value={
+            stats.filter((s) =>
+              groups.flatMap((g) => g.participants).includes(s.user)
+            ).length
+          }
           color="purple"
         />
         <IconCard
           Icon={BsPaperclip}
           label="Average Level"
-					value={averageLevelCalculator(stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user))).toFixed(1)}
+          value={averageLevelCalculator(
+            stats.filter((s) =>
+              groups.flatMap((g) => g.participants).includes(s.user)
+            )
+          ).toFixed(1)}
           color="purple"
         />
-				<IconCard Icon={BsPeople} label="Groups" value={groups.length} color="purple" onClick={() => setPage("groups")} />
+        <IconCard
+          Icon={BsPeople}
+          label="Groups"
+          value={groups.length}
+          color="purple"
+          onClick={() => setPage("groups")}
+        />
         <div
           onClick={() => setPage("assignments")}
-					className="bg-white rounded-xl shadow p-4 flex flex-col gap-4 items-center w-96 h-52 justify-center cursor-pointer hover:shadow-xl transition ease-in-out duration-300">
+          className="bg-white rounded-xl shadow p-4 flex flex-col gap-4 items-center w-96 h-52 justify-center cursor-pointer hover:shadow-xl transition ease-in-out duration-300"
+        >
           <BsEnvelopePaper className="text-6xl text-mti-purple-light" />
           <span className="flex flex-col gap-1 items-center text-xl">
             <span className="text-lg">Assignments</span>
-						<span className="font-semibold text-mti-purple-light">{assignments.filter((a) => !a.archived).length}</span>
+            <span className="font-semibold text-mti-purple-light">
+              {assignments.filter((a) => !a.archived).length}
+            </span>
           </span>
         </div>
       </section>
@@ -326,7 +411,11 @@ export default function TeacherDashboard({user}: Props) {
           <div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
             {users
               .filter(studentFilter)
-							.sort((a, b) => calculateAverageLevel(b.levels) - calculateAverageLevel(a.levels))
+              .sort(
+                (a, b) =>
+                  calculateAverageLevel(b.levels) -
+                  calculateAverageLevel(a.levels)
+              )
               .map((x) => (
                 <UserDisplay key={x.id} {...x} />
               ))}
@@ -339,7 +428,8 @@ export default function TeacherDashboard({user}: Props) {
               .filter(studentFilter)
               .sort(
                 (a, b) =>
-									Object.keys(groupByExam(getStatsByStudent(b))).length - Object.keys(groupByExam(getStatsByStudent(a))).length,
+                  Object.keys(groupByExam(getStatsByStudent(b))).length -
+                  Object.keys(groupByExam(getStatsByStudent(a))).length
               )
               .map((x) => (
                 <UserDisplay key={x.id} {...x} />
@@ -363,9 +453,16 @@ export default function TeacherDashboard({user}: Props) {
                   if (shouldReload) reload();
                 }}
                 onViewStudents={
-									selectedUser.type === "corporate" || selectedUser.type === "teacher" ? () => setPage("students") : undefined
+                  selectedUser.type === "corporate" ||
+                  selectedUser.type === "teacher"
+                    ? () => setPage("students")
+                    : undefined
+                }
+                onViewTeachers={
+                  selectedUser.type === "corporate"
+                    ? () => setPage("teachers")
+                    : undefined
                 }
-								onViewTeachers={selectedUser.type === "corporate" ? () => setPage("teachers") : undefined}
                 user={selectedUser}
               />
             </div>

src/pages/(admin)/Lists/CodeList.tsx

@@ -14,9 +14,11 @@ import {
 } from "@tanstack/react-table";
 import axios from "axios";
 import moment from "moment";
-import { useEffect, useState } from "react";
+import { useEffect, useState, useMemo } from "react";
 import { BsTrash } from "react-icons/bs";
 import { toast } from "react-toastify";
+import ReactDatePicker from "react-datepicker";
+import clsx from "clsx";
 
 const columnHelper = createColumnHelper<Code>();
 
@@ -41,41 +43,51 @@ export default function CodeList({ user }: { user: User }) {
   const [selectedCodes, setSelectedCodes] = useState<string[]>([]);
 
   const [filteredCorporate, setFilteredCorporate] = useState<User | undefined>(
-    user?.type === "corporate" ? user : undefined,
+    user?.type === "corporate" ? user : undefined
   );
   const [filterAvailability, setFilterAvailability] = useState<
     "in-use" | "unused"
   >();
 
-  const [filteredCodes, setFilteredCodes] = useState<Code[]>([]);
+  // const [filteredCodes, setFilteredCodes] = useState<Code[]>([]);
 
   const { users } = useUsers();
   const { codes, reload } = useCodes(
-    user?.type === "corporate" ? user?.id : undefined,
+    user?.type === "corporate" ? user?.id : undefined
   );
 
-  useEffect(() => {
+  const [startDate, setStartDate] = useState<Date | null>(moment("01/01/2023").toDate());
-    let result = [...codes];
+	const [endDate, setEndDate] = useState<Date | null>(moment().endOf("day").toDate());
-    if (filteredCorporate)
+  const filteredCodes = useMemo(() => {
-      result = result.filter((x) => x.creator === filteredCorporate.id);
+    return codes.filter((x) => {
-    if (filterAvailability)
+      // TODO: if the expiry date is missing, it does not make sense to filter by date
-      result = result.filter((x) =>
+      // so we need to find a way to handle this edge case
-        filterAvailability === "in-use" ? !!x.userId : !x.userId,
+			if(startDate && endDate && x.expiryDate) {
-      );
+        const date = moment(x.expiryDate);
+        if(date.isBefore(startDate) || date.isAfter(endDate)) {
+          return false;
+        }
+      }
+      if (filteredCorporate && x.creator !== filteredCorporate.id) return false;
+      if (filterAvailability) {
+        if (filterAvailability === "in-use" && !x.userId) return false;
+        if (filterAvailability === "unused" && x.userId) return false;
+      }
 
-    setFilteredCodes(result);
+      return true;
-  }, [codes, filteredCorporate, filterAvailability]);
+    });
+  }, [codes, startDate, endDate, filteredCorporate, filterAvailability]);
 
   const toggleCode = (id: string) => {
     setSelectedCodes((prev) =>
-      prev.includes(id) ? prev.filter((x) => x !== id) : [...prev, id],
+      prev.includes(id) ? prev.filter((x) => x !== id) : [...prev, id]
     );
   };
 
   const toggleAllCodes = (checked: boolean) => {
     if (checked)
       return setSelectedCodes(
-        filteredCodes.filter((x) => !x.userId).map((x) => x.code),
+        filteredCodes.filter((x) => !x.userId).map((x) => x.code)
       );
 
     return setSelectedCodes([]);
@@ -137,7 +149,7 @@ export default function CodeList({ user }: { user: User }) {
 
   const defaultColumns = [
     columnHelper.accessor("code", {
-      id: "code",
+      id: "codeCheckbox",
       header: () => (
         <Checkbox
           disabled={filteredCodes.filter((x) => !x.userId).length === 0}
@@ -242,18 +254,20 @@ export default function CodeList({ user }: { user: User }) {
             }
             options={users
               .filter((x) =>
-                ["admin", "developer", "corporate"].includes(x.type),
+                ["admin", "developer", "corporate"].includes(x.type)
               )
               .map((x) => ({
-                label: `${x.type === "corporate" ? x.corporateInformation?.companyInformation?.name || x.name : x.name} (${
+                label: `${
-                  USER_TYPE_LABELS[x.type]
+                  x.type === "corporate"
-                })`,
+                    ? x.corporateInformation?.companyInformation?.name || x.name
+                    : x.name
+                } (${USER_TYPE_LABELS[x.type]})`,
                 value: x.id,
                 user: x,
               }))}
             onChange={(value) =>
               setFilteredCorporate(
-                value ? users.find((x) => x.id === value?.value) : undefined,
+                value ? users.find((x) => x.id === value?.value) : undefined
               )
             }
           />
@@ -267,10 +281,32 @@ export default function CodeList({ user }: { user: User }) {
             ]}
             onChange={(value) =>
               setFilterAvailability(
-                value ? (value.value as typeof filterAvailability) : undefined,
+                value ? (value.value as typeof filterAvailability) : undefined
               )
             }
           />
+          <ReactDatePicker
+            dateFormat="dd/MM/yyyy"
+            className="px-4 py-6 w-full text-sm text-center font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none"
+            selected={startDate}
+            startDate={startDate}
+            endDate={endDate}
+            selectsRange
+            showMonthDropdown
+            filterDate={(date: Date) =>
+              moment(date).isSameOrBefore(moment(new Date()))
+            }
+            onChange={([initialDate, finalDate]: [Date, Date]) => {
+              setStartDate(initialDate ?? moment("01/01/2023").toDate());
+              if (finalDate) {
+                // basicly selecting a final day works as if I'm selecting the first
+                // minute of that day. this way it covers the whole day
+                setEndDate(moment(finalDate).endOf("day").toDate());
+                return;
+              }
+              setEndDate(null);
+            }}
+          />
         </div>
         <div className="flex gap-4 items-center">
           <span>{selectedCodes.length} code(s) selected</span>
@@ -295,7 +331,7 @@ export default function CodeList({ user }: { user: User }) {
                     ? null
                     : flexRender(
                         header.column.columnDef.header,
-                        header.getContext(),
+                        header.getContext()
                       )}
                 </th>
               ))}

src/pages/list/users.tsx

@@ -1,20 +1,20 @@
 import Layout from "@/components/High/Layout";
 import useUser from "@/hooks/useUser";
 import useUsers from "@/hooks/useUsers";
-import {sessionOptions} from "@/lib/session";
+import { sessionOptions } from "@/lib/session";
 import useFilterStore from "@/stores/listFilterStore";
-import {withIronSessionSsr} from "iron-session/next";
+import { withIronSessionSsr } from "iron-session/next";
 import Head from "next/head";
-import {useRouter} from "next/router";
+import { useRouter } from "next/router";
-import {useEffect} from "react";
+import { useEffect } from "react";
-import {BsArrowLeft} from "react-icons/bs";
+import { BsArrowLeft } from "react-icons/bs";
-import {ToastContainer} from "react-toastify";
+import { ToastContainer } from "react-toastify";
 import UserList from "../(admin)/Lists/UserList";
 
-export const getServerSideProps = withIronSessionSsr(({req, res}) => {
+export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
   const user = req.session.user;
 
-	const envVariables: {[key: string]: string} = {};
+  const envVariables: { [key: string]: string } = {};
   Object.keys(process.env)
     .filter((x) => x.startsWith("NEXT_PUBLIC"))
     .forEach((x: string) => {
@@ -26,19 +26,22 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
       redirect: {
         destination: "/login",
         permanent: false,
-			}
+      },
     };
   }
 
   return {
-		props: {user: req.session.user, envVariables},
+    props: { user: req.session.user, envVariables },
   };
 }, sessionOptions);
 
 export default function UsersListPage() {
-	const {user} = useUser();
+  const { user } = useUser();
-	const {users} = useUsers();
+  const { users } = useUsers();
-	const [filters, clearFilters] = useFilterStore((state) => [state.userFilters, state.clearUserFilters]);
+  const [filters, clearFilters] = useFilterStore((state) => [
+    state.userFilters,
+    state.clearUserFilters,
+  ]);
   const router = useRouter();
 
   return (
@@ -56,20 +59,25 @@ export default function UsersListPage() {
 
       {user && (
         <Layout user={user}>
+          <UserList
+            user={user}
+            filters={filters.map((f) => f.filter)}
+            renderHeader={(total) => (
               <div className="flex flex-col gap-4">
                 <div
                   onClick={() => {
                     clearFilters();
                     router.back();
                   }}
-							className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+                  className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+                >
                   <BsArrowLeft className="text-xl" />
                   <span>Back</span>
                 </div>
-						<h2 className="text-2xl font-semibold">Users ({filters.map((f) => f.filter).reduce((d, f) => d.filter(f), users).length})</h2>
+                <h2 className="text-2xl font-semibold">Users ({total})</h2>
               </div>
-
+            )}
-					<UserList user={user} filters={filters.map((f) => f.filter)} />
+          />
         </Layout>
       )}
     </>

src/pages/record.tsx

@@ -1,32 +1,42 @@
 /* eslint-disable @next/next/no-img-element */
 import Head from "next/head";
-import {withIronSessionSsr} from "iron-session/next";
+import { withIronSessionSsr } from "iron-session/next";
-import {sessionOptions} from "@/lib/session";
+import { sessionOptions } from "@/lib/session";
-import {Stat, User} from "@/interfaces/user";
+import { Stat, User } from "@/interfaces/user";
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
 import useStats from "@/hooks/useStats";
-import {convertToUserSolutions, groupByDate} from "@/utils/stats";
+import { convertToUserSolutions, groupByDate } from "@/utils/stats";
 import moment from "moment";
 import useUsers from "@/hooks/useUsers";
 import useExamStore from "@/stores/examStore";
-import {Module} from "@/interfaces";
+import { Module } from "@/interfaces";
-import {ToastContainer} from "react-toastify";
+import { ToastContainer } from "react-toastify";
-import {useRouter} from "next/router";
+import { useRouter } from "next/router";
-import {uniqBy} from "lodash";
+import { uniqBy } from "lodash";
-import {getExamById} from "@/utils/exams";
+import { getExamById } from "@/utils/exams";
-import {sortByModule} from "@/utils/moduleUtils";
+import { sortByModule } from "@/utils/moduleUtils";
 import Layout from "@/components/High/Layout";
 import clsx from "clsx";
-import {calculateBandScore} from "@/utils/score";
+import { calculateBandScore } from "@/utils/score";
-import {BsBook, BsClipboard, BsClock, BsHeadphones, BsMegaphone, BsPen, BsPersonDash, BsPersonFillX, BsXCircle} from "react-icons/bs";
+import {
+  BsBook,
+  BsClipboard,
+  BsClock,
+  BsHeadphones,
+  BsMegaphone,
+  BsPen,
+  BsPersonDash,
+  BsPersonFillX,
+  BsXCircle,
+} from "react-icons/bs";
 import Select from "@/components/Low/Select";
 import useGroups from "@/hooks/useGroups";
-import {shouldRedirectHome} from "@/utils/navigation.disabled";
+import { shouldRedirectHome } from "@/utils/navigation.disabled";
 import useAssignments from "@/hooks/useAssignments";
-import {uuidv4} from "@firebase/util";
+import { uuidv4 } from "@firebase/util";
-import {usePDFDownload} from "@/hooks/usePDFDownload";
+import { usePDFDownload } from "@/hooks/usePDFDownload";
-
+import useRecordStore from "@/stores/recordStore";
-export const getServerSideProps = withIronSessionSsr(({req, res}) => {
+export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
   const user = req.session.user;
 
   if (!user || !user.isVerified) {
@@ -48,19 +58,32 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
   }
 
   return {
-		props: {user: req.session.user},
+    props: { user: req.session.user },
   };
 }, sessionOptions);
 
-export default function History({user}: {user: User}) {
+const defaultSelectableCorporate = {
-	const [statsUserId, setStatsUserId] = useState<string | undefined>(user.id);
+  value: "",
-	const [groupedStats, setGroupedStats] = useState<{[key: string]: Stat[]}>();
+  label: "All",
-	const [filter, setFilter] = useState<"months" | "weeks" | "days" | "assignments">();
+};
-	const {assignments} = useAssignments({});
 
-	const {users} = useUsers();
+export default function History({ user }: { user: User }) {
-	const {stats, isLoading: isStatsLoading} = useStats(statsUserId);
+  const [statsUserId, setStatsUserId] = useRecordStore((state) => [
-	const {groups} = useGroups(user.id);
+    state.selectedUser,
+    state.setSelectedUser,
+  ]);
+  // const [statsUserId, setStatsUserId] = useState<string | undefined>(user.id);
+  const [groupedStats, setGroupedStats] = useState<{ [key: string]: Stat[] }>();
+  const [filter, setFilter] = useState<
+    "months" | "weeks" | "days" | "assignments"
+  >();
+  const { assignments } = useAssignments({});
+
+  const { users } = useUsers();
+  const { stats, isLoading: isStatsLoading } = useStats(statsUserId);
+  const { groups: allGroups } = useGroups();
+
+  const groups = allGroups.filter((x) => x.admin === user.id);
 
   const setExams = useExamStore((state) => state.setExams);
   const setShowSolutions = useExamStore((state) => state.setShowSolutions);
@@ -83,36 +106,48 @@ export default function History({user}: {user: User}) {
             )
               return false;
             return true;
-					}),
+          })
-				),
+        )
       );
     }
   }, [stats, isStatsLoading]);
 
+  //   useEffect(() => {
+  //     // just set this initially
+  //     if (!statsUserId) setStatsUserId(user.id);
+  //   }, []);
+
   const toggleFilter = (value: "months" | "weeks" | "days" | "assignments") => {
     setFilter((prev) => (prev === value ? undefined : value));
   };
 
-	const filterStatsByDate = (stats: {[key: string]: Stat[]}) => {
+  const filterStatsByDate = (stats: { [key: string]: Stat[] }) => {
     if (filter && filter !== "assignments") {
       const filterDate = moment()
-				.subtract({[filter as string]: 1})
+        .subtract({ [filter as string]: 1 })
         .format("x");
-			const filteredStats: {[key: string]: Stat[]} = {};
+      const filteredStats: { [key: string]: Stat[] } = {};
 
       Object.keys(stats).forEach((timestamp) => {
-				if (timestamp >= filterDate) filteredStats[timestamp] = stats[timestamp];
+        if (timestamp >= filterDate)
+          filteredStats[timestamp] = stats[timestamp];
       });
 
       return filteredStats;
     }
 
     if (filter && filter === "assignments") {
-			const filteredStats: {[key: string]: Stat[]} = {};
+      const filteredStats: { [key: string]: Stat[] } = {};
 
       Object.keys(stats).forEach((timestamp) => {
-				if (stats[timestamp].map((s) => s.assignment === undefined).includes(false))
+        if (
-					filteredStats[timestamp] = [...stats[timestamp].filter((s) => !!s.assignment)];
+          stats[timestamp]
+            .map((s) => s.assignment === undefined)
+            .includes(false)
+        )
+          filteredStats[timestamp] = [
+            ...stats[timestamp].filter((s) => !!s.assignment),
+          ];
       });
 
       return filteredStats;
@@ -128,8 +163,12 @@ export default function History({user}: {user: User}) {
     return date.format(formatter);
   };
 
-	const aggregateScoresByModule = (stats: Stat[]): {module: Module; total: number; missing: number; correct: number}[] => {
+  const aggregateScoresByModule = (
-		const scores: {[key in Module]: {total: number; missing: number; correct: number}} = {
+    stats: Stat[]
+  ): { module: Module; total: number; missing: number; correct: number }[] => {
+    const scores: {
+      [key in Module]: { total: number; missing: number; correct: number };
+    } = {
       reading: {
         total: 0,
         correct: 0,
@@ -167,17 +206,28 @@ export default function History({user}: {user: User}) {
 
     return Object.keys(scores)
       .filter((x) => scores[x as Module].total > 0)
-			.map((x) => ({module: x as Module, ...scores[x as Module]}));
+      .map((x) => ({ module: x as Module, ...scores[x as Module] }));
   };
 
   const customContent = (timestamp: string) => {
     if (!groupedStats) return <></>;
 
     const dateStats = groupedStats[timestamp];
-		const correct = dateStats.reduce((accumulator, current) => accumulator + current.score.correct, 0);
+    const correct = dateStats.reduce(
-		const total = dateStats.reduce((accumulator, current) => accumulator + current.score.total, 0);
+      (accumulator, current) => accumulator + current.score.correct,
-		const aggregatedScores = aggregateScoresByModule(dateStats).filter((x) => x.total > 0);
+      0
-		const assignmentID = dateStats.reduce((_, current) => current.assignment as any, "");
+    );
+    const total = dateStats.reduce(
+      (accumulator, current) => accumulator + current.score.total,
+      0
+    );
+    const aggregatedScores = aggregateScoresByModule(dateStats).filter(
+      (x) => x.total > 0
+    );
+    const assignmentID = dateStats.reduce(
+      (_, current) => current.assignment as any,
+      ""
+    );
     const assignment = assignments.find((a) => a.id === assignmentID);
     const isDisabled = dateStats.some((x) => x.isDisabled);
 
@@ -186,11 +236,11 @@ export default function History({user}: {user: User}) {
       level: calculateBandScore(x.correct, x.total, x.module, user.focus),
     }));
 
-		const {timeSpent, inactivity, session} = dateStats[0];
+    const { timeSpent, inactivity, session } = dateStats[0];
 
     const selectExam = () => {
       const examPromises = uniqBy(dateStats, "exam").map((stat) => {
-				console.log({stat});
+        console.log({ stat });
         return getExamById(stat.module, stat.exam);
       });
 
@@ -206,7 +256,7 @@ export default function History({user}: {user: User}) {
             exams
               .map((x) => x!)
               .sort(sortByModule)
-							.map((x) => x!.module),
+              .map((x) => x!.module)
           );
           router.push("/exercises");
         }
@@ -216,7 +266,7 @@ export default function History({user}: {user: User}) {
     const textColor = clsx(
       correct / total >= 0.7 && "text-mti-purple",
       correct / total >= 0.3 && correct / total < 0.7 && "text-mti-red",
-			correct / total < 0.3 && "text-mti-rose",
+      correct / total < 0.3 && "text-mti-rose"
     );
 
     const content = (
@@ -226,12 +276,18 @@ export default function History({user}: {user: User}) {
             <span className="font-medium">{formatTimestamp(timestamp)}</span>
             <div className="flex items-center gap-2">
               {!!timeSpent && (
-								<span className="text-sm flex gap-2 items-center tooltip" data-tip="Time Spent">
+                <span
+                  className="text-sm flex gap-2 items-center tooltip"
+                  data-tip="Time Spent"
+                >
                   <BsClock /> {Math.floor(timeSpent / 60)} minutes
                 </span>
               )}
               {!!inactivity && (
-								<span className="text-sm flex gap-2 items-center tooltip" data-tip="Inactivity">
+                <span
+                  className="text-sm flex gap-2 items-center tooltip"
+                  data-tip="Inactivity"
+                >
                   <BsXCircle /> {Math.floor(inactivity / 60)} minutes
                 </span>
               )}
@@ -240,7 +296,12 @@ export default function History({user}: {user: User}) {
           <div className="flex flex-row gap-2">
             <span className={textColor}>
               Level{" "}
-							{(aggregatedLevels.reduce((accumulator, current) => accumulator + current.level, 0) / aggregatedLevels.length).toFixed(1)}
+              {(
+                aggregatedLevels.reduce(
+                  (accumulator, current) => accumulator + current.level,
+                  0
+                ) / aggregatedLevels.length
+              ).toFixed(1)}
             </span>
             {renderPdfIcon(session, textColor, textColor)}
           </div>
@@ -248,7 +309,7 @@ export default function History({user}: {user: User}) {
 
         <div className="w-full flex flex-col gap-1">
           <div className="grid grid-cols-4 gap-2 place-items-start w-full -md:mt-2">
-						{aggregatedLevels.map(({module, level}) => (
+            {aggregatedLevels.map(({ module, level }) => (
               <div
                 key={module}
                 className={clsx(
@@ -257,8 +318,9 @@ export default function History({user}: {user: User}) {
                   module === "listening" && "bg-ielts-listening",
                   module === "writing" && "bg-ielts-writing",
                   module === "speaking" && "bg-ielts-speaking",
-									module === "level" && "bg-ielts-level",
+                  module === "level" && "bg-ielts-level"
-								)}>
+                )}
+              >
                 {module === "reading" && <BsBook className="w-4 h-4" />}
                 {module === "listening" && <BsHeadphones className="w-4 h-4" />}
                 {module === "writing" && <BsPen className="w-4 h-4" />}
@@ -271,7 +333,8 @@ export default function History({user}: {user: User}) {
 
           {assignment && (
             <span className="font-light text-sm">
-							Assignment: {assignment.name}, Teacher: {users.find((u) => u.id === assignment.assigner)?.name}
+              Assignment: {assignment.name}, Teacher:{" "}
+              {users.find((u) => u.id === assignment.assigner)?.name}
             </span>
           )}
         </div>
@@ -286,12 +349,15 @@ export default function History({user}: {user: User}) {
             "flex flex-col justify-between gap-4 border border-mti-gray-platinum p-4 cursor-pointer rounded-xl transition ease-in-out duration-300 -md:hidden",
             isDisabled && "grayscale tooltip",
             correct / total >= 0.7 && "hover:border-mti-purple",
-						correct / total >= 0.3 && correct / total < 0.7 && "hover:border-mti-red",
+            correct / total >= 0.3 &&
-						correct / total < 0.3 && "hover:border-mti-rose",
+              correct / total < 0.7 &&
+              "hover:border-mti-red",
+            correct / total < 0.3 && "hover:border-mti-rose"
           )}
           onClick={isDisabled ? () => null : selectExam}
           data-tip="This exam is still being evaluated..."
-					role="button">
+          role="button"
+        >
           {content}
         </div>
         <div
@@ -299,17 +365,86 @@ export default function History({user}: {user: User}) {
           className={clsx(
             "flex flex-col gap-4 border border-mti-gray-platinum p-4 cursor-pointer rounded-xl transition ease-in-out duration-300 -md:tooltip md:hidden",
             correct / total >= 0.7 && "hover:border-mti-purple",
-						correct / total >= 0.3 && correct / total < 0.7 && "hover:border-mti-red",
+            correct / total >= 0.3 &&
-						correct / total < 0.3 && "hover:border-mti-rose",
+              correct / total < 0.7 &&
+              "hover:border-mti-red",
+            correct / total < 0.3 && "hover:border-mti-rose"
           )}
           data-tip="Your screen size is too small to view previous exams."
-					role="button">
+          role="button"
+        >
           {content}
         </div>
       </>
     );
   };
 
+  const selectableCorporates = [
+    defaultSelectableCorporate,
+    ...users
+      .filter((x) => x.type === "corporate")
+      .map((x) => ({
+        value: x.id,
+        label: `${x.name} - ${x.email}`,
+      })),
+  ];
+
+  const [selectedCorporate, setSelectedCorporate] = useState<string>(
+    defaultSelectableCorporate.value
+  );
+
+  const getUsersList = (): User[] => {
+    if (selectedCorporate) {
+      // get groups for that corporate
+      const selectedCorporateGroups = allGroups.filter(
+        (x) => x.admin === selectedCorporate
+      );
+
+      // get the teacher ids for that group
+      const selectedCorporateGroupsParticipants =
+        selectedCorporateGroups.flatMap((x) => x.participants);
+
+      //   // search for groups for these teachers
+      //   const teacherGroups = allGroups.filter((x) => {
+      //     return selectedCorporateGroupsParticipants.includes(x.admin);
+      //   });
+
+      //   const usersList = [
+      //     ...selectedCorporateGroupsParticipants,
+      //     ...teacherGroups.flatMap((x) => x.participants),
+      //   ];
+      const userListWithUsers = selectedCorporateGroupsParticipants.map((x) =>
+        users.find((y) => y.id === x)
+      ) as User[];
+      return userListWithUsers.filter((x) => x);
+    }
+
+    return users || [];
+  };
+
+  const corporateFilteredUserList = getUsersList();
+
+  const getSelectedUser = () => {
+    if (selectedCorporate) {
+      const userInCorporate = corporateFilteredUserList.find(
+        (x) => x.id === statsUserId
+      );
+      return userInCorporate || corporateFilteredUserList[0];
+    }
+
+    return users.find((x) => x.id === statsUserId) || user;
+  };
+
+  const selectedUser = getSelectedUser();
+  const selectedUserSelectValue = selectedUser
+    ? {
+        value: selectedUser.id,
+        label: `${selectedUser.name} - ${selectedUser.email}`,
+      }
+    : {
+        value: "",
+        label: "",
+      };
   return (
     <>
       <Head>
@@ -327,36 +462,90 @@ export default function History({user}: {user: User}) {
           <div className="w-full flex -xl:flex-col -xl:gap-4 justify-between items-center">
             <div className="xl:w-3/4">
               {(user.type === "developer" || user.type === "admin") && (
+                <>
+                  <label className="font-normal text-base text-mti-gray-dim">
+                    Corporate
+                  </label>
+
                   <Select
-									options={users.map((x) => ({value: x.id, label: `${x.name} - ${x.email}`}))}
+                    options={selectableCorporates}
-									defaultValue={{value: user.id, label: `${user.name} - ${user.email}`}}
+                    value={selectableCorporates.find(
-									onChange={(value) => setStatsUserId(value?.value)}
+                      (x) => x.value === selectedCorporate
+                    )}
+                    onChange={(value) =>
+                      setSelectedCorporate(value?.value || "")
+                    }
                     styles={{
-										menuPortal: (base) => ({...base, zIndex: 9999}),
+                      menuPortal: (base) => ({ ...base, zIndex: 9999 }),
                       option: (styles, state) => ({
                         ...styles,
-											backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
+                        backgroundColor: state.isFocused
+                          ? "#D5D9F0"
+                          : state.isSelected
+                          ? "#7872BF"
+                          : "white",
+                        color: state.isFocused ? "black" : styles.color,
+                      }),
+                    }}
+                  ></Select>
+                  <label className="font-normal text-base text-mti-gray-dim">
+                    User
+                  </label>
+
+                  <Select
+                    options={corporateFilteredUserList.map((x) => ({
+                      value: x.id,
+                      label: `${x.name} - ${x.email}`,
+                    }))}
+                    value={selectedUserSelectValue}
+                    onChange={(value) => setStatsUserId(value?.value)}
+                    styles={{
+                      menuPortal: (base) => ({ ...base, zIndex: 9999 }),
+                      option: (styles, state) => ({
+                        ...styles,
+                        backgroundColor: state.isFocused
+                          ? "#D5D9F0"
+                          : state.isSelected
+                          ? "#7872BF"
+                          : "white",
                         color: state.isFocused ? "black" : styles.color,
                       }),
                     }}
                   />
+                </>
               )}
-							{(user.type === "corporate" || user.type === "teacher") && groups.length > 0 && (
+              {(user.type === "corporate" || user.type === "teacher") &&
+                groups.length > 0 && (
+                  <>
+                    <label className="font-normal text-base text-mti-gray-dim">
+                      User
+                    </label>
+
                     <Select
                       options={users
-										.filter((x) => groups.flatMap((y) => y.participants).includes(x.id))
+                        .filter((x) =>
-										.map((x) => ({value: x.id, label: `${x.name} - ${x.email}`}))}
+                          groups.flatMap((y) => y.participants).includes(x.id)
-									defaultValue={{value: user.id, label: `${user.name} - ${user.email}`}}
+                        )
+                        .map((x) => ({
+                          value: x.id,
+                          label: `${x.name} - ${x.email}`,
+                        }))}
+                      value={selectedUserSelectValue}
                       onChange={(value) => setStatsUserId(value?.value)}
                       styles={{
-										menuPortal: (base) => ({...base, zIndex: 9999}),
+                        menuPortal: (base) => ({ ...base, zIndex: 9999 }),
                         option: (styles, state) => ({
                           ...styles,
-											backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
+                          backgroundColor: state.isFocused
+                            ? "#D5D9F0"
+                            : state.isSelected
+                            ? "#7872BF"
+                            : "white",
                           color: state.isFocused ? "black" : styles.color,
                         }),
                       }}
                     />
+                  </>
                 )}
             </div>
             <div className="flex gap-4 w-full justify-center xl:justify-end">
@@ -364,49 +553,59 @@ export default function History({user}: {user: User}) {
                 className={clsx(
                   "bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
                   "transition duration-300 ease-in-out",
-									filter === "assignments" && "!bg-mti-purple-light !text-white",
+                  filter === "assignments" && "!bg-mti-purple-light !text-white"
                 )}
-								onClick={() => toggleFilter("assignments")}>
+                onClick={() => toggleFilter("assignments")}
+              >
                 Assignments
               </button>
               <button
                 className={clsx(
                   "bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
                   "transition duration-300 ease-in-out",
-									filter === "months" && "!bg-mti-purple-light !text-white",
+                  filter === "months" && "!bg-mti-purple-light !text-white"
                 )}
-								onClick={() => toggleFilter("months")}>
+                onClick={() => toggleFilter("months")}
+              >
                 Last month
               </button>
               <button
                 className={clsx(
                   "bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
                   "transition duration-300 ease-in-out",
-									filter === "weeks" && "!bg-mti-purple-light !text-white",
+                  filter === "weeks" && "!bg-mti-purple-light !text-white"
                 )}
-								onClick={() => toggleFilter("weeks")}>
+                onClick={() => toggleFilter("weeks")}
+              >
                 Last week
               </button>
               <button
                 className={clsx(
                   "bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
                   "transition duration-300 ease-in-out",
-									filter === "days" && "!bg-mti-purple-light !text-white",
+                  filter === "days" && "!bg-mti-purple-light !text-white"
                 )}
-								onClick={() => toggleFilter("days")}>
+                onClick={() => toggleFilter("days")}
+              >
                 Last day
               </button>
             </div>
           </div>
-					{groupedStats && Object.keys(groupedStats).length > 0 && !isStatsLoading && (
+          {groupedStats &&
+            Object.keys(groupedStats).length > 0 &&
+            !isStatsLoading && (
               <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 w-full gap-4 xl:gap-6">
                 {Object.keys(filterStatsByDate(groupedStats))
                   .sort((a, b) => parseInt(b) - parseInt(a))
                   .map(customContent)}
               </div>
             )}
-					{groupedStats && Object.keys(groupedStats).length === 0 && !isStatsLoading && (
+          {groupedStats &&
-						<span className="font-semibold ml-1">No record to display...</span>
+            Object.keys(groupedStats).length === 0 &&
+            !isStatsLoading && (
+              <span className="font-semibold ml-1">
+                No record to display...
+              </span>
             )}
         </Layout>
       )}

src/pages/tickets.tsx

@@ -68,16 +68,40 @@ const SOURCE_OPTIONS = [
 	{value: "platform", label: "Platform"},
 ];
 
+type CustomStatus = TicketStatus | "all" | "pending";
+
+const STATUS_OPTIONS = [{
+	label: 'Pending',
+	value: 'pending',
+	filter: (x: Ticket) => x.status !== 'completed',
+}, {
+	label: 'All',
+	value: 'all',
+	filter: (x: Ticket) => true,
+}, {
+	label: 'Completed',
+	value: 'completed',
+	filter: (x: Ticket) => x.status === 'completed',
+}, {
+	label: 'In Progress',
+	value: 'in-progress',
+	filter: (x: Ticket) => x.status === 'in-progress',
+}, {
+	label: 'Submitted',
+	value: 'submitted',
+	filter: (x: Ticket) => x.status === 'submitted',
+}]
+
 export default function Tickets() {
 	const [filteredTickets, setFilteredTickets] = useState<Ticket[]>([]);
 	const [selectedTicket, setSelectedTicket] = useState<Ticket>();
 	const [assigneeFilter, setAssigneeFilter] = useState<string>();
 	const [sourceFilter, setSourceFilter] = useState<Source>("");
-
+	// const [statusFilter, setStatusFilter] = useState<CustomStatus>('pending');
 	const [dateSorting, setDateSorting] = useState<"asc" | "desc">("desc");
 
 	const [typeFilter, setTypeFilter] = useState<TicketType>();
-	const [statusFilter, setStatusFilter] = useState<TicketStatus>();
+	const [statusFilter, setStatusFilter] = useState<CustomStatus>('pending');
 
 	const {user} = useUser({redirectTo: "/login"});
 	const {users} = useUsers();
@@ -91,7 +115,10 @@ export default function Tickets() {
 		const filters = [];
 		if (user?.type === "agent") filters.push((x: Ticket) => x.assignedTo === user.id);
 		if (typeFilter) filters.push((x: Ticket) => x.type === typeFilter);
-		if (statusFilter) filters.push((x: Ticket) => x.status === statusFilter);
+		if (statusFilter) {
+			const filter = STATUS_OPTIONS.find(x => x.value === statusFilter)?.filter;
+			if (filter) filters.push(filter);
+		}
 		if (assigneeFilter) filters.push((x: Ticket) => x.assignedTo === assigneeFilter);
 		if (sourceFilter) {
 			if (sourceFilter === "webpage") filters.push((x: Ticket) => fromHomepage.some((r) => r.test(x.reportedFrom)));
@@ -214,17 +241,9 @@ export default function Tickets() {
 						<div className="flex w-full flex-col gap-3">
 							<label className="text-mti-gray-dim text-base font-normal">Status</label>
 							<Select
-								options={Object.keys(TicketStatusLabel).map((x) => ({
+								options={STATUS_OPTIONS}
-									value: x,
-									label: TicketStatusLabel[x as keyof typeof TicketStatusLabel],
-								}))}
 								value={
-									statusFilter
+									STATUS_OPTIONS.find((x) => x.value === statusFilter)
-										? {
-												value: statusFilter,
-												label: TicketStatusLabel[statusFilter],
-										  }
-										: undefined
 								}
 								onChange={(value) => setStatusFilter((value?.value as TicketStatus) ?? undefined)}
 								isClearable

src/stores/recordStore.ts

@@ -0,0 +1,18 @@
+
+import {create} from "zustand";
+
+export interface RecordState {
+	selectedUser?: string;
+	setSelectedUser: (selectedUser: string | undefined) => void;
+}
+
+export const initialState = {
+	selectedUser: undefined,
+};
+
+const recordStore = create<RecordState>((set) => ({
+	...initialState,
+    setSelectedUser: (selectedUser: string | undefined) => set(() => ({selectedUser})),
+}));
+
+export default recordStore;