chellow 1723449410.0.0__py3-none-any.whl → 1723630623.0.0__py3-none-any.whl

chellow/e/dno_rate_parser.py

@@ -314,7 +314,14 @@ def tab_ehv(sheet, gsp_rates):
                 llfc = None if llfc_val is None else str(llfc_val).strip()
                 if llfc not in (None, ""):
                     band_col = col_find(title_row, "residual")
-                    band = "" if band_col is None else int(get_decimal(row, band_col))
+                    if band_col is None:
+                        band = 0
+                    else:
+                        band_val = get_value(row, band_col)
+                        if band_val is None:
+                            band = 0
+                        else:
+                            band = int(band_val)
                     tariffs[llfc] = {
                         "super-red-gbp-per-kwh": get_rate(
                             row, col_match(title_row, f"{polarity} super red")

chellow/reports/report_247.py

@@ -259,12 +259,13 @@ def _process_site(
             ):
                 for sname in ("kwh", "net-gbp"):
                     month_data[f"{name}-{sname}"] = 0
-            month_data["billed-import-kwh"] = 0
-            for suf in ("net-gbp", "vat-gbp", "gross-gbp"):
-                month_data[f"billed-import-{suf}"] = 0
-                month_data[f"billed-supplier-import-{suf}"] = 0
-                month_data[f"billed-dc-import-{suf}"] = 0
-                month_data[f"billed-mop-import-{suf}"] = 0
+            for polarity in ("import", "export"):
+                month_data[f"billed-{polarity}-kwh"] = 0
+                for suf in ("net-gbp", "vat-gbp", "gross-gbp"):
+                    month_data[f"billed-{polarity}-{suf}"] = 0
+                    month_data[f"billed-supplier-{polarity}-{suf}"] = 0
+                    month_data[f"billed-dc-{polarity}-{suf}"] = 0
+                    month_data[f"billed-mop-{polarity}-{suf}"] = 0
 
             if imp_ss is not None:
                 imp_supplier_contract = imp_ss.supplier_contract
@@ -286,7 +287,7 @@ def _process_site(
                     month_data["import-3rd-party-kwh"] += kwh
                     month_data["used-3rd-party-net-gbp"] += gbp
                     month_data["used-3rd-party-kwh"] += kwh
-                    month_data["used-gbp"] += gbp
+                    month_data["used-net-gbp"] += gbp
                     month_data["used-kwh"] += kwh
                 elif source_code == "3rd-party-reverse":
                     month_data["export-3rd-party-net-gbp"] += gbp
@@ -1032,7 +1033,6 @@ def content(
                 data_source_bill = Object()
                 data_source_bill.start_date = month_start
                 data_source_bill.finish_date = month_finish
-
                 for site in sites:
                     if by_hh:
                         sf = [

{chellow-1723449410.0.0.dist-info → chellow-1723630623.0.0.dist-info}/METADATA

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

@@ -20,7 +20,7 @@ chellow/e/bsuos.py,sha256=hdP9vnOJSuZl46OAkJeUg1XJYvYIBj4J6Sqce1Hy9Vs,15542
 chellow/e/ccl.py,sha256=30dh_SvlgzsTQPPAJNZWILaMvbeDsv9-P-S1JxS5_SQ,3184
 chellow/e/cfd.py,sha256=RvJRLDLY-KvT299a8xF-HRmslPZczqTgJ9C1zBo55U8,14456
 chellow/e/computer.py,sha256=CoYf9SA8zrh1NP_S1jKsfXsaBm5kFcjBbtPUJnx8M9A,67274
-chellow/e/dno_rate_parser.py,sha256=9A3SEBUQnnjx2Tw3CpA2q0KsJ-Pjgmt_mbADkEtsIzc,21497
+chellow/e/dno_rate_parser.py,sha256=A5TP6KjyfT5lVWh7dX4SiXRi6wnf2lGv-H_T4Sod8CI,21731
 chellow/e/duos.py,sha256=nwviRjz-qIt3GxIMHk0hItIT4dtKsxOWq9TUC1z-hO8,30864
 chellow/e/elexon.py,sha256=ALhXS9Es7PV0z9ukPbIramn3cf3iLyFi-PMWPSm5iOs,5487
 chellow/e/energy_management.py,sha256=aXC2qlGt3FAODlNl_frWzVYAQrJLP8FFOiNX3m-QE_Y,12388
@@ -78,7 +78,7 @@ chellow/reports/report_219.py,sha256=cA0lfJKnJg41Zc4_gZB1KUXZ9JeJo0TiTlu5jm1bdDM
 chellow/reports/report_231.py,sha256=uhO1algP7sibpZVaniqGs56HOCPCQeDO-Y-UfvFQwnI,5311
 chellow/reports/report_233.py,sha256=cIatj-HHYW_GNIRsji-DlsmYjt8rUdm_5xujPLOYL8U,4537
 chellow/reports/report_241.py,sha256=AlFmSHnfG2HWv_ICmWX7fNpPwLHjq7mo1QtOTjSKO3k,5384
-chellow/reports/report_247.py,sha256=KmigazTTyh6kGTnDylJZxfVVfZpJGPUVlCLPd46mVsw,46125
+chellow/reports/report_247.py,sha256=LMq3QQ5h1ipTYRxiE79kbkDEMEZuNDjAHnXwWbECT6Y,46223
 chellow/reports/report_29.py,sha256=KDFjgrLBv4WbG9efCdu_geMR7gT_QV9N97Wfdt7aDc4,2736
 chellow/reports/report_291.py,sha256=rqBXy6s7hMeYWw-yNX6w_L5t2yz6rNEeos_4xO7wf90,7519
 chellow/reports/report_33.py,sha256=laVz-itDbJTdvC6LxLEeuY0eKpYx43Un4adiExPTEEE,16730
@@ -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-1723449410.0.0.dist-info/METADATA,sha256=jJ3jHguNMB1z6JGZw5ZOaOz7wuAQhHfYQiDHF1bTKrQ,12241
-chellow-1723449410.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1723449410.0.0.dist-info/RECORD,,
+chellow-1723630623.0.0.dist-info/METADATA,sha256=uO1r5mgkkgQ1MMmvsArp3l4hFOLWwvrTKbMx64XWh0U,12241
+chellow-1723630623.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1723630623.0.0.dist-info/RECORD,,