chellow 1699537199.0.0__py3-none-any.whl → 1699877950.0.0__py3-none-any.whl

chellow/gas/dn_rate_parser.py

@@ -249,10 +249,10 @@ def find_nts_rates(file_name, file_like, col):
     for sheet in book.worksheets:
         title = sheet.title.strip().lower()
         if title.startswith("nts unit rates"):
-            rates["so_entry_gbp_per_kwh"] = get_nts_rate(sheet, col, 10)
-            rates["so_exit_gbp_per_kwh"] = get_nts_rate(sheet, col, 11)
-            rates["to_entry_gbp_per_kwh"] = get_nts_rate(sheet, col, 12)
-            rates["to_exit_gbp_per_kwh"] = get_nts_rate(sheet, col, 13)
+            rates["so_entry_gbp_per_kwh"] = get_nts_rate(sheet, col, 11)
+            rates["so_exit_gbp_per_kwh"] = get_nts_rate(sheet, col, 13)
+            rates["to_entry_gbp_per_kwh"] = get_nts_rate(sheet, col, 10)
+            rates["to_exit_gbp_per_kwh"] = get_nts_rate(sheet, col, 12)
 
     return rates
 
@@ -317,7 +317,7 @@ def rate_server_import(sess, log, set_progress, s, paths):
 
             nts_rs_2_script = nts_rs_2.make_script()
             if nts_rs_2_script.get("a_file_name") != file_name:
-                nts_rs_2.update(find_nts_1_rates(file_name, BytesIO(download(s, url))))
+                nts_rs_2.update(find_nts_2_rates(file_name, BytesIO(download(s, url))))
                 log(f"Updated NTS rate script for {hh_format(oct_start)}")
 
             dn_rs_script = dn_rs.make_script()

chellow/templates/e/era_edit.html

@@ -69,8 +69,7 @@
 	
 	<form action="/e/eras/{{era.id}}/edit" method="post">	
 		<fieldset hx-get="/e/eras/{{era.id}}/edit/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'],[name='dno_id'],[name='gsp_group_id'],[name='ssc_id'],[name='cop_id'],[name='comm_id'],[name='energisation_status_id'],[name='is_ended'],[name='imp_supplier_contract_id'],[name='exp_supplier_contract_id'],[name='imp_sc'],[name='exp_sc'],[name='msn']">
+			 hx-trigger="load, change" hx-include="this">
 			{{input_hidden_checkbox('is_ended', initial=era.finish_date != None)}}
 			{{input_hidden('source_id', initial=era.supply.source.id)}}
 			{{input_hidden('cop_id', initial=era.cop.id)}}

chellow/templates/e/site_add_e_supply.html

@@ -13,8 +13,7 @@
 {% block content %}
 	<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'],[name='dno_id'],[name='gsp_group_id'],[name='ssc_id'],[name='cop_id'],[name='comm_id'],[name='energisation_status_id'],[name='imp_supplier_contract_id'],[name='exp_supplier_contract_id']">
+			 hx-trigger="load, change" hx-include="this">
 			{{ input_hidden('source_id')}}
 			<input type="hidden" name="cop_id" value="{{request.values.cop_id}}">
 			<input type="hidden" name="comm_id" value="{{request.values.comm_id}}">

chellow/templates/input_date.html

@@ -1,8 +1,8 @@
 {% extends "macros.html" %}
 
 {% block html %}
-	{{input_hidden('prefix', initial=prefix)}}
-	{{input_hidden('resolution', initial=resolution)}}
+	<input type="hidden" name="prefix" value="{{prefix}}">
+	<input type="hidden" name="resolution" value="{{resolution}}">
 
 	{{input_text(year_name, initial=initial.year, size=4, maxlength=4)}}
 

chellow/templates/macros.html

@@ -17,8 +17,9 @@
 			{%- if is_dynamic -%}
 				, change
 			{%- endif -%}" hx-include="this">
