chellow 1719570651.0.0__py3-none-any.whl → 1720526317.0.0__py3-none-any.whl

chellow/reports/report_231.py

@@ -36,6 +36,9 @@ def content(user_id, start_date, finish_date, contract_id):
                 "energisation_status",
                 "gsp_group",
                 "dno",
+                "era_start",
+                "pc",
+                "meter_type",
                 "site_code",
                 "imp_is_substation",
                 "imp_llfc_code",
@@ -46,7 +49,8 @@ def content(user_id, start_date, finish_date, contract_id):
             ]
 
             bill_titles = contract_func(caches, contract, "virtual_bill_titles")()
-            writer.writerow(header_titles + bill_titles)
+            titles = header_titles + bill_titles
+            writer.writerow(titles)
             vb_func = contract_func(caches, contract, "virtual_bill")
 
             for era in (
@@ -77,34 +81,31 @@ def content(user_id, start_date, finish_date, contract_id):
                     exp_llfc_description = supply_source.llfc.description
                     imp_is_substation = imp_llfc_code = imp_llfc_description = None
 
-                out = [
-                    era.imp_mpan_core,
-                    era.exp_mpan_core,
-                    chunk_start,
-                    chunk_finish,
-                    supply_source.energisation_status_code,
-                    supply_source.gsp_group_code,
-                    supply_source.dno_code,
-                    era.get_physical_site(sess).code,
-                    imp_is_substation,
-                    imp_llfc_code,
-                    imp_llfc_description,
-                    exp_is_substation,
-                    exp_llfc_code,
-                    exp_llfc_description,
-                ]
+                out = {
+                    "imp_mpan_core": era.imp_mpan_core,
+                    "exp_mpan_core": era.exp_mpan_core,
+                    "start_date": chunk_start,
+                    "finish_date": chunk_finish,
+                    "energisation_status": supply_source.energisation_status_code,
+                    "gsp_group": supply_source.gsp_group_code,
+                    "dno": supply_source.dno_code,
+                    "era_start": era.start_date,
+                    "pc": supply_source.pc_code,
+                    "meter_type": supply_source.meter_type_code,
+                    "site_code": era.get_physical_site(sess).code,
+                    "imp_is_substation": imp_is_substation,
+                    "imp_llfc_code": imp_llfc_code,
+                    "imp_llfc_description": imp_llfc_description,
+                    "exp_is_substation": exp_is_substation,
+                    "exp_llfc_code": exp_llfc_code,
+                    "exp_llfc_description": exp_llfc_description,
+                }
                 vb_func(supply_source)
                 bill = supply_source.mop_bill
                 for title in bill_titles:
                     if title in bill:
-                        out.append(bill[title])
-                        del bill[title]
-                    else:
-                        out.append("")
-                for k in sorted(bill.keys()):
-                    out.append(k)
-                    out.append(bill[k])
-                writer.writerow(csv_make_val(v) for v in out)
+                        out[title] = bill[title]
+                writer.writerow(csv_make_val(out.get(t)) for t in titles)
 
                 sess.rollback()  # Avoid long-running transactions
     except BadRequest as e:

chellow/reports/report_429.py

@@ -102,6 +102,7 @@ def content(g_batch_id, g_bill_id, g_contract_id, start_date, finish_date, user_
                     _process_g_bill_ids(
                         sess,
                         report_context,
+                        g_contract,
                         g_bill_ids,
                         forecast_date,
                         bill_titles,
@@ -122,6 +123,7 @@ def content(g_batch_id, g_bill_id, g_contract_id, start_date, finish_date, user_
 def _process_g_bill_ids(
     sess,
     report_context,
+    g_contract,
     g_bill_ids,
     forecast_date,
     bill_titles,
@@ -132,15 +134,24 @@ def _process_g_bill_ids(
     g_bill_id = list(sorted(g_bill_ids))[0]
     g_bill_ids.remove(g_bill_id)
     g_bill = sess.query(GBill).filter(GBill.id == g_bill_id).one()
-    problem = ""
     g_supply = g_bill.g_supply
+    vals = {
+        "covered_vat_gbp": Decimal("0.00"),
+        "covered_net_gbp": Decimal("0.00"),
+        "covered_gross_gbp": Decimal("0.00"),
+        "covered_kwh": Decimal(0),
+        "covered_start": g_bill.start_date,
+        "covered_finish": g_bill.finish_date,
+        "covered_bill_ids": [],
+        "virtual_problem": "",
+    }
     read_dict = defaultdict(set)
     for g_read in g_bill.g_reads:
         if not all(
             g_read.msn == era.msn
             for era in g_supply.find_g_eras(sess, g_read.prev_date, g_read.pres_date)
         ):
-            problem += (
+            vals["virtual_problem"] += (
                 f"The MSN {g_read.msn} of the register read {g_read.id} doesn't match "
                 f"the MSN of all the relevant eras."
             )
@@ -152,17 +163,9 @@ def _process_g_bill_ids(
             typ_set = read_dict[str(dt) + "-" + g_read.msn]
             typ_set.add(typ)
             if len(typ_set) > 1:
-                problem += f" Reads taken on {dt} have differing read types."
-
-    vals = {
-        "covered_vat_gbp": Decimal("0.00"),
-        "covered_net_gbp": Decimal("0.00"),
-        "covered_gross_gbp": Decimal("0.00"),
-        "covered_kwh": Decimal(0),
-        "covered_start": g_bill.start_date,
-        "covered_finish": g_bill.finish_date,
-        "covered_bill_ids": [],
-    }
+                vals[
+                    "virtual_problem"
+                ] += f" Reads taken on {dt} have differing read types."
 
     covered_primary_bill = None
     enlarged = True
@@ -270,12 +273,19 @@ def _process_g_bill_ids(
             or_(GEra.finish_date == null(), GEra.finish_date >= vals["covered_start"]),
         )
     ).scalars():
+        if g_era.g_contract != g_contract:
+            vals[
+                "virtual_problem"
+            ] += "The contract of the bill is different from the contract of the era."
+            continue
         site = (
             sess.query(Site)
             .join(SiteGEra)
             .filter(SiteGEra.is_physical == true(), SiteGEra.g_era == g_era)
             .one()
         )
+        vals["site_code"] = site.code
+        vals["site_name"] = site.name
 
         chunk_start = hh_max(vals["covered_start"], g_era.start_date)
         chunk_finish = hh_min(vals["covered_finish"], g_era.finish_date)
@@ -314,8 +324,6 @@ def _process_g_bill_ids(
     vals["bill_finish_date"] = g_bill.finish_date
     vals["mprn"] = g_supply.mprn
     vals["supply_name"] = g_supply.name
-    vals["site_code"] = site.code
-    vals["site_name"] = site.name
 
     for k, v in vals.items():
         if k == "covered_bill_ids":
@@ -332,9 +340,7 @@ def _process_g_bill_ids(
             except KeyError:
                 vals[title] = None
 
-    csv_writer.writerow(
-        [(vals.get(k) if vals.get(k) is not None else "") for k in titles]
-    )
+    csv_writer.writerow([csv_make_val(vals.get(k)) for k in titles])
 
 
 def do_get(sess):

chellow/reports/report_81.py

@@ -37,13 +37,16 @@ def content(user_id, contract_id, end_year, end_month, months):
 
             bill_titles = contract_func(caches, contract, "virtual_bill_titles")()
             header_titles = [
-                "Import MPAN Core",
-                "Export MPAN Core",
-                "Start Date",
-                "Finish Date",
+                "imp_mpan_core",
+                "exp_mpan_core",
+                "start_date",
+                "finish_date",
                 "energisation_status",
                 "gsp_group",
                 "dno",
+                "era_start",
+                "pc",
+                "meter_type",
                 "site_code",
                 "imp_is_substation",
                 "imp_llfc_code",
@@ -55,7 +58,8 @@ def content(user_id, contract_id, end_year, end_month, months):
 
             vb_func = contract_func(caches, contract, "virtual_bill")
 
-            writer.writerow(header_titles + bill_titles)
+            titles = header_titles + bill_titles
+            writer.writerow(titles)
 
             for era in (
                 sess.query(Era)
@@ -86,36 +90,33 @@ def content(user_id, contract_id, end_year, end_month, months):
                     exp_llfc_description = supply_source.llfc.description
                     imp_is_substation = imp_llfc_code = imp_llfc_description = None
 
-                vals = [
-                    era.imp_mpan_core,
-                    era.exp_mpan_core,
-                    chunk_start,
-                    chunk_finish,
-                    supply_source.energisation_status_code,
-                    supply_source.gsp_group_code,
-                    supply_source.dno_code,
-                    era.get_physical_site(sess).code,
-                    imp_is_substation,
-                    imp_llfc_code,
-                    imp_llfc_description,
-                    exp_is_substation,
-                    exp_llfc_code,
-                    exp_llfc_description,
-                ]
+                vals = {
+                    "imp_mpan_core": era.imp_mpan_core,
+                    "exp_mpan_core": era.exp_mpan_core,
+                    "start_date": chunk_start,
+                    "finish_date": chunk_finish,
+                    "energisation_status": supply_source.energisation_status_code,
+                    "gsp_group": supply_source.gsp_group_code,
+                    "dno": supply_source.dno_code,
+                    "era_start": era.start_date,
+                    "pc": supply_source.pc_code,
+                    "meter_type": supply_source.meter_type_code,
+                    "site_code": era.get_physical_site(sess).code,
+                    "imp_is_substation": imp_is_substation,
+                    "imp_llfc_code": imp_llfc_code,
+                    "imp_llfc_description": imp_llfc_description,
+                    "exp_is_substation": exp_is_substation,
+                    "exp_llfc_code": exp_llfc_code,
+                    "exp_llfc_description": exp_llfc_description,
+                }
 
                 vb_func(supply_source)
                 bill = supply_source.dc_bill
 
                 for title in bill_titles:
-                    vals.append(bill.get(title))
-                    if title in bill:
-                        del bill[title]
+                    vals[title] = bill.get(title)
 
-                for k in sorted(bill.keys()):
-                    vals.append(k)
-                    vals.append(bill[k])
-
-                writer.writerow(csv_make_val(v) for v in vals)
+                writer.writerow(csv_make_val(vals.get(t)) for t in titles)
 
                 # Avoid long-running transactions
                 sess.rollback()

chellow/reports/report_87.py

@@ -83,37 +83,32 @@ def _process_era(
             exp_llfc_description = data_source.llfc.description
             imp_is_substation = imp_llfc_code = imp_llfc_description = None
 
-        vals = [
-            data_source.mpan_core,
-            site.code,
-            site.name,
-            data_source.supplier_account,
-            data_source.start_date,
-            data_source.finish_date,
-            data_source.energisation_status_code,
-            data_source.gsp_group_code,
-            data_source.dno_code,
-            imp_is_substation,
-            imp_llfc_code,
-            imp_llfc_description,
-            exp_is_substation,
-            exp_llfc_code,
-            exp_llfc_description,
-        ]
+        vals = {
+            "mpan_core": data_source.mpan_core,
+            "site_code": site.code,
+            "site_name": site.name,
+            "account": data_source.supplier_account,
+            "from": data_source.start_date,
+            "to": data_source.finish_date,
+            "energisation_status": data_source.energisation_status_code,
+            "gsp_group": data_source.gsp_group_code,
+            "dno": data_source.dno_code,
+            "era_start": era.start_date,
+            "pc": data_source.pc_code,
+            "meter_type": data_source.meter_type_code,
+            "imp_is_substation": imp_is_substation,
+            "imp_llfc_code": imp_llfc_code,
+            "imp_llfc_description": imp_llfc_description,
+            "exp_is_substation": exp_is_substation,
+            "exp_llfc_code": exp_llfc_code,
+            "exp_llfc_description": exp_llfc_description,
+        }
 
         vb_func(data_source)
         bill = data_source.supplier_bill
         for title in bill_titles:
             if title in bill:
-                val = bill[title]
-                del bill[title]
-            else:
-                val = ""
-            vals.append(val)
-
-        for k in sorted(bill.keys()):
-            vals.append(k)
-            vals.append(str(bill[k]))
+                vals[title] = bill[title]
 
         return vals
 
@@ -163,6 +158,9 @@ def create_csv(f, sess, start_date, finish_date, contract_id):
         "energisation_status",
         "gsp_group",
         "dno",
+        "era_start",
+        "pc",
+        "meter_type",
         "imp_is_substation",
         "imp_llfc_code",
         "imp_llfc_description",
@@ -170,7 +168,8 @@ def create_csv(f, sess, start_date, finish_date, contract_id):
         "exp_llfc_code",
         "exp_llfc_description",
     ]
-    writer.writerow(header_titles + bill_titles)
+    titles = header_titles + bill_titles
+    writer.writerow(titles)
     vb_func = contract_func(caches, contract, "virtual_bill")
 
     for month_start, month_finish in month_pairs:
@@ -201,7 +200,7 @@ def create_csv(f, sess, start_date, finish_date, contract_id):
                     period_finish,
                     era,
                 )
-                writer.writerow(csv_make_val(v) for v in vals)
+                writer.writerow(csv_make_val(vals.get(t)) for t in titles)
             except BadRequest as e:
                 raise BadRequest(
                     f"Problem with {chellow.utils.url_root}eras/{era.id}/edit "

{chellow-1719570651.0.0.dist-info → chellow-1720526317.0.0.dist-info}/METADATA

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

@@ -74,7 +74,7 @@ chellow/reports/report_181.py,sha256=mCL6vXfrj8r0kL-LilDS0SnSu5tJOzCq7eMJVx9zpEw
 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=cA0lfJKnJg41Zc4_gZB1KUXZ9JeJo0TiTlu5jm1bdDM,7158
-chellow/reports/report_231.py,sha256=gOb1AkXZQvwVpRg5cIenO7iR7Se1_zsWnJp9l2BlgpA,5008
+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=ozgCcee8XeqYbOpZCyU2STJKaz6h2x7TYQogagTaYLw,46626
@@ -83,10 +83,10 @@ chellow/reports/report_291.py,sha256=rqBXy6s7hMeYWw-yNX6w_L5t2yz6rNEeos_4xO7wf90
 chellow/reports/report_33.py,sha256=laVz-itDbJTdvC6LxLEeuY0eKpYx43Un4adiExPTEEE,16730
 chellow/reports/report_387.py,sha256=kmBZopb0AOivcowO2nPjRj6LnV0_QjCDXLwqPL7IGVE,5672
 chellow/reports/report_41.py,sha256=QQeTshA1Og7N3wPaoZ8ynJzwsvZ1mgSFc7DDkVqIZoM,7447
-chellow/reports/report_429.py,sha256=0GCc0rQnOSG0fusw69yMMOCxnWApBd3P2sGWIg1py9M,12359
+chellow/reports/report_429.py,sha256=8WlLqyfMyvIF5Kc6CE0MKwcT5xwmR_Ao99Ef72yAOVc,12668
 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_81.py,sha256=f7sKPZUbl2VDbDHIg7B5rMDxcx_xnV1Y6PbjJyiTPLA,5609
+chellow/reports/report_87.py,sha256=j2gdBOapaVY1ZnlNlw14RPx58_k8eUkc3oRSnKuCsNA,7057
 chellow/reports/report_asset_comparison.py,sha256=UN298MHuzyUDUiiZr7F_Ua6SrdVOlFLjgKjnIbrA-14,6118
 chellow/reports/report_batches.py,sha256=7O5TcB9W1sPKS0LQMsC6sUDzx73X5iyoZE0O3zK91zs,4798
 chellow/reports/report_bills.py,sha256=AHW6tiZAOE0gXDfencPvemE4zqK6eTqfN8_bWQ4RT5o,3323
@@ -364,6 +364,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-1719570651.0.0.dist-info/METADATA,sha256=yaaDeEPCR9gyn7FAzr9s9ysogjV22XbTtqdeLVAJWHI,12205
-chellow-1719570651.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1719570651.0.0.dist-info/RECORD,,
+chellow-1720526317.0.0.dist-info/METADATA,sha256=iyZrZ95p6OGYA8F9VMGixtiqBwF6NGri0JHZNnUJL_Y,12205
+chellow-1720526317.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1720526317.0.0.dist-info/RECORD,,