clean up calendar display, added separated device runtime overrides

backend/app.py

@@ -44,7 +44,7 @@ def _smb_credentials_from_settings(settings: dict[str, Any]) -> dict[str, str]:
 	}
 
 
-def _runtime_overrides_from_settings(settings: dict[str, Any]) -> dict[str, int]:
+def _runtime_overrides_from_settings(settings: dict[str, Any]) -> dict[str, dict[str, int]]:
 	def _parse_positive_int(value: Any) -> int | None:
 		if value is None:
 			return None
@@ -58,15 +58,23 @@ def _runtime_overrides_from_settings(settings: dict[str, Any]) -> dict[str, int]
 			return None
 		return parsed if parsed > 0 else None
 
-	overrides: dict[str, int] = {}
-	for test_type, key in (
-		("P2P", "p2pRuntimeMinutes"),
-		("COE", "coeRuntimeMinutes"),
-		("P3P", "p3pRuntimeMinutes"),
-	):
-		minutes = _parse_positive_int(settings.get(key))
-		if minutes is not None:
-			overrides[test_type] = minutes
+	legacy_overrides = {
+		"P2P": _parse_positive_int(settings.get("p2pRuntimeMinutes")),
+		"COE": _parse_positive_int(settings.get("coeRuntimeMinutes")),
+		"P3P": _parse_positive_int(settings.get("p3pRuntimeMinutes")),
+	}
+
+	overrides: dict[str, dict[str, int]] = {}
+	for device_key, field_prefix in ((db.DEVICE_DUT, "dut"), (db.DEVICE_REF, "ref")):
+		device_overrides: dict[str, int] = {}
+		for test_type, suffix in (("P2P", "P2p"), ("COE", "Coe"), ("P3P", "P3p")):
+			minutes = _parse_positive_int(settings.get(f"{field_prefix}{suffix}RuntimeMinutes"))
+			if minutes is None:
+				minutes = legacy_overrides[test_type]
+			if minutes is not None:
+				device_overrides[test_type] = minutes
+		if device_overrides:
+			overrides[device_key] = device_overrides
 
 	return overrides