From 9c8d7988c5743c8af4d86df7e43348eaba65f7d0 Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Wed, 6 Dec 2023 15:16:48 +0000
Subject: [PATCH 01/18] Changed Comercial labels to Corporate

---
 src/components/DemographicInformationInput.tsx |  8 ++++----
 src/components/UserCard.tsx                    | 10 +++++-----
 src/pages/profile.tsx                          |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/DemographicInformationInput.tsx b/src/components/DemographicInformationInput.tsx
index 222dc546..1f90ff21 100644
--- a/src/components/DemographicInformationInput.tsx
+++ b/src/components/DemographicInformationInput.tsx
@@ -24,7 +24,7 @@ export default function DemographicInformationInput({user, mutateUser}: Props) {
 	const [position, setPosition] = useState<string>();
 	const [isLoading, setIsLoading] = useState(false);
 
-	const [companyName, setCompanyName] = useState<string>();
+	const [corporateName, setCorporateName] = useState<string>();
 	const [commercialRegistration, setCommercialRegistration] = useState<string>();
 
 	const save = (e?: FormEvent) => {
@@ -40,7 +40,7 @@ export default function DemographicInformationInput({user, mutateUser}: Props) {
 					employment: user.type === "corporate" ? undefined : employment,
 					position: user.type === "corporate" ? position : undefined,
 				},
-				agentInformation: user.type === "agent" ? {companyName, commercialRegistration} : undefined,
+				agentInformation: user.type === "agent" ? {corporateName, commercialRegistration} : undefined,
 			})
 			.then((response) => mutateUser((response.data as {user: User}).user))
 			.catch(() => {
@@ -62,7 +62,7 @@ export default function DemographicInformationInput({user, mutateUser}: Props) {
 			<form className="flex flex-col items-center justify-items-center gap-6 w-full h-full -md:px-4 lg:w-1/2 mb-32" onSubmit={save}>
 				{user.type === "agent" && (
 					<div className="w-full flex gap-8">
-						<Input type="text" onChange={setCompanyName} name="companyName" label="Company Name" required />
+						<Input type="text" onChange={setCorporateName} name="corporateName" label="Corporate Name" required />
 						<Input
 							type="text"
 							onChange={setCommercialRegistration}
@@ -157,7 +157,7 @@ export default function DemographicInformationInput({user, mutateUser}: Props) {
 						!phone ||
 						!gender ||
 						(user.type === "corporate" ? !position : !employment) ||
-						(user.type === "agent" ? !companyName || !commercialRegistration : false)
+						(user.type === "agent" ? !corporateName || !commercialRegistration : false)
 					}>
 					{!isLoading && "Save information"}
 					{isLoading && (
diff --git a/src/components/UserCard.tsx b/src/components/UserCard.tsx
index 682b32d8..f81302ac 100644
--- a/src/components/UserCard.tsx
+++ b/src/components/UserCard.tsx
@@ -146,11 +146,11 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
 				<>
 					<div className="grid grid-cols-1 md:grid-cols-2 gap-8 w-full">
 						<Input
-							label="Company Name"
+							label="Corporate Name"
 							type="text"
 							name="companyName"
 							onChange={setCompanyName}
-							placeholder="Enter company name"
+							placeholder="Enter corporate name"
 							defaultValue={companyName}
 							required
 						/>
@@ -159,7 +159,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
 							type="text"
 							name="commercialRegistration"
 							onChange={setCommercialRegistration}
-							placeholder="Enter company name"
+							placeholder="Enter commercial registration"
 							defaultValue={commercialRegistration}
 							required
 						/>
@@ -171,11 +171,11 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
 				<>
 					<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 w-full">
 						<Input
-							label="Company Name"
+							label="Corporate Name"
 							type="text"
 							name="companyName"
 							onChange={setCompanyName}
-							placeholder="Enter company name"
+							placeholder="Enter corporate name"
 							defaultValue={companyName}
 						/>
 						<Input
diff --git a/src/pages/profile.tsx b/src/pages/profile.tsx
index b9aa8289..54ff55cc 100644
--- a/src/pages/profile.tsx
+++ b/src/pages/profile.tsx
@@ -214,11 +214,11 @@ export default function Home() {
 									{user.type === "agent" && (
 										<div className="grid grid-cols-1 md:grid-cols-2 gap-8 w-full">
 											<Input
-												label="Company Name"
+												label="Corporate Name"
 												type="text"
 												name="companyName"
 												onChange={() => null}
-												placeholder="Enter company name"
+												placeholder="Enter corporate name"
 												defaultValue={user.agentInformation.companyName}
 												disabled
 											/>
@@ -227,7 +227,7 @@ export default function Home() {
 												type="text"
 												name="commercialRegistration"
 												onChange={() => null}
-												placeholder="Enter company name"
+												placeholder="Enter commercial registration"
 												defaultValue={user.agentInformation.commercialRegistration}
 												disabled
 											/>

From f36384fdb447ecf2381336c1c26aae21dbd8e8dd Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Wed, 6 Dec 2023 15:43:44 +0000
Subject: [PATCH 02/18] Replaced Corporate Icon on Admin dashboard

---
 src/dashboards/Admin.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/dashboards/Admin.tsx b/src/dashboards/Admin.tsx
index 097bb968..f50ff99d 100644
--- a/src/dashboards/Admin.tsx
+++ b/src/dashboards/Admin.tsx
@@ -13,9 +13,8 @@ import {
 	BsGlobeCentralSouthAsia,
 	BsPerson,
 	BsPersonFill,
-	BsPersonFillGear,
-	BsPersonGear,
 	BsPersonLinesFill,
+	BsBank,
 } from "react-icons/bs";
 import UserCard from "@/components/UserCard";
 import useGroups from "@/hooks/useGroups";
@@ -207,7 +206,7 @@ export default function AdminDashboard({user}: Props) {
 					color="purple"
 				/>
 				<IconCard
-					Icon={BsPersonLinesFill}
+					Icon={BsBank}
 					label="Corporate"
 					value={users.filter((x) => x.type === "corporate").length}
 					onClick={() => setPage("corporate")}

From 62b2f477f427bb7d0d1207e4d27bfedb8462e2ee Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Wed, 6 Dec 2023 15:54:49 +0000
Subject: [PATCH 03/18] Replaced Corporate Icon on Agent Dashboard

---
 src/dashboards/Agent.tsx | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/dashboards/Agent.tsx b/src/dashboards/Agent.tsx
index f951f04e..4c4cd21e 100644
--- a/src/dashboards/Agent.tsx
+++ b/src/dashboards/Agent.tsx
@@ -9,17 +9,8 @@ import moment from "moment";
 import {useEffect, useState} from "react";
 import {
 	BsArrowLeft,
-	BsClipboard2Data,
-	BsClipboard2DataFill,
-	BsClock,
-	BsGlobeCentralSouthAsia,
-	BsPaperclip,
-	BsPerson,
-	BsPersonAdd,
 	BsPersonFill,
-	BsPersonFillGear,
-	BsPersonGear,
-	BsPersonLinesFill,
+	BsBank
 } from "react-icons/bs";
 import UserCard from "@/components/UserCard";
 import useGroups from "@/hooks/useGroups";
@@ -119,7 +110,7 @@ export default function AgentDashboard({user}: Props) {
 				/>
 				<IconCard
 					onClick={() => setPage("corporate")}
-					Icon={BsPersonFill}
+					Icon={BsBank}
 					label="Corporate"
 					value={users.filter(corporateFilter).length}
 					color="purple"

From 6f5dd86cd15312caf2c96a5351b67444af3492d8 Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Thu, 7 Dec 2023 16:36:57 +0000
Subject: [PATCH 04/18] Updated so the new payment prefills with all of the
 corporate's payment information

---
 src/components/UserCard.tsx  |  2 +-
 src/pages/payment-record.tsx | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/components/UserCard.tsx b/src/components/UserCard.tsx
index 682b32d8..76e8a830 100644
--- a/src/components/UserCard.tsx
+++ b/src/components/UserCard.tsx
@@ -58,7 +58,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
 	);
 	const [userAmount, setUserAmount] = useState(user.type === "corporate" ? user.corporateInformation?.companyInformation.userAmount : undefined);
 	const [paymentValue, setPaymentValue] = useState(user.type === "corporate" ? user.corporateInformation?.payment?.value : undefined);
-	const [paymentCurrency, setPaymentCurrency] = useState(user.type === "corporate" ? user.corporateInformation?.payment?.currency : undefined);
+	const [paymentCurrency, setPaymentCurrency] = useState(user.type === "corporate" ? user.corporateInformation?.payment?.currency : "EUR");
 	const [monthlyDuration, setMonthlyDuration] = useState(user.type === "corporate" ? user.corporateInformation?.monthlyDuration : undefined);
 
 	const {stats} = useStats(user.id);
diff --git a/src/pages/payment-record.tsx b/src/pages/payment-record.tsx
index ee58653b..70f094d7 100644
--- a/src/pages/payment-record.tsx
+++ b/src/pages/payment-record.tsx
@@ -75,6 +75,13 @@ const PaymentCreator = ({onClose, reload}: {onClose: () => void; reload: () => v
 		setReferralAgent(referralAgent as AgentUser | undefined);
 	}, [corporate, users]);
 
+	useEffect(() => {
+		const payment = corporate?.corporateInformation?.payment;
+
+		setPrice(payment?.value || 0);
+		setCurrency(payment?.currency || "EUR");
+	}, [corporate]);
+
 	const submit = () => {
 		axios
 			.post(`/api/payments`, {
@@ -138,14 +145,15 @@ const PaymentCreator = ({onClose, reload}: {onClose: () => void; reload: () => v
 							name="paymentValue"
 							onChange={(e) => setPrice(e ? parseInt(e) : 0)}
 							type="number"
-							defaultValue={0}
+							value={price}
 							className="col-span-3"
 						/>
 						<Select
 							className="px-4 col-span-2 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed bg-white rounded-full border border-mti-gray-platinum focus:outline-none"
 							options={CURRENCIES.map(({label, currency}) => ({value: currency, label}))}
-							defaultValue={{value: "EUR", label: "Euro"}}
+							defaultValue={{value: currency || "EUR", label: CURRENCIES.find((c) => c.currency === currency)?.label || "Euro"}}
 							onChange={(value) => setCurrency(value?.value || "EUR")}
+							value={{value: currency || "EUR", label: CURRENCIES.find((c) => c.currency === currency)?.label || "Euro"}}
 							styles={{
 								control: (styles) => ({
 									...styles,

From 9d4071d4cd90444d60c0b3fc2a1e6f5626dc75fa Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Thu, 7 Dec 2023 18:19:01 +0000
Subject: [PATCH 05/18] Added debug settings for vscoe

---
 .vscode/launch.json | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 .vscode/launch.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..e3305190
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,28 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+      {
+        "name": "Next.js: debug server-side",
+        "type": "node-terminal",
+        "request": "launch",
+        "command": "npm run dev"
+      },
+      {
+        "name": "Next.js: debug client-side",
+        "type": "chrome",
+        "request": "launch",
+        "url": "http://localhost:3000"
+      },
+      {
+        "name": "Next.js: debug full stack",
+        "type": "node-terminal",
+        "request": "launch",
+        "command": "npm run dev",
+        "serverReadyAction": {
+          "pattern": "- Local:.+(https?://.+)",
+          "uriFormat": "%s",
+          "action": "debugWithChrome"
+        }
+      }
+    ]
+  }
\ No newline at end of file

From f7af21878e6efdf930cbb4c3e90f26c1b36ad07e Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Thu, 7 Dec 2023 18:20:11 +0000
Subject: [PATCH 06/18] Separate get exam bussiness logic into a backend asset

---
 src/pages/api/exam/[module]/index.ts | 36 ++++---------------
 src/utils/exams.be.ts                | 52 ++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 29 deletions(-)
 create mode 100644 src/utils/exams.be.ts

diff --git a/src/pages/api/exam/[module]/index.ts b/src/pages/api/exam/[module]/index.ts
index 87fd150b..c48a3d78 100644
--- a/src/pages/api/exam/[module]/index.ts
+++ b/src/pages/api/exam/[module]/index.ts
@@ -1,14 +1,11 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type {NextApiRequest, NextApiResponse} from "next";
 import {app} from "@/firebase";
-import {getFirestore, collection, getDocs, query, where, setDoc, doc} from "firebase/firestore";
+import {getFirestore, setDoc, doc} from "firebase/firestore";
 import {withIronSessionApiRoute} from "iron-session/next";
 import {sessionOptions} from "@/lib/session";
-import {shuffle} from "lodash";
 import {Exam} from "@/interfaces/exam";
-import {Stat} from "@/interfaces/user";
-import {v4} from "uuid";
-
+import { getExams } from "@/utils/exams.be";
 const db = getFirestore(app);
 
 export default withIronSessionApiRoute(handler, sessionOptions);
@@ -26,31 +23,12 @@ async function GET(req: NextApiRequest, res: NextApiResponse) {
 		return;
 	}
 
-	const {module, avoidRepeated} = req.query as {module: string; avoidRepeated: string};
-	const moduleRef = collection(db, module);
-
-	const q = query(moduleRef, where("isDiagnostic", "==", false));
-	const snapshot = await getDocs(q);
-
-	const exams: Exam[] = shuffle(
-		snapshot.docs.map((doc) => ({
-			id: doc.id,
-			...doc.data(),
-			module,
-		})),
-	) as Exam[];
-
-	if (avoidRepeated === "true") {
-		const statsQ = query(collection(db, "stats"), where("user", "==", req.session.user.id));
-		const statsSnapshot = await getDocs(statsQ);
-
-		const stats: Stat[] = statsSnapshot.docs.map((doc) => ({id: doc.id, ...doc.data()})) as unknown as Stat[];
-		const filteredExams = exams.filter((x) => !stats.map((s) => s.exam).includes(x.id));
-
-		res.status(200).json(filteredExams.length > 0 ? filteredExams : exams);
-		return;
-	}
+	const {
+		module,
+		avoidRepeated,
+	} = req.query as {module: string; avoidRepeated: string};
 
+	const exams: Exam[] = await getExams(db, module, avoidRepeated, req.session.user.id);
 	res.status(200).json(exams);
 }
 
diff --git a/src/utils/exams.be.ts b/src/utils/exams.be.ts
new file mode 100644
index 00000000..ee9832f3
--- /dev/null
+++ b/src/utils/exams.be.ts
@@ -0,0 +1,52 @@
+import {
+  collection,
+  getDocs,
+  query,
+  where,
+  setDoc,
+  doc,
+  Firestore,
+} from "firebase/firestore";
+import { shuffle } from "lodash";
+import { Exam } from "@/interfaces/exam";
+import { Stat } from "@/interfaces/user";
+
+export const getExams = async (
+  db: Firestore,
+  module: string,
+  avoidRepeated: string,
+  // added userId as due to assignments being set from the teacher to the student
+  // we need to make sure we are serving exams not executed by the user and not
+  // by the teacher that performed the request
+  userId: string
+): Promise<Exam[]> => {
+  const moduleRef = collection(db, module);
+
+  const q = query(moduleRef, where("isDiagnostic", "==", false));
+  const snapshot = await getDocs(q);
+
+  const exams: Exam[] = shuffle(
+    snapshot.docs.map((doc) => ({
+      id: doc.id,
+      ...doc.data(),
+      module,
+    }))
+  ) as Exam[];
+
+  if (avoidRepeated === "true") {
+    const statsQ = query(collection(db, "stats"), where("user", "==", userId));
+    const statsSnapshot = await getDocs(statsQ);
+
+    const stats: Stat[] = statsSnapshot.docs.map((doc) => ({
+      id: doc.id,
+      ...doc.data(),
+    })) as unknown as Stat[];
+    const filteredExams = exams.filter(
+      (x) => !stats.map((s) => s.exam).includes(x.id)
+    );
+
+    return filteredExams.length > 0 ? filteredExams : exams;
+  }
+
+  return exams;
+};

From 5eaa0ac26949618be8ccd911b42a421d4b9aabba Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Thu, 7 Dec 2023 18:23:00 +0000
Subject: [PATCH 07/18] Assignments now generate unique list of exams for each
 user

---
 src/dashboards/AssignmentCreator.tsx | 54 ++++++++++------------
 src/interfaces/results.ts            |  2 +-
 src/pages/api/assignments/index.ts   | 69 ++++++++++++++++++++++++++--
 3 files changed, 91 insertions(+), 34 deletions(-)

diff --git a/src/dashboards/AssignmentCreator.tsx b/src/dashboards/AssignmentCreator.tsx
index 08b29b90..e55faa60 100644
--- a/src/dashboards/AssignmentCreator.tsx
+++ b/src/dashboards/AssignmentCreator.tsx
@@ -46,36 +46,32 @@ export default function AssignmentCreator({isCreating, assignment, assigner, gro
 	};
 
 	const createAssignment = () => {
-		setIsLoading(true);
+    setIsLoading(true);
 
-		const examPromises = selectedModules.map(async (module) => getExam(module, false));
-		Promise.all(examPromises)
-			.then((exams) => {
-				(assignment ? axios.patch : axios.post)(`/api/assignments${assignment ? `/${assignment.id}` : ""}`, {
-					assigner,
-					assignees,
-					name,
-					startDate,
-					endDate,
-					results: [],
-					exams: exams.map((e) => ({module: e?.module, id: e?.id})),
-				})
-					.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));
-			})
-			.catch((e) => {
-				console.log(e);
-				toast.error("Something went wrong, please try again later!");
-				setIsLoading(false);
-			});
-	};
+    (assignment ? axios.patch : axios.post)(
+      `/api/assignments${assignment ? `/${assignment.id}` : ""}`,
+      {
+        assignees,
+        name,
+        startDate,
+        endDate,
+		selectedModules
+      }
+    )
+      .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) {
diff --git a/src/interfaces/results.ts b/src/interfaces/results.ts
index 1acadec3..b3e6d9e3 100644
--- a/src/interfaces/results.ts
+++ b/src/interfaces/results.ts
@@ -19,7 +19,7 @@ export interface Assignment {
 		type: "academic" | "general";
 		stats: Stat[];
 	}[];
-	exams: {id: string; module: Module}[];
+	exams: {id: string; module: Module, assignee: string}[];
 	startDate: Date;
 	endDate: Date;
 }
diff --git a/src/pages/api/assignments/index.ts b/src/pages/api/assignments/index.ts
index eb59649e..37ee47a1 100644
--- a/src/pages/api/assignments/index.ts
+++ b/src/pages/api/assignments/index.ts
@@ -5,6 +5,10 @@ import {getFirestore, collection, getDocs, query, where, setDoc, doc} from "fire
 import {withIronSessionApiRoute} from "iron-session/next";
 import {sessionOptions} from "@/lib/session";
 import {uuidv4} from "@firebase/util";
+import { Module } from "@/interfaces";
+import { getExams } from "@/utils/exams.be";
+import { Exam } from "@/interfaces/exam";
+import { flatten } from "lodash";
 
 const db = getFirestore(app);
 
@@ -34,8 +38,65 @@ async function GET(req: NextApiRequest, res: NextApiResponse) {
 	res.status(200).json(docs);
 }
 
-async function POST(req: NextApiRequest, res: NextApiResponse) {
-	await setDoc(doc(db, "assignments", uuidv4()), {assigner: req.session.user?.id, ...req.body});
-
-	res.status(200).json({ok: true});
+interface ExamWithUser {
+  module: Module;
+  id: string;
+  assignee: string;
+}
+
+function getRandomIndex(arr: any[]): number {
+  const randomIndex = Math.floor(Math.random() * arr.length);
+  return randomIndex;
+}
+
+async function POST(req: NextApiRequest, res: NextApiResponse) {
+  const { selectedModules, assignees, ...body } = req.body as {
+    selectedModules: Module[];
+    assignees: string[];
+  };
+
+  // for optimization purposes, it would be better to create a new endpoint that returned the answers for all users at once
+  const allExams = await assignees.map(async (assignee) => {
+    const selectedModulePromises = await selectedModules.map(
+      async (module: Module) => {
+        try {
+          const exams: Exam[] = await getExams(db, module, "true", assignee);
+
+          const exam = exams[getRandomIndex(exams)];
+          if (exam) {
+            return { module: exam.module, id: exam.id, assignee };
+          }
+          return null;
+        } catch (e) {
+          console.error(e);
+          return null;
+        }
+      },
+      []
+    );
+    const newModules = await Promise.all(selectedModulePromises);
+
+    return newModules;
+  }, []);
+
+  const exams = flatten(await Promise.all(allExams)).filter(
+    (x) => x !== null
+  ) as ExamWithUser[];
+
+  if (exams.length === 0) {
+    res
+      .status(400)
+      .json({ ok: false, error: "No exams found for the selected modules" });
+    return;
+  }
+
+  await setDoc(doc(db, "assignments", uuidv4()), {
+    assigner: req.session.user?.id,
+    assignees,
+    results: [],
+    exams,
+    ...body,
+  });
+
+  res.status(200).json({ ok: true });
 }

From f48885bba66eeffe6060e974a691cc484948098b Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Thu, 7 Dec 2023 18:23:44 +0000
Subject: [PATCH 08/18] Updatd UI to display the unique tests for each user in
 an assignment

---
 src/dashboards/Student.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/dashboards/Student.tsx b/src/dashboards/Student.tsx
index d93a0780..ec67cff7 100644
--- a/src/dashboards/Student.tsx
+++ b/src/dashboards/Student.tsx
@@ -38,7 +38,7 @@ export default function StudentDashboard({user}: Props) {
 	const setAssignment = useExamStore((state) => state.setAssignment);
 
 	const startAssignment = (assignment: Assignment) => {
-		const examPromises = assignment.exams.map((e) => getExamById(e.module, e.id));
+		const examPromises = assignment.exams.filter((e) => e.assignee === user.id).map((e) => getExamById(e.module, e.id));
 
 		Promise.all(examPromises).then((exams) => {
 			if (exams.every((x) => !!x)) {
@@ -121,6 +121,7 @@ export default function StudentDashboard({user}: Props) {
 								<div className="flex justify-between w-full items-center">
 									<div className="grid grid-cols-2 gap-2 place-items-center justify-center w-fit min-w-[104px] -md:mt-2">
 										{assignment.exams
+											.filter((e) => e.assignee === user.id)
 											.map((e) => e.module)
 											.sort(sortByModuleName)
 											.map((module) => (

From 0049ab272b7f30e7ac43a5fb3112181d4fefa762 Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Thu, 7 Dec 2023 23:07:35 +0000
Subject: [PATCH 09/18] Added dynamic generation of exams as an option

---
 src/dashboards/AssignmentCreator.tsx |  11 ++-
 src/pages/api/assignments/index.ts   | 100 +++++++++++++++++++--------
 src/utils/exams.be.ts                |   2 +-
 3 files changed, 82 insertions(+), 31 deletions(-)

diff --git a/src/dashboards/AssignmentCreator.tsx b/src/dashboards/AssignmentCreator.tsx
index e55faa60..fe1b9c68 100644
--- a/src/dashboards/AssignmentCreator.tsx
+++ b/src/dashboards/AssignmentCreator.tsx
@@ -18,6 +18,7 @@ import {getExam} from "@/utils/exams";
 import {toast} from "react-toastify";
 import {uuidv4} from "@firebase/util";
 import {Assignment} from "@/interfaces/results";
+import Checkbox from "@/components/Low/Checkbox";
 
 interface Props {
 	isCreating: boolean;
@@ -35,6 +36,8 @@ export default function AssignmentCreator({isCreating, assignment, assigner, gro
 	const [isLoading, setIsLoading] = useState(false);
 	const [startDate, setStartDate] = useState<Date | null>(assignment ? moment(assignment.startDate).toDate() : moment().add(1, "day").toDate());
 	const [endDate, setEndDate] = useState<Date | null>(assignment ? moment(assignment.endDate).toDate() : moment().add(8, "day").toDate());
+	// creates a new exam for each assignee or just one exam for all assignees
+	const [generateMultiple, setGenerateMultiple] = useState<boolean>(false);
 
 	const toggleModule = (module: Module) => {
 		const modules = selectedModules.filter((x) => x !== module);
@@ -55,7 +58,8 @@ export default function AssignmentCreator({isCreating, assignment, assigner, gro
         name,
         startDate,
         endDate,
-		selectedModules
+		selectedModules,
+		generateMultiple,
       }
     )
       .then(() => {
@@ -280,6 +284,11 @@ export default function AssignmentCreator({isCreating, assignment, assigner, gro
 						))}
 					</div>
 				</section>
+				<div className="flex gap-4 w-full justify-end">
+					<Checkbox isChecked={generateMultiple} onChange={() => setGenerateMultiple(d => !d)}>
+						Generate an unique exam for each student
+					</Checkbox>
+				</div>
 				<div className="flex gap-4 w-full justify-end">
 					<Button className="w-full max-w-[200px]" variant="outline" onClick={cancelCreation} disabled={isLoading} isLoading={isLoading}>
 						Cancel
diff --git a/src/pages/api/assignments/index.ts b/src/pages/api/assignments/index.ts
index 37ee47a1..f5a87acd 100644
--- a/src/pages/api/assignments/index.ts
+++ b/src/pages/api/assignments/index.ts
@@ -49,40 +49,82 @@ function getRandomIndex(arr: any[]): number {
   return randomIndex;
 }
 
+const generateExams = async (
+  generateMultiple: Boolean,
+  selectedModules: Module[],
+  assignees: string[]
+): Promise<ExamWithUser[]> => {
+  if (generateMultiple) {
+    // for optimization purposes, it would be better to create a new endpoint that returned the answers for all users at once
+    const allExams = await assignees.map(async (assignee) => {
+      const selectedModulePromises = await selectedModules.map(
+        async (module: Module) => {
+          try {
+            const exams: Exam[] = await getExams(db, module, "true", assignee);
+
+            const exam = exams[getRandomIndex(exams)];
+            if (exam) {
+              return { module: exam.module, id: exam.id, assignee };
+            }
+            return null;
+          } catch (e) {
+            console.error(e);
+            return null;
+          }
+        },
+        []
+      );
+      const newModules = await Promise.all(selectedModulePromises);
+
+      return newModules;
+    }, []);
+
+    const exams = flatten(await Promise.all(allExams)).filter(
+      (x) => x !== null
+    ) as ExamWithUser[];
+    return exams;
+  }
+
+  const selectedModulePromises = await selectedModules.map(
+    async (module: Module) => {
+      const exams: Exam[] = await getExams(db, module, "false", undefined);
+      const exam = exams[getRandomIndex(exams)];
+
+      if (exam) {
+        return { module: exam.module, id: exam.id };
+      }
+      return null;
+    }
+  );
+
+  const exams = await Promise.all(selectedModulePromises);
+  const examesFiltered = exams.filter((x) => x !== null) as ExamWithUser[];
+  return flatten(
+    assignees.map((assignee) =>
+      examesFiltered.map((exam) => ({ ...exam, assignee }))
+    )
+  );
+};
+
 async function POST(req: NextApiRequest, res: NextApiResponse) {
-  const { selectedModules, assignees, ...body } = req.body as {
+  const {
+    selectedModules,
+    assignees,
+    // Generarte multiple true would generate an unique exam for eacah user
+    // false would generate the same exam for all usersa
+    generateMultiple = false,
+    ...body
+  } = req.body as {
     selectedModules: Module[];
     assignees: string[];
+    generateMultiple: Boolean;
   };
 
-  // for optimization purposes, it would be better to create a new endpoint that returned the answers for all users at once
-  const allExams = await assignees.map(async (assignee) => {
-    const selectedModulePromises = await selectedModules.map(
-      async (module: Module) => {
-        try {
-          const exams: Exam[] = await getExams(db, module, "true", assignee);
-
-          const exam = exams[getRandomIndex(exams)];
-          if (exam) {
-            return { module: exam.module, id: exam.id, assignee };
-          }
-          return null;
-        } catch (e) {
-          console.error(e);
-          return null;
-        }
-      },
-      []
-    );
-    const newModules = await Promise.all(selectedModulePromises);
-
-    return newModules;
-  }, []);
-
-  const exams = flatten(await Promise.all(allExams)).filter(
-    (x) => x !== null
-  ) as ExamWithUser[];
-
+  const exams: ExamWithUser[] = await generateExams(
+    generateMultiple,
+    selectedModules,
+    assignees
+  );
   if (exams.length === 0) {
     res
       .status(400)
diff --git a/src/utils/exams.be.ts b/src/utils/exams.be.ts
index ee9832f3..78ac1914 100644
--- a/src/utils/exams.be.ts
+++ b/src/utils/exams.be.ts
@@ -18,7 +18,7 @@ export const getExams = async (
   // added userId as due to assignments being set from the teacher to the student
   // we need to make sure we are serving exams not executed by the user and not
   // by the teacher that performed the request
-  userId: string
+  userId: string | undefined
 ): Promise<Exam[]> => {
   const moduleRef = collection(db, module);
 

From 7dc9d568d13886220d0744a22baab544be027940 Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Thu, 7 Dec 2023 23:13:42 +0000
Subject: [PATCH 10/18] Replaced Teachers Icon

---
 src/dashboards/Admin.tsx     | 4 ++--
 src/dashboards/Corporate.tsx | 4 ++--
 src/dashboards/Teacher.tsx   | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/dashboards/Admin.tsx b/src/dashboards/Admin.tsx
index f50ff99d..0c4f52e3 100644
--- a/src/dashboards/Admin.tsx
+++ b/src/dashboards/Admin.tsx
@@ -13,7 +13,7 @@ import {
 	BsGlobeCentralSouthAsia,
 	BsPerson,
 	BsPersonFill,
-	BsPersonLinesFill,
+	BsPencilSquare,
 	BsBank,
 } from "react-icons/bs";
 import UserCard from "@/components/UserCard";
@@ -199,7 +199,7 @@ export default function AdminDashboard({user}: Props) {
 					color="purple"
 				/>
 				<IconCard
-					Icon={BsPersonLinesFill}
+					Icon={BsPencilSquare}
 					label="Teachers"
 					value={users.filter((x) => x.type === "teacher").length}
 					onClick={() => setPage("teachers")}
diff --git a/src/dashboards/Corporate.tsx b/src/dashboards/Corporate.tsx
index 54a50473..600d0f89 100644
--- a/src/dashboards/Corporate.tsx
+++ b/src/dashboards/Corporate.tsx
@@ -19,7 +19,7 @@ import {
 	BsPersonFill,
 	BsPersonFillGear,
 	BsPersonGear,
-	BsPersonLinesFill,
+	BsPencilSquare,
 } from "react-icons/bs";
 import UserCard from "@/components/UserCard";
 import useGroups from "@/hooks/useGroups";
@@ -170,7 +170,7 @@ export default function CorporateDashboard({user}: Props) {
 				/>
 				<IconCard
 					onClick={() => setPage("teachers")}
-					Icon={BsPersonLinesFill}
+					Icon={BsPencilSquare}
 					label="Teachers"
 					value={users.filter(teacherFilter).length}
 					color="purple"
diff --git a/src/dashboards/Teacher.tsx b/src/dashboards/Teacher.tsx
index 54dfede6..b166ed38 100644
--- a/src/dashboards/Teacher.tsx
+++ b/src/dashboards/Teacher.tsx
@@ -24,7 +24,6 @@ import {
 	BsPersonFill,
 	BsPersonFillGear,
 	BsPersonGear,
-	BsPersonLinesFill,
 	BsPlus,
 	BsRepeat,
 	BsRepeat1,

From e70e26f84cd9829086e14af2b95897fe772e64c0 Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Thu, 7 Dec 2023 23:17:23 +0000
Subject: [PATCH 11/18] Updated checkbox string

---
 src/dashboards/AssignmentCreator.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dashboards/AssignmentCreator.tsx b/src/dashboards/AssignmentCreator.tsx
index fe1b9c68..358f3721 100644
--- a/src/dashboards/AssignmentCreator.tsx
+++ b/src/dashboards/AssignmentCreator.tsx
@@ -286,7 +286,7 @@ export default function AssignmentCreator({isCreating, assignment, assigner, gro
 				</section>
 				<div className="flex gap-4 w-full justify-end">
 					<Checkbox isChecked={generateMultiple} onChange={() => setGenerateMultiple(d => !d)}>
-						Generate an unique exam for each student
+						Generate different exams
 					</Checkbox>
 				</div>
 				<div className="flex gap-4 w-full justify-end">

From db7762c6e29476fd46564f110b3ca9d0bcc7f712 Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Thu, 7 Dec 2023 23:20:19 +0000
Subject: [PATCH 12/18] Replaced Teacher labels

---
 src/dashboards/Admin.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dashboards/Admin.tsx b/src/dashboards/Admin.tsx
index 0c4f52e3..6e1529cc 100644
--- a/src/dashboards/Admin.tsx
+++ b/src/dashboards/Admin.tsx
@@ -297,7 +297,7 @@ export default function AdminDashboard({user}: Props) {
 					</div>
 				</div>
 				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Teachers expiring in 1 month</span>
+					<span className="p-4">Country Manager expiring in 1 month</span>
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
 						{users
 							.filter(
@@ -341,7 +341,7 @@ export default function AdminDashboard({user}: Props) {
 					</div>
 				</div>
 				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Expired Teachers</span>
+					<span className="p-4">Expired Country Manager</span>
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
 						{users
 							.filter(

From fe32584ff952f5f39926e921a18df40d2400bbfd Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Thu, 7 Dec 2023 23:23:39 +0000
Subject: [PATCH 13/18] Add Inactive Country manager

---
 src/dashboards/Admin.tsx | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/dashboards/Admin.tsx b/src/dashboards/Admin.tsx
index 6e1529cc..33410fd6 100644
--- a/src/dashboards/Admin.tsx
+++ b/src/dashboards/Admin.tsx
@@ -148,6 +148,26 @@ export default function AdminDashboard({user}: Props) {
 		</>
 	);
 
+	const InactiveCountryManagerList = () => {
+		const filter = (x: User) => x.type === "agent" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
+
+		return (
+			<>
+				<div className="flex flex-col gap-4">
+					<div
+						onClick={() => setPage("")}
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+						<BsArrowLeft className="text-xl" />
+						<span>Back</span>
+					</div>
+					<h2 className="text-2xl font-semibold">Inactive Country Managers ({users.filter(filter).length})</h2>
+				</div>
+
+				<UserList user={user} filters={[filter]} />
+			</>
+		);
+	}
+
 	const InactiveStudentsList = () => {
 		const filter = (x: User) => x.type === "student" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
 
@@ -235,6 +255,16 @@ export default function AdminDashboard({user}: Props) {
 					}
 					color="rose"
 				/>
+				<IconCard
+					onClick={() => setPage("inactiveCountryManagers")}
+					Icon={BsPerson}
+					label="Inactive Country Managers"
+					value={
+						users.filter((x) => x.type === "agent" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate)))
+							.length
+					}
+					color="rose"
+				/>
 				<IconCard
 					onClick={() => setPage("inactiveCorporate")}
 					Icon={BsPerson}
@@ -453,7 +483,9 @@ export default function AdminDashboard({user}: Props) {
 			{page === "agents" && <AgentsList />}
 			{page === "inactiveStudents" && <InactiveStudentsList />}
 			{page === "inactiveCorporate" && <InactiveCorporateList />}
+			{page === "inactiveCountryManagers" && <InactiveCountryManagerList />}
 			{page === "" && <DefaultDashboard />}
+			
 		</>
 	);
 }

From ec56a5426b38524961673aec9f30f0e4c789c778 Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Thu, 7 Dec 2023 23:31:16 +0000
Subject: [PATCH 14/18] Added Inactive Referred corporate

---
 src/dashboards/Agent.tsx | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/dashboards/Agent.tsx b/src/dashboards/Agent.tsx
index 4c4cd21e..38183407 100644
--- a/src/dashboards/Agent.tsx
+++ b/src/dashboards/Agent.tsx
@@ -41,6 +41,7 @@ export default function AgentDashboard({user}: Props) {
 	const corporateFilter = (user: User) => user.type === "corporate";
 	const referredCorporateFilter = (x: User) =>
 		x.type === "corporate" && !!x.corporateInformation && x.corporateInformation.referralAgent === user.id;
+	const inactiveReferredCorporateFilter = (x: User) => referredCorporateFilter(x)  && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
 
 	const UserDisplay = (displayUser: User) => (
 		<div
@@ -59,8 +60,6 @@ export default function AgentDashboard({user}: Props) {
 	);
 
 	const ReferredCorporateList = () => {
-		const filter = (x: User) => x.type === "corporate" && !!x.corporateInformation && x.corporateInformation.referralAgent === user.id;
-
 		return (
 			<>
 				<div className="flex flex-col gap-4">
@@ -70,10 +69,28 @@ export default function AgentDashboard({user}: Props) {
 						<BsArrowLeft className="text-xl" />
 						<span>Back</span>
 					</div>
-					<h2 className="text-2xl font-semibold">Referred Corporate ({users.filter(filter).length})</h2>
+					<h2 className="text-2xl font-semibold">Referred Corporate ({users.filter(referredCorporateFilter).length})</h2>
 				</div>
 
-				<UserList user={user} filters={[filter]} />
+				<UserList user={user} filters={[referredCorporateFilter]} />
+			</>
+		);
+	};
+
+	const InactiveReferredCorporateList = () => {
+		return (
+			<>
+				<div className="flex flex-col gap-4">
+					<div
+						onClick={() => setPage("")}
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+						<BsArrowLeft className="text-xl" />
+						<span>Back</span>
+					</div>
+					<h2 className="text-2xl font-semibold">Inactive Referred Corporate ({users.filter(inactiveReferredCorporateFilter).length})</h2>
+				</div>
+
+				<UserList user={user} filters={[inactiveReferredCorporateFilter]} />
 			</>
 		);
 	};
@@ -108,6 +125,13 @@ export default function AgentDashboard({user}: Props) {
 					value={users.filter(referredCorporateFilter).length}
 					color="purple"
 				/>
+				<IconCard
+					onClick={() => setPage("inactiveReferredCorporate")}
+					Icon={BsPersonFill}
+					label="Inactive Referred Corporate"
+					value={users.filter(inactiveReferredCorporateFilter).length}
+					color="rose"
+				/>
 				<IconCard
 					onClick={() => setPage("corporate")}
 					Icon={BsBank}
@@ -168,6 +192,7 @@ export default function AgentDashboard({user}: Props) {
 			</Modal>
 			{page === "referredCorporate" && <ReferredCorporateList />}
 			{page === "corporate" && <CorporateList />}
+			{page === "inactiveReferredCorporate" && <InactiveReferredCorporateList />}
 			{page === "" && <DefaultDashboard />}
 		</>
 	);

From 26c4368f31d99fd46b640464a656eb7bfaeabc5e Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Thu, 7 Dec 2023 23:34:31 +0000
Subject: [PATCH 15/18] Minor improvement on reusability of filter function

---
 src/dashboards/Admin.tsx | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/dashboards/Admin.tsx b/src/dashboards/Admin.tsx
index 33410fd6..49b9c654 100644
--- a/src/dashboards/Admin.tsx
+++ b/src/dashboards/Admin.tsx
@@ -42,6 +42,8 @@ export default function AdminDashboard({user}: Props) {
 		setShowModal(!!selectedUser && page === "");
 	}, [selectedUser, page]);
 
+	const inactiveCountryManagerFilter = (x: User) => x.type === "agent" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
+
 	const UserDisplay = (displayUser: User) => (
 		<div
 			onClick={() => setSelectedUser(displayUser)}
@@ -149,8 +151,6 @@ export default function AdminDashboard({user}: Props) {
 	);
 
 	const InactiveCountryManagerList = () => {
-		const filter = (x: User) => x.type === "agent" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
-
 		return (
 			<>
 				<div className="flex flex-col gap-4">
@@ -160,10 +160,10 @@ export default function AdminDashboard({user}: Props) {
 						<BsArrowLeft className="text-xl" />
 						<span>Back</span>
 					</div>
-					<h2 className="text-2xl font-semibold">Inactive Country Managers ({users.filter(filter).length})</h2>
+					<h2 className="text-2xl font-semibold">Inactive Country Managers ({users.filter(inactiveCountryManagerFilter).length})</h2>
 				</div>
 
-				<UserList user={user} filters={[filter]} />
+				<UserList user={user} filters={[inactiveCountryManagerFilter]} />
 			</>
 		);
 	}
@@ -259,10 +259,7 @@ export default function AdminDashboard({user}: Props) {
 					onClick={() => setPage("inactiveCountryManagers")}
 					Icon={BsPerson}
 					label="Inactive Country Managers"
-					value={
-						users.filter((x) => x.type === "agent" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate)))
-							.length
-					}
+					value={users.filter(inactiveCountryManagerFilter).length}
 					color="rose"
 				/>
 				<IconCard

From d46f92edb28b6f0d52fd7ca1eed2deb2c11089c2 Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Thu, 7 Dec 2023 23:42:04 +0000
Subject: [PATCH 16/18] Added Referenced corporate expiring in 1 month

---
 src/dashboards/Agent.tsx | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/dashboards/Agent.tsx b/src/dashboards/Agent.tsx
index 38183407..0ed93eea 100644
--- a/src/dashboards/Agent.tsx
+++ b/src/dashboards/Agent.tsx
@@ -164,6 +164,21 @@ export default function AgentDashboard({user}: Props) {
 							))}
 					</div>
 				</div>
+				<div className="bg-white shadow flex flex-col rounded-xl w-full">
+					<span className="p-4">Referenced corporate expiring in 1 month</span>
+					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
+						{users
+							.filter(
+								(x) =>
+									referredCorporateFilter(x) &&
+									moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
+									moment().isBefore(moment(x.subscriptionExpirationDate)),
+							)
+							.map((x) => (
+								<UserDisplay key={x.id} {...x} />
+							))}
+					</div>
+				</div>
 			</section>
 		</>
 	);

From dfbbf0456da9e3be45b6276d2cba078b71067986 Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Fri, 8 Dec 2023 14:55:16 +0000
Subject: [PATCH 17/18] Revert "Changed Comercial labels to Corporate"

This reverts commit 9c8d7988c5743c8af4d86df7e43348eaba65f7d0.
---
 src/components/DemographicInformationInput.tsx |  8 ++++----
 src/components/UserCard.tsx                    | 10 +++++-----
 src/pages/profile.tsx                          |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/DemographicInformationInput.tsx b/src/components/DemographicInformationInput.tsx
index 1f90ff21..222dc546 100644
--- a/src/components/DemographicInformationInput.tsx
+++ b/src/components/DemographicInformationInput.tsx
@@ -24,7 +24,7 @@ export default function DemographicInformationInput({user, mutateUser}: Props) {
 	const [position, setPosition] = useState<string>();
 	const [isLoading, setIsLoading] = useState(false);
 
-	const [corporateName, setCorporateName] = useState<string>();
+	const [companyName, setCompanyName] = useState<string>();
 	const [commercialRegistration, setCommercialRegistration] = useState<string>();
 
 	const save = (e?: FormEvent) => {
@@ -40,7 +40,7 @@ export default function DemographicInformationInput({user, mutateUser}: Props) {
 					employment: user.type === "corporate" ? undefined : employment,
 					position: user.type === "corporate" ? position : undefined,
 				},
-				agentInformation: user.type === "agent" ? {corporateName, commercialRegistration} : undefined,
+				agentInformation: user.type === "agent" ? {companyName, commercialRegistration} : undefined,
 			})
 			.then((response) => mutateUser((response.data as {user: User}).user))
 			.catch(() => {
@@ -62,7 +62,7 @@ export default function DemographicInformationInput({user, mutateUser}: Props) {
 			<form className="flex flex-col items-center justify-items-center gap-6 w-full h-full -md:px-4 lg:w-1/2 mb-32" onSubmit={save}>
 				{user.type === "agent" && (
 					<div className="w-full flex gap-8">
-						<Input type="text" onChange={setCorporateName} name="corporateName" label="Corporate Name" required />
+						<Input type="text" onChange={setCompanyName} name="companyName" label="Company Name" required />
 						<Input
 							type="text"
 							onChange={setCommercialRegistration}
@@ -157,7 +157,7 @@ export default function DemographicInformationInput({user, mutateUser}: Props) {
 						!phone ||
 						!gender ||
 						(user.type === "corporate" ? !position : !employment) ||
-						(user.type === "agent" ? !corporateName || !commercialRegistration : false)
+						(user.type === "agent" ? !companyName || !commercialRegistration : false)
 					}>
 					{!isLoading && "Save information"}
 					{isLoading && (
diff --git a/src/components/UserCard.tsx b/src/components/UserCard.tsx
index f81302ac..682b32d8 100644
--- a/src/components/UserCard.tsx
+++ b/src/components/UserCard.tsx
@@ -146,11 +146,11 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
 				<>
 					<div className="grid grid-cols-1 md:grid-cols-2 gap-8 w-full">
 						<Input
-							label="Corporate Name"
+							label="Company Name"
 							type="text"
 							name="companyName"
 							onChange={setCompanyName}
-							placeholder="Enter corporate name"
+							placeholder="Enter company name"
 							defaultValue={companyName}
 							required
 						/>
@@ -159,7 +159,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
 							type="text"
 							name="commercialRegistration"
 							onChange={setCommercialRegistration}
-							placeholder="Enter commercial registration"
+							placeholder="Enter company name"
 							defaultValue={commercialRegistration}
 							required
 						/>
@@ -171,11 +171,11 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
 				<>
 					<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 w-full">
 						<Input
-							label="Corporate Name"
+							label="Company Name"
 							type="text"
 							name="companyName"
 							onChange={setCompanyName}
-							placeholder="Enter corporate name"
+							placeholder="Enter company name"
 							defaultValue={companyName}
 						/>
 						<Input
diff --git a/src/pages/profile.tsx b/src/pages/profile.tsx
index 54ff55cc..b9aa8289 100644
--- a/src/pages/profile.tsx
+++ b/src/pages/profile.tsx
@@ -214,11 +214,11 @@ export default function Home() {
 									{user.type === "agent" && (
 										<div className="grid grid-cols-1 md:grid-cols-2 gap-8 w-full">
 											<Input
-												label="Corporate Name"
+												label="Company Name"
 												type="text"
 												name="companyName"
 												onChange={() => null}
-												placeholder="Enter corporate name"
+												placeholder="Enter company name"
 												defaultValue={user.agentInformation.companyName}
 												disabled
 											/>
@@ -227,7 +227,7 @@ export default function Home() {
 												type="text"
 												name="commercialRegistration"
 												onChange={() => null}
-												placeholder="Enter commercial registration"
+												placeholder="Enter company name"
 												defaultValue={user.agentInformation.commercialRegistration}
 												disabled
 											/>

From 450a4e9fe385390b79e85c2603f909f9794f3467 Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Fri, 8 Dec 2023 15:43:19 +0000
Subject: [PATCH 18/18] Changed Comercial labels to Corporate

---
 src/components/DemographicInformationInput.tsx |  2 +-
 src/components/UserCard.tsx                    | 10 +++++-----
 src/pages/profile.tsx                          |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/DemographicInformationInput.tsx b/src/components/DemographicInformationInput.tsx
index 222dc546..2468178e 100644
--- a/src/components/DemographicInformationInput.tsx
+++ b/src/components/DemographicInformationInput.tsx
@@ -62,7 +62,7 @@ export default function DemographicInformationInput({user, mutateUser}: Props) {
 			<form className="flex flex-col items-center justify-items-center gap-6 w-full h-full -md:px-4 lg:w-1/2 mb-32" onSubmit={save}>
 				{user.type === "agent" && (
 					<div className="w-full flex gap-8">
-						<Input type="text" onChange={setCompanyName} name="companyName" label="Company Name" required />
+						<Input type="text" onChange={setCompanyName} name="companyName" label="Corporate Name" required />
 						<Input
 							type="text"
 							onChange={setCommercialRegistration}
diff --git a/src/components/UserCard.tsx b/src/components/UserCard.tsx
index 76e8a830..98db4a77 100644
--- a/src/components/UserCard.tsx
+++ b/src/components/UserCard.tsx
@@ -146,11 +146,11 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
 				<>
 					<div className="grid grid-cols-1 md:grid-cols-2 gap-8 w-full">
 						<Input
-							label="Company Name"
+							label="Corporate Name"
 							type="text"
 							name="companyName"
 							onChange={setCompanyName}
-							placeholder="Enter company name"
+							placeholder="Enter corporate name"
 							defaultValue={companyName}
 							required
 						/>
@@ -159,7 +159,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
 							type="text"
 							name="commercialRegistration"
 							onChange={setCommercialRegistration}
-							placeholder="Enter company name"
+							placeholder="Enter commercial registration"
 							defaultValue={commercialRegistration}
 							required
 						/>
@@ -171,11 +171,11 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
 				<>
 					<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 w-full">
 						<Input
-							label="Company Name"
+							label="Corporate Name"
 							type="text"
 							name="companyName"
 							onChange={setCompanyName}
-							placeholder="Enter company name"
+							placeholder="Enter corporate name"
 							defaultValue={companyName}
 						/>
 						<Input
diff --git a/src/pages/profile.tsx b/src/pages/profile.tsx
index b9aa8289..54ff55cc 100644
--- a/src/pages/profile.tsx
+++ b/src/pages/profile.tsx
@@ -214,11 +214,11 @@ export default function Home() {
 									{user.type === "agent" && (
 										<div className="grid grid-cols-1 md:grid-cols-2 gap-8 w-full">
 											<Input
-												label="Company Name"
+												label="Corporate Name"
 												type="text"
 												name="companyName"
 												onChange={() => null}
-												placeholder="Enter company name"
+												placeholder="Enter corporate name"
 												defaultValue={user.agentInformation.companyName}
 												disabled
 											/>
@@ -227,7 +227,7 @@ export default function Home() {
 												type="text"
 												name="commercialRegistration"
 												onChange={() => null}
-												placeholder="Enter company name"
+												placeholder="Enter commercial registration"
 												defaultValue={user.agentInformation.commercialRegistration}
 												disabled
 											/>