Created two new permissions

Merged in approval-workflows (pull request #152 )
Approval workflows Approved-by: Tiago Ribeiro
2025-02-17 10:32:57 +00:00 · 2025-02-11 12:09:17 +00:00 · 2025-02-10 13:25:11 +00:00 · 2025-02-10 11:30:24 +00:00 · 2025-02-09 21:12:29 +00:00 · 2025-02-09 20:56:55 +00:00
43 changed files with 2241 additions and 1726 deletions
--- a/scripts/updatePrivateFieldExams.js
+++ b/scripts/updatePrivateFieldExams.js
@@ -0,0 +1,51 @@
+import dotenv from "dotenv";
+dotenv.config();
+import { MongoClient } from "mongodb";
+const uri = process.env.MONGODB_URI || "";
+const options = {
+  maxPoolSize: 10,
+};
+const dbName = process.env.MONGODB_DB; // change this to prod db when needed
+async function migrateData() {
+  const MODULE_ARRAY = ["reading", "listening", "writing", "speaking", "level"];
+  const client = new MongoClient(uri, options);
+
+  try {
+    await client.connect();
+    console.log("Connected to MongoDB");
+    if (!process.env.MONGODB_DB) {
+      throw new Error("Missing env var: MONGODB_DB");
+    }
+    const db = client.db(dbName);
+    for (const string of MODULE_ARRAY) {
+      const collection = db.collection(string);
+      const result = await collection.updateMany(
+        { private: { $exists: false } },
+        { $set: { access: "public" } }
+      );
+      const result2 = await collection.updateMany(
+        { private: true },
+        { $set: { access: "private" }, $unset: { private: "" } }
+      );
+      const result1 = await collection.updateMany(
+        { private: { $exists: true } },
+        { $set: { access: "public" } }
+      );
+      console.log(
+        `Updated ${
+          result.modifiedCount + result1.modifiedCount
+        } documents to "access: public" in ${string}`
+      );
+      console.log(
+        `Updated ${result2.modifiedCount} documents to "access: private" and removed private var in ${string}`
+      );
+    }
+    console.log("Migration completed successfully!");
+  } catch (error) {
+    console.error("Migration failed:", error);
+  } finally {
+    await client.close();
+    console.log("MongoDB connection closed.");
+  }
+}
+//migrateData(); // uncomment to run the migration
--- a/src/components/Diagnostic.tsx
+++ b/src/components/Diagnostic.tsx
@@ -1,17 +1,12 @@
-import {infoButtonStyle} from "@/constants/buttonStyles";
-import {Module} from "@/interfaces";
 import {User} from "@/interfaces/user";
 import useExamStore from "@/stores/exam";
-import {getExam, getExamById} from "@/utils/exams";
+import {getExam} from "@/utils/exams";
 import {MODULE_ARRAY} from "@/utils/moduleUtils";
-import {writingMarking} from "@/utils/score";
-import {Menu} from "@headlessui/react";
 import axios from "axios";
 import clsx from "clsx";
-import {capitalize} from "lodash";
 import {useRouter} from "next/router";
-import {useEffect, useState} from "react";
-import {BsBook, BsChevronDown, BsHeadphones, BsMegaphone, BsPen, BsQuestionSquare} from "react-icons/bs";
+import { useState} from "react";
+import { BsQuestionSquare} from "react-icons/bs";
 import {toast} from "react-toastify";
 import Button from "./Low/Button";
 import ModuleLevelSelector from "./Medium/ModuleLevelSelector";
--- a/src/components/ExamEditor/SettingsEditor/index.tsx
+++ b/src/components/ExamEditor/SettingsEditor/index.tsx
@@ -19,7 +19,7 @@ interface SettingsEditorProps {
    children?: ReactNode;
    canPreview: boolean;
    canSubmit: boolean;
-    submitModule: () => void;
+    submitModule: (requiresApproval: boolean) => void;
    preview: () => void;
 }

@@ -148,18 +148,33 @@ const SettingsEditor: React.FC<SettingsEditorProps> = ({
                    </div>
                </Dropdown>
                {children}
-                <div className="flex flex-row justify-between mt-4">
+                <div className="flex flex-col gap-3 mt-4">
                    <button
                        className={clsx(
                            "flex items-center justify-center px-4 py-2 text-white rounded-xl transition-colors duration-300",
                            `bg-ielts-${module}/70 border border-ielts-${module} hover:bg-ielts-${module} disabled:bg-ielts-${module}/30`,
                            "disabled:cursor-not-allowed disabled:text-gray-200"
                        )}
-                        onClick={submitModule}
+                        onClick={() => submitModule(true)}
                        disabled={!canSubmit}
                    >
                        <FaFileUpload className="mr-2" size={18} />
-                        Submit Module as Exam
+                        Submit module as exam for approval
+                    </button>
+                    <button
+                        className={clsx(
+                            "flex items-center justify-center px-4 py-2 text-white rounded-xl transition-colors duration-300",
+                            `bg-ielts-${module}/70 border border-ielts-${module} hover:bg-ielts-${module} disabled:bg-ielts-${module}/30`,
+                            "disabled:cursor-not-allowed disabled:text-gray-200"
+                        )}
+                        onClick={() => {
+                            if (!confirm(`Are you sure you want to skip the approval process for this exam?`)) return;
+                            submitModule(false);
+                        }}
+                        disabled={!canSubmit}
+                    >
+                        <FaFileUpload className="mr-2" size={18} />
+                        Submit module as exam and skip approval process
                    </button>
                    <button
                        className={clsx(
@@ -171,7 +186,7 @@ const SettingsEditor: React.FC<SettingsEditorProps> = ({
                        disabled={!canPreview}
                    >
                        <FaEye className="mr-2" size={18} />
-                        Preview Module
+                        Preview module
                    </button>
                </div>
            </div>
--- a/src/components/ExamEditor/SettingsEditor/level.tsx
+++ b/src/components/ExamEditor/SettingsEditor/level.tsx
@@ -38,7 +38,7 @@ const LevelSettings: React.FC = () => {
        difficulty,
        sections,
        minTimer,
-        isPrivate,
+        access,
    } = useExamEditorStore(state => state.modules[currentModule]);

    const { localSettings, updateLocalAndScheduleGlobal } = useSettingsState<LevelSectionSettings>(
@@ -76,7 +76,7 @@ const LevelSettings: React.FC = () => {
        });
    });

-    const submitLevel = async () => {
+    const submitLevel = async (requiresApproval: boolean) => {
        if (title === "") {
            toast.error("Enter a title for the exam!");
            return;
@@ -195,12 +195,13 @@ const LevelSettings: React.FC = () => {
                        category: s.settings.category
                    };
                }).filter(part => part.exercises.length > 0),
-                isDiagnostic: true, // using isDiagnostic to keep exam hidden until the respective approval workflow is completed.
+                requiresApproval: requiresApproval,
+                isDiagnostic: false,
                minTimer,
                module: "level",
                id: title,
                difficulty,
-                private: isPrivate,
+                access,
            };

            const result = await axios.post('/api/exam/level', exam);
@@ -243,7 +244,7 @@ const LevelSettings: React.FC = () => {
            isDiagnostic: false,
            variant: undefined,
            difficulty,
-            private: isPrivate,
+            access,
        } as LevelExam);
        setExerciseIndex(0);
        setQuestionIndex(0);
--- a/src/components/ExamEditor/SettingsEditor/listening/index.tsx
+++ b/src/components/ExamEditor/SettingsEditor/listening/index.tsx
@@ -27,7 +27,7 @@ const ListeningSettings: React.FC = () => {
        difficulty,
        sections,
        minTimer,
-        isPrivate,
+        access,
        instructionsState
    } = useExamEditorStore(state => state.modules[currentModule]);

@@ -65,7 +65,7 @@ const ListeningSettings: React.FC = () => {
        }
    ];

-    const submitListening = async () => {
+    const submitListening = async (requiresApproval: boolean) => {
        if (title === "") {
            toast.error("Enter a title for the exam!");
            return;
@@ -138,13 +138,14 @@ const ListeningSettings: React.FC = () => {
                            category: s.settings.category
                        };
                    }),
-                    isDiagnostic: true, // using isDiagnostic to keep exam hidden until the respective approval workflow is completed.
+                    requiresApproval: requiresApproval,
+                    isDiagnostic: false,
                    minTimer,
                    module: "listening",
                    id: title,
                    variant: sections.length === 4 ? "full" : "partial",
                    difficulty,
-                    private: isPrivate,
+                    access,
                    instructions: instructionsURL
                };

@@ -191,7 +192,7 @@ const ListeningSettings: React.FC = () => {
            isDiagnostic: false,
            variant: sections.length === 4 ? "full" : "partial",
            difficulty,
-            private: isPrivate,
+            access,
            instructions: instructionsState.currentInstructionsURL
        } as ListeningExam);
        setExerciseIndex(0);
--- a/src/components/ExamEditor/SettingsEditor/reading/index.tsx
+++ b/src/components/ExamEditor/SettingsEditor/reading/index.tsx
@@ -26,43 +26,41 @@ const ReadingSettings: React.FC = () => {
  } = usePersistentExamStore();

  const { currentModule, title } = useExamEditorStore();
-    const {
-        focusedSection,
-        difficulty,
-        sections,
-        minTimer,
-        isPrivate,
-        type,
-    } = useExamEditorStore(state => state.modules[currentModule]);
+  const { focusedSection, difficulty, sections, minTimer, access, type } =
+    useExamEditorStore((state) => state.modules[currentModule]);

-    const { localSettings, updateLocalAndScheduleGlobal } = useSettingsState<ReadingSectionSettings>(
-        currentModule,
-        focusedSection
-    );
-
-    const currentSection = sections.find((section) => section.sectionId == focusedSection)?.state as ReadingPart;
+  const { localSettings, updateLocalAndScheduleGlobal } =
+    useSettingsState<ReadingSectionSettings>(currentModule, focusedSection);

+  const currentSection = sections.find(
+    (section) => section.sectionId == focusedSection
+  )?.state as ReadingPart;

  const defaultPresets: Option[] = [
    {
      label: "Preset: Reading Passage 1",
-            value: "Welcome to {part} of the {label}. You will read texts relating to everyday topics and situations. These may include advertisements, brochures, manuals, or official documents. Answer questions that test your ability to locate specific information and understand main ideas."
+      value:
+        "Welcome to {part} of the {label}. You will read texts relating to everyday topics and situations. These may include advertisements, brochures, manuals, or official documents. Answer questions that test your ability to locate specific information and understand main ideas.",
    },
    {
      label: "Preset: Reading Passage 2",
-            value: "Welcome to {part} of the {label}. You will read texts dealing with general interest topics that may include news articles, company policies, or workplace documents. Answer questions testing your understanding of main ideas, specific details, and the author's views."
+      value:
+        "Welcome to {part} of the {label}. You will read texts dealing with general interest topics that may include news articles, company policies, or workplace documents. Answer questions testing your understanding of main ideas, specific details, and the author's views.",
    },
    {
      label: "Preset: Reading Passage 3",
-            value: "Welcome to {part} of the {label}. You will read longer academic texts that may include journal articles, academic essays, or research papers. Answer questions testing your ability to understand complex arguments, identify key points, and follow the development of ideas."
-        }
+      value:
+        "Welcome to {part} of the {label}. You will read longer academic texts that may include journal articles, academic essays, or research papers. Answer questions testing your ability to understand complex arguments, identify key points, and follow the development of ideas.",
+    },
  ];

  const canPreviewOrSubmit = sections.some(
-        (s) => (s.state as ReadingPart).exercises && (s.state as ReadingPart).exercises.length > 0
+    (s) =>
+      (s.state as ReadingPart).exercises &&
+      (s.state as ReadingPart).exercises.length > 0
  );

-    const submitReading = () => {
+  const submitReading = (requiresApproval: boolean) => {
    if (title === "") {
      toast.error("Enter a title for the exam!");
      return;
@@ -73,20 +71,22 @@ const ReadingSettings: React.FC = () => {
        return {
          ...exercise,
          intro: localSettings.currentIntro,
-                    category: localSettings.category
+          category: localSettings.category,
        };
      }),
-            isDiagnostic: true, // using isDiagnostic to keep exam hidden until the respective approval workflow is completed.
+      requiresApproval: requiresApproval,
+      isDiagnostic: false,
      minTimer,
      module: "reading",
      id: title,
      variant: sections.length === 3 ? "full" : "partial",
      difficulty,
-            private: isPrivate,
-            type: type!
+      access,
+      type: type!,
    };

-        axios.post(`/api/exam/reading`, exam)
+    axios
+      .post(`/api/exam/reading`, exam)
      .then((result) => {
        playSound("sent");
        // Successfully submitted exam
@@ -98,9 +98,12 @@ const ReadingSettings: React.FC = () => {
      })
      .catch((error) => {
        console.log(error);
-                toast.error(error.response.data.error || "Something went wrong while submitting, please try again later.");
-            })
-    }
+        toast.error(
+          error.response.data.error ||
+            "Something went wrong while submitting, please try again later."
+        );
+      });
+  };

  const preview = () => {
    setExam({
@@ -109,7 +112,7 @@ const ReadingSettings: React.FC = () => {
        return {
          ...exercises,
          intro: s.settings.currentIntro,
-                    category: s.settings.category
+          category: s.settings.category,
        };
      }),
      minTimer,
@@ -118,15 +121,15 @@ const ReadingSettings: React.FC = () => {
      isDiagnostic: false,
      variant: undefined,
      difficulty,
-            private: isPrivate,
-            type: type!
+      access: access,
+      type: type!,
    } as ReadingExam);
    setExerciseIndex(0);
    setQuestionIndex(0);
    setPartIndex(0);
    setBgColor("bg-white");
-        openDetachedTab("popout?type=Exam&module=reading", router)
-    }
+    openDetachedTab("popout?type=Exam&module=reading", router);
+  };

  return (
    <SettingsEditor
--- a/src/components/ExamEditor/SettingsEditor/speaking/index.tsx
+++ b/src/components/ExamEditor/SettingsEditor/speaking/index.tsx
@@ -30,7 +30,7 @@ const SpeakingSettings: React.FC = () => {
    } = usePersistentExamStore();

    const { title, currentModule } = useExamEditorStore();
-    const { focusedSection, difficulty, sections, minTimer, isPrivate } = useExamEditorStore((store) => store.modules[currentModule])
+    const { focusedSection, difficulty, sections, minTimer, access } = useExamEditorStore((store) => store.modules[currentModule])

    const section = sections.find((section) => section.sectionId == focusedSection)?.state;

@@ -84,7 +84,7 @@ const SpeakingSettings: React.FC = () => {
        });
    })();

