chellow 1715266420.0.0__py3-none-any.whl → 1715279978.0.0__py3-none-any.whl

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/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/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/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.dist-info → chellow-1715279978.0.0.dist-info}/METADATA

@@ -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-1715266420.0.0.dist-info → chellow-1715279978.0.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=5SmP-0QPK6xCkd_wjIWh_8FAzN5OxNHCzyEQ1Xb-Y-M,5256
 chellow/edi_lib.py,sha256=het3R0DBGtXEo-Sy1zvXQuX9EWQ1X6Y33G4l1hYYuds,51859
 chellow/general_import.py,sha256=l3EHq9zG9Vfl5Ee6XTVrC1nusXo4YGGB4VBmZ_JaJR8,65798
-chellow/models.py,sha256=Rq_ARe-MI73kalTW3Kpas-mTBdjFjBtaqSRAAn3SMzU,241085
+chellow/models.py,sha256=ju7SyQEde5nsuLTylQv6VQD8TeGJ_lScOjOH6DU1TJg,242143
 chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
@@ -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=iKnzFWNvANSB0yNDhZHo5nKw1Ptl6Q8KHuK003ZTDfg,215030
+chellow/e/views.py,sha256=es1lQWgZjCcHQ7AR_98SM9hLJjX8UUarePuBHnkkJ_4,215037
 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
@@ -92,7 +92,7 @@ chellow/reports/report_bills.py,sha256=AHW6tiZAOE0gXDfencPvemE4zqK6eTqfN8_bWQ4RT
 chellow/reports/report_csv_llfcs.py,sha256=OHSbP64lQ6dlAMcQYgvdANlA4lQyF0iBlwk7V9c9nuo,1944
 chellow/reports/report_csv_site_hh_data.py,sha256=T-clGDmYdn0ej7zZfL3kDp4Vyd82WzptxEzxx9KqAZg,4270
 chellow/reports/report_csv_site_snags.py,sha256=gG2sYQrLoIBwCoMUC8rhmAL7Kffh_rvNb9UOX7cYDko,2668
-chellow/reports/report_ecoes_comparison.py,sha256=s6d69cORezon-h3RmgewT8_cMpLrpMElmP2TnT-y7yY,21743
+chellow/reports/report_ecoes_comparison.py,sha256=mInFX4UmrPnjO-nLarqrCmyLx6O0wlCd94AUN2JlqZQ,21716
 chellow/reports/report_g_monthly_duration.py,sha256=vI5FKAU8_oThjR5oflPZont7Z7sVAunr0qlMfJsaPJI,12004
 chellow/reports/report_g_supplies_snapshot.py,sha256=0M0x_0o0985Hu45gUJJJwzfx0DDOAuXBJ1UVUDbQ36g,4718
 chellow/reports/report_g_supply_virtual_bill.py,sha256=x_KtQ02dwgmXvAEUXJ1poK0BRwqxa-GcbJ5pddEina0,3694
@@ -158,7 +158,7 @@ chellow/templates/e/channel_add.html,sha256=X1hi0b-ZjchlQ2m7uZYCyqkqU-Qd1s3_5u4z
 chellow/templates/e/channel_edit.html,sha256=OUkdiS2NBQ_w4gmxRxXAcRToM5BT8DWWJrtQMFs-GUU,2198
 chellow/templates/e/channel_snag.html,sha256=wBJ5KBfeJdAeRmaB0qu0AD9Z4nM5fn6tJ_8bNqTWtoo,1477
 chellow/templates/e/channel_snag_edit.html,sha256=sUFI4Ml3F1B35x8_t_Pz3hWuQN9Xtxr3kt4u8hdxNwY,1911
-chellow/templates/e/channel_snags.html,sha256=1dzC5FoCJ8bg6PBsQrVqGLn-DbPE2EHQklfm_pg3w0c,2899
+chellow/templates/e/channel_snags.html,sha256=57bVmu2SwetdpWQbImMykO-qgY7wXi6Y9plRqykOGy4,2901
 chellow/templates/e/comm.html,sha256=DSlAaDg1r4KYq9VUgDtt2lgW6apZjZvwhMujIJINmps,383
 chellow/templates/e/comms.html,sha256=bUXZePnMfpKk1E71qLGOSkx8r3GxdPPD_-MosIXXq4s,434
 chellow/templates/e/cop.html,sha256=ULv7ALFJHMUgPX96hQNm2irc3edtKYHS6fYAxvmzj8M,376
@@ -363,6 +363,6 @@ chellow/templates/g/supply_note_edit.html,sha256=6UQf_qbhFDys3cVsTp-c7ABWZpggW9R
 chellow/templates/g/supply_notes.html,sha256=WR3YwGh_qqTklSJ7JqWX6BKBc9rk_jMff4RiWZiF2CM,936
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1715266420.0.0.dist-info/METADATA,sha256=sBafR1NjQRgEambtrlc1xNw2rNtq1xGtoEUF9THC2Zw,12205
-chellow-1715266420.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-chellow-1715266420.0.0.dist-info/RECORD,,
+chellow-1715279978.0.0.dist-info/METADATA,sha256=orieA2aDGbd1HQ_Au3J-Buky6xGH89GWZ8wn7KXUv2k,12205
+chellow-1715279978.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+chellow-1715279978.0.0.dist-info/RECORD,,