ENCOA-90: Creating the ability for a corporate/master corporate to edit their grading system

This commit is contained in:
Tiago Ribeiro
2024-08-26 22:35:00 +01:00
parent 4a1a52bd61
commit a0b8521f0a
6 changed files with 293 additions and 1 deletions

22
src/hooks/useGrading.tsx Normal file
View File

@@ -0,0 +1,22 @@
import {Grading} from "@/interfaces";
import {Code, Group, User} from "@/interfaces/user";
import axios from "axios";
import {useEffect, useState} from "react";
export default function useGradingSystem() {
const [gradingSystem, setGradingSystem] = useState<Grading>();
const [isLoading, setIsLoading] = useState(false);
const [isError, setIsError] = useState(false);
const getData = () => {
setIsLoading(true);
axios
.get<Grading>(`/api/grading`)
.then((response) => setGradingSystem(response.data))
.finally(() => setIsLoading(false));
};
useEffect(getData, []);
return {gradingSystem, isLoading, isError, reload: getData, mutate: setGradingSystem};
}

View File

@@ -1 +1,12 @@
export type Module = "reading" | "listening" | "writing" | "speaking" | "level";
export interface Step {
min: number;
max: number;
label: string;
}
export interface Grading {
user: string;
steps: Step[];
}

View File

@@ -0,0 +1,128 @@
import Button from "@/components/Low/Button";
import Input from "@/components/Low/Input";
import {Grading, Step} from "@/interfaces";
import {User} from "@/interfaces/user";
import {CEFR_STEPS, GENERAL_STEPS, IELTS_STEPS, TOFEL_STEPS} from "@/resources/grading";
import axios from "axios";
import {useEffect, useState} from "react";
import {BsPlusCircle, BsTrash} from "react-icons/bs";
import {toast} from "react-toastify";
const areStepsOverlapped = (steps: Step[]) => {
for (let i = 0; i < steps.length; i++) {
if (i === 0) continue;
const step = steps[i];
const previous = steps[i - 1];
if (previous.max >= step.min) return true;
}
return false;
};
export default function CorporateGradingSystem({user, defaultSteps, mutate}: {user: User; defaultSteps: Step[]; mutate: (steps: Step[]) => void}) {
const [isLoading, setIsLoading] = useState(false);
const [steps, setSteps] = useState<Step[]>(defaultSteps || []);
const saveGradingSystem = () => {
if (!steps.every((x) => x.min < x.max)) return toast.error("One of your steps has a minimum threshold inferior to its superior threshold.");
if (areStepsOverlapped(steps)) return toast.error("There seems to be an overlap in one of your steps.");
if (
steps.reduce((acc, curr) => {
console.log(acc - (curr.max - curr.min + 1));
return acc - (curr.max - curr.min + 1);
}, 100) > 0
)
return toast.error("There seems to be an open interval in your steps.");
setIsLoading(true);
axios
.post("/api/grading", {user: user.id, steps})
.then(() => toast.success("Your grading system has been saved!"))
.then(() => mutate(steps))
.catch(() => toast.error("Something went wrong, please try again later"))
.finally(() => setIsLoading(false));
};
return (
<div className="flex flex-col gap-4 border p-4 border-mti-gray-platinum rounded-xl">
<label className="font-normal text-base text-mti-gray-dim">Grading System</label>
<label className="font-normal text-base text-mti-gray-dim">Preset Systems</label>
<div className="grid grid-cols-4 gap-4">
<Button variant="outline" onClick={() => setSteps(CEFR_STEPS)}>
CEFR
</Button>
<Button variant="outline" onClick={() => setSteps(GENERAL_STEPS)}>
General English
</Button>
<Button variant="outline" onClick={() => setSteps(IELTS_STEPS)}>
IELTS
</Button>
<Button variant="outline" onClick={() => setSteps(TOFEL_STEPS)}>
TOFEL iBT
</Button>
</div>
{steps.map((step, index) => (
<>
<div className="flex items-center gap-4">
<div className="grid grid-cols-3 gap-4 w-full" key={step.min}>
<Input
label="Min. Percentage"
value={step.min}
type="number"
disabled={index === 0 || isLoading}
onChange={(e) => setSteps((prev) => prev.map((x, i) => (i === index ? {...x, min: parseInt(e)} : x)))}
name="min"
/>
<Input
label="Grade"
value={step.label}
type="text"
disabled={isLoading}
onChange={(e) => setSteps((prev) => prev.map((x, i) => (i === index ? {...x, label: e} : x)))}
name="min"
/>
<Input
label="Max. Percentage"
value={step.max}
type="number"
disabled={index === steps.length - 1 || isLoading}
onChange={(e) => setSteps((prev) => prev.map((x, i) => (i === index ? {...x, max: parseInt(e)} : x)))}
name="max"
/>
</div>
{index !== 0 && index !== steps.length - 1 && (
<button
disabled={isLoading}
className="pt-9 text-xl group"
onClick={() => setSteps((prev) => prev.filter((_, i) => i !== index))}>
<div className="w-full h-full flex items-center justify-center group-hover:bg-neutral-200 rounded-full p-3 transition ease-in-out duration-300">
<BsTrash />
</div>
</button>
)}
</div>
{index < steps.length - 1 && (
<Button
className="w-full flex items-center justify-center"
disabled={isLoading}
onClick={() => {
const item = {min: steps[index === 0 ? 0 : index - 1].max + 1, max: steps[index + 1].min - 1, label: ""};
setSteps((prev) => [...prev.slice(0, index + 1), item, ...prev.slice(index + 1, steps.length)]);
}}>
<BsPlusCircle />
</Button>
)}
</>
))}
<Button onClick={saveGradingSystem} isLoading={isLoading} disabled={isLoading} className="mt-8">
Save Grading System
</Button>
</div>
);
}

