ENCOA-133: Teachers within a Group should be able to view the Group assignments

src/dashboards/AssignmentCreator.tsx

@@ -2,7 +2,7 @@ import Input from "@/components/Low/Input";
 import Modal from "@/components/Modal";
 import {Module} from "@/interfaces";
 import clsx from "clsx";
-import {useEffect, useState} from "react";
+import {useEffect, useMemo, useState} from "react";
 import {BsBook, BsCheckCircle, BsClipboard, BsHeadphones, BsMegaphone, BsPen, BsXCircle} from "react-icons/bs";
 import {generate} from "random-words";
 import {capitalize} from "lodash";
@@ -47,7 +47,7 @@ export default function AssignmentCreator({isCreating, assignment, user, groups,
 			}),
 	);
 	const [isLoading, setIsLoading] = useState(false);
-	const [startDate, setStartDate] = useState<Date | null>(assignment ? moment(assignment.startDate).toDate() : moment().add(1, 'hour').toDate());
+	const [startDate, setStartDate] = useState<Date | null>(assignment ? moment(assignment.startDate).toDate() : moment().add(1, "hour").toDate());
 
 	const [endDate, setEndDate] = useState<Date | null>(
 		assignment ? moment(assignment.endDate).toDate() : moment().hours(23).minutes(59).add(8, "day").toDate(),
@@ -66,6 +66,9 @@ export default function AssignmentCreator({isCreating, assignment, user, groups,
 
 	const {exams} = useExams();
 
+	const userStudents = useMemo(() => users.filter((x) => x.type === "student"), [users]);
+	const userTeachers = useMemo(() => users.filter((x) => x.type === "teacher"), [users]);
+
 	useEffect(() => {
 		setExamIDs((prev) => prev.filter((x) => selectedModules.includes(x.module)));
 	}, [selectedModules]);
@@ -79,6 +82,10 @@ export default function AssignmentCreator({isCreating, assignment, user, groups,
 		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);
 
@@ -270,22 +277,23 @@ export default function AssignmentCreator({isCreating, assignment, user, groups,
 							onChange={(date) => setEndDate(date)}
 						/>
 					</div>
-					{autoStart && (<div className="flex flex-col gap-2">
-						<label className="font-normal text-base text-mti-gray-dim">Automatic Start Date *</label>
-						<ReactDatePicker
-							className={clsx(
-								"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",
-								"transition duration-300 ease-in-out",
-							)}
-							popperClassName="!z-20"
-							filterTime={(date) => moment(date).isSameOrAfter(new Date())}
-							dateFormat="dd/MM/yyyy HH:mm"
-							selected={autoStartDate}
-							showTimeSelect
-							onChange={(date) => setAutoStartDate(date)}
-						/>
-					</div>
+					{autoStart && (
+						<div className="flex flex-col gap-2">
+							<label className="font-normal text-base text-mti-gray-dim">Automatic Start Date *</label>
+							<ReactDatePicker
+								className={clsx(
+									"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",
+									"transition duration-300 ease-in-out",
+								)}
+								popperClassName="!z-20"
+								filterTime={(date) => moment(date).isSameOrAfter(new Date())}
+								dateFormat="dd/MM/yyyy HH:mm"
+								selected={autoStartDate}
+								showTimeSelect
+								onChange={(date) => setAutoStartDate(date)}
+							/>
+						</div>
 					)}
 				</div>
 
@@ -364,7 +372,7 @@ export default function AssignmentCreator({isCreating, assignment, user, groups,
 						))}
 					</div>
 					<div className="flex flex-wrap -md:justify-center gap-4">
-						{users.map((user) => (
+						{userStudents.map((user) => (
 							<div
 								onClick={() => toggleAssignee(user)}
 								className={clsx(
@@ -395,7 +403,60 @@ export default function AssignmentCreator({isCreating, assignment, user, groups,
 						))}
 					</div>
 				</section>
-				<div className="flex flex-col gap-4 w-full items-end">
+
+				{user.type !== "teacher" && (
+					<section className="w-full flex flex-col gap-3">
+						<span className="font-semibold">Teachers ({teachers.length} selected)</span>
+						<div className="flex gap-4 overflow-x-scroll scrollbar-hide">
+							{groups.map((g) => (
+								<button
+									key={g.id}
+									onClick={() => {
+										const groupStudentIds = users.filter((u) => g.participants.includes(u.id)).map((u) => u.id);
+										if (groupStudentIds.every((u) => teachers.includes(u))) {
+											setTeachers((prev) => prev.filter((a) => !groupStudentIds.includes(a)));
+										} else {
+											setTeachers((prev) => [...prev.filter((a) => !groupStudentIds.includes(a)), ...groupStudentIds]);
+										}
+									}}
+									className={clsx(
+										"bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
+										"transition duration-300 ease-in-out",
+										users.filter((u) => g.participants.includes(u.id)).every((u) => teachers.includes(u.id)) &&
+											"!bg-mti-purple-light !text-white",
+									)}>
+									{g.name}
+								</button>
+							))}
+						</div>
+						<div className="flex flex-wrap -md:justify-center gap-4">
+							{userTeachers.map((user) => (
+								<div
+									onClick={() => 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}>
+									<span className="flex flex-col gap-0 justify-center">
+										<span className="font-semibold">{user.name}</span>
+										<span className="text-sm opacity-80">{user.email}</span>
+									</span>
+									<span className="text-mti-black/80 text-sm whitespace-pre-wrap mt-2">
+										Groups:{" "}
+										{groups
+											.filter((g) => g.participants.includes(user.id))
+											.map((g) => g.name)
+											.join(", ")}
+									</span>
+								</div>
+							))}
+						</div>
+					</section>
+				)}
+
+				<div className="flex gap-4 w-full items-end">
 					<Checkbox isChecked={variant === "full"} onChange={() => setVariant((prev) => (prev === "full" ? "partial" : "full"))}>
 						Full length exams
 					</Checkbox>

src/dashboards/Corporate.tsx

@@ -175,7 +175,7 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
 		() =>
 			users.filter(
 				(x) =>
-					x.type === "student" &&
+					(x.type === "student" || x.type === "teacher") &&
 					(!!selectedUser
 						? groups
 								.filter((g) => g.admin === selectedUser.id)

src/dashboards/MasterCorporate.tsx

@@ -320,7 +320,7 @@ export default function MasterCorporateDashboard({user}: Props) {
 		() =>
 			users.filter(
 				(x) =>
-					x.type === "student" &&
+					(x.type === "student" || x.type === "teacher") &&
 					(!!selectedUser
 						? groups
 								.filter((g) => g.admin === selectedUser.id)

src/hooks/useAssignments.tsx

@@ -13,7 +13,7 @@ export default function useAssignments({assigner, assignees, corporate}: {assign
 			.get<Assignment[]>(!corporate ? "/api/assignments" : `/api/assignments/corporate/${corporate}`)
 			.then(async (response) => {
 				if (assigner) {
-					setAssignments(response.data.filter((a) => a.assigner === assigner));
+					setAssignments(response.data.filter((a) => a.assigner === assigner || (!a.teachers ? false : a.teachers.includes(assigner))));
 					return;
 				}