chellow 1716909517.0.0__py3-none-any.whl → 1716973778.0.0__py3-none-any.whl

chellow/e/bill_parsers/mm.py

@@ -73,7 +73,7 @@ CHARGE_UNITS_LOOKUP = {
 ELEMENT_LOOKUP = {
     "10ANNUAL": "standing",
     "20RS0108": "unrestricted",
-    "9WANNUAL": "site_fee",
+    "9WANNUAL": "site-fee",
     "20RS0123": "day",
     "30RS0123": "night",
     "90ANNUAL": "duos-fixed",
@@ -181,14 +181,14 @@ def _handle_0470(headers, pre_record, record):
 def _handle_1455(headers, pre_record, record):
     parts = _chop_record(record, ccl_kwh=13, unknown_1=8, ccl_rate=15, ccl_gbp=13)
     bd = headers["breakdown"]
-    bd["ccl_kwh"] += Decimal(parts["ccl_kwh"])
-    if "ccl_rate" in bd:
-        ccl_rates = bd["ccl_rate"]
+    bd["ccl-kwh"] += Decimal(parts["ccl_kwh"])
+    if "ccl-rate" in bd:
+        ccl_rates = bd["ccl-rate"]
     else:
-        ccl_rates = bd["ccl_rate"] = set()
+        ccl_rates = bd["ccl-rate"] = set()
 
     ccl_rates.add(Decimal(parts["ccl_rate"]) / Decimal("100"))
-    bd["ccl_gbp"] += Decimal(parts["ccl_gbp"]) / Decimal("100")
+    bd["ccl-gbp"] += Decimal(parts["ccl_gbp"]) / Decimal("100")
 
 
 def _handle_1460(headers, pre_record, record):

chellow/reports/report_219.py

@@ -15,8 +15,8 @@ from chellow.models import (
     Bill,
     BillType,
     Era,
+    RSession,
     RegisterRead,
-    Session,
     Supply,
     User,
 )
@@ -27,31 +27,33 @@ from chellow.views import chellow_redirect
 def content(year, month, months, supply_id, user_id):
     f = None
     try:
-        with Session() as sess:
+        with RSession() as sess:
             user = User.get_by_id(sess, user_id)
 
             f = open_file("register_reads.csv", user, mode="w", newline="")
             w = csv.writer(f, lineterminator="\n")
             titles = (
-                "Duration Start",
-                "Duration Finish",
-                "Supply Id",
-                "Import MPAN Core",
-                "Export MPAN Core",
-                "Batch Reference",
-                "Bill Id",
-                "Bill Reference",
-                "Bill Issue Date",
-                "Bill Type",
-                "Register Read Id",
-                "TPR",
-                "Coefficient",
-                "Previous Read Date",
-                "Previous Read Value",
-                "Previous Read Type",
-                "Present Read Date",
-                "Present Read Value",
-                "Present Read Type",
+                "duration_start",
+                "duration_finish",
+                "site_code",
+                "site_name",
+                "supply_id",
+                "imp_mpan_core",
+                "exp_mpan_core",
+                "batch_reference",
+                "bill_id",
+                "bill_reference",
+                "bill_issue_date",
+                "bill_type",
+                "register_read_id",
+                "tpr",
+                "coefficient",
+                "prev_read_date",
+                "prev_read_value",
+                "prev_read_type",
+                "pres_read_date",
+                "pres_read_value",
+                "pres_read_type",
             )
             w.writerow(titles)
 
@@ -118,6 +120,8 @@ def content(year, month, months, supply_id, user_id):
                         else:
                             era = eras[-1]
 
+                    site = era.get_physical_site(sess)
+
                     for read in (
                         sess.query(RegisterRead)
                         .filter(
@@ -139,28 +143,30 @@ def content(year, month, months, supply_id, user_id):
                             joinedload(RegisterRead.present_type),
                         )
                     ):
-                        vals = [
-                            start_date,
-                            finish_date,
-                            supply_id,
-                            era.imp_mpan_core,
-                            era.exp_mpan_core,
-                            batch.reference,
-                            bill.id,
-                            bill.reference,
-                            bill.issue_date,
-                            bill_type.code,
-                            read.id,
-                            "md" if read.tpr is None else read.tpr.code,
-                            read.coefficient,
-                            read.previous_date,
-                            read.previous_value,
-                            read.previous_type.code,
-                            read.present_date,
-                            read.present_value,
-                            read.present_type.code,
-                        ]
-                        w.writerow(csv_make_val(v) for v in vals)
+                        vals = {
+                            "duration_start": start_date,
+                            "duration_finish": finish_date,
+                            "site_code": site.code,
+                            "site_name": site.name,
+                            "supply_id": supply_id,
+                            "imp_mpan_core": era.imp_mpan_core,
+                            "exp_mpan_core": era.exp_mpan_core,
+                            "batch_reference": batch.reference,
+                            "bill_id": bill.id,
+                            "bill_reference": bill.reference,
+                            "bill_issue_date": bill.issue_date,
+                            "bill_type": bill_type.code,
+                            "register_read_id": read.id,
+                            "tpr": "md" if read.tpr is None else read.tpr.code,
+                            "coefficient": read.coefficient,
+                            "prev_read_date": read.previous_date,
+                            "prev_read_value": read.previous_value,
+                            "prev_read_type": read.previous_type.code,
+                            "pres_read_date": read.present_date,
+                            "pres_read_value": read.present_value,
+                            "pres_read_type": read.present_type.code,
+                        }
+                        w.writerow(csv_make_val(vals.get(t)) for t in titles)
 
                     # Avoid a long-running transaction
                     sess.rollback()

{chellow-1716909517.0.0.dist-info → chellow-1716973778.0.0.dist-info}/METADATA

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

@@ -51,7 +51,7 @@ chellow/e/bill_parsers/gdf_csv.py,sha256=ZfK3Oc6oP28p_P9DIevLNB_zW2WLcEJ3Lvb1gL3
 chellow/e/bill_parsers/haven_csv.py,sha256=0uENq8IgVNqdxfBQMBxLTSZWCOuDHXZC0xzk52SbfyE,13652
 chellow/e/bill_parsers/haven_edi.py,sha256=YGPHRxPOhje9s32jqPHHELni2tooOYj3cMC_qaZVPq4,16107
 chellow/e/bill_parsers/haven_edi_tprs.py,sha256=ZVX9CCqUybsot_Z0BEOJPvl9x5kSr7fEWyuJXvZDcz4,11841
-chellow/e/bill_parsers/mm.py,sha256=PiKjKypy5g0HmasrWTzgoq478y97AfsVDn1XN2XhkLM,8528
+chellow/e/bill_parsers/mm.py,sha256=5ChR3uVImZ6pJe_wZFeDkA06uxcVlyWWizwKJnMR_gg,8528
 chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=yogXTuQHGRL7IiqvRWr2C9V24ez1j9Yx0128UygPE_k,4723
 chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=gKeYMdUO4bVycV8n1lWs5AIfF3bHZLkM6tkasD4rhHs,6239
 chellow/e/bill_parsers/sse_edi.py,sha256=L85DOfNkqexeEIEr8pCBn_2sHJI-zEaw6cogpE3YyYM,15204
@@ -73,7 +73,7 @@ chellow/reports/report_169.py,sha256=tnTiHmhigcgZ7E8rUSfgzsVYUCW947xBZZq04-KqfK8
 chellow/reports/report_181.py,sha256=mCL6vXfrj8r0kL-LilDS0SnSu5tJOzCq7eMJVx9zpEw,4999
 chellow/reports/report_183.py,sha256=DZX-hHJPl_Tbgkt31C_cuLZg_5L2b6iCPQ5foOZizR0,8817
 chellow/reports/report_187.py,sha256=UvpaYHjyJFNV5puYq8_KxfzoBtVrwFgIGUOmC5oGA9A,9956
-chellow/reports/report_219.py,sha256=o2eEg3mX9_raP2b4gjc2Gu4vqnMqcvvJBYQ1oQjxvpE,6637
+chellow/reports/report_219.py,sha256=cA0lfJKnJg41Zc4_gZB1KUXZ9JeJo0TiTlu5jm1bdDM,7158
 chellow/reports/report_231.py,sha256=gOb1AkXZQvwVpRg5cIenO7iR7Se1_zsWnJp9l2BlgpA,5008
 chellow/reports/report_233.py,sha256=cIatj-HHYW_GNIRsji-DlsmYjt8rUdm_5xujPLOYL8U,4537
 chellow/reports/report_241.py,sha256=AlFmSHnfG2HWv_ICmWX7fNpPwLHjq7mo1QtOTjSKO3k,5384
@@ -364,6 +364,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-1716909517.0.0.dist-info/METADATA,sha256=LyXn7aMKKbo8Ir-4xP1EcvGNuWiAflgFKRORKLzbAWc,12205
-chellow-1716909517.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-chellow-1716909517.0.0.dist-info/RECORD,,
+chellow-1716973778.0.0.dist-info/METADATA,sha256=BR86ws0YMWBZHavEOJuh7KngaxixyJ5Mh8yZ1Nwlz2g,12205
+chellow-1716973778.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+chellow-1716973778.0.0.dist-info/RECORD,,