devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/training-content' of https://bitbucket.org/ecropdev/ielts-ui into feature/training-content

Browse Source
This commit is contained in:
Carlos Mesquita
2024-08-27 17:09:33 +01:00
parent 845bccbe2a d04ea33616
commit eb985014be
4 changed files with 564 additions and 775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

391
src/dashboards/AssignmentCreator.tsx
View File

@@ -1,32 +1,24 @@
import Input from "@/components/Low/Input"; import Input from "@/components/Low/Input";
import Modal from "@/components/Modal"; import Modal from "@/components/Modal";
import { Module } from "@/interfaces"; import {Module} from "@/interfaces";
import clsx from "clsx"; import clsx from "clsx";
import { useEffect, useState } from "react"; import {useEffect, useState} from "react";
import { import {BsBook, BsCheckCircle, BsClipboard, BsHeadphones, BsMegaphone, BsPen, BsXCircle} from "react-icons/bs";
BsBook, import {generate} from "random-words";
BsCheckCircle, import {capitalize} from "lodash";
BsClipboard,
BsHeadphones,
BsMegaphone,
BsPen,
BsXCircle,
} from "react-icons/bs";
import { generate } from "random-words";
import { capitalize } from "lodash";
import useUsers from "@/hooks/useUsers"; import useUsers from "@/hooks/useUsers";
import { Group, User } from "@/interfaces/user"; import {Group, User} from "@/interfaces/user";
import ProgressBar from "@/components/Low/ProgressBar"; import ProgressBar from "@/components/Low/ProgressBar";
import { calculateAverageLevel } from "@/utils/score"; import {calculateAverageLevel} from "@/utils/score";
import Button from "@/components/Low/Button"; import Button from "@/components/Low/Button";
import ReactDatePicker from "react-datepicker"; import ReactDatePicker from "react-datepicker";
import moment from "moment"; import moment from "moment";
import axios from "axios"; import axios from "axios";
import { getExam } from "@/utils/exams"; import {getExam} from "@/utils/exams";
import { toast } from "react-toastify"; import {toast} from "react-toastify";
import { Assignment } from "@/interfaces/results"; import {Assignment} from "@/interfaces/results";
import Checkbox from "@/components/Low/Checkbox"; import Checkbox from "@/components/Low/Checkbox";
import { InstructorGender, Variant } from "@/interfaces/exam"; import {InstructorGender, Variant} from "@/interfaces/exam";
import Select from "@/components/Low/Select"; import Select from "@/components/Low/Select";
import useExams from "@/hooks/useExams"; import useExams from "@/hooks/useExams";
@@ -39,20 +31,9 @@ interface Props {
cancelCreation: () => void; cancelCreation: () => void;
} }
export default function AssignmentCreator({ export default function AssignmentCreator({isCreating, assignment, assigner, groups, users, cancelCreation}: Props) {
isCreating, const [selectedModules, setSelectedModules] = useState<Module[]>(assignment?.exams.map((e) => e.module) || []);
assignment, const [assignees, setAssignees] = useState<string[]>(assignment?.assignees || []);
assigner,
groups,
users,
cancelCreation,
}: Props) {
const [selectedModules, setSelectedModules] = useState<Module[]>(
assignment?.exams.map((e) => e.module) || []
);
const [assignees, setAssignees] = useState<string[]>(
assignment?.assignees || []
);
const [name, setName] = useState( const [name, setName] = useState(
assignment?.name || assignment?.name ||
generate({ generate({
@@ -62,55 +43,39 @@ export default function AssignmentCreator({
max: 3, max: 3,
join: " ", join: " ",
formatter: capitalize, formatter: capitalize,
}) }),
); );
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const [startDate, setStartDate] = useState<Date | null>( const [startDate, setStartDate] = useState<Date | null>(assignment ? moment(assignment.startDate).toDate() : new Date());
assignment ? moment(assignment.startDate).toDate() : new Date()
);
const [endDate, setEndDate] = useState<Date | null>( const [endDate, setEndDate] = useState<Date | null>(
assignment assignment ? moment(assignment.endDate).toDate() : moment().hours(23).minutes(59).add(8, "day").toDate(),
? moment(assignment.endDate).toDate()
: moment().hours(23).minutes(59).add(8, "day").toDate()
); );
const [variant, setVariant] = useState<Variant>("full"); const [variant, setVariant] = useState<Variant>("full");
const [instructorGender, setInstructorGender] = useState<InstructorGender>( const [instructorGender, setInstructorGender] = useState<InstructorGender>(assignment?.instructorGender || "varied");
assignment?.instructorGender || "varied"
);
// creates a new exam for each assignee or just one exam for all assignees // creates a new exam for each assignee or just one exam for all assignees
const [generateMultiple, setGenerateMultiple] = useState<boolean>(false); const [generateMultiple, setGenerateMultiple] = useState<boolean>(false);
const [useRandomExams, setUseRandomExams] = useState(true); const [useRandomExams, setUseRandomExams] = useState(true);
const [examIDs, setExamIDs] = useState<{ id: string; module: Module }[]>([]); const [examIDs, setExamIDs] = useState<{id: string; module: Module}[]>([]);
const { exams } = useExams(); const {exams} = useExams();
useEffect(() => { useEffect(() => {
setExamIDs((prev) => setExamIDs((prev) => prev.filter((x) => selectedModules.includes(x.module)));
prev.filter((x) => selectedModules.includes(x.module))
);
}, [selectedModules]); }, [selectedModules]);
const toggleModule = (module: Module) => { const toggleModule = (module: Module) => {
const modules = selectedModules.filter((x) => x !== module); const modules = selectedModules.filter((x) => x !== module);
setSelectedModules((prev) => setSelectedModules((prev) => (prev.includes(module) ? modules : [...modules, module]));
prev.includes(module) ? modules : [...modules, module]
);
}; };
const toggleAssignee = (user: User) => { const toggleAssignee = (user: User) => {
setAssignees((prev) => setAssignees((prev) => (prev.includes(user.id) ? prev.filter((a) => a !== user.id) : [...prev, user.id]));
prev.includes(user.id)
? prev.filter((a) => a !== user.id)
: [...prev, user.id]
);
}; };
const createAssignment = () => { const createAssignment = () => {
setIsLoading(true); setIsLoading(true);
(assignment ? axios.patch : axios.post)( (assignment ? axios.patch : axios.post)(`/api/assignments${assignment ? `/${assignment.id}` : ""}`, {
`/api/assignments${assignment ? `/${assignment.id}` : ""}`,
{
assignees, assignees,
name, name,
startDate, startDate,
@@ -120,14 +85,9 @@ export default function AssignmentCreator({
generateMultiple, generateMultiple,
variant, variant,
instructorGender, instructorGender,
} })
)
.then(() => { .then(() => {
toast.success( toast.success(`The assignment "${name}" has been ${assignment ? "updated" : "created"} successfully!`);
`The assignment "${name}" has been ${
assignment ? "updated" : "created"
} successfully!`
);
cancelCreation(); cancelCreation();
}) })
.catch((e) => { .catch((e) => {
@@ -141,18 +101,11 @@ export default function AssignmentCreator({
if (assignment) { if (assignment) {
setIsLoading(true); setIsLoading(true);
if ( if (!confirm(`Are you sure you want to delete the "${assignment.name}" assignment?`)) return;
!confirm(
`Are you sure you want to delete the "${assignment.name}" assignment?`
)
)
return;
axios axios
.delete(`api/assignments/${assignment.id}`) .delete(`api/assignments/${assignment.id}`)
.then(() => { .then(() => {
toast.success( toast.success(`The assignment "${name}" has been deleted successfully!`);
`The assignment "${name}" has been deleted successfully!`
);
cancelCreation(); cancelCreation();
}) })
.catch((e) => { .catch((e) => {
@@ -170,9 +123,7 @@ export default function AssignmentCreator({
axios axios
.post(`/api/assignments/${assignment.id}/start`) .post(`/api/assignments/${assignment.id}/start`)
.then(() => { .then(() => {
toast.success( toast.success(`The assignment "${name}" has been started successfully!`);
`The assignment "${name}" has been started successfully!`
);
cancelCreation(); cancelCreation();
}) })
.catch((e) => { .catch((e) => {
@@ -181,181 +132,108 @@ export default function AssignmentCreator({
}) })
.finally(() => setIsLoading(false)); .finally(() => setIsLoading(false));
} }
} };
return ( return (
<Modal isOpen={isCreating} onClose={cancelCreation} title="New Assignment"> <Modal isOpen={isCreating} onClose={cancelCreation} title="New Assignment">
<div className="w-full flex flex-col gap-4"> <div className="w-full flex flex-col gap-4">
<section className="w-full grid -md:grid-cols-1 md:grid-cols-2 place-items-center lg:grid-cols-6 -md:flex-col -md:items-center -md:gap-12 justify-between gap-8 mt-8 px-8"> <section className="w-full grid -md:grid-cols-1 md:grid-cols-3 place-items-center -md:flex-col -md:items-center -md:gap-12 justify-between gap-8 mt-8 px-8">
<div <div
onClick={ onClick={!selectedModules.includes("level") ? () => toggleModule("reading") : undefined}
!selectedModules.includes("level")
? () => toggleModule("reading")
: undefined
}
className={clsx( 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", "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",
"lg:col-span-2", selectedModules.includes("reading") ? "border-mti-purple-light" : "border-mti-gray-platinum",
selectedModules.includes("reading") )}>
? "border-mti-purple-light"
: "border-mti-gray-platinum"
)}
>
<div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-reading top-1/2 -translate-y-1/2 left-0 -translate-x-1/2"> <div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-reading top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
<BsBook className="text-white w-7 h-7" /> <BsBook className="text-white w-7 h-7" />
</div> </div>
<span className="ml-8 font-semibold">Reading</span> <span className="ml-8 font-semibold">Reading</span>
{!selectedModules.includes("reading") && {!selectedModules.includes("reading") && !selectedModules.includes("level") && (
!selectedModules.includes("level") && (
<div className="border border-mti-gray-platinum w-8 h-8 rounded-full" /> <div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
)} )}
{selectedModules.includes("level") && ( {selectedModules.includes("level") && <BsXCircle className="text-mti-red-light w-8 h-8" />}
<BsXCircle className="text-mti-red-light w-8 h-8" /> {selectedModules.includes("reading") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
)}
{selectedModules.includes("reading") && (
<BsCheckCircle className="text-mti-purple-light w-8 h-8" />
)}
</div> </div>
<div <div
onClick={ onClick={!selectedModules.includes("level") ? () => toggleModule("listening") : undefined}
!selectedModules.includes("level")
? () => toggleModule("listening")
: undefined
}
className={clsx( 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", "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",
"lg:col-span-2", selectedModules.includes("listening") ? "border-mti-purple-light" : "border-mti-gray-platinum",
selectedModules.includes("listening") )}>
? "border-mti-purple-light"
: "border-mti-gray-platinum"
)}
>
<div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-listening top-1/2 -translate-y-1/2 left-0 -translate-x-1/2"> <div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-listening top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
<BsHeadphones className="text-white w-7 h-7" /> <BsHeadphones className="text-white w-7 h-7" />
</div> </div>
<span className="ml-8 font-semibold">Listening</span> <span className="ml-8 font-semibold">Listening</span>
{!selectedModules.includes("listening") && {!selectedModules.includes("listening") && !selectedModules.includes("level") && (
!selectedModules.includes("level") && (
<div className="border border-mti-gray-platinum w-8 h-8 rounded-full" /> <div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
)} )}
{selectedModules.includes("level") && ( {selectedModules.includes("level") && <BsXCircle className="text-mti-red-light w-8 h-8" />}
<BsXCircle className="text-mti-red-light w-8 h-8" /> {selectedModules.includes("listening") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
)}
{selectedModules.includes("listening") && (
<BsCheckCircle className="text-mti-purple-light w-8 h-8" />
)}
</div> </div>
<div <div
onClick={ onClick={
!selectedModules.includes("level") (!selectedModules.includes("level") && selectedModules.length === 0) || selectedModules.includes("level")
? () => 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",
"lg:col-span-2",
selectedModules.includes("writing")
? "border-mti-purple-light"
: "border-mti-gray-platinum"
)}
>
<div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-writing top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
<BsPen className="text-white w-7 h-7" />
</div>
<span className="ml-8 font-semibold">Writing</span>
{!selectedModules.includes("writing") &&
!selectedModules.includes("level") && (
<div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
)}
{selectedModules.includes("level") && (
<BsXCircle className="text-mti-red-light w-8 h-8" />
)}
{selectedModules.includes("writing") && (
<BsCheckCircle className="text-mti-purple-light w-8 h-8" />
)}
</div>
<div
onClick={
!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",
"lg:col-span-3",
selectedModules.includes("speaking")
? "border-mti-purple-light"
: "border-mti-gray-platinum"
)}
>
<div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-speaking top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
<BsMegaphone className="text-white w-7 h-7" />
</div>
<span className="ml-8 font-semibold">Speaking</span>
{!selectedModules.includes("speaking") &&
!selectedModules.includes("level") && (
<div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
)}
{selectedModules.includes("level") && (
<BsXCircle className="text-mti-red-light w-8 h-8" />
)}
{selectedModules.includes("speaking") && (
<BsCheckCircle className="text-mti-purple-light w-8 h-8" />
)}
</div>
<div
onClick={
(!selectedModules.includes("level") &&
selectedModules.length === 0) ||
selectedModules.includes("level")
? () => toggleModule("level") ? () => toggleModule("level")
: undefined : undefined
} }
className={clsx( 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", "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",
"lg:col-span-3", selectedModules.includes("level") ? "border-mti-purple-light" : "border-mti-gray-platinum",
selectedModules.includes("level") )}>
? "border-mti-purple-light"
: "border-mti-gray-platinum"
)}
>
<div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-level top-1/2 -translate-y-1/2 left-0 -translate-x-1/2"> <div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-level top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
<BsClipboard className="text-white w-7 h-7" /> <BsClipboard className="text-white w-7 h-7" />
</div> </div>
<span className="ml-8 font-semibold">Level</span> <span className="ml-8 font-semibold">Level</span>
{!selectedModules.includes("level") && {!selectedModules.includes("level") && selectedModules.length === 0 && (
selectedModules.length === 0 && (
<div className="border border-mti-gray-platinum w-8 h-8 rounded-full" /> <div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
)} )}
{!selectedModules.includes("level") && {!selectedModules.includes("level") && selectedModules.length > 0 && <BsXCircle className="text-mti-red-light w-8 h-8" />}
selectedModules.length > 0 && ( {selectedModules.includes("level") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
<BsXCircle className="text-mti-red-light w-8 h-8" /> </div>
<div
onClick={!selectedModules.includes("level") ? () => 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",
)}>
<div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-writing top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
<BsPen className="text-white w-7 h-7" />
</div>
<span className="ml-8 font-semibold">Writing</span>
{!selectedModules.includes("writing") && !selectedModules.includes("level") && (
<div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
)} )}
{selectedModules.includes("level") && ( {selectedModules.includes("level") && <BsXCircle className="text-mti-red-light w-8 h-8" />}
<BsCheckCircle className="text-mti-purple-light w-8 h-8" /> {selectedModules.includes("writing") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
</div>
<div
onClick={!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",
)}>
<div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-speaking top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
<BsMegaphone className="text-white w-7 h-7" />
</div>
<span className="ml-8 font-semibold">Speaking</span>
{!selectedModules.includes("speaking") && !selectedModules.includes("level") && (
<div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
)} )}
{selectedModules.includes("level") && <BsXCircle className="text-mti-red-light w-8 h-8" />}
{selectedModules.includes("speaking") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
</div> </div>
</section> </section>
<Input <Input type="text" name="name" onChange={(e) => setName(e)} defaultValue={name} label="Assignment Name" required />
type="text"
name="name"
onChange={(e) => setName(e)}
defaultValue={name}
label="Assignment Name"
required
/>
<div className="w-full grid -md:grid-cols-1 md:grid-cols-2 gap-8"> <div className="w-full grid -md:grid-cols-1 md:grid-cols-2 gap-8">
<div className="flex flex-col gap-2"> <div className="flex flex-col gap-2">
<label className="font-normal text-base text-mti-gray-dim"> <label className="font-normal text-base text-mti-gray-dim">Start Date *</label>
Start Date *
</label>
<ReactDatePicker <ReactDatePicker
className={clsx( className={clsx(
"p-6 w-full min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer", "p-6 w-full min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
"hover:border-mti-purple tooltip z-10", "hover:border-mti-purple tooltip z-10",
"transition duration-300 ease-in-out" "transition duration-300 ease-in-out",
)} )}
popperClassName="!z-20" popperClassName="!z-20"
filterTime={(date) => moment(date).isSameOrAfter(new Date())} filterTime={(date) => moment(date).isSameOrAfter(new Date())}
@@ -366,14 +244,12 @@ export default function AssignmentCreator({
/> />
</div> </div>
<div className="flex flex-col gap-2"> <div className="flex flex-col gap-2">
<label className="font-normal text-base text-mti-gray-dim"> <label className="font-normal text-base text-mti-gray-dim">End Date *</label>
End Date *
</label>
<ReactDatePicker <ReactDatePicker
className={clsx( className={clsx(
"p-6 w-full min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer", "p-6 w-full min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
"hover:border-mti-purple tooltip z-10", "hover:border-mti-purple tooltip z-10",
"transition duration-300 ease-in-out" "transition duration-300 ease-in-out",
)} )}
popperClassName="!z-20" popperClassName="!z-20"
filterTime={(date) => moment(date).isAfter(startDate)} filterTime={(date) => moment(date).isAfter(startDate)}
@@ -387,24 +263,18 @@ export default function AssignmentCreator({
{selectedModules.includes("speaking") && ( {selectedModules.includes("speaking") && (
<div className="flex flex-col gap-3 w-full"> <div className="flex flex-col gap-3 w-full">
<label className="font-normal text-base text-mti-gray-dim"> <label className="font-normal text-base text-mti-gray-dim">Speaking Instructor&apos;s Gender</label>
Speaking Instructor&apos;s Gender
</label>
<Select <Select
value={{ value={{
value: instructorGender, value: instructorGender,
label: capitalize(instructorGender), label: capitalize(instructorGender),
}} }}
onChange={(value) => onChange={(value) => (value ? setInstructorGender(value.value as InstructorGender) : null)}
value
? setInstructorGender(value.value as InstructorGender)
: null
}
disabled={!selectedModules.includes("speaking") || !!assignment} disabled={!selectedModules.includes("speaking") || !!assignment}
options={[ options={[
{ value: "male", label: "Male" }, {value: "male", label: "Male"},
{ value: "female", label: "Female" }, {value: "female", label: "Female"},
{ value: "varied", label: "Varied" }, {value: "varied", label: "Varied"},
]} ]}
/> />
</div> </div>
@@ -419,29 +289,20 @@ export default function AssignmentCreator({
<div className="grid md:grid-cols-2 w-full gap-4"> <div className="grid md:grid-cols-2 w-full gap-4">
{selectedModules.map((module) => ( {selectedModules.map((module) => (
<div key={module} className="flex flex-col gap-3 w-full"> <div key={module} className="flex flex-col gap-3 w-full">
<label className="font-normal text-base text-mti-gray-dim"> <label className="font-normal text-base text-mti-gray-dim">{capitalize(module)} Exam</label>
{capitalize(module)} Exam
</label>
<Select <Select
value={{ value={{
value: value: examIDs.find((e) => e.module === module)?.id || null,
examIDs.find((e) => e.module === module)?.id || null, label: examIDs.find((e) => e.module === module)?.id || "",
label:
examIDs.find((e) => e.module === module)?.id || "",
}} }}
onChange={(value) => onChange={(value) =>
value value
? setExamIDs((prev) => [ ? setExamIDs((prev) => [...prev.filter((x) => x.module !== module), {id: value.value!, module}])
...prev.filter((x) => x.module !== module), : setExamIDs((prev) => prev.filter((x) => x.module !== module))
{ id: value.value!, module },
])
: setExamIDs((prev) =>
prev.filter((x) => x.module !== module)
)
} }
options={exams options={exams
.filter((x) => !x.isDiagnostic && x.module === module) .filter((x) => !x.isDiagnostic && x.module === module)
.map((x) => ({ value: x.id, label: x.id }))} .map((x) => ({value: x.id, label: x.id}))}
/> />
</div> </div>
))} ))}
@@ -451,37 +312,25 @@ export default function AssignmentCreator({
)} )}
<section className="w-full flex flex-col gap-3"> <section className="w-full flex flex-col gap-3">
<span className="font-semibold"> <span className="font-semibold">Assignees ({assignees.length} selected)</span>
Assignees ({assignees.length} selected)
</span>
<div className="flex gap-4 overflow-x-scroll scrollbar-hide"> <div className="flex gap-4 overflow-x-scroll scrollbar-hide">
{groups.map((g) => ( {groups.map((g) => (
<button <button
key={g.id} key={g.id}
onClick={() => { onClick={() => {
const groupStudentIds = users const groupStudentIds = users.filter((u) => g.participants.includes(u.id)).map((u) => u.id);
.filter((u) => g.participants.includes(u.id))
.map((u) => u.id);
if (groupStudentIds.every((u) => assignees.includes(u))) { if (groupStudentIds.every((u) => assignees.includes(u))) {
setAssignees((prev) => setAssignees((prev) => prev.filter((a) => !groupStudentIds.includes(a)));
prev.filter((a) => !groupStudentIds.includes(a))
);
} else { } else {
setAssignees((prev) => [ setAssignees((prev) => [...prev.filter((a) => !groupStudentIds.includes(a)), ...groupStudentIds]);
...prev.filter((a) => !groupStudentIds.includes(a)),
...groupStudentIds,
]);
} }
}} }}
className={clsx( className={clsx(
"bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light", "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", "transition duration-300 ease-in-out",
users users.filter((u) => g.participants.includes(u.id)).every((u) => assignees.includes(u.id)) &&
.filter((u) => g.participants.includes(u.id)) "!bg-mti-purple-light !text-white",
.every((u) => assignees.includes(u.id)) && )}>
"!bg-mti-purple-light !text-white"
)}
>
{g.name} {g.name}
</button> </button>
))} ))}
@@ -493,12 +342,9 @@ export default function AssignmentCreator({
className={clsx( className={clsx(
"p-4 flex flex-col gap-2 rounded-xl border cursor-pointer w-72", "p-4 flex flex-col gap-2 rounded-xl border cursor-pointer w-72",
"transition ease-in-out duration-300", "transition ease-in-out duration-300",
assignees.includes(user.id) assignees.includes(user.id) ? "border-mti-purple" : "border-mti-gray-platinum",
? "border-mti-purple"
: "border-mti-gray-platinum"
)} )}
key={user.id} key={user.id}>
>
<span className="flex flex-col gap-0 justify-center"> <span className="flex flex-col gap-0 justify-center">
<span className="font-semibold">{user.name}</span> <span className="font-semibold">{user.name}</span>
<span className="text-sm opacity-80">{user.email}</span> <span className="text-sm opacity-80">{user.email}</span>
@@ -522,29 +368,15 @@ export default function AssignmentCreator({
</div> </div>
</section> </section>
<div className="flex flex-col gap-4 w-full items-end"> <div className="flex flex-col gap-4 w-full items-end">
<Checkbox <Checkbox isChecked={variant === "full"} onChange={() => setVariant((prev) => (prev === "full" ? "partial" : "full"))}>
isChecked={variant === "full"}
onChange={() =>
setVariant((prev) => (prev === "full" ? "partial" : "full"))
}
>
Full length exams Full length exams
</Checkbox> </Checkbox>
<Checkbox <Checkbox isChecked={generateMultiple} onChange={() => setGenerateMultiple((d) => !d)}>
isChecked={generateMultiple}
onChange={() => setGenerateMultiple((d) => !d)}
>
Generate different exams Generate different exams
</Checkbox> </Checkbox>
</div> </div>
<div className="flex gap-4 w-full justify-end"> <div className="flex gap-4 w-full justify-end">
<Button <Button className="w-full max-w-[200px]" variant="outline" onClick={cancelCreation} disabled={isLoading} isLoading={isLoading}>
className="w-full max-w-[200px]"
variant="outline"
onClick={cancelCreation}
disabled={isLoading}
isLoading={isLoading}
>
Cancel Cancel
</Button> </Button>
{assignment && ( {assignment && (
@@ -555,8 +387,7 @@ export default function AssignmentCreator({
variant="outline" variant="outline"
onClick={startAssignment} onClick={startAssignment}
disabled={isLoading || moment().isAfter(startDate)} disabled={isLoading || moment().isAfter(startDate)}
isLoading={isLoading} isLoading={isLoading}>
>
Start Start
</Button> </Button>
<Button <Button
@@ -565,8 +396,7 @@ export default function AssignmentCreator({
variant="outline" variant="outline"
onClick={deleteAssignment} onClick={deleteAssignment}
disabled={isLoading} disabled={isLoading}
isLoading={isLoading} isLoading={isLoading}>
>
Delete Delete
</Button> </Button>
</> </>
@@ -582,8 +412,7 @@ export default function AssignmentCreator({
} }
className="w-full max-w-[200px]" className="w-full max-w-[200px]"
onClick={createAssignment} onClick={createAssignment}
isLoading={isLoading} isLoading={isLoading}>
>
{assignment ? "Update" : "Create"} {assignment ? "Update" : "Create"}
</Button> </Button>
</div> </div>

98
src/pages/(admin)/Lists/ExamList.tsx
View File

@@ -1,27 +1,25 @@
import { useMemo } from "react"; import {useMemo} from "react";
import { PERMISSIONS } from "@/constants/userPermissions"; import {PERMISSIONS} from "@/constants/userPermissions";
import useExams from "@/hooks/useExams"; import useExams from "@/hooks/useExams";
import useUsers from "@/hooks/useUsers"; import useUsers from "@/hooks/useUsers";
import { Module } from "@/interfaces"; import {Module} from "@/interfaces";
import { Exam } from "@/interfaces/exam"; import {Exam} from "@/interfaces/exam";
import { Type, User } from "@/interfaces/user"; import {Type, User} from "@/interfaces/user";
import useExamStore from "@/stores/examStore"; import useExamStore from "@/stores/examStore";
import { getExamById } from "@/utils/exams"; import {getExamById} from "@/utils/exams";
import { countExercises } from "@/utils/moduleUtils"; import {countExercises} from "@/utils/moduleUtils";
import { import {createColumnHelper, flexRender, getCoreRowModel, useReactTable} from "@tanstack/react-table";
createColumnHelper,
flexRender,
getCoreRowModel,
useReactTable,
} from "@tanstack/react-table";
import axios from "axios"; import axios from "axios";
import clsx from "clsx"; import clsx from "clsx";
import { capitalize } from "lodash"; import {capitalize} from "lodash";
import { useRouter } from "next/router"; import {useRouter} from "next/router";
import { BsCheck, BsTrash, BsUpload } from "react-icons/bs"; import {BsCheck, BsTrash, BsUpload} from "react-icons/bs";
import { toast } from "react-toastify"; import {toast} from "react-toastify";
import {useListSearch} from "@/hooks/useListSearch";
const CLASSES: { [key in Module]: string } = { const searchFields = [["module"], ["id"], ["createdBy"]];
const CLASSES: {[key in Module]: string} = {
reading: "text-ielts-reading", reading: "text-ielts-reading",
listening: "text-ielts-listening", listening: "text-ielts-listening",
speaking: "text-ielts-speaking", speaking: "text-ielts-speaking",
@@ -31,9 +29,9 @@ const CLASSES: { [key in Module]: string } = {
const columnHelper = createColumnHelper<Exam>(); const columnHelper = createColumnHelper<Exam>();
export default function ExamList({ user }: { user: User }) { export default function ExamList({user}: {user: User}) {
const { exams, reload } = useExams(); const {exams, reload} = useExams();
const { users } = useUsers(); const {users} = useUsers();
const parsedExams = useMemo(() => { const parsedExams = useMemo(() => {
return exams.map((exam) => { return exams.map((exam) => {
@@ -51,6 +49,8 @@ export default function ExamList({ user }: { user: User }) {
}); });
}, [exams, users]); }, [exams, users]);
const {rows: filteredRows, renderSearch} = useListSearch<Exam>(searchFields, parsedExams);
const setExams = useExamStore((state) => state.setExams); const setExams = useExamStore((state) => state.setExams);
const setSelectedModules = useExamStore((state) => state.setSelectedModules); const setSelectedModules = useExamStore((state) => state.setSelectedModules);
@@ -59,12 +59,9 @@ export default function ExamList({ user }: { user: User }) {
const loadExam = async (module: Module, examId: string) => { const loadExam = async (module: Module, examId: string) => {
const exam = await getExamById(module, examId.trim()); const exam = await getExamById(module, examId.trim());
if (!exam) { if (!exam) {
toast.error( toast.error("Unknown Exam ID! Please make sure you selected the right module and entered the right exam ID", {
"Unknown Exam ID! Please make sure you selected the right module and entered the right exam ID",
{
toastId: "invalid-exam-id", toastId: "invalid-exam-id",
} });
);
return; return;
} }
@@ -76,12 +73,7 @@ export default function ExamList({ user }: { user: User }) {
}; };
const deleteExam = async (exam: Exam) => { const deleteExam = async (exam: Exam) => {
if ( if (!confirm(`Are you sure you want to delete this ${capitalize(exam.module)} exam?`)) return;
!confirm(
`Are you sure you want to delete this ${capitalize(exam.module)} exam?`
)
)
return;
axios axios
.delete(`/api/exam/${exam.module}/${exam.id}`) .delete(`/api/exam/${exam.module}/${exam.id}`)
@@ -103,11 +95,7 @@ export default function ExamList({ user }: { user: User }) {
}; };
const getTotalExercises = (exam: Exam) => { const getTotalExercises = (exam: Exam) => {
if ( if (exam.module === "reading" || exam.module === "listening" || exam.module === "level") {
exam.module === "reading" ||
exam.module === "listening" ||
exam.module === "level"
) {
return countExercises(exam.parts.flatMap((x) => x.exercises)); return countExercises(exam.parts.flatMap((x) => x.exercises));
} }
@@ -121,11 +109,7 @@ export default function ExamList({ user }: { user: User }) {
}), }),
columnHelper.accessor("module", { columnHelper.accessor("module", {
header: "Module", header: "Module",
cell: (info) => ( cell: (info) => <span className={CLASSES[info.getValue()]}>{capitalize(info.getValue())}</span>,
<span className={CLASSES[info.getValue()]}>
{capitalize(info.getValue())}
</span>
),
}), }),
columnHelper.accessor((x) => getTotalExercises(x), { columnHelper.accessor((x) => getTotalExercises(x), {
header: "Exercises", header: "Exercises",
@@ -153,24 +137,17 @@ export default function ExamList({ user }: { user: User }) {
{ {
header: "", header: "",
id: "actions", id: "actions",
cell: ({ row }: { row: { original: Exam } }) => { cell: ({row}: {row: {original: Exam}}) => {
return ( return (
<div className="flex gap-4"> <div className="flex gap-4">
<div <div
data-tip="Load exam" data-tip="Load exam"
className="cursor-pointer tooltip" className="cursor-pointer tooltip"
onClick={async () => onClick={async () => await loadExam(row.original.module, row.original.id)}>
await loadExam(row.original.module, row.original.id)
}
>
<BsUpload className="hover:text-mti-purple-light transition ease-in-out duration-300" /> <BsUpload className="hover:text-mti-purple-light transition ease-in-out duration-300" />
</div> </div>
{PERMISSIONS.examManagement.delete.includes(user.type) && ( {PERMISSIONS.examManagement.delete.includes(user.type) && (
<div <div data-tip="Delete" className="cursor-pointer tooltip" onClick={() => deleteExam(row.original)}>
data-tip="Delete"
className="cursor-pointer tooltip"
onClick={() => deleteExam(row.original)}
>
<BsTrash className="hover:text-mti-purple-light transition ease-in-out duration-300" /> <BsTrash className="hover:text-mti-purple-light transition ease-in-out duration-300" />
</div> </div>
)} )}
@@ -181,24 +158,21 @@ export default function ExamList({ user }: { user: User }) {
]; ];
const table = useReactTable({ const table = useReactTable({
data: parsedExams, data: filteredRows,
columns: defaultColumns, columns: defaultColumns,
getCoreRowModel: getCoreRowModel(), getCoreRowModel: getCoreRowModel(),
}); });
return ( return (
<div className="flex flex-col gap-4 w-full h-full">
{renderSearch()}
<table className="rounded-xl bg-mti-purple-ultralight/40 w-full"> <table className="rounded-xl bg-mti-purple-ultralight/40 w-full">
<thead> <thead>
{table.getHeaderGroups().map((headerGroup) => ( {table.getHeaderGroups().map((headerGroup) => (
<tr key={headerGroup.id}> <tr key={headerGroup.id}>
{headerGroup.headers.map((header) => ( {headerGroup.headers.map((header) => (
<th className="p-4 text-left" key={header.id}> <th className="p-4 text-left" key={header.id}>
{header.isPlaceholder {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
? null
: flexRender(
header.column.columnDef.header,
header.getContext()
)}
</th> </th>
))} ))}
</tr> </tr>
@@ -206,10 +180,7 @@ export default function ExamList({ user }: { user: User }) {
</thead> </thead>
<tbody className="px-2"> <tbody className="px-2">
{table.getRowModel().rows.map((row) => ( {table.getRowModel().rows.map((row) => (
<tr <tr className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2" key={row.id}>
className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2"
key={row.id}
>
{row.getVisibleCells().map((cell) => ( {row.getVisibleCells().map((cell) => (
<td className="px-4 py-2" key={cell.id}> <td className="px-4 py-2" key={cell.id}>
{flexRender(cell.column.columnDef.cell, cell.getContext())} {flexRender(cell.column.columnDef.cell, cell.getContext())}
@@ -219,5 +190,6 @@ export default function ExamList({ user }: { user: User }) {
))} ))}
</tbody> </tbody>
</table> </table>
</div>
); );
} }

9
src/pages/(admin)/Lists/GroupList.tsx
View File

@@ -17,6 +17,8 @@ import {getUserCorporate} from "@/utils/groups";
import {isAgentUser, isCorporateUser, USER_TYPE_LABELS} from "@/resources/user"; import {isAgentUser, isCorporateUser, USER_TYPE_LABELS} from "@/resources/user";
import {checkAccess} from "@/utils/permissions"; import {checkAccess} from "@/utils/permissions";
import usePermissions from "@/hooks/usePermissions"; import usePermissions from "@/hooks/usePermissions";
import {useListSearch} from "@/hooks/useListSearch";
const searchFields = [["name"]];
const columnHelper = createColumnHelper<Group>(); const columnHelper = createColumnHelper<Group>();
const EMAIL_REGEX = new RegExp(/^[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*@[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*$/); const EMAIL_REGEX = new RegExp(/^[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*@[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*$/);
@@ -217,6 +219,8 @@ export default function GroupList({user}: {user: User}) {
adminAdmins: user?.id, adminAdmins: user?.id,
}); });
const {rows: filteredRows, renderSearch} = useListSearch<Group>(searchFields, groups);
const deleteGroup = (group: Group) => { const deleteGroup = (group: Group) => {
if (!confirm(`Are you sure you want to delete "${group.name}"?`)) return; if (!confirm(`Are you sure you want to delete "${group.name}"?`)) return;
@@ -283,7 +287,7 @@ export default function GroupList({user}: {user: User}) {
]; ];
const table = useReactTable({ const table = useReactTable({
data: groups, data: filteredRows,
columns: defaultColumns, columns: defaultColumns,
getCoreRowModel: getCoreRowModel(), getCoreRowModel: getCoreRowModel(),
}); });
@@ -295,7 +299,7 @@ export default function GroupList({user}: {user: User}) {
}; };
return ( return (
<div className="h-full w-full rounded-xl"> <div className="h-full w-full rounded-xl flex flex-col gap-4">
<Modal isOpen={isCreating || !!editingGroup} onClose={closeModal} title={editingGroup ? `Editing ${editingGroup.name}` : "New Group"}> <Modal isOpen={isCreating || !!editingGroup} onClose={closeModal} title={editingGroup ? `Editing ${editingGroup.name}` : "New Group"}>
<CreatePanel <CreatePanel
group={editingGroup} group={editingGroup}
@@ -315,6 +319,7 @@ export default function GroupList({user}: {user: User}) {
} }
/> />
</Modal> </Modal>
{renderSearch()}
<table className="bg-mti-purple-ultralight/40 w-full rounded-xl"> <table className="bg-mti-purple-ultralight/40 w-full rounded-xl">
<thead> <thead>
{table.getHeaderGroups().map((headerGroup) => ( {table.getHeaderGroups().map((headerGroup) => (

17
src/pages/(admin)/Lists/UserList.tsx
View File

@@ -109,23 +109,6 @@ export default function UserList({
.finally(reload); .finally(reload);
}; };
const updateAccountType = (user: User, type: Type) => {
if (!confirm(`Are you sure you want to update ${user.name}'s account from ${capitalize(user.type)} to ${capitalize(type)}?`)) return;
axios
.post<{user?: User; ok?: boolean}>(`/api/users/update?id=${user.id}`, {
...user,
type,
})
.then(() => {
toast.success("User type updated successfully!");
reload();
})
.catch(() => {
toast.error("Something went wrong!", {toastId: "update-error"});
});
};
const verifyAccount = (user: User) => { const verifyAccount = (user: User) => {
axios axios
.post<{user?: User; ok?: boolean}>(`/api/users/update?id=${user.id}`, { .post<{user?: User; ok?: boolean}>(`/api/users/update?id=${user.id}`, {