chellow 1725628177.0.0__tar.gz → 1726494151.0.0__tar.gz

{chellow-1725628177.0.0 → chellow-1726494151.0.0}/PKG-INFO

@@ -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-1726494151.0.0/VERSION

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

{chellow-1725628177.0.0 → chellow-1726494151.0.0}/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-1725628177.0.0 → chellow-1726494151.0.0}/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-1725628177.0.0 → chellow-1726494151.0.0}/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-1725628177.0.0 → chellow-1726494151.0.0}/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 → chellow-1726494151.0.0}/test/e/test_e_views.py

@@ -2677,6 +2677,19 @@ def test_read_add_get_existing_era(sess, client):
     match(response, 200, *patterns)
 
 
+def test_scenario_get(sess, client):
+    props = {
+        "scenario_start_year": 2010,
+        "scenario_start_month": 5,
+    }
+    scenario = Scenario.insert(sess, "scenario 1", props)
+    sess.commit()
+
+    response = client.get(f"/e/scenarios/{scenario.id}")
+
+    match(response, 200)
+
+
 def test_scenario_edit_post(sess, client):
     props = {
         "scenario_start_year": 2010,

chellow-1725628177.0.0/VERSION

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