chore: update versioning and enhance Training Framework features
- Incremented APP_VERSION to 0.8.9 and DB_SCHEMA_VERSION to 20260505036. - Added changelog entry for version 0.8.9 detailing database and API changes. - Updated TrainingFrameworkProgramEditPage to manage focus areas, style directions, training types, and target groups. - Enhanced TrainingFrameworkProgramsListPage with context teasers for better user information. - Improved CSS styles for framework catalog checkgrid and check components for better layout and usability.
This commit is contained in:
1 parent
8f32a6df29
commit
b4495e39c1
7 files changed
+416
-249
No files matched your search
@@ -1,8 +1,11 @@
|
||||
"""
|
||||
Trainingsrahmenprogramm — Rahmen‑Vorlage über mehrere Session‑Slots (CURR‑002 Stufe 2).
|
||||
AuthZ wie Planungs‑Vorlagen: Admin sieht alle, sonst nur eigene Artefakte; Schreibzugriff mit Planungsrolle.
|
||||
Trainingsrahmenprogramm — wiederverwendbare Vorlage (Bibliothek) über mehrere Session-Slots.
|
||||
|
||||
Zuordnung zu Trainingsgruppen / konkreten Einheiten erfolgt aus der Planung (Kopie + Lineage),
|
||||
nicht über group_id oder training_unit_id am Rahmen.
|
||||
AuthZ wie Planungs-Vorlagen: Admin sieht alle, sonst nur eigene Artefakte; Schreibzugriff mit Planungsrolle.
|
||||
"""
|
||||
from typing import Any, Dict, List, Optional
|
||||
from typing import Any, Dict, List, Optional, Sequence
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException
|
||||
|
||||
@@ -10,17 +13,12 @@ from auth import require_auth
|
||||
from db import get_db, get_cursor, r2d
|
||||
|
||||
from routers.training_planning import (
|
||||
_assert_training_unit_permission,
|
||||
_can_access_group_for_create,
|
||||
_has_planning_role,
|
||||
_optional_positive_int,
|
||||
_training_unit_guard_row,
|
||||
_validate_variant_for_exercise,
|
||||
)
|
||||
|
||||
router = APIRouter(prefix="/api", tags=["training_framework_programs"])
|
||||
|
||||
_VALID_PLAN_MODE = frozenset({"concrete", "library"})
|
||||
_VALID_VISIBILITY = frozenset({"private", "club", "official"})
|
||||
|
||||
|
||||
@@ -54,6 +52,32 @@ def _fetch_slot_exercises(cur, slot_id: int) -> List[Dict[str, Any]]:
|
||||
return [r2d(x) for x in cur.fetchall()]
|
||||
|
||||
|
||||
def _training_type_ids(cur, framework_id: int) -> List[int]:
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT training_type_id
|
||||
FROM training_framework_program_training_types
|
||||
WHERE framework_program_id = %s
|
||||
ORDER BY training_type_id
|
||||
""",
|
||||
(framework_id,),
|
||||
)
|
||||
return [r["training_type_id"] for r in cur.fetchall()]
|
||||
|
||||
|
||||
def _target_group_ids(cur, framework_id: int) -> List[int]:
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT target_group_id
|
||||
FROM training_framework_program_target_groups
|
||||
WHERE framework_program_id = %s
|
||||
ORDER BY target_group_id
|
||||
""",
|
||||
(framework_id,),
|
||||
)
|
||||
return [r["target_group_id"] for r in cur.fetchall()]
|
||||
|
||||
|
||||
def _hydrate_framework(cur, row: Dict[str, Any]) -> Dict[str, Any]:
|
||||
fid = row["id"]
|
||||
cur.execute(
|
||||
@@ -68,7 +92,7 @@ def _hydrate_framework(cur, row: Dict[str, Any]) -> Dict[str, Any]:
|
||||
row["goals"] = [r2d(g) for g in cur.fetchall()]
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT id, framework_program_id, sort_order, title, notes, training_unit_id
|
||||
SELECT id, framework_program_id, sort_order, title, notes
|
||||
FROM training_framework_slots
|
||||
WHERE framework_program_id = %s
|
||||
ORDER BY sort_order
|
||||
@@ -79,6 +103,8 @@ def _hydrate_framework(cur, row: Dict[str, Any]) -> Dict[str, Any]:
|
||||
for s in slots:
|
||||
s["exercises"] = _fetch_slot_exercises(cur, s["id"])
|
||||
row["slots"] = slots
|
||||
row["training_type_ids"] = _training_type_ids(cur, fid)
|
||||
row["target_group_ids"] = _target_group_ids(cur, fid)
|
||||
return row
|
||||
|
||||
|
||||
@@ -93,36 +119,55 @@ def _assert_visibility(val: Optional[str]) -> Optional[str]:
|
||||
return val
|
||||
|
||||
|
||||
def _assert_framework_invariants(plan_mode: str, group_id: Optional[int]) -> None:
|
||||
if plan_mode == "library" and group_id is not None:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
detail="plan_mode library erlaubt kein group_id",
|
||||
def _parse_positive_int_ids(raw: Any, label: str) -> List[int]:
|
||||
if raw is None:
|
||||
return []
|
||||
if not isinstance(raw, list):
|
||||
raise HTTPException(status_code=400, detail=f"{label} muss eine Liste von IDs sein")
|
||||
out: List[int] = []
|
||||
for item in raw:
|
||||
if item in (None, ""):
|
||||
continue
|
||||
try:
|
||||
n = int(item)
|
||||
except (TypeError, ValueError):
|
||||
raise HTTPException(status_code=400, detail=f"{label}: ungültige ID") from None
|
||||
if n <= 0:
|
||||
raise HTTPException(status_code=400, detail=f"{label}: ungültige ID")
|
||||
if n not in out:
|
||||
out.append(n)
|
||||
return out
|
||||
|
||||
|
||||
def _replace_training_types(cur, framework_id: int, ids: Sequence[int]) -> None:
|
||||
cur.execute(
|
||||
"DELETE FROM training_framework_program_training_types WHERE framework_program_id = %s",
|
||||
(framework_id,),
|
||||
)
|
||||
for tid in ids:
|
||||
cur.execute(
|
||||
"""
|
||||
INSERT INTO training_framework_program_training_types (framework_program_id, training_type_id)
|
||||
VALUES (%s, %s)
|
||||
ON CONFLICT DO NOTHING
|
||||
""",
|
||||
(framework_id, tid),
|
||||
)
|
||||
|
||||
|
||||
def _assert_slot_unit_constraints(
|
||||
cur,
|
||||
plan_mode: str,
|
||||
framework_group_id: Optional[int],
|
||||
training_unit_id: Optional[int],
|
||||
profile_id: int,
|
||||
role: str,
|
||||
) -> None:
|
||||
if plan_mode == "library" and training_unit_id:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
detail="Im Bibliotheksmodus (library) keine Verknüpfung von Slots zu Trainingseinheiten",
|
||||
)
|
||||
if not training_unit_id:
|
||||
return
|
||||
uid = training_unit_id
|
||||
unit_row = _training_unit_guard_row(cur, uid)
|
||||
_assert_training_unit_permission(cur, unit_row, profile_id, role)
|
||||
if framework_group_id is not None and unit_row["group_id"] != framework_group_id:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
detail="training_unit_id muss zur group_id dieses Rahmens gehören",
|
||||
def _replace_target_groups(cur, framework_id: int, ids: Sequence[int]) -> None:
|
||||
cur.execute(
|
||||
"DELETE FROM training_framework_program_target_groups WHERE framework_program_id = %s",
|
||||
(framework_id,),
|
||||
)
|
||||
for gid in ids:
|
||||
cur.execute(
|
||||
"""
|
||||
INSERT INTO training_framework_program_target_groups (framework_program_id, target_group_id)
|
||||
VALUES (%s, %s)
|
||||
ON CONFLICT DO NOTHING
|
||||
""",
|
||||
(framework_id, gid),
|
||||
)
|
||||
|
||||
|
||||
@@ -149,11 +194,7 @@ def _insert_goal_rows(cur, framework_id: int, goals_in: List[Any]) -> None:
|
||||
def _insert_slots_and_exercises(
|
||||
cur,
|
||||
framework_id: int,
|
||||
plan_mode: str,
|
||||
framework_group_id: Optional[int],
|
||||
slots_in: Optional[List[Any]],
|
||||
profile_id: int,
|
||||
role: str,
|
||||
) -> None:
|
||||
if slots_in is None:
|
||||
return
|
||||
@@ -164,14 +205,12 @@ def _insert_slots_and_exercises(
|
||||
title_s = slot.get("title")
|
||||
if title_s is not None:
|
||||
title_s = title_s.strip() or None
|
||||
unit_sid = _optional_positive_int(slot.get("training_unit_id"), "training_unit_id")
|
||||
_assert_slot_unit_constraints(cur, plan_mode, framework_group_id, unit_sid, profile_id, role)
|
||||
|
||||
cur.execute(
|
||||
"""
|
||||
INSERT INTO training_framework_slots (
|
||||
framework_program_id, sort_order, title, notes, training_unit_id
|
||||
) VALUES (%s, %s, %s, %s, %s)
|
||||
) VALUES (%s, %s, %s, %s, NULL)
|
||||
RETURNING id
|
||||
""",
|
||||
(
|
||||
@@ -179,7 +218,6 @@ def _insert_slots_and_exercises(
|
||||
int(order_ix),
|
||||
title_s,
|
||||
slot.get("notes"),
|
||||
unit_sid,
|
||||
),
|
||||
)
|
||||
sid = cur.fetchone()["id"]
|
||||
@@ -212,11 +250,19 @@ def list_training_framework_programs(session=Depends(require_auth)):
|
||||
cur = get_cursor(conn)
|
||||
base_sel = """
|
||||
SELECT fp.*,
|
||||
fa.name AS focus_area_name,
|
||||
sd.name AS style_direction_name,
|
||||
(SELECT COUNT(*)::int FROM training_framework_goals g WHERE g.framework_program_id = fp.id)
|
||||
AS goals_count,
|
||||
(SELECT COUNT(*)::int FROM training_framework_slots s WHERE s.framework_program_id = fp.id)
|
||||
AS slots_count
|
||||
AS slots_count,
|
||||
(SELECT COUNT(*)::int FROM training_framework_program_training_types t
|
||||
WHERE t.framework_program_id = fp.id) AS training_types_count,
|
||||
(SELECT COUNT(*)::int FROM training_framework_program_target_groups tg
|
||||
WHERE tg.framework_program_id = fp.id) AS target_groups_count
|
||||
FROM training_framework_programs fp
|
||||
LEFT JOIN focus_areas fa ON fa.id = fp.focus_area_id
|
||||
LEFT JOIN style_directions sd ON sd.id = fp.style_direction_id
|
||||
"""
|
||||
if role in ("admin", "superadmin"):
|
||||
cur.execute(base_sel + " ORDER BY fp.updated_at DESC NULLS LAST, fp.title")
|
||||
@@ -249,53 +295,48 @@ def create_training_framework_program(data: dict, session=Depends(require_auth))
|
||||
if not title:
|
||||
raise HTTPException(status_code=400, detail="title ist Pflicht")
|
||||
|
||||
plan_mode = (data.get("plan_mode") or "").strip().lower()
|
||||
if plan_mode not in _VALID_PLAN_MODE:
|
||||
raise HTTPException(status_code=400, detail="plan_mode muss concrete oder library sein")
|
||||
|
||||
gid = None
|
||||
if data.get("group_id") not in (None, ""):
|
||||
gid = _optional_positive_int(data.get("group_id"), "group_id")
|
||||
_assert_framework_invariants(plan_mode, gid)
|
||||
|
||||
vis = data.get("visibility") or "private"
|
||||
vis = _assert_visibility(vis)
|
||||
club_id = data.get("club_id")
|
||||
|
||||
goals_in = data.get("goals")
|
||||
slots_in = data.get("slots")
|
||||
if not isinstance(goals_in, list) or not goals_in:
|
||||
raise HTTPException(status_code=400, detail="goals als Liste mit mindestens einem Eintrag ist Pflicht")
|
||||
|
||||
fa_id = _optional_positive_int(data.get("focus_area_id"), "focus_area_id")
|
||||
sd_id = _optional_positive_int(data.get("style_direction_id"), "style_direction_id")
|
||||
tt_ids = _parse_positive_int_ids(data.get("training_type_ids"), "training_type_ids")
|
||||
tg_ids = _parse_positive_int_ids(data.get("target_group_ids"), "target_group_ids")
|
||||
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
if gid is not None:
|
||||
_can_access_group_for_create(cur, gid, profile_id, role)
|
||||
|
||||
cur.execute(
|
||||
"""
|
||||
INSERT INTO training_framework_programs (
|
||||
title, description, plan_mode, group_id,
|
||||
title, description,
|
||||
planned_period_start, planned_period_end,
|
||||
visibility, club_id, created_by
|
||||
visibility, club_id, created_by,
|
||||
focus_area_id, style_direction_id
|
||||
) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)
|
||||
RETURNING id
|
||||
""",
|
||||
(
|
||||
title[:200],
|
||||
data.get("description"),
|
||||
plan_mode,
|
||||
gid,
|
||||
data.get("planned_period_start"),
|
||||
data.get("planned_period_end"),
|
||||
vis,
|
||||
club_id,
|
||||
profile_id,
|
||||
fa_id,
|
||||
sd_id,
|
||||
),
|
||||
)
|
||||
fid = cur.fetchone()["id"]
|
||||
_insert_goal_rows(cur, fid, goals_in)
|
||||
_insert_slots_and_exercises(cur, fid, plan_mode, gid, slots_in, profile_id, role)
|
||||
_insert_slots_and_exercises(cur, fid, slots_in)
|
||||
_replace_training_types(cur, fid, tt_ids)
|
||||
_replace_target_groups(cur, fid, tg_ids)
|
||||
conn.commit()
|
||||
|
||||
return get_training_framework_program(fid, session)
|
||||
@@ -310,46 +351,28 @@ def update_training_framework_program(framework_id: int, data: dict, session=Dep
|
||||
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
existing = _framework_access(cur, framework_id, profile_id, role)
|
||||
|
||||
plan_mode_new = existing["plan_mode"]
|
||||
if "plan_mode" in data:
|
||||
pm = (data.get("plan_mode") or "").strip().lower()
|
||||
if pm not in _VALID_PLAN_MODE:
|
||||
raise HTTPException(status_code=400, detail="plan_mode muss concrete oder library sein")
|
||||
plan_mode_new = pm
|
||||
|
||||
group_id_eff = existing.get("group_id")
|
||||
if "group_id" in data:
|
||||
if data.get("group_id") in (None, ""):
|
||||
group_id_eff = None
|
||||
else:
|
||||
group_id_eff = _optional_positive_int(data.get("group_id"), "group_id")
|
||||
_assert_framework_invariants(plan_mode_new, group_id_eff)
|
||||
_framework_access(cur, framework_id, profile_id, role)
|
||||
|
||||
header_fields = []
|
||||
header_params: List[Any] = []
|
||||
|
||||
if "title" in data:
|
||||
tit = (data.get("title") or "").strip()
|
||||
if not tit:
|
||||
raise HTTPException(status_code=400, detail="title ist Pflicht")
|
||||
header_fields.append("title = %s")
|
||||
header_params.append(tit[:200])
|
||||
|
||||
if "description" in data:
|
||||
header_fields.append("description = %s")
|
||||
header_params.append(data.get("description"))
|
||||
if "plan_mode" in data:
|
||||
header_fields.append("plan_mode = %s")
|
||||
header_params.append(plan_mode_new)
|
||||
if "group_id" in data:
|
||||
header_fields.append("group_id = %s")
|
||||
header_params.append(group_id_eff)
|
||||
if "planned_period_start" in data:
|
||||
header_fields.append("planned_period_start = %s")
|
||||
header_params.append(data.get("planned_period_start"))
|
||||
if "planned_period_end" in data:
|
||||
header_fields.append("planned_period_end = %s")
|
||||
header_params.append(data.get("planned_period_end"))
|
||||
|
||||
if "visibility" in data:
|
||||
v = _assert_visibility(data.get("visibility"))
|
||||
if v is None:
|
||||
@@ -360,11 +383,18 @@ def update_training_framework_program(framework_id: int, data: dict, session=Dep
|
||||
header_fields.append("club_id = %s")
|
||||
header_params.append(data.get("club_id"))
|
||||
|
||||
if group_id_eff is not None and (
|
||||
("group_id" in data)
|
||||
or (plan_mode_new == "concrete" and plan_mode_new != existing.get("plan_mode"))
|
||||
):
|
||||
_can_access_group_for_create(cur, group_id_eff, profile_id, role)
|
||||
if "focus_area_id" in data:
|
||||
fidv = data.get("focus_area_id")
|
||||
header_fields.append("focus_area_id = %s")
|
||||
header_params.append(
|
||||
None if fidv in (None, "") else _optional_positive_int(fidv, "focus_area_id")
|
||||
)
|
||||
if "style_direction_id" in data:
|
||||
sidv = data.get("style_direction_id")
|
||||
header_fields.append("style_direction_id = %s")
|
||||
header_params.append(
|
||||
None if sidv in (None, "") else _optional_positive_int(sidv, "style_direction_id")
|
||||
)
|
||||
|
||||
if header_fields:
|
||||
header_fields.append("updated_at = NOW()")
|
||||
@@ -378,6 +408,14 @@ def update_training_framework_program(framework_id: int, data: dict, session=Dep
|
||||
tuple(header_params),
|
||||
)
|
||||
|
||||
if "training_type_ids" in data:
|
||||
tt_ids = _parse_positive_int_ids(data.get("training_type_ids"), "training_type_ids")
|
||||
_replace_training_types(cur, framework_id, tt_ids)
|
||||
|
||||
if "target_group_ids" in data:
|
||||
tg_ids = _parse_positive_int_ids(data.get("target_group_ids"), "target_group_ids")
|
||||
_replace_target_groups(cur, framework_id, tg_ids)
|
||||
|
||||
if "goals" in data:
|
||||
goals_in = data["goals"]
|
||||
if not isinstance(goals_in, list) or not goals_in:
|
||||
@@ -393,26 +431,9 @@ def update_training_framework_program(framework_id: int, data: dict, session=Dep
|
||||
"DELETE FROM training_framework_slots WHERE framework_program_id = %s",
|
||||
(framework_id,),
|
||||
)
|
||||
_insert_slots_and_exercises(
|
||||
cur,
|
||||
framework_id,
|
||||
plan_mode_new,
|
||||
group_id_eff,
|
||||
data.get("slots") or [],
|
||||
profile_id,
|
||||
role,
|
||||
)
|
||||
_insert_slots_and_exercises(cur, framework_id, data.get("slots") or [])
|
||||
|
||||
if plan_mode_new == "library":
|
||||
cur.execute(
|
||||
"""
|
||||
UPDATE training_framework_slots SET training_unit_id = NULL
|
||||
WHERE framework_program_id = %s AND training_unit_id IS NOT NULL
|
||||
""",
|
||||
(framework_id,),
|
||||
)
|
||||
|
||||
if "goals" in data or "slots" in data or header_fields:
|
||||
if header_fields or "goals" in data or "slots" in data or "training_type_ids" in data or "target_group_ids" in data:
|
||||
cur.execute(
|
||||
"UPDATE training_framework_programs SET updated_at = NOW() WHERE id = %s",
|
||||
(framework_id,),
|
||||
|
||||
Reference in new issue
Block a user