bf5ea860cc
CI / go-lint (push) Has been skipped
CI / python-lint (push) Has been skipped
CI / nodejs-lint (push) Has been skipped
CI / test-go-school (push) Successful in 37s
CI / test-go-edu-search (push) Successful in 29s
CI / test-python-klausur (push) Failing after 3m56s
CI / test-python-agent-core (push) Successful in 19s
CI / test-nodejs-website (push) Successful in 23s
Backend (school-service):
- tt_solution gains parent_solution_id (self-FK, ON DELETE SET NULL)
and seconds_limit columns via ALTER TABLE IF NOT EXISTS.
- CreateTimetableSolutionRequest accepts optional parent_solution_id
and seconds_limit (5-600s) with binding validation.
- CreateSolution checks parent ownership before INSERT so users can't
fork another tenant's plan.
- New PUT /timetable/lessons/:id/pin endpoint; ownership enforced via
the lesson's solution.created_by_user_id JOIN.
Solver:
- Lesson.pinned now carries @PlanningPin so Timefold leaves locked
cells untouched during the search.
- build_problem() takes optional parent_solution_id; if set, copies
pinned (class_id, subject_id, day, period, room) tuples onto fresh
Lesson objects via greedy first-fit matching. Surplus pinned rows
from curriculum changes are silently dropped.
- _build_factory(seconds) replaces the module-level factory so each
job honours its tt_solution.seconds_limit override.
- persist_solution writes lesson.pinned back so subsequent re-solves
inherit it.
Frontend (studio-v2):
- SolutionList grows three knobs in the create-form: Basieren auf
(parent dropdown, only completed solutions, disabled when none),
Sekunden-Limit (5-600), and the existing Name.
- PlanView cells get a pin/unpin button with optimistic update and
rollback on error. Pinned cells gain an amber ring.
- types.ts + api.ts mirror the new fields; lessonsApi.pin(id, bool).
- HelpPanel: collapsible 6-step Bedienungsanleitung explaining the
setup-to-plan workflow. Anchored at the top of /stundenplan above
the dev token banner.
- page.tsx switches to the same gradient + animated-blob background
used on /korrektur so /stundenplan stops looking like a slate-900
test page.
- JWT dev banner gets a step-by-step explanation of how to grab the
token from DevTools and a non-blocking success indicator (no more
alert()).
Tests:
- school-service: 6 new validator cases for parent_solution_id +
seconds_limit boundaries. 73 subtests total, all green.
- studio-v2: mockSchoolApi adds PUT /lessons/:id/pin route. 5 new
Playwright tests across two suites (parent-selector visibility +
options, seconds-limit input, pin button render, pin-icon flip).
Existing tests adjusted to the new help panel + JWT banner wording.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
232 lines
9.4 KiB
TypeScript
232 lines
9.4 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useEffect, useCallback, useMemo } from 'react'
|
|
import { useTheme } from '@/lib/ThemeContext'
|
|
import { solutionsApi, subjectsApi, lessonsApi } from '@/lib/stundenplan/api'
|
|
import type { TimetableLesson, TimetableSubject } from '@/app/stundenplan/types'
|
|
|
|
interface PlanViewProps {
|
|
solutionId: string
|
|
}
|
|
|
|
const DAYS = [
|
|
{ v: 1, label: 'Mo' },
|
|
{ v: 2, label: 'Di' },
|
|
{ v: 3, label: 'Mi' },
|
|
{ v: 4, label: 'Do' },
|
|
{ v: 5, label: 'Fr' },
|
|
]
|
|
|
|
type Perspective = 'class' | 'teacher' | 'room'
|
|
|
|
const PERSPECTIVE_LABEL: Record<Perspective, string> = {
|
|
class: 'Klasse',
|
|
teacher: 'Lehrer',
|
|
room: 'Raum',
|
|
}
|
|
|
|
interface Resource {
|
|
id: string
|
|
label: string
|
|
}
|
|
|
|
export function PlanView({ solutionId }: PlanViewProps) {
|
|
const { isDark } = useTheme()
|
|
const [lessons, setLessons] = useState<TimetableLesson[]>([])
|
|
const [subjects, setSubjects] = useState<TimetableSubject[]>([])
|
|
const [loading, setLoading] = useState(true)
|
|
const [error, setError] = useState<string | null>(null)
|
|
const [perspective, setPerspective] = useState<Perspective>('class')
|
|
const [selectedResource, setSelectedResource] = useState<string>('')
|
|
|
|
const load = useCallback(async () => {
|
|
setLoading(true)
|
|
setError(null)
|
|
try {
|
|
const [ls, sub] = await Promise.all([
|
|
solutionsApi.lessons(solutionId),
|
|
subjectsApi.list(),
|
|
])
|
|
setLessons(ls || [])
|
|
setSubjects(sub || [])
|
|
} catch (e) {
|
|
setError(e instanceof Error ? e.message : 'Laden fehlgeschlagen')
|
|
} finally {
|
|
setLoading(false)
|
|
}
|
|
}, [solutionId])
|
|
|
|
useEffect(() => { load() }, [load])
|
|
|
|
// Unique resources for the chosen perspective.
|
|
const resources: Resource[] = useMemo(() => {
|
|
const seen = new Map<string, Resource>()
|
|
for (const l of lessons) {
|
|
let id = ''
|
|
let label = ''
|
|
if (perspective === 'class') {
|
|
id = l.class_id
|
|
label = l.class_name || id.slice(0, 8)
|
|
} else if (perspective === 'teacher') {
|
|
id = l.teacher_id
|
|
label = l.teacher_name || id.slice(0, 8)
|
|
} else if (perspective === 'room') {
|
|
id = l.room_id || 'kein-raum'
|
|
label = l.room_name || (l.room_id ? l.room_id.slice(0, 8) : '— kein Raum —')
|
|
}
|
|
if (!seen.has(id)) seen.set(id, { id, label })
|
|
}
|
|
return Array.from(seen.values()).sort((a, b) => a.label.localeCompare(b.label))
|
|
}, [lessons, perspective])
|
|
|
|
// Reset selected resource when perspective changes or list refreshes.
|
|
useEffect(() => {
|
|
if (resources.length > 0 && !resources.some(r => r.id === selectedResource)) {
|
|
setSelectedResource(resources[0].id)
|
|
}
|
|
}, [resources, selectedResource])
|
|
|
|
const visibleLessons = useMemo(() => {
|
|
if (!selectedResource) return []
|
|
return lessons.filter(l => {
|
|
if (perspective === 'class') return l.class_id === selectedResource
|
|
if (perspective === 'teacher') return l.teacher_id === selectedResource
|
|
return (l.room_id || 'kein-raum') === selectedResource
|
|
})
|
|
}, [lessons, perspective, selectedResource])
|
|
|
|
const subjectColor = useCallback((id: string): string => {
|
|
const s = subjects.find(x => x.id === id)
|
|
return s?.color || (isDark ? '#475569' : '#cbd5e1')
|
|
}, [subjects, isDark])
|
|
|
|
const periodIndices = useMemo(() => {
|
|
const set = new Set<number>()
|
|
for (const l of lessons) set.add(l.period_index)
|
|
return Array.from(set).sort((a, b) => a - b)
|
|
}, [lessons])
|
|
|
|
const cellLesson = (day: number, periodIdx: number): TimetableLesson | undefined =>
|
|
visibleLessons.find(l => l.day_of_week === day && l.period_index === periodIdx)
|
|
|
|
const togglePin = useCallback(async (lesson: TimetableLesson) => {
|
|
// Optimistic update so the lock icon flips immediately even if the
|
|
// server is slow.
|
|
setLessons(prev => prev.map(l => l.id === lesson.id ? { ...l, pinned: !l.pinned } : l))
|
|
try {
|
|
await lessonsApi.pin(lesson.id, !lesson.pinned)
|
|
} catch (e) {
|
|
// Revert on failure and surface the error.
|
|
setLessons(prev => prev.map(l => l.id === lesson.id ? { ...l, pinned: lesson.pinned } : l))
|
|
setError(e instanceof Error ? e.message : 'Pin fehlgeschlagen')
|
|
}
|
|
}, [])
|
|
|
|
const cardClass = isDark ? 'bg-white/10 border-white/20 text-white' : 'bg-white/80 border-black/10 text-slate-900'
|
|
const selectClass = isDark ? 'bg-white/10 border-white/20 text-white' : 'bg-white border-slate-300 text-slate-900'
|
|
|
|
return (
|
|
<div className="space-y-4" data-testid="plan-view">
|
|
<div className={`p-4 rounded-2xl border backdrop-blur-xl ${cardClass}`}>
|
|
<div className="flex flex-wrap items-center gap-3">
|
|
<div>
|
|
<label className="block text-xs mb-1 opacity-70">Perspektive</label>
|
|
<div className="flex gap-1">
|
|
{(['class', 'teacher', 'room'] as Perspective[]).map(p => (
|
|
<button
|
|
key={p}
|
|
onClick={() => setPerspective(p)}
|
|
data-testid={`perspective-${p}`}
|
|
className={`px-3 py-1.5 rounded-lg text-sm font-medium transition-colors ${
|
|
perspective === p
|
|
? isDark ? 'bg-indigo-500 text-white' : 'bg-indigo-600 text-white'
|
|
: isDark ? 'bg-white/10 text-white/70 hover:bg-white/20' : 'bg-slate-100 text-slate-700 hover:bg-slate-200'
|
|
}`}
|
|
>
|
|
{PERSPECTIVE_LABEL[p]}
|
|
</button>
|
|
))}
|
|
</div>
|
|
</div>
|
|
<div className="flex-1 min-w-[200px]">
|
|
<label className="block text-xs mb-1 opacity-70">{PERSPECTIVE_LABEL[perspective]}</label>
|
|
<select value={selectedResource} onChange={e => setSelectedResource(e.target.value)} className={`w-full px-3 py-1.5 rounded-lg border ${selectClass}`}>
|
|
{resources.length === 0 && <option value="">— keine Daten —</option>}
|
|
{resources.map(r => <option key={r.id} value={r.id}>{r.label}</option>)}
|
|
</select>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{error && <div className="p-3 rounded-xl bg-red-500/20 border border-red-500/40 text-red-300">{error}</div>}
|
|
|
|
{loading ? (
|
|
<div className={`text-center py-8 opacity-60 ${isDark ? 'text-white' : 'text-slate-700'}`}>Laedt…</div>
|
|
) : lessons.length === 0 ? (
|
|
<div className={`text-center py-8 opacity-60 ${isDark ? 'text-white' : 'text-slate-700'}`}>
|
|
Keine Lessons in diesem Plan.
|
|
</div>
|
|
) : (
|
|
<div className={`rounded-2xl border backdrop-blur-xl overflow-hidden ${cardClass}`}>
|
|
<table className="w-full">
|
|
<thead className={isDark ? 'bg-white/5' : 'bg-slate-100'}>
|
|
<tr>
|
|
<th className="text-left px-3 py-3 text-sm font-medium opacity-70 w-16">Stunde</th>
|
|
{DAYS.map(d => (
|
|
<th key={d.v} className="text-left px-3 py-3 text-sm font-medium opacity-70">{d.label}</th>
|
|
))}
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{periodIndices.map(idx => (
|
|
<tr key={idx} className={isDark ? 'border-t border-white/10' : 'border-t border-slate-200'}>
|
|
<td className="px-3 py-2 font-medium text-sm">{idx}.</td>
|
|
{DAYS.map(d => {
|
|
const lesson = cellLesson(d.v, idx)
|
|
if (!lesson) {
|
|
return <td key={d.v} className="px-3 py-2 opacity-20 text-xs">—</td>
|
|
}
|
|
const color = subjectColor(lesson.subject_id)
|
|
return (
|
|
<td key={d.v} className="px-2 py-1">
|
|
<div
|
|
className={`rounded-md p-2 text-xs space-y-0.5 relative ${lesson.pinned ? 'ring-2 ring-amber-400/70' : ''}`}
|
|
style={{ backgroundColor: color + (isDark ? '40' : '30'), borderLeft: `3px solid ${color}` }}
|
|
data-testid={`cell-${d.v}-${idx}`}
|
|
>
|
|
<button
|
|
onClick={() => togglePin(lesson)}
|
|
data-testid={`pin-${lesson.id}`}
|
|
title={lesson.pinned ? 'Lesson loesen' : 'Lesson anpinnen'}
|
|
className={`absolute top-1 right-1 text-xs leading-none px-1 py-0.5 rounded ${
|
|
lesson.pinned
|
|
? 'text-amber-300 hover:text-amber-200'
|
|
: 'opacity-30 hover:opacity-100'
|
|
}`}
|
|
>
|
|
{lesson.pinned ? '🔒' : '📌'}
|
|
</button>
|
|
<div className="font-semibold pr-5">{lesson.subject_name || '?'}</div>
|
|
{perspective !== 'class' && lesson.class_name && (
|
|
<div className="opacity-80">{lesson.class_name}</div>
|
|
)}
|
|
{perspective !== 'teacher' && lesson.teacher_name && (
|
|
<div className="opacity-70">{lesson.teacher_name.split(',')[0]}</div>
|
|
)}
|
|
{perspective !== 'room' && lesson.room_name && (
|
|
<div className="opacity-60">{lesson.room_name}</div>
|
|
)}
|
|
</div>
|
|
</td>
|
|
)
|
|
})}
|
|
</tr>
|
|
))}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
)}
|
|
</div>
|
|
)
|
|
}
|