chellow 1715266420.0.0__tar.gz → 1715279978.0.0__tar.gz

{chellow-1715266420.0.0 → chellow-1715279978.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1715266420.0.0
+Version: 1715279978.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-1715279978.0.0/VERSION

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

{chellow-1715266420.0.0 → chellow-1715279978.0.0}/chellow/e/views.py

@@ -1174,7 +1174,7 @@ def dc_contract_edit_post(contract_id):
             name = req_str("name")
             charge_script = req_str("charge_script")
             party = Party.get_by_id(g.sess, party_id)
-            contract.update(name, party, charge_script, contract.properties)
+            contract.update(name, party, charge_script, contract.make_properties())
             g.sess.commit()
             return chellow_redirect(f"/dc_contracts/{contract.id}", 303)
     except BadRequest as e:

{chellow-1715266420.0.0 → chellow-1715279978.0.0}/chellow/models.py

@@ -6651,6 +6651,20 @@ def insert_dtc_meter_types(sess):
         ("2CF", "Polyphase with APC that is compliant with SMETS2"),
         ("2CDF", "Polyphase with ALCS and APC that is compliant with SMETS2"),
         ("2CEF", "Polyphase with Boost Function and APC that is compliant with SMETS2"),
+        (
+            "S2ADE",
+            "Single element meter with one or more ALCS and Boost Function that is "
+            "compliant with SMETS2",
+        ),
+        (
+            "S2BDE",
+            "A twin element meter with one or more ALCS and Boost Function that is "
+            "compliant with SMETS2",
+        ),
+        (
+            "S2CD",
+            "A polyphase meter with one or more ALCS that is compliant with SMETS2",
+        ),
     ):
         DtcMeterType.insert(sess, code, desc)
 
@@ -7434,6 +7448,26 @@ def db_upgrade_46_to_47(sess, root_path):
     sess.execute(text("alter table era drop column properties;"))
 
 
+def db_upgrade_47_to_48(sess, root_path):
+    for code, desc in (
+        (
+            "S2ADE",
+            "Single element meter with one or more ALCS and Boost Function that is "
+            "compliant with SMETS2",
+        ),
+        (
+            "S2BDE",
+            "A twin element meter with one or more ALCS and Boost Function that is "
+            "compliant with SMETS2",
+        ),
+        (
+            "S2CD",
+            "A polyphase meter with one or more ALCS that is compliant with SMETS2",
+        ),
+    ):
+        DtcMeterType.insert(sess, code, desc)
+
+
 upgrade_funcs = [None] * 18
 upgrade_funcs.extend(
     [
@@ -7466,6 +7500,7 @@ upgrade_funcs.extend(
         db_upgrade_44_to_45,
         db_upgrade_45_to_46,
         db_upgrade_46_to_47,
+        db_upgrade_47_to_48,
     ]
 )
 

{chellow-1715266420.0.0 → chellow-1715279978.0.0}/chellow/reports/report_ecoes_comparison.py

@@ -540,7 +540,6 @@ def _process(
             values["chellow_era_id"] = chellow_era_id
             report_run.insert_row(sess, "", titles, values, {})
             sess.commit()
-        sess.expunge_all()
 
     for mpan_core in mpans:
         supply = Supply.get_by_mpan_core(sess, mpan_core)

{chellow-1715266420.0.0 → chellow-1715279978.0.0}/chellow/templates/e/channel_snags.html

@@ -29,7 +29,7 @@
 
 	<form action="/e/channel_snags">
 		<fieldset>
-			<label>Show Channel Snags</label>	
+			<legend>Show Channel Snags</legend>	
 			<input type="hidden" name="dc_contract_id" value="{{contract.id}}">
 			<label>Hide snags &lt; days old</label>
 		 	{{input_text('days_hidden', '0', 3, 3)}}

{chellow-1715266420.0.0 → chellow-1715279978.0.0}/test/e/test_e_views.py

@@ -558,13 +558,13 @@ def test_dc_contract_edit_delete(sess, client):
 
 
 def test_dc_contract_edit_post(sess, client):
+    vf = to_utc(ct_datetime(2000, 1, 1))
     market_role_C = MarketRole.insert(sess, "C", "DC")
     participant = Participant.insert(sess, "CALB", "AK Industries")
-    party = participant.insert_party(
-        sess, market_role_C, "DC Ltd.", utc_datetime(2000, 1, 1), None, None
-    )
+    party = participant.insert_party(sess, market_role_C, "DC Ltd.", vf, None, None)
+    properties = {"sora": "ai"}
     contract = Contract.insert_dc(
-        sess, "DC 2000", participant, "", {}, utc_datetime(2000, 1, 1), None, {}
+        sess, "DC 2000", participant, "", properties, vf, None, {}
     )
     sess.commit()
 
@@ -580,25 +580,14 @@ def virtual_bill(ds):
     for hh in ds.hh_data:
         if hh['utc-is-month-end']:
             bill['net-gbp'] += 7
-""",
-        "properties": """{
-  "enabled": true,
-  "protocol": "https",
-  "download_days": 8,
-  "url_template":
-  "http://localhost:8080/hh_api?from={{chunk_start.strftime('%d/%m/%Y')}}&to={{chunk_finish.strftime('%d/%m/%Y')}}",
-  "url_values": {
-    "22 7907 4116 080": {
-      "api_key": "768234ht"
-    }
-  }
-}
 """,
     }
 
     response = client.post(f"/e/dc_contracts/{contract.id}/edit", data=data)
 
     match(response, 303)
+    sess.rollback()
+    assert contract.make_properties() == properties
 
 
 def test_dc_rate_script_add_post(sess, client):

chellow-1715266420.0.0/VERSION

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