From 4085d9e2c6b835f1730db264a073fe63472388a3 Mon Sep 17 00:00:00 2001 From: Darren <3921919+pendingintent@users.noreply.github.com> Date: Fri, 2 Jan 2026 13:57:32 -0500 Subject: [PATCH 1/5] Added dropdown select for associating timing with encounter --- src/soa_builder/web/app.py | 103 +++++++++++++++++++++++- src/soa_builder/web/templates/edit.html | 11 +++ 2 files changed, 111 insertions(+), 3 deletions(-) diff --git a/src/soa_builder/web/app.py b/src/soa_builder/web/app.py index bb11c74..f5a06b1 100644 --- a/src/soa_builder/web/app.py +++ b/src/soa_builder/web/app.py @@ -1062,7 +1062,7 @@ def _fetch_matrix(soa_id: int): cur = conn.cursor() # Epochs not part of matrix axes currently; retrieved separately where needed. cur.execute( - "SELECT id,name,label,order_index,epoch_id,description FROM visit WHERE soa_id=? ORDER BY order_index", + "SELECT id,name,label,order_index,epoch_id,description,scheduledAtId FROM visit WHERE soa_id=? ORDER BY order_index", (soa_id,), ) visits = [ @@ -1073,6 +1073,9 @@ def _fetch_matrix(soa_id: int): order_index=r[3], epoch_id=r[4], description=r[5], + scheduledAtId=( + int(r[6]) if (r[6] is not None and str(r[6]).isdigit()) else None + ), ) for r in cur.fetchall() ] @@ -3637,8 +3640,15 @@ def ui_edit(request: Request, soa_id: int): ] conn_tr.close() - # Element audit list - # element_audits = _fetch_element_audits(soa_id) -> Moved to audits.py, audits.html + # Load Timings for dropdown + conn_tm = _connect() + cur_tm = conn_tm.cursor() + cur_tm.execute( + "SELECT id,name FROM timing WHERE soa_id=? ORDER BY id", + (soa_id,), + ) + timings = [{"id": r[0], "name": r[1]} for r in cur_tm.fetchall()] + conn_tm.close() return templates.TemplateResponse( request, @@ -3673,6 +3683,7 @@ def ui_edit(request: Request, soa_id: int): # Study Cells "study_cells": study_cells, "transition_rules": transition_rules, + "timings": timings, }, ) @@ -5710,6 +5721,7 @@ def ui_set_visit_epoch( raise HTTPException(400, "Invalid epoch_id for this SOA") cur.execute("UPDATE visit SET epoch_id=? WHERE id=?", (parsed_epoch, visit_id)) conn.commit() + """ logger.info( "ui_set_visit_epoch updated visit id=%s soa_id=%s epoch_id=%s raw_val='%s' db_path=%s", visit_id, @@ -5718,6 +5730,7 @@ def ui_set_visit_epoch( raw_val, DB_PATH, ) + """ # Fetch after and record audit cur.execute( "SELECT id,name,label,order_index,epoch_id,encounter_uid,description FROM visit WHERE id=? AND soa_id=?", @@ -5749,6 +5762,90 @@ def ui_set_visit_epoch( ) +# UI endpoint for associating a Timing with Visit/Encounter (visit.scheduledAtId) +@app.post("/ui/soa/{soa_id}/set_timing", response_class=HTMLResponse) +def ui_set_timing( + request: Request, + soa_id: int, + visit_id: int = Form(...), + timing_id: str = Form(""), +): + """Form handler for associating a Timing with a Visit/Encounter""" + if not soa_exists(soa_id): + raise HTTPException(404, "SOA not found") + # Determing timing name + raw_val = (timing_id or "").strip() + parsed_timing: Optional[int] = None + if raw_val: + if raw_val.isdigit(): + parsed_timing = int(raw_val) + else: + raise HTTPException(400, "Invalid timing_id value") + conn = _connect() + cur = conn.cursor() + cur.execute( + "SELECT id,name,label,order_index,encounter_uid,description,scheduledAtId FROM visit WHERE id=? AND soa_id=?", + (visit_id, soa_id), + ) + row = cur.fetchone() + if not row: + conn.close() + raise HTTPException(404, "Visit not found") + before = { + "id": row[0], + "name": row[1], + "label": row[2], + "order_index": row[3], + "encounter_uid": row[4], + "description": row[5], + "scheduledAtId": row[6], + } + if parsed_timing is not None: + cur.execute( + "SELECT 1 FROM timing WHERE id=? AND soa_id=?", + (parsed_timing, soa_id), + ) + if not cur.fetchone(): + conn.close() + raise HTTPException(400, "Invalid timing_id for this SOA") + cur.execute( + "UPDATE visit SET scheduledAtId=? WHERE id=?", + (parsed_timing, visit_id), + ) + conn.commit() + # Fecth after record audit + cur.execute( + "SELECT id,name,label,order_index,encounter_uid,description,scheduledAtId FROM visit WHERE id=? AND soa_id=?", + (visit_id, soa_id), + ) + r = cur.fetchone() + after = { + "id": r[0], + "name": r[1], + "label": r[2], + "order_index": r[3], + "encounter_uid": r[4], + "description": r[5], + "scheduledAtId": r[6], + } + updated_fields = [ + f + for f in ["scheduledAtId"] + if (before.get(f) or None) != (after.get(f) or None) + ] + _record_visit_audit( + soa_id, + "update", + visit_id, + before=before, + after={**after, "updated_fields": updated_fields}, + ) + conn.close() + return HTMLResponse( + f"" + ) + + # UI endpoint for updating an Encounter/Visit @app.post("/ui/soa/{soa_id}/update_visit", response_class=HTMLResponse) def ui_update_visit( diff --git a/src/soa_builder/web/templates/edit.html b/src/soa_builder/web/templates/edit.html index e066cd0..4608ca0 100644 --- a/src/soa_builder/web/templates/edit.html +++ b/src/soa_builder/web/templates/edit.html @@ -98,6 +98,17 @@

