Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix grades 500 error #274

Merged
merged 2 commits into from
Oct 1, 2024
Merged

fix grades 500 error #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce94c4e
fix grades 500 error
ProkingK Sep 30, 2024
6c1a476
fix tests
ProkingK Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 30 additions & 22 deletions src/src/routes/(app)/grades/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,36 @@
<h1 class="mb-4 text-3xl font-bold dark:text-white">Student Grades</h1>

<Tabs style="underline">
{#each workspaces as workspace}
<TabItem open title={workspace.name}>
<Table striped={true}>
<TableHead>
<TableHeadCell>Assessment</TableHeadCell>
<TableHeadCell>Date & Time</TableHeadCell>
<TableHeadCell>Your Score (%)</TableHeadCell>
<TableHeadCell>Class Average (%)</TableHeadCell>
</TableHead>
{#if workspaces.length === 0}
<p class="text-lg dark:text-white">No grades available</p>
{:else}
{#each workspaces as workspace}
<TabItem open title={workspace.name}>
{#if workspace.grades.length === 0}
<p class="text-lg dark:text-white">No grades available</p>
{:else}
<Table striped={true}>
<TableHead>
<TableHeadCell>Assessment</TableHeadCell>
<TableHeadCell>Date & Time</TableHeadCell>
<TableHeadCell>Your Score (%)</TableHeadCell>
<TableHeadCell>Class Average (%)</TableHeadCell>
</TableHead>

<TableBody>
{#each workspace.grades as grade}
<TableBodyRow>
<TableBodyCell>{grade.assessment}</TableBodyCell>
<TableBodyCell>{grade.date}</TableBodyCell>
<TableBodyCell>{grade.score}</TableBodyCell>
<TableBodyCell>{grade.average}</TableBodyCell>
</TableBodyRow>
{/each}
</TableBody>
</Table>
</TabItem>
{/each}
<TableBody>
{#each workspace.grades as grade}
<TableBodyRow>
<TableBodyCell>{grade.assessment}</TableBodyCell>
<TableBodyCell>{grade.date}</TableBodyCell>
<TableBodyCell>{grade.score}</TableBodyCell>
<TableBodyCell>{grade.average}</TableBodyCell>
</TableBodyRow>
{/each}
</TableBody>
</Table>
{/if}
</TabItem>
{/each}
{/if}
</Tabs>
</main>
2 changes: 2 additions & 0 deletions src/src/routes/(app)/workspaces/+page.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { fail, error, redirect } from '@sveltejs/kit';
import { upload, deleteFile } from '$lib/server/storage';

import Users from '$db/schemas/User';
// eslint-disable-next-line
import Grades from '$db/schemas/Grades';
import Workspaces from '$db/schemas/Workspace';
import type { Workspace, User } from '$src/types';

Expand Down
4 changes: 3 additions & 1 deletion src/src/routes/(app)/workspaces/[workspace]/grades/+page.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { error } from '@sveltejs/kit';
import Grades from '$lib/server/database/schemas/Grades';
import Grades from '$db/schemas/Grades';

export async function load({ locals, params }) {
if (!locals.user || locals.user.role !== 'student') throw error(401, 'Unauthorised');
Expand All @@ -26,6 +26,8 @@ export async function load({ locals, params }) {
assessment.average = Math.round(average);
}

console.log(workspaceGrades);

return { grades: workspaceGrades };
} catch (e) {
console.error('Error fetching grades:', e);
Expand Down
41 changes: 22 additions & 19 deletions src/src/routes/(app)/workspaces/[workspace]/grades/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,27 @@

<main class="container mx-auto p-4">
<h1 class="mb-4 text-3xl font-bold dark:text-white">Grades</h1>
{#if grades.length === 0}
<p class="text-lg dark:text-white">No grades available</p>
{:else}
<Table striped={true}>
<TableHead>
<TableHeadCell>Assessment</TableHeadCell>
<TableHeadCell>Date & Time</TableHeadCell>
<TableHeadCell>Your Score (%)</TableHeadCell>
<TableHeadCell>Class Average (%)</TableHeadCell>
</TableHead>

<Table striped={true}>
<TableHead>
<TableHeadCell>Assessment</TableHeadCell>
<TableHeadCell>Date & Time</TableHeadCell>
<TableHeadCell>Your Score (%)</TableHeadCell>
<TableHeadCell>Class Average (%)</TableHeadCell>
</TableHead>

<TableBody>
{#each grades as grade}
<TableBodyRow>
<TableBodyCell>{grade.assessment}</TableBodyCell>
<TableBodyCell>{grade.date}</TableBodyCell>
<TableBodyCell>{grade.score}</TableBodyCell>
<TableBodyCell>{grade.average}</TableBodyCell>
</TableBodyRow>
{/each}
</TableBody>
</Table>
<TableBody>
{#each grades as grade}
<TableBodyRow>
<TableBodyCell>{grade.assessment}</TableBodyCell>
<TableBodyCell>{grade.date}</TableBodyCell>
<TableBodyCell>{grade.score}</TableBodyCell>
<TableBodyCell>{grade.average}</TableBodyCell>
</TableBodyRow>
{/each}
</TableBody>
</Table>
{/if}
</main>
268 changes: 0 additions & 268 deletions src/src/routes/(app)/workspaces/page.server.test.ts
View file
Open in desktop

This file was deleted.

Loading
Loading