Hotfix

plugins/trainingstracker/tests/test_app.py

@@ -379,8 +379,12 @@ def test_structured_result_is_saved_canonically_and_used_by_analysis(tmp_path: P
     assert client.put("/api/plans/training.json/tracker", json=tracker).status_code == 200
 
     raw = json.loads((tracker_data / "sessions" / "training.json").read_text(encoding="utf-8"))
-    item = raw["sessions"]["w01-d01"]["items"]["d1-r0-e0"]
+    plan = module._normalize_plan(training)
+    stable_id = plan["days"][0]["rotations"][0]["exercises"][0]["id"]
+    assert "d1-r0-e0" not in raw["sessions"]["w01-d01"]["items"]
+    item = raw["sessions"]["w01-d01"]["items"][stable_id]
     assert item["result"] == "4 kg · L 9/8/8 · R 9/8/9 Reps"
+    assert item["result_data"]["version"] == 2
     assert item["result_data"]["weight_kg"] == 4.0
     assert item["result_data"]["left_values"] == [9.0, 8.0, 8.0]
 
@@ -458,3 +462,119 @@ def test_frontend_contains_explicit_week_status_and_item_skip_states():
     assert "Übersprungen" in source
     assert "Teilweise" in source
     assert "eine neue analyse überschreibt die vorherige" in source.lower()
+
+
+def test_legacy_results_are_migrated_server_side_without_hidden_values(tmp_path: Path):
+    plans = tmp_path / "data" / "trainingsplan" / "plans"
+    tracker_data = tmp_path / "data" / "trainingstracker"
+    plans.mkdir(parents=True)
+    training = plans / "training.json"
+    payload = sample_plan()
+    payload["config"]["days"][0]["rotations"][0]["exercises"][0]["result_schema"] = {
+        "mode": "reps", "weight_mode": "required", "laterality": "unilateral",
+        "sides_mode": "separate", "sets": 3,
+    }
+    training.write_text(json.dumps(payload), encoding="utf-8")
+    sessions = tracker_data / "sessions"
+    sessions.mkdir(parents=True)
+    (sessions / "training.json").write_text(json.dumps({
+        "version": 5,
+        "revision": 4,
+        "sessions": {
+            "w01-d01": {
+                "status": "completed",
+                "items": {
+                    "d1-r0-e0": {
+                        "done": True,
+                        "progression": "assistiert",
+                        "result": "4kg, 6/6/5 je Seite",
+                        "note": "Altwert",
+                    }
+                },
+            }
+        },
+    }), encoding="utf-8")
+
+    module = load_module(Path(__file__).parents[1] / "app.py", tracker_data, plans)
+    client = module.app.test_client()
+    detail = client.get("/api/plans/training.json").get_json()
+    plan = detail["plan"]
+    tracker = detail["tracker"]
+    stable_id = plan["days"][0]["rotations"][0]["exercises"][0]["id"]
+    item = tracker["sessions"]["w01-d01"]["items"][stable_id]
+
+    assert "d1-r0-e0" not in tracker["sessions"]["w01-d01"]["items"]
+    assert item["result_data"] == {
+        "version": 2,
+        "mode": "reps",
+        "laterality": "unilateral",
+        "sides_mode": "same",
+        "sets": 3,
+        "weight_kg": 4.0,
+        "values": [6.0, 6.0, 5.0],
+        "left_values": [None, None, None],
+        "right_values": [None, None, None],
+    }
+    assert item["result_format"]["sides_mode"] == "same"
+    assert item["result"] == "4 kg · 6/6/5 Reps je Seite"
+    assert tracker["revision"] == 5
+
+    persisted = json.loads((sessions / "training.json").read_text(encoding="utf-8"))
+    assert persisted["sessions"]["w01-d01"]["items"][stable_id]["result_data"]["version"] == 2
+    backup = tracker_data / "sessions" / ".migration-backups" / "training.json.pre-result-data-v2.json"
+    assert json.loads(backup.read_text(encoding="utf-8"))["version"] == 5
+    assert client.get("/api/plans/training.json").get_json()["tracker"]["revision"] == 5
+
+
+def test_legacy_mode_override_and_zero_weight_are_preserved(tmp_path: Path):
+    plans = tmp_path / "plans"
+    tracker_data = tmp_path / "tracker"
+    plans.mkdir()
+    training = plans / "training.json"
+    training.write_text(json.dumps(sample_plan()), encoding="utf-8")
+    module = load_module(Path(__file__).parents[1] / "app.py", tracker_data, plans)
+
+    seconds, override = module._parse_legacy_result_data("6x20 s", {
+        "mode": "reps", "weight_mode": "none", "laterality": "bilateral",
+        "sides_mode": "same", "default_sets": 6,
+    })
+    assert seconds["mode"] == "seconds"
+    assert seconds["values"] == [20.0] * 6
+    assert override["mode"] == "seconds"
+
+    weighted, override = module._parse_legacy_result_data("0kg, 8/7", {
+        "mode": "reps", "weight_mode": "required", "laterality": "bilateral",
+        "sides_mode": "same", "default_sets": 2,
+    })
+    assert weighted["weight_kg"] == 0.0
+    assert weighted["values"] == [8.0, 7.0]
+    assert override is None
+
+
+def test_empty_stable_placeholder_does_not_erase_completed_legacy_item(tmp_path: Path):
+    plans = tmp_path / "plans"
+    tracker_data = tmp_path / "tracker"
+    plans.mkdir()
+    training = plans / "training.json"
+    training.write_text(json.dumps(sample_plan()), encoding="utf-8")
+    module = load_module(Path(__file__).parents[1] / "app.py", tracker_data, plans)
+
+    merged = module._merge_migrated_item(
+        {"done": True, "completion_status": "completed", "result": "8/7", "note": "wichtig"},
+        {"done": False, "completion_status": "planned", "result": "", "note": "", "exercise_name": "Squat"},
+    )
+    assert merged["done"] is True
+    assert merged["completion_status"] == "completed"
+    assert merged["result"] == "8/7"
+    assert merged["note"] == "wichtig"
+    assert merged["exercise_name"] == "Squat"
+
+
+def test_frontend_hotfix_uses_result_data_v2_and_non_overlapping_status_layout():
+    source = (Path(__file__).parents[1] / "static" / "index.html").read_text(encoding="utf-8")
+    assert "const RESULT_DATA_VERSION = 2" in source
+    assert "grid-template-columns: minmax(112px,132px) minmax(0,1fr)" in source
+    assert "@media (max-width: 420px)" in source
+    assert ".exercise-title { grid-template-columns: minmax(0,1fr); }" in source
+    assert ".app { width: min(1180px, 100%)" in source
+    assert "formatOverride" in source