Editing SoA {{ soa_id }}

{% endif %} + {% if timings %} +
+ + +
+ {% endif %}
From 0ee8c707d448e93732b2223e93b01fa7e00894c0 Mon Sep 17 00:00:00 2001 From: Darren <3921919+pendingintent@users.noreply.github.com> Date: Fri, 2 Jan 2026 14:22:48 -0500 Subject: [PATCH 2/5] Added scheduledAtId value --- src/usdm/generate_encounters.py | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/src/usdm/generate_encounters.py b/src/usdm/generate_encounters.py index c3969e0..50163c3 100644 --- a/src/usdm/generate_encounters.py +++ b/src/usdm/generate_encounters.py @@ -20,6 +20,23 @@ def _nz(s: Optional[str]) -> Optional[str]: return s or None +def _get_timing_name(soa_id: int, timing_id: Optional[int]) -> str: + conn = _connect() + cur = conn.cursor() + cur.execute( + "SELECT timing_uid FROM timing WHERE id=? AND soa_id=?", + ( + timing_id, + soa_id, + ), + ) + row = cur.fetchone() + conn.close() + timing_uid = row[0] if (row and row[0] is not None) else None + + return timing_uid + + def _get_type_code_tuple(soa_id: int, code_uid: str) -> Tuple[str, str, str, str]: conn = _connect() cur = conn.cursor() @@ -102,7 +119,7 @@ def build_usdm_encounters(soa_id: int) -> List[Dict[str, Any]]: conn = _connect() cur = conn.cursor() cur.execute( - "SELECT name,label,order_index,encounter_uid,description,type,environmentalSettings FROM visit WHERE soa_id=?", + "SELECT name,label,order_index,encounter_uid,description,type,environmentalSettings,scheduledAtId FROM visit WHERE soa_id=?", (soa_id,), ) rows = cur.fetchall() @@ -123,6 +140,7 @@ def build_usdm_encounters(soa_id: int) -> List[Dict[str, Any]]: description, type, environmentalSettings, + scheduledAtId, ) = ( r[0], r[1], @@ -131,6 +149,7 @@ def build_usdm_encounters(soa_id: int) -> List[Dict[str, Any]]: r[4], r[5], r[6], + r[7], ) eid = encounter_uid t_code, t_decode, t_codeSystem, t_codeSystemVersion = _get_type_code_tuple( @@ -143,6 +162,15 @@ def build_usdm_encounters(soa_id: int) -> List[Dict[str, Any]]: prev_id = id_by_index.get(i - 1) next_id = id_by_index.get(i + 1) + timing_uid = _get_timing_name( + soa_id, + ( + int(scheduledAtId) + if (scheduledAtId is not None and str(scheduledAtId).isdigit()) + else None + ), + ) + encounter = { "id": eid, "extensionAttributes": [], @@ -160,7 +188,7 @@ def build_usdm_encounters(soa_id: int) -> List[Dict[str, Any]]: }, "previousId": prev_id, "nextId": next_id, - "scheduledAt": "", + "scheduledAt": timing_uid, "environmentSettings": [ { "id": environmentalSettings, From 2a1685d893548804b08a8721048ccf9ceab9eec5 Mon Sep 17 00:00:00 2001 From: Darren <3921919+pendingintent@users.noreply.github.com> Date: Fri, 2 Jan 2026 16:16:49 -0500 Subject: [PATCH 3/5] Added transition Start Rule selector and USDM output --- src/soa_builder/web/app.py | 87 ++++++++++++++++++++++++- src/soa_builder/web/templates/edit.html | 11 ++++ src/usdm/generate_encounters.py | 36 +++++++++- 3 files changed, 131 insertions(+), 3 deletions(-) diff --git a/src/soa_builder/web/app.py b/src/soa_builder/web/app.py index f5a06b1..9efe0a1 100644 --- a/src/soa_builder/web/app.py +++ b/src/soa_builder/web/app.py @@ -1062,7 +1062,7 @@ def _fetch_matrix(soa_id: int): cur = conn.cursor() # Epochs not part of matrix axes currently; retrieved separately where needed. cur.execute( - "SELECT id,name,label,order_index,epoch_id,description,scheduledAtId FROM visit WHERE soa_id=? ORDER BY order_index", + "SELECT id,name,label,order_index,epoch_id,description,scheduledAtId,transitionStartRule FROM visit WHERE soa_id=? ORDER BY order_index", (soa_id,), ) visits = [ @@ -1076,6 +1076,7 @@ def _fetch_matrix(soa_id: int): scheduledAtId=( int(r[6]) if (r[6] is not None and str(r[6]).isdigit()) else None ), + transitionStartRule=(r[7] if r[7] else None), ) for r in cur.fetchall() ] @@ -5762,6 +5763,90 @@ def ui_set_visit_epoch( ) +# UI endpoint for associating a Transition Start Rule with Visit/Encounter (visit.transitionStartRule) +@app.post("/ui/soa/{soa_id}/set_transition_start_rule", response_class=HTMLResponse) +def ui_set_transition_start_rule( + request: Request, + soa_id: int, + visit_id: int = Form(...), + transition_start_rule_uid: str = Form(""), +): + """Form handler for associating a Transition Start Rule with a Visit/Encounter""" + if not soa_exists(soa_id): + raise HTTPException(404, "SOA not found") + + new_uid = (transition_start_rule_uid or "").strip() or None + + conn = _connect() + cur = conn.cursor() + cur.execute( + "SELECT id,name,label,order_index,encounter_uid,description,transitionStartRule FROM visit WHERE id=? AND soa_id=?", + (visit_id, soa_id), + ) + row = cur.fetchone() + if not row: + conn.close() + raise HTTPException(404, "Visit not found") + + before = { + "id": row[0], + "name": row[1], + "label": row[2], + "order_index": row[3], + "encounter_uid": row[4], + "description": row[5], + "transitionStartRule": row[6], + } + if new_uid is not None: + cur.execute( + "SELECT 1 FROM transition_rule WHERE transition_rule_uid=? AND soa_id=?", + (new_uid, soa_id), + ) + if not cur.fetchone(): + conn.close() + raise HTTPException(400, "Invalid Transition Rule for this SOA") + + cur.execute( + "UPDATE visit SET transitionStartRule=? WHERE id=? AND soa_id=?", + (new_uid, visit_id, soa_id), + ) + conn.commit() + + cur.execute( + "SELECT id,name,label,order_index,encounter_uid,description,transitionStartRule FROM visit WHERE id=? AND soa_id=?", + ( + visit_id, + soa_id, + ), + ) + r = cur.fetchone() + after = { + "id": r[0], + "name": r[1], + "label": r[2], + "order_index": r[3], + "encounter_uid": r[4], + "description": r[5], + "transitionStartRule": r[6], + } + updated_fields = [ + f + for f in ["transitionStartRule"] + if (before.get(f) or None) != (after.get(f) or None) + ] + _record_visit_audit( + soa_id, + "update", + visit_id, + before=before, + after={**after, "updated_fields": updated_fields}, + ) + conn.close() + return HTMLResponse( + f"" + ) + + # UI endpoint for associating a Timing with Visit/Encounter (visit.scheduledAtId) @app.post("/ui/soa/{soa_id}/set_timing", response_class=HTMLResponse) def ui_set_timing( diff --git a/src/soa_builder/web/templates/edit.html b/src/soa_builder/web/templates/edit.html index 4608ca0..053e43c 100644 --- a/src/soa_builder/web/templates/edit.html +++ b/src/soa_builder/web/templates/edit.html @@ -109,6 +109,17 @@

Editing SoA {{ soa_id }}

{% endif %} + {% if transition_rules %} +
+ + +
+ {% endif %}
diff --git a/src/usdm/generate_encounters.py b/src/usdm/generate_encounters.py index 50163c3..49b176c 100644 --- a/src/usdm/generate_encounters.py +++ b/src/usdm/generate_encounters.py @@ -37,6 +37,32 @@ def _get_timing_name(soa_id: int, timing_id: Optional[int]) -> str: return timing_uid +def _get_transition_start_rule( + soa_id: int, transition_rule_uid: Optional[str] +) -> Optional[Dict[str, Any]]: + if not transition_rule_uid: + return None + conn = _connect() + cur = conn.cursor() + cur.execute( + "SELECT tr.name, tr.label, tr.description, tr.text FROM transition_rule tr WHERE soa_id=? AND transition_rule_uid=?", + (soa_id, transition_rule_uid), + ) + row = cur.fetchone() + conn.close() + if not row: + return None + return { + "id": transition_rule_uid, + "extensionAttributes": [], + "name": row[0] or None, + "label": row[1] or None, + "description": row[2] or None, + "text": row[3] or None, + "instanceType": "TransitionRule", + } + + def _get_type_code_tuple(soa_id: int, code_uid: str) -> Tuple[str, str, str, str]: conn = _connect() cur = conn.cursor() @@ -119,7 +145,7 @@ def build_usdm_encounters(soa_id: int) -> List[Dict[str, Any]]: conn = _connect() cur = conn.cursor() cur.execute( - "SELECT name,label,order_index,encounter_uid,description,type,environmentalSettings,scheduledAtId FROM visit WHERE soa_id=?", + "SELECT name,label,order_index,encounter_uid,description,type,environmentalSettings,scheduledAtId,transitionStartRule FROM visit WHERE soa_id=?", (soa_id,), ) rows = cur.fetchall() @@ -141,6 +167,7 @@ def build_usdm_encounters(soa_id: int) -> List[Dict[str, Any]]: type, environmentalSettings, scheduledAtId, + transition_start_rule_uid, ) = ( r[0], r[1], @@ -150,6 +177,7 @@ def build_usdm_encounters(soa_id: int) -> List[Dict[str, Any]]: r[5], r[6], r[7], + r[8], ) eid = encounter_uid t_code, t_decode, t_codeSystem, t_codeSystemVersion = _get_type_code_tuple( @@ -171,6 +199,10 @@ def build_usdm_encounters(soa_id: int) -> List[Dict[str, Any]]: ), ) + transition_start_rule_obj = _get_transition_start_rule( + soa_id, transition_start_rule_uid + ) + encounter = { "id": eid, "extensionAttributes": [], @@ -201,7 +233,7 @@ def build_usdm_encounters(soa_id: int) -> List[Dict[str, Any]]: }, ], "contactModes": [], - "transitionStartRule": {}, + "transitionStartRule": transition_start_rule_obj or {}, "transitionEndRule": {}, "notes": [], "instanceType": "Encounter", From 56b1e5d51e24137820110d6880da7eb447f0242e Mon Sep 17 00:00:00 2001 From: Darren <3921919+pendingintent@users.noreply.github.com> Date: Fri, 2 Jan 2026 16:43:40 -0500 Subject: [PATCH 4/5] Added transition end rule selector and USDM generator --- src/soa_builder/web/app.py | 88 ++++++++++++++++++++++++- src/soa_builder/web/templates/edit.html | 11 +++- src/usdm/generate_encounters.py | 36 +++++++++- 3 files changed, 131 insertions(+), 4 deletions(-) diff --git a/src/soa_builder/web/app.py b/src/soa_builder/web/app.py index 9efe0a1..668ac20 100644 --- a/src/soa_builder/web/app.py +++ b/src/soa_builder/web/app.py @@ -1062,7 +1062,7 @@ def _fetch_matrix(soa_id: int): cur = conn.cursor() # Epochs not part of matrix axes currently; retrieved separately where needed. cur.execute( - "SELECT id,name,label,order_index,epoch_id,description,scheduledAtId,transitionStartRule FROM visit WHERE soa_id=? ORDER BY order_index", + "SELECT id,name,label,order_index,epoch_id,description,scheduledAtId,transitionStartRule,transitionEndRule FROM visit WHERE soa_id=? ORDER BY order_index", (soa_id,), ) visits = [ @@ -1077,6 +1077,7 @@ def _fetch_matrix(soa_id: int): int(r[6]) if (r[6] is not None and str(r[6]).isdigit()) else None ), transitionStartRule=(r[7] if r[7] else None), + transitionEndRule=(r[8] if r[8] else None), ) for r in cur.fetchall() ] @@ -5847,6 +5848,91 @@ def ui_set_transition_start_rule( ) +# UI endpoint for associating a Transition End Rule with Visit/Encounter (visit.transitionEndRule) +@app.post("/ui/soa/{soa_id}/set_transition_end_rule", response_class=HTMLResponse) +def ui_set_transition_end_rule( + request: Request, + soa_id: int, + visit_id: int = Form(...), + transition_end_rule_uid: str = Form(""), +): + """Form Handler for associating a Transition End Rule with a Visit/Encounter""" + if not soa_exists(soa_id): + raise HTTPException(404, "SOA not found") + + new_uid = (transition_end_rule_uid or "").strip() or None + + conn = _connect() + cur = conn.cursor() + cur.execute( + "SELECT id,name,label,order_index,encounter_uid,description,transitionEndRule FROM visit WHERE id=? AND soa_id=?", + (visit_id, soa_id), + ) + row = cur.fetchone() + if not row: + conn.close() + raise HTTPException(404, "Visit not found") + + before = { + "id": row[0], + "name": row[1], + "label": row[2], + "order_index": row[3], + "encounter_uid": row[4], + "description": row[5], + "transitionEndRule": row[6], + } + + if new_uid is not None: + cur.execute( + "SELECT 1 FROM transition_rule WHERE transition_rule_uid=? AND soa_id=?", + (new_uid, soa_id), + ) + if not cur.fetchone(): + conn.close() + raise HTTPException(400, "Invalid Transition Rule for this SOA") + + cur.execute( + "UPDATE visit SET transitionEndRule=? WHERE id=? AND soa_id=?", + (new_uid, visit_id, soa_id), + ) + conn.commit() + + cur.execute( + "SELECT id,name,label,order_index,encounter_uid,description,transitionEndRule FROM visit WHERE id=? AND soa_id=?", + ( + visit_id, + soa_id, + ), + ) + r = cur.fetchone() + after = { + "id": r[0], + "name": r[1], + "label": r[2], + "order_index": r[3], + "encounter_uid": r[4], + "description": r[5], + "transitionEndRule": r[6], + } + updated_fields = [ + f + for f in ["transitionEndRule"] + if (before.get(f) or None) != (after.get(f) or None) + ] + _record_visit_audit( + soa_id, + "update", + visit_id, + before=before, + after={**after, "updated_fields": updated_fields}, + ) + conn.close() + return HTMLResponse( + f"" + ) + + # UI endpoint for associating a Timing with Visit/Encounter (visit.scheduledAtId) @app.post("/ui/soa/{soa_id}/set_timing", response_class=HTMLResponse) def ui_set_timing( diff --git a/src/soa_builder/web/templates/edit.html b/src/soa_builder/web/templates/edit.html index 053e43c..f51f29d 100644 --- a/src/soa_builder/web/templates/edit.html +++ b/src/soa_builder/web/templates/edit.html @@ -113,12 +113,21 @@