View File

@@ -0,0 +1,74 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type {NextApiRequest, NextApiResponse} from "next";
import {app} from "@/firebase";
import {getFirestore, collection, getDocs, setDoc, doc, getDoc, deleteDoc, query} from "firebase/firestore";
import {withIronSessionApiRoute} from "iron-session/next";
import {sessionOptions} from "@/lib/session";
import {CorporateUser, Group} from "@/interfaces/user";
import {Discount, Package} from "@/interfaces/paypal";
import {v4} from "uuid";
import {checkAccess} from "@/utils/permissions";
import {CEFR_STEPS} from "@/resources/grading";
import {getCorporateUser} from "@/resources/user";
import {getUserCorporate} from "@/utils/groups";
import {Grading} from "@/interfaces";
import {getGroupsForUser} from "@/utils/groups.be";
import {uniq} from "lodash";
import {getUser} from "@/utils/users.be";
const db = getFirestore(app);
export default withIronSessionApiRoute(handler, sessionOptions);
async function handler(req: NextApiRequest, res: NextApiResponse) {
if (req.method === "GET") await get(req, res);
if (req.method === "POST") await post(req, res);
}
async function get(req: NextApiRequest, res: NextApiResponse) {
if (!req.session.user) {
res.status(401).json({ok: false});
return;
}
const snapshot = await getDoc(doc(db, "grading", req.session.user.id));
if (snapshot.exists()) return res.status(200).json(snapshot.data());
if (req.session.user.type !== "teacher" && req.session.user.type !== "student") return res.status(200).json(CEFR_STEPS);
const corporate = await getUserCorporate(req.session.user.id);
if (!corporate) return res.status(200).json(CEFR_STEPS);
const corporateSnapshot = await getDoc(doc(db, "grading", corporate.id));
if (corporateSnapshot.exists()) return res.status(200).json(snapshot.data());
return res.status(200).json(CEFR_STEPS);
}
async function post(req: NextApiRequest, res: NextApiResponse) {
if (!req.session.user) {
res.status(401).json({ok: false});
return;
}
if (!checkAccess(req.session.user, ["admin", "developer", "mastercorporate", "corporate"]))
return res.status(403).json({
ok: false,
reason: "You do not have permission to create a new grading system",
});
const body = req.body as Grading;
await setDoc(doc(db, "grading", req.session.user.id), body);
if (req.session.user.type === "mastercorporate") {
const groups = await getGroupsForUser(req.session.user.id);
const participants = uniq(groups.flatMap((x) => x.participants));
const participantUsers = await Promise.all(participants.map(getUser));
const corporateUsers = participantUsers.filter((x) => x.type === "corporate") as CorporateUser[];
await Promise.all(corporateUsers.map(async (g) => await setDoc(doc(db, "grading", g.id), body)));
}
res.status(200).json({ok: true});
}

