-
- - Stundenplan -
-- Stammdaten und Regeln fuer den Solver -
-
-
-
-
- (`/timetable/solutions/${id}/lessons`),
}
+
+export const lessonsApi = {
+ pin: (id: string, pinned: boolean) =>
+ apiFetch<{ message: string; pinned: boolean }>(`/timetable/lessons/${id}/pin`, {
+ method: 'PUT',
+ body: JSON.stringify({ pinned }),
+ }),
+}
diff --git a/timetable-solver-service/app/domain.py b/timetable-solver-service/app/domain.py
index 605ec00..31ccd2b 100644
--- a/timetable-solver-service/app/domain.py
+++ b/timetable-solver-service/app/domain.py
@@ -15,6 +15,7 @@ from timefold.solver.domain import (
planning_entity,
planning_solution,
PlanningVariable,
+ PlanningPin,
PlanningId,
PlanningEntityCollectionProperty,
ProblemFactCollectionProperty,
@@ -88,6 +89,10 @@ class Lesson:
Curriculum says "5a needs 4 hours of Mathe per week" → 4 Lesson instances
with school_class=5a, subject=Mathe, teacher fixed (from tt_assignment).
The solver assigns timeslot + room.
+
+ pinned (Phase 7): when True, this Lesson's timeslot + room have been
+ pre-assigned and the solver must not move it. Used for plan versioning
+ so re-solves keep the parent solution's locked cells in place.
"""
id: Annotated[str, PlanningId]
@@ -96,6 +101,7 @@ class Lesson:
teacher: Teacher
timeslot: Annotated[Optional[Timeslot], PlanningVariable] = field(default=None)
room: Annotated[Optional[Room], PlanningVariable] = field(default=None)
+ pinned: Annotated[bool, PlanningPin] = field(default=False)
def __str__(self) -> str:
return f"{self.school_class}-{self.subject}#{self.id[:8]}"
diff --git a/timetable-solver-service/app/repository.py b/timetable-solver-service/app/repository.py
index d359236..ebb6416 100644
--- a/timetable-solver-service/app/repository.py
+++ b/timetable-solver-service/app/repository.py
@@ -17,7 +17,11 @@ from .rules import (
)
-async def build_problem(pool: asyncpg.Pool, user_id: str) -> Timetable:
+async def build_problem(
+ pool: asyncpg.Pool,
+ user_id: str,
+ parent_solution_id: str | None = None,
+) -> Timetable:
async with pool.acquire() as conn:
timeslots = await _load_timeslots(conn, user_id)
rooms = await _load_rooms(conn, user_id)
@@ -27,6 +31,11 @@ async def build_problem(pool: asyncpg.Pool, user_id: str) -> Timetable:
lessons = await _build_lessons(conn, user_id, classes, subjects, teachers)
rules = await _load_rules(conn, user_id)
+ if parent_solution_id:
+ await _inherit_pinned_from_parent(
+ conn, parent_solution_id, lessons, timeslots, rooms,
+ )
+
return Timetable(
timeslots=timeslots,
rooms=rooms,
@@ -39,6 +48,58 @@ async def build_problem(pool: asyncpg.Pool, user_id: str) -> Timetable:
)
+async def _inherit_pinned_from_parent(
+ conn: asyncpg.Connection,
+ parent_solution_id: str,
+ lessons: list[Lesson],
+ timeslots: list[Timeslot],
+ rooms: list[Room],
+) -> None:
+ """Apply pinned lessons from a parent solution onto the new problem.
+
+ Matching rule: parent pinned lesson maps to a new Lesson with the same
+ (class_id, subject_id) that hasn't already received a pinned assignment.
+ Greedy first-fit so the count matches the parent's pinned count up to
+ the curriculum's weekly_hours per (class, subject). If curriculum
+ changed between solves, surplus pinned rows are silently dropped.
+ """
+ rows = await conn.fetch("""
+ SELECT class_id::text, subject_id::text, room_id::text,
+ day_of_week, period_index
+ FROM tt_lesson
+ WHERE solution_id = $1 AND pinned = true
+ """, parent_solution_id)
+
+ if not rows:
+ return
+
+ ts_by_dp = {(t.day_of_week, t.period_index): t for t in timeslots}
+ room_by_id = {r.id: r for r in rooms}
+ used: set[str] = set()
+
+ for r in rows:
+ ts = ts_by_dp.get((r["day_of_week"], r["period_index"]))
+ if ts is None:
+ continue # period was deleted in the meantime
+ # Find a not-yet-pinned lesson with matching class+subject.
+ candidate: Lesson | None = None
+ for lesson in lessons:
+ if lesson.id in used:
+ continue
+ if (lesson.school_class.id == r["class_id"] and
+ lesson.subject.id == r["subject_id"]):
+ candidate = lesson
+ break
+ if candidate is None:
+ continue
+ candidate.timeslot = ts
+ room_id = r["room_id"]
+ if room_id:
+ candidate.room = room_by_id.get(room_id)
+ candidate.pinned = True
+ used.add(candidate.id)
+
+
async def _load_timeslots(conn: asyncpg.Connection, user_id: str) -> list[Timeslot]:
rows = await conn.fetch("""
SELECT id::text, day_of_week, period_index,
@@ -217,7 +278,7 @@ async def persist_solution(
INSERT INTO tt_lesson
(solution_id, class_id, subject_id, teacher_id, room_id,
day_of_week, period_index, pinned)
- VALUES ($1, $2::uuid, $3::uuid, $4::uuid, $5::uuid, $6, $7, false)
+ VALUES ($1, $2::uuid, $3::uuid, $4::uuid, $5::uuid, $6, $7, $8)
""",
solution_id,
lesson.school_class.id,
@@ -226,6 +287,7 @@ async def persist_solution(
lesson.room.id if lesson.room else None,
lesson.timeslot.day_of_week,
lesson.timeslot.period_index,
+ lesson.pinned,
)
diff --git a/timetable-solver-service/app/runner.py b/timetable-solver-service/app/runner.py
index cd26f3f..d550a1b 100644
--- a/timetable-solver-service/app/runner.py
+++ b/timetable-solver-service/app/runner.py
@@ -35,32 +35,48 @@ logger = logging.getLogger(__name__)
_executor = ThreadPoolExecutor(max_workers=2)
-_solver_factory = SolverFactory.create(
- SolverConfig(
- solution_class=Timetable,
- entity_class_list=[Lesson],
- score_director_factory_config=ScoreDirectorFactoryConfig(
- constraint_provider_function=define_constraints,
- ),
- termination_config=TerminationConfig(
- spent_limit=Duration(seconds=settings.solver_seconds_limit),
- ),
+def _build_factory(seconds: int) -> SolverFactory:
+ """One factory per solve so we can honour per-job timeout overrides.
+ Cheap to construct — the Java side caches what it can across builds."""
+ return SolverFactory.create(
+ SolverConfig(
+ solution_class=Timetable,
+ entity_class_list=[Lesson],
+ score_director_factory_config=ScoreDirectorFactoryConfig(
+ constraint_provider_function=define_constraints,
+ ),
+ termination_config=TerminationConfig(
+ spent_limit=Duration(seconds=seconds),
+ ),
+ )
)
-)
-def _solve_sync(problem: Timetable) -> Timetable:
+def _solve_sync(problem: Timetable, seconds: int) -> Timetable:
"""Blocking solver call; runs in a worker thread."""
- solver = _solver_factory.build_solver()
+ solver = _build_factory(seconds).build_solver()
return solver.solve(problem)
+async def _fetch_solve_options(pool, solution_id: str) -> tuple[str | None, int]:
+ """Read parent_solution_id + seconds_limit from tt_solution."""
+ async with pool.acquire() as conn:
+ row = await conn.fetchrow("""
+ SELECT parent_solution_id::text, seconds_limit
+ FROM tt_solution WHERE id = $1
+ """, solution_id)
+ parent = row["parent_solution_id"] if row else None
+ limit = row["seconds_limit"] if row and row["seconds_limit"] else settings.solver_seconds_limit
+ return parent, int(limit)
+
+
async def run_solve(solution_id: str, user_id: str) -> None:
"""Top-level async entry. Caller fires-and-forgets via BackgroundTasks."""
pool = await get_pool()
try:
+ parent_id, seconds = await _fetch_solve_options(pool, solution_id)
await mark_running(pool, solution_id)
- problem = await build_problem(pool, user_id)
+ problem = await build_problem(pool, user_id, parent_solution_id=parent_id)
if not problem.lessons:
await mark_failed(pool, solution_id,
@@ -76,7 +92,7 @@ async def run_solve(solution_id: str, user_id: str) -> None:
return
loop = asyncio.get_running_loop()
- solved: Timetable = await loop.run_in_executor(_executor, _solve_sync, problem)
+ solved: Timetable = await loop.run_in_executor(_executor, _solve_sync, problem, seconds)
score = solved.score
hard = score.hard_score() if score else 0
- Dev: JWT-Token setzen (Anmeldung noch nicht integriert) -
-
- setToken(e.target.value)}
- placeholder="Bearer-Token"
- className={`flex-1 px-3 py-1.5 rounded-lg text-sm ${
- isDark ? 'bg-white/10 border border-white/20 text-white' : 'bg-white border border-slate-300 text-slate-900'
- }`}
- />
-
+
+
- {tab === 'plan' &&
)
diff --git a/studio-v2/app/stundenplan/types.ts b/studio-v2/app/stundenplan/types.ts
index 0f59de8..558579b 100644
--- a/studio-v2/app/stundenplan/types.ts
+++ b/studio-v2/app/stundenplan/types.ts
@@ -240,6 +240,8 @@ export interface TimetableSolution {
started_at?: string | null
finished_at?: string | null
created_at: string
+ parent_solution_id?: string | null
+ seconds_limit?: number | null
}
export interface TimetableLesson {
@@ -261,4 +263,6 @@ export interface TimetableLesson {
export interface CreateTimetableSolution {
name?: string
+ parent_solution_id?: string | null
+ seconds_limit?: number | null
}
diff --git a/studio-v2/e2e/_helpers.ts b/studio-v2/e2e/_helpers.ts
index 5cc59ca..888530d 100644
--- a/studio-v2/e2e/_helpers.ts
+++ b/studio-v2/e2e/_helpers.ts
@@ -118,6 +118,16 @@ export async function mockSchoolApi(page: Page, opts: MockOpts = {}) {
await page.route(/\/api\/school\/timetable\/solutions\/[^/]+\/lessons$/, async (route) => {
return route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify(lessons) })
})
+
+ // Phase 7: lesson-level pin toggle.
+ await page.route(/\/api\/school\/timetable\/lessons\/[^/]+\/pin$/, async (route) => {
+ if (route.request().method() !== 'PUT') return route.fulfill({ status: 405 })
+ const body = JSON.parse(route.request().postData() || '{}')
+ return route.fulfill({
+ status: 200, contentType: 'application/json',
+ body: JSON.stringify({ message: 'ok', pinned: body.pinned ?? false }),
+ })
+ })
await page.route(/\/api\/school\/timetable\/solutions\/[^/]+$/, async (route) => {
if (route.request().method() === 'DELETE') {
return route.fulfill({ status: 200, contentType: 'application/json', body: '{"message":"deleted"}' })
diff --git a/studio-v2/e2e/stundenplan.spec.ts b/studio-v2/e2e/stundenplan.spec.ts
index a1cd2af..4279a59 100644
--- a/studio-v2/e2e/stundenplan.spec.ts
+++ b/studio-v2/e2e/stundenplan.spec.ts
@@ -18,7 +18,15 @@ test.describe('Stundenplan — Page Shell', () => {
test('page loads with title and subtitle', async ({ page }) => {
await expect(page.getByRole('heading', { name: 'Stundenplan' })).toBeVisible()
- await expect(page.getByText('Stammdaten und Regeln fuer den Solver')).toBeVisible()
+ await expect(page.getByText('Stammdaten, Regeln und Plan-Generierung fuer den Schul-Stundenplan')).toBeVisible()
+ })
+
+ test('help panel toggles open', async ({ page }) => {
+ const panel = page.getByTestId('help-panel')
+ await expect(panel).toBeVisible()
+ await expect(panel.getByText('1. Klassen, Lehrer, Faecher, Raeume anlegen')).toHaveCount(0)
+ await panel.getByRole('button', { name: /Bedienungsanleitung/ }).click()
+ await expect(panel.getByText('1. Klassen, Lehrer, Faecher, Raeume anlegen')).toBeVisible()
})
test('shows all 9 tabs', async ({ page }) => {
@@ -34,9 +42,8 @@ test.describe('Stundenplan — Page Shell', () => {
})
test('JWT dev field exists and persists into localStorage', async ({ page }) => {
- await page.getByText('Dev: JWT-Token setzen').click()
- page.on('dialog', d => d.accept())
- await page.getByPlaceholder('Bearer-Token').fill('test-jwt-abc')
+ await page.getByText('Anmeldung noch nicht integriert').click()
+ await page.getByPlaceholder(/Bearer-Token/).fill('test-jwt-abc')
await page.getByRole('button', { name: 'Speichern' }).click()
const stored = await page.evaluate(() => localStorage.getItem('bp_stundenplan_jwt'))
expect(stored).toBe('test-jwt-abc')
@@ -401,3 +408,73 @@ test.describe('Stundenplan — PlanView grid', () => {
await expect(page.locator('select').last()).toHaveValue('r1')
})
})
+
+// ==========================================================================
+// Phase 7 — Pinning + Plan-Versionen
+// ==========================================================================
+
+test.describe('Stundenplan — Solve options (parent + seconds limit)', () => {
+ test('parent-selector disabled when no completed solutions exist', async ({ page }) => {
+ await mockSchoolApi(page, { solutions: [] })
+ await page.goto('/stundenplan')
+ await page.waitForLoadState('networkidle')
+ await expect(page.getByTestId('parent-selector')).toBeDisabled()
+ })
+
+ test('parent-selector lists only completed solutions', async ({ page }) => {
+ await mockSchoolApi(page, {
+ solutions: [
+ { id: 's1', created_by_user_id: 'u', name: 'Plan A', status: 'completed', hard_score: 0, soft_score: 0, created_at: '2026-05-22T10:00:00Z' },
+ { id: 's2', created_by_user_id: 'u', name: 'Plan B', status: 'failed', created_at: '2026-05-22T11:00:00Z' },
+ { id: 's3', created_by_user_id: 'u', name: 'Plan C', status: 'completed', hard_score: 0, soft_score: -5, created_at: '2026-05-22T12:00:00Z' },
+ ],
+ })
+ await page.goto('/stundenplan')
+ await page.waitForLoadState('networkidle')
+ const sel = page.getByTestId('parent-selector')
+ await expect(sel).toBeEnabled()
+ // Only Plan A and Plan C are options (Plan B failed).
+ await expect(sel.locator('option', { hasText: 'Plan A' })).toHaveCount(1)
+ await expect(sel.locator('option', { hasText: 'Plan C' })).toHaveCount(1)
+ await expect(sel.locator('option', { hasText: 'Plan B' })).toHaveCount(0)
+ })
+
+ test('seconds-limit field accepts numeric input', async ({ page }) => {
+ await mockSchoolApi(page, { solutions: [] })
+ await page.goto('/stundenplan')
+ await page.waitForLoadState('networkidle')
+ const field = page.getByTestId('seconds-limit')
+ await field.fill('120')
+ await expect(field).toHaveValue('120')
+ })
+})
+
+test.describe('Stundenplan — Pin lesson', () => {
+ const baseOpts = () => ({
+ solutions: [
+ { id: 's1', created_by_user_id: 'u', name: 'Plan A', status: 'completed', hard_score: 0, soft_score: 0, created_at: '2026-05-22T10:00:00Z' },
+ ],
+ lessons: [
+ { id: 'l1', solution_id: 's1', class_id: 'c1', subject_id: 'sub1', teacher_id: 't1', room_id: 'r1', day_of_week: 1, period_index: 1, pinned: false, created_at: '', class_name: '5a', subject_name: 'Mathe', teacher_name: 'Schmidt, Anna', room_name: 'A101' },
+ ],
+ })
+
+ test('pin button is rendered on each lesson cell', async ({ page }) => {
+ await mockSchoolApi(page, baseOpts())
+ await page.goto('/stundenplan')
+ await page.waitForLoadState('networkidle')
+ await page.getByRole('button', { name: 'Anzeigen' }).click()
+ await expect(page.getByTestId('pin-l1')).toBeVisible()
+ })
+
+ test('clicking pin flips the icon via optimistic update', async ({ page }) => {
+ await mockSchoolApi(page, baseOpts())
+ await page.goto('/stundenplan')
+ await page.waitForLoadState('networkidle')
+ await page.getByRole('button', { name: 'Anzeigen' }).click()
+ const pinBtn = page.getByTestId('pin-l1')
+ await expect(pinBtn).toContainText('📌')
+ await pinBtn.click()
+ await expect(pinBtn).toContainText('🔒')
+ })
+})
diff --git a/studio-v2/lib/stundenplan/api.ts b/studio-v2/lib/stundenplan/api.ts
index 7c9caed..e2f6f69 100644
--- a/studio-v2/lib/stundenplan/api.ts
+++ b/studio-v2/lib/stundenplan/api.ts
@@ -152,3 +152,11 @@ export const solutionsApi = {
lessons: (id: string) =>
apiFetch
+
+
+
+
+ {tab === 'plan' &&
-
-
-
-
+
-
+ + Stundenplan +
++ Stammdaten, Regeln und Plan-Generierung fuer den Schul-Stundenplan +
+
+
+
+
+
+
+
+
+ + Anmeldung noch nicht integriert — Dev-Token setzen +
+
+
+
+ Bis die volle BreakPilot-Anmeldung an dieses Modul angebunden ist, muss
+ ein gueltiger JWT-Token manuell hinterlegt werden. Ohne Token antwortet
+ die API mit Authorization header required.
+
-
+
- An BreakPilot anmelden (z.B. ueber das Lehrer-Login) +
- Im Browser DevTools → Application/Storage → Cookies oder localStorage den + JWT-Token kopieren (Feldname kann je nach Login-Flow variieren) +
- Token unten einfuegen, Speichern, Seite neu laden +
+ setToken(e.target.value)}
+ placeholder="Bearer-Token (ohne 'Bearer '-Prefix)"
+ className={`flex-1 px-3 py-1.5 rounded-lg text-sm ${
+ isDark ? 'bg-white/10 border border-white/20 text-white' : 'bg-white border border-slate-300 text-slate-900'
+ }`}
+ />
+
+
+ {tokenSaved && (
+ + Token gespeichert. Seite neu laden, um die Aenderung zu uebernehmen. +
+ )} +