Solved a problem with the download of the excel
This commit is contained in:
@@ -343,7 +343,7 @@ const MasterStatistical = (props: Props) => {
|
|||||||
</div>
|
</div>
|
||||||
{renderSearch()}
|
{renderSearch()}
|
||||||
<div className="flex flex-col gap-3 justify-end">
|
<div className="flex flex-col gap-3 justify-end">
|
||||||
<Button className="max-w-[200px] h-[70px]" variant="outline" onClick={triggerDownload}>
|
<Button className="max-w-[200px] h-[70px]" variant="outline" isLoading={downloading} onClick={triggerDownload}>
|
||||||
Download
|
Download
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -45,9 +45,7 @@ const searchFilters = [["email"], ["user"], ["userId"]];
|
|||||||
async function post(req: NextApiRequest, res: NextApiResponse) {
|
async function post(req: NextApiRequest, res: NextApiResponse) {
|
||||||
// verify if it's a logged user that is trying to export
|
// verify if it's a logged user that is trying to export
|
||||||
if (req.session.user) {
|
if (req.session.user) {
|
||||||
if (
|
if (!checkAccess(req.session.user, ["mastercorporate", "corporate", "developer", "admin"])) {
|
||||||
!checkAccess(req.session.user, ["mastercorporate", "corporate", "developer", "admin"])
|
|
||||||
) {
|
|
||||||
return res.status(403).json({error: "Unauthorized"});
|
return res.status(403).json({error: "Unauthorized"});
|
||||||
}
|
}
|
||||||
const {
|
const {
|
||||||
@@ -65,15 +63,9 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
|
|||||||
};
|
};
|
||||||
const startDateParsed = startDate ? new Date(startDate) : undefined;
|
const startDateParsed = startDate ? new Date(startDate) : undefined;
|
||||||
const endDateParsed = endDate ? new Date(endDate) : undefined;
|
const endDateParsed = endDate ? new Date(endDate) : undefined;
|
||||||
const assignments = await getAssignmentsForCorporates(
|
const assignments = await getAssignmentsForCorporates(ids, startDateParsed, endDateParsed);
|
||||||
ids,
|
|
||||||
startDateParsed,
|
|
||||||
endDateParsed
|
|
||||||
);
|
|
||||||
|
|
||||||
const assignmentUsers = [
|
const assignmentUsers = [...new Set(assignments.flatMap((a) => a.assignees))];
|
||||||
...new Set(assignments.flatMap((a) => a.assignees)),
|
|
||||||
];
|
|
||||||
const assigners = [...new Set(assignments.map((a) => a.assigner))];
|
const assigners = [...new Set(assignments.map((a) => a.assigner))];
|
||||||
const users = await getSpecificUsers(assignmentUsers);
|
const users = await getSpecificUsers(assignmentUsers);
|
||||||
const assignerUsers = await getSpecificUsers(assigners);
|
const assignerUsers = await getSpecificUsers(assigners);
|
||||||
@@ -83,7 +75,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
|
|||||||
const data = await getGradingSystem(user);
|
const data = await getGradingSystem(user);
|
||||||
// in this context I need to override as I'll have to match to the assigner
|
// in this context I need to override as I'll have to match to the assigner
|
||||||
return {...data, user: user.id};
|
return {...data, user: user.id};
|
||||||
})
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
const getGradingSystemHelper = (
|
const getGradingSystemHelper = (
|
||||||
@@ -91,19 +83,12 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
|
|||||||
assigner: string,
|
assigner: string,
|
||||||
user: User,
|
user: User,
|
||||||
correct: number,
|
correct: number,
|
||||||
total: number
|
total: number,
|
||||||
) => {
|
) => {
|
||||||
if (exams.some((e) => e.module === "level")) {
|
if (exams.some((e) => e.module === "level")) {
|
||||||
const gradingSystem = assignerUsersGradingSystems.find(
|
const gradingSystem = assignerUsersGradingSystems.find((gs) => gs.user === assigner);
|
||||||
(gs) => gs.user === assigner
|
|
||||||
);
|
|
||||||
if (gradingSystem) {
|
if (gradingSystem) {
|
||||||
const bandScore = calculateBandScore(
|
const bandScore = calculateBandScore(correct, total, "level", user?.focus || "academic");
|
||||||
correct,
|
|
||||||
total,
|
|
||||||
"level",
|
|
||||||
user.focus
|
|
||||||
);
|
|
||||||
return {
|
return {
|
||||||
label: getGradingLabel(bandScore, gradingSystem?.steps || []),
|
label: getGradingLabel(bandScore, gradingSystem?.steps || []),
|
||||||
score: bandScore,
|
score: bandScore,
|
||||||
@@ -117,19 +102,12 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
|
|||||||
const tableResults = assignments
|
const tableResults = assignments
|
||||||
.reduce((accmA: TableData[], a: AssignmentWithCorporateId) => {
|
.reduce((accmA: TableData[], a: AssignmentWithCorporateId) => {
|
||||||
const userResults = a.assignees.map((assignee) => {
|
const userResults = a.assignees.map((assignee) => {
|
||||||
const userStats =
|
const userStats = a.results.find((r) => r.user === assignee)?.stats || [];
|
||||||
a.results.find((r) => r.user === assignee)?.stats || [];
|
|
||||||
const userData = users.find((u) => u.id === assignee);
|
const userData = users.find((u) => u.id === assignee);
|
||||||
const corporateUser = users.find((u) => u.id === a.assigner);
|
const corporateUser = users.find((u) => u.id === a.assigner);
|
||||||
const correct = userStats.reduce((n, e) => n + e.score.correct, 0);
|
const correct = userStats.reduce((n, e) => n + e.score.correct, 0);
|
||||||
const total = userStats.reduce((n, e) => n + e.score.total, 0);
|
const total = userStats.reduce((n, e) => n + e.score.total, 0);
|
||||||
const { label: level, score } = getGradingSystemHelper(
|
const {label: level, score} = getGradingSystemHelper(a.exams, a.assigner, userData!, correct, total);
|
||||||
a.exams,
|
|
||||||
a.assigner,
|
|
||||||
userData!,
|
|
||||||
correct,
|
|
||||||
total
|
|
||||||
);
|
|
||||||
|
|
||||||
console.log("Level", level);
|
console.log("Level", level);
|
||||||
const commonData = {
|
const commonData = {
|
||||||
@@ -223,9 +201,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
|
|||||||
})),
|
})),
|
||||||
];
|
];
|
||||||
|
|
||||||
const filteredSearch = searchText
|
const filteredSearch = searchText ? search(searchText, searchFilters, tableResults) : tableResults;
|
||||||
? search(searchText, searchFilters, tableResults)
|
|
||||||
: tableResults;
|
|
||||||
|
|
||||||
worksheet.addRow(headers.map((h) => h.label));
|
worksheet.addRow(headers.map((h) => h.label));
|
||||||
(filteredSearch as TableData[]).forEach((entry) => {
|
(filteredSearch as TableData[]).forEach((entry) => {
|
||||||
@@ -241,8 +217,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
|
|||||||
const fileRef = ref(storage, refName);
|
const fileRef = ref(storage, refName);
|
||||||
// upload the pdf to storage
|
// upload the pdf to storage
|
||||||
await uploadBytes(fileRef, buffer, {
|
await uploadBytes(fileRef, buffer, {
|
||||||
contentType:
|
contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
|
||||||
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const url = await getDownloadURL(fileRef);
|
const url = await getDownloadURL(fileRef);
|
||||||
|
|||||||
Reference in New Issue
Block a user