- {% with instances=instances_crud, study_name=soa_name, hide_return_link=true %}
+ {% with instances=instances_crud, study_name=study_name, hide_return_link=true %}
Scheduled Activity Instances ({{ instances_crud|length }})
{% include '_instances_section.html' %}
From 7c69b65af2be50ecafe5ede0326727bc30bc7e72 Mon Sep 17 00:00:00 2001
From: Darren <3921919+pendingintent@users.noreply.github.com>
Date: Mon, 23 Feb 2026 11:45:17 -0500
Subject: [PATCH 4/7] test file following existing project conventions,
asserting 200/404 behavior and that all three sections render
---
tests/test_routers_study_timing.py | 61 ++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
create mode 100644 tests/test_routers_study_timing.py
diff --git a/tests/test_routers_study_timing.py b/tests/test_routers_study_timing.py
new file mode 100644
index 0000000..c12cca1
--- /dev/null
+++ b/tests/test_routers_study_timing.py
@@ -0,0 +1,61 @@
+"""Tests for the combined study timing UI route."""
+
+from fastapi.testclient import TestClient
+
+from soa_builder.web.app import app
+
+client = TestClient(app)
+
+
+def test_ui_study_timing_200():
+ """GET /ui/soa/{soa_id}/study_timing returns 200 HTML for a valid SoA."""
+ r = client.post("/soa", json={"name": "Study Timing 200 Test"})
+ soa_id = r.json()["id"]
+
+ resp = client.get(f"/ui/soa/{soa_id}/study_timing")
+ assert resp.status_code == 200
+ assert "text/html" in resp.headers.get("content-type", "")
+
+
+def test_ui_study_timing_contains_all_sections():
+ """Response HTML includes all three section containers."""
+ r = client.post("/soa", json={"name": "Study Timing Sections Test"})
+ soa_id = r.json()["id"]
+
+ resp = client.get(f"/ui/soa/{soa_id}/study_timing")
+ assert resp.status_code == 200
+ assert "study-timing-schedule-timelines" in resp.text
+ assert "study-timing-instances" in resp.text
+ assert "study-timing-timings" in resp.text
+
+
+def test_ui_study_timing_404_nonexistent_soa():
+ """GET /ui/soa/999999/study_timing returns 404 for nonexistent SoA."""
+ resp = client.get("/ui/soa/999999/study_timing")
+ assert resp.status_code == 404
+
+
+def test_ui_study_timing_with_data():
+ """Created entities appear in the rendered page."""
+ r = client.post("/soa", json={"name": "Study Timing Data Test"})
+ soa_id = r.json()["id"]
+
+ # Create one of each entity via API
+ client.post(
+ f"/soa/{soa_id}/schedule_timelines",
+ json={"name": "My Test Timeline"},
+ )
+ client.post(
+ f"/soa/{soa_id}/instances",
+ json={"name": "My Test Instance"},
+ )
+ client.post(
+ f"/soa/{soa_id}/timings",
+ json={"name": "My Test Timing"},
+ )
+
+ resp = client.get(f"/ui/soa/{soa_id}/study_timing")
+ assert resp.status_code == 200
+ assert "My Test Timeline" in resp.text
+ assert "My Test Instance" in resp.text
+ assert "My Test Timing" in resp.text
From 6582fa998e127d5089f21f995ed51064ab6fe835 Mon Sep 17 00:00:00 2001
From: Darren <3921919+pendingintent@users.noreply.github.com>
Date: Mon, 23 Feb 2026 11:46:42 -0500
Subject: [PATCH 5/7] Update src/soa_builder/web/routers/schedule_timelines.py
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
src/soa_builder/web/routers/schedule_timelines.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/soa_builder/web/routers/schedule_timelines.py b/src/soa_builder/web/routers/schedule_timelines.py
index 0c6ae26..ae01124 100644
--- a/src/soa_builder/web/routers/schedule_timelines.py
+++ b/src/soa_builder/web/routers/schedule_timelines.py
@@ -37,12 +37,13 @@ def _redirect_url(request: Request, fallback: str) -> str:
"""Return the Referer URL if it's a same-origin /ui/ path, else fallback."""
referer = request.headers.get("referer", "")
if referer:
- from urllib.parse import urlparse
+ from urllib.parse import urlparse, urlunparse
parsed = urlparse(referer)
base = urlparse(str(request.base_url))
if parsed.netloc == base.netloc and parsed.path.startswith("/ui/"):
- return parsed.path
+ # Preserve any query string and fragment from the original Referer
+ return urlunparse(("", "", parsed.path, "", parsed.query, parsed.fragment))
return fallback
From 9c31f15fefaeb873f58f73725575b7694414d95d Mon Sep 17 00:00:00 2001
From: Darren <3921919+pendingintent@users.noreply.github.com>
Date: Mon, 23 Feb 2026 12:15:47 -0500
Subject: [PATCH 6/7] _redirect_url logic moved to utils.py to provide single
implementation
---
src/soa_builder/web/routers/instances.py | 14 +-------------
src/soa_builder/web/routers/schedule_timelines.py | 15 +--------------
src/soa_builder/web/routers/timings.py | 14 +-------------
src/soa_builder/web/utils.py | 13 +++++++++++++
4 files changed, 16 insertions(+), 40 deletions(-)
diff --git a/src/soa_builder/web/routers/instances.py b/src/soa_builder/web/routers/instances.py
index e62a3e8..1cef88b 100644
--- a/src/soa_builder/web/routers/instances.py
+++ b/src/soa_builder/web/routers/instances.py
@@ -15,6 +15,7 @@
get_epoch_uid,
get_schedule_timeline,
get_scheduled_activity_instance,
+ redirect_url_from_referer as _redirect_url,
)
router = APIRouter()
@@ -29,19 +30,6 @@ def _nz(s: Optional[str]) -> Optional[str]:
return s or None
-def _redirect_url(request: Request, fallback: str) -> str:
- """Return the Referer URL if it's a same-origin /ui/ path, else fallback."""
- referer = request.headers.get("referer", "")
- if referer:
- from urllib.parse import urlparse
-
- parsed = urlparse(referer)
- base = urlparse(str(request.base_url))
- if parsed.netloc == base.netloc and parsed.path.startswith("/ui/"):
- return parsed.path
- return fallback
-
-
# API endpoint to list timeline instances for SOA
@router.get("/soa/{soa_id}/instances", response_class=JSONResponse, response_model=None)
def list_instances(soa_id: int):
diff --git a/src/soa_builder/web/routers/schedule_timelines.py b/src/soa_builder/web/routers/schedule_timelines.py
index ae01124..47d2e9c 100644
--- a/src/soa_builder/web/routers/schedule_timelines.py
+++ b/src/soa_builder/web/routers/schedule_timelines.py
@@ -16,6 +16,7 @@
get_encounter_id,
get_epoch_uid,
get_study_timing_type,
+ redirect_url_from_referer as _redirect_url,
)
from .instances import list_instances
from .timings import list_timings
@@ -33,20 +34,6 @@ def _nz(s: Optional[str]) -> Optional[str]:
return s or None
-def _redirect_url(request: Request, fallback: str) -> str:
- """Return the Referer URL if it's a same-origin /ui/ path, else fallback."""
- referer = request.headers.get("referer", "")
- if referer:
- from urllib.parse import urlparse, urlunparse
-
- parsed = urlparse(referer)
- base = urlparse(str(request.base_url))
- if parsed.netloc == base.netloc and parsed.path.startswith("/ui/"):
- # Preserve any query string and fragment from the original Referer
- return urlunparse(("", "", parsed.path, "", parsed.query, parsed.fragment))
- return fallback
-
-
def _to_bool(v: Optional[str]) -> bool:
if v is None:
return False
diff --git a/src/soa_builder/web/routers/timings.py b/src/soa_builder/web/routers/timings.py
index 6c5c820..0aa6040 100644
--- a/src/soa_builder/web/routers/timings.py
+++ b/src/soa_builder/web/routers/timings.py
@@ -18,6 +18,7 @@
get_schedule_timeline,
get_study_timing_type,
get_next_code_uid as _get_next_code_uid,
+ redirect_url_from_referer as _redirect_url,
)
router = APIRouter()
@@ -32,19 +33,6 @@ def _nz(s: Optional[str]) -> Optional[str]:
return s or None
-def _redirect_url(request: Request, fallback: str) -> str:
- """Return the Referer URL if it's a same-origin /ui/ path, else fallback."""
- referer = request.headers.get("referer", "")
- if referer:
- from urllib.parse import urlparse
-
- parsed = urlparse(referer)
- base = urlparse(str(request.base_url))
- if parsed.netloc == base.netloc and parsed.path.startswith("/ui/"):
- return parsed.path
- return fallback
-
-
# API endpoint to list timings for SOA
@router.get("/soa/{soa_id}/timings", response_class=JSONResponse, response_model=None)
def list_timings(soa_id: int):
diff --git a/src/soa_builder/web/utils.py b/src/soa_builder/web/utils.py
index b6fdf8b..2a60580 100644
--- a/src/soa_builder/web/utils.py
+++ b/src/soa_builder/web/utils.py
@@ -3,6 +3,8 @@
import re
import requests
import time
+from urllib.parse import urlparse, urlunparse
+from fastapi import Request
from .db import _connect
_epoch_type_cache: dict[str, Any] = {
@@ -57,6 +59,17 @@
"""
+def redirect_url_from_referer(request: Request, fallback: str) -> str:
+ """Return the Referer URL if it's a same-origin /ui/ path, else fallback."""
+ referer = request.headers.get("referer", "")
+ if referer:
+ parsed = urlparse(referer)
+ base = urlparse(str(request.base_url))
+ if parsed.netloc == base.netloc and parsed.path.startswith("/ui/"):
+ return urlunparse(("", "", parsed.path, "", parsed.query, parsed.fragment))
+ return fallback
+
+
def iso_duration_to_days(iso_duration: str) -> float:
"""
Convert an ISO-8601 duration (e.g. 'P1D', 'P2W', 'P1Y2M3D', 'P1DT12H')
From ab8dde43764a999e820402c567c13f3b32447d7d Mon Sep 17 00:00:00 2001
From: Darren <3921919+pendingintent@users.noreply.github.com>
Date: Mon, 23 Feb 2026 12:18:35 -0500
Subject: [PATCH 7/7] schedule timelines specified for empty list
---
src/soa_builder/web/templates/_schedule_timelines_section.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/soa_builder/web/templates/_schedule_timelines_section.html b/src/soa_builder/web/templates/_schedule_timelines_section.html
index 38458d5..0e3ece4 100644
--- a/src/soa_builder/web/templates/_schedule_timelines_section.html
+++ b/src/soa_builder/web/templates/_schedule_timelines_section.html
@@ -101,7 +101,7 @@ Schedule Timelines for Study: {% if study_label %}{{ study_label }}{% else %
{% else %}
- | No instances yet. |
+ No schedule timelines yet. |
{% endfor %}