-		{{input_hidden('prefix', initial=prefix)}}
-		{{input_hidden('resolution', initial=resolution)}}
+		<input type="hidden" name="prefix" value="{{prefix}}">
+		<input type="hidden" name="resolution" value="{{resolution}}">
+
 		{% if initial %}
 			{{input_hidden(year_name, initial=initial.year)}}
 			{{input_hidden(month_name, initial=initial.month)}}

{chellow-1699537199.0.0.dist-info → chellow-1699877950.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1699537199.0.0
+Version: 1699877950.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-1699537199.0.0.dist-info → chellow-1699877950.0.0.dist-info}/RECORD

@@ -57,7 +57,7 @@ chellow/gas/bill_parser_csv.py,sha256=Ecdy-apFT-mWAxddAsM4k1s-9-FpIaOfjP0oFc0rdQ
 chellow/gas/bill_parser_engie_edi.py,sha256=2nlroUfNS4DV7fMLiTS_0MZanyFdmRn-4guR3dSK-Vg,8813
 chellow/gas/ccl.py,sha256=f4__2kBd6b8n1-7JKKjsJQ2Y0ZxqrIZJ12Y9BQDBxKc,281
 chellow/gas/cv.py,sha256=ORi3xCJlcRlmGTiluZ9ZTA-GYt6vTyeyQ-bSAoXMqO4,7250
-chellow/gas/dn_rate_parser.py,sha256=80lXyN-eNQDl8qcEA8-YCXUlHK45SQi-ipaek7OCErs,11338
+chellow/gas/dn_rate_parser.py,sha256=8ybJYqYsOyMnt-8IVVapZivkuJLJ8pHav4Chif8JNfQ,11338
 chellow/gas/engine.py,sha256=PUrwwQi7XokloQwU1Wjvot6K73OqwxOUme-MePti6-Q,25243
 chellow/gas/transportation.py,sha256=Bkg8TWOs-v0ES-4qqwbleiOhqbE_t2KauUx9JYMZELM,5300
 chellow/gas/views.py,sha256=0kcz5u5tnCzILwdTi2Ck62ZrDcLlo3AW3cuhJUhvlMQ,55961
@@ -114,10 +114,10 @@ chellow/templates/edi_viewer.html,sha256=szUthgHOdph6Of-7f_1LeC_zYlNJaMeS5ctn6xT
 chellow/templates/general_import.html,sha256=SMemHGu466Be3_cAWSS6Hn-Kv-1psbEMDD6NQG6bfbI,1013
 chellow/templates/general_imports.html,sha256=BbMs_OyLgJ6nZQZBINMZAO4TMxJha1HFNoA35N_mE_E,12230
 chellow/templates/home.html,sha256=5GXzbgFeceQAnr8nQEg911v0xT4hJN1H0-5Npo9GbAE,5516
-chellow/templates/input_date.html,sha256=2TT1wi3CFR7zJfA7y7MsQhtPmtj_x1tXSe1p3RTeucQ,1224
+chellow/templates/input_date.html,sha256=rpgB5n0LfN8Y5djN_ZiuSxqdskxzCoKrEqI7hyJkVQo,1248
 chellow/templates/local_report.html,sha256=pV7_0QwyQ-D3OS9LXrly5pq3qprZnwTCoq6vCnMTkS4,1332
 chellow/templates/local_reports.html,sha256=4wbfVkY4wUfSSfWjxqIsvCpIsa9k7H_dGAjznrG5jNM,701
-chellow/templates/macros.html,sha256=fcXKEBfP1aACoLnTsJ2qskcgE2s7AgpqQSGP_m0aEX8,5156
+chellow/templates/macros.html,sha256=L9vpDsM1mDY0UEt8sJVzNAOKCivRaLl5g8qgk_fuvSw,5181
 chellow/templates/national_grid.html,sha256=8W92tsjlqPSB0J--nyFIi-wzFae9CyDr6fODXLZp8ic,991
 chellow/templates/non_core_auto_importer.html,sha256=s9SluRN1bHTHjd8GP6uFhk6LrZYG8dqBG3y94zUKe5Q,944
 chellow/templates/non_core_contract.html,sha256=X876Aywk0WHb5i2sk7E7ZN6AnHbvJM9wK1GzMiLY5B0,1671
