chellow 1767090201.0.0__tar.gz → 1767956592.0.0__tar.gz

{chellow-1767090201.0.0 → chellow-1767956592.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1767090201.0.0
+Version: 1767956592.0.0
 Summary: Web Application for checking UK energy bills.
 Project-URL: Homepage, https://github.com/WessexWater/chellow
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)

chellow-1767956592.0.0/VERSION

@@ -0,0 +1 @@
+__version__ = "1767956592.0.0"

{chellow-1767090201.0.0 → chellow-1767956592.0.0}/chellow/e/aahedc.py

@@ -3,7 +3,7 @@ from decimal import Decimal
 from sqlalchemy import select
 
 from chellow.models import Contract, RateScript
-from chellow.national_grid import api_get
+from chellow.national_grid import csv_get, parse_date
 from chellow.utils import ct_datetime, to_utc
 
 
@@ -36,9 +36,11 @@ def national_grid_import(sess, log, set_progress, s):
             sess, contract_name, "", {}, to_utc(ct_datetime(1996, 4, 1)), None, {}
         )
 
-    params = {"sql": """SELECT * FROM "ffd29cc8-3c55-4e83-aa0e-73212d4fedba" """}
-    res_j = api_get(s, "datastore_search_sql", params=params)
-    for record in res_j["result"]["records"]:
+    path = (
+        "dataset/43d94335-c97f-4939-a8b9-607d2cfb3734/resource/"
+        "ffd29cc8-3c55-4e83-aa0e-73212d4fedba/download"
+    )
+    for record in csv_get(s, path):
         # {
         #   "_full_text": "'-07':4 '-15':5 '0.012247':7 '0.028 '2026':2 'final':1",
         #   "Published Date": "2025-07-15",
@@ -71,11 +73,11 @@ def national_grid_import(sess, log, set_progress, s):
         except KeyError:
             rs_record = rs_script["record"] = {}
 
