From 9e3069f70afd50974c2c84c26eba5be715ca02a3 Mon Sep 17 00:00:00 2001 From: Darren <3921919+pendingintent@users.noreply.github.com> Date: Wed, 7 Jan 2026 13:44:01 -0500 Subject: [PATCH 01/11] Added defaultConditionId to ScheduledActivityInstances --- src/soa_builder/web/routers/instances.py | 10 +++++++- src/soa_builder/web/templates/edit.html | 22 ++++++++--------- src/soa_builder/web/templates/instances.html | 24 ++++++++++++++----- .../web/templates/schedule_timelines.html | 3 ++- src/soa_builder/web/templates/timings.html | 2 +- 5 files changed, 41 insertions(+), 20 deletions(-) diff --git a/src/soa_builder/web/routers/instances.py b/src/soa_builder/web/routers/instances.py index c699ecc..5c79c11 100644 --- a/src/soa_builder/web/routers/instances.py +++ b/src/soa_builder/web/routers/instances.py @@ -9,7 +9,13 @@ from ..audit import _record_instance_audit from ..db import _connect from ..schemas import InstanceCreate, InstanceUpdate -from ..utils import soa_exists, get_encounter_id, get_epoch_uid, get_schedule_timeline +from ..utils import ( + soa_exists, + get_encounter_id, + get_epoch_uid, + get_schedule_timeline, + get_scheduled_activity_instance, +) router = APIRouter() logger = logging.getLogger("soa_builder.web.routers.instances") @@ -67,6 +73,7 @@ def ui_list_instances(request: Request, soa_id: int): encounter_options = get_encounter_id(soa_id) epoch_options = get_epoch_uid(soa_id) schedule_timelines_options = get_schedule_timeline(soa_id) + instance_options = get_scheduled_activity_instance(soa_id) return templates.TemplateResponse( "instances.html", @@ -77,6 +84,7 @@ def ui_list_instances(request: Request, soa_id: int): "encounter_options": encounter_options, "epoch_options": epoch_options, "schedule_timelines_options": schedule_timelines_options, + "instance_options": instance_options, }, ) diff --git a/src/soa_builder/web/templates/edit.html b/src/soa_builder/web/templates/edit.html index 2b31e52..e9bfa37 100644 --- a/src/soa_builder/web/templates/edit.html +++ b/src/soa_builder/web/templates/edit.html @@ -83,7 +83,7 @@