From 86133a0d4a4d4e17d24a54e35eeff6f6b9646571 Mon Sep 17 00:00:00 2001
From: Tony Locke <tlocke@tlocke.org.uk>
Date: Mon, 4 Sep 2023 11:12:47 +0100
Subject: [PATCH] i

---
 chellow/e/views.py                         | 9 +++++----
 chellow/templates/e/site_add_e_supply.html | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/chellow/e/views.py b/chellow/e/views.py
index d7902c96b..207a4bc33 100644
--- a/chellow/e/views.py
+++ b/chellow/e/views.py
@@ -3894,11 +3894,12 @@ def site_add_e_supply_form_get(site_id):
             .where(MarketRole.code == "R")
             .order_by(Party.dno_code)
         ).all()
-        if "dno_id" in request.values:
-            dno_id = req_int("dno_id")
-            dno = Party.get_by_id(g.sess, dno_id)
-        else:
+        dno_id = req_int_none("dno_id")
+        if dno_id is None:
             dno = dnos[0]
+        else:
+            dno = Party.get_by_id(g.sess, dno_id)
+
         participant = dno.participant
 
         if pc.code == "00":
diff --git a/chellow/templates/e/site_add_e_supply.html b/chellow/templates/e/site_add_e_supply.html
index 27a520bfb..3831cb8ee 100644
--- a/chellow/templates/e/site_add_e_supply.html
+++ b/chellow/templates/e/site_add_e_supply.html
@@ -14,9 +14,11 @@
 	<form action="/e/sites/{{site.id}}/add_e_supply" method="post">
 		<fieldset hx-get="/e/sites/{{site.id}}/add_e_supply/form" hx-params="*"
 			 hx-trigger="load, change"
-			 hx-include="[name='source_id'],[name='start_year'],[name='start_month'],[name='start_day'],[name='start_hour'],[name='start_minute'],[name='pc_id'],[name='name'],[name='imp_mpan_core'],[name='exp_mpan_core'],[name='mop_account'],[name='dc_account'],[name='dc_contract_id'],[name='mop_contract_id'],[name='imp_supplier_account'],[name='exp_supplier_account'],[name='imp_llfc_id'],[name='exp_llfc_id'],[name='mtc_participant_id'],[name='has_imp_mpan'],[name='has_exp_mpan']">
+			 hx-include="[name='source_id'],[name='start_year'],[name='start_month'],[name='start_day'],[name='start_hour'],[name='start_minute'],[name='pc_id'],[name='name'],[name='imp_mpan_core'],[name='exp_mpan_core'],[name='mop_account'],[name='dc_account'],[name='dc_contract_id'],[name='mop_contract_id'],[name='imp_supplier_account'],[name='exp_supplier_account'],[name='imp_llfc_id'],[name='exp_llfc_id'],[name='mtc_participant_id'],[name='has_imp_mpan'],[name='has_exp_mpan'],[name='dno_id'],[name='gsp_group_id']">
 			<input type="hidden" name="source_id" value="{{request.values.source_id}}">
 			<input type="hidden" name="pc_id" value="{{request.values.pc_id}}">
+			<input type="hidden" name="dno_id" value="{{request.values.dno_id}}">
+			<input type="hidden" name="gsp_group_id" value="{{request.values.gsp_group_id}}">
 			<input type="hidden" name="mtc_participant_id"
 		 			value="{{request.values.mtc_participant_id}}">
 			<input type="hidden" name="name" value="{{request.values.name}}">