Update version information and add training duration features
Deploy Development / deploy (push) Successful in 42s
Test Suite / pytest-backend (push) Successful in 38s
Test Suite / lint-backend (push) Successful in 0s
Test Suite / build-frontend (push) Successful in 13s
Test Suite / k6 /health Baseline (push) Successful in 33s
Test Suite / playwright-tests (push) Successful in 1m22s
Deploy Development / deploy (push) Successful in 42s
Test Suite / pytest-backend (push) Successful in 38s
Test Suite / lint-backend (push) Successful in 0s
Test Suite / build-frontend (push) Successful in 13s
Test Suite / k6 /health Baseline (push) Successful in 33s
Test Suite / playwright-tests (push) Successful in 1m22s
- Bumped application version to 0.8.150 and updated build date and database schema version. - Introduced new SQL migration for planned duration fields in training units and sections. - Added functions to handle focus areas and style directions in training framework programs. - Enhanced training planning components to support planned duration input and display. - Updated frontend components to manage and display planned duration for training units and sections.
This commit is contained in:
1 parent
ab612a5335
commit
5a8a212f40
12 files changed
+629
-149
No files matched your search
@@ -99,6 +99,32 @@ def _target_group_ids(cur, framework_id: int) -> List[int]:
|
||||
return [r["target_group_id"] for r in cur.fetchall()]
|
||||
|
||||
|
||||
def _focus_area_ids(cur, framework_id: int) -> List[int]:
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT focus_area_id
|
||||
FROM training_framework_program_focus_areas
|
||||
WHERE framework_program_id = %s
|
||||
ORDER BY focus_area_id
|
||||
""",
|
||||
(framework_id,),
|
||||
)
|
||||
return [r["focus_area_id"] for r in cur.fetchall()]
|
||||
|
||||
|
||||
def _style_direction_ids(cur, framework_id: int) -> List[int]:
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT style_direction_id
|
||||
FROM training_framework_program_style_directions
|
||||
WHERE framework_program_id = %s
|
||||
ORDER BY style_direction_id
|
||||
""",
|
||||
(framework_id,),
|
||||
)
|
||||
return [r["style_direction_id"] for r in cur.fetchall()]
|
||||
|
||||
|
||||
def _hydrate_framework(cur, row: Dict[str, Any]) -> Dict[str, Any]:
|
||||
fid = row["id"]
|
||||
cur.execute(
|
||||
@@ -136,6 +162,14 @@ def _hydrate_framework(cur, row: Dict[str, Any]) -> Dict[str, Any]:
|
||||
uid = row_b["id"]
|
||||
s["blueprint_training_unit_id"] = uid
|
||||
unit_min: Dict[str, Any] = {"id": uid}
|
||||
cur.execute(
|
||||
"SELECT planned_duration_min FROM training_units WHERE id = %s",
|
||||
(uid,),
|
||||
)
|
||||
urow = cur.fetchone()
|
||||
s["planned_duration_min"] = (
|
||||
urow["planned_duration_min"] if urow else None
|
||||
)
|
||||
_hydrate_training_unit_payload(cur, unit_min)
|
||||
s["phases"] = unit_min.get("phases", [])
|
||||
s["sections"] = unit_min.get("sections", [])
|
||||
@@ -143,6 +177,8 @@ def _hydrate_framework(cur, row: Dict[str, Any]) -> Dict[str, Any]:
|
||||
row["slots"] = slots
|
||||
row["training_type_ids"] = _training_type_ids(cur, fid)
|
||||
row["target_group_ids"] = _target_group_ids(cur, fid)
|
||||
row["focus_area_ids"] = _focus_area_ids(cur, fid)
|
||||
row["style_direction_ids"] = _style_direction_ids(cur, fid)
|
||||
return row
|
||||
|
||||
|
||||
@@ -209,6 +245,53 @@ def _replace_target_groups(cur, framework_id: int, ids: Sequence[int]) -> None:
|
||||
)
|
||||
|
||||
|
||||
def _replace_focus_areas(cur, framework_id: int, ids: Sequence[int]) -> None:
|
||||
cur.execute(
|
||||
"DELETE FROM training_framework_program_focus_areas WHERE framework_program_id = %s",
|
||||
(framework_id,),
|
||||
)
|
||||
for fid in ids:
|
||||
cur.execute(
|
||||
"""
|
||||
INSERT INTO training_framework_program_focus_areas (framework_program_id, focus_area_id)
|
||||
VALUES (%s, %s)
|
||||
ON CONFLICT DO NOTHING
|
||||
""",
|
||||
(framework_id, fid),
|
||||
)
|
||||
|
||||
|
||||
def _replace_style_directions(cur, framework_id: int, ids: Sequence[int]) -> None:
|
||||
cur.execute(
|
||||
"DELETE FROM training_framework_program_style_directions WHERE framework_program_id = %s",
|
||||
(framework_id,),
|
||||
)
|
||||
for sid in ids:
|
||||
cur.execute(
|
||||
"""
|
||||
INSERT INTO training_framework_program_style_directions (framework_program_id, style_direction_id)
|
||||
VALUES (%s, %s)
|
||||
ON CONFLICT DO NOTHING
|
||||
""",
|
||||
(framework_id, sid),
|
||||
)
|
||||
|
||||
|
||||
def _parse_context_ids_from_payload(data: dict) -> tuple:
|
||||
"""focus_area_ids / style_direction_ids (M:N); Legacy focus_area_id / style_direction_id."""
|
||||
fa_ids = _parse_positive_int_ids(data.get("focus_area_ids"), "focus_area_ids")
|
||||
if not fa_ids and data.get("focus_area_id") not in (None, ""):
|
||||
one = _optional_positive_int(data.get("focus_area_id"), "focus_area_id")
|
||||
if one is not None:
|
||||
fa_ids = [one]
|
||||
sd_ids = _parse_positive_int_ids(data.get("style_direction_ids"), "style_direction_ids")
|
||||
if not sd_ids and data.get("style_direction_id") not in (None, ""):
|
||||
one = _optional_positive_int(data.get("style_direction_id"), "style_direction_id")
|
||||
if one is not None:
|
||||
sd_ids = [one]
|
||||
return fa_ids, sd_ids
|
||||
|
||||
|
||||
def _insert_goal_rows(cur, framework_id: int, goals_in: List[Any]) -> None:
|
||||
if not goals_in:
|
||||
raise HTTPException(status_code=400, detail="Mindestens ein Entwicklungsziel (goals) ist erforderlich")
|
||||
@@ -277,22 +360,25 @@ def _insert_slots_and_blueprints(
|
||||
)
|
||||
sid = cur.fetchone()["id"]
|
||||
|
||||
slot_pdur = _optional_positive_int(
|
||||
slot.get("planned_duration_min"), "planned_duration_min"
|
||||
)
|
||||
cur.execute(
|
||||
"""
|
||||
INSERT INTO training_units (
|
||||
group_id, planned_date,
|
||||
planned_time_start, planned_time_end, planned_focus,
|
||||
planned_time_start, planned_time_end, planned_duration_min, planned_focus,
|
||||
status, notes, trainer_notes,
|
||||
created_by, plan_template_id, framework_slot_id
|
||||
) VALUES (
|
||||
NULL, NULL,
|
||||
NULL, NULL, NULL,
|
||||
NULL, NULL, %s, NULL,
|
||||
'planned', NULL, NULL,
|
||||
%s, NULL, %s
|
||||
)
|
||||
RETURNING id
|
||||
""",
|
||||
(profile_id, sid),
|
||||
(slot_pdur, profile_id, sid),
|
||||
)
|
||||
bid = cur.fetchone()["id"]
|
||||
|
||||
@@ -327,8 +413,6 @@ def list_training_framework_programs(tenant: TenantContext = Depends(get_tenant_
|
||||
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)
|
||||
@@ -337,6 +421,18 @@ def list_training_framework_programs(tenant: TenantContext = Depends(get_tenant_
|
||||
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,
|
||||
(
|
||||
SELECT STRING_AGG(fa.name::text, ', ' ORDER BY fa.name)
|
||||
FROM training_framework_program_focus_areas j
|
||||
JOIN focus_areas fa ON fa.id = j.focus_area_id
|
||||
WHERE j.framework_program_id = fp.id
|
||||
) AS focus_area_names_agg,
|
||||
(
|
||||
SELECT STRING_AGG(sd.name::text, ', ' ORDER BY sd.name)
|
||||
FROM training_framework_program_style_directions j
|
||||
JOIN style_directions sd ON sd.id = j.style_direction_id
|
||||
WHERE j.framework_program_id = fp.id
|
||||
) AS style_direction_names_agg,
|
||||
(
|
||||
SELECT STRING_AGG(typ.name::text, ', ' ORDER BY typ.sort_order NULLS LAST, typ.name)
|
||||
FROM training_framework_program_training_types j
|
||||
@@ -350,8 +446,6 @@ def list_training_framework_programs(tenant: TenantContext = Depends(get_tenant_
|
||||
WHERE j.framework_program_id = fp.id
|
||||
) AS target_group_names_agg
|
||||
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
|
||||
"""
|
||||
vis_clause, vis_params = library_content_visibility_sql(
|
||||
alias="fp",
|
||||
@@ -403,10 +497,11 @@ def create_training_framework_program(
|
||||
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")
|
||||
fa_ids, sd_ids = _parse_context_ids_from_payload(data)
|
||||
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")
|
||||
fa_legacy = fa_ids[0] if len(fa_ids) == 1 else None
|
||||
sd_legacy = sd_ids[0] if len(sd_ids) == 1 else None
|
||||
|
||||
with get_db() as conn:
|
||||
cur = get_cursor(conn)
|
||||
@@ -418,19 +513,17 @@ def create_training_framework_program(
|
||||
planned_period_start, planned_period_end,
|
||||
visibility, club_id, created_by,
|
||||
focus_area_id, style_direction_id
|
||||
) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)
|
||||
) VALUES (%s, %s, NULL, NULL, %s, %s, %s, %s, %s)
|
||||
RETURNING id
|
||||
""",
|
||||
(
|
||||
title[:200],
|
||||
data.get("description"),
|
||||
data.get("planned_period_start"),
|
||||
data.get("planned_period_end"),
|
||||
vis,
|
||||
club_id,
|
||||
profile_id,
|
||||
fa_id,
|
||||
sd_id,
|
||||
fa_legacy,
|
||||
sd_legacy,
|
||||
),
|
||||
)
|
||||
fid = cur.fetchone()["id"]
|
||||
@@ -438,6 +531,8 @@ def create_training_framework_program(
|
||||
_insert_slots_and_blueprints(cur, fid, slots_in, profile_id, role)
|
||||
_replace_training_types(cur, fid, tt_ids)
|
||||
_replace_target_groups(cur, fid, tg_ids)
|
||||
_replace_focus_areas(cur, fid, fa_ids)
|
||||
_replace_style_directions(cur, fid, sd_ids)
|
||||
conn.commit()
|
||||
|
||||
return _response_framework_detail(fid, profile_id, role)
|
||||
@@ -489,13 +584,6 @@ def update_training_framework_program(
|
||||
if "description" in data:
|
||||
header_fields.append("description = %s")
|
||||
header_params.append(data.get("description"))
|
||||
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:
|
||||
header_fields.append("visibility = %s")
|
||||
header_params.append(merged_vis)
|
||||
@@ -503,18 +591,26 @@ def update_training_framework_program(
|
||||
header_fields.append("club_id = %s")
|
||||
header_params.append(merged_club)
|
||||
|
||||
if "focus_area_id" in data:
|
||||
fidv = data.get("focus_area_id")
|
||||
if "focus_area_ids" in data or "focus_area_id" in data:
|
||||
fa_ids = _parse_positive_int_ids(data.get("focus_area_ids"), "focus_area_ids")
|
||||
if not fa_ids and data.get("focus_area_id") not in (None, ""):
|
||||
one = _optional_positive_int(data.get("focus_area_id"), "focus_area_id")
|
||||
if one is not None:
|
||||
fa_ids = [one]
|
||||
header_fields.append("focus_area_id = %s")
|
||||
header_params.append(
|
||||
None if fidv in (None, "") else _optional_positive_int(fidv, "focus_area_id")
|
||||
header_params.append(fa_ids[0] if len(fa_ids) == 1 else None)
|
||||
_replace_focus_areas(cur, framework_id, fa_ids)
|
||||
if "style_direction_ids" in data or "style_direction_id" in data:
|
||||
sd_ids = _parse_positive_int_ids(
|
||||
data.get("style_direction_ids"), "style_direction_ids"
|
||||
)
|
||||
if "style_direction_id" in data:
|
||||
sidv = data.get("style_direction_id")
|
||||
if not sd_ids and data.get("style_direction_id") not in (None, ""):
|
||||
one = _optional_positive_int(data.get("style_direction_id"), "style_direction_id")
|
||||
if one is not None:
|
||||
sd_ids = [one]
|
||||
header_fields.append("style_direction_id = %s")
|
||||
header_params.append(
|
||||
None if sidv in (None, "") else _optional_positive_int(sidv, "style_direction_id")
|
||||
)
|
||||
header_params.append(sd_ids[0] if len(sd_ids) == 1 else None)
|
||||
_replace_style_directions(cur, framework_id, sd_ids)
|
||||
|
||||
if header_fields:
|
||||
header_fields.append("updated_at = NOW()")
|
||||
@@ -555,7 +651,17 @@ def update_training_framework_program(
|
||||
cur, framework_id, data.get("slots") or [], profile_id, role
|
||||
)
|
||||
|
||||
if header_fields or "goals" in data or "slots" in data or "training_type_ids" in data or "target_group_ids" in data:
|
||||
if (
|
||||
header_fields
|
||||
or "goals" in data
|
||||
or "slots" in data
|
||||
or "training_type_ids" in data
|
||||
or "target_group_ids" in data
|
||||
or "focus_area_ids" in data
|
||||
or "focus_area_id" in data
|
||||
or "style_direction_ids" in data
|
||||
or "style_direction_id" in data
|
||||
):
|
||||
cur.execute(
|
||||
"UPDATE training_framework_programs SET updated_at = NOW() WHERE id = %s",
|
||||
(framework_id,),
|
||||
|
||||
Reference in new issue
Block a user