diff --git a/src/dashboards/MasterCorporate.tsx b/src/dashboards/MasterCorporate.tsx index f3dd3534..34989219 100644 --- a/src/dashboards/MasterCorporate.tsx +++ b/src/dashboards/MasterCorporate.tsx @@ -198,7 +198,6 @@ const StudentPerformanceList = ({items, stats, users, groups}: {items: StudentPe ]; const filterUsers = (data: StudentPerformanceItem[]) => { - console.log(data, selectedCorporate); const filterByCorporate = (item: StudentPerformanceItem) => item.corporate?.id === selectedCorporate?.id; const filterByGroup = (item: StudentPerformanceItem) => item.group?.id === selectedGroup?.id; diff --git a/src/pages/(admin)/CorporateGradingSystem.tsx b/src/pages/(admin)/CorporateGradingSystem.tsx index 54a8f76b..014fe11f 100644 --- a/src/pages/(admin)/CorporateGradingSystem.tsx +++ b/src/pages/(admin)/CorporateGradingSystem.tsx @@ -30,7 +30,6 @@ export default function CorporateGradingSystem({user, defaultSteps, mutate}: {us 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 ) diff --git a/src/pages/api/assignments/corporate/index.ts b/src/pages/api/assignments/corporate/index.ts index 631878f6..cf6f8f92 100644 --- a/src/pages/api/assignments/corporate/index.ts +++ b/src/pages/api/assignments/corporate/index.ts @@ -1,68 +1,64 @@ // Next.js API route support: https://nextjs.org/docs/api-routes/introduction -import type { NextApiRequest, NextApiResponse } from "next"; -import { withIronSessionApiRoute } from "iron-session/next"; -import { sessionOptions } from "@/lib/session"; -import { getAllAssignersByCorporate } from "@/utils/groups.be"; -import { getAssignmentsByAssigners } from "@/utils/assignments.be"; +import type {NextApiRequest, NextApiResponse} from "next"; +import {withIronSessionApiRoute} from "iron-session/next"; +import {sessionOptions} from "@/lib/session"; +import {getAllAssignersByCorporate} from "@/utils/groups.be"; +import {getAssignmentsByAssigners} from "@/utils/assignments.be"; export default withIronSessionApiRoute(handler, sessionOptions); async function handler(req: NextApiRequest, res: NextApiResponse) { - if (!req.session.user) { - res.status(401).json({ ok: false }); - return; - } + if (!req.session.user) { + res.status(401).json({ok: false}); + return; + } - if (req.method === "GET") return await GET(req, res); + if (req.method === "GET") return await GET(req, res); - res.status(404).json({ ok: false }); + res.status(404).json({ok: false}); } async function GET(req: NextApiRequest, res: NextApiResponse) { - const { ids, startDate, endDate } = req.query as { - ids: string; - startDate?: string; - endDate?: string; - }; + const {ids, startDate, endDate} = req.query as { + ids: string; + startDate?: string; + endDate?: string; + }; - const startDateParsed = startDate ? new Date(startDate) : undefined; - const endDateParsed = endDate ? new Date(endDate) : undefined; - try { - const idsList = ids.split(","); + const startDateParsed = startDate ? new Date(startDate) : undefined; + const endDateParsed = endDate ? new Date(endDate) : undefined; + try { + const idsList = ids.split(","); - const assigners = await Promise.all( - idsList.map(async (id) => { - const assigners = await getAllAssignersByCorporate(id); - return { - corporateId: id, - assigners, - }; - }) - ); + const assigners = await Promise.all( + idsList.map(async (id) => { + const assigners = await getAllAssignersByCorporate(id); + return { + corporateId: id, + assigners, + }; + }), + ); - const assignments = await Promise.all(assigners.map(async (data) => { - try { - const assigners = [...new Set([...data.assigners, data.corporateId])]; - const assignments = await getAssignmentsByAssigners( - assigners, - startDateParsed, - endDateParsed - ); - return assignments.map((assignment) => ({ - ...assignment, - corporateId: data.corporateId, - })); - } catch (err) { - console.error(err); - return []; - } - })); + const assignments = await Promise.all( + assigners.map(async (data) => { + try { + const assigners = [...new Set([...data.assigners, data.corporateId])]; + const assignments = await getAssignmentsByAssigners(assigners, startDateParsed, endDateParsed); + return assignments.map((assignment) => ({ + ...assignment, + corporateId: data.corporateId, + })); + } catch (err) { + console.error(err); + return []; + } + }), + ); - console.log(assignments); - - // const assignments = await getAssignmentsByAssigners(assignmentList, startDateParsed, endDateParsed); - res.status(200).json(assignments.flat()); - } catch (err: any) { - res.status(500).json({ error: err.message }); - } + // const assignments = await getAssignmentsByAssigners(assignmentList, startDateParsed, endDateParsed); + res.status(200).json(assignments.flat()); + } catch (err: any) { + res.status(500).json({error: err.message}); + } }