@@ -204,7 +204,7 @@ chellow/templates/e/em_site.html,sha256=LQJ1RJe7IJCZ-dsmd-Ku3hhNEeKUq3BimEBKJPNZ
 chellow/templates/e/em_totals.html,sha256=D_H12qF6b8heVeSGzcl4u7xRvtPLUtM1zWYrwEFRFTM,678
 chellow/templates/e/energisation_status.html,sha256=hvD1qMpLYjmWWGIrv-5Ko3KbRL3a6MdQXcO3Fr4_cHA,478
 chellow/templates/e/energisation_statuses.html,sha256=qwRIH7jqKA1MgajsWOeZAH89iRpOfsNW_fAqXymUQ3E,587
-chellow/templates/e/era_edit.html,sha256=m0NMHN9qczApn13aV_tpZv6a8DTdrAgS3ok3wJ_uSH8,4731
+chellow/templates/e/era_edit.html,sha256=hW2_8Yt1n6VbT15a3PJ4Tn7wwVKyU-IkYDSLC1ZWCRQ,4022
 chellow/templates/e/era_edit_form.html,sha256=dd2AjxZjrKw01CCEBkXEQZ8biuep0APcOm1cYjgcG9I,4749
 chellow/templates/e/era_supplier_bill_add.html,sha256=TgcIFuX-_sXXYFsn9yGT-QqMrZe6uLxWoJ-G0f-VELU,2050
 chellow/templates/e/generator_type.html,sha256=En0lQSU_mc-QLMG5Hx-gDINVoqyfa4X9RYwopzpm33g,439
@@ -269,7 +269,7 @@ chellow/templates/e/scenario_add.html,sha256=qQpxvhlrQqrNYiIQTHu_NvSoeSKuRNEJQYw
 chellow/templates/e/scenario_docs.html,sha256=dvl-2wppHGaVqG16w9PERE_65u2eJAIOTh-lHCX_dW4,5162
 chellow/templates/e/scenario_edit.html,sha256=Uf64v_qsBP0BxaFEIz214CC_dZXlvro4zvQXH_towhA,1070
 chellow/templates/e/scenarios.html,sha256=zlNhZvQEcuwLgHObVHS-4THur5Lz9Jf1G6xD98-jamI,847
-chellow/templates/e/site_add_e_supply.html,sha256=pRi5it7Bcflh8sQvzt9TDjQG47dqZVNpIjCIDL290mE,3282
+chellow/templates/e/site_add_e_supply.html,sha256=GqPtk8yYJzMij14SzNREGSpCaVD2YcOJSmu-Dn00bGo,2636
 chellow/templates/e/site_add_e_supply_form.html,sha256=rL-hEdT6ORiBHC8yxxoQA-ofFKozOdk47olRkzusvhY,5308
 chellow/templates/e/site_hh_data.html,sha256=1Ld5IIM3G84tVCAwtlJNGJTnrASS7d84AgaPwwHNEMI,1413
 chellow/templates/e/site_site_snags.html,sha256=vWpsFyxZj7GOrMXQz2rKq9zOQdVsqeUVtdBzehp9J5w,847
@@ -357,6 +357,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-1699537199.0.0.dist-info/METADATA,sha256=fHpLv5xY21_Kns6fV49_Ymngmd59sA50mXt3fPI5uZU,12160
-chellow-1699537199.0.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
-chellow-1699537199.0.0.dist-info/RECORD,,
+chellow-1699877950.0.0.dist-info/METADATA,sha256=ux1gN6B0EhEEvIskOS2TEiVrFpzkH21dH9ql7K64DVE,12160
+chellow-1699877950.0.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
+chellow-1699877950.0.0.dist-info/RECORD,,