View File

@@ -19,8 +19,11 @@ import usePermissions from "@/hooks/usePermissions";
import {useState} from "react";
import Modal from "@/components/Modal";
import IconCard from "@/dashboards/IconCard";
import {BsCode, BsCodeSquare, 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 useGradingSystem from "@/hooks/useGrading";
import {CEFR_STEPS} from "@/resources/grading";
export const getServerSideProps = withIronSessionSsr(({req, res}) => {
const user = req.session.user;
@@ -50,6 +53,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
export default function Admin() {
const {user} = useUser({redirectTo: "/login"});
const {permissions} = usePermissions(user?.id || "");
const {gradingSystem, mutate} = useGradingSystem();
const [modalOpen, setModalOpen] = useState<string>();
@@ -79,6 +83,13 @@ export default function Admin() {
<Modal isOpen={modalOpen === "createUser"} onClose={() => setModalOpen(undefined)}>
<UserCreator user={user} />
</Modal>
<Modal isOpen={modalOpen === "gradingSystem"} onClose={() => setModalOpen(undefined)}>
<CorporateGradingSystem
user={user}
defaultSteps={gradingSystem?.steps || CEFR_STEPS}
mutate={(steps) => mutate({user: user.id, steps})}
/>
</Modal>
<section className="w-full grid grid-cols-2 -md:grid-cols-1 gap-8">
<ExamLoader />
@@ -112,6 +123,15 @@ export default function Admin() {
className="w-full h-full"
onClick={() => setModalOpen("batchCreateUser")}
/>
{checkAccess(user, ["admin", "corporate", "developer", "mastercorporate"]) && (
<IconCard
Icon={BsGearFill}
label="Grading System"
color="purple"
className="w-full h-full col-span-2"
onClick={() => setModalOpen("gradingSystem")}
/>
)}
</div>
)}
</section>

37
src/resources/grading.ts Normal file
View File

@@ -0,0 +1,37 @@
export const CEFR_STEPS = [
{min: 0, max: 9, label: "Pre A1"},
{min: 10, max: 19, label: "A1"},
{min: 20, max: 39, label: "A2"},
{min: 40, max: 59, label: "B1"},
{min: 60, max: 74, label: "B2"},
{min: 75, max: 89, label: "C1"},
{min: 90, max: 100, label: "C2"},
];
export const GENERAL_STEPS = [
{min: 0, max: 9, label: "Beginner"},
{min: 10, max: 19, label: "Elementary"},
{min: 20, max: 39, label: "Pre-Intermediate"},
{min: 40, max: 59, label: "Intermediate"},
{min: 60, max: 74, label: "Upper-Intermediate"},
{min: 75, max: 89, label: "Advance"},
{min: 90, max: 100, label: "Professional user"},
];
export const IELTS_STEPS = [
{min: 0, max: 9, label: "1.0"},
{min: 10, max: 19, label: "2.0 - 2.5"},
{min: 20, max: 39, label: "3.0 - 3.5"},
{min: 40, max: 59, label: "4.0 - 5.0"},
{min: 60, max: 74, label: "5.5 - 6.5"},
{min: 75, max: 89, label: "7.0 - 7.0"},
{min: 90, max: 100, label: "8.5 - 9.0"},
];
export const TOFEL_STEPS = [
{min: 0, max: 19, label: "0 - 39"},
{min: 20, max: 39, label: "40 - 56"},
{min: 40, max: 74, label: "57 - 86"},
{min: 75, max: 89, label: "87 - 109"},
{min: 90, max: 100, label: "110 - 120"},
];