chellow 1716366171.0.0__py3-none-any.whl → 1716370405.0.0__py3-none-any.whl

chellow/reports/report_59.py

@@ -486,7 +486,45 @@ def _process_site(
                     .all()
                 )
                 if len(bills) > 0:
-                    month_data = {}
+                    imp_supplier_contract = last_era.imp_supplier_contract
+                    imp_supplier_contract_name = (
+                        None
+                        if imp_supplier_contract is None
+                        else imp_supplier_contract.name
+                    )
+                    exp_supplier_contract = last_era.exp_supplier_contract
+                    exp_supplier_contract_name = (
+                        None
+                        if exp_supplier_contract is None
+                        else exp_supplier_contract.name
+                    )
+                    era_associates = {
+                        s.site.code for s in last_era.site_eras if not s.is_physical
+                    }
+                    vals = {
+                        "creation-date": now,
+                        "start-date": chunk_start,
+                        "finish-date": chunk_finish,
+                        "imp-mpan-core": last_era.imp_mpan_core,
+                        "exp-mpan-core": last_era.exp_mpan_core,
+                        "site-code": site.code,
+                        "site-name": site.name,
+                        "associated-site-codes": era_associates,
+                        "era-start-date": None,
+                        "era-finish-date": None,
+                        "imp-supplier-contract": imp_supplier_contract_name,
+                        "imp-non-actual-hhs": None,
+                        "imp-non-actual-kwh": None,
+                        "exp-supplier-contract": exp_supplier_contract_name,
+                        "exp-non-actual-hhs": None,
+                        "exp-non-actual-kwh": None,
+                        "metering-type": last_era.meter_category,
+                        "source": last_era.supply.source.code,
+                        "generator-type": None,
+                        "supply-name": last_era.supply.name,
+                        "msn": last_era.msn,
+                        "pc": last_era.pc.code,
+                    }
                     for name in (
                         "import-net",
                         "export-net",
@@ -500,10 +538,10 @@ def _process_site(
                         "billed-import-net",
                     ):
                         for sname in ("kwh", "gbp"):
-                            month_data[name + "-" + sname] = 0
-                    month_data["billed-supplier-import-net-gbp"] = 0
-                    month_data["billed-dc-import-net-gbp"] = 0
-                    month_data["billed-mop-import-net-gbp"] = 0
+                            vals[name + "-" + sname] = 0
+                    vals["billed-supplier-import-net-gbp"] = 0
+                    vals["billed-dc-import-net-gbp"] = 0
+                    vals["billed-mop-import-net-gbp"] = 0
 
                     for bill in bills:
                         bill_role_code = bill.batch.contract.market_role.code
@@ -528,42 +566,12 @@ def _process_site(
                         else:
                             raise BadRequest("Role code not recognized.")
 
-                        for data in month_data, site_data:
+                        for data in vals, site_data:
                             data["billed-import-net-kwh"] += bill_prop_kwh
                             data["billed-import-net-gbp"] += bill_prop_gbp
                             data[key] += bill_prop_gbp
 
-                    imp_supplier_contract = last_era.imp_supplier_contract
-                    exp_supplier_contract = last_era.exp_supplier_contract
-                    out = [
-                        now,
-                        last_era.imp_mpan_core,
-                        (
-                            None
-                            if imp_supplier_contract is None
-                            else imp_supplier_contract.name
-                        ),
-                        last_era.exp_mpan_core,
-                        (
-                            None
-                            if exp_supplier_contract is None
-                            else exp_supplier_contract.name
-                        ),
-                        chunk_start,
-                        last_era.meter_category,
-                        last_era.supply.source.code,
-                        None,
-                        last_era.supply.name,
-                        last_era.msn,
-                        last_era.pc.code,
-                        site.code,
-                        site.name,
-                        None,
-                        start_date,
-                        finish_date,
-                    ] + [month_data[t] for t in summary_titles]
-
-                    era_rows.append([make_val(v) for v in out])
+                    era_rows.append([make_val(vals.get(t)) for t in era_titles])
         first_era = (
             sess.execute(
                 select(Era).where(Era.supply == supply).order_by(Era.start_date)

{chellow-1716366171.0.0.dist-info → chellow-1716370405.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1716366171.0.0
+Version: 1716370405.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)
@@ -20,7 +20,7 @@ Requires-Dist: pympler==1.0.1
 Requires-Dist: pypdf==3.17.0
 Requires-Dist: python-dateutil==2.8.2
 Requires-Dist: pytz==2022.6
-Requires-Dist: requests==2.31.0
+Requires-Dist: requests==2.32.2
 Requires-Dist: sqlalchemy==2.0.28
 Requires-Dist: waitress==2.1.2
 Requires-Dist: xlrd==2.0.1

{chellow-1716366171.0.0.dist-info → chellow-1716370405.0.0.dist-info}/RECORD

@@ -84,7 +84,7 @@ chellow/reports/report_33.py,sha256=laVz-itDbJTdvC6LxLEeuY0eKpYx43Un4adiExPTEEE,
 chellow/reports/report_387.py,sha256=KcClrEOK5IRvePp0Jgbzs1Gwf-_CqYmEtFFlXrr_Z3E,5670
 chellow/reports/report_41.py,sha256=QQeTshA1Og7N3wPaoZ8ynJzwsvZ1mgSFc7DDkVqIZoM,7447
 chellow/reports/report_429.py,sha256=0GCc0rQnOSG0fusw69yMMOCxnWApBd3P2sGWIg1py9M,12359
-chellow/reports/report_59.py,sha256=d3qosO0s0y7xsn4i-ZGQLF420Zaax0lYI2KnolIPNi8,44749
+chellow/reports/report_59.py,sha256=CCFPUspUFgoMt6sMFsdtLYW-inA9rN6D-6Kted6vskA,45458
 chellow/reports/report_81.py,sha256=UYr0Dm4TmCCYUbIWw3hWNI0GdQRhH27vwVk3Ytdsrcg,5288
 chellow/reports/report_87.py,sha256=ZadBo40rUORN0Fi926-dDHeTFn6L-fBzp3b4k7v5MdY,6802
 chellow/reports/report_asset_comparison.py,sha256=UN298MHuzyUDUiiZr7F_Ua6SrdVOlFLjgKjnIbrA-14,6118
@@ -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-1716366171.0.0.dist-info/METADATA,sha256=5ILGiNhUzVRJ-d34v1fsQjuGDkLxbpVzg-DM_uxNmwY,12205
-chellow-1716366171.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-chellow-1716366171.0.0.dist-info/RECORD,,
+chellow-1716370405.0.0.dist-info/METADATA,sha256=TuaScYTcnRt-YAdvw014lKjfOAS9GaelicnQ1FPdkjI,12205
+chellow-1716370405.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+chellow-1716370405.0.0.dist-info/RECORD,,