chellow 1725628177.0.0__py3-none-any.whl → 1726494151.0.0__py3-none-any.whl

chellow/e/mdd_importer.py

@@ -248,6 +248,10 @@ def _import_Market_Participant_Role(sess, rows, ctx):
         dno_code_str = values[14]
         dno_code = None if len(dno_code_str) == 0 else dno_code_str
 
+        if participant_code == "CIDC" and dno_code == "99":
+            # We already use 99 with CROW
+            continue
+
         if party is None:
             participant.insert_party(
                 sess,

chellow/e/views.py

@@ -3943,20 +3943,58 @@ def scenario_add_get():
 
 @e.route("/scenarios/<int:scenario_id>")
 def scenario_get(scenario_id):
+    start_date = None
+    finish_date = None
+    duration = 1
+
     scenario = Scenario.get_by_id(g.sess, scenario_id)
     props = scenario.props
-    _, finish_date_ct = list(
-        c_months_c(
-            start_year=props["scenario_start_year"],
-            start_month=props["scenario_start_month"],
-            months=props["scenario_duration"],
+    site_codes = "\n".join(props.get("site_codes", []))
+    try:
+        duration = props["scenario_duration"]
+        _, finish_date_ct = list(
+            c_months_c(
+                start_year=props["scenario_start_year"],
+                start_month=props["scenario_start_month"],
+                months=duration,
+            )
+        )[-1]
+        finish_date = to_utc(finish_date_ct)
+    except KeyError:
+        pass
+
+    try:
+        start_date = to_utc(
+            ct_datetime(
+                props["scenario_start_year"],
+                props["scenario_start_month"],
+                props["scenario_start_day"],
+                props["scenario_start_hour"],
+                props["scenario_start_minute"],
+            )
         )
-    )[-1]
+    except KeyError:
+        pass
+
+    try:
+        finish_date = to_utc(
+            ct_datetime(
+                props["scenario_finish_year"],
+                props["scenario_finish_month"],
+                props["scenario_finish_day"],
+                props["scenario_finish_hour"],
+                props["scenario_finish_minute"],
+            )
+        )
+    except KeyError:
+        pass
     return render_template(
         "scenario.html",
         scenario=scenario,
-        scenario_finish_date=to_utc(finish_date_ct),
-        scenario_duration=props["scenario_duration"],
+        scenario_start_date=start_date,
+        scenario_finish_date=finish_date,
+        scenario_duration=duration,
+        site_codes=site_codes,
     )
 
 

chellow/models.py

@@ -7511,6 +7511,19 @@ def db_upgrade_49_to_50(sess, root_path):
     sess.flush()
 
 
+def db_upgrade_50_to_51(sess, root_path):
+    participant_cidc = Participant.get_by_code(sess, "CIDC")
+    dno_99 = sess.scalars(
+        select(Party).where(
+            Party.dno_code == "99", Party.participant == participant_cidc
+        )
+    ).one_or_none()
+    if dno_99 is not None:
+        sess.execute(delete(Llfc).where(Llfc.dno == dno_99))
+
+        sess.execute(delete(Party).where(Party.id == dno_99.id))
+
+
 upgrade_funcs = [None] * 18
 upgrade_funcs.extend(
     [
@@ -7546,6 +7559,7 @@ upgrade_funcs.extend(
         db_upgrade_47_to_48,
         db_upgrade_48_to_49,
         db_upgrade_49_to_50,
+        db_upgrade_50_to_51,
     ]
 )
 

chellow/templates/e/scenario.html

@@ -28,8 +28,12 @@
 		<fieldset>
 			<legend>Run With Duration</legend>
 			<input type="hidden" name="scenario_id" value="{{scenario.id}}">
+			<label>Start Date</label>
+			{{ input_date('start', scenario_start_date) }}
+			<label>Finish Date</label>
+			{{ input_date('finish', scenario_finish_date) }}
 			<label>Site Codes</label>
-			{{input_textarea('site_codes', '', 5, 40,
+			{{input_textarea('site_codes', site_codes, 5, 40,
 			  placeholder='One on each line, includes all if left blank')}}    						
 			<input type="submit" value="Run">
 		</fieldset>	

{chellow-1725628177.0.0.dist-info → chellow-1726494151.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1725628177.0.0
+Version: 1726494151.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-1725628177.0.0.dist-info → chellow-1726494151.0.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=dixp-O0MF2_mlwrnKx3D9DH09Qu05BjTo0rZfigTjR4,5534
 chellow/edi_lib.py,sha256=alu20x9ZX06iPfnNI9dEJzuP6RIf4We3Y_M_bl7RrcY,51789
 chellow/general_import.py,sha256=l3EHq9zG9Vfl5Ee6XTVrC1nusXo4YGGB4VBmZ_JaJR8,65798
-chellow/models.py,sha256=pBaFnTUIyThyg7iGIrbh4v8MW3LuEAwe1-4LAF4G7Q4,243491
+chellow/models.py,sha256=qq7YLv-FGTGE5ussQKMXGYwB7EuCyDk7nMeEUVYdfqw,243939
 chellow/national_grid.py,sha256=czwIZqzJndSGhEMQ5YzI6hRBhvjkM6VRVYXybf4_KXg,4377
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
@@ -30,7 +30,7 @@ chellow/e/hh_parser_df2.py,sha256=7gaVidyIqeqprm3zYPtHvRLLn08nph04N0cKlveNTV0,42
 chellow/e/hh_parser_simple_csv.py,sha256=RN4QOLvTQeoPrpvXvQ9hkOBZnR5piybLfjCiSJdjpjs,2112
 chellow/e/laf_import.py,sha256=aqkcbjnvfBPszBLSNg6getP7iW1uWiTVHy6N5Z5x39U,5514
 chellow/e/lcc.py,sha256=OkpynN8_iAdHRlu-yyU6BhRUqYYOZsUnl0HbHULYo_4,4670
-chellow/e/mdd_importer.py,sha256=wq5Fw-MSe17WNuPzeWdCmJvX0NKV3Y501t6z2tqd92Q,35638
+chellow/e/mdd_importer.py,sha256=NugJr2JhuzkPTsEMl_5UdQuw5K2p8lVJ-hyz4MK6Hfg,35762
 chellow/e/rcrc.py,sha256=92CA1uIotIHd1epQ_jEPdJKzXqDFV-AoJOJeRO6MEyA,4274
 chellow/e/ro.py,sha256=dZKZv_9wXSWuwcb3jiKavoD_9ot-PZseNVeEEe0siLo,596
 chellow/e/scenario.py,sha256=fBDZVOdrI1I3XQG-RdpB0-lDF9VYENBu_9bBXJxmvWk,23362
@@ -38,7 +38,7 @@ chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,623
 chellow/e/tlms.py,sha256=M33D6YpMixu2KkwSCzDRM3kThLgShg8exp63Obo75l8,8905
 chellow/e/tnuos.py,sha256=XseYztPUsQXNKuBmystO2kzzwAG9ehCZgpGBTdgSk-A,4313
 chellow/e/triad.py,sha256=lIQj7EdUrcFwEqleuHZXYU_bfzIwNOqUVVxB3NPQt4A,13710
-chellow/e/views.py,sha256=NwDgs0iZ6nmfX4qF5sSwFlecSsqDBMRsf46vxuIkgVg,219605
+chellow/e/views.py,sha256=aljiDbLvO_rUl00ohDDxs-3-xPmsuguaOyo69lcXcBA,220624
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=UgWXDPzQkQghyj_lfgBqoSJpHB-t-qOdSaB8qY6GLog,4071
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
@@ -272,7 +272,7 @@ chellow/templates/e/read_add.html,sha256=PGNPKTQiXkTEANMKOXCzBLGwJJJfQIkIgpGRAb-
 chellow/templates/e/read_edit.html,sha256=JWnHn8Dcq3t_LUGLUV9IAMnhuacw38On7552kGn4QiU,3147
 chellow/templates/e/read_type.html,sha256=volKteZB79famXrzN_Bgqy9JT9C4a50vXLkuZ0ObBq0,403
 chellow/templates/e/read_types.html,sha256=CknHXNEkBnsAprqI66ftvnnMFBdR_kqI7o26rxjlrJA,473
-chellow/templates/e/scenario.html,sha256=ZPkRsRcl_qgkFxSYanTfLDPQCzEqsV5u1m-swv4QNaU,1353
+chellow/templates/e/scenario.html,sha256=E8o3WQwAEejzaMPzeuUqyt9fWWNSDtN96qkJz0slDEo,1522
 chellow/templates/e/scenario_add.html,sha256=qQpxvhlrQqrNYiIQTHu_NvSoeSKuRNEJQYwLqRlQ8_U,516
 chellow/templates/e/scenario_docs.html,sha256=hOg6hrrnOcvdk7jXRsMrk1wtwK7K0IpqcBukX_vlvRg,4878
 chellow/templates/e/scenario_edit.html,sha256=Uf64v_qsBP0BxaFEIz214CC_dZXlvro4zvQXH_towhA,1070
@@ -365,6 +365,6 @@ chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1
 chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBeyRzQe3Rg,854
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1725628177.0.0.dist-info/METADATA,sha256=wHjj_Ouyy8wLs6Dv3TYkeiDOzc0SCVRSPCsUOjCnSoM,12204
-chellow-1725628177.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1725628177.0.0.dist-info/RECORD,,
+chellow-1726494151.0.0.dist-info/METADATA,sha256=64Fg0dcAvXBOlRHQla8VKh58635-X7YjLyWsRhWhv2A,12204
+chellow-1726494151.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1726494151.0.0.dist-info/RECORD,,