{formatTimestamp(stats[0].date.toString())}
{timeSpent && (
<>
- •
+ •
{Math.floor(timeSpent / 60)} minutes
)}
diff --git a/src/dashboards/IconCard.tsx b/src/components/IconCard.tsx
similarity index 100%
rename from src/dashboards/IconCard.tsx
rename to src/components/IconCard.tsx
diff --git a/src/components/Medium/InviteCard.tsx b/src/components/Medium/InviteCard.tsx
index 9b3e0a20..98a89cdb 100644
--- a/src/components/Medium/InviteCard.tsx
+++ b/src/components/Medium/InviteCard.tsx
@@ -6,72 +6,68 @@ import { BsArrowRepeat } from "react-icons/bs";
import { toast } from "react-toastify";
interface Props {
- invite: Invite;
- users: User[];
- reload: () => void;
+ invite: Invite;
+ users: User[];
+ reload: () => void;
}
export default function InviteCard({ invite, users, reload }: Props) {
- const [isLoading, setIsLoading] = useState(false);
+ const [isLoading, setIsLoading] = useState(false);
- const inviter = users.find((u) => u.id === invite.from);
- const name = !inviter
- ? null
- : inviter.type === "corporate"
- ? inviter.corporateInformation?.companyInformation?.name || inviter.name
- : inviter.name;
+ const inviter = users.find((u) => u.id === invite.from);
+ const name = !inviter ? null : inviter.name;
- const decide = (decision: "accept" | "decline") => {
- if (!confirm(`Are you sure you want to ${decision} this invite?`)) return;
+ const decide = (decision: "accept" | "decline") => {
+ if (!confirm(`Are you sure you want to ${decision} this invite?`)) return;
- setIsLoading(true);
- axios
- .get(`/api/invites/${decision}/${invite.id}`)
- .then(() => {
- toast.success(
- `Successfully ${decision === "accept" ? "accepted" : "declined"} the invite!`,
- { toastId: "success" },
- );
- reload();
- })
- .catch((e) => {
- toast.success(`Something went wrong, please try again later!`, {
- toastId: "error",
- });
- reload();
- })
- .finally(() => setIsLoading(false));
- };
+ setIsLoading(true);
+ axios
+ .get(`/api/invites/${decision}/${invite.id}`)
+ .then(() => {
+ toast.success(
+ `Successfully ${decision === "accept" ? "accepted" : "declined"} the invite!`,
+ { toastId: "success" },
+ );
+ reload();
+ })
+ .catch((e) => {
+ toast.success(`Something went wrong, please try again later!`, {
+ toastId: "error",
+ });
+ reload();
+ })
+ .finally(() => setIsLoading(false));
+ };
- return (
- 
- {(user.type === "corporate" || user.type === "mastercorporate") && !!user.corporateInformation?.companyInformation?.name
- ? `${user.corporateInformation?.companyInformation.name} |`
- : ""}{" "}
{user.name} | {USER_TYPE_LABELS[user.type]}
{user.type === "corporate" &&
!!user.demographicInformation?.position &&
diff --git a/src/components/UserCard.tsx b/src/components/UserCard.tsx
index 977af621..dd90e5b1 100644
--- a/src/components/UserCard.tsx
+++ b/src/components/UserCard.tsx
@@ -1,15 +1,15 @@
import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
-import {CorporateInformation, CorporateUser, EMPLOYMENT_STATUS, User, Type, Stat, Gender} from "@/interfaces/user";
-import {groupBySession, averageScore} from "@/utils/stats";
-import {RadioGroup} from "@headlessui/react";
+import { CorporateInformation, CorporateUser, EMPLOYMENT_STATUS, User, Type, Stat, Gender } from "@/interfaces/user";
+import { groupBySession, averageScore } from "@/utils/stats";
+import { RadioGroup } from "@headlessui/react";
import axios from "axios";
import clsx from "clsx";
import moment from "moment";
-import {Divider} from "primereact/divider";
-import {useEffect, useState} from "react";
+import { Divider } from "primereact/divider";
+import { useEffect, useState } from "react";
import ReactDatePicker from "react-datepicker";
-import {BsFileEarmarkText, BsPencil, BsPerson, BsPersonAdd, BsStar} from "react-icons/bs";
-import {toast} from "react-toastify";
+import { BsFileEarmarkText, BsPencil, BsPerson, BsPersonAdd, BsStar } from "react-icons/bs";
+import { toast } from "react-toastify";
import Button from "./Low/Button";
import Checkbox from "./Low/Checkbox";
import CountrySelect from "./Low/CountrySelect";
@@ -17,12 +17,12 @@ import Input from "./Low/Input";
import ProfileSummary from "./ProfileSummary";
import Select from "react-select";
import useUsers from "@/hooks/useUsers";
-import {USER_TYPE_LABELS} from "@/resources/user";
-import {CURRENCIES} from "@/resources/paypal";
+import { USER_TYPE_LABELS } from "@/resources/user";
+import { CURRENCIES } from "@/resources/paypal";
import useCodes from "@/hooks/useCodes";
-import {checkAccess, getTypesOfUser} from "@/utils/permissions";
-import {PERMISSIONS} from "@/constants/userPermissions";
-import {PermissionType} from "@/interfaces/permissions";
+import { checkAccess, getTypesOfUser } from "@/utils/permissions";
+import { PERMISSIONS } from "@/constants/userPermissions";
+import { PermissionType } from "@/interfaces/permissions";
import usePermissions from "@/hooks/usePermissions";
const expirationDateColor = (date: Date) => {
@@ -68,7 +68,7 @@ const USER_TYPE_OPTIONS = Object.keys(USER_TYPE_LABELS).map((type) => ({
label: USER_TYPE_LABELS[type as keyof typeof USER_TYPE_LABELS],
}));
-const CURRENCIES_OPTIONS = CURRENCIES.map(({label, currency}) => ({
+const CURRENCIES_OPTIONS = CURRENCIES.map(({ label, currency }) => ({
value: currency,
label,
}));
@@ -100,9 +100,7 @@ const UserCard = ({
user.type === "corporate" || user.type === "mastercorporate" ? user.corporateInformation?.referralAgent : undefined,
);
const [companyName, setCompanyName] = useState(
- user.type === "corporate" || user.type === "mastercorporate"
- ? user.corporateInformation?.companyInformation.name
- : user.type === "agent"
+ user.type === "agent"
? user.agentInformation?.companyName
: undefined,
);
@@ -110,25 +108,19 @@ const UserCard = ({
const [commercialRegistration, setCommercialRegistration] = useState(
user.type === "agent" ? user.agentInformation?.commercialRegistration : undefined,
);
- const [userAmount, setUserAmount] = useState(
- user.type === "corporate" || user.type === "mastercorporate" ? user.corporateInformation?.companyInformation.userAmount : undefined,
- );
const [paymentValue, setPaymentValue] = useState(
user.type === "corporate" || user.type === "mastercorporate" ? user.corporateInformation?.payment?.value : undefined,
);
const [paymentCurrency, setPaymentCurrency] = useState(
user.type === "corporate" || user.type === "mastercorporate" ? user.corporateInformation?.payment?.currency : "EUR",
);
- const [monthlyDuration, setMonthlyDuration] = useState(
- user.type === "corporate" || user.type === "mastercorporate" ? user.corporateInformation?.monthlyDuration : undefined,
- );
const [commissionValue, setCommission] = useState(
user.type === "corporate" || user.type === "mastercorporate" ? user.corporateInformation?.payment?.commission : undefined,
);
- const {data: stats} = useFilterRecordsByUser(user.id);
- const {users} = useUsers();
- const {codes} = useCodes(user.id);
- const {permissions} = usePermissions(loggedInUser.id);
+ const { data: stats } = useFilterRecordsByUser(user.id);
+ const { users } = useUsers();
+ const { codes } = useCodes(user.id);
+ const { permissions } = usePermissions(loggedInUser.id);
useEffect(() => {
if (users && users.length > 0) {
@@ -153,7 +145,7 @@ const UserCard = ({
if (!confirm(`Are you sure you want to update ${user.name}'s account?`)) return;
axios
- .post<{user?: User; ok?: boolean}>(`/api/users/update?id=${user.id}`, {
+ .post<{ user?: User; ok?: boolean }>(`/api/users/update?id=${user.id}`, {
...user,
subscriptionExpirationDate: expiryDate,
studentID,
@@ -167,26 +159,21 @@ const UserCard = ({
agentInformation:
type === "agent"
? {
- companyName,
- commercialRegistration,
- arabName,
- }
+ companyName,
+ commercialRegistration,
+ arabName,
+ }
: undefined,
corporateInformation:
type === "corporate" || type === "mastercorporate"
? {
- referralAgent,
- monthlyDuration,
- companyInformation: {
- name: companyName,
- userAmount,
- },
- payment: {
- value: paymentValue,
- currency: paymentCurrency,
- ...(referralAgent === "" ? {} : {commission: commissionValue}),
- },
- }
+ referralAgent,
+ payment: {
+ value: paymentValue,
+ currency: paymentCurrency,
+ ...(referralAgent === "" ? {} : { commission: commissionValue }),
+ },
+ }
: undefined,
})
.then(() => {
@@ -194,7 +181,7 @@ const UserCard = ({
onClose(true);
})
.catch(() => {
- toast.error("Something went wrong!", {toastId: "update-error"});
+ toast.error("Something went wrong!", { toastId: "update-error" });
});
};
@@ -216,31 +203,16 @@ const UserCard = ({
},
];
- const corporateProfileItems =
- user.type === "corporate" || user.type === "mastercorporate"
- ? [
- {
- icon:
- Invited by {name}
-
- );
+ return (
+
-
-
-
-
+ Invited by {name}
+
+ );
}
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index 949257b5..f2bc5a42 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -1,25 +1,25 @@
-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 {useRouter} from "next/router";
-import {BsList, BsQuestionCircle, BsQuestionCircleFill} from "react-icons/bs";
+import { preventNavigation } from "@/utils/navigation.disabled";
+import { useRouter } from "next/router";
+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 {Type} from "@/interfaces/user";
-import {USER_TYPE_LABELS} from "@/resources/user";
+import { useEffect, useState } from "react";
+import { Type } from "@/interfaces/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 { Module } from "@/interfaces";
import Badge from "./Low/Badge";
-import {BsArrowRepeat, BsBook, BsCheck, BsCheckCircle, BsClipboard, BsHeadphones, BsMegaphone, BsPen, BsXCircle} from "react-icons/bs";
+import { BsArrowRepeat, BsBook, BsCheck, BsCheckCircle, BsClipboard, BsHeadphones, BsMegaphone, BsPen, BsXCircle } from "react-icons/bs";
interface Props {
user: User;
navDisabled?: boolean;
@@ -29,7 +29,7 @@ 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);
@@ -109,9 +109,8 @@ export default function Navbar({user, path, navDisabled = false, focusMode = fal
badges.map((badge) => (
+
+
+
+
+ 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()}
))}
@@ -145,9 +144,6 @@ export default function Navbar({user, path, navDisabled = false, focusMode = fal
-
- setUserAmount(e ? parseInt(e) : undefined)}
- placeholder="Enter number of users"
- defaultValue={userAmount}
- disabled={
- disabled ||
- checkAccess(
- loggedInUser,
- getTypesOfUser(["developer", "admin", ...((user.type === "corporate" ? ["mastercorporate"] : []) as Type[])]),
- )
- }
- />
- setMonthlyDuration(e ? parseInt(e) : undefined)}
- placeholder="Enter monthly duration"
- defaultValue={monthlyDuration}
- disabled={disabled || checkAccess(loggedInUser, getTypesOfUser(["developer", "admin"]))}
- />
@@ -346,7 +276,7 @@ const UserCard = ({
onChange={(value) => setPaymentCurrency(value?.value)}
menuPortalTarget={document?.body}
styles={{
- menuPortal: (base) => ({...base, zIndex: 9999}),
+ menuPortal: (base) => ({ ...base, zIndex: 9999 }),
control: (styles) => ({
...styles,
paddingLeft: "4px",
@@ -375,10 +305,10 @@ const UserCard = ({
className={clsx(
"px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool bg-white rounded-full border border-mti-gray-platinum focus:outline-none",
(checkAccess(loggedInUser, getTypesOfUser(["developer", "admin"])) || disabledFields.countryManager) &&
- "!bg-mti-gray-platinum/40 !text-mti-gray-dim cursor-not-allowed",
+ "!bg-mti-gray-platinum/40 !text-mti-gray-dim cursor-not-allowed",
)}
options={[
- {value: "", label: "No referral"},
+ { value: "", label: "No referral" },
...users
.filter((u) => u.type === "agent")
.map((x) => ({
@@ -393,7 +323,7 @@ const UserCard = ({
menuPortalTarget={document?.body}
onChange={(value) => setReferralAgent(value?.value)}
styles={{
- menuPortal: (base) => ({...base, zIndex: 9999}),
+ menuPortal: (base) => ({ ...base, zIndex: 9999 }),
control: (styles) => ({
...styles,
paddingLeft: "4px",
@@ -505,9 +435,9 @@ const UserCard = ({
value={user.demographicInformation?.employment}
className="grid grid-cols-2 items-center gap-4 place-items-center"
disabled={disabled}>
- {EMPLOYMENT_STATUS.map(({status, label}) => (
+ {EMPLOYMENT_STATUS.map(({ status, label }) => (
- {({checked}) => (
+ {({ checked }) => (
- {({checked}) => (
+ {({ checked }) => (
- {({checked}) => (
+ {({ checked }) => (
- {({checked}) => (
+ {({ checked }) => (
-
-
-
-
-
- )}
+
+ )}
diff --git a/src/dashboards/Admin.tsx b/src/dashboards/Admin.tsx
deleted file mode 100644
index 656a4377..00000000
--- a/src/dashboards/Admin.tsx
+++ /dev/null
@@ -1,647 +0,0 @@
-/* eslint-disable @next/next/no-img-element */
-import Modal from "@/components/Modal";
-import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
-import useUsers from "@/hooks/useUsers";
-import {Stat, User} from "@/interfaces/user";
-import UserList from "@/pages/(admin)/Lists/UserList";
-import {dateSorter} from "@/utils";
-import moment from "moment";
-import {useEffect, useState} from "react";
-import {
- BsArrowLeft,
- BsBriefcaseFill,
- BsGlobeCentralSouthAsia,
- BsPerson,
- BsPersonFill,
- BsPencilSquare,
- BsBank,
- BsCurrencyDollar,
- BsLayoutWtf,
- BsLayoutSidebar,
-} from "react-icons/bs";
-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 usePaymentStatusUsers from "@/hooks/usePaymentStatusUsers";
-import CorporateStudentsLevels from "./CorporateStudentsLevels";
-
-interface Props {
- user: User;
-}
-
-const studentHash = {
- type: "student",
- size: 25,
- orderBy: "registrationDate",
-};
-
-const teacherHash = {
- type: "teacher",
- size: 25,
- orderBy: "registrationDate",
-};
-
-const corporateHash = {
- type: "corporate",
- size: 25,
- orderBy: "registrationDate",
-};
-
-const agentsHash = {
- type: "agent",
- size: 25,
- orderBy: "registrationDate",
-};
-
-export default function AdminDashboard({user}: Props) {
- const [page, setPage] = useState("");
- const [selectedUser, setSelectedUser] = useState();
- const [showModal, setShowModal] = useState(false);
-
- const {users: students, total: totalStudents, reload: reloadStudents, isLoading: isStudentsLoading} = useUsers(studentHash);
- const {users: teachers, total: totalTeachers, reload: reloadTeachers, isLoading: isTeachersLoading} = useUsers(teacherHash);
- const {users: corporates, total: totalCorporate, reload: reloadCorporates, isLoading: isCorporatesLoading} = useUsers(corporateHash);
- const {users: agents, total: totalAgents, reload: reloadAgents, isLoading: isAgentsLoading} = useUsers(agentsHash);
-
- const {groups} = useGroups({});
- const {pending, done} = usePaymentStatusUsers();
-
- const appendUserFilters = useFilterStore((state) => state.appendUserFilter);
- const router = useRouter();
-
- useEffect(() => {
- setShowModal(!!selectedUser && router.asPath === "/#");
- }, [selectedUser, router.asPath]);
-
- const inactiveCountryManagerFilter = (x: User) => x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate);
-
- const UserDisplay = (displayUser: User) => (
- (
- (
- (
- (
- (
- (
- (
- (
-
- router.push("/#students")}
- color="purple"
- />
- router.push("/#teachers")}
- color="purple"
- />
- router.push("/#corporate")}
- color="purple"
- />
- router.push("/#agents")}
- color="purple"
- />
- x.demographicInformation).map((x) => x.demographicInformation?.country))].length}
- color="purple"
- />
- router.push("/#inactiveStudents")}
- Icon={BsPersonFill}
- isLoading={isStudentsLoading}
- label="Inactive Students"
- value={
- students.filter((x) => x.type === "student" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate)))
- .length
- }
- color="rose"
- />
- router.push("/#inactiveCountryManagers")}
- Icon={BsBriefcaseFill}
- isLoading={isAgentsLoading}
- label="Inactive Country Managers"
- value={agents.filter(inactiveCountryManagerFilter).length}
- color="rose"
- />
- router.push("/#inactiveCorporate")}
- Icon={BsBank}
- isLoading={isCorporatesLoading}
- label="Inactive Corporate"
- value={
- corporates.filter(
- (x) => x.type === "corporate" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate)),
- ).length
- }
- color="rose"
- />
- router.push("/#paymentdone")}
- Icon={BsCurrencyDollar}
- label="Payment Done"
- value={done.length}
- color="purple"
- />
- router.push("/#paymentpending")}
- Icon={BsCurrencyDollar}
- label="Pending Payment"
- value={pending.length}
- color="rose"
- />
- router.push("https://cms.encoach.com/admin")}
- Icon={BsLayoutSidebar}
- label="Content Management System (CMS)"
- color="green"
- />
- router.push("/#corporatestudentslevels")}
- Icon={BsPersonFill}
- isLoading={isStudentsLoading}
- label="Corporate Students Levels"
- color="purple"
- />
-
-
-
-
-
- );
-
- return (
- <>
- setSelectedUser(undefined)}>
- <>
- {selectedUser && (
-
- {router.asPath === "/#students" && ();
- const [showModal, setShowModal] = useState(false);
-
- const {data: stats} = useFilterRecordsByUser();
- const {users, reload} = useUsers();
- const {pending, done} = usePaymentStatusUsers();
-
- useEffect(() => {
- setShowModal(!!selectedUser && page === "");
- }, [selectedUser, page]);
-
- const corporateFilter = (user: User) => user.type === "corporate";
- const referredCorporateFilter = (x: User) =>
- x.type === "corporate" && !!x.corporateInformation && x.corporateInformation.referralAgent === user.id;
- const inactiveReferredCorporateFilter = (x: User) =>
- referredCorporateFilter(x) && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
-
- const UserDisplay = ({displayUser, allowClick = true}: {displayUser: User; allowClick?: boolean}) => (
- (
- (
- (
- (
-
- setPage("referredCorporate")}
- Icon={BsBank}
- label="Referred Corporate"
- value={users.filter(referredCorporateFilter).length}
- color="purple"
- />
- setPage("inactiveReferredCorporate")}
- Icon={BsBank}
- label="Inactive Referred Corporate"
- value={users.filter(inactiveReferredCorporateFilter).length}
- color="rose"
- />
- setPage("corporate")}
- Icon={BsBank}
- label="Corporate"
- value={users.filter(corporateFilter).length}
- color="purple"
- />
- setPage("paymentdone")} Icon={BsCurrencyDollar} label="Payment Done" value={done.length} color="purple" />
- setPage("paymentpending")}
- Icon={BsCurrencyDollar}
- label="Pending Payment"
- value={pending.length}
- color="rose"
- />
-
-
-
-
-
- );
-
- return (
- <>
- setSelectedUser(undefined)}>
- <>
- {selectedUser && (
-
- {page === "referredCorporate" && (assignment?.exams.map((e) => e.module) || []);
- const [assignees, setAssignees] = useState(assignment?.assignees || []);
- const [teachers, setTeachers] = useState(!!assignment ? assignment.teachers || [] : [...(user.type === "teacher" ? [user.id] : [])]);
- const [name, setName] = useState(
- assignment?.name ||
- generate({
- minLength: 6,
- maxLength: 8,
- min: 2,
- max: 3,
- join: " ",
- formatter: capitalize,
- }),
- );
- const [isLoading, setIsLoading] = useState(false);
- const [startDate, setStartDate] = useState(assignment ? moment(assignment.startDate).toDate() : moment().add(1, "hour").toDate());
-
- const [endDate, setEndDate] = useState(
- assignment ? moment(assignment.endDate).toDate() : moment().hours(23).minutes(59).add(8, "day").toDate(),
- );
- const [variant, setVariant] = useState("full");
- const [instructorGender, setInstructorGender] = useState(assignment?.instructorGender || "varied");
- // creates a new exam for each assignee or just one exam for all assignees
- const [generateMultiple, setGenerateMultiple] = useState(false);
- const [released, setReleased] = useState(assignment?.released || false);
-
- const [autoStart, setAutostart] = useState(assignment?.autoStart || false);
-
- const [useRandomExams, setUseRandomExams] = useState(true);
- const [examIDs, setExamIDs] = useState<{ id: string; module: Module }[]>([]);
-
- const { exams } = useExams();
-
- const userStudents = useMemo(() => users.filter((x) => x.type === "student"), [users]);
- const userTeachers = useMemo(() => users.filter((x) => x.type === "teacher"), [users]);
-
- const { rows: filteredStudentsRows, renderSearch: renderStudentSearch, text: studentText } = useListSearch([["name"], ["email"]], userStudents);
- const { rows: filteredTeachersRows, renderSearch: renderTeacherSearch, text: teacherText } = useListSearch([["name"], ["email"]], userTeachers);
-
- useEffect(() => setStudentsPage(0), [studentText]);
- const studentRows = useMemo(
- () =>
- filteredStudentsRows.slice(
- studentsPage * SIZE,
- (studentsPage + 1) * SIZE > filteredStudentsRows.length ? filteredStudentsRows.length : (studentsPage + 1) * SIZE,
- ),
- [filteredStudentsRows, studentsPage],
- );
-
- useEffect(() => setTeachersPage(0), [teacherText]);
- const teacherRows = useMemo(
- () =>
- filteredTeachersRows.slice(
- teachersPage * SIZE,
- (teachersPage + 1) * SIZE > filteredTeachersRows.length ? filteredTeachersRows.length : (teachersPage + 1) * SIZE,
- ),
- [filteredTeachersRows, teachersPage],
- );
-
- useEffect(() => {
- setExamIDs((prev) => prev.filter((x) => selectedModules.includes(x.module)));
- }, [selectedModules]);
-
- const toggleModule = (module: Module) => {
- const modules = selectedModules.filter((x) => x !== module);
- setSelectedModules((prev) => (prev.includes(module) ? modules : [...modules, module]));
- };
-
- const toggleAssignee = (user: User) => {
- setAssignees((prev) => (prev.includes(user.id) ? prev.filter((a) => a !== user.id) : [...prev, user.id]));
- };
-
- const toggleTeacher = (user: User) => {
- setTeachers((prev) => (prev.includes(user.id) ? prev.filter((a) => a !== user.id) : [...prev, user.id]));
- };
-
- const createAssignment = () => {
- setIsLoading(true);
-
- (assignment ? axios.patch : axios.post)(`/api/assignments${assignment ? `/${assignment.id}` : ""}`, {
- assignees,
- name,
- startDate,
- examIDs: !useRandomExams ? examIDs : undefined,
- endDate,
- selectedModules,
- generateMultiple,
- teachers,
- variant,
- instructorGender,
- released,
- autoStart,
- })
- .then(() => {
- toast.success(`The assignment "${name}" has been ${assignment ? "updated" : "created"} successfully!`);
- cancelCreation();
- })
- .catch((e) => {
- console.log(e);
- toast.error("Something went wrong, please try again later!");
- })
- .finally(() => setIsLoading(false));
- };
-
- const deleteAssignment = () => {
- if (assignment) {
- setIsLoading(true);
-
- if (!confirm(`Are you sure you want to delete the "${assignment.name}" assignment?`)) return;
- axios
- .delete(`api/assignments/${assignment.id}`)
- .then(() => {
- toast.success(`The assignment "${name}" has been deleted successfully!`);
- cancelCreation();
- })
- .catch((e) => {
- console.log(e);
- toast.error("Something went wrong, please try again later!");
- })
- .finally(() => setIsLoading(false));
- }
- };
-
- const startAssignment = () => {
- if (assignment) {
- setIsLoading(true);
-
- axios
- .post(`/api/assignments/${assignment.id}/start`)
- .then(() => {
- toast.success(`The assignment "${name}" has been started successfully!`);
- cancelCreation();
- })
- .catch((e) => {
- console.log(e);
- toast.error("Something went wrong, please try again later!");
- })
- .finally(() => setIsLoading(false));
- }
- };
-
- return (
-
-
- );
-}
diff --git a/src/dashboards/Corporate/MasterStatisticalPage.tsx b/src/dashboards/Corporate/MasterStatisticalPage.tsx
deleted file mode 100644
index 14420ae4..00000000
--- a/src/dashboards/Corporate/MasterStatisticalPage.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import useUsers, {userHashStudent, userHashTeacher} from "@/hooks/useUsers";
-import {CorporateUser, User} from "@/interfaces/user";
-import {useRouter} from "next/router";
-import {useMemo} from "react";
-import {BsArrowLeft} from "react-icons/bs";
-import MasterStatistical from "../MasterCorporate/MasterStatistical";
-
-interface Props {
- user: CorporateUser;
-}
-
-const MasterStatisticalPage = ({user}: Props) => {
- const {users: students} = useUsers(userHashStudent);
- const {users: teachers} = useUsers(userHashTeacher);
-
- // this workaround will allow us toreuse the master statistical due to master corporate restraints
- // while still being able to use the corporate user
- const groupedByNameCorporateIds = useMemo(
- () => ({
- [user.corporateInformation?.companyInformation?.name || user.name]: [user.id],
- }),
- [user],
- );
-
- const teachersAndStudents = useMemo(() => [...students, ...teachers], [students, teachers]);
-
- const router = useRouter();
-
- return (
- <>
- ();
-
- const columns = [
- columnHelper.accessor("name", {
- header: "Student Name",
- cell: (info) => info.getValue(),
- }),
- columnHelper.accessor("email", {
- header: "E-mail",
- cell: (info) => info.getValue(),
- }),
- columnHelper.accessor("demographicInformation.passport_id", {
- header: "ID",
- cell: (info) => info.getValue() || "N/A",
- }),
- columnHelper.accessor("group", {
- header: "Group",
- cell: (info) => info.getValue(),
- }),
- columnHelper.accessor("corporateName", {
- header: "Corporate",
- cell: (info) => info.getValue() || "N/A",
- }),
- columnHelper.accessor("levels.reading", {
- header: "Reading",
- cell: (info) =>
- !isShowingAmount
- ? info.getValue() || 0
- : `${Object.keys(groupByExam(stats.filter((x) => x.module === "reading" && x.user === info.row.original.id))).length} exams`,
- }),
- columnHelper.accessor("levels.listening", {
- header: "Listening",
- cell: (info) =>
- !isShowingAmount
- ? info.getValue() || 0
- : `${Object.keys(groupByExam(stats.filter((x) => x.module === "listening" && x.user === info.row.original.id))).length} exams`,
- }),
- columnHelper.accessor("levels.writing", {
- header: "Writing",
- cell: (info) =>
- !isShowingAmount
- ? info.getValue() || 0
- : `${Object.keys(groupByExam(stats.filter((x) => x.module === "writing" && x.user === info.row.original.id))).length} exams`,
- }),
- columnHelper.accessor("levels.speaking", {
- header: "Speaking",
- cell: (info) =>
- !isShowingAmount
- ? info.getValue() || 0
- : `${Object.keys(groupByExam(stats.filter((x) => x.module === "speaking" && x.user === info.row.original.id))).length} exams`,
- }),
- columnHelper.accessor("levels.level", {
- header: "Level",
- cell: (info) =>
- !isShowingAmount
- ? info.getValue() || 0
- : `${Object.keys(groupByExam(stats.filter((x) => x.module === "level" && x.user === info.row.original.id))).length} exams`,
- }),
- columnHelper.accessor("levels", {
- id: "overall_level",
- header: "Overall",
- cell: (info) =>
- !isShowingAmount
- ? averageLevelCalculator(
- users,
- stats.filter((x) => x.user === info.row.original.id),
- ).toFixed(1)
- : `${Object.keys(groupByExam(stats.filter((x) => x.user === info.row.original.id))).length} exams`,
- }),
- ];
-
- return (
- ();
-
- const router = useRouter();
-
- const performanceStudents = students.map((u) => ({
- ...u,
- group: groups.find((x) => x.participants.includes(u.id))?.name || "N/A",
- corporateName: getUserCompanyName(user, [], groups),
- }));
-
- return (
- <>
- ();
- const [showModal, setShowModal] = useState(false);
-
- const {data: stats} = useFilterRecordsByUser();
- const {groups} = useGroups({admin: user.id});
- const {assignments, isLoading: isAssignmentsLoading, reload: reloadAssignments} = useAssignments({corporate: user.id});
- const {balance} = useUserBalance();
-
- const {users: students, total: totalStudents, reload: reloadStudents, isLoading: isStudentsLoading} = useUsers(studentHash);
- const {users: teachers, total: totalTeachers, reload: reloadTeachers, isLoading: isTeachersLoading} = useUsers(teacherHash);
-
- const appendUserFilters = useFilterStore((state) => state.appendUserFilter);
- const router = useRouter();
-
- const assignmentsGroups = useMemo(() => groups.filter((x) => x.admin === user.id || x.participants.includes(user.id)), [groups, user.id]);
-
- useEffect(() => {
- setShowModal(!!selectedUser && router.asPath === "/#");
- }, [selectedUser, router.asPath]);
-
- const getStatsByStudent = (user: User) => stats.filter((s) => s.user === user.id);
-
- const UserDisplay = (displayUser: User) => (
- (
- (
- router.push("/")}
- />
- );
-
- if (router.asPath === "/#statistical") return setSelectedUser(undefined)}>
- <>
- {selectedUser && (
-
-
- <>
- {!!linkedCorporate && (
-
- router.push("/#students")}
- isLoading={isStudentsLoading}
- Icon={BsPersonFill}
- label="Students"
- value={totalStudents}
- color="purple"
- />
- router.push("/#teachers")}
- isLoading={isTeachersLoading}
- Icon={BsPencilSquare}
- label="Teachers"
- value={totalTeachers}
- color="purple"
- />
- groups.flatMap((g) => g.participants).includes(s.user)).length}
- color="purple"
- />
- groups.flatMap((g) => g.participants).includes(s.user))).toFixed(1)}
- color="purple"
- />
- router.push("/#groups")} Icon={BsPeople} label="Groups" value={groups.length} color="purple" />
- router.push("/#studentsPerformance")}
- />
- router.push("/#statistical")} />
-
-
-
-
-
-
-
- );
-}
diff --git a/src/dashboards/CorporateStudentsLevels.tsx b/src/dashboards/CorporateStudentsLevels.tsx
deleted file mode 100644
index 203b3caf..00000000
--- a/src/dashboards/CorporateStudentsLevels.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import React, {useMemo} from "react";
-import useUsers, { userHashStudent, userHashTeacher, userHashCorporate } 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 (
- ("");
-
- const {users: students} = useUsers(userHashStudent);
- const {users: corporates} = useUsers(userHashCorporate);
-
- const corporate = useMemo(() => corporates.find((u) => u.id === corporateId) || corporates[0], [corporates, corporateId]);
-
- return (
- <>
-
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">
- 
-
- );
-
- const StudentsList = () => {
- const filter = (x: User) =>
- !!selectedUser
- ? groups
- .filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
- .flatMap((g) => g.participants)
- .includes(x.id)
- : true;
-
- return (
-
-
- {displayUser.type === "corporate"
- ? displayUser.corporateInformation?.companyInformation?.name || displayUser.name
- : displayUser.name}
-
- {displayUser.email}
-
-
-
- )}
- />
- );
- };
-
- const TeachersList = () => {
- const filter = (x: User) =>
- !!selectedUser
- ? groups
- .filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
- .flatMap((g) => g.participants)
- .includes(x.id) || false
- : true;
-
- return (
- router.push("/")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Students ({total})
-
-
- )}
- />
- );
- };
-
- const AgentsList = () => {
- return (
- router.push("/")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Teachers ({total})
-
-
- )}
- />
- );
- };
-
- const CorporateList = () => (
- router.push("/")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Country Managers ({total})
-
-
- )}
- />
- );
-
- const CorporatePaidStatusList = ({paid}: {paid: Boolean}) => {
- const list = paid ? done : pending;
- const filter = (x: User) => list.includes(x.id);
-
- return (
- router.push("/")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Corporate ({total})
-
-
- )}
- />
- );
- };
-
- const InactiveCountryManagerList = () => {
- return (
- router.push("/")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- - {paid ? "Payment Done" : "Pending Payment"} ({total}) -
-
-
- )}
- />
- );
- };
-
- const InactiveStudentsList = () => {
- const filter = (x: User) => x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate);
-
- return (
- router.push("/")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Inactive Country Managers ({total})
-
-
- )}
- />
- );
- };
-
- const InactiveCorporateList = () => {
- const filter = (x: User) => x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate);
-
- return (
- router.push("/")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Inactive Students ({total})
-
-
- )}
- />
- );
- };
-
- const CorporateStudentsLevelsHelper = () => {
- return (
- <>
- router.push("/")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Inactive Corporate ({total})
-
-
- router.push("/")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Corporate Students Levels
-
- Latest students
-
-
- {students
- .sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
- .map((x) => (
-
-
- Latest teachers
-
-
- {teachers
- .sort((a, b) => {
- return dateSorter(a, b, "desc", "registrationDate");
- })
- .map((x) => (
-
-
- Latest corporate
-
-
- {corporates
- .sort((a, b) => {
- return dateSorter(a, b, "desc", "registrationDate");
- })
- .map((x) => (
-
-
- Unpaid Corporate
-
-
- {corporates
- .filter((x) => x.status === "paymentDue")
- .map((x) => (
-
-
- Students expiring in 1 month
-
-
- {students
- .filter(
- (x) =>
- x.subscriptionExpirationDate &&
- moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
- moment().isBefore(moment(x.subscriptionExpirationDate)),
- )
- .map((x) => (
-
-
- Teachers expiring in 1 month
-
-
- {teachers
- .filter(
- (x) =>
- x.subscriptionExpirationDate &&
- moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
- moment().isBefore(moment(x.subscriptionExpirationDate)),
- )
- .map((x) => (
-
-
- Country Manager expiring in 1 month
-
-
- {agents
- .filter(
- (x) =>
- x.subscriptionExpirationDate &&
- moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
- moment().isBefore(moment(x.subscriptionExpirationDate)),
- )
- .map((x) => (
-
-
- Corporate expiring in 1 month
-
-
- {corporates
- .filter(
- (x) =>
- x.subscriptionExpirationDate &&
- moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
- moment().isBefore(moment(x.subscriptionExpirationDate)),
- )
- .map((x) => (
-
-
- Expired Students
-
-
- {students
- .filter((x) => x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)))
- .map((x) => (
-
-
- Expired Teachers
-
-
- {teachers
- .filter((x) => x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)))
- .map((x) => (
-
-
- Expired Country Manager
-
-
- {agents
- .filter((x) => x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)))
- .map((x) => (
-
-
- Expired Corporate
-
-
- {corporates
- .filter((x) => x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)))
- .map((x) => (
-
-
- {
- setSelectedUser(undefined);
- if (shouldReload && selectedUser!.type === "student") reloadStudents();
- if (shouldReload && selectedUser!.type === "teacher") reloadTeachers();
- if (shouldReload && selectedUser!.type === "corporate") reloadCorporates();
- if (shouldReload && selectedUser!.type === "agent") reloadAgents();
- }}
- onViewStudents={
- selectedUser.type === "corporate" || selectedUser.type === "teacher"
- ? () => {
- appendUserFilters({
- id: "view-students",
- filter: (x: User) => x.type === "student",
- });
- appendUserFilters({
- id: "belongs-to-admin",
- filter: (x: User) =>
- groups
- .filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
- .flatMap((g) => g.participants)
- .includes(x.id),
- });
-
- router.push("/users");
- }
- : undefined
- }
- onViewTeachers={
- selectedUser.type === "corporate" || selectedUser.type === "student"
- ? () => {
- appendUserFilters({
- id: "view-teachers",
- filter: (x: User) => x.type === "teacher",
- });
- appendUserFilters({
- id: "belongs-to-admin",
- filter: (x: User) =>
- groups
- .filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
- .flatMap((g) => g.participants)
- .includes(x.id),
- });
-
- router.push("/users");
- }
- : undefined
- }
- onViewCorporate={
- selectedUser.type === "teacher" || selectedUser.type === "student"
- ? () => {
- appendUserFilters({
- id: "view-corporate",
- filter: (x: User) => x.type === "corporate",
- });
- appendUserFilters({
- id: "belongs-to-admin",
- filter: (x: User) =>
- groups
- .filter((g) => g.participants.includes(selectedUser.id))
- .flatMap((g) => [g.admin, ...g.participants])
- .includes(x.id),
- });
-
- router.push("/users");
- }
- : undefined
- }
- user={selectedUser}
- />
-
- )}
-
- 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">
-
-
- );
-
- const ReferredCorporateList = () => {
- return (
-
-
- {displayUser.type === "corporate"
- ? displayUser.corporateInformation?.companyInformation?.name || displayUser.name
- : displayUser.name}
-
- {displayUser.email}
-
-
-
- )}
- />
- );
- };
-
- const InactiveReferredCorporateList = () => {
- return (
- setPage("")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Referred Corporate ({total})
-
-
- )}
- />
- );
- };
-
- const CorporateList = () => {
- const filter = (x: User) => x.type === "corporate";
-
- return (
- setPage("")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Inactive Referred Corporate ({total})
-
-
- )}
- />
- );
- };
-
- const CorporatePaidStatusList = ({paid}: {paid: Boolean}) => {
- const list = paid ? done : pending;
- const filter = (x: User) => x.type === "corporate" && list.includes(x.id);
-
- return (
- setPage("")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Corporate ({total})
-
-
- )}
- />
- );
- };
-
- const DefaultDashboard = () => (
- <>
- setPage("")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- - {paid ? "Payment Done" : "Pending Payment"} ({total}) -
-
- Latest Referred Corporate
-
-
- {users
- .filter(referredCorporateFilter)
- .sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
- .map((x) => (
-
-
- Latest corporate
-
-
- {users
- .filter(corporateFilter)
- .sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
- .map((x) => (
-
-
- Referenced corporate expiring in 1 month
-
-
- {users
- .filter(
- (x) =>
- referredCorporateFilter(x) &&
- moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
- moment().isBefore(moment(x.subscriptionExpirationDate)),
- )
- .map((x) => (
-
-
- {
- setSelectedUser(undefined);
- if (shouldReload) reload();
- }}
- onViewStudents={
- selectedUser.type === "corporate" || selectedUser.type === "teacher" ? () => setPage("students") : undefined
- }
- onViewTeachers={selectedUser.type === "corporate" ? () => setPage("teachers") : undefined}
- user={selectedUser}
- />
-
- )}
-
-
-
-
-
- setName(e)} defaultValue={name} label="Assignment Name" required />
-
-
- Assignees ({assignees.length} selected)
-
-
- {user.type !== "teacher" && (
-
- Teachers ({teachers.length} selected)
-
- )}
-
-
- toggleModule("reading") : undefined}
- className={clsx(
- "w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
- selectedModules.includes("reading") ? "border-mti-purple-light" : "border-mti-gray-platinum",
- )}>
-
-
-
- Reading
- {!selectedModules.includes("reading") && !selectedModules.includes("level") && (
-
- )}
- {selectedModules.includes("level") && toggleModule("listening") : undefined}
- className={clsx(
- "w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
- selectedModules.includes("listening") ? "border-mti-purple-light" : "border-mti-gray-platinum",
- )}>
-
-
-
- Listening
- {!selectedModules.includes("listening") && !selectedModules.includes("level") && (
-
- )}
- {selectedModules.includes("level") && toggleModule("level")
- : undefined
- }
- className={clsx(
- "w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
- selectedModules.includes("level") ? "border-mti-purple-light" : "border-mti-gray-platinum",
- )}>
-
-
-
- Level
- {!selectedModules.includes("level") && selectedModules.length === 0 && (
-
- )}
- {!selectedModules.includes("level") && selectedModules.length > 0 && toggleModule("writing") : undefined}
- className={clsx(
- "w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
- selectedModules.includes("writing") ? "border-mti-purple-light" : "border-mti-gray-platinum",
- )}>
-
-
-
- Writing
- {!selectedModules.includes("writing") && !selectedModules.includes("level") && (
-
- )}
- {selectedModules.includes("level") && toggleModule("speaking") : undefined}
- className={clsx(
- "w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
- selectedModules.includes("speaking") ? "border-mti-purple-light" : "border-mti-gray-platinum",
- )}>
-
-
-
- Speaking
- {!selectedModules.includes("speaking") && !selectedModules.includes("level") && (
-
- )}
- {selectedModules.includes("level") &&
-
-
- {selectedModules.includes("speaking") && (
-
-
- moment(date).isSameOrAfter(new Date())}
- dateFormat="dd/MM/yyyy HH:mm"
- selected={startDate}
- showTimeSelect
- onChange={(date) => setStartDate(date)}
- />
-
-
-
- moment(date).isAfter(startDate)}
- dateFormat="dd/MM/yyyy HH:mm"
- selected={endDate}
- showTimeSelect
- onChange={(date) => setEndDate(date)}
- />
-
-
-
-
- )}
-
- {selectedModules.length > 0 && (
-
-
- Random Exams
-
- {!useRandomExams && (
-
- )}
-
-
- {selectedModules.map((module) => (
-
- )}
-
-
-
- ))}
-
- {groups.map((g) => (
-
- ))}
-
-
- {renderStudentSearch()}
-
-
- {studentRows.map((user) => (
-
- toggleAssignee(user)}
- className={clsx(
- "p-4 flex flex-col gap-2 rounded-xl border cursor-pointer w-72",
- "transition ease-in-out duration-300",
- assignees.includes(user.id) ? "border-mti-purple" : "border-mti-gray-platinum",
- )}
- key={user.id}>
-
- {user.name}
- {user.email}
-
-
- ))}
-
-
-
-
-
-
-
- {studentsPage * SIZE + 1} -{" "}
- {(studentsPage + 1) * SIZE > filteredStudentsRows.length ? filteredStudentsRows.length : (studentsPage + 1) * SIZE} /{" "}
- {filteredStudentsRows.length}
-
-
-
-
- {groups.map((g) => (
-
- ))}
-
-
- {renderTeacherSearch()}
-
-
- {teacherRows.map((user) => (
-
-
- toggleTeacher(user)}
- className={clsx(
- "p-4 flex flex-col gap-2 rounded-xl border cursor-pointer w-72",
- "transition ease-in-out duration-300",
- teachers.includes(user.id) ? "border-mti-purple" : "border-mti-gray-platinum",
- )}
- key={user.id}>
-
- {user.name}
- {user.email}
-
-
- Groups:{" "}
- {groups
- .filter((g) => g.participants.includes(user.id))
- .map((g) => g.name)
- .join(", ")}
-
-
- ))}
-
-
-
-
-
-
-
- {teachersPage * SIZE + 1} -{" "}
- {(teachersPage + 1) * SIZE > filteredTeachersRows.length
- ? filteredTeachersRows.length
- : (teachersPage + 1) * SIZE}{" "}
- / {filteredTeachersRows.length}
-
-
-
-
- setVariant((prev) => (prev === "full" ? "partial" : "full"))}>
- Full length exams
-
- setGenerateMultiple((d) => !d)}>
- Generate different exams
-
- setReleased((d) => !d)}>
- Auto release results
-
- setAutostart((d) => !d)}>
- Auto start exam
-
-
-
-
- {assignment && (
- <>
-
-
-
- )}
-
-
-
-
- router.push("/")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Master Statistical
-
-
- Show Utilization
-
-
- data={items.sort(
- (a, b) =>
- averageLevelCalculator(
- users,
- stats.filter((x) => x.user === b.id),
- ) -
- averageLevelCalculator(
- users,
- stats.filter((x) => x.user === a.id),
- ),
- )}
- columns={columns}
- />
-
- );
-};
-
-export default StudentPerformanceList;
diff --git a/src/dashboards/Corporate/StudentPerformancePage.tsx b/src/dashboards/Corporate/StudentPerformancePage.tsx
deleted file mode 100644
index 21092ac2..00000000
--- a/src/dashboards/Corporate/StudentPerformancePage.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
-import useGroups from "@/hooks/useGroups";
-import useUsers, {userHashStudent} from "@/hooks/useUsers";
-import {Stat, User} from "@/interfaces/user";
-import {getUserCompanyName} from "@/resources/user";
-import clsx from "clsx";
-import {useRouter} from "next/router";
-import {BsArrowLeft, BsArrowRepeat} from "react-icons/bs";
-import StudentPerformanceList from "./StudentPerformanceList";
-
-interface Props {
- user: User;
-}
-
-const StudentPerformancePage = ({user}: Props) => {
- const {groups} = useGroups({admin: user.id});
- const {users: students, reload: reloadStudents, isLoading: isStudentsLoading} = useUsers(userHashStudent);
- const {data: stats} = useFilterRecordsByUser
-
- router.push("/")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
-
- Reload
-
- 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">
-
-
- );
-
- const GroupsList = () => {
- const filter = (x: Group) => x.admin === user.id || x.participants.includes(user.id);
-
- return (
- <>
-
- {displayUser.name}
- {displayUser.email}
-
-
-
-
- router.push("/")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Groups ({groups.filter(filter).length})
-
-
- )}
- />
- );
-
- if (router.asPath === "/#teachers")
- return (
- router.push("/")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Students ({total})
-
-
- )}
- />
- );
-
- if (router.asPath === "/#groups") return router.push("/")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Teachers ({total})
-
- {
- setSelectedUser(undefined);
- if (shouldReload && selectedUser!.type === "student") reloadStudents();
- if (shouldReload && selectedUser!.type === "teacher") reloadTeachers();
- }}
- onViewStudents={
- selectedUser.type === "corporate" || selectedUser.type === "teacher"
- ? () => {
- appendUserFilters({
- id: "view-students",
- filter: (x: User) => x.type === "student",
- });
- appendUserFilters({
- id: "belongs-to-admin",
- filter: (x: User) =>
- groups
- .filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
- .flatMap((g) => g.participants)
- .includes(x.id),
- });
-
- router.push("/users");
- }
- : undefined
- }
- onViewTeachers={
- selectedUser.type === "corporate" || selectedUser.type === "student"
- ? () => {
- appendUserFilters({
- id: "view-teachers",
- filter: (x: User) => x.type === "teacher",
- });
- appendUserFilters({
- id: "belongs-to-admin",
- filter: (x: User) =>
- groups
- .filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
- .flatMap((g) => g.participants)
- .includes(x.id),
- });
-
- router.push("/users");
- }
- : undefined
- }
- user={selectedUser}
- />
-
- )}
-
-
- Linked to: {linkedCorporate?.corporateInformation?.companyInformation.name || linkedCorporate.name}
-
- )}
-
- Latest students
-
-
- {students
- .sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
- .map((x) => (
-
-
- Latest teachers
-
-
- {teachers
- .sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
- .map((x) => (
-
-
- Highest level students
-
-
- {students
- .sort((a, b) => calculateAverageLevel(b.levels) - calculateAverageLevel(a.levels))
- .map((x) => (
-
-
- Highest exam count students
-
-
- {students
- .sort(
- (a, b) =>
- Object.keys(groupByExam(getStatsByStudent(b))).length - Object.keys(groupByExam(getStatsByStudent(a))).length,
- )
- .map((x) => (
-
-
-
- );
-};
-
-const CorporateStudentsLevels = () => {
- const [corporateId, setCorporateId] = React.useState
-
- {user.name}
-
- {MODULE_ARRAY.map((module) => {
- const desiredLevel = user.desiredLevels[module] || 9;
- const level = user.levels[module] || 0;
- return (
-
-
-
- );
- })}
-
-
-
- {module === "reading" &&
-
- {capitalize(module)}
-
-
- {module === "level" && English Level: {getLevelLabel(level).join(" / ")}}
- {module !== "level" && (
-
-
- Level {level} / Level 9
- Desired Level: {desiredLevel}
-
- )}
-
-
-
@@ -285,6 +307,15 @@ export default function Home({user, entity, users, linkedUsers}: Props) {
- Entity Label:
-
+
+
+ Entity Label:
+
+
+
+
+ Licenses:
+ setLicenses(parseInt(v))} type="number" placeholder="12" />
+
diff --git a/src/pages/entities/index.tsx b/src/pages/entities/index.tsx
index 4674ada8..8f588ced 100644
--- a/src/pages/entities/index.tsx
+++ b/src/pages/entities/index.tsx
@@ -6,7 +6,7 @@ import { ToastContainer } from "react-toastify";
import Layout from "@/components/High/Layout";
import { GroupWithUsers, User } from "@/interfaces/user";
import { shouldRedirectHome } from "@/utils/navigation.disabled";
-import { getUserName } from "@/utils/users";
+import { getUserName, isAdmin } from "@/utils/users";
import { convertToUsers, getGroupsForUser } from "@/utils/groups.be";
import { countEntityUsers, getEntityUsers, getSpecificUsers, getUsers } from "@/utils/users.be";
import { checkAccess, findAllowedEntities, getTypesOfUser } from "@/utils/permissions";
@@ -64,7 +64,7 @@ export default function Home({ user, entities }: Props) {
Members
- {count}
+ {count}{isAdmin(user) && ` / ${entity.licenses || 0}`}
{users.map(getUserName).join(", ")}{' '}
diff --git a/src/pages/payment-record.tsx b/src/pages/payment-record.tsx
index 20b5c081..2be5369a 100644
--- a/src/pages/payment-record.tsx
+++ b/src/pages/payment-record.tsx
@@ -1,20 +1,20 @@
/* eslint-disable @next/next/no-img-element */
import Head from "next/head";
-import {withIronSessionSsr} from "iron-session/next";
-import {sessionOptions} from "@/lib/session";
+import { withIronSessionSsr } from "iron-session/next";
+import { sessionOptions } from "@/lib/session";
import useUser from "@/hooks/useUser";
-import {toast, ToastContainer} from "react-toastify";
+import { toast, ToastContainer } from "react-toastify";
import Layout from "@/components/High/Layout";
-import {shouldRedirectHome} from "@/utils/navigation.disabled";
+import { shouldRedirectHome } from "@/utils/navigation.disabled";
import usePayments from "@/hooks/usePayments";
import usePaypalPayments from "@/hooks/usePaypalPayments";
-import {Payment, PaypalPayment} from "@/interfaces/paypal";
-import {CellContext, createColumnHelper, flexRender, getCoreRowModel, HeaderGroup, Table, useReactTable} from "@tanstack/react-table";
-import {CURRENCIES} from "@/resources/paypal";
-import {BsTrash} from "react-icons/bs";
+import { Payment, PaypalPayment } from "@/interfaces/paypal";
+import { CellContext, createColumnHelper, flexRender, getCoreRowModel, HeaderGroup, Table, useReactTable } from "@tanstack/react-table";
+import { CURRENCIES } from "@/resources/paypal";
+import { BsTrash } from "react-icons/bs";
import axios from "axios";
-import {useEffect, useState, useMemo} from "react";
-import {AgentUser, CorporateUser, User} from "@/interfaces/user";
+import { useEffect, useState, useMemo } from "react";
+import { AgentUser, CorporateUser, User } from "@/interfaces/user";
import UserCard from "@/components/UserCard";
import Modal from "@/components/Modal";
import clsx from "clsx";
@@ -26,15 +26,15 @@ import Input from "@/components/Low/Input";
import ReactDatePicker from "react-datepicker";
import moment from "moment";
import PaymentAssetManager from "@/components/PaymentAssetManager";
-import {toFixedNumber} from "@/utils/number";
-import {CSVLink} from "react-csv";
-import {Tab} from "@headlessui/react";
-import {useListSearch} from "@/hooks/useListSearch";
-import {checkAccess, getTypesOfUser} from "@/utils/permissions";
+import { toFixedNumber } from "@/utils/number";
+import { CSVLink } from "react-csv";
+import { Tab } from "@headlessui/react";
+import { useListSearch } from "@/hooks/useListSearch";
+import { checkAccess, getTypesOfUser } from "@/utils/permissions";
import { requestUser } from "@/utils/api";
import { redirect } from "@/utils";
-export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
+export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
const user = await requestUser(req, res)
if (!user) return redirect("/login")
@@ -43,18 +43,18 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
}
return {
- props: {user},
+ props: { user },
};
}, sessionOptions);
const columnHelper = createColumnHelper();
const paypalColumnHelper = createColumnHelper();
-const PaymentCreator = ({onClose, reload, showComission = false}: {onClose: () => void; reload: () => void; showComission: boolean}) => {
+const PaymentCreator = ({ onClose, reload, showComission = false }: { onClose: () => void; reload: () => void; showComission: boolean }) => {
const [corporate, setCorporate] = useState();
const [date, setDate] = useState(new Date());
- const {users} = useUsers();
+ const { users } = useUsers();
const price = corporate?.corporateInformation?.payment?.value || 0;
const commission = corporate?.corporateInformation?.payment?.commission || 0;
@@ -101,13 +101,13 @@ const PaymentCreator = ({onClose, reload, showComission = false}: {onClose: () =
options={(users.filter((u) => u.type === "corporate") as CorporateUser[]).map((user) => ({
value: user.id,
meta: user,
- label: `${user.corporateInformation?.companyInformation?.name || user.name} - ${user.email}`,
+ label: `${user.name} - ${user.email}`,
}))}
- defaultValue={{value: "undefined", label: "Select an account"}}
+ defaultValue={{ value: "undefined", label: "Select an account" }}
onChange={(value) => setCorporate((value as any)?.meta ?? undefined)}
menuPortalTarget={document?.body}
styles={{
- menuPortal: (base) => ({...base, zIndex: 9999}),
+ menuPortal: (base) => ({ ...base, zIndex: 9999 }),
control: (styles) => ({
...styles,
paddingLeft: "4px",
@@ -129,10 +129,10 @@ const PaymentCreator = ({onClose, reload, showComission = false}: {onClose: () =
- {}} type="number" value={price} defaultValue={0} className="col-span-3" disabled />
+ { }} type="number" value={price} defaultValue={0} className="col-span-3" disabled />