diff --git a/actions/grades.ts b/actions/grades.ts index dee4386..4d1f057 100644 --- a/actions/grades.ts +++ b/actions/grades.ts @@ -8,7 +8,6 @@ export async function getGrade(testId: number, userId: number) { grade: true, id: true, testId: true, - note: true, createdAt: true, }, where: { @@ -24,7 +23,6 @@ export async function addGrade(testId: number, userId: number, grade: number, no const newGrade = await prisma.grade.create({ data: { grade: grade, - note: note, testId: testId, userId: userId, } diff --git a/actions/mangeTest.ts b/actions/mangeTest.ts index 02a569c..ddc82db 100644 --- a/actions/mangeTest.ts +++ b/actions/mangeTest.ts @@ -16,7 +16,6 @@ export async function getActiveTest(date: Date) { select: { id: true, isActive: true, - isPassed: true, testOf: { select: { id: true, @@ -30,7 +29,6 @@ export async function getActiveTest(date: Date) { }, where: { isActive: true, - isPassed: false, testOn: new Date(date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + (date.getDate().toString().length === 1 ? '0' + date.getDate() : date.getDate())), }, }); @@ -41,7 +39,6 @@ export async function getActiveTestWithGrade(date: Date, userId: number) { select: { id: true, isActive: true, - isPassed: true, testOf: { select: { id: true, @@ -54,7 +51,6 @@ export async function getActiveTestWithGrade(date: Date, userId: number) { select: { id: true, grade: true, - note: true, createdAt: true, }, take: 1, @@ -67,7 +63,6 @@ export async function getActiveTestWithGrade(date: Date, userId: number) { }, where: { isActive: true, - isPassed: false, testOn: new Date(date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + (date.getDate().toString().length === 1 ? '0' + date.getDate() : date.getDate())), }, }); diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx index 7c40dff..3ef202e 100644 --- a/app/dashboard/page.tsx +++ b/app/dashboard/page.tsx @@ -8,10 +8,9 @@ export default async function Dashboard() { console.log(authSession); if (!authSession) return redirect('/'); - const tests = await prisma.test.findMany({ select: { isActive: true, isPassed: true, id: true, testOf: { select: { id: true, firstName: true, lastName: true, isTeacher: true } } } }); + const tests = await prisma.test.findMany({ select: { isActive: true, id: true, testOf: { select: { id: true, firstName: true, lastName: true, isTeacher: true } } } }); const activeTests = tests.filter((test) => test.isActive); - const passedTests = tests.filter((test) => test.isPassed); return (
diff --git a/app/results/[id]/page.tsx b/app/results/[id]/page.tsx index 554ba50..0920b07 100644 --- a/app/results/[id]/page.tsx +++ b/app/results/[id]/page.tsx @@ -24,12 +24,11 @@ export default function Page({ params }: { params: { id: string } }) { useEffect(() => { featchResults(testId); + setTimeout(() => { + featchResults(testId); + }, 5000); }, [testId]); - setTimeout(() => { - featchResults(testId); - }, 5000); - return (
{'Logo'} diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 3e07a65..6c13d28 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -14,27 +14,25 @@ model Users { firstName String lastName String isTeacher Boolean @default(false) + isAdmin Boolean @default(false) createdAt DateTime @default(now()) grades Grade[] test Test? } model Test { - id Int @id @default(autoincrement()) - testOfId Int @unique - testOn DateTime @db.Date - createdAt DateTime @default(now()) - testOf Users @relation(fields: [testOfId], references: [id]) - grades Grade[] - isActive Boolean @default(false) - isPassed Boolean @default(false) - teacherGrade Float? + id Int @id @default(autoincrement()) + testOfId Int @unique + testOn DateTime @db.Date + createdAt DateTime @default(now()) + testOf Users @relation(fields: [testOfId], references: [id]) + grades Grade[] + isActive Boolean @default(false) } model Grade { id Int @id @default(autoincrement()) userId Int - note String? createdAt DateTime @default(now()) grade Float testId Int