Switch homework pending filter from feedbacks-none to status-based (PENDING/REVIEWING)
This commit is contained in:
@@ -30,7 +30,7 @@ export default async function AdminDashboard() {
|
|||||||
prisma.courseEnrollment.count({
|
prisma.courseEnrollment.count({
|
||||||
where: { expiresAt: { gt: now, lte: new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000) } },
|
where: { expiresAt: { gt: now, lte: new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000) } },
|
||||||
}),
|
}),
|
||||||
prisma.homeworkSubmission.count({ where: { feedbacks: { none: {} } } }),
|
prisma.homeworkSubmission.count({ where: { status: { in: ["PENDING", "REVIEWING"] } } }),
|
||||||
prisma.homeworkSubmission.count(),
|
prisma.homeworkSubmission.count(),
|
||||||
prisma.lessonProgress.count(),
|
prisma.lessonProgress.count(),
|
||||||
prisma.balanceTransaction.aggregate({ _sum: { amount: true } }),
|
prisma.balanceTransaction.aggregate({ _sum: { amount: true } }),
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ export default async function CuratorDashboard() {
|
|||||||
if (!session) redirect("/login");
|
if (!session) redirect("/login");
|
||||||
|
|
||||||
const [pending, total, recentFeedbacks] = await Promise.all([
|
const [pending, total, recentFeedbacks] = await Promise.all([
|
||||||
prisma.homeworkSubmission.count({ where: { feedbacks: { none: {} } } }),
|
prisma.homeworkSubmission.count({ where: { status: { in: ["PENDING", "REVIEWING"] } } }),
|
||||||
prisma.homeworkSubmission.count(),
|
prisma.homeworkSubmission.count(),
|
||||||
prisma.homeworkFeedback.count({
|
prisma.homeworkFeedback.count({
|
||||||
where: {
|
where: {
|
||||||
|
|||||||
@@ -39,8 +39,8 @@ export default async function HomeworkListPage({ searchParams }: Props) {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
: {}),
|
: {}),
|
||||||
...(status === "pending" ? { feedbacks: { none: {} } } : {}),
|
...(status === "pending" ? { status: { in: ["PENDING", "REVIEWING"] } } : {}),
|
||||||
...(status === "reviewed" ? { feedbacks: { some: {} } } : {}),
|
...(status === "reviewed" ? { status: { in: ["APPROVED", "REJECTED"] } } : {}),
|
||||||
};
|
};
|
||||||
|
|
||||||
const [submissions, total, courses] = await Promise.all([
|
const [submissions, total, courses] = await Promise.all([
|
||||||
|
|||||||
Reference in New Issue
Block a user