-        record_published_date = record["Published Date"]
+        record_published_date = parse_date(record["Published Date"])
 
         if (
             "Published Date" not in rs_record
-            or rs_record["Published Date"] < record_published_date
+            or parse_date(rs_record["Published Date"]) < record_published_date
         ):
             rs_script["record"] = record
             rs_script["aahedc_gbp_per_gsp_kwh"] = Decimal(

chellow-1767956592.0.0/chellow/e/issues.py

@@ -0,0 +1,31 @@
+from sqlalchemy import select
+
+from chellow.models import Supply, User
+
+
+def make_issue_bundles(sess, issues):
+    return [make_issue_bundle(sess, issue) for issue in issues]
+
+
+def make_issue_bundle(sess, issue):
+    props = issue.properties
+    supply_bundles = []
+    if "owner_id" in props:
+        owner = User.get_by_id(sess, props["owner_id"])
+    else:
+        owner = None
+    bundle = {
+        "issue": issue,
+        "latest_entry": None if len(issue.entries) == 0 else issue.entries[-1],
+        "supplies": supply_bundles,
+        "owner": owner,
+    }
+    for supply in sess.scalars(
+        select(Supply)
+        .where(Supply.id.in_(props.get("supply_ids", [])))
+        .order_by(Supply.id)
+    ).all():
+        era = supply.eras[0]
+        site = era.get_physical_site(sess)
+        supply_bundles.append({"supply": supply, "era": supply.eras[0], "site": site})
+    return bundle

{chellow-1767090201.0.0 → chellow-1767956592.0.0}/chellow/e/tnuos.py

@@ -2,7 +2,7 @@ from sqlalchemy import select
 
 
 from chellow.models import Contract, RateScript
-from chellow.national_grid import api_get
+from chellow.national_grid import csv_get, parse_date
 from chellow.utils import (
     ct_datetime,
     to_utc,
@@ -101,9 +101,11 @@ def national_grid_import(sess, log, set_progress, s):
         )
         sess.commit()
 
-    params = {"sql": """SELECT * FROM "dcca94fd-343e-4d4e-8c5d-66009dec4ad3" """}
-    res_j = api_get(s, "datastore_search_sql", params=params)
-    for record in res_j["result"]["records"]:
+    path = (
+        "dataset/eaef4708-1100-4ad9-98d5-d892f3c9a56c/resource/"
+        "dcca94fd-343e-4d4e-8c5d-66009dec4ad3/download"
+    )
+    for record in csv_get(s, path):
         # {
         #   "_id": 1,
         #   "Publication": "Final",
@@ -134,10 +136,10 @@ def national_grid_import(sess, log, set_progress, s):
             bands = rs_script["bands"] = {}
 
         record_key = record["TDR Band"]
-        record_published_date = record["Published_Date"]
+        record_published_date = parse_date(record["Published_Date"])
 
         band = bands.get(record_key)
-        if band is None or band["Published_Date"] < record_published_date:
+        if band is None or parse_date(band["Published_Date"]) < record_published_date:
             if "TDR Tariff" not in record:
                 tdr_tariff = [
                     v for k, v in record.items() if k.startswith("TDR Tariff")

{chellow-1767090201.0.0 → chellow-1767956592.0.0}/chellow/e/views.py

@@ -23,6 +23,7 @@ from flask import (
 
 from sqlalchemy import (
     Float,
+    Integer,
     case,
     cast,
     delete,
@@ -46,6 +47,7 @@ import chellow.e.dno_rate_parser
 import chellow.e.lcc
 from chellow.e.computer import SupplySource, contract_func, forecast_date
 from chellow.e.energy_management import totals_runner
+from chellow.e.issues import make_issue_bundle, make_issue_bundles
 from chellow.models import (
     Batch,
     BatchFile,
@@ -92,6 +94,8 @@ from chellow.models import (
     Ssc,
     Supply,
     Tpr,
+    User,
+    UserRole,
     VoltageLevel,
 )
 from chellow.utils import (
@@ -1312,98 +1316,14 @@ def dc_contracts_hh_import_get(contract_id, import_id):
 @e.route("/dc_contracts/<int:contract_id>/issues")
 def dc_issues_get(contract_id):
     contract = Contract.get_dc_by_id(g.sess, contract_id)
-    bundles = []
-    for issue in g.sess.scalars(
+    issues = g.sess.scalars(
         select(Issue)
         .where(Issue.contract == contract)
         .order_by(Issue.is_open.desc(), Issue.date_created)
-    ):
-        supply_bundles = []
-        bundle = {
-            "issue": issue,
-            "latest_entry": None if len(issue.entries) == 0 else issue.entries[-1],
-            "supplies": supply_bundles,
-        }
-        for supply in g.sess.scalars(
-            select(Supply)
-            .where(Supply.id.in_(issue.properties.get("supply_ids", [])))
-            .order_by(Supply.id)
-        ).all():
-            era = supply.eras[0]
-            site = era.get_physical_site(g.sess)
-            supply_bundles.append(
-                {"supply": supply, "era": supply.eras[0], "site": site}
-            )
-        bundles.append(bundle)
-
-    return render_template(
-        "dc_issues.html",
-        contract=contract,
-        issue_bundles=bundles,
     )
+    bundles = make_issue_bundles(g.sess, issues)
 
-
-@e.route("/dc_contracts/<int:contract_id>/issues/download")
-def dc_issues_download_get(contract_id):
-    contract = Contract.get_dc_by_id(g.sess, contract_id)
-    titles = (
-        "issue_id",
-        "contract_name",
-        "date_created",
-        "status",
-        "subject",
-        "imp_mpan_core",
-        "exp_mpan_core",
-        "site_code",
-        "site_name",
-        "latest_entry_timestamp",
-        "latest_entry_markdown",
-    )
-    rows = []
-    for issue in g.sess.scalars(
-        select(Issue)
-        .where(Issue.contract == contract)
-        .order_by(Issue.is_open.desc(), Issue.date_created)
-    ):
-        props = issue.properties
-        values = {
-            "contract_name": contract.name,
-            "issue_id": issue.id,
-            "date_created": issue.date_created,
-            "status": "open" if issue.is_open else "closed",
-            "subject": props.get("subject"),
-            "imp_mpan_core": None,
-            "exp_mpan_core": None,
-            "site_code": None,
-            "site_name": None,
-        }
-        if len(issue.entries) == 0:
-            values["latest_entry_timestamp"] = None
-            values["latest_entry_markdown"] = None
-        else:
-            entry = issue.entries[-1]
-            values["latest_entry_timestamp"] = entry.timestamp
-            values["latest_entry_markdown"] = entry.markdown
-
-        supply_ids = props.get("supply_ids", [])
-        if len(supply_ids) == 0:
-            rows.append([csv_make_val(values[title]) for title in titles])
-        else:
-            for supply in g.sess.scalars(
-                select(Supply)
-                .where(Supply.id.in_(issue.properties.get("supply_ids", [])))
-                .order_by(Supply.id)
-            ).all():
-                values = values.copy()
-                era = supply.eras[0]
-                site = era.get_physical_site(g.sess)
-                values["imp_mpan_core"] = era.imp_mpan_core
-                values["exp_mpan_core"] = era.exp_mpan_core
-                values["site_code"] = site.code
-                values["site_name"] = site.name
-                rows.append([csv_make_val(values[title]) for title in titles])
-
-    return _csv_response("dc_issues.csv", titles, rows)
+    return render_template("dc_issues.html", contract=contract, issue_bundles=bundles)
 
 
 @e.route("/dc_contracts/<int:contract_id>/add_issue")
@@ -1420,7 +1340,8 @@ def dc_issue_add_post(contract_id):
         subject = req_str("subject")
 
         now = utc_datetime_now()
-        issue = contract.insert_issue(g.sess, now, {"subject": subject})
+        properties = {"subject": subject, "owner_id": g.user.id}
+        issue = contract.insert_issue(g.sess, now, properties)
         g.sess.commit()
         return chellow_redirect(f"/dc_issues/{issue.id}", 303)
     except BadRequest as e:
@@ -1433,22 +1354,35 @@ def dc_issue_add_post(contract_id):
 @e.route("/dc_issues/<int:issue_id>")
 def dc_issue_get(issue_id):
     issue = Issue.get_by_id(g.sess, issue_id)
+    props = issue.properties
     supply_bundles = []
     for supply in g.sess.scalars(
         select(Supply)
-        .where(Supply.id.in_(issue.properties.get("supply_ids", [])))
+        .where(Supply.id.in_(props.get("supply_ids", [])))
         .order_by(Supply.id)
     ).all():
         era = supply.eras[0]
         site = era.get_physical_site(g.sess)
         supply_bundles.append({"supply": supply, "era": supply.eras[0], "site": site})
-    return render_template("dc_issue.html", issue=issue, supply_bundles=supply_bundles)
+    if "owner_id" in props:
+        owner = User.get_by_id(g.sess, props["owner_id"])
+    else:
+        owner = None
+    return render_template(
+        "dc_issue.html", issue=issue, supply_bundles=supply_bundles, owner=owner
+    )
 
 
 @e.route("/dc_issues/<int:issue_id>/edit")
 def dc_issue_edit_get(issue_id):
     issue = Issue.get_by_id(g.sess, issue_id)
-    return render_template("dc_issue_edit.html", issue=issue)
+    users = g.sess.scalars(
+        select(User)
+        .join(UserRole)
+        .where(UserRole.code == "editor")
+        .order_by(User.email_address)
+    )
+    return render_template("dc_issue_edit.html", issue=issue, users=users)
 
 
 @e.route("/dc_issues/<int:issue_id>/edit", methods=["POST"])
@@ -1457,13 +1391,23 @@ def dc_issue_edit_post(issue_id):
         issue = Issue.get_by_id(g.sess, issue_id)
         date_created = req_date("date_created")
         is_open = req_checkbox("is_open")
-        properties = req_json("properties")
+        owner_id = req_int("owner_id")
+        properties = issue.properties
+        properties["owner_id"] = owner_id
         issue.update(date_created, is_open, properties)
         g.sess.commit()
         return chellow_redirect(f"/dc_issues/{issue.id}", 303)
     except BadRequest as e:
         flash(e.description)
-        return make_response(render_template("dc_issue_edit.html", issue=issue), 400)
+        users = g.sess.scalars(
+            select(User)
+            .join(UserRole)
+            .where(UserRole.code == "editor")
+            .order_by(User.email_address)
+        )
+        return make_response(
+            render_template("dc_issue_edit.html", issue=issue, users=users), 400
+        )
 
 
 @e.route("/dc_issues/<int:issue_id>/edit", methods=["DELETE"])
@@ -2724,6 +2668,52 @@ def isd_post():
     return chellow_redirect("/isd", 303)
 
 
+@e.route("/issues")
+def issues_get():
+    issues = g.sess.scalars(
+        select(Issue).order_by(Issue.is_open.desc(), Issue.date_created)
+    )
+    mop_contracts = g.sess.scalars(
+        select(Contract)
+        .join(Issue)
+        .join(MarketRole)
+        .where(MarketRole.code == "M")
+        .distinct()
+        .order_by(Contract.name)
+    ).all()
+    dc_contracts = g.sess.scalars(
+        select(Contract)
+        .join(Issue)
+        .join(MarketRole)
+        .where(MarketRole.code == "C")
+        .distinct()
+        .order_by(Contract.name)
+    ).all()
+    supplier_contracts = g.sess.scalars(
+        select(Contract)
+        .join(Issue)
+        .join(MarketRole)
+        .where(MarketRole.code == "X")
+        .distinct()
+        .order_by(Contract.name)
+    ).all()
+    owners = g.sess.scalars(
+        select(User)
+        .join(Issue, User.id == cast(Issue.properties["owner_id"], Integer))
+        .distinct()
+        .order_by(User.email_address)
+    ).all()
+    bundles = make_issue_bundles(g.sess, issues)
+    return render_template(
+        "issues.html",
+        issue_bundles=bundles,
+        mop_contracts=mop_contracts,
+        dc_contracts=dc_contracts,
+        supplier_contracts=supplier_contracts,
+        owners=owners,
+    )
+
+
 @e.route("/lafs")
 def lafs_get():
     llfc_id = req_int("llfc_id")
@@ -3518,6 +3508,198 @@ def mop_element_edit_delete(element_id):
         )
 
 
+@e.route("/mop_contracts/<int:contract_id>/issues")
+def mop_issues_get(contract_id):
+    contract = Contract.get_mop_by_id(g.sess, contract_id)
+    issues = g.sess.scalars(
+        select(Issue)
+        .where(Issue.contract == contract)
+        .order_by(Issue.is_open.desc(), Issue.date_created)
+    )
+    bundles = make_issue_bundles(g.sess, issues)
+
+    return render_template("mop_issues.html", contract=contract, issue_bundles=bundles)
+
+
+@e.route("/mop_contracts/<int:contract_id>/add_issue")
+def mop_issue_add_get(contract_id):
+    contract = Contract.get_mop_by_id(g.sess, contract_id)
+
+    return render_template("mop_issue_add.html", contract=contract)
+
+
+@e.route("/mop_contracts/<int:contract_id>/add_issue", methods=["POST"])
+def mop_issue_add_post(contract_id):
+    contract = Contract.get_mop_by_id(g.sess, contract_id)
+    try:
+        subject = req_str("subject")
+
+        now = utc_datetime_now()
+        properties = {"subject": subject, "owner_id": g.user.id}
+        issue = contract.insert_issue(g.sess, now, properties)
+        g.sess.commit()
+        return chellow_redirect(f"/mop_issues/{issue.id}", 303)
+    except BadRequest as e:
+        flash(e.description)
+        return make_response(
+            render_template("mop_issue_add.html", contract=contract), 400
+        )
+
+
+@e.route("/mop_issues/<int:issue_id>")
+def mop_issue_get(issue_id):
+    issue = Issue.get_by_id(g.sess, issue_id)
+    props = issue.properties
+    supply_bundles = []
+    for supply in g.sess.scalars(
+        select(Supply)
+        .where(Supply.id.in_(props.get("supply_ids", [])))
+        .order_by(Supply.id)
+    ).all():
+        era = supply.eras[0]
+        site = era.get_physical_site(g.sess)
+        supply_bundles.append({"supply": supply, "era": supply.eras[0], "site": site})
+    if "owner_id" in props:
+        owner = User.get_by_id(g.sess, props["owner_id"])
+    else:
+        owner = None
+    return render_template(
+        "mop_issue.html", issue=issue, supply_bundles=supply_bundles, owner=owner
+    )
+
+
+@e.route("/mop_issues/<int:issue_id>/edit")
+def mop_issue_edit_get(issue_id):
+    issue = Issue.get_by_id(g.sess, issue_id)
+    users = g.sess.scalars(
+        select(User)
+        .join(UserRole)
+        .where(UserRole.code == "editor")
+        .order_by(User.email_address)
+    )
+    return render_template("mop_issue_edit.html", issue=issue, users=users)
+
+
+@e.route("/mop_issues/<int:issue_id>/edit", methods=["POST"])
+def mop_issue_edit_post(issue_id):
+    try:
+        issue = Issue.get_by_id(g.sess, issue_id)
+        date_created = req_date("date_created")
+        is_open = req_checkbox("is_open")
+        owner_id = req_int("owner_id")
+        properties = issue.properties
+        properties["owner_id"] = owner_id
+        issue.update(date_created, is_open, properties)
+        g.sess.commit()
+        return chellow_redirect(f"/mop_issues/{issue.id}", 303)
+    except BadRequest as e:
+        flash(e.description)
+        users = g.sess.scalars(
+            select(User)
+            .join(UserRole)
+            .where(UserRole.code == "editor")
+            .order_by(User.email_address)
+        )
+        return make_response(
+            render_template("mop_issue_edit.html", issue=issue, users=users), 400
+        )
+
+
+@e.route("/mop_issues/<int:issue_id>/edit", methods=["DELETE"])
+def mop_issue_edit_delete(issue_id):
+    try:
+        issue = Issue.get_by_id(g.sess, issue_id)
+        contract = issue.contract
+        issue.delete(g.sess)
+        g.sess.commit()
+        return hx_redirect(f"/mop_contracts/{contract.id}/issues", 303)
+    except BadRequest as e:
+        flash(e.description)
+        return make_response(render_template("mop_issue_edit.html", issue=issue), 400)
+
+
+@e.route("/mop_issues/<int:issue_id>/attach_supply")
+def mop_issue_attach_supply_get(issue_id):
+    issue = Issue.get_by_id(g.sess, issue_id)
+    return render_template("mop_issue_attach_supply.html", issue=issue)
+
+
+@e.route("/mop_issues/<int:issue_id>/attach_supply", methods=["POST"])
+def mop_issue_attach_supply_post(issue_id):
+    issue = Issue.get_by_id(g.sess, issue_id)
+    try:
+        mpan_core_str = req_str("mpan_core")
+        mpan_core = parse_mpan_core(mpan_core_str)
+        supply = Supply.get_by_mpan_core(g.sess, mpan_core)
+
+        props = issue.properties
+        supply_ids = props.get("supply_ids", [])
+        supply_ids.append(supply.id)
+        props["supply_ids"] = supply_ids
+        issue.update_properties(props)
+        g.sess.commit()
+        return chellow_redirect(f"/mop_issues/{issue.id}", 303)
+    except BadRequest as e:
+        flash(e.description)
+        return make_response(
+            render_template("mop_issue_attach_supply.html", issue=issue), 400
+        )
+
+
+@e.route("/mop_issues/<int:issue_id>/add_entry")
+def mop_entry_add_get(issue_id):
+    issue = Issue.get_by_id(g.sess, issue_id)
+    return render_template("mop_entry_add.html", issue=issue)
+
+
+@e.route("/mop_issues/<int:issue_id>/add_entry", methods=["POST"])
+def mop_entry_add_post(issue_id):
+    issue = Issue.get_by_id(g.sess, issue_id)
+    try:
+        markdown = req_markdown("markdown")
+
+        issue.add_entry(g.sess, markdown)
+        g.sess.commit()
+        return chellow_redirect(f"/mop_issues/{issue.id}", 303)
+    except BadRequest as e:
+        flash(e.description)
+        return make_response(render_template("mop_entry_add.html", issue=issue), 400)
+
+
+@e.route("/mop_entries/<int:entry_id>/edit")
+def mop_entry_edit_get(entry_id):
+    entry = IssueEntry.get_by_id(g.sess, entry_id)
+    return render_template("mop_entry_edit.html", entry=entry)
+
+
+@e.route("/mop_entries/<int:entry_id>/edit", methods=["POST"])
+def mop_entry_edit_post(entry_id):
+    entry = IssueEntry.get_by_id(g.sess, entry_id)
+    try:
+        markdown = req_markdown("markdown")
+        timestamp = req_date("timestamp")
+
+        entry.update(timestamp, markdown)
+        g.sess.commit()
+        return chellow_redirect(f"/mop_issues/{entry.issue.id}", 303)
+    except BadRequest as e:
+        flash(e.description)
+        return make_response(render_template("mop_entry_edit.html", entry=entry), 400)
+
+
+@e.route("/mop_entries/<int:entry_id>/edit", methods=["DELETE"])
+def mop_entry_edit_delete(entry_id):
+    try:
+        entry = IssueEntry.get_by_id(g.sess, entry_id)
+        issue = entry.issue
+        entry.delete(g.sess)
+        g.sess.commit()
+        return hx_redirect(f"/mop_issues/{issue.id}", 303)
+    except BadRequest as e:
+        flash(e.description)
+        return make_response(render_template("mop_entry_edit.html", entry=entry), 400)
+
+
 @e.route("/mop_rate_scripts/<int:rate_script_id>")
 def mop_rate_script_get(rate_script_id):
     rate_script = RateScript.get_mop_by_id(g.sess, rate_script_id)
@@ -6057,25 +6239,14 @@ def supplier_element_edit_delete(element_id):
 @e.route("/supplier_contracts/<int:contract_id>/issues")
 def supplier_issues_get(contract_id):
     contract = Contract.get_supplier_by_id(g.sess, contract_id)
-    bundles = []
-    for issue in g.sess.scalars(
+    issues = g.sess.scalars(
         select(Issue)
         .where(Issue.contract == contract)
         .order_by(Issue.is_open.desc(), Issue.date_created)
-    ):
-        bundle = {}
-        bundle["issue"] = issue
-        bundle["supplies"] = g.sess.scalars(
-            select(Supply)
-            .where(Supply.id.in_(issue.properties.get("supply_ids", [])))
-            .order_by(Supply.id)
-        ).all()
-        bundles.append(bundle)
-
+    )
+    bundles = make_issue_bundles(g.sess, issues)
     return render_template(
-        "supplier_issues.html",
-        contract=contract,
-        issue_bundles=bundles,
+        "supplier_issues.html", contract=contract, issue_bundles=bundles
     )
 
 
@@ -6093,7 +6264,8 @@ def supplier_issue_add_post(contract_id):
         subject = req_str("subject")
 
         now = utc_datetime_now()
-        issue = contract.insert_issue(g.sess, now, {"subject": subject})
+        properties = {"subject": subject, "owner_id": g.user.id}
+        issue = contract.insert_issue(g.sess, now, properties)
         g.sess.commit()
         return chellow_redirect(f"/supplier_issues/{issue.id}", 303)
     except BadRequest as e:
@@ -6106,18 +6278,20 @@ def supplier_issue_add_post(contract_id):
 @e.route("/supplier_issues/<int:issue_id>")
 def supplier_issue_get(issue_id):
     issue = Issue.get_by_id(g.sess, issue_id)
-    supplies = g.sess.scalars(
-        select(Supply)
-        .where(Supply.id.in_(issue.properties.get("supply_ids", [])))
-        .order_by(Supply.id)
-    )
-    return render_template("supplier_issue.html", issue=issue, supplies=supplies)
+    issue_bundle = make_issue_bundle(g.sess, issue)
+    return render_template("supplier_issue.html", issue_bundle=issue_bundle)
 
 
 @e.route("/supplier_issues/<int:issue_id>/edit")
 def supplier_issue_edit_get(issue_id):
     issue = Issue.get_by_id(g.sess, issue_id)
-    return render_template("supplier_issue_edit.html", issue=issue)
+    users = g.sess.scalars(
+        select(User)
+        .join(UserRole)
+        .where(UserRole.code == "editor")
+        .order_by(User.email_address)
+    )
+    return render_template("supplier_issue_edit.html", issue=issue, users=users)
 
 
 @e.route("/supplier_issues/<int:issue_id>/edit", methods=["POST"])
@@ -6127,6 +6301,9 @@ def supplier_issue_edit_post(issue_id):
         date_created = req_date("date_created")
         is_open = req_checkbox("is_open")
         properties = req_json("properties")
+        owner_id = req_int("owner_id")
+        properties = issue.properties
+        properties["owner_id"] = owner_id
         issue.update(date_created, is_open, properties)
         g.sess.commit()
         return chellow_redirect(f"/supplier_issues/{issue.id}", 303)
@@ -6580,6 +6757,14 @@ def supply_get(supply_id):
             line0 = lines[0]
             if len(lines) > 1 or len(line0) > 50:
                 truncated_line = line0[:50]
+    issues = g.sess.scalars(
+        select(Issue)
+        .where(
+            Issue.is_open == true(),
+            Issue.properties["supply_ids"].op("@>")(cast([supply_id], JSONB)),
+        )
+        .order_by(Issue.date_created)
+    ).all()
 
     return render_template(
         "supply.html",
@@ -6594,6 +6779,7 @@ def supply_get(supply_id):
         this_month_start=this_month_start,
         batch_reports=batch_reports,
         era_bundles=era_bundles,
+        issues=issues,
     )