Editing SoA {{ soa_id }}

+
+ + +
{% endif %}
diff --git a/src/usdm/generate_encounters.py b/src/usdm/generate_encounters.py index 49b176c..83c2c32 100644 --- a/src/usdm/generate_encounters.py +++ b/src/usdm/generate_encounters.py @@ -63,6 +63,32 @@ def _get_transition_start_rule( } +def _get_transition_end_rule( + soa_id: int, transition_rule_uid: Optional[str] +) -> Optional[Dict[str, Any]]: + if not transition_rule_uid: + return None + conn = _connect() + cur = conn.cursor() + cur.execute( + "SELECT tr.name, tr.label, tr.description, tr.text FROM transition_rule tr WHERE soa_id=? AND transition_rule_uid=?", + (soa_id, transition_rule_uid), + ) + row = cur.fetchone() + conn.close() + if not row: + return None + return { + "id": transition_rule_uid, + "extensionAttributes": [], + "name": row[0] or None, + "label": row[1] or None, + "description": row[2] or None, + "text": row[3] or None, + "instanceType": "TransitionRule", + } + + def _get_type_code_tuple(soa_id: int, code_uid: str) -> Tuple[str, str, str, str]: conn = _connect() cur = conn.cursor() @@ -145,7 +171,7 @@ def build_usdm_encounters(soa_id: int) -> List[Dict[str, Any]]: conn = _connect() cur = conn.cursor() cur.execute( - "SELECT name,label,order_index,encounter_uid,description,type,environmentalSettings,scheduledAtId,transitionStartRule FROM visit WHERE soa_id=?", + "SELECT name,label,order_index,encounter_uid,description,type,environmentalSettings,scheduledAtId,transitionStartRule,transitionEndRule FROM visit WHERE soa_id=?", (soa_id,), ) rows = cur.fetchall() @@ -168,6 +194,7 @@ def build_usdm_encounters(soa_id: int) -> List[Dict[str, Any]]: environmentalSettings, scheduledAtId, transition_start_rule_uid, + transition_end_rule_uid, ) = ( r[0], r[1], @@ -178,6 +205,7 @@ def build_usdm_encounters(soa_id: int) -> List[Dict[str, Any]]: r[6], r[7], r[8], + r[9], ) eid = encounter_uid t_code, t_decode, t_codeSystem, t_codeSystemVersion = _get_type_code_tuple( @@ -203,6 +231,10 @@ def build_usdm_encounters(soa_id: int) -> List[Dict[str, Any]]: soa_id, transition_start_rule_uid ) + transition_end_rule_obj = _get_transition_start_rule( + soa_id, transition_end_rule_uid + ) + encounter = { "id": eid, "extensionAttributes": [], @@ -234,7 +266,7 @@ def build_usdm_encounters(soa_id: int) -> List[Dict[str, Any]]: ], "contactModes": [], "transitionStartRule": transition_start_rule_obj or {}, - "transitionEndRule": {}, + "transitionEndRule": transition_end_rule_obj or {}, "notes": [], "instanceType": "Encounter", } From 573c26007084643fcb856f07ef8019e2b5f8db74 Mon Sep 17 00:00:00 2001 From: Darren <3921919+pendingintent@users.noreply.github.com> Date: Mon, 5 Jan 2026 08:11:46 -0500 Subject: [PATCH 5/5] Updated to use correct helper function --- src/usdm/generate_encounters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/usdm/generate_encounters.py b/src/usdm/generate_encounters.py index 83c2c32..67d00a0 100644 --- a/src/usdm/generate_encounters.py +++ b/src/usdm/generate_encounters.py @@ -231,7 +231,7 @@ def build_usdm_encounters(soa_id: int) -> List[Dict[str, Any]]: soa_id, transition_start_rule_uid ) - transition_end_rule_obj = _get_transition_start_rule( + transition_end_rule_obj = _get_transition_end_rule( soa_id, transition_end_rule_uid )