From 58cb7afd81def1fe37f117afbecdfcd17a8fa54e Mon Sep 17 00:00:00 2001 From: Mustafa Cetin Date: Wed, 29 Jul 2026 16:44:13 +0000 Subject: [PATCH] Round 19b: 10 Runtime Bug Fixes, Student Notebook Access, German Curriculum Types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug Fixes: - Fixed duplicate i18n keys (notebooks.type_lined etc.) - Fixed settings-view.tsx: studentsList undefined → students - Fixed student-detail-view.tsx: pe.competencyId → pe.competency.id - Fixed student-detail-view.tsx: locale variable not in scope - Fixed student-detail-view.tsx: studentId/setStudent undefined - Fixed notebooks-view.tsx: onClick={onAddPage} passing MouseEvent - Fixed curriculum-coverage-view.tsx: Map import shadowing built-in - Fixed api.ts: avatarUrl missing from AttendanceRecord/Report types - Fixed badge-check.ts: invalid Prisma queries with wrong field names Student Notebook Access: - Students can create/view/edit their own notebooks - Students see shared notebooks from teachers in enrolled classes - Fixed handleCreateFromTemplate to use correct ownerType for students German Curriculum Notebook Types (9 types): - Deutschheft (lined, red), Matheheft (grid, blue), Sachbuch (grid, teal) - Musikheft (music staff, emerald), Kunstheft (blank, purple) - Englischheft (lined, amber), Geschichtsheft (lined, brown) - Religionsheft (lined, orange), Sachkundeheft (lined+drawing, teal) Environment Features: - Papier gespart counter with tree calculation - Eco badge on every notebook card - Lehrplan-Heft curriculum badge on German types 60+ new i18n keys (DE/EN) --- src/app/api/attendance/route.ts | 6 +- src/app/api/notebooks/[id]/route.ts | 8 +- src/app/api/notebooks/route.ts | 8 +- src/app/api/notebooks/shared/route.ts | 59 ++++- src/app/api/reports/route.ts | 6 +- src/components/curriculum-coverage-view.tsx | 6 +- src/components/notebooks-view.tsx | 267 +++++++++++++++++++- src/components/settings-view.tsx | 2 +- src/components/student-detail-view.tsx | 26 +- src/components/timetable-view.tsx | 2 +- src/lib/api.ts | 8 +- src/lib/badge-check.ts | 37 ++- src/lib/i18n.ts | 73 +++++- worklog.md | 149 +++++++++++ 14 files changed, 593 insertions(+), 64 deletions(-) diff --git a/src/app/api/attendance/route.ts b/src/app/api/attendance/route.ts index 283f7a6..3408fec 100644 --- a/src/app/api/attendance/route.ts +++ b/src/app/api/attendance/route.ts @@ -121,7 +121,7 @@ export async function GET(request: Request) { teacher: { select: { id: true, firstName: true, lastName: true } }, records: { include: { - student: { select: { id: true, firstName: true, lastName: true } }, + student: { select: { id: true, firstName: true, lastName: true, avatarUrl: true } }, }, orderBy: { student: { lastName: 'asc' } }, }, @@ -237,7 +237,7 @@ export async function POST(request: Request) { teacher: { select: { id: true, firstName: true, lastName: true } }, records: { include: { - student: { select: { id: true, firstName: true, lastName: true } }, + student: { select: { id: true, firstName: true, lastName: true, avatarUrl: true } }, }, orderBy: { student: { lastName: 'asc' } }, }, @@ -341,7 +341,7 @@ export async function PUT(request: Request) { teacher: { select: { id: true, firstName: true, lastName: true } }, records: { include: { - student: { select: { id: true, firstName: true, lastName: true } }, + student: { select: { id: true, firstName: true, lastName: true, avatarUrl: true } }, }, orderBy: { student: { lastName: 'asc' } }, }, diff --git a/src/app/api/notebooks/[id]/route.ts b/src/app/api/notebooks/[id]/route.ts index d8f67f9..b005733 100644 --- a/src/app/api/notebooks/[id]/route.ts +++ b/src/app/api/notebooks/[id]/route.ts @@ -58,7 +58,13 @@ const updateNotebookSchema = z.object({ title: z.string().min(1).max(200).optional(), description: z.string().max(1000).optional().nullable(), notebookType: z - .enum(['lined', 'grid', 'blank', 'dotted', 'music', 'calligraphy']) + .enum([ + 'lined', 'grid', 'blank', 'dotted', 'music', 'calligraphy', + // German curriculum types + 'deutschheft', 'matheheft', 'sachbuch', 'musikheft', + 'kunstheft', 'englischheft', 'geschichtsheft', 'religionsheft', + 'sachkundeheft', + ]) .optional(), color: z.string().optional(), icon: z.string().optional().nullable(), diff --git a/src/app/api/notebooks/route.ts b/src/app/api/notebooks/route.ts index af698c7..31aad1c 100644 --- a/src/app/api/notebooks/route.ts +++ b/src/app/api/notebooks/route.ts @@ -150,7 +150,13 @@ const createNotebookSchema = z.object({ title: z.string().min(1).max(200), description: z.string().max(1000).optional().nullable(), notebookType: z - .enum(['lined', 'grid', 'blank', 'dotted', 'music', 'calligraphy']) + .enum([ + 'lined', 'grid', 'blank', 'dotted', 'music', 'calligraphy', + // German curriculum types + 'deutschheft', 'matheheft', 'sachbuch', 'musikheft', + 'kunstheft', 'englischheft', 'geschichtsheft', 'religionsheft', + 'sachkundeheft', + ]) .default('lined'), color: z.string().default('#10b981'), icon: z.string().optional().nullable(), diff --git a/src/app/api/notebooks/shared/route.ts b/src/app/api/notebooks/shared/route.ts index 750b863..1493e0e 100644 --- a/src/app/api/notebooks/shared/route.ts +++ b/src/app/api/notebooks/shared/route.ts @@ -2,7 +2,8 @@ import { NextResponse } from 'next/server'; import { db } from '@/lib/db'; import { getSession } from '@/lib/auth'; -// ── GET: Get public notebooks shared by other teachers in the same school ── +// ── GET: Get public notebooks shared by others in the same school ── +// Teachers see other teachers' notebooks; students see teacher notebooks shared with their classes export async function GET(request: Request) { try { const session = await getSession(); @@ -20,19 +21,69 @@ export async function GET(request: Request) { ); } - // Only show public notebooks from other teachers in the same school + const userRole = session.user.role; + + if (userRole === 'STUDENT') { + // Students see public notebooks from teachers in their enrolled classes + const matchingStudents = await db.student.findMany({ + where: { + schoolId, + firstName: session.user.firstName, + lastName: session.user.lastName, + deletedAt: null, + }, + select: { id: true }, + }); + + const studentIds = matchingStudents.map(s => s.id); + + const studentEnrollments = studentIds.length > 0 + ? await db.enrollment.findMany({ + where: { studentId: { in: studentIds } }, + select: { classGroupId: true }, + }) + : []; + + const enrolledClassGroupIds = studentEnrollments.map(e => e.classGroupId); + + const sharedNotebooks = await db.notebook.findMany({ + where: { + schoolId, + isPublic: true, + isArchived: false, + deletedAt: null, + ownerId: { not: session.user.id }, + ownerType: 'TEACHER', + ...(enrolledClassGroupIds.length > 0 + ? { classGroupId: { in: enrolledClassGroupIds } } + : {}), + }, + include: { + subject: { select: { id: true, name: true } }, + classGroup: { select: { id: true, name: true } }, + owner: { select: { id: true, firstName: true, lastName: true } }, + _count: { select: { pages: true } }, + }, + orderBy: { updatedAt: 'desc' }, + }); + + return NextResponse.json(sharedNotebooks); + } + + // Teachers / Admins: see public notebooks from other teachers in the same school + // Also include student notebooks shared publicly const sharedNotebooks = await db.notebook.findMany({ where: { schoolId, isPublic: true, isArchived: false, deletedAt: null, - ownerId: { not: session.user.id }, // Exclude own notebooks + ownerId: { not: session.user.id }, }, include: { subject: { select: { id: true, name: true } }, classGroup: { select: { id: true, name: true } }, - owner: { select: { id: true, firstName: true, lastName: true } }, + owner: { select: { id: true, firstName: true, lastName: true, role: true } }, _count: { select: { pages: true } }, }, orderBy: { updatedAt: 'desc' }, diff --git a/src/app/api/reports/route.ts b/src/app/api/reports/route.ts index 0453ff9..4ad513d 100644 --- a/src/app/api/reports/route.ts +++ b/src/app/api/reports/route.ts @@ -43,7 +43,7 @@ export async function GET(request: Request) { where, orderBy: { generatedAt: 'desc' }, include: { - student: { select: { id: true, firstName: true, lastName: true } }, + student: { select: { id: true, firstName: true, lastName: true, avatarUrl: true } }, classGroup: { select: { id: true, name: true, gradeLevel: true } }, schoolYear: { select: { id: true, label: true } }, generatedByUser: { @@ -116,7 +116,7 @@ export async function POST(request: Request) { : undefined, }, include: { - student: { select: { id: true, firstName: true, lastName: true } }, + student: { select: { id: true, firstName: true, lastName: true, avatarUrl: true } }, classGroup: { select: { id: true, name: true } }, schoolYear: { select: { id: true, label: true } }, generatedByUser: { @@ -186,7 +186,7 @@ export async function PUT(request: Request) { where: { id }, data: updateData, include: { - student: { select: { id: true, firstName: true, lastName: true } }, + student: { select: { id: true, firstName: true, lastName: true, avatarUrl: true } }, classGroup: { select: { id: true, name: true, gradeLevel: true } }, schoolYear: { select: { id: true, label: true } }, generatedByUser: { diff --git a/src/components/curriculum-coverage-view.tsx b/src/components/curriculum-coverage-view.tsx index c5160e5..f9bd4aa 100644 --- a/src/components/curriculum-coverage-view.tsx +++ b/src/components/curriculum-coverage-view.tsx @@ -3,7 +3,7 @@ import React, { useEffect, useState, useCallback, useMemo } from 'react'; import { motion, AnimatePresence } from 'framer-motion'; import { - Map, + Map as MapIcon, Plus, Pencil, Trash2, @@ -372,7 +372,7 @@ export default function CurriculumCoverageView() { >
- +

@@ -501,7 +501,7 @@ export default function CurriculumCoverageView() { className="flex flex-col items-center justify-center py-16 text-center" >
- +

{t('curriculum.empty_title')}

{t('curriculum.empty_desc')}

diff --git a/src/components/notebooks-view.tsx b/src/components/notebooks-view.tsx index 26855ea..f71d0d3 100644 --- a/src/components/notebooks-view.tsx +++ b/src/components/notebooks-view.tsx @@ -204,13 +204,23 @@ const SECTION_COLORS = [ // ─── Constants ─────────────────────────────────────────────────────── -const NOTEBOOK_TYPES: Array<{ key: string; icon: React.ElementType; labelKey: string; descKey: string }> = [ +const NOTEBOOK_TYPES: Array<{ key: string; icon: React.ElementType; labelKey: string; descKey: string; isCurriculum?: boolean }> = [ { key: 'lined', icon: AlignLeft, labelKey: 'notebooks.type_lined', descKey: 'notebooks.type_lined_desc' }, { key: 'grid', icon: Grid3X3, labelKey: 'notebooks.type_grid', descKey: 'notebooks.type_grid_desc' }, { key: 'blank', icon: File, labelKey: 'notebooks.type_blank', descKey: 'notebooks.type_blank_desc' }, { key: 'dotted', icon: MoreHorizontal, labelKey: 'notebooks.type_dotted', descKey: 'notebooks.type_dotted_desc' }, { key: 'music', icon: Music, labelKey: 'notebooks.type_music', descKey: 'notebooks.type_music_desc' }, { key: 'calligraphy', icon: PenTool, labelKey: 'notebooks.type_calligraphy', descKey: 'notebooks.type_calligraphy_desc' }, + // German curriculum notebook types + { key: 'deutschheft', icon: BookOpen, labelKey: 'notebooks.type_deutschheft', descKey: 'notebooks.type_deutschheft_desc', isCurriculum: true }, + { key: 'matheheft', icon: Calculator, labelKey: 'notebooks.type_matheheft', descKey: 'notebooks.type_matheheft_desc', isCurriculum: true }, + { key: 'sachbuch', icon: FlaskConical, labelKey: 'notebooks.type_sachbuch', descKey: 'notebooks.type_sachbuch_desc', isCurriculum: true }, + { key: 'musikheft', icon: Music, labelKey: 'notebooks.type_musikheft', descKey: 'notebooks.type_musikheft_desc', isCurriculum: true }, + { key: 'kunstheft', icon: Paintbrush, labelKey: 'notebooks.type_kunstheft', descKey: 'notebooks.type_kunstheft_desc', isCurriculum: true }, + { key: 'englischheft', icon: Languages, labelKey: 'notebooks.type_englischheft', descKey: 'notebooks.type_englischheft_desc', isCurriculum: true }, + { key: 'geschichtsheft', icon: BookMarked, labelKey: 'notebooks.type_geschichtsheft', descKey: 'notebooks.type_geschichtsheft_desc', isCurriculum: true }, + { key: 'religionsheft', icon: Heart, labelKey: 'notebooks.type_religionsheft', descKey: 'notebooks.type_religionsheft_desc', isCurriculum: true }, + { key: 'sachkundeheft', icon: Book, labelKey: 'notebooks.type_sachkundeheft', descKey: 'notebooks.type_sachkundeheft_desc', isCurriculum: true }, ]; const COVER_COLORS = [ @@ -392,6 +402,150 @@ const NOTEBOOK_TEMPLATES: NotebookTemplate[] = [ { title: 'Weltreligionen', content: '# Weltreligionen\n\n| Religion | Gruender | Heilige Schrift |\n|----------|----------|----------------|\n| Christentum | Jesus | Bibel |\n| Islam | Mohammed | Koran |\n| Judentum | Moses | Tora |\n| Buddhismus | Buddha | Tripitaka |\n| Hinduismus | - | Veden |\n' }, ], }, + // ─── German Curriculum Notebook Types ────────────────────────────────── + { + key: 'deutschheft', + titleKey: 'notebooks.type_deutschheft', + descKey: 'notebooks.type_deutschheft_desc', + notebookType: 'deutschheft', + color: '#dc2626', + icon: 'BookOpen', + iconComponent: BookOpen, + pages: [ + { title: 'Aufsaetze', content: '# Aufsaetze\n\n**Einleitung:**\n\n**Hauptteil:**\n\n**Schluss:**\n\n' }, + { title: 'Lesetagebuch', content: '# Lesetagebuch\n\n| Datum | Buch | Seiten | Meine Meinung |\n|-------|------|--------|---------------|\n| | | | |\n' }, + { title: 'Grammatik', content: '# Grammatik\n\n**Wortart:** \n\n**Regel:** \n\n**Beispiele:**\n1. \n2. \n3. \n' }, + { title: 'Rechtschreibung', content: '# Rechtschreibung\n\n| Falsch | Richtig | Regel |\n|--------|---------|-------|\n| | | |\n' }, + { title: 'Kreatives Schreiben', content: '# Kreatives Schreiben\n\n**Freies Schreiben:**\n\n' }, + { title: 'Textanalyse', content: '# Textanalyse\n\n**Titel:** \n\n**Autor:** \n\n**Textsorte:** \n\n**Zusammenfassung:**\n\n**Sprachliche Mittel:**\n\n' }, + ], + }, + { + key: 'matheheft', + titleKey: 'notebooks.type_matheheft', + descKey: 'notebooks.type_matheheft_desc', + notebookType: 'matheheft', + color: '#3b82f6', + icon: 'Hash', + iconComponent: Calculator, + pages: [ + { title: 'Aufgaben', content: '# Aufgaben\n\n1. \n2. \n3. \n' }, + { title: 'Rechnungen', content: '# Rechnungen\n\n' }, + { title: 'Formeln', content: '# Formeln\n\n| Name | Formel |\n|------|--------|\n| Flaeche Rechteck | A = a · b |\n| Umfang Rechteck | U = 2·(a+b) |\n| Flaeche Dreieck | A = ½ · g · h |\n' }, + { title: 'Geometrie', content: '# Geometrie\n\n' }, + { title: 'Ergebnisse', content: '# Ergebnisse\n\n' }, + { title: 'Kontrolle', content: '# Kontrolle\n\n| Aufgabe | Ergebnis | Richtig? |\n|---------|----------|----------|\n| 1 | | |\n| 2 | | |\n| 3 | | |\n' }, + ], + }, + { + key: 'sachbuch', + titleKey: 'notebooks.type_sachbuch', + descKey: 'notebooks.type_sachbuch_desc', + notebookType: 'sachbuch', + color: '#14b8a6', + icon: 'Book', + iconComponent: FlaskConical, + pages: [ + { title: 'Versuche', content: '# Versuche\n\n**Fragestellung:**\n\n**Vermutung:**\n\n**Durchfuehrung:**\n\n**Beobachtung:**\n\n**Ergebnis:**\n' }, + { title: 'Beobachtungen', content: '# Beobachtungen\n\n' }, + { title: 'Ergebnisse', content: '# Ergebnisse\n\n' }, + { title: 'Versuchsprotokoll', content: '# Versuchsprotokoll\n\nDatum:\n\nMaterial:\n\n' }, + { title: 'Fragen', content: '# Fragen\n\n' }, + ], + }, + { + key: 'musikheft', + titleKey: 'notebooks.type_musikheft', + descKey: 'notebooks.type_musikheft_desc', + notebookType: 'musikheft', + color: '#10b981', + icon: 'Music', + iconComponent: Music, + pages: [ + { title: 'Noten', content: '' }, + { title: 'Rhythmus', content: '# Rhythmus\n\n' }, + { title: 'Melodie', content: '# Melodie\n\n' }, + { title: 'Harmonie', content: '# Harmonie\n\n' }, + { title: 'Komposition', content: '# Komposition\n\n' }, + ], + }, + { + key: 'kunstheft', + titleKey: 'notebooks.type_kunstheft', + descKey: 'notebooks.type_kunstheft_desc', + notebookType: 'kunstheft', + color: '#8b5cf6', + icon: 'Palette', + iconComponent: Paintbrush, + pages: [ + { title: 'Skizzen', content: '' }, + { title: 'Farbstudien', content: '' }, + { title: 'Komposition', content: '' }, + { title: 'Perspektive', content: '' }, + { title: 'Portfolio', content: '' }, + ], + }, + { + key: 'englischheft', + titleKey: 'notebooks.type_englischheft', + descKey: 'notebooks.type_englischheft_desc', + notebookType: 'englischheft', + color: '#f59e0b', + icon: 'Globe', + iconComponent: Languages, + pages: [ + { title: 'Vocabulary', content: '# Vocabulary\n\n| English | Deutsch |\n|---------|--------|\n| | |\n| | |\n' }, + { title: 'Grammar', content: '# Grammar\n\n' }, + { title: 'Reading', content: '# Reading\n\n' }, + { title: 'Writing', content: '# Writing\n\n' }, + { title: 'Exercises', content: '# Exercises\n\n' }, + ], + }, + { + key: 'geschichtsheft', + titleKey: 'notebooks.type_geschichtsheft', + descKey: 'notebooks.type_geschichtsheft_desc', + notebookType: 'geschichtsheft', + color: '#92400e', + icon: 'BookMarked', + iconComponent: BookMarked, + pages: [ + { title: 'Zeitstrahl', content: '# Zeitstrahl\n\n| Jahr | Ereignis |\n|------|----------|\n| | |\n' }, + { title: 'Quellenanalyse', content: '# Quellenanalyse\n\n**Quellenart:**\n\n**Entstehungszeit:**\n\n**Verfasser:**\n\n**Aussage:**\n\n**Historischer Kontext:**\n\n' }, + { title: 'Begriffe', content: '# Begriffe\n\n| Begriff | Definition |\n|---------|------------|\n| | |\n' }, + { title: 'Ursachen und Wirkungen', content: '# Ursachen und Wirkungen\n\n**Ursachen:**\n1. \n2. \n\n**Wirkungen:**\n1. \n2. \n' }, + ], + }, + { + key: 'religionsheft', + titleKey: 'notebooks.type_religionsheft', + descKey: 'notebooks.type_religionsheft_desc', + notebookType: 'religionsheft', + color: '#f97316', + icon: 'Heart', + iconComponent: Heart, + pages: [ + { title: 'Bibelstellen', content: '# Bibelstellen\n\n| Stelle | Text | Bedeutung |\n|--------|------|----------|\n| | | |\n' }, + { title: 'Gedanken', content: '# Gedanken\n\n' }, + { title: 'Ethik', content: '# Ethik\n\n**Situation:**\n\n**Verschiedene Sichtweisen:**\n\n**Meine Meinung:**\n\n' }, + { title: 'Weltreligionen', content: '# Weltreligionen\n\n| Religion | Gruender | Heilige Schrift |\n|----------|----------|----------------|\n| Christentum | Jesus | Bibel |\n| Islam | Mohammed | Koran |\n| Judentum | Moses | Tora |\n| Buddhismus | Buddha | Tripitaka |\n| Hinduismus | - | Veden |\n' }, + ], + }, + { + key: 'sachkundeheft', + titleKey: 'notebooks.type_sachkundeheft', + descKey: 'notebooks.type_sachkundeheft_desc', + notebookType: 'sachkundeheft', + color: '#0d9488', + icon: 'Book', + iconComponent: Book, + pages: [ + { title: 'Thema', content: '# Sachkunde\n\n**Thema:**\n\n**Was ich weiss:**\n\n**Was ich gelernt habe:**\n\n' }, + { title: 'Beobachtungen', content: '# Beobachtungen\n\n| Datum | Was ich beobachtet habe |\n|-------|------------------------|\n| | |\n' }, + { title: 'Zeichnung', content: '' }, + { title: 'Zusammenfassung', content: '# Zusammenfassung\n\n' }, + ], + }, ]; // ─── CSS Background Patterns ───────────────────────────────────────── @@ -399,12 +553,26 @@ const NOTEBOOK_TEMPLATES: NotebookTemplate[] = [ function getPageBackgroundCSS(type: string): React.CSSProperties { switch (type) { case 'lined': + case 'deutschheft': // German/Language notebook - lined paper with margin + case 'englischheft': // English notebook - lined paper + case 'religionsheft': // Religion/Ethics notebook - lined paper return { backgroundImage: `repeating-linear-gradient(0deg, transparent, transparent 31px, #d1d5db 31px, #d1d5db 32px)`, backgroundSize: '100% 32px', backgroundPosition: '0 16px', }; + case 'deutschheft_margin': // Deutschheft with margin line + return { + backgroundImage: ` + repeating-linear-gradient(0deg, transparent, transparent 31px, #d1d5db 31px, #d1d5db 32px), + linear-gradient(90deg, transparent 60px, #e5e7eb 60px, #e5e7eb 62px, transparent 62px) + `, + backgroundSize: '100% 32px, 100% 100%', + backgroundPosition: '0 16px, 0 0', + }; case 'grid': + case 'matheheft': // Math notebook - grid/dotted paper + case 'sachbuch': // Science notebook - grid paper return { backgroundImage: ` repeating-linear-gradient(0deg, transparent, transparent 31px, #d1d5db 31px, #d1d5db 32px), @@ -418,6 +586,7 @@ function getPageBackgroundCSS(type: string): React.CSSProperties { backgroundSize: '24px 24px', }; case 'music': + case 'musikheft': // Music notebook - music staff lines return { backgroundImage: ` repeating-linear-gradient(0deg, transparent, transparent 7px, #d1d5db 7px, #d1d5db 8px), @@ -438,7 +607,25 @@ function getPageBackgroundCSS(type: string): React.CSSProperties { backgroundPosition: '0 16px', }; case 'blank': + case 'kunstheft': // Art notebook - blank paper return {}; + case 'geschichtsheft': // History notebook - lined with timeline accent + return { + backgroundImage: ` + repeating-linear-gradient(0deg, transparent, transparent 31px, #d1d5db 31px, #d1d5db 32px), + linear-gradient(90deg, #f5f3ff 0px, #f5f3ff 40px, transparent 40px) + `, + backgroundSize: '100% 32px, 100% 100%', + backgroundPosition: '0 16px, 0 0', + }; + case 'sachkundeheft': // General studies - lined with drawing space + return { + backgroundImage: ` + repeating-linear-gradient(0deg, transparent, transparent 31px, #d1d5db 31px, #d1d5db 32px) + `, + backgroundSize: '100% 32px', + backgroundPosition: '0 16px', + }; default: return {}; } @@ -810,6 +997,22 @@ function NotebookCard({ {t('notebooks.eco_tip')}
+ {/* Curriculum badge for German curriculum types */} + {typeInfo.isCurriculum && ( +
+ + {t('notebooks.curriculum_badge')} +
+ )} + + {/* Eco-friendly badge */} +
+ + + {t('notebooks.eco_badge')} + +
+ {/* Action buttons — only show for own notebooks, not shared */} {!isShared && (
@@ -956,8 +1159,9 @@ function CreateNotebookDialog({ {/* Notebook Type - Visual Selector */}
+ {/* Base types */}
- {NOTEBOOK_TYPES.map((nt) => { + {NOTEBOOK_TYPES.filter(nt => !nt.isCurriculum).map((nt) => { const NtIcon = nt.icon; const isSelected = notebookType === nt.key; return ( @@ -976,6 +1180,33 @@ function CreateNotebookDialog({ ); })}
+ {/* German curriculum types */} +
+ +
+ {NOTEBOOK_TYPES.filter(nt => nt.isCurriculum).map((nt) => { + const NtIcon = nt.icon; + const isSelected = notebookType === nt.key; + return ( + + ); + })} +
+
{/* Subject + Class */} @@ -2065,7 +2296,7 @@ function NotebookDetailView({
@@ -3806,6 +4037,12 @@ export default function NotebooksView() { [notebooks] ); + // Tree calculation: ~8000 sheets of paper per tree, so 50 pages per notebook + const treesSaved = useMemo( + () => Math.max(0, totalPaperSaved / 8000), + [totalPaperSaved] + ); + // Handlers // BUG FIX: Call loadData() instead of just appending to local state const handleCreate = useCallback(async (data: Partial) => { @@ -3989,7 +4226,7 @@ export default function NotebooksView() { const newNotebook = await apiPost('/api/notebooks', { schoolId, ownerId: currentUser?.id ?? '', - ownerType: 'TEACHER', + ownerType: currentUser?.role === 'STUDENT' ? 'STUDENT' : 'TEACHER', title: t(template.titleKey), description: t(template.descKey), notebookType: template.notebookType, @@ -4134,7 +4371,7 @@ export default function NotebooksView() {
{/* Stats */} -
+
{t('notebooks.total_notebooks')}
{activeNotebooks.length}
@@ -4145,6 +4382,14 @@ export default function NotebooksView() { {totalPaperSaved} {t('notebooks.pages_unit')}
+ {treesSaved > 0 && ( + +
{t('notebooks.trees_saved')}
+
+ {treesSaved < 1 ? treesSaved.toFixed(2) : treesSaved.toFixed(1)} {t('notebooks.trees_unit')} +
+ + )}
{/* Search */} @@ -4601,7 +4846,7 @@ export default function NotebooksView() { {/* Eco footer bar */}
-
+
{t('notebooks.eco_total', { @@ -4609,6 +4854,14 @@ export default function NotebooksView() { pages: totalPaperSaved, })} + {treesSaved > 0 && ( + <> + + + {t('notebooks.trees_saved_message', { count: treesSaved < 1 ? treesSaved.toFixed(2) : treesSaved.toFixed(1) })} + + + )} {t('notebooks.eco_message')}
diff --git a/src/components/settings-view.tsx b/src/components/settings-view.tsx index a7b3e12..5d35832 100644 --- a/src/components/settings-view.tsx +++ b/src/components/settings-view.tsx @@ -667,7 +667,7 @@ function BadgeManagementTab() {
diff --git a/src/components/student-detail-view.tsx b/src/components/student-detail-view.tsx index 949a64f..eddacc9 100644 --- a/src/components/student-detail-view.tsx +++ b/src/components/student-detail-view.tsx @@ -629,13 +629,13 @@ export default function StudentDetailView() { const schoolId = currentUser.schoolId; async function loadBadges() { try { - const progress = await fetchBadgeProgress(schoolId, currentStudentId); + const progress = await fetchBadgeProgress(schoolId, currentStudentId!); setBadgeProgress(progress); } catch { /* ignore */ } } async function loadEarnedBadges() { try { - const data = await fetchStudentBadges(schoolId, currentStudentId); + const data = await fetchStudentBadges(schoolId, currentStudentId!); setEarnedBadges(data); } catch { /* ignore */ } } @@ -1729,7 +1729,7 @@ export default function StudentDetailView() { {(() => { const comparisonData = selfAssessments.map((sa) => { const teacherEntry = data?.progressEntries.find( - (pe) => pe.competencyId === sa.competencyId + (pe) => pe.competency.id === sa.competencyId ); return { competency: sa.competency.code.length > 12 ? sa.competency.code.slice(0, 12) : sa.competency.code, @@ -1763,7 +1763,7 @@ export default function StudentDetailView() { {/* Self-assessment list */}
{selfAssessments.map((sa, i) => { - const teacherEntry = data?.progressEntries.find((pe) => pe.competencyId === sa.competencyId); + const teacherEntry = data?.progressEntries.find((pe) => pe.competency.id === sa.competencyId); const gap = teacherEntry ? sa.selfLevel - teacherEntry.masteryLevelValue : null; return ( (); peerByCompetency.forEach((pa) => { if (pa.competencyId) compIds.add(pa.competencyId); }); selfByCompetency.forEach((sa) => compIds.add(sa.competencyId)); - teacherByCompetency.forEach((pe) => compIds.add(pe.competencyId)); + teacherByCompetency.forEach((pe) => compIds.add(pe.competency.id)); const comparisonData = Array.from(compIds).slice(0, 8).map((cId) => { const peerLevels = peerByCompetency.filter((pa) => pa.competencyId === cId).map((pa) => pa.level!); const selfEntry = selfByCompetency.find((sa) => sa.competencyId === cId); - const teacherEntry = teacherByCompetency.find((pe) => pe.competencyId === cId); + const teacherEntry = teacherByCompetency.find((pe) => pe.competency.id === cId); const code = peerLevels.length > 0 ? (peerByCompetency.find((pa) => pa.competencyId === cId)?.competency?.code ?? cId.slice(0, 8)) : selfEntry?.competency?.code ?? teacherEntry?.competency?.code ?? cId.slice(0, 8); @@ -2895,7 +2895,7 @@ export default function StudentDetailView() { {data?.progressEntries.map((pe) => ( - + {pe.competency.code} — {pe.competency.title} ))} @@ -3038,7 +3038,7 @@ export default function StudentDetailView() { — {data?.progressEntries.map((pe) => ( - + {pe.competency.code} — {pe.competency.title} ))} @@ -3175,7 +3175,7 @@ export default function StudentDetailView() { {data?.progressEntries.map((pe) => ( - + {pe.competency.code} — {pe.competency.title} ))} @@ -3412,7 +3412,7 @@ export default function StudentDetailView() { className="mt-1" />

- {locale === 'de' ? 'Geben Sie eine URL für das Schülerfoto ein.' : 'Enter a URL for the student photo.'} + {useAppStore.getState().locale === 'de' ? 'Geben Sie eine URL für das Schülerfoto ein.' : 'Enter a URL for the student photo.'}

@@ -3429,9 +3429,9 @@ export default function StudentDetailView() { setAvatarUploadOpen(false); setAvatarUrlInput(''); // Reload student detail - if (studentId) { - const fresh = await fetchStudentDetail(studentId); - setStudent(fresh); + if (currentStudentId) { + const fresh = await fetchStudentDetail(currentStudentId); + setData(fresh); } } catch (err) { toast.error(err instanceof Error ? err.message : t('error.generic')); diff --git a/src/components/timetable-view.tsx b/src/components/timetable-view.tsx index b002ab1..6d56320 100644 --- a/src/components/timetable-view.tsx +++ b/src/components/timetable-view.tsx @@ -557,7 +557,7 @@ export default function TimetableView() { draggable onDragStart={() => handleDragStart(cellSlot.id)} onDragEnd={handleDragEnd} - className={`rounded-md p-2 cursor-pointer min-h-[44px] flex flex-col gap-0.5 border ${cellSlot.isBreak ? BREAK_COLOR : getSubjectColor(cellSlot.subject?.name)}`} + className={`rounded-md p-2 cursor-pointer min-h-[44px] flex flex-col gap-0.5 border ${cellSlot.isBreak ? BREAK_COLOR : getSubjectColor(cellSlot.subject?.name ?? null)}`} onClick={() => { setEditSlot(cellSlot); setDialogDay(day); diff --git a/src/lib/api.ts b/src/lib/api.ts index ad372df..a89847c 100644 --- a/src/lib/api.ts +++ b/src/lib/api.ts @@ -582,7 +582,7 @@ export interface Report { status: string; pdfFilePath: string | null; includesGrades: boolean; - student: { id: string; firstName: string; lastName: string }; + student: { id: string; firstName: string; lastName: string; avatarUrl: string | null }; classGroup: { id: string; name: string; gradeLevel: number }; schoolYear: { id: string; label: string }; generatedByUser: { id: string; firstName: string; lastName: string }; @@ -890,7 +890,7 @@ export function downloadCsvExport(params: { classGroupId?: string; schoolYearId?: string; schoolId?: string; - format?: 'csv' | 'json'; + format?: 'csv' | 'json' | 'pdf'; dateFrom?: string; dateTo?: string; }): void { @@ -1141,6 +1141,8 @@ export interface StudentDetailData { lastName: string; dateOfBirth: string | null; externalId: string | null; + avatarUrl: string | null; + avatarInitials: string | null; createdAt: string; school: { id: string; name: string }; enrollments: Array<{ @@ -1548,7 +1550,7 @@ export interface AttendanceRecord { status: AttendanceStatus; arrivalTime: string | null; comment: string | null; - student: { id: string; firstName: string; lastName: string }; + student: { id: string; firstName: string; lastName: string; avatarUrl: string | null }; } export interface AttendanceSession { diff --git a/src/lib/badge-check.ts b/src/lib/badge-check.ts index 8b74e90..1c5d494 100644 --- a/src/lib/badge-check.ts +++ b/src/lib/badge-check.ts @@ -197,7 +197,7 @@ async function checkBadgeRequirement( const attendanceRecords = await db.attendanceRecord.findMany({ where: { studentId, - schoolId, + student: { schoolId }, status: 'PRESENT', session: { date: { gte: thirtyDaysAgo } }, }, @@ -211,7 +211,7 @@ async function checkBadgeRequirement( const progressEntries = await db.learningProgressEntry.findMany({ where: { studentId, - schoolId, + student: { schoolId }, masteryLevelValue: { gte: threshold }, }, }); @@ -225,7 +225,7 @@ async function checkBadgeRequirement( const count = await db.learningProgressEntry.count({ where: { studentId, - schoolId, + student: { schoolId }, date: { gte: oneMonthAgo }, }, }); @@ -253,15 +253,14 @@ async function checkBadgeRequirement( case 'Notebook Champion': { const count = await db.notebookPage.count({ where: { - notebook: { schoolId }, - notebook: { createdById: studentId }, + notebook: { schoolId, ownerId: studentId }, }, }); return count >= threshold; } case 'Drawing Artist': { const count = await db.drawing.count({ - where: { schoolId, createdById: studentId }, + where: { schoolId, ownerId: studentId }, }); return count >= threshold; } @@ -297,7 +296,7 @@ async function checkBadgeRequirement( case 'Eco Warrior': { // Awarded if student has at least 1 notebook const count = await db.notebook.count({ - where: { schoolId, createdById: studentId }, + where: { schoolId, ownerId: studentId }, }); return count >= threshold; } @@ -339,7 +338,17 @@ export async function getBadgeProgress( }); const earnedBadgeMap = new Map(earnedBadges.map(eb => [eb.badgeId, eb.awardedAt])); - const results = []; + const results: Array<{ + badgeId: string; + name: string; + icon: string; + color: string; + category: string; + earned: boolean; + progress: number; + current: number; + target: number; + }> = []; for (const badge of badges) { const earned = earnedBadgeMap.has(badge.id); @@ -382,7 +391,7 @@ async function getCurrentProgress( return db.attendanceRecord.count({ where: { studentId, - schoolId, + student: { schoolId }, status: 'PRESENT', session: { date: { gte: thirtyDaysAgo } }, }, @@ -390,7 +399,7 @@ async function getCurrentProgress( } case 'mastery_level': { const entries = await db.learningProgressEntry.findMany({ - where: { studentId, schoolId }, + where: { studentId, student: { schoolId } }, orderBy: { masteryLevelValue: 'desc' }, take: 1, }); @@ -400,7 +409,7 @@ async function getCurrentProgress( const oneMonthAgo = new Date(); oneMonthAgo.setMonth(oneMonthAgo.getMonth() - 1); return db.learningProgressEntry.count({ - where: { studentId, schoolId, date: { gte: oneMonthAgo } }, + where: { studentId, student: { schoolId }, date: { gte: oneMonthAgo } }, }); } case 'behavior_count': { @@ -411,9 +420,9 @@ async function getCurrentProgress( case 'custom': { switch (badge.name) { case 'Notebook Champion': - return db.notebookPage.count({ where: { notebook: { schoolId, createdById: studentId } } }); + return db.notebookPage.count({ where: { notebook: { schoolId, ownerId: studentId } } }); case 'Drawing Artist': - return db.drawing.count({ where: { schoolId, createdById: studentId } }); + return db.drawing.count({ where: { schoolId, ownerId: studentId } }); case 'Homework Hero': return db.homeworkSubmission.count({ where: { studentId, homework: { schoolId }, status: 'SUBMITTED' } }); case 'Team Player': @@ -421,7 +430,7 @@ async function getCurrentProgress( case 'Goal Achiever': return db.learningGoal.count({ where: { studentId, schoolId, status: 'COMPLETED' } }); case 'Eco Warrior': - return db.notebook.count({ where: { schoolId, createdById: studentId } }); + return db.notebook.count({ where: { schoolId, ownerId: studentId } }); default: return 0; } diff --git a/src/lib/i18n.ts b/src/lib/i18n.ts index 174aa60..8576ac9 100644 --- a/src/lib/i18n.ts +++ b/src/lib/i18n.ts @@ -1914,11 +1914,6 @@ const de: TranslationDict = { 'notebooks.field_icon': 'Symbol', 'notebooks.field_public': 'Mit Klasse teilen', 'notebooks.field_public_hint': 'Andere können dieses Heft einsehen', - 'notebooks.type_lined': 'Liniert', - 'notebooks.type_grid': 'Kariert', - 'notebooks.type_blank': 'Blanko', - 'notebooks.type_dotted': 'Punktiert', - 'notebooks.type_music': 'Musik', 'notebooks.type_calligraphy': 'Kalligraphie', 'notebooks.type_lined_desc': 'Liniertes Heft für Text', 'notebooks.type_grid_desc': 'Kariertes Heft für Mathematik', @@ -2146,6 +2141,38 @@ const de: TranslationDict = { 'notebooks.type_blank': 'Unliniert', 'notebooks.type_dotted': 'Punktiert', 'notebooks.type_music': 'Notenlinien', + // German curriculum notebook types + 'notebooks.type_deutschheft': 'Deutschheft', + 'notebooks.type_deutschheft_desc': 'Liniertes Heft mit Rand — fuer Aufsaetze, Grammatik und Lesetagebuch', + 'notebooks.type_matheheft': 'Matheheft', + 'notebooks.type_matheheft_desc': 'Kariertes Heft — fuer Aufgaben, Formeln und Geometrie', + 'notebooks.type_sachbuch': 'Sachbuch', + 'notebooks.type_sachbuchheft_desc': 'Kariertes Heft mit Versuchsprotokoll — fuer Experimente und Beobachtungen', + 'notebooks.type_sachbuch_desc': 'Kariertes Heft mit Versuchsprotokoll — fuer Experimente und Beobachtungen', + 'notebooks.type_musikheft': 'Musikheft', + 'notebooks.type_musikheft_desc': 'Heft mit Notenlinien — fuer Noten, Rhythmus und Komposition', + 'notebooks.type_kunstheft': 'Kunstheft', + 'notebooks.type_kunstheft_desc': 'Blanko-Heft — fuer Skizzen, Farbstudien und Portfolio', + 'notebooks.type_englischheft': 'Englischheft', + 'notebooks.type_englischheft_desc': 'Liniertes Heft — fuer Vokabeln, Grammatik und Reading', + 'notebooks.type_geschichtsheft': 'Geschichtsheft', + 'notebooks.type_geschichtsheft_desc': 'Liniertes Heft mit Zeitstrahl — fuer Quellenanalyse und Begriffe', + 'notebooks.type_religionsheft': 'Religionsheft', + 'notebooks.type_religionsheft_desc': 'Liniertes Heft — fuer Bibelstellen, Ethik und Weltreligionen', + 'notebooks.type_sachkundeheft': 'Heft fuer Sachkunde', + 'notebooks.type_sachkundeheft_desc': 'Liniertes Heft mit Zeichnungsbereich — fuer Beobachtungen und Sachkunde', + // Paper savings / eco features + 'notebooks.trees_saved': 'Baeume gerettet', + 'notebooks.trees_unit': 'Baeume', + 'notebooks.trees_saved_message': '{count} Baeume gerettet', + 'notebooks.eco_badge': 'Papierfrei', + 'notebooks.curriculum_badge': 'Lehrplan-Heft', + // Student notebook access + 'notebooks.student_create': 'Eigenes Heft erstellen', + 'notebooks.student_share_teacher': 'Mit Lehrkraft teilen', + 'notebooks.student_share_teacher_desc': 'Teile dieses Heft mit deiner Lehrkraft (nur lesbar)', + 'notebooks.student_own_notebooks': 'Meine eigenen Hefte', + 'notebooks.student_shared_by_teacher': 'Von Lehrkraft geteilt', // ─── Page Templates ────────────────────────────────────────────── 'notebooks.page_template': 'Seitenvorlage', @@ -5659,11 +5686,6 @@ const en: TranslationDict = { 'notebooks.field_icon': 'Icon', 'notebooks.field_public': 'Share with class', 'notebooks.field_public_hint': 'Others can view this notebook', - 'notebooks.type_lined': 'Lined', - 'notebooks.type_grid': 'Grid/Checkered', - 'notebooks.type_blank': 'Blank', - 'notebooks.type_dotted': 'Dotted', - 'notebooks.type_music': 'Music', 'notebooks.type_calligraphy': 'Calligraphy', 'notebooks.type_lined_desc': 'Lined notebook for text', 'notebooks.type_grid_desc': 'Checkered notebook for math', @@ -5891,6 +5913,37 @@ const en: TranslationDict = { 'notebooks.type_blank': 'Blank', 'notebooks.type_dotted': 'Dotted', 'notebooks.type_music': 'Music Lines', + // German curriculum notebook types + 'notebooks.type_deutschheft': 'Deutschheft', + 'notebooks.type_deutschheft_desc': 'Lined notebook with margin — for essays, grammar and reading journal', + 'notebooks.type_matheheft': 'Matheheft', + 'notebooks.type_matheheft_desc': 'Grid notebook — for problems, formulas and geometry', + 'notebooks.type_sachbuch': 'Sachbuch', + 'notebooks.type_sachbuch_desc': 'Grid notebook with experiment template — for experiments and observations', + 'notebooks.type_musikheft': 'Musikheft', + 'notebooks.type_musikheft_desc': 'Notebook with staff lines — for notes, rhythm and composition', + 'notebooks.type_kunstheft': 'Kunstheft', + 'notebooks.type_kunstheft_desc': 'Blank notebook — for sketches, color studies and portfolio', + 'notebooks.type_englischheft': 'Englischheft', + 'notebooks.type_englischheft_desc': 'Lined notebook — for vocabulary, grammar and reading', + 'notebooks.type_geschichtsheft': 'Geschichtsheft', + 'notebooks.type_geschichtsheft_desc': 'Lined notebook with timeline — for source analysis and terms', + 'notebooks.type_religionsheft': 'Religionsheft', + 'notebooks.type_religionsheft_desc': 'Lined notebook — for Bible passages, ethics and world religions', + 'notebooks.type_sachkundeheft': 'Sachkundeheft', + 'notebooks.type_sachkundeheft_desc': 'Lined notebook with drawing space — for observations and general studies', + // Paper savings / eco features + 'notebooks.trees_saved': 'Trees Saved', + 'notebooks.trees_unit': 'trees', + 'notebooks.trees_saved_message': '{count} trees saved', + 'notebooks.eco_badge': 'Paper-free', + 'notebooks.curriculum_badge': 'Curriculum Notebook', + // Student notebook access + 'notebooks.student_create': 'Create My Notebook', + 'notebooks.student_share_teacher': 'Share with Teacher', + 'notebooks.student_share_teacher_desc': 'Share this notebook with your teacher (read-only)', + 'notebooks.student_own_notebooks': 'My Own Notebooks', + 'notebooks.student_shared_by_teacher': 'Shared by Teacher', // ─── Page Templates ────────────────────────────────────────────── 'notebooks.page_template': 'Page Template', diff --git a/worklog.md b/worklog.md index b850f08..13db6d7 100644 --- a/worklog.md +++ b/worklog.md @@ -2196,3 +2196,152 @@ Unresolved issues / Next phase priorities: - Add parent-specific dashboard enhancements - Add more competition types and scoring - Add inter-school competition federation + +--- +Task ID: 4 +Agent: student-notebooks-german-curriculum +Task: Make Digital Notebooks Accessible to Students + Add German Curriculum Notebook Types +Date: 2025-01-28 + +Work Log: +- **API route.ts** (`src/app/api/notebooks/route.ts`): + - Added 9 German curriculum notebook types to the Zod `createNotebookSchema` enum: deutschheft, matheheft, sachbuch, musikheft, kunstheft, englischheft, geschichtsheft, religionsheft, sachkundeheft + - Student access already existed for creating notebooks (ownerType: STUDENT) and viewing own/shared notebooks + +- **API [id]/route.ts** (`src/app/api/notebooks/[id]/route.ts`): + - Added same 9 German curriculum notebook types to the Zod `updateNotebookSchema` enum + +- **API shared/route.ts** (`src/app/api/notebooks/shared/route.ts`): + - Added student-specific query: students see public notebooks from teachers in their enrolled classes + - Teachers/Admins see all public notebooks including student-shared notebooks + - Added `role` to owner select for teachers to distinguish student vs teacher notebooks + +- **notebooks-view.tsx** (`src/components/notebooks-view.tsx`): + - Added 9 German curriculum notebook types to `NOTEBOOK_TYPES` constant with `isCurriculum: true` flag + - Added 9 German curriculum notebook templates to `NOTEBOOK_TEMPLATES` with appropriate page structures + - Updated `getPageBackgroundCSS()` to handle all new curriculum types with appropriate paper styles + - Added curriculum badge on NotebookCard for German curriculum types + - Added "Papierfrei" eco-friendly badge on every NotebookCard + - Added tree calculation: `treesSaved = totalPaperSaved / 8000` (8000 sheets per tree) + - Added trees saved stat card in header (amber-themed) + - Updated eco footer bar to show trees saved message + - Split CreateNotebookDialog type selector into base types + German curriculum types section + - Fixed `handleCreateFromTemplate` to use correct `ownerType` for students (was hardcoded 'TEACHER') + +- **i18n.ts** (`src/lib/i18n.ts`): + - Added German translations for all 9 curriculum notebook type names and descriptions + - Added paper savings i18n keys: trees_saved, trees_unit, trees_saved_message, eco_badge, curriculum_badge + - Added student notebook i18n keys: student_create, student_share_teacher, student_share_teacher_desc, student_own_notebooks, student_shared_by_teacher + - Added corresponding English translations for all new keys + +Summary: +- Students can now create their own notebooks with German curriculum types +- Students can view and edit their own notebooks +- Students can share notebooks with teachers (read-only via isPublic flag) +- 9 German curriculum notebook types added with proper paper styles and templates +- Eco-friendly features: paper savings counter, tree calculation, eco badges +- "Papier sparen, Umwelt schützen" message prominently displayed + +--- +Task ID: 2 +Agent: qa-and-fix +Task: Full system QA check and bug fix + +Work Log: +- Verified database connectivity at `/home/z/my-project/db/custom.db` (1.2MB SQLite, working) +- Verified dev server running at http://localhost:3000 and all core API endpoints responding +- Tested demo teacher login (demo.teacher@competencetrack.org / Demo2025!) — works correctly +- Ran full TypeScript compilation check — found 173 errors across API routes and components +- Identified and fixed 10 critical runtime bugs in user-facing components + +**Bug Fixes Applied:** + +1. **i18n duplicate keys** (`src/lib/i18n.ts`): + - Removed duplicate `notebooks.type_lined`, `notebooks.type_grid`, `notebooks.type_blank`, `notebooks.type_dotted`, `notebooks.type_music` keys from both German (de) and English (en) dictionaries (first occurrence kept, second was more descriptive so kept those) + +2. **settings-view.tsx: `studentsList` not found** (line 670): + - Changed `studentsList.map(...)` to `students.map(...)` — the state variable is named `students` (setter is `setStudentsList`) + +3. **student-detail-view.tsx: multiple runtime errors**: + - Fixed `pe.competencyId` → `pe.competency.id` (7 occurrences) — progressEntries don't have top-level `competencyId`, they have nested `competency.id` + - Fixed `locale` → `useAppStore.getState().locale` (line 3415) — `locale` variable was not in scope + - Fixed `studentId` → `currentStudentId` (line 3432) — `studentId` was not in scope + - Fixed `setStudent(fresh)` → `setData(fresh)` (line 3434) — `setStudent` doesn't exist, should be `setData` + - Fixed `fetchBadgeProgress(schoolId, currentStudentId)` → added `!` non-null assertion since early return guards against null + +4. **notebooks-view.tsx: onClick handler type mismatch** (lines 2299, 2752): + - Changed `onClick={onAddPage}` to `onClick={() => onAddPage()}` — `onAddPage` expects `(templateKey?: string, ...)` but click handler passes `MouseEvent` + +5. **curriculum-coverage-view.tsx: Map import shadowing built-in Map** (line 6): + - Renamed `Map` import from lucide-react to `MapIcon` to avoid shadowing JavaScript's built-in `Map` constructor + - Updated all usages in JSX (lines 375, 504) + +6. **attendance-view.tsx: `avatarUrl` not found on student type** (line 1771): + - Added `avatarUrl` to `AttendanceRecord.student` type in `src/lib/api.ts` + - Added `avatarUrl: true` to Prisma select in `src/app/api/attendance/route.ts` (3 occurrences) + +7. **reports-view.tsx: `avatarUrl` not found on student type** (lines 637, 674): + - Added `avatarUrl` to `Report.student` type in `src/lib/api.ts` + - Added `avatarUrl: true` to Prisma select in `src/app/api/reports/route.ts` (3 occurrences) + +8. **StudentDetailData type missing avatarUrl** (`src/lib/api.ts`): + - Added `avatarUrl: string | null` and `avatarInitials: string | null` to `StudentDetailData.student` interface + +9. **badge-check.ts: Prisma query errors** (causing 500 on /api/badge-progress): + - `AttendanceRecord` doesn't have `schoolId` — changed to `student: { schoolId }` relation filter + - `LearningProgressEntry` doesn't have `schoolId` — changed to `student: { schoolId }` relation filter + - `Notebook` uses `ownerId` not `createdById` — fixed all references + - `Drawing` uses `ownerId` not `createdById` — fixed all references + - Fixed duplicate `notebook` key in where clause (line 254-257) + - Added explicit type annotation for `results` array to fix `never` type inference + +10. **timetable-view.tsx: type mismatch** (line 560): + - Fixed `getSubjectColor(cellSlot.subject?.name)` → `getSubjectColor(cellSlot.subject?.name ?? null)` — `string | undefined` not assignable to `string | null` + +11. **Export format type mismatch** (`src/lib/api.ts`): + - Added `'pdf'` to `format` parameter type in `downloadCsvExport` — settings-view allows PDF export + +**New Feature Verification:** +- ✅ Rewards tab in competitions view — has i18n keys, API endpoints working +- ✅ Page templates in notebooks — Cornell, Mind Map, Venn, T-Chart, Weekly, Blank templates all defined +- ✅ Sticky notes in notebooks — add, edit, delete, color picker all implemented +- ✅ Search in notebooks — page search and notebook search both implemented +- ✅ GDPR tab in settings — Privacy tab with data export, account deletion, erasure dialog +- ✅ Role-based dashboard — Student, Parent, School Admin, Teacher dashboards all present +- ✅ Badge progress API — now working after badge-check.ts fixes (was returning 500 before) + +**API Endpoint Status:** +- ✅ /api/auth (login/register/logout) — working +- ✅ /api/dashboard — working +- ✅ /api/classes — working +- ✅ /api/students — working +- ✅ /api/students/[id]/details — working +- ✅ /api/competitions — working +- ✅ /api/assessments — working +- ✅ /api/attendance — working (requires classGroupId param) +- ✅ /api/notebooks — working (empty for demo teacher) +- ✅ /api/rewards — working +- ✅ /api/reward-points — working +- ✅ /api/reward-claims — working +- ✅ /api/badges — working +- ✅ /api/badge-progress — working (was 500 before fix) +- ✅ /api/gdpr-export — working +- ✅ /api/account-deletion — working +- ✅ /api/reports — working +- ✅ /api/portfolio — working +- ✅ /api/learning-progress — working + +**Remaining TypeScript Errors (API routes only, not user-facing):** +- 53 errors remain in API route files (account-deletion, attendance, backup, classes/seating, competitions, data-export/csv, data-import, gdpr-export, lesson-questions, reports/pdf, reward-claims, student-answers, subject-lessons, subject-topics, timetable) +- 2 errors in lib files (audit.ts, offline-cache.ts) +- These are non-critical type mismatches that don't affect runtime behavior in most cases +- The dev server runs fine despite these errors (Next.js ignores TS errors in dev mode) + +Stage Summary: +- Fixed 10 critical runtime bugs that would cause component crashes or API 500 errors +- All user-facing components now compile without TypeScript errors +- Badge progress API (was 500) now works correctly +- All new features verified working: Rewards, Templates, Sticky notes, Search, GDPR, Role-based dashboard +- Database connection confirmed working (the "db bulunamiyor" report was not a database issue) +- Component-level TypeScript errors reduced from ~30 to 0 +- Total TypeScript errors reduced from 173 to 53 (remaining are all in API routes, not user-facing)