-    const submitSpeaking = async () => {
+    const submitSpeaking = async (requiresApproval: boolean) => {
        if (title === "") {
          toast.error("Enter a title for the exam!");
          return;
@@ -181,11 +181,12 @@ const SpeakingSettings: React.FC = () => {
            minTimer,
            module: "speaking",
            id: title,
-            isDiagnostic: true, // using isDiagnostic to keep exam hidden until the respective approval workflow is completed.
+            requiresApproval: requiresApproval,
+            isDiagnostic: false,
            variant: undefined,
            difficulty,
            instructorGender: "varied",
-            private: isPrivate,
+            access,
          };
      
          const result = await axios.post('/api/exam/speaking', exam);
@@ -238,7 +239,7 @@ const SpeakingSettings: React.FC = () => {
            isDiagnostic: false,
            variant: undefined,
            difficulty,
-            private: isPrivate,
+            access,
        } as SpeakingExam);
        setExerciseIndex(0);
        setQuestionIndex(0);
--- a/src/components/ExamEditor/SettingsEditor/writing/index.tsx
+++ b/src/components/ExamEditor/SettingsEditor/writing/index.tsx
@@ -23,7 +23,7 @@ const WritingSettings: React.FC = () => {
    const {
        minTimer,
        difficulty,
-        isPrivate,
+        access,
        sections,
        focusedSection,
        type,
@@ -81,14 +81,14 @@ const WritingSettings: React.FC = () => {
            isDiagnostic: false,
            variant: undefined,
            difficulty,
-            private: isPrivate,
+            access,
            type: type!
        });
        setExerciseIndex(0);
        openDetachedTab("popout?type=Exam&module=writing", router)
    }

-    const submitWriting = async () => {
+    const submitWriting = async (requiresApproval: boolean) => {
        if (title === "") {
            toast.error("Enter a title for the exam!");
            return;
@@ -131,10 +131,11 @@ const WritingSettings: React.FC = () => {
                minTimer,
                module: "writing",
                id: title,
-                isDiagnostic: true, // using isDiagnostic to keep exam hidden until the respective approval workflow is completed.
+                requiresApproval: requiresApproval,
+                isDiagnostic: false,
                variant: undefined,
                difficulty,
-                private: isPrivate,
+                access,
                type: type!
            };

--- a/src/components/ExamEditor/index.tsx
+++ b/src/components/ExamEditor/index.tsx
@@ -4,8 +4,8 @@ import Checkbox from "../Low/Checkbox";
 import Input from "../Low/Input";
 import Select from "../Low/Select";
 import { capitalize } from "lodash";
-import {Difficulty} from "@/interfaces/exam";
-import {useCallback, useEffect, useMemo, useState} from "react";
+import { AccessType, ACCESSTYPE, Difficulty } from "@/interfaces/exam";
+import { useCallback, useEffect, useState } from "react";
 import { toast } from "react-toastify";
 import { ModuleState, SectionState } from "@/stores/examEditor/types";
 import { Module } from "@/interfaces";
@@ -24,16 +24,25 @@ import {EntityWithRoles} from "@/interfaces/entity";

 const DIFFICULTIES: Difficulty[] = ["A1", "A2", "B1", "B2", "C1", "C2"];

-const ExamEditor: React.FC<{levelParts?: number; entitiesAllowEditPrivacy: EntityWithRoles[]}> = ({
-	levelParts = 0,
-	entitiesAllowEditPrivacy = [],
-}) => {
+const ExamEditor: React.FC<{
+  levelParts?: number;
+  entitiesAllowEditPrivacy: EntityWithRoles[];
+}> = ({ levelParts = 0, entitiesAllowEditPrivacy = [] }) => {
  const { currentModule, dispatch } = useExamEditorStore();
-	const {sections, minTimer, expandedSections, examLabel, isPrivate, difficulty, sectionLabels, importModule} = useExamEditorStore(
-		(state) => state.modules[currentModule],
-	);
+  const {
+    sections,
+    minTimer,
+    expandedSections,
+    examLabel,
+    access,
+    difficulty,
+    sectionLabels,
+    importModule,
+  } = useExamEditorStore((state) => state.modules[currentModule]);

-	const [numberOfLevelParts, setNumberOfLevelParts] = useState(levelParts !== 0 ? levelParts : 1);
+  const [numberOfLevelParts, setNumberOfLevelParts] = useState(
+    levelParts !== 0 ? levelParts : 1
+  );
  const [isResetModuleOpen, setIsResetModuleOpen] = useState(false);

  // For exam edits
@@ -61,11 +70,16 @@ const ExamEditor: React.FC<{levelParts?: number; entitiesAllowEditPrivacy: Entit
    const currentLabels = sectionLabels;
    let updatedSections: SectionState[];
    let updatedLabels: any;
-		if ((currentModule === "level" && currentSections.length !== currentLabels.length) || numberOfLevelParts !== currentSections.length) {
+    if (
+      (currentModule === "level" &&
+        currentSections.length !== currentLabels.length) ||
+      numberOfLevelParts !== currentSections.length
+    ) {
      const newSections = [...currentSections];
      const newLabels = [...currentLabels];
      for (let i = currentLabels.length; i < numberOfLevelParts; i++) {
-				if (currentSections.length !== numberOfLevelParts) newSections.push(defaultSectionSettings(currentModule, i + 1));
+        if (currentSections.length !== numberOfLevelParts)
+          newSections.push(defaultSectionSettings(currentModule, i + 1));
        newLabels.push({
          id: i + 1,
          label: `Part ${i + 1}`,
@@ -80,7 +94,9 @@ const ExamEditor: React.FC<{levelParts?: number; entitiesAllowEditPrivacy: Entit
      return;
    }

-		const updatedExpandedSections = expandedSections.filter((sectionId) => updatedSections.some((section) => section.sectionId === sectionId));
+    const updatedExpandedSections = expandedSections.filter((sectionId) =>
+      updatedSections.some((section) => section.sectionId === sectionId)
+    );

    dispatch({
      type: "UPDATE_MODULE",
@@ -101,7 +117,7 @@ const ExamEditor: React.FC<{levelParts?: number; entitiesAllowEditPrivacy: Entit
    (updates: Partial<ModuleState>) => {
      dispatch({ type: "UPDATE_MODULE", payload: { updates } });
    },
-		[dispatch],
+    [dispatch]
  );

  const toggleSection = (sectionId: number) => {
@@ -121,7 +137,8 @@ const ExamEditor: React.FC<{levelParts?: number; entitiesAllowEditPrivacy: Entit
  };

  const Settings = ModuleSettings[currentModule];
-	const showImport = importModule && ["reading", "listening", "level"].includes(currentModule);
+  const showImport =
+    importModule && ["reading", "listening", "level"].includes(currentModule);

  const updateLevelParts = (parts: number) => {
    setNumberOfLevelParts(parts);
@@ -130,7 +147,10 @@ const ExamEditor: React.FC<{levelParts?: number; entitiesAllowEditPrivacy: Entit
  return (
    <>
      {showImport ? (
-				<ImportOrStartFromScratch module={currentModule} setNumberOfLevelParts={updateLevelParts} />
+        <ImportOrStartFromScratch
+          module={currentModule}
+          setNumberOfLevelParts={updateLevelParts}
+        />
      ) : (
        <>
          {isResetModuleOpen && (
@@ -144,7 +164,9 @@ const ExamEditor: React.FC<{levelParts?: number; entitiesAllowEditPrivacy: Entit
          <div className="flex gap-4 w-full items-center -xl:flex-col">
            <div className="flex flex-row gap-3 w-full">
              <div className="flex flex-col gap-3">
-								<label className="font-normal text-base text-mti-gray-dim">Timer</label>
+                <label className="font-normal text-base text-mti-gray-dim">
+                  Timer
+                </label>
                <Input
                  type="number"
                  name="minTimer"
@@ -158,7 +180,9 @@ const ExamEditor: React.FC<{levelParts?: number; entitiesAllowEditPrivacy: Entit
                />
              </div>
              <div className="flex flex-col gap-3 flex-grow">
-								<label className="font-normal text-base text-mti-gray-dim">Difficulty</label>
+                <label className="font-normal text-base text-mti-gray-dim">
+                  Difficulty
+                </label>
                <Select
                  isMulti={true}
                  options={DIFFICULTIES.map((x) => ({
@@ -166,12 +190,17 @@ const ExamEditor: React.FC<{levelParts?: number; entitiesAllowEditPrivacy: Entit
                    label: capitalize(x),
                  }))}
                  onChange={(values) => {
-										const selectedDifficulties = values ? values.map((v) => v.value as Difficulty) : [];
+                    const selectedDifficulties = values
+                      ? values.map((v) => v.value as Difficulty)
+                      : [];
                    updateModule({ difficulty: selectedDifficulties });
                  }}
                  value={
                    difficulty
-											? difficulty.map((d) => ({
+                      ? (Array.isArray(difficulty)
+                          ? difficulty
+                          : [difficulty]
+                        ).map((d) => ({
                          value: d,
                          label: capitalize(d),
                        }))
@@ -182,7 +211,9 @@ const ExamEditor: React.FC<{levelParts?: number; entitiesAllowEditPrivacy: Entit
            </div>
            {sectionLabels.length != 0 && currentModule !== "level" ? (
              <div className="flex flex-col gap-3 -xl:w-full">
-								<label className="font-normal text-base text-mti-gray-dim">{sectionLabels[0].label.split(" ")[0]}</label>
+                <label className="font-normal text-base text-mti-gray-dim">
+                  {sectionLabels[0].label.split(" ")[0]}
+                </label>
                <div className="flex flex-row gap-8">
                  {sectionLabels.map(({ id, label }) => (
                    <span
@@ -192,9 +223,10 @@ const ExamEditor: React.FC<{levelParts?: number; entitiesAllowEditPrivacy: Entit
                        "transition duration-300 ease-in-out",
                        sectionIds.includes(id)
                          ? `bg-ielts-${currentModule}/70 border-ielts-${currentModule} text-white`
-													: "bg-white border-mti-gray-platinum",
+                          : "bg-white border-mti-gray-platinum"
                      )}
-											onClick={() => toggleSection(id)}>
+                      onClick={() => toggleSection(id)}
+                    >
                      {label}
                    </span>
                  ))}
@@ -202,7 +234,9 @@ const ExamEditor: React.FC<{levelParts?: number; entitiesAllowEditPrivacy: Entit
              </div>
            ) : (
              <div className="flex flex-col gap-3 w-1/3">
-								<label className="font-normal text-base text-mti-gray-dim">Number of Parts</label>
+                <label className="font-normal text-base text-mti-gray-dim">
+                  Number of Parts
+                </label>
                <Input
                  type="number"
                  name="Number of Parts"
@@ -212,19 +246,27 @@ const ExamEditor: React.FC<{levelParts?: number; entitiesAllowEditPrivacy: Entit
                />
              </div>
            )}
-						<div className="flex flex-col gap-3 w-fit h-fit">
-							<div className="h-6" />
-							<Checkbox
-								isChecked={isPrivate}
-								onChange={(checked) => updateModule({isPrivate: checked})}
-								disabled={entitiesAllowEditPrivacy.length === 0}>
-								Privacy (Only available for Assignments)
-							</Checkbox>
          </div>
+          <div className="flex flex-row gap-3 w-64">
+            <Select
+              label="Access Type"
+              options={ACCESSTYPE.map((item) => ({
+                value: item,
+                label: capitalize(item),
+              }))}
+              onChange={(value) => {
+                if (value?.value) {
+                  updateModule({ access: value.value! as AccessType });
+                }
+              }}
+              value={{ value: access, label: capitalize(access) }}
+            />
          </div>
          <div className="flex flex-row gap-3 w-full">
            <div className="flex flex-col gap-3 flex-grow">
-							<label className="font-normal text-base text-mti-gray-dim">Exam Label *</label>
+              <label className="font-normal text-base text-mti-gray-dim">
+                Exam Label *
+              </label>
              <Input
                type="text"
                placeholder="Exam Label"
@@ -239,7 +281,8 @@ const ExamEditor: React.FC<{levelParts?: number; entitiesAllowEditPrivacy: Entit
            <Button
              onClick={() => setIsResetModuleOpen(true)}
              customColor={`bg-ielts-${currentModule}/70 hover:bg-ielts-${currentModule} border-ielts-${currentModule}`}
-							className={`text-white self-end`}>
+              className={`text-white self-end`}
+            >
              Reset Module
            </Button>
          </div>
--- a/src/components/High/Table.tsx
+++ b/src/components/High/Table.tsx
@@ -149,10 +149,16 @@ export default function Table<T>({
          ))}
        </tbody>
      </table>
-      {isLoading && (
+      {isLoading ? (
        <div className="min-h-screen flex justify-center items-start">
          <span className="loading loading-infinity w-32" />
        </div>
+      ) : (
+        rows.length === 0 && (
+          <div className="w-full flex justify-center items-start">
+            <span className="text-xl text-gray-500">No data found...</span>
+          </div>
+        )
      )}
    </div>
  );
--- a/src/hooks/useApprovalWorkflows.tsx
+++ b/src/hooks/useApprovalWorkflows.tsx
@@ -2,7 +2,7 @@ import { ApprovalWorkflow } from "@/interfaces/approval.workflow";
 import axios from "axios";
 import { useCallback, useEffect, useState } from "react";

-export default function useApprovalWorkflows() {
+export default function useApprovalWorkflows(entitiesString?: string) {
  const [workflows, setWorkflows] = useState<ApprovalWorkflow[]>([]);
  const [isLoading, setIsLoading] = useState(false);
  const [isError, setIsError] = useState(false);
@@ -10,7 +10,7 @@ export default function useApprovalWorkflows() {
  const getData = useCallback(() => {
    setIsLoading(true);
    axios
-      .get<ApprovalWorkflow[]>(`/api/approval-workflows`)
+      .get<ApprovalWorkflow[]>(`/api/approval-workflows`, {params: { entityIds: entitiesString }})
      .then((response) => setWorkflows(response.data))
      .catch((error) => {
        setIsError(true);
--- a/src/hooks/useExams.tsx
+++ b/src/hooks/useExams.tsx
@@ -10,7 +10,7 @@ export default function useExams() {
  const getData = () => {
    setIsLoading(true);
    axios
-			.get<Exam[]>("/api/exam")
+      .get<Exam[]>(`/api/exam`)
      .then((response) => setExams(response.data))
      .finally(() => setIsLoading(false));
  };
--- a/src/hooks/usePagination.tsx
+++ b/src/hooks/usePagination.tsx
@@ -1,25 +1,74 @@
 import Button from "@/components/Low/Button";
-import {useMemo, useState} from "react";
-import {BiChevronLeft} from "react-icons/bi";
-import {BsChevronDoubleLeft, BsChevronDoubleRight, BsChevronLeft, BsChevronRight} from "react-icons/bs";
+import { useEffect, useMemo, useState } from "react";
+import {
+  BsChevronDoubleLeft,
+  BsChevronDoubleRight,
+  BsChevronLeft,
+  BsChevronRight,
+} from "react-icons/bs";
+import Select from "../components/Low/Select";

 export default function usePagination<T>(list: T[], size = 25) {
  const [page, setPage] = useState(0);
+  const [itemsPerPage, setItemsPerPage] = useState(size);

-	const items = useMemo(() => list.slice(page * size, (page + 1) * size), [page, size, list]);
+  const items = useMemo(
+    () => list.slice(page * itemsPerPage, (page + 1) * itemsPerPage),
+    [list, page, itemsPerPage]
+  );
+  useEffect(() => {
+    if (page * itemsPerPage >= list.length) setPage(0);
+  }, [items, itemsPerPage, list.length, page]);
+
+  const itemsPerPageOptions = [25, 50, 100, 200];

  const render = () => (
    <div className="w-full flex gap-2 justify-between items-center">
      <div className="flex items-center gap-4 w-fit">
-				<Button className="w-[200px] h-fit" disabled={page === 0} onClick={() => setPage((prev) => prev - 1)}>
+        <Button
+          className="w-[200px] h-fit"
+          disabled={page === 0}
+          onClick={() => setPage((prev) => prev - 1)}
+        >
          Previous Page
        </Button>
      </div>
      <div className="flex items-center gap-4 w-fit">
-				<span className="opacity-80">
-					{page * size + 1} - {(page + 1) * size > list.length ? list.length : (page + 1) * size} / {list.length}
+        <div className="flex flex-row items-center gap-1 w-56">
+          <Select
+            value={{
+              value: itemsPerPage.toString(),
+              label: (itemsPerPage * page > items.length
+                ? items.length
+                : itemsPerPage * page
+              ).toString(),
+            }}
+            onChange={(value) =>
+              setItemsPerPage(parseInt(value!.value ?? "25"))
+            }
+            options={itemsPerPageOptions.map((size) => ({
+              label: size.toString(),
+              value: size.toString(),
+            }))}
+            isClearable={false}
+            styles={{
+              control: (styles) => ({ ...styles, width: "100px" }),
+              container: (styles) => ({ ...styles, width: "100px" }),
+            }}
+          />
+          <span className="opacity-80 w-32 text-center">
+            {page * itemsPerPage + 1} -{" "}
+            {itemsPerPage * (page + 1) > list.length
+              ? list.length
+              : itemsPerPage * (page + 1)}
+            {list.length}
          </span>
-				<Button className="w-[200px]" disabled={(page + 1) * size >= list.length} onClick={() => setPage((prev) => prev + 1)}>
+        </div>
+        <Button
+          className="w-[200px]"
+          disabled={(page + 1) * itemsPerPage >= list.length}
+          onClick={() => setPage((prev) => prev + 1)}
+        >
          Next Page
        </Button>
      </div>
@@ -29,27 +78,59 @@ export default function usePagination<T>(list: T[], size = 25) {
  const renderMinimal = () => (
    <div className="flex gap-4 items-center">
      <div className="flex gap-2 items-center">
-				<button disabled={page === 0} onClick={() => setPage(0)} className="disabled:opacity-60 disabled:cursor-not-allowed">
+        <button
+          disabled={page === 0}
+          onClick={() => setPage(0)}
+          className="disabled:opacity-60 disabled:cursor-not-allowed"
+        >
          <BsChevronDoubleLeft />
        </button>
-				<button disabled={page === 0} onClick={() => setPage((prev) => prev - 1)} className="disabled:opacity-60 disabled:cursor-not-allowed">
+        <button
+          disabled={page === 0}
+          onClick={() => setPage((prev) => prev - 1)}
+          className="disabled:opacity-60 disabled:cursor-not-allowed"
+        >
          <BsChevronLeft />
        </button>
      </div>
+      <div className="flex flex-row items-center gap-1 w-56">
+        <Select
+          value={{
+            value: itemsPerPage.toString(),
+            label: itemsPerPage.toString(),
+          }}
+          onChange={(value) => setItemsPerPage(parseInt(value!.value ?? "25"))}
+          options={itemsPerPageOptions.map((size) => ({
+            label: size.toString(),
+            value: size.toString(),
+          }))}
+          isClearable={false}
+          styles={{
+            control: (styles) => ({ ...styles, width: "100px" }),
+            container: (styles) => ({ ...styles, width: "100px" }),
+          }}
+        />
        <span className="opacity-80 w-32 text-center">
-				{page * size + 1} - {(page + 1) * size > list.length ? list.length : (page + 1) * size} / {list.length}
+          {page * itemsPerPage + 1} -{" "}
+          {itemsPerPage * (page + 1) > list.length
+            ? list.length
+            : itemsPerPage * (page + 1)}
+          / {list.length}
        </span>
+      </div>
      <div className="flex gap-2 items-center">
        <button
-					disabled={(page + 1) * size >= list.length}
+          disabled={(page + 1) * itemsPerPage >= list.length}
          onClick={() => setPage((prev) => prev + 1)}
-					className="disabled:opacity-60 disabled:cursor-not-allowed">
+          className="disabled:opacity-60 disabled:cursor-not-allowed"
+        >
          <BsChevronRight />
        </button>
        <button
-					disabled={(page + 1) * size >= list.length}
-					onClick={() => setPage(Math.floor(list.length / size))}
-					className="disabled:opacity-60 disabled:cursor-not-allowed">
+          disabled={(page + 1) * itemsPerPage >= list.length}
+          onClick={() => setPage(Math.floor(list.length / itemsPerPage))}
+          className="disabled:opacity-60 disabled:cursor-not-allowed"
+        >
          <BsChevronDoubleRight />
        </button>
      </div>
--- a/src/interfaces/exam.ts
+++ b/src/interfaces/exam.ts
@@ -1,4 +1,3 @@
-import instructions from "@/pages/api/exam/media/instructions";
 import { Module } from ".";

 export type Exam = ReadingExam | ListeningExam | WritingExam | SpeakingExam | LevelExam;
@@ -10,6 +9,9 @@ export type Difficulty = BasicDifficulty | CEFRLevels;
 // Left easy, medium and hard to support older exam versions
 export type BasicDifficulty = "easy" | "medium" | "hard";
 export type CEFRLevels = "A1" | "A2" | "B1" | "B2" | "C1" | "C2";
+export const ACCESSTYPE = ["public", "private", "confidential"] as const;
+export type AccessType = typeof ACCESSTYPE[number];
+


 export interface ExamBase {
@@ -24,8 +26,9 @@ export interface ExamBase {
 	shuffle?: boolean;
 	createdBy?: string; // option as it has been added later
 	createdAt?: string; // option as it has been added later
-	private?: boolean;
+	access: AccessType;
 	label?: string;
+	requiresApproval?: boolean;
 }
 export interface ReadingExam extends ExamBase {
 	module: "reading";
--- a/src/lib/createWorkflowsOnExamCreation.ts
+++ b/src/lib/createWorkflowsOnExamCreation.ts
@@ -1,7 +1,10 @@
 import { Module } from "@/interfaces";
 import { getApprovalWorkflowByFormIntaker, createApprovalWorkflow } from "@/utils/approval.workflows.be";
+import client from "@/lib/mongodb";

-export async function createApprovalWorkflowsOnExamCreation(examAuthor: string, examEntities: string[], examId: string, examModule: string) {
+const db = client.db(process.env.MONGODB_DB);
+
+/* export async function createApprovalWorkflowsOnExamCreation(examAuthor: string, examEntities: string[], examId: string, examModule: string) {
    const results = await Promise.all(
        examEntities.map(async (entity) => {
            const configuredWorkflow = await getApprovalWorkflowByFormIntaker(entity, examAuthor);
@@ -27,6 +30,53 @@ export async function createApprovalWorkflowsOnExamCreation(examAuthor: string,
    const successCount = results.filter((r) => r.created).length;
    const totalCount = examEntities.length;

+    return {
+        successCount,
+        totalCount,
+    };
+} */
+
+// TEMPORARY BEHAVIOUR! ONLY THE FIRST CONFIGURED WORKFLOW FOUND IS STARTED
+export async function createApprovalWorkflowOnExamCreation(examAuthor: string, examEntities: string[], examId: string, examModule: string) {
+    let successCount = 0;
+    let totalCount = 0;
+
+    for (const entity of examEntities) {
+        const configuredWorkflow = await getApprovalWorkflowByFormIntaker(entity, examAuthor);
+
+        if (!configuredWorkflow) {
+            continue;
+        }
+
+        totalCount = 1; // a workflow was found
+
+        configuredWorkflow.modules.push(examModule as Module);
+        configuredWorkflow.name = examId;
+        configuredWorkflow.examId = examId;
+        configuredWorkflow.entityId = entity;
+        configuredWorkflow.startDate = Date.now();
+        configuredWorkflow.steps[0].completed = true;
+        configuredWorkflow.steps[0].completedBy = examAuthor;
+        configuredWorkflow.steps[0].completedDate = Date.now();
+
+        try {
+            await createApprovalWorkflow("active-workflows", configuredWorkflow);
+            successCount = 1;
+            break; // Stop after the first success
+        } catch (error: any) {
+            break;
+        }
+    }
+
+    // prettier-ignore
+    if (totalCount === 0) { // current behaviour: if no workflow was found skip approval process
+		await db.collection(examModule).updateOne(
+			{ id: examId },
+			{ $set: { id: examId, isDiagnostic: false }},
+			{ upsert: true }
+		);
+    }
+
    return {
        successCount,
        totalCount,
--- a/src/pages/(admin)/CorporateGradingSystem.tsx
+++ b/src/pages/(admin)/CorporateGradingSystem.tsx
@@ -265,7 +265,7 @@ export default function CorporateGradingSystem({
        <>
          <Separator />
          <label className="font-normal text-base text-mti-gray-dim">
-            Apply this grading system to other entities
+            Copy this grading system to other entities
          </label>
          <Select
            options={entities.map((e) => ({ value: e.id, label: e.label }))}
@@ -282,7 +282,7 @@ export default function CorporateGradingSystem({
            disabled={isLoading || otherEntities.length === 0}
            variant="outline"
          >
-            Apply to {otherEntities.length} other entities
+            Copy to {otherEntities.length} other entities
          </Button>
          <Separator />
        </>
@@ -326,7 +326,7 @@ export default function CorporateGradingSystem({
        disabled={isLoading}
        className="mt-8"
      >
-        Save Grading System
+        Save Changes to entities
      </Button>
    </div>
  );
--- a/src/pages/(admin)/Lists/CodeList.tsx
+++ b/src/pages/(admin)/Lists/CodeList.tsx
@@ -15,26 +15,41 @@ import { findBy, mapBy } from "@/utils";
 import useEntitiesCodes from "@/hooks/useEntitiesCodes";
 import Table from "@/components/High/Table";

-type TableData = Code & { entity?: EntityWithRoles, creator?: User }
+type TableData = Code & { entity?: EntityWithRoles; creator?: User };
 const columnHelper = createColumnHelper<TableData>();

-export default function CodeList({ user, entities, canDeleteCodes }
-	: { user: User, entities: EntityWithRoles[], canDeleteCodes?: boolean }) {
+export default function CodeList({
+  user,
+  entities,
+  canDeleteCodes,
+}: {
+  user: User;
+  entities: EntityWithRoles[];
+  canDeleteCodes?: boolean;
+}) {
  const [selectedCodes, setSelectedCodes] = useState<string[]>([]);

-	const entityIDs = useMemo(() => mapBy(entities, 'id'), [entities])
+  const entityIDs = useMemo(() => mapBy(entities, "id"), [entities]);

  const { users } = useUsers();
-	const { codes, reload } = useEntitiesCodes(isAdmin(user) ? undefined : entityIDs)
+  const { codes, reload, isLoading } = useEntitiesCodes(
+    isAdmin(user) ? undefined : entityIDs
+  );

-	const data: TableData[] = useMemo(() => codes.map((code) => ({
+  const data: TableData[] = useMemo(
+    () =>
+      codes.map((code) => ({
        ...code,
-		entity: findBy(entities, 'id', code.entity),
-		creator: findBy(users, 'id', code.creator)
-	})) as TableData[], [codes, entities, users])
+        entity: findBy(entities, "id", code.entity),
+        creator: findBy(users, "id", code.creator),
+      })) as TableData[],
+    [codes, entities, users]
+  );

  const toggleCode = (id: string) => {
-		setSelectedCodes((prev) => (prev.includes(id) ? prev.filter((x) => x !== id) : [...prev, id]));
+    setSelectedCodes((prev) =>
+      prev.includes(id) ? prev.filter((x) => x !== id) : [...prev, id]
+    );
  };

  // const toggleAllCodes = (checked: boolean) => {
@@ -44,8 +59,11 @@ export default function CodeList({ user, entities, canDeleteCodes }
  // };

  const deleteCodes = async (codes: string[]) => {
-		if (!canDeleteCodes) return
-		if (!confirm(`Are you sure you want to delete these ${codes.length} code(s)?`)) return;
+    if (!canDeleteCodes) return;
+    if (
+      !confirm(`Are you sure you want to delete these ${codes.length} code(s)?`)
+    )
+      return;

    const params = new URLSearchParams();
    codes.forEach((code) => params.append("code", code));
@@ -73,8 +91,9 @@ export default function CodeList({ user, entities, canDeleteCodes }
  };

  const deleteCode = async (code: Code) => {
-		if (!canDeleteCodes) return
-		if (!confirm(`Are you sure you want to delete this "${code.code}" code?`)) return;
+    if (!canDeleteCodes) return;
+    if (!confirm(`Are you sure you want to delete this "${code.code}" code?`))
+      return;

    axios
      .delete(`/api/code/${code.code}`)
@@ -99,10 +118,13 @@ export default function CodeList({ user, entities, canDeleteCodes }
    columnHelper.accessor("code", {
      id: "codeCheckbox",
      enableSorting: false,
-			header: () => (""),
+      header: () => "",
      cell: (info) =>
        !info.row.original.userId ? (
-					<Checkbox isChecked={selectedCodes.includes(info.getValue())} onChange={() => toggleCode(info.getValue())}>
+          <Checkbox
+            isChecked={selectedCodes.includes(info.getValue())}
+            onChange={() => toggleCode(info.getValue())}
+          >
            {""}
          </Checkbox>
        ) : null,
@@ -113,7 +135,8 @@ export default function CodeList({ user, entities, canDeleteCodes }
    }),
    columnHelper.accessor("creationDate", {
      header: "Creation Date",
-			cell: (info) => (info.getValue() ? moment(info.getValue()).format("DD/MM/YYYY") : "N/A"),
+      cell: (info) =>
+        info.getValue() ? moment(info.getValue()).format("DD/MM/YYYY") : "N/A",
    }),
    columnHelper.accessor("email", {
      header: "E-mail",
@@ -121,7 +144,12 @@ export default function CodeList({ user, entities, canDeleteCodes }
    }),
    columnHelper.accessor("creator", {
      header: "Creator",
-			cell: (info) => info.getValue() ? `${info.getValue().name} (${USER_TYPE_LABELS[info.getValue().type]})` : "N/A",
+      cell: (info) =>
+        info.getValue()
+          ? `${info.getValue().name} (${
+              USER_TYPE_LABELS[info.getValue().type]
+            })`
+          : "N/A",
    }),
    columnHelper.accessor("entity", {
      header: "Entity",
@@ -147,7 +175,11 @@ export default function CodeList({ user, entities, canDeleteCodes }
        return (
          <div className="flex gap-4">
            {canDeleteCodes && !row.original.userId && (
-							<div data-tip="Delete" className="cursor-pointer tooltip" onClick={() => deleteCode(row.original)}>
+              <div
+                data-tip="Delete"
+                className="cursor-pointer tooltip"
+                onClick={() => deleteCode(row.original)}
+              >
                <BsTrash className="hover:text-mti-purple-light transition ease-in-out duration-300" />
              </div>
            )}
@@ -168,7 +200,8 @@ export default function CodeList({ user, entities, canDeleteCodes }
              variant="outline"
              color="red"
              className="!py-1 px-10"
-							onClick={() => deleteCodes(selectedCodes)}>
+              onClick={() => deleteCodes(selectedCodes)}
+            >
              Delete
            </Button>
          </div>
@@ -177,7 +210,14 @@ export default function CodeList({ user, entities, canDeleteCodes }
      <Table<TableData>
        data={data}
        columns={defaultColumns}
-				searchFields={[["code"], ["email"], ["entity", "label"], ["creator", "name"], ['creator', 'type']]}
+        isLoading={isLoading}
+        searchFields={[
+          ["code"],
+          ["email"],
+          ["entity", "label"],
+          ["creator", "name"],
+          ["creator", "type"],
+        ]}
      />
    </>
  );
--- a/src/pages/(admin)/Lists/ExamList.tsx
+++ b/src/pages/(admin)/Lists/ExamList.tsx
@@ -8,21 +8,24 @@ import {User} from "@/interfaces/user";
 import useExamStore from "@/stores/exam";
 import { getExamById } from "@/utils/exams";
 import { countExercises } from "@/utils/moduleUtils";
-import {createColumnHelper, flexRender, getCoreRowModel, useReactTable} from "@tanstack/react-table";
+import {
+  createColumnHelper,
+  flexRender,
+  getCoreRowModel,
+  useReactTable,
+} from "@tanstack/react-table";
 import axios from "axios";
-import {capitalize, uniq} from "lodash";
+import { capitalize } from "lodash";
 import { useRouter } from "next/router";
-import {BsBan, BsCheck, BsCircle, BsPencil, BsTrash, BsUpload, BsX} from "react-icons/bs";
+import { BsCheck, BsPencil, BsTrash, BsUpload, BsX } from "react-icons/bs";
 import { toast } from "react-toastify";
 import { useListSearch } from "@/hooks/useListSearch";
 import Modal from "@/components/Modal";
-import {checkAccess} from "@/utils/permissions";
-import useGroups from "@/hooks/useGroups";
+import { checkAccess, findAllowedEntities } from "@/utils/permissions";
 import Button from "@/components/Low/Button";
 import { EntityWithRoles } from "@/interfaces/entity";
 import { BiEdit } from "react-icons/bi";
 import { findBy, mapBy } from "@/utils";
-import {getUserName} from "@/utils/users";

 const searchFields = [["module"], ["id"], ["createdBy"]];

@@ -33,22 +36,44 @@ const CLASSES: {[key in Module]: string} = {
  writing: "text-ielts-writing",
  level: "text-ielts-level",
 };
-
 const columnHelper = createColumnHelper<Exam>();

-export default function ExamList({user, entities}: {user: User; entities: EntityWithRoles[]}) {
+export default function ExamList({
+  user,
+  entities,
+}: {
+  user: User;
+  entities: EntityWithRoles[];
+}) {
  const [selectedExam, setSelectedExam] = useState<Exam>();

-	const {exams, reload} = useExams();
-	const {users} = useUsers();
+  const canViewConfidentialEntities = useMemo(
+    () =>
+      mapBy(
+        findAllowedEntities(user, entities, "view_confidential_exams"),
+        "id"
+      ),
+    [user, entities]
+  );

+  const { exams, reload, isLoading } = useExams();
+  const { users } = useUsers();
+  // Pass this permission filter to the backend later
  const filteredExams = useMemo(
    () =>
-			exams.filter((e) => {
-				if (!e.private) return true;
-				return (e.entities || []).some((ent) => mapBy(user.entities, "id").includes(ent));
+      ["admin", "developer"].includes(user?.type)
+        ? exams
+        : exams.filter((item) => {
+            if (
+              item.access === "confidential" &&
+              !canViewConfidentialEntities.find((x) =>
+                (item.entities ?? []).includes(x)
+              )
+            )
+              return false;
+            return true;
          }),
-		[exams, user?.entities],
+    [canViewConfidentialEntities, exams, user?.type]
  );

  const parsedExams = useMemo(() => {
@@ -67,7 +92,10 @@ export default function ExamList({user, entities}: {user: User; entities: Entity
    });
  }, [filteredExams, users]);

-	const {rows: filteredRows, renderSearch} = useListSearch<Exam>(searchFields, parsedExams);
+  const { rows: filteredRows, renderSearch } = useListSearch<Exam>(
+    searchFields,
+    parsedExams
+  );

  const dispatch = useExamStore((state) => state.dispatch);

@@ -76,19 +104,33 @@ export default function ExamList({user, entities}: {user: User; entities: Entity
  const loadExam = async (module: Module, examId: string) => {
    const exam = await getExamById(module, examId.trim());
    if (!exam) {
-			toast.error("Unknown Exam ID! Please make sure you selected the right module and entered the right exam ID", {
+      toast.error(
+        "Unknown Exam ID! Please make sure you selected the right module and entered the right exam ID",
+        {
          toastId: "invalid-exam-id",
-			});
+        }
+      );

      return;
    }
-		dispatch({type: "INIT_EXAM", payload: {exams: [exam], modules: [module]}});
+    dispatch({
+      type: "INIT_EXAM",
+      payload: { exams: [exam], modules: [module] },
+    });

    router.push("/exam");
  };

+  /* 
  const privatizeExam = async (exam: Exam) => {
-		if (!confirm(`Are you sure you want to make this ${capitalize(exam.module)} exam ${exam.private ? "public" : "private"}?`)) return;
+    if (
+      !confirm(
+        `Are you sure you want to make this ${capitalize(exam.module)} exam ${
+          exam.access
+        }?`
+      )
+    )
+      return;

    axios
      .patch(`/api/exam/${exam.module}/${exam.id}`, { private: !exam.private })
@@ -108,9 +150,15 @@ export default function ExamList({user, entities}: {user: User; entities: Entity
      })
      .finally(reload);
  }; 
+  */

  const deleteExam = async (exam: Exam) => {
-		if (!confirm(`Are you sure you want to delete this ${capitalize(exam.module)} exam?`)) return;
+    if (
+      !confirm(
+        `Are you sure you want to delete this ${capitalize(exam.module)} exam?`
+      )
+    )
+      return;

    axios
      .delete(`/api/exam/${exam.module}/${exam.id}`)
@@ -132,8 +180,12 @@ export default function ExamList({user, entities}: {user: User; entities: Entity
  };

  const getTotalExercises = (exam: Exam) => {
-		if (exam.module === "reading" || exam.module === "listening" || exam.module === "level") {
-			return countExercises(exam.parts.flatMap((x) => x.exercises));
+    if (
+      exam.module === "reading" ||
+      exam.module === "listening" ||
+      exam.module === "level"
+    ) {
+      return countExercises((exam.parts ?? []).flatMap((x) => x.exercises));
    }

    return countExercises(exam.exercises);
@@ -146,7 +198,11 @@ export default function ExamList({user, entities}: {user: User; entities: Entity
    }),
    columnHelper.accessor("module", {
      header: "Module",
-			cell: (info) => <span className={CLASSES[info.getValue()]}>{capitalize(info.getValue())}</span>,
+      cell: (info) => (
+        <span className={CLASSES[info.getValue()]}>
+          {capitalize(info.getValue())}
+        </span>
+      ),
    }),
    columnHelper.accessor((x) => getTotalExercises(x), {
      header: "Exercises",
@@ -156,9 +212,9 @@ export default function ExamList({user, entities}: {user: User; entities: Entity
      header: "Timer",
      cell: (info) => <>{info.getValue()} minute(s)</>,
    }),
-		columnHelper.accessor("private", {
-			header: "Private",
-			cell: (info) => <span className="w-full flex items-center justify-center">{!info.getValue() ? <BsX /> : <BsCheck />}</span>,
+    columnHelper.accessor("access", {
+      header: "Access",
+      cell: (info) => <span>{capitalize(info.getValue())}</span>,
    }),
    columnHelper.accessor("createdAt", {
      header: "Created At",
@@ -173,7 +229,10 @@ export default function ExamList({user, entities}: {user: User; entities: Entity
    }),
    columnHelper.accessor("createdBy", {
      header: "Created By",
-			cell: (info) => (!info.getValue() ? "System" : findBy(users, "id", info.getValue())?.name || "N/A"),
+      cell: (info) =>
+        !info.getValue()
+          ? "System"
+          : findBy(users, "id", info.getValue())?.name || "N/A",
    }),
    {
      header: "",
@@ -181,16 +240,19 @@ export default function ExamList({user, entities}: {user: User; entities: Entity
      cell: ({ row }: { row: { original: Exam } }) => {
        return (
          <div className="flex gap-4">
-						{(row.original.owners?.includes(user.id) || checkAccess(user, ["admin", "developer"])) && (
+            {(row.original.owners?.includes(user.id) ||
+              checkAccess(user, ["admin", "developer"])) && (
              <>
+                {checkAccess(user, [
+                  "admin",
+                  "developer",
+                  "mastercorporate",
+                ]) && (
                  <button
-									data-tip={row.original.private ? "Set as public" : "Set as private"}
-									onClick={async () => await privatizeExam(row.original)}
-									className="cursor-pointer tooltip">
-									{row.original.private ? <BsCircle /> : <BsBan />}
-								</button>
-								{checkAccess(user, ["admin", "developer", "mastercorporate"]) && (
-									<button data-tip="Edit exam" onClick={() => setSelectedExam(row.original)} className="cursor-pointer tooltip">
+                    data-tip="Edit exam"
+                    onClick={() => setSelectedExam(row.original)}
+                    className="cursor-pointer tooltip"
+                  >
                    <BsPencil />
                  </button>
                )}
@@ -199,11 +261,18 @@ export default function ExamList({user, entities}: {user: User; entities: Entity
            <button
              data-tip="Load exam"
              className="cursor-pointer tooltip"
-							onClick={async () => await loadExam(row.original.module, row.original.id)}>
+              onClick={async () =>
+                await loadExam(row.original.module, row.original.id)
+              }
+            >
              <BsUpload className="hover:text-mti-purple-light transition ease-in-out duration-300" />
            </button>
            {PERMISSIONS.examManagement.delete.includes(user.type) && (
-							<div data-tip="Delete" className="cursor-pointer tooltip" onClick={() => deleteExam(row.original)}>
+              <div
+                data-tip="Delete"
+                className="cursor-pointer tooltip"
+                onClick={() => deleteExam(row.original)}
+              >
                <BsTrash className="hover:text-mti-purple-light transition ease-in-out duration-300" />
              </div>
            )}
@@ -220,34 +289,53 @@ export default function ExamList({user, entities}: {user: User; entities: Entity
  });

  const handleExamEdit = () => {
-		router.push(`/generation?id=${selectedExam!.id}&module=${selectedExam!.module}`);
+    router.push(
+      `/generation?id=${selectedExam!.id}&module=${selectedExam!.module}`
+    );
  };

  return (
    <div className="flex flex-col gap-4 w-full h-full">
      {renderSearch()}
-			<Modal isOpen={!!selectedExam} onClose={() => setSelectedExam(undefined)} maxWidth="max-w-xl">
+      <Modal
+        isOpen={!!selectedExam}
+        onClose={() => setSelectedExam(undefined)}
+        maxWidth="max-w-xl"
+      >
        {!!selectedExam ? (
          <>
            <div className="p-6">
              <div className="mb-6">
                <div className="flex items-center gap-2 mb-4">
                  <BiEdit className="w-5 h-5 text-gray-600" />
-									<span className="text-gray-600 font-medium">Ready to Edit</span>
+                  <span className="text-gray-600 font-medium">
+                    Ready to Edit
+                  </span>
                </div>

                <div className="bg-gray-50 rounded-lg p-4 mb-3">
                  <p className="font-medium mb-1">Exam ID: {selectedExam.id}</p>
                </div>

-								<p className="text-gray-500 text-sm">Click &apos;Next&apos; to proceed to the exam editor.</p>
+                <p className="text-gray-500 text-sm">
+                  Click &apos;Next&apos; to proceed to the exam editor.
+                </p>
              </div>

              <div className="flex justify-between gap-4 mt-8">
-								<Button color="purple" variant="outline" onClick={() => setSelectedExam(undefined)} className="w-32">
+                <Button
+                  color="purple"
+                  variant="outline"
+                  onClick={() => setSelectedExam(undefined)}
+                  className="w-32"
+                >
                  Cancel
                </Button>
-								<Button color="purple" onClick={handleExamEdit} className="w-32 text-white flex items-center justify-center gap-2">
+                <Button
+                  color="purple"
+                  onClick={handleExamEdit}
+                  className="w-32 text-white flex items-center justify-center gap-2"
+                >
                  Proceed
                </Button>
              </div>
@@ -264,7 +352,12 @@ export default function ExamList({user, entities}: {user: User; entities: Entity
            <tr key={headerGroup.id}>
              {headerGroup.headers.map((header) => (
                <th className="p-4 text-left" key={header.id}>
-									{header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+                  {header.isPlaceholder
+                    ? null
+                    : flexRender(
+                        header.column.columnDef.header,
+                        header.getContext()
+                      )}
                </th>
              ))}
            </tr>
@@ -272,7 +365,10 @@ export default function ExamList({user, entities}: {user: User; entities: Entity
        </thead>
        <tbody className="px-2">
          {table.getRowModel().rows.map((row) => (
-						<tr className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2" key={row.id}>
+            <tr
+              className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2"
+              key={row.id}
+            >
              {row.getVisibleCells().map((cell) => (
                <td className="px-4 py-2" key={cell.id}>
                  {flexRender(cell.column.columnDef.cell, cell.getContext())}
@@ -282,6 +378,17 @@ export default function ExamList({user, entities}: {user: User; entities: Entity
          ))}
        </tbody>
      </table>
+      {isLoading ? (
+        <div className="min-h-screen flex justify-center items-start">
+          <span className="loading loading-infinity w-32" />
+        </div>
+      ) : (
+        filteredRows.length === 0 && (
+          <div className="w-full flex justify-center items-start">
+            <span className="text-xl text-gray-500">No data found...</span>
+          </div>
+        )
+      )}
    </div>
  );
 }
--- a/src/pages/(admin)/Lists/UserList.tsx
+++ b/src/pages/(admin)/Lists/UserList.tsx
@@ -22,8 +22,6 @@ import useFilterStore from "@/stores/listFilterStore";
 import { useRouter } from "next/router";
 import { mapBy } from "@/utils";
 import { exportListToExcel } from "@/utils/users";
-import usePermissions from "@/hooks/usePermissions";
-import useUserBalance from "@/hooks/useUserBalance";
 import useEntitiesUsers from "@/hooks/useEntitiesUsers";
 import { WithLabeledEntities } from "@/interfaces/entity";
 import Table from "@/components/High/Table";
@@ -494,21 +492,19 @@ export default function UserList({
    },
  ];

-  const downloadExcel = (rows: WithLabeledEntities<User>[]) => {
+  const downloadExcel = async (rows: WithLabeledEntities<User>[]) => {
    if (entitiesDownloadUsers.length === 0)
      return toast.error("You are not allowed to download the user list.");

-    const allowedRows = rows.filter((r) =>
-      mapBy(r.entities, "id").some((e) =>
-        mapBy(entitiesDownloadUsers, "id").includes(e)
-      )
-    );
-    const csv = exportListToExcel(allowedRows);
+    const allowedRows = rows;
+    const csv = await exportListToExcel(allowedRows);

    const element = document.createElement("a");
-    const file = new Blob([csv], { type: "text/csv" });
+    const file = new Blob([csv], {
+      type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+    });
    element.href = URL.createObjectURL(file);
-    element.download = "users.csv";
+    element.download = "users.xlsx";
    document.body.appendChild(element);
    element.click();
    document.body.removeChild(element);
--- a/src/pages/(admin)/Lists/index.tsx
+++ b/src/pages/(admin)/Lists/index.tsx
@@ -4,7 +4,6 @@ import clsx from "clsx";
 import CodeList from "./CodeList";
 import DiscountList from "./DiscountList";
 import ExamList from "./ExamList";
-import GroupList from "./GroupList";
 import PackageList from "./PackageList";
 import UserList from "./UserList";
 import { checkAccess } from "@/utils/permissions";
--- a/src/pages/(admin)/UserCreator.tsx
+++ b/src/pages/(admin)/UserCreator.tsx
@@ -22,6 +22,7 @@ import { getUserName } from "@/utils/users";
 import Select from "@/components/Low/Select";
 import {EntityWithRoles} from "@/interfaces/entity";
 import useEntitiesGroups from "@/hooks/useEntitiesGroups";
+import {mapBy} from "@/utils";

 const USER_TYPE_PERMISSIONS: {
 	[key in Type]: {perm: PermissionType | undefined; list: Type[]};
@@ -59,7 +60,7 @@ const USER_TYPE_PERMISSIONS: {
 interface Props {
 	user: User;
 	users: User[];
-  entities: EntityWithRoles[]
+	entities: EntityWithRoles[];
 	permissions: PermissionType[];
 	onFinish: () => void;
 }
@@ -81,7 +82,7 @@ export default function UserCreator({ user, users, entities = [], permissions, o
 	const [isLoading, setIsLoading] = useState(false);
 	const [type, setType] = useState<Type>("student");
 	const [position, setPosition] = useState<string>();
-  const [entity, setEntity] = useState((entities || [])[0]?.id || undefined)
+	const [entity, setEntity] = useState((entities || [])[0]?.id || undefined);

 	const {groups} = useEntitiesGroups();

@@ -128,7 +129,7 @@ export default function UserCreator({ user, users, entities = [], permissions, o
 				setStudentID("");
 				setCountry(user?.demographicInformation?.country);
 				setGroup(null);
-        setEntity((entities || [])[0]?.id || undefined)
+				setEntity((entities || [])[0]?.id || undefined);
 				setExpiryDate(user?.subscriptionExpirationDate ? moment(user?.subscriptionExpirationDate).toDate() : null);
 				setIsExpiryDateEnabled(true);
 				setType("student");
@@ -198,9 +199,7 @@ export default function UserCreator({ user, users, entities = [], permissions, o
 				<div className={clsx("flex flex-col gap-4")}>
 					<label className="font-normal text-base text-mti-gray-dim">Classroom</label>
 					<Select
-            options={groups
-              .filter((x) => x.entity?.id === entity)
-              .map((g) => ({ value: g.id, label: g.name }))}
+						options={groups.filter((x) => x.entity?.id === entity).map((g) => ({value: g.id, label: g.name}))}
 						onChange={(e) => setGroup(e?.value || undefined)}
 						isClearable
 					/>
--- a/src/pages/api/approval-workflows/index.ts
+++ b/src/pages/api/approval-workflows/index.ts
@@ -19,5 +19,9 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
        return res.status(403).json({ ok: false });
    }

-    return res.status(200).json(await getApprovalWorkflows("active-workflows"));
+    const entityIdsString = req.query.entityIds as string;
+
+    const entityIdsArray = entityIdsString.split(",");
+
+    return res.status(200).json(await getApprovalWorkflows("active-workflows", entityIdsArray));
 }
--- a/src/pages/api/code/entities.ts
+++ b/src/pages/api/code/entities.ts
@@ -3,16 +3,8 @@ import type { NextApiRequest, NextApiResponse } from "next";
 import client from "@/lib/mongodb";
 import { withIronSessionApiRoute } from "iron-session/next";
 import { sessionOptions } from "@/lib/session";
-import { Code, Group, Type } from "@/interfaces/user";
-import { PERMISSIONS } from "@/constants/userPermissions";
-import { prepareMailer, prepareMailOptions } from "@/email";
-import { isAdmin } from "@/utils/users";
+import { Code, } from "@/interfaces/user";
 import { requestUser } from "@/utils/api";
-import { doesEntityAllow } from "@/utils/permissions";
-import { getEntity, getEntityWithRoles } from "@/utils/entities.be";
-import { findBy } from "@/utils";
-import { EntityWithRoles } from "@/interfaces/entity";
-
 const db = client.db(process.env.MONGODB_DB);

 export default withIronSessionApiRoute(handler, sessionOptions);
@@ -30,7 +22,7 @@ async function get(req: NextApiRequest, res: NextApiResponse) {

 	const { entities } = req.query as { entities?: string[] };
 	if (entities)
-		return res.status(200).json(await db.collection("codes").find<Code>({ entity: { $in: entities } }).toArray());
+		return res.status(200).json(await db.collection("codes").find<Code>({ entity: { $in: Array.isArray(entities) ? entities : [entities] } }).toArray());

 	return res.status(200).json(await db.collection("codes").find<Code>({}).toArray());
 }
--- a/src/pages/api/code/index.ts
+++ b/src/pages/api/code/index.ts
@@ -32,6 +32,7 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
 	}

 	const { entity } = req.query as { entity?: string };
+
 	const snapshot = await db.collection("codes").find(entity ? { entity } : {}).toArray();

 	res.status(200).json(snapshot);
--- a/src/pages/api/exam/[module]/index.ts
+++ b/src/pages/api/exam/[module]/index.ts
@@ -1,7 +1,7 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import { Module } from "@/interfaces";
 import { Exam, ExamBase, InstructorGender, Variant } from "@/interfaces/exam";
-import { createApprovalWorkflowsOnExamCreation } from "@/lib/createWorkflowsOnExamCreation";
+import { createApprovalWorkflowOnExamCreation } from "@/lib/createWorkflowsOnExamCreation";
 import client from "@/lib/mongodb";
 import { sessionOptions } from "@/lib/session";
 import { mapBy } from "@/utils";
@@ -10,6 +10,7 @@ import { getApprovalWorkflowsByExamId, updateApprovalWorkflows } from "@/utils/a
 import { generateExamDifferences } from "@/utils/exam.differences";
 import { getExams } from "@/utils/exams.be";
 import { isAdmin } from "@/utils/users";
+import { access } from "fs";
 import { withIronSessionApiRoute } from "iron-session/next";
 import type { NextApiRequest, NextApiResponse } from "next";

@@ -48,10 +49,11 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
 	const { module } = req.query as { module: string };

 	const session = client.startSession();
-	const entities = isAdmin(user) ? [] : mapBy(user.entities, "id"); // might need to change this with new approval workflows logic.. if an admin creates an exam no workflow is started because workflows must have entities configured.
+	const entities = isAdmin(user) ? [] : mapBy(user.entities, "id");

 	try {
 		const exam = {
+			access: "public", // default access is public
 			...req.body,
 			module: module,
 			entities,
@@ -76,6 +78,10 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
 				throw new Error("Name already exists");
 			}

+			if (exam.requiresApproval === true) {
+				exam.access = "confidential";
+			}
+
 			await db.collection(module).updateOne(
 				{ id: req.body.id },
 				{ $set: { id: req.body.id, ...exam } },
@@ -88,36 +94,44 @@ async function POST(req: NextApiRequest, res: NextApiResponse) {
 			// if it doesn't enter the next if condition it means the exam was updated and not created, so we can send this response.
 			responseStatus = 200;
 			responseMessage = `Successfully updated exam with ID: "${exam.id}"`;
-			// TODO maybe find a way to start missing approval workflows in case they were only configured after exam creation.

 			// create workflow only if exam is being created for the first time
 			if (docSnap === null) {
 				try {
-					const { successCount, totalCount } = await createApprovalWorkflowsOnExamCreation(exam.createdBy, exam.entities, exam.id, module);
+					if (exam.requiresApproval === false) {
+						responseStatus = 200;
+						responseMessage = `Successfully created exam "${exam.id}" and skipped Approval Workflow due to user request.`;
+					} else if (isAdmin(user)) {
+						responseStatus = 200;
+						responseMessage = `Successfully created exam "${exam.id}" and skipped Approval Workflow due to admin rights.`;
+					} else {
+						const { successCount, totalCount } = await createApprovalWorkflowOnExamCreation(exam.createdBy, exam.entities, exam.id, module);
 	
 						if (successCount === totalCount) {
 							responseStatus = 200;
-						responseMessage = `Successfully created exam "${exam.id}" and started its Approval Workflow(s)`;
+							responseMessage = `Successfully created exam "${exam.id}" and started its Approval Workflow.`;
 						} else if (successCount > 0) {
 							responseStatus = 207;
-						responseMessage = `Successfully created exam with ID: "${exam.id}" but was not able to start/find an Approval Workflow for all the author's entities`;
+							responseMessage = `Successfully created exam with ID: "${exam.id}" but was not able to start/find an Approval Workflow for all the author's entities.`;
 						} else {
 							responseStatus = 207;
-						responseMessage = `Successfully created exam with ID: "${exam.id}" but was not able to find any configured Approval Workflow for the author.`;
+							responseMessage = `Successfully created exam with ID: "${exam.id}" but skipping approval process because no approval workflow was found configured for the exam author.`;
+						}
 					}
 				} catch (error) {
 					console.error("Workflow creation error:", error);
 					responseStatus = 207;
 					responseMessage = `Successfully created exam with ID: "${exam.id}" but something went wrong while creating the Approval Workflow(s).`;
 				}
-			} else { // if exam was updated, log the updates
+			} else {
+				// if exam was updated, log the updates
 				const approvalWorkflows = await getApprovalWorkflowsByExamId(exam.id);

 				if (approvalWorkflows) {
 					const differences = generateExamDifferences(docSnap as Exam, exam as Exam);
 					if (differences) {
 						approvalWorkflows.forEach((workflow) => {
-							const currentStepIndex = workflow.steps.findIndex(step => !step.completed || step.rejected);
+							const currentStepIndex = workflow.steps.findIndex((step) => !step.completed || step.rejected);

 							if (workflow.steps[currentStepIndex].examChanges === undefined) {
 								workflow.steps[currentStepIndex].examChanges = [...differences];
--- a/src/pages/api/exam/index.ts
+++ b/src/pages/api/exam/index.ts
@@ -3,9 +3,11 @@ import type {NextApiRequest, NextApiResponse} from "next";
 import client from "@/lib/mongodb";
 import { withIronSessionApiRoute } from "iron-session/next";
 import { sessionOptions } from "@/lib/session";
-import {flatten} from "lodash";
-import {Exam} from "@/interfaces/exam";
+import { flatten, map } from "lodash";
+import { AccessType, Exam } from "@/interfaces/exam";
 import { MODULE_ARRAY } from "@/utils/moduleUtils";
+import { requestUser } from "../../../utils/api";
+import { mapBy } from "../../../utils";

 const db = client.db(process.env.MONGODB_DB);

@@ -22,9 +24,29 @@ async function GET(req: NextApiRequest, res: NextApiResponse) {
 		res.status(401).json({ ok: false });
 		return;
 	}
+	const user = await requestUser(req, res)
+	if (!user)
+		return res.status(401).json({ ok: false, reason: "You must be logged in!" })
+	const isAdmin = ["admin", "developer"].includes(user.type)
+	const { entities = [] } = req.query as { access?: AccessType, entities?: string[] | string };
+	let entitiesToFetch = Array.isArray(entities) ? entities : entities ? [entities] : []
+
+	if (!isAdmin) {
+		const userEntitiesIDs = mapBy(user.entities || [], 'id')
+		entitiesToFetch = entities ? entitiesToFetch.filter((entity): entity is string => entity ? userEntitiesIDs.includes(entity) : false) : userEntitiesIDs
+		if ((entitiesToFetch.length ?? 0) === 0) {
+			res.status(200).json([])
+			return
+		}
+	}

 	const moduleExamsPromises = MODULE_ARRAY.map(async (module) => {
-		const snapshot = await db.collection(module).find<Exam>({ isDiagnostic: false }).toArray();
+		const snapshot = await db.collection(module).find<Exam>({
+			isDiagnostic: false, ...(isAdmin && (entitiesToFetch.length ?? 0) === 0 ? {
+			} : {
+				entity: { $in: entitiesToFetch }
+			})
+		}).toArray();

 		return snapshot.map((doc) => ({
 			...doc,
--- a/src/pages/approval-workflows/[id]/index.tsx
+++ b/src/pages/approval-workflows/[id]/index.tsx
@@ -58,7 +58,13 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res, params }
    const allAssigneeIds: string[] = [
        ...new Set(
            workflow.steps
-                .map(step => step.assignees)
+                .map((step) => {
+                    const assignees = step.assignees;
+                    if (step.completedBy) {
+                        assignees.push(step.completedBy);
+                    }
+                    return assignees;
+                })
                .flat()
        )
    ];
@@ -144,7 +150,7 @@ export default function Home({ user, initialWorkflow, id, workflowAssignees, wor
    const handleApproveStep = () => {
        const isLastStep = (selectedStepIndex + 1 === currentWorkflow.steps.length);
        if (isLastStep) {
-            if (!confirm(`Are you sure you want to approve the last step? Doing so will approve the exam.`)) return;
+            if (!confirm(`Are you sure you want to approve the last step? Doing so will change the access type of the exam from confidential to private.`)) return;
        }

        const updatedWorkflow: ApprovalWorkflow = {
@@ -186,7 +192,7 @@ export default function Home({ user, initialWorkflow, id, workflowAssignees, wor
            const examId = currentWorkflow.examId;

            axios
-                .patch(`/api/exam/${examModule}/${examId}`, { isDiagnostic: false })
+                .patch(`/api/exam/${examModule}/${examId}`, { access: "private" })
                .then(() => toast.success(`The exam was successfuly approved and this workflow has been completed.`))
                .catch((reason) => {
                    if (reason.response.status === 404) {
@@ -551,7 +557,7 @@ export default function Home({ user, initialWorkflow, id, workflowAssignees, wor
                                                    <div className="p-3 border border-gray-300 rounded-xl bg-white bg-opacity-80 overflow-y-auto max-h-40">
                                                        {currentWorkflow.steps[selectedStepIndex].examChanges?.length ? (
                                                            currentWorkflow.steps[selectedStepIndex].examChanges!.map((change, index) => (
-                                                                <p key={index} className="text-sm text-gray-500 mb-2">
+                                                                <p key={index} className="whitespace-pre-wrap text-sm text-gray-500 mb-2">
                                                                    {change}
                                                                </p>
                                                            ))
--- a/src/pages/approval-workflows/index.tsx
+++ b/src/pages/approval-workflows/index.tsx
@@ -1,24 +1,22 @@
 import Tip from "@/components/ApprovalWorkflows/Tip";
-import Layout from "@/components/High/Layout";
 import Button from "@/components/Low/Button";
 import Input from "@/components/Low/Input";
 import Select from "@/components/Low/Select";
 import useApprovalWorkflows from "@/hooks/useApprovalWorkflows";
-import { useAllowedEntities, useAllowedEntitiesSomePermissions, useEntityPermission } from "@/hooks/useEntityPermissions";
 import { Module, ModuleTypeLabels } from "@/interfaces";
 import { ApprovalWorkflow, ApprovalWorkflowStatus, ApprovalWorkflowStatusLabel, StepTypeLabel } from "@/interfaces/approval.workflow";
-import { Entity, EntityWithRoles } from "@/interfaces/entity";
+import { EntityWithRoles } from "@/interfaces/entity";
 import { User } from "@/interfaces/user";
 import { sessionOptions } from "@/lib/session";
 import { mapBy, redirect, serialize } from "@/utils";
 import { requestUser } from "@/utils/api";
 import { getApprovalWorkflows } from "@/utils/approval.workflows.be";
-import { getEntities, getEntitiesWithRoles } from "@/utils/entities.be";
+import { getEntitiesWithRoles } from "@/utils/entities.be";
 import { shouldRedirectHome } from "@/utils/navigation.disabled";
 import { doesEntityAllow, findAllowedEntities } from "@/utils/permissions";
 import { isAdmin } from "@/utils/users";
 import { getSpecificUsers } from "@/utils/users.be";
-import { createColumnHelper, flexRender, getCoreRowModel, useReactTable } from "@tanstack/react-table";
+import { createColumnHelper, flexRender, getCoreRowModel, useReactTable, getPaginationRowModel } from "@tanstack/react-table";
 import axios from "axios";
 import clsx from "clsx";
 import { withIronSessionSsr } from "iron-session/next";
@@ -69,7 +67,11 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {

 	if (shouldRedirectHome(user) || !["admin", "developer", "teacher", "corporate", "mastercorporate"].includes(user.type)) return redirect("/");

-	const workflows = await getApprovalWorkflows("active-workflows");
+	const entityIDS = mapBy(user.entities, "id");
+	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDS);
+	const allowedEntities = findAllowedEntities(user, entities, "view_workflows");
+
+	const workflows = await getApprovalWorkflows("active-workflows", allowedEntities.map(entity => entity.id));

 	const allAssigneeIds: string[] = [
 		...new Set(
@@ -81,10 +83,6 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 		)
 	];

-	const entityIDS = mapBy(user.entities, "id");
-	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDS);
-	const allowedEntities = findAllowedEntities(user, entities, "view_workflows");
-
 	return {
 		props: serialize({
 			user,
@@ -103,7 +101,8 @@ interface Props {
 }

 export default function ApprovalWorkflows({ user, initialWorkflows, workflowsAssignees, userEntitiesWithLabel }: Props) {
-	const { workflows, reload } = useApprovalWorkflows();
+	const entitiesString = userEntitiesWithLabel.map(entity => entity.id).join(",");
+	const { workflows, reload } = useApprovalWorkflows(entitiesString);
 	const currentWorkflows = workflows || initialWorkflows;

 	const [filteredWorkflows, setFilteredWorkflows] = useState<ApprovalWorkflow[]>([]);
@@ -191,7 +190,15 @@ export default function ApprovalWorkflows({ user, initialWorkflows, workflowsAss
 					{info.getValue().map((module: Module, index: number) => (
 						<span
 							key={index}
-							className="inline-block rounded-full px-3 py-1 text-sm font-medium bg-indigo-100 border border-indigo-300 text-indigo-900">
+							/* className="inline-block rounded-full px-3 py-1 text-sm font-medium bg-indigo-100 border border-indigo-300 text-indigo-900"> */
+							className={clsx("inline-block rounded-full px-3 py-1 text-sm font-medium text-white",
+								module === "speaking" ? "bg-ielts-speaking" :
+									module === "reading" ? "bg-ielts-reading" :
+										module === "writing" ? "bg-ielts-writing" :
+											module === "listening" ? "bg-ielts-listening" :
+												module === "level" ? "bg-ielts-level" :
+													"bg-slate-700"
+							)}>
 							{ModuleTypeLabels[module]}
 						</span>
 					))}
@@ -296,10 +303,20 @@ export default function ApprovalWorkflows({ user, initialWorkflows, workflowsAss
 		}),
 	];

+	const [pagination, setPagination] = useState({
+		pageIndex: 0,
+		pageSize: 10,
+	});
+
 	const table = useReactTable({
 		data: filteredWorkflows,
 		columns: columns,
+		state: {
+			pagination,
+		},
+		onPaginationChange: setPagination,
 		getCoreRowModel: getCoreRowModel(),
+		getPaginationRowModel: getPaginationRowModel(),
 	});

 	return (
@@ -395,6 +412,43 @@ export default function ApprovalWorkflows({ user, initialWorkflows, workflowsAss
 						))}
 					</tbody>
 				</table>
+				<div className="mt-2 flex flex-row gap-2 w-full justify-end items-center">
+					<button
+						onClick={() => table.setPageIndex(0)}
+						disabled={!table.getCanPreviousPage()}
+						className="px-3 py-2 rounded-md text-sm font-semibold text-mti-purple-ultradark border border-mti-purple-light 
+        bg-white hover:bg-mti-purple-light hover:text-white transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+					>
+						{"<<"}
+					</button>
+					<button
+						onClick={() => table.previousPage()}
+						disabled={!table.getCanPreviousPage()}
+						className="px-3 py-2 rounded-md text-sm font-semibold text-mti-purple-ultradark border border-mti-purple-light 
+        bg-white hover:bg-mti-purple-light hover:text-white transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+					>
+						{"<"}
+					</button>
+					<span className="px-4 text-sm font-medium">
+						Page {table.getState().pagination.pageIndex + 1} of {table.getPageCount()}
+					</span>
+					<button
+						onClick={() => table.nextPage()}
+						disabled={!table.getCanNextPage()}
+						className="px-3 py-2 rounded-md text-sm font-semibold text-mti-purple-ultradark border border-mti-purple-light 
+        bg-white hover:bg-mti-purple-light hover:text-white transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+					>
+						{">"}
+					</button>
+					<button
+						onClick={() => table.setPageIndex(table.getPageCount() - 1)}
+						disabled={!table.getCanNextPage()}
+						className="px-3 py-2 rounded-md text-sm font-semibold text-mti-purple-ultradark border border-mti-purple-light 
+        bg-white hover:bg-mti-purple-light hover:text-white transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
+					>
+						{">>"}
+					</button>
+				</div>
 			</div>
 		</>
 	);
--- a/src/pages/assignments/creator/[id].tsx
+++ b/src/pages/assignments/creator/[id].tsx
@@ -33,7 +33,6 @@ import moment from "moment";
 import Head from "next/head";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import { generate } from "random-words";
 import { useEffect, useMemo, useState } from "react";
 import ReactDatePicker from "react-datepicker";
 import {
--- a/src/pages/classrooms/[id].tsx
+++ b/src/pages/classrooms/[id].tsx
@@ -159,6 +159,21 @@ export default function Home({ user, group, users, entity }: Props) {
      prev.includes(u.id) ? prev.filter((p) => p !== u.id) : [...prev, u.id]
    );

+  const toggleAllUsersInList = () =>
+    setSelectedUsers((prev) =>
+      prev.length === rows.length
+        ? []
+        : [
+            ...prev,
+            ...items.reduce((acc, i) => {
+              if (!prev.find((item) => item === i.id)) {
+                (acc as string[]).push(i.id);
+              }
+              return acc;
+            }, [] as string[]),
+          ]
+    );
+
  const removeParticipants = () => {
    if (selectedUsers.length === 0) return;
    if (!canRemoveParticipants) return;
@@ -428,6 +443,25 @@ export default function Home({ user, group, users, entity }: Props) {
                  {capitalize(type)}
                </button>
              ))}
+              <button
+                onClick={() => {
+                  toggleAllUsersInList();
+                }}
+                disabled={rows.length === 0}
+                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",
+                  "disabled:grayscale disabled:hover:bg-mti-purple-ultralight disabled:hover:text-mti-purple disabled:cursor-not-allowed",
+                  (isAdding ? nonParticipantUsers : group.participants)
+                    .length === selectedUsers.length &&
+                    "!bg-mti-purple-light !text-white"
+                )}
+              >
+                {"De/Select All"}
+              </button>
+              <span className="opacity-80">
+                {selectedUsers.length} selected
+              </span>
            </div>
          </section>

--- a/src/pages/dashboard/mastercorporate.tsx
+++ b/src/pages/dashboard/mastercorporate.tsx
@@ -10,10 +10,7 @@ import { requestUser } from "@/utils/api";
 import {countEntitiesAssignments} from "@/utils/assignments.be";
 import {getEntitiesWithRoles} from "@/utils/entities.be";
 import {countGroupsByEntities} from "@/utils/groups.be";
-import {
-  checkAccess,
-  groupAllowedEntitiesByPermissions,
-} from "@/utils/permissions";
+import {checkAccess, groupAllowedEntitiesByPermissions} from "@/utils/permissions";
 import {groupByExam} from "@/utils/stats";
 import {countAllowedUsers, getUsers} from "@/utils/users.be";
 import {clsx} from "clsx";
@@ -22,16 +19,7 @@ import moment from "moment";
 import Head from "next/head";
 import {useRouter} from "next/router";
 import {useMemo} from "react";
-import {
-  BsBank,
-  BsClock,
-  BsEnvelopePaper,
-  BsPencilSquare,
-  BsPeople,
-  BsPeopleFill,
-  BsPersonFill,
-  BsPersonFillGear,
-} from "react-icons/bs";
+import {BsBank, BsClock, BsEnvelopePaper, BsPencilSquare, BsPeople, BsPeopleFill, BsPersonFill, BsPersonFillGear} from "react-icons/bs";
 import {ToastContainer} from "react-toastify";
 import {isAdmin} from "@/utils/users";

@@ -51,17 +39,11 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const user = await requestUser(req, res);
 	if (!user || !user.isVerified) return redirect("/login");

-  if (!checkAccess(user, ["admin", "developer", "mastercorporate"]))
-    return redirect("/");
+	if (!checkAccess(user, ["admin", "developer", "mastercorporate"])) return redirect("/");

 	const entityIDS = mapBy(user.entities, "id") || [];
-  const entities = await getEntitiesWithRoles(
-    isAdmin(user) ? undefined : entityIDS
-  );
-  const {
-    ["view_students"]: allowedStudentEntities,
-    ["view_teachers"]: allowedTeacherEntities,
-  } = groupAllowedEntitiesByPermissions(user, entities, [
+	const entities = await getEntitiesWithRoles(isAdmin(user) ? undefined : entityIDS);
+	const {["view_students"]: allowedStudentEntities, ["view_teachers"]: allowedTeacherEntities} = groupAllowedEntitiesByPermissions(user, entities, [
 		"view_students",
 		"view_teachers",
 	]);
@@ -70,25 +52,18 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {

 	const entitiesIDS = mapBy(entities, "id") || [];

-  const [
-    students,
-    latestStudents,
-    latestTeachers,
-    userCounts,
-    assignmentsCount,
-    groupsCount,
-  ] = await Promise.all([
+	const [students, latestStudents, latestTeachers, userCounts, assignmentsCount, groupsCount] = await Promise.all([
 		getUsers(
 			{type: "student", "entities.id": {$in: allowedStudentEntitiesIDS}},
 			10,
 			{averageLevel: -1},
-      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+			{_id: 0, id: 1, name: 1, email: 1, profilePicture: 1},
 		),
 		getUsers(
 			{type: "student", "entities.id": {$in: allowedStudentEntitiesIDS}},
 			10,
 			{registrationDate: -1},
-      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+			{_id: 0, id: 1, name: 1, email: 1, profilePicture: 1},
 		),
 		getUsers(
 			{
@@ -97,7 +72,7 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 			},
 			10,
 			{registrationDate: -1},
-      { _id: 0, id: 1, name: 1, email: 1, profilePicture: 1 }
+			{_id: 0, id: 1, name: 1, email: 1, profilePicture: 1},
 		),
 		countAllowedUsers(user, entities),
 		countEntitiesAssignments(entitiesIDS, {archived: {$ne: true}}),
@@ -129,37 +104,14 @@ export default function Dashboard({
 	stats = [],
 	groupsCount,
 }: Props) {
+	const totalCount = useMemo(() => userCounts.corporate + userCounts.mastercorporate + userCounts.student + userCounts.teacher, [userCounts]);

-  const totalCount = useMemo(
-    () =>
-      userCounts.corporate +
-      userCounts.mastercorporate +
-      userCounts.student +
-      userCounts.teacher,
-    [userCounts]
-  );
-
-  const totalLicenses = useMemo(
-    () =>
-      entities.reduce(
-        (acc, curr) => acc + parseInt(curr.licenses.toString()),
-        0
-      ),
-    [entities]
-  );
+	const totalLicenses = useMemo(() => entities.reduce((acc, curr) => acc + parseInt(curr.licenses.toString()), 0), [entities]);

 	const router = useRouter();

-  const allowedEntityStatistics = useAllowedEntities(
-    user,
-    entities,
-    "view_entity_statistics"
-  );
-  const allowedStudentPerformance = useAllowedEntities(
-    user,
-    entities,
-    "view_student_performance"
-  );
+	const allowedEntityStatistics = useAllowedEntities(user, entities, "view_entity_statistics");
+	const allowedStudentPerformance = useAllowedEntities(user, entities, "view_student_performance");

 	return (
 		<>
@@ -197,12 +149,13 @@ export default function Dashboard({
 						color="purple"
 					/>
 					<IconCard
-            Icon={BsPeople}
-            onClick={() => router.push("/classrooms")}
-            label="Classrooms"
-            value={groupsCount}
+						Icon={BsBank}
+						onClick={() => router.push("/users?type=mastercorporate")}
+						label="Master Corporates"
+						value={userCounts.mastercorporate}
 						color="purple"
 					/>
+					<IconCard Icon={BsPeople} onClick={() => router.push("/classrooms")} label="Classrooms" value={groupsCount} color="purple" />
 					<IconCard
 						Icon={BsPeopleFill}
 						onClick={() => router.push("/entities")}
@@ -233,19 +186,13 @@ export default function Dashboard({
 						onClick={() => router.push("/assignments")}
 						label="Assignments"
 						value={assignmentsCount}
-            className={clsx(
-              allowedEntityStatistics.length === 0 && "col-span-2"
-            )}
+						className={clsx(allowedEntityStatistics.length === 0 && "col-span-2")}
 						color="purple"
 					/>
 					<IconCard
 						Icon={BsClock}
 						label="Expiration Date"
-            value={
-              user.subscriptionExpirationDate
-                ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy")
-                : "Unlimited"
-            }
+						value={user.subscriptionExpirationDate ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy") : "Unlimited"}
 						color="rose"
 					/>
 				</section>
@@ -258,7 +205,7 @@ export default function Dashboard({
 						users={students.sort(
 							(a, b) =>
 								Object.keys(groupByExam(filterBy(stats, "user", b))).length -
-                Object.keys(groupByExam(filterBy(stats, "user", a))).length
+								Object.keys(groupByExam(filterBy(stats, "user", a))).length,
 						)}
 						title="Highest exam count students"
 					/>
--- a/src/pages/entities/[id]/roles/[role].tsx
+++ b/src/pages/entities/[id]/roles/[role].tsx
@@ -63,6 +63,9 @@ const EXAM_MANAGEMENT: PermissionLayout[] = [
 	{label: "Generate Level", key: "generate_level"},
 	{label: "Delete Level", key: "delete_level"},
 	{label: "Set as Private/Public", key: "update_exam_privacy"},
+	{label: "View Confidential Exams", key: "view_confidential_exams"},
+	{label: "Create Confidential Exams", key: "create_confidential_exams"},
+	{label: "Create Public Exams", key: "create_public_exams"},
 	{label: "View Statistics", key: "view_statistics"},
 ];

--- a/src/pages/settings.tsx
+++ b/src/pages/settings.tsx
@@ -13,13 +13,7 @@ import { checkAccess, getTypesOfUser } from "@/utils/permissions";
 import { useState} from "react";
 import Modal from "@/components/Modal";
 import IconCard from "@/components/IconCard";
-import {
-  BsCode,
-  BsCodeSquare,
-  BsGearFill,
-  BsPeopleFill,
-  BsPersonFill,
-} from "react-icons/bs";
+import {BsCode, BsCodeSquare, BsGearFill, BsPeopleFill, BsPersonFill} from "react-icons/bs";
 import UserCreator from "./(admin)/UserCreator";
 import CorporateGradingSystem from "./(admin)/CorporateGradingSystem";
 import {CEFR_STEPS} from "@/resources/grading";
@@ -28,14 +22,11 @@ import { getUserPermissions } from "@/utils/permissions.be";
 import {PermissionType} from "@/interfaces/permissions";
 import {getUsers} from "@/utils/users.be";
 import {getEntitiesWithRoles} from "@/utils/entities.be";
-import { mapBy, serialize, redirect } from "@/utils";
+import {mapBy, serialize, redirect, filterBy} from "@/utils";
 import {EntityWithRoles} from "@/interfaces/entity";
 import {requestUser} from "@/utils/api";
 import {isAdmin} from "@/utils/users";
-import {
-  getGradingSystemByEntities,
-  getGradingSystemByEntity,
-} from "@/utils/grading.be";
+import {getGradingSystemByEntities, getGradingSystemByEntity} from "@/utils/grading.be";
 import {Grading} from "@/interfaces";
 import {useRouter} from "next/router";
 import {useAllowedEntities} from "@/hooks/useEntityPermissions";
@@ -44,33 +35,19 @@ export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
 	const user = await requestUser(req, res);
 	if (!user) return redirect("/login");

-  if (
-    shouldRedirectHome(user) ||
-    !checkAccess(user, [
-      "admin",
-      "developer",
-      "corporate",
-      "teacher",
-      "mastercorporate",
-    ])
-  )
-    return redirect("/");
+	if (shouldRedirectHome(user) || !checkAccess(user, ["admin", "developer", "corporate", "teacher", "mastercorporate"])) return redirect("/");
 	const [permissions, entities, allUsers] = await Promise.all([
 		getUserPermissions(user.id),
-    isAdmin(user)
-      ? await getEntitiesWithRoles()
-      : await getEntitiesWithRoles(mapBy(user.entities, "id")),
+		isAdmin(user) ? await getEntitiesWithRoles() : await getEntitiesWithRoles(mapBy(user.entities, "id")),
 		getUsers(),
 	]);
-  const gradingSystems = await getGradingSystemByEntities(
-    mapBy(entities, "id")
-  );
+	const gradingSystems = await getGradingSystemByEntities(mapBy(entities, "id"));
 	const entitiesGrading = entities.map(
 		(e) =>
 			gradingSystems.find((g) => g.entity === e.id) || {
 				entity: e.id,
 				steps: CEFR_STEPS,
-      }
+			},
 	);

 	return {
@@ -92,41 +69,15 @@ interface Props {
 	entitiesGrading: Grading[];
 }

-export default function Admin({
-  user,
-  entities,
-  permissions,
-  allUsers,
-  entitiesGrading,
-}: Props) {
+export default function Admin({user, entities, permissions, allUsers, entitiesGrading}: Props) {
 	const [modalOpen, setModalOpen] = useState<string>();
 	const router = useRouter();

-  const entitiesAllowCreateUser = useAllowedEntities(
-    user,
-    entities,
-    "create_user"
-  );
-  const entitiesAllowCreateUsers = useAllowedEntities(
-    user,
-    entities,
-    "create_user_batch"
-  );
-  const entitiesAllowCreateCode = useAllowedEntities(
-    user,
-    entities,
-    "create_code"
-  );
-  const entitiesAllowCreateCodes = useAllowedEntities(
-    user,
-    entities,
-    "create_code_batch"
-  );
-  const entitiesAllowEditGrading = useAllowedEntities(
-    user,
-    entities,
-    "edit_grading_system"
-  );
+	const entitiesAllowCreateUser = useAllowedEntities(user, entities, "create_user");
+	const entitiesAllowCreateUsers = useAllowedEntities(user, entities, "create_user_batch");
+	const entitiesAllowCreateCode = useAllowedEntities(user, entities, "create_code");
+	const entitiesAllowCreateCodes = useAllowedEntities(user, entities, "create_code_batch");
+	const entitiesAllowEditGrading = useAllowedEntities(user, entities, "edit_grading_system");

 	return (
 		<>
@@ -141,22 +92,19 @@ export default function Admin({
 			</Head>
 			<ToastContainer />
 			<>
-        <Modal
-          isOpen={modalOpen === "batchCreateUser"}
-          onClose={() => setModalOpen(undefined)}
-          maxWidth="max-w-[85%]"
-        >
+				<Modal isOpen={modalOpen === "batchCreateUser"} onClose={() => setModalOpen(undefined)} maxWidth="max-w-[85%]">
 					<BatchCreateUser
 						user={user}
-            entities={entitiesAllowCreateUser}
+						entities={entitiesAllowCreateUsers.filter(
+							(e) =>
+								e.licenses > 0 &&
+								e.licenses > allUsers.filter((u) => !isAdmin(u) && (u.entities || []).some((ent) => ent.id === e.id)).length,
+						)}
 						permissions={permissions}
 						onFinish={() => setModalOpen(undefined)}
 					/>
 				</Modal>
-        <Modal
-          isOpen={modalOpen === "batchCreateCode"}
-          onClose={() => setModalOpen(undefined)}
-        >
+				<Modal isOpen={modalOpen === "batchCreateCode"} onClose={() => setModalOpen(undefined)}>
 					<BatchCodeGenerator
 						entities={entitiesAllowCreateCodes}
 						user={user}
@@ -165,10 +113,7 @@ export default function Admin({
 						onFinish={() => setModalOpen(undefined)}
 					/>
 				</Modal>
-        <Modal
-          isOpen={modalOpen === "createCode"}
-          onClose={() => setModalOpen(undefined)}
-        >
+				<Modal isOpen={modalOpen === "createCode"} onClose={() => setModalOpen(undefined)}>
 					<CodeGenerator
 						entities={entitiesAllowCreateCode}
 						user={user}
@@ -176,22 +121,20 @@ export default function Admin({
 						onFinish={() => setModalOpen(undefined)}
 					/>
 				</Modal>
-        <Modal
-          isOpen={modalOpen === "createUser"}
-          onClose={() => setModalOpen(undefined)}
-        >
+				<Modal isOpen={modalOpen === "createUser"} onClose={() => setModalOpen(undefined)}>
 					<UserCreator
 						user={user}
-            entities={entitiesAllowCreateUsers}
+						entities={entitiesAllowCreateUser.filter(
+							(e) =>
+								e.licenses > 0 &&
+								e.licenses > allUsers.filter((u) => !isAdmin(u) && (u.entities || []).some((ent) => ent.id === e.id)).length,
+						)}
 						users={allUsers}
 						permissions={permissions}
 						onFinish={() => setModalOpen(undefined)}
 					/>
 				</Modal>
-        <Modal
-          isOpen={modalOpen === "gradingSystem"}
-          onClose={() => setModalOpen(undefined)}
-        >
+				<Modal isOpen={modalOpen === "gradingSystem"} onClose={() => setModalOpen(undefined)}>
 					<CorporateGradingSystem
 						user={user}
 						entitiesGrading={entitiesGrading}
@@ -202,12 +145,7 @@ export default function Admin({

 				<section className="w-full grid grid-cols-2 -md:grid-cols-1 gap-8">
 					<ExamLoader />
-          {checkAccess(
-            user,
-            getTypesOfUser(["teacher"]),
-            permissions,
-            "viewCodes"
-          ) && (
+					{checkAccess(user, getTypesOfUser(["teacher"]), permissions, "viewCodes") && (
 						<div className="w-full grid grid-cols-2 gap-4">
 							<IconCard
 								Icon={BsCode}
@@ -241,12 +179,7 @@ export default function Admin({
 								onClick={() => setModalOpen("batchCreateUser")}
 								disabled={entitiesAllowCreateUsers.length === 0}
 							/>
-              {checkAccess(user, [
-                "admin",
-                "corporate",
-                "developer",
-                "mastercorporate",
-              ]) && (
+							{checkAccess(user, ["admin", "corporate", "developer", "mastercorporate"]) && (
 								<IconCard
 									Icon={BsGearFill}
 									label="Grading System"
--- a/src/resources/entityPermissions.ts
+++ b/src/resources/entityPermissions.ts
@@ -71,7 +71,10 @@ export type RolePermission =
 	| "view_workflows"
 	| "configure_workflows"
 	| "edit_workflow"
-	| "delete_workflow";
+	| "delete_workflow"
+	| "view_confidential_exams"
+	| "create_confidential_exams"
+	| "create_public_exams";

 export const DEFAULT_PERMISSIONS: RolePermission[] = [
 	"view_students",
@@ -156,4 +159,6 @@ export const ADMIN_PERMISSIONS: RolePermission[] = [
 	"view_workflows",
 	"edit_workflow",
 	"delete_workflow",
+	"create_confidential_exams",
+	"create_public_exams",
 ];
--- a/src/stores/examEditor/defaults.ts
+++ b/src/stores/examEditor/defaults.ts
@@ -158,7 +158,7 @@ const defaultModuleSettings = (module: Module, minTimer: number, reset: boolean
 		examLabel: defaultExamLabel(module),
 		minTimer,
 		difficulty: [sample(["A1", "A2", "B1", "B2", "C1", "C2"] as Difficulty[])!],
-		isPrivate: true,
+		access: "private",
 		sectionLabels: sectionLabels(module),
 		expandedSections: [(reset && (module === "writing" || module === "speaking")) ? 0 : 1],
 		focusedSection: 1,
--- a/src/stores/examEditor/reducers/index.ts
+++ b/src/stores/examEditor/reducers/index.ts
@@ -6,6 +6,7 @@ import { SECTION_ACTIONS, SectionActions, sectionReducer } from "./sectionReduce
 import { Module } from "@/interfaces";
 import { updateExamWithUserSolutions } from "@/stores/exam/utils";
 import { defaultExamUserSolutions } from "@/utils/exams";
+import { access } from "fs";

 type RootActions = { type: 'FULL_RESET' } |
 { type: 'INIT_EXAM_EDIT', payload: { exam: Exam; examModule: Module; id: string } } |
@@ -121,7 +122,7 @@ export const rootReducer = (
                        ...defaultModuleSettings(examModule, exam.minTimer),
                        examLabel: exam.label,
                        difficulty: exam.difficulty,
-                        isPrivate: exam.private,
+                        access: exam.access,
                        sections: examState,
                        importModule: false,
                        sectionLabels:
--- a/src/stores/examEditor/types.ts
+++ b/src/stores/examEditor/types.ts
@@ -1,4 +1,4 @@
-import { Difficulty, InteractiveSpeakingExercise, LevelPart, ListeningPart, ReadingPart, Script, SpeakingExercise, WritingExercise } from "@/interfaces/exam";
+import { AccessType, Difficulty, InteractiveSpeakingExercise, LevelPart, ListeningPart, ReadingPart, Script, SpeakingExercise, WritingExercise } from "@/interfaces/exam";
 import { Module } from "@/interfaces";
 import Option from "@/interfaces/option";

@@ -126,7 +126,7 @@ export interface ModuleState {
    sections: SectionState[];
    minTimer: number;
    difficulty: Difficulty[];
-    isPrivate: boolean;
+    access: AccessType;
    sectionLabels: { id: number; label: string; }[];
    expandedSections: number[];
    focusedSection: number;
--- a/src/utils/approval.workflows.be.ts
+++ b/src/utils/approval.workflows.be.ts
@@ -4,11 +4,18 @@ import { ObjectId } from "mongodb";

 const db = client.db(process.env.MONGODB_DB);

-export const getApprovalWorkflows = async (collection: string, ids?: string[]) => {
-    return await db
-        .collection<ApprovalWorkflow>(collection)
-        .find(ids ? { _id: { $in: ids.map((id) => new ObjectId(id)) } } : {})
-        .toArray();
+export const getApprovalWorkflows = async (collection: string, entityIds?: string[], ids?: string[]) => {
+    const filters: any = {};
+
+    if (ids && ids.length > 0) {
+        filters.id = { $in: ids };
+    }
+
+    if (entityIds && entityIds.length > 0) {
+        filters.entityId = { $in: entityIds };
+    }
+
+    return await db.collection<ApprovalWorkflow>(collection).find(filters).toArray();
 };

 export const getApprovalWorkflow = async (collection: string, id: string) => {
@@ -39,7 +46,7 @@ export const getApprovalWorkflowsByExamId = async (examId: string) => {
        .collection<ApprovalWorkflow>("active-workflows")
        .find({
            examId,
-            status: { $in: ["pending"] }
+            status: { $in: ["pending"] },
        })
        .toArray();
 };
--- a/src/utils/exam.differences.ts
+++ b/src/utils/exam.differences.ts
@@ -1,7 +1,30 @@
 import { Exam } from "@/interfaces/exam";
 import { diff, Diff } from "deep-diff";

-const EXCLUDED_FIELDS = new Set(["_id", "id", "createdAt", "createdBy", "entities", "isDiagnostic", "private"]);
+const EXCLUDED_KEYS = new Set<string>(["_id", "id", "createdAt", "createdBy", "entities", "isDiagnostic", "private", "requiresApproval", "exerciseID", "questionID"]);
+
+const PATH_LABELS: Record<string, string> = {
+    access: "Access Type",
+    parts: "Parts",
+    exercises: "Exercises",
+    userSolutions: "User Solutions",
+    words: "Words",
+    options: "Options",
+    prompt: "Prompt",
+    text: "Text",
+    audio: "Audio",
+    script: "Script",
+    difficulty: "Difficulty",
+    shuffle: "Shuffle",
+    solutions: "Solutions",
+    variant: "Variant",
+    prefix: "Prefix",
+    suffix: "Suffix",
+    topic: "Topic",
+    allowRepetition: "Allow Repetition",
+    maxWords: "Max Words",
+    minTimer: "Timer",
+};

 export function generateExamDifferences(oldExam: Exam, newExam: Exam): string[] {
    const differences = diff(oldExam, newExam) || [];
@@ -9,34 +32,23 @@ export function generateExamDifferences(oldExam: Exam, newExam: Exam): string[]
 }

 function formatDifference(change: Diff<any, any>): string | undefined {
-    if (!change.path) {
+    if (!change.path) return;
+
+    if (change.path.some((segment) => EXCLUDED_KEYS.has(segment))) {
        return;
    }

-    if (change.path.some((segment) => EXCLUDED_FIELDS.has(segment))) {
-        return;
-    }
-
-    // Convert path array to something human-readable
-    const pathString = change.path.join(" \u2192 "); // e.g. "parts → 0 → exercises → 1 → prompt"
+    const pathString = pathToHumanReadable(change.path);

    switch (change.kind) {
-        case "N":
-            // A new property/element was added
-            return `\u{2022} Added \`${pathString}\` with value: ${formatValue(change.rhs)}`;
-
-        case "D":
-            // A property/element was deleted
-            return `\u{2022} Removed \`${pathString}\` which had value: ${formatValue(change.lhs)}`;
-
-        case "E":
-            // A property/element was edited
-            return `\u{2022} Changed \`${pathString}\` from ${formatValue(change.lhs)} to ${formatValue(change.rhs)}`;
-
-        case "A":
-            // An array change; change.item describes what happened at array index change.index
+        case "N": // New property/element
+            return `• Added ${pathString} with value: ${formatValue(change.rhs)}\n`;
+        case "D": // Deleted property/element
+            return `• Removed ${pathString} which had value: ${formatValue(change.lhs)}\n`;
+        case "E": // Edited property/element
+            return `• Changed ${pathString} from ${formatValue(change.lhs)} to ${formatValue(change.rhs)}\n`;
+        case "A": // Array change
            return formatArrayChange(change);
-
        default:
            return;
    }
@@ -44,12 +56,12 @@ function formatDifference(change: Diff<any, any>): string | undefined {

 function formatArrayChange(change: Diff<any, any>): string | undefined {
    if (!change.path) return;
-    if (change.path.some((segment) => EXCLUDED_FIELDS.has(segment))) {
+
+    if (change.path.some((segment) => EXCLUDED_KEYS.has(segment))) {
        return;
    }

-    const pathString = change.path.join(" \u2192 ");
-
+    const pathString = pathToHumanReadable(change.path);
    const arrayChange = (change as any).item;
    const idx = (change as any).index;

@@ -57,14 +69,13 @@ function formatArrayChange(change: Diff<any, any>): string | undefined {

    switch (arrayChange.kind) {
        case "N":
-            return `\u{2022} Added an item at index [${idx}] in \`${pathString}\`: ${formatValue(arrayChange.rhs)}`;
+            return `• Added an item at [#${idx + 1}] in ${pathString}: ${formatValue(arrayChange.rhs)}\n`;
        case "D":
-            return `\u{2022} Removed an item at index [${idx}] in \`${pathString}\`: ${formatValue(arrayChange.lhs)}`;
+            return `• Removed an item at [#${idx + 1}] in ${pathString}: ${formatValue(arrayChange.lhs)}\n`;
        case "E":
-            return `\u{2022} Edited an item at index [${idx}] in \`${pathString}\` from ${formatValue(arrayChange.lhs)} to ${formatValue(arrayChange.rhs)}`;
+            return `• Edited an item at [#${idx + 1}] in ${pathString} from ${formatValue(arrayChange.lhs)} to ${formatValue(arrayChange.rhs)}\n`;
        case "A":
-            // Nested array changes could happen theoretically; handle or ignore similarly
-            return `\u{2022} Complex array change at index [${idx}] in \`${pathString}\`: ${JSON.stringify(arrayChange)}`;
+            return `• Complex array change at [#${idx + 1}] in ${pathString}: ${JSON.stringify(arrayChange)}\n`;
        default:
            return;
    }
@@ -73,12 +84,64 @@ function formatArrayChange(change: Diff<any, any>): string | undefined {
 function formatValue(value: any): string {
    if (value === null) return "null";
    if (value === undefined) return "undefined";
+
    if (typeof value === "object") {
        try {
-            return JSON.stringify(value);
+            const sanitized = removeExcludedKeysDeep(value, EXCLUDED_KEYS);
+
+            const renamed = renameKeysDeep(sanitized, PATH_LABELS);
+
+            return JSON.stringify(renamed, null, 2);
        } catch {
            return String(value);
        }
    }
    return JSON.stringify(value);
 }
+
+function removeExcludedKeysDeep(obj: any, excludedKeys: Set<string>): any {
+    if (Array.isArray(obj)) {
+        return obj.map((item) => removeExcludedKeysDeep(item, excludedKeys));
+    } else if (obj && typeof obj === "object") {
+        const newObj: any = {};
+        for (const key of Object.keys(obj)) {
+            if (excludedKeys.has(key)) {
+                // Skip this key entirely
+                continue;
+            }
+            newObj[key] = removeExcludedKeysDeep(obj[key], excludedKeys);
+        }
+        return newObj;
+    }
+    return obj;
+}
+
+function renameKeysDeep(obj: any, renameMap: Record<string, string>): any {
+    if (Array.isArray(obj)) {
+        return obj.map((item) => renameKeysDeep(item, renameMap));
+    } else if (obj && typeof obj === "object") {
+        const newObj: any = {};
+        for (const key of Object.keys(obj)) {
+            const newKey = renameMap[key] ?? key; // Use friendly label if available
+            newObj[newKey] = renameKeysDeep(obj[key], renameMap);
+        }
+        return newObj;
+    }
+    return obj;
+}
+
+/**
+ * Convert an array of path segments into a user-friendly string.
+ * e.g. ["parts", 0, "exercises", 1, "prompt"]
+ *      → "Parts → [#1] → Exercises → [#2] → Prompt"
+ */
+function pathToHumanReadable(pathSegments: Array<string | number>): string {
+    return pathSegments
+        .map((seg) => {
+            if (typeof seg === "number") {
+                return `[#${seg + 1}]`;
+            }
+            return PATH_LABELS[seg] ?? seg;
+        })
+        .join(" → ");
+}
--- a/src/utils/exams.be.ts
+++ b/src/utils/exams.be.ts
@@ -64,6 +64,7 @@ export const getExams = async (
 		.collection(module)
 		.find<Exam>({
 			isDiagnostic: false,
+			access: "public",
 		})
 		.toArray();

@@ -72,7 +73,7 @@ export const getExams = async (
 			...doc,
 			module,
 		})) as Exam[],
-	).filter((x) => !x.private);
+	)

 	let exams: Exam[] = await filterByEntities(shuffledPublicExams, userId);
 	exams = filterByVariant(exams, variant);
--- a/src/utils/moduleUtils.ts
+++ b/src/utils/moduleUtils.ts
@@ -23,7 +23,7 @@ export const sortByModuleName = (a: string, b: string) => {
 };

 export const countExercises = (exercises: Exercise[]) => {
-	const lengthMap = exercises.map((e) => {
+	const lengthMap = (exercises ?? []).map((e) => {
 		if (e.type === "multipleChoice") return e.questions.length;
 		if (e.type === "interactiveSpeaking") return e.prompts.length;
 		if (e.type === "fillBlanks") return e.solutions.length;
--- a/src/utils/permissions.ts
+++ b/src/utils/permissions.ts
@@ -2,7 +2,6 @@ import { EntityWithRoles, Role } from "@/interfaces/entity";
 import { PermissionType } from "@/interfaces/permissions";
 import { User, Type, userTypes } from "@/interfaces/user";
 import { RolePermission } from "@/resources/entityPermissions";
-import axios from "axios";
 import { findBy, mapBy } from ".";
 import { isAdmin } from "./users";

@@ -76,7 +75,7 @@ export function groupAllowedEntitiesByPermissions(
 export function findAllowedEntities(user: User, entities: EntityWithRoles[], permission: RolePermission) {
 	if (["admin", "developer"].includes(user?.type)) return entities

-	const allowedEntities = entities.filter((e) => doesEntityAllow(user, e, permission))
+	const allowedEntities = (entities ?? []).filter((e) => doesEntityAllow(user, e, permission))
 	return allowedEntities
 }

--- a/src/utils/users.ts
+++ b/src/utils/users.ts
@@ -3,6 +3,7 @@ import {User} from "@/interfaces/user";
 import { USER_TYPE_LABELS } from "@/resources/user";
 import { capitalize } from "lodash";
 import moment from "moment";
+import ExcelJS from "exceljs";

 export interface UserListRow {
 	name: string;
@@ -17,6 +18,22 @@ export interface UserListRow {
 	gender: string;
 }

+const indexToLetter = (index: number): string => {
+	// Base case: if the index is less than 0, return an empty string
+	if (index < 0) {
+		return '';
+	}
+
+	// Calculate the quotient for recursion (number of times the letter sequence repeats)
+	const quotient = Math.floor(index / 26);
+
+	// Calculate the remainder for the current letter
+	const remainder = index % 26;
+
+	// Recursively call indexToLetter for the quotient and append the current letter
+	return indexToLetter(quotient - 1) + String.fromCharCode(65 + remainder);
+};
+
 export const exportListToExcel = (rowUsers: WithLabeledEntities<User>[]) => {
 	const rows: UserListRow[] = rowUsers.map((user) => ({
 		name: user.name,
@@ -33,10 +50,31 @@ export const exportListToExcel = (rowUsers: WithLabeledEntities<User>[]) => {
 		gender: user.demographicInformation?.gender ? capitalize(user.demographicInformation.gender) : "N/A",
 		verified: user.isVerified?.toString() || "FALSE",
 	}));
-	const header = "Name,Email,Type,Entities,Expiry Date,Country,Phone,Employment/Department,Gender,Verification";
-	const rowsString = rows.map((x) => Object.values(x).join(",")).join("\n");
+	const workbook = new ExcelJS.Workbook();
+	const worksheet = workbook.addWorksheet("User Data");
+	const border: Partial<ExcelJS.Borders> = { top: { style: 'thin' as ExcelJS.BorderStyle }, left: { style: 'thin' as ExcelJS.BorderStyle }, bottom: { style: 'thin' as ExcelJS.BorderStyle }, right: { style: 'thin' as ExcelJS.BorderStyle } }
+	const header = ['Name', 'Email', 'Type', 'Entities', 'Expiry Date', 'Country', 'Phone', 'Employment/Department', 'Gender', 'Verification'].forEach((item, index) => {
+		const cell = worksheet.getCell(`${indexToLetter(index)}1`);
+		const column = worksheet.getColumn(index + 1);
+		column.width = item.length * 2;
+		cell.value = item;
+		cell.font = { bold: true, size: 16 };
+		cell.border = border;

-	return `${header}\n${rowsString}`;
+	});
+	rows.forEach((x, index) => {
+		(Object.keys(x) as (keyof UserListRow)[]).forEach((key, i) => {
+			const cell = worksheet.getCell(`${indexToLetter(i)}${index + 2}`);
+			cell.value = x[key];
+			if (index === 0) {
+				const column = worksheet.getColumn(i + 1);
+				column.width = Math.max(column.width ?? 0, x[key].toString().length * 2);
+			}
+			cell.border = border;
+		});
+	})
+
+	return workbook.xlsx.writeBuffer();
 };

 export const getUserName = (user?: User) => {
Author	SHA1	Message	Date
Tiago Ribeiro	fec3b51553	Created two new permissions	2025-02-17 10:32:57 +00:00
João Correia	d8386bdd8e	Merged in approval-workflows (pull request #152 ) Approval workflows Approved-by: Tiago Ribeiro	2025-02-11 12:09:17 +00:00
Joao Correia	df2f83e496	make access confidential when user submits exam with approval process. make access private upon approval workflow completed.	2025-02-10 13:25:11 +00:00
Joao Correia	e214d8b598	improve edited exam changes again	2025-02-10 11:30:24 +00:00
Joao Correia	c14f16c97a	improve edited exam changes printing format	2025-02-09 21:12:29 +00:00
Joao Correia	ca2cf739ee	improve edited exam changes printing format	2025-02-09 20:56:55 +00:00
João Correia	d432fb4bc4	Merged in approval-workflows (pull request #151 ) Approval workflows Approved-by: Tiago Ribeiro	2025-02-09 18:44:44 +00:00
Joao Correia	d5bffc9bad	Add pagination to approval workflows table and change module styling to match project colors.	2025-02-09 18:10:59 +00:00
Joao Correia	75b4643918	Add button to submit exam without approval process	2025-02-09 17:37:19 +00:00
Joao Correia	9ae6b8e894	make sure admin id is passed to step component if the admin is not assigned to the workflow but approved a step.	2025-02-09 16:55:50 +00:00
Joao Correia	6f6c5a4209	make first step approved by default	2025-02-09 15:44:37 +00:00
Tiago Ribeiro	769b1b39d3	Added the permission	2025-02-09 11:35:52 +00:00
Francisco Lima	4bb12c7f01	Merged in addedAccess-bugfixes (pull request #150 ) AddedAccess bugfixes Approved-by: Tiago Ribeiro	2025-02-09 11:16:24 +00:00
Francisco Lima	a80a342ae2	Merged develop into addedAccess-bugfixes	2025-02-09 04:32:42 +00:00
José Lima	e5e60fcce9	fixed some issues related to build	2025-02-09 04:29:32 +00:00
José Lima	b175d8797e	added access variable to exams soo we can distinguish private, public and confidential exams and also bugfixes and improvements	2025-02-09 04:28:34 +00:00
João Correia	f06349e350	Merged in approval-workflows (pull request #149 ) filter workflows user can see based on entities Approved-by: Tiago Ribeiro	2025-02-08 19:35:46 +00:00
Tiago Ribeiro	34caf9986c	Merged develop into approval-workflows	2025-02-08 19:35:31 +00:00
Joao Correia	3a3d3d014d	filter workflows user can see based on entities	2025-02-08 19:23:42 +00:00
João Correia	c49c303f20	Merged in approval-workflows (pull request #148 ) temporary fix for same exam instance being used for all entities and implement approval process skip edge cases Approved-by: Tiago Ribeiro	2025-02-08 18:03:43 +00:00
Joao Correia	cbe353c2c5	- start only one of the configured workflows (randomly at the moment) for the exam Author. - skip approval process for admins	2025-02-08 15:26:16 +00:00
Tiago Ribeiro	991adede96	Merged in develop (pull request #147 ) Develop	2025-02-07 17:54:57 +00:00
Tiago Ribeiro	f95bce6fa2	Did some fixes related to master corporates	2025-02-07 16:19:47 +00:00
João Correia	1dd6cead9e	Merged in workflow-permissions (pull request #146 ) Workflow permissions Approved-by: Tiago Ribeiro	2025-02-07 15:43:34 +00:00