Matrix: {% if timeline_instances and timeline_instances[0].timeline_name %}{
Activity
Concepts
-
+
{% for inst in timeline_instances %}
-
- {% if inst.label %}{{ inst.label }}{% else %}{{ inst.name }}{% endif %}
-
+
{% for a in activities %}
From 95c6b0f1fb4b63736610efa86d0312250193ee2d Mon Sep 17 00:00:00 2001
From: Darren <3921919+pendingintent@users.noreply.github.com>
Date: Mon, 26 Jan 2026 16:16:24 -0500
Subject: [PATCH 09/21] Removed backup file of edit.html
---
.../web/templates/edit_backup.html | 642 ------------------
1 file changed, 642 deletions(-)
delete mode 100644 src/soa_builder/web/templates/edit_backup.html
diff --git a/src/soa_builder/web/templates/edit_backup.html b/src/soa_builder/web/templates/edit_backup.html
deleted file mode 100644
index e9bfa37..0000000
--- a/src/soa_builder/web/templates/edit_backup.html
+++ /dev/null
@@ -1,642 +0,0 @@
-{% extends 'base.html' %}
-{% block content %}
-Editing SoA {{ soa_id }}
-
-
-
-
-
-
- Count: {{ freeze_count }}
- {% if last_frozen_at %} • Last: {{ last_frozen_at }} {% endif %}
-
-
- {% if freezes %}
-
-
Versions:
- {% for f in freezes %}
-
- {{ f.version_label }}
- View
-
- {% endfor %}
-
-
-
- Diff:
-
- {% for f in freezes %}{{ f.version_label }} {% endfor %}
-
-
- {% for f in freezes %}{{ f.version_label }} {% endfor %}
-
- Compare
-
- {% else %}
-
No versions frozen yet.
- {% endif %}
-
-
-
-
- Last fetch:
- {% if concepts_last_fetch_relative %}
- {{ concepts_last_fetch_relative }}
- {% else %}
- n/a
- {% endif %}
-
-
(forces remote re-fetch & cache reset)
-
-
-
- Visits/Encounters ({{ visits|length }}) (drag to reorder)
-
- {% for v in visits %}
-
- {{ v.order_index }} . {{ v.name }}
-
- {% if epochs %}
-
- {% endif %}
- {% if timings %}
-
- {% endif %}
- {% if transition_rules %}
-
-
- {% endif %}
-
-
-
-
-
- {% endfor %}
-
-
-
-
- Activities ({{ activities|length }}) (drag to reorder)
-
- {% for a in activities %}
-
- {{ a.order_index }} . {{ a.name }}
-
-
-
-
-
- {% endfor %}
-
-
-
-
-
- Epochs ({{ epochs|length }}) (drag to reorder)
-
- {% for e in epochs %}
-
- {{ e.order_index }} . {{ e.name }}
-
-
-
-
-
- {% endfor %}
-
-
-
-
- Elements ({{ elements|length }}) (drag to reorder)
-
- {% for el in elements %}
-
- {{ el.order_index }} . {% if el.label %}{{ el.label }}{% else %}{{ el.name }}{% endif %}
-
- {% if transition_rules %}
-
-
- {% endif %}
-
-
-
-
- {% endfor %}
-
-
-
-
- Arms ({{ arms|length }}) (drag to reorder)
-
- {% for arm in arms %}
-
- {{ arm.order_index }} . {% if arm.label %}{{ arm.label }}{% else %}{{ arm.name }}{% endif %}
-
-
-
-
-
- {% endfor %}
-
-
-
-
- Study Cells ({{ study_cells|length }})
-
-
-
-
- UID
- Arm
- Epoch
- Element
- Actions
-
- {% for sc in study_cells %}
-
- {{ sc.study_cell_uid }}
-
- {% set arm_match = arms | selectattr('arm_uid', 'equalto', sc.arm_uid) | list %}
- {% if arm_match and arm_match[0] and arm_match[0].name %}
- {{ arm_match[0].name }}
- {% else %}
- {{ sc.arm_uid }}
- {% endif %}
-
- {{ sc.epoch_name or sc.epoch_uid }}
- {{ sc.element_name or sc.element_uid }}
-
-
-
-
- {% else %}
- No study cells yet.
-
-
- Transition Rules ({{ transition_rules|length }})
-
- {% for rule in transition_rules %}
-
- {{ rule.order_index }} . {% if rule.label %}{{ rule.label }}{% else %}{{ rule.name }}{% endif %}
-
-
-
-
-
- {% endfor %}
-
-
-
-
-
-
Matrix
-
-
- Activity
- Concepts
- {% for v in visits %}
-
- {{ v.name }}
- Encounter: {{ v.name }}
- {% if v.epoch_id %}
- {% set ep = (epochs | selectattr('id','equalto', v.epoch_id) | list) %}
- {% if ep and ep[0] %}Epoch: {{ ep[0].name }}
{% endif %}
- {% endif %}
-
- {% endfor %}
-
- {% for a in activities %}
-
- {{ a.name }}
- {% set concepts_list = activity_concepts.get(a.id, []) %}
- {% set selected_list = concepts_list %}
- {% set selected_codes = concepts_list | map(attribute='code') | list %}
- {% set activity_id = a.id %}
- {% include 'concepts_cell.html' %}
- {% for v in visits %}
- {% set raw_status = cell_map.get((v.id, a.id), '') %}
- {% set display = 'X' if raw_status == 'X' else '' %}
- {{ display }}
- {% endfor %}
-
- {% endfor %}
-
-Generate Normalized Summary (JSON)
-
-
-
-{% endblock %}
From 32eba89a42d5497d6284647641340e160e18153a Mon Sep 17 00:00:00 2001
From: Darren <3921919+pendingintent@users.noreply.github.com>
Date: Mon, 26 Jan 2026 16:18:00 -0500
Subject: [PATCH 10/21] Aligned export XLSX SoA matrix with that shown in the
UI
---
src/soa_builder/web/app.py | 118 +++++++++++++++++++++++++++++++++++++
1 file changed, 118 insertions(+)
diff --git a/src/soa_builder/web/app.py b/src/soa_builder/web/app.py
index 4024c0d..e3fde12 100644
--- a/src/soa_builder/web/app.py
+++ b/src/soa_builder/web/app.py
@@ -1963,6 +1963,47 @@ def _matrix_arrays(soa_id: int):
return instance_headers, rows
+def _fetch_enriched_instances(soa_id: int):
+ """Return enriched instance data with all header information for XLSX export."""
+ conn = _connect()
+ cur = conn.cursor()
+ cur.execute(
+ """
+ SELECT i.id,i.name,i.instance_uid,i.label,i.member_of_timeline,
+ v.name AS encounter_name,v.label AS encounter_label,
+ e.name AS epoch_name,e.epoch_label as epoch_label,
+ tm.window_label,tm.label AS timing_label,tm.name AS timing_name,tm.value AS study_day
+ FROM instances i
+ LEFT JOIN visit v ON v.encounter_uid = i.encounter_uid AND v.soa_id = i.soa_id
+ LEFT JOIN epoch e ON e.epoch_uid = i.epoch_uid AND e.soa_id = i.soa_id
+ LEFT JOIN timing tm ON tm.id = v.scheduledAtId AND tm.soa_id = v.soa_id
+ WHERE i.soa_id=?
+ ORDER BY COALESCE(i.member_of_timeline, 'zzz'), LENGTH(i.instance_uid), i.instance_uid
+ """,
+ (soa_id,),
+ )
+ instances = [
+ {
+ "id": r[0],
+ "name": r[1],
+ "instance_uid": r[2],
+ "label": r[3],
+ "member_of_timeline": r[4],
+ "encounter_name": r[5],
+ "encounter_label": r[6],
+ "epoch_name": r[7],
+ "epoch_label": r[8],
+ "window_label": r[9],
+ "timing_label": r[10],
+ "timing_name": r[11],
+ "study_day": r[12],
+ }
+ for r in cur.fetchall()
+ ]
+ conn.close()
+ return instances
+
+
# API endpoint for creating new Study/SOA
@app.post("/soa")
def create_soa(payload: SOACreate):
@@ -2724,6 +2765,9 @@ def export_xlsx(soa_id: int, left: Optional[int] = None, right: Optional[int] =
except Exception as e:
# Provide an error sheet to highlight issue rather than failing entire export
concept_diff_df = pd.DataFrame([[str(e)]], columns=["ConceptDiffError"])
+ # Fetch enriched instances for header rows
+ enriched_instances = _fetch_enriched_instances(soa_id)
+
with pd.ExcelWriter(bio, engine="openpyxl") as writer:
study_df.to_excel(writer, index=False, sheet_name="Study")
df.to_excel(writer, index=False, sheet_name="SoA")
@@ -2731,6 +2775,80 @@ def export_xlsx(soa_id: int, left: Optional[int] = None, right: Optional[int] =
audit_df.to_excel(writer, index=False, sheet_name="RollbackAudit")
if concept_diff_df is not None:
concept_diff_df.to_excel(writer, index=False, sheet_name="ConceptDiff")
+
+ # Add header rows to SoA sheet to match web UI
+ # workbook = writer.book
+ worksheet = writer.sheets["SoA"]
+
+ # Insert 6 rows at the top for header rows
+ worksheet.insert_rows(1, 6)
+
+ # Build header rows
+ # Row 1: Epoch (with merged cells for consecutive same values)
+ worksheet.cell(1, 1, "")
+ worksheet.cell(1, 2, "Epoch:")
+ col_idx = 3
+ epoch_groups = [] # Track (value, start_col, end_col) for merging
+ prev_epoch = None
+ start_col = 3
+ for i, inst in enumerate(enriched_instances):
+ epoch_val = inst.get("epoch_label") or inst.get("epoch_name") or ""
+ if prev_epoch is None:
+ prev_epoch = epoch_val
+ start_col = col_idx
+ elif prev_epoch != epoch_val:
+ epoch_groups.append((prev_epoch, start_col, col_idx - 1))
+ prev_epoch = epoch_val
+ start_col = col_idx
+ col_idx += 1
+ # Add last group
+ if prev_epoch is not None:
+ epoch_groups.append((prev_epoch, start_col, col_idx - 1))
+
+ # Write and merge epoch cells
+ for epoch_val, start, end in epoch_groups:
+ worksheet.cell(1, start, epoch_val)
+ if start != end:
+ worksheet.merge_cells(
+ start_row=1, start_column=start, end_row=1, end_column=end
+ )
+
+ # Row 2: Encounter
+ worksheet.cell(2, 1, "")
+ worksheet.cell(2, 2, "Encounter:")
+ for i, inst in enumerate(enriched_instances):
+ encounter_val = (
+ inst.get("encounter_label") or inst.get("encounter_name") or ""
+ )
+ worksheet.cell(2, i + 3, encounter_val)
+
+ # Row 3: Instance (ScheduledActivityInstance)
+ worksheet.cell(3, 1, "")
+ worksheet.cell(3, 2, "Instance:")
+ for i, inst in enumerate(enriched_instances):
+ instance_val = inst.get("label") or inst.get("name") or ""
+ worksheet.cell(3, i + 3, instance_val)
+
+ # Row 4: Study Day
+ worksheet.cell(4, 1, "")
+ worksheet.cell(4, 2, "Study Day:")
+ for i, inst in enumerate(enriched_instances):
+ study_day_val = inst.get("study_day") or ""
+ worksheet.cell(4, i + 3, study_day_val)
+
+ # Row 5: Timing
+ worksheet.cell(5, 1, "")
+ worksheet.cell(5, 2, "Timing:")
+ for i, inst in enumerate(enriched_instances):
+ timing_val = inst.get("timing_label") or inst.get("timing_name") or ""
+ worksheet.cell(5, i + 3, timing_val)
+
+ # Row 6: Visit Window
+ worksheet.cell(6, 1, "")
+ worksheet.cell(6, 2, "Visit Window:")
+ for i, inst in enumerate(enriched_instances):
+ window_val = inst.get("window_label") or ""
+ worksheet.cell(6, i + 3, window_val)
bio.seek(0)
# Dynamic filename pattern: studyid_version.xlsx
# Determine study_id and version context
From c2ef2525993d38b4b9b03289e7059f0a55262e52 Mon Sep 17 00:00:00 2001
From: Darren <3921919+pendingintent@users.noreply.github.com>
Date: Mon, 26 Jan 2026 16:24:43 -0500
Subject: [PATCH 11/21] XLSX export matrix now includes a worksheet per
timeline
---
src/soa_builder/web/app.py | 231 +++++++++++++++++++++++++------------
1 file changed, 160 insertions(+), 71 deletions(-)
diff --git a/src/soa_builder/web/app.py b/src/soa_builder/web/app.py
index e3fde12..56bf8a1 100644
--- a/src/soa_builder/web/app.py
+++ b/src/soa_builder/web/app.py
@@ -2004,6 +2004,77 @@ def _fetch_enriched_instances(soa_id: int):
return instances
+def _add_header_rows_to_worksheet(worksheet, enriched_instances):
+ """Add header rows to a worksheet with instance metadata."""
+ # Insert 6 rows at the top for header rows
+ worksheet.insert_rows(1, 6)
+
+ # Build header rows
+ # Row 1: Epoch (with merged cells for consecutive same values)
+ worksheet.cell(1, 1, "")
+ worksheet.cell(1, 2, "Epoch:")
+ col_idx = 3
+ epoch_groups = [] # Track (value, start_col, end_col) for merging
+ prev_epoch = None
+ start_col = 3
+ for i, inst in enumerate(enriched_instances):
+ epoch_val = inst.get("epoch_label") or inst.get("epoch_name") or ""
+ if prev_epoch is None:
+ prev_epoch = epoch_val
+ start_col = col_idx
+ elif prev_epoch != epoch_val:
+ epoch_groups.append((prev_epoch, start_col, col_idx - 1))
+ prev_epoch = epoch_val
+ start_col = col_idx
+ col_idx += 1
+ # Add last group
+ if prev_epoch is not None:
+ epoch_groups.append((prev_epoch, start_col, col_idx - 1))
+
+ # Write and merge epoch cells
+ for epoch_val, start, end in epoch_groups:
+ worksheet.cell(1, start, epoch_val)
+ if start != end:
+ worksheet.merge_cells(
+ start_row=1, start_column=start, end_row=1, end_column=end
+ )
+
+ # Row 2: Encounter
+ worksheet.cell(2, 1, "")
+ worksheet.cell(2, 2, "Encounter:")
+ for i, inst in enumerate(enriched_instances):
+ encounter_val = inst.get("encounter_label") or inst.get("encounter_name") or ""
+ worksheet.cell(2, i + 3, encounter_val)
+
+ # Row 3: Instance (ScheduledActivityInstance)
+ worksheet.cell(3, 1, "")
+ worksheet.cell(3, 2, "Instance:")
+ for i, inst in enumerate(enriched_instances):
+ instance_val = inst.get("label") or inst.get("name") or ""
+ worksheet.cell(3, i + 3, instance_val)
+
+ # Row 4: Study Day
+ worksheet.cell(4, 1, "")
+ worksheet.cell(4, 2, "Study Day:")
+ for i, inst in enumerate(enriched_instances):
+ study_day_val = inst.get("study_day") or ""
+ worksheet.cell(4, i + 3, study_day_val)
+
+ # Row 5: Timing
+ worksheet.cell(5, 1, "")
+ worksheet.cell(5, 2, "Timing:")
+ for i, inst in enumerate(enriched_instances):
+ timing_val = inst.get("timing_label") or inst.get("timing_name") or ""
+ worksheet.cell(5, i + 3, timing_val)
+
+ # Row 6: Visit Window
+ worksheet.cell(6, 1, "")
+ worksheet.cell(6, 2, "Visit Window:")
+ for i, inst in enumerate(enriched_instances):
+ window_val = inst.get("window_label") or ""
+ worksheet.cell(6, i + 3, window_val)
+
+
# API endpoint for creating new Study/SOA
@app.post("/soa")
def create_soa(payload: SOACreate):
@@ -2768,87 +2839,105 @@ def export_xlsx(soa_id: int, left: Optional[int] = None, right: Optional[int] =
# Fetch enriched instances for header rows
enriched_instances = _fetch_enriched_instances(soa_id)
+ # Fetch timelines
+ conn_tl = _connect()
+ cur_tl = conn_tl.cursor()
+ cur_tl.execute(
+ """
+ SELECT schedule_timeline_uid,name,main_timeline
+ FROM schedule_timelines
+ WHERE soa_id=?
+ ORDER BY main_timeline DESC, name
+ """,
+ (soa_id,),
+ )
+ timelines = [
+ {
+ "schedule_timeline_uid": r[0],
+ "name": r[1],
+ "main_timeline": bool(r[2]),
+ }
+ for r in cur_tl.fetchall()
+ ]
+ conn_tl.close()
+
+ # Group enriched instances by timeline
+ instances_by_timeline = {}
+ for inst in enriched_instances:
+ timeline_key = inst.get("member_of_timeline") or "unassigned"
+ if timeline_key not in instances_by_timeline:
+ instances_by_timeline[timeline_key] = []
+ instances_by_timeline[timeline_key].append(inst)
+
with pd.ExcelWriter(bio, engine="openpyxl") as writer:
study_df.to_excel(writer, index=False, sheet_name="Study")
- df.to_excel(writer, index=False, sheet_name="SoA")
mapping_df.to_excel(writer, index=False, sheet_name="ConceptMappings")
audit_df.to_excel(writer, index=False, sheet_name="RollbackAudit")
if concept_diff_df is not None:
concept_diff_df.to_excel(writer, index=False, sheet_name="ConceptDiff")
- # Add header rows to SoA sheet to match web UI
- # workbook = writer.book
- worksheet = writer.sheets["SoA"]
-
- # Insert 6 rows at the top for header rows
- worksheet.insert_rows(1, 6)
-
- # Build header rows
- # Row 1: Epoch (with merged cells for consecutive same values)
- worksheet.cell(1, 1, "")
- worksheet.cell(1, 2, "Epoch:")
- col_idx = 3
- epoch_groups = [] # Track (value, start_col, end_col) for merging
- prev_epoch = None
- start_col = 3
- for i, inst in enumerate(enriched_instances):
- epoch_val = inst.get("epoch_label") or inst.get("epoch_name") or ""
- if prev_epoch is None:
- prev_epoch = epoch_val
- start_col = col_idx
- elif prev_epoch != epoch_val:
- epoch_groups.append((prev_epoch, start_col, col_idx - 1))
- prev_epoch = epoch_val
- start_col = col_idx
- col_idx += 1
- # Add last group
- if prev_epoch is not None:
- epoch_groups.append((prev_epoch, start_col, col_idx - 1))
+ # Create a worksheet for each timeline
+ if timelines:
+ for timeline in timelines:
+ timeline_uid = timeline["schedule_timeline_uid"]
+ timeline_name = timeline["name"]
+ timeline_instances = instances_by_timeline.get(timeline_uid, [])
+
+ if not timeline_instances:
+ continue
+
+ # Build matrix data for this timeline
+ cell_lookup = {
+ (c["instance_id"], c["activity_id"]): c.get("status", "")
+ for c in cells
+ if c.get("instance_id") is not None
+ and c.get("activity_id") is not None
+ }
+
+ # Build instance headers for this timeline
+ instance_headers_tl = [inst["name"] for inst in timeline_instances]
+
+ # Build rows for this timeline
+ rows_tl = []
+ for a in activities:
+ row = [a["name"]]
+ for inst in timeline_instances:
+ row.append(cell_lookup.get((inst["id"], a["id"]), ""))
+ rows_tl.append(row)
- # Write and merge epoch cells
- for epoch_val, start, end in epoch_groups:
- worksheet.cell(1, start, epoch_val)
- if start != end:
- worksheet.merge_cells(
- start_row=1, start_column=start, end_row=1, end_column=end
+ # Create DataFrame for this timeline
+ df_tl = pd.DataFrame(
+ rows_tl, columns=["Activity"] + instance_headers_tl
)
- # Row 2: Encounter
- worksheet.cell(2, 1, "")
- worksheet.cell(2, 2, "Encounter:")
- for i, inst in enumerate(enriched_instances):
- encounter_val = (
- inst.get("encounter_label") or inst.get("encounter_name") or ""
- )
- worksheet.cell(2, i + 3, encounter_val)
-
- # Row 3: Instance (ScheduledActivityInstance)
- worksheet.cell(3, 1, "")
- worksheet.cell(3, 2, "Instance:")
- for i, inst in enumerate(enriched_instances):
- instance_val = inst.get("label") or inst.get("name") or ""
- worksheet.cell(3, i + 3, instance_val)
-
- # Row 4: Study Day
- worksheet.cell(4, 1, "")
- worksheet.cell(4, 2, "Study Day:")
- for i, inst in enumerate(enriched_instances):
- study_day_val = inst.get("study_day") or ""
- worksheet.cell(4, i + 3, study_day_val)
-
- # Row 5: Timing
- worksheet.cell(5, 1, "")
- worksheet.cell(5, 2, "Timing:")
- for i, inst in enumerate(enriched_instances):
- timing_val = inst.get("timing_label") or inst.get("timing_name") or ""
- worksheet.cell(5, i + 3, timing_val)
-
- # Row 6: Visit Window
- worksheet.cell(6, 1, "")
- worksheet.cell(6, 2, "Visit Window:")
- for i, inst in enumerate(enriched_instances):
- window_val = inst.get("window_label") or ""
- worksheet.cell(6, i + 3, window_val)
+ # Add concepts columns
+ if len(concepts_strings) == len(df_tl):
+ df_tl.insert(1, "Concepts", concepts_strings)
+ df_tl["Concept UIDs"] = concept_titles_strings
+
+ # Sanitize sheet name (max 31 chars, no special chars)
+ sheet_name = f"SoA - {timeline_name}"[:31]
+ sheet_name = (
+ sheet_name.replace("/", "-")
+ .replace("\\", "-")
+ .replace("*", "-")
+ .replace("?", "-")
+ .replace(":", "-")
+ .replace("[", "-")
+ .replace("]", "-")
+ )
+
+ # Write to Excel
+ df_tl.to_excel(writer, index=False, sheet_name=sheet_name)
+
+ # Add header rows
+ worksheet_tl = writer.sheets[sheet_name]
+ _add_header_rows_to_worksheet(worksheet_tl, timeline_instances)
+ else:
+ # No timelines, create single SoA sheet as before
+ df.to_excel(writer, index=False, sheet_name="SoA")
+ worksheet = writer.sheets["SoA"]
+ _add_header_rows_to_worksheet(worksheet, enriched_instances)
bio.seek(0)
# Dynamic filename pattern: studyid_version.xlsx
# Determine study_id and version context
From 821c15fc00452c262d94a6f67dd650541c52eea7 Mon Sep 17 00:00:00 2001
From: Darren <3921919+pendingintent@users.noreply.github.com>
Date: Tue, 3 Feb 2026 16:33:46 -0500
Subject: [PATCH 12/21] All timelines now collpase/expand biomedical concepts
---
.../web/templates/concepts_cell.html | 23 ++++++++++---------
src/soa_builder/web/templates/edit.html | 1 +
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/soa_builder/web/templates/concepts_cell.html b/src/soa_builder/web/templates/concepts_cell.html
index 02b1614..51b1715 100644
--- a/src/soa_builder/web/templates/concepts_cell.html
+++ b/src/soa_builder/web/templates/concepts_cell.html
@@ -1,8 +1,9 @@
{# Partial for concepts cell in matrix (add/remove only; concepts immutable) #}
{% set concept_count = selected_list | length %}
-
+{% set cell_id_suffix = timeline_context ~ '-' ~ activity_id if timeline_context is defined else activity_id %}
+
{% if edit %}
-
+
{% endblock %}
\ No newline at end of file
From 198c4e580ef0266b25125541ddcb0b4d234c27a9 Mon Sep 17 00:00:00 2001
From: Darren <3921919+pendingintent@users.noreply.github.com>
Date: Thu, 5 Feb 2026 09:03:44 -0500
Subject: [PATCH 14/21] Added reorder instances functionality
---
src/soa_builder/web/routers/instances.py | 48 +++++++++++++++++++++++-
1 file changed, 46 insertions(+), 2 deletions(-)
diff --git a/src/soa_builder/web/routers/instances.py b/src/soa_builder/web/routers/instances.py
index fcb63af..712575d 100644
--- a/src/soa_builder/web/routers/instances.py
+++ b/src/soa_builder/web/routers/instances.py
@@ -1,8 +1,8 @@
import logging
import os
-from typing import Optional
+from typing import Optional, List
-from fastapi import APIRouter, HTTPException, Request, Form
+from fastapi import APIRouter, HTTPException, Request, Form, Body
from fastapi.responses import JSONResponse, HTMLResponse, RedirectResponse
from fastapi.templating import Jinja2Templates
@@ -420,3 +420,47 @@ def delete_instance(soa_id: int, instance_id: int):
def ui_del_instance(request: Request, soa_id: int, instance_id: int):
delete_instance(soa_id, instance_id)
return RedirectResponse(url=f"/ui/soa/{int(soa_id)}/instances", status_code=303)
+
+
+# API endpoint to reorder instances
+@router.post("/soa/{soa_id}/instances/reorder", response_class=JSONResponse)
+def reorder_instances_api(
+ soa_id: int,
+ order: List[int] = Body(..., embed=True), # JSON body: {"order":[...]}
+):
+ if not soa_exists(soa_id):
+ raise HTTPException(404, "SOA not found")
+ if not order:
+ raise HTTPException(400, "Order list required")
+
+ conn = _connect()
+ cur = conn.cursor()
+ cur.execute(
+ "SELECT id,name FROM instances WHERE soa_id=? ORDER BY order_index", (soa_id,)
+ )
+ rows = cur.fetchall()
+ old_order = [r[0] for r in rows] # IDs for API response
+ id_to_name = {r[0]: r[1] for r in rows}
+ old_order_names = [r[1] for r in rows] # Names for audit
+
+ cur.execute("SELECT id,name FROM instances WHERE soa_id=?", (soa_id,))
+ existing = {r[0] for r in cur.fetchall()}
+ if set(order) - existing:
+ conn.close()
+ raise HTTPException(400, "Order contains invalid instance id")
+
+ for idx, instance_id in enumerate(order, start=1):
+ cur.execute("UPDATE instances SET order_index=? WHERE id=?", (idx, instance_id))
+ conn.commit()
+ conn.close()
+
+ new_order_names = [id_to_name.get(iid, str(iid)) for iid in order]
+
+ _record_instance_audit(
+ soa_id,
+ "reorder",
+ instance_id=None,
+ before={"old_order": old_order_names},
+ after={"new_order": new_order_names},
+ )
+ return JSONResponse({"ok": True, "old_order": old_order, "new_order": order})
From 116ebffd6e4f78aa4b2f887b6f703df4053eb20e Mon Sep 17 00:00:00 2001
From: Darren <3921919+pendingintent@users.noreply.github.com>
Date: Thu, 5 Feb 2026 09:04:51 -0500
Subject: [PATCH 15/21] Added return to edit page navigation
---
src/soa_builder/web/templates/arms.html | 6 +++++
src/soa_builder/web/templates/elements.html | 6 +++++
src/soa_builder/web/templates/encounters.html | 6 +++++
src/soa_builder/web/templates/epochs.html | 24 +++++++++++--------
src/soa_builder/web/templates/rules.html | 6 +++++
.../web/templates/schedule_timelines.html | 6 +++++
src/soa_builder/web/templates/timings.html | 6 +++++
7 files changed, 50 insertions(+), 10 deletions(-)
diff --git a/src/soa_builder/web/templates/arms.html b/src/soa_builder/web/templates/arms.html
index 0a7df12..a15dddf 100644
--- a/src/soa_builder/web/templates/arms.html
+++ b/src/soa_builder/web/templates/arms.html
@@ -2,6 +2,12 @@
{% block content %}
Arms for SoA {{ soa_id }}
+
+
{% for e in epochs %}