chellow 1726737247.0.0__tar.gz → 1726827015.0.0__tar.gz

{chellow-1726737247.0.0 → chellow-1726827015.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1726737247.0.0
+Version: 1726827015.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-1726827015.0.0/VERSION

@@ -0,0 +1 @@
+__version__ = "1726827015.0.0"

{chellow-1726737247.0.0 → chellow-1726827015.0.0}/chellow/gas/views.py

@@ -50,7 +50,6 @@ from chellow.models import (
 from chellow.utils import (
     HH,
     csv_make_val,
-    hh_format,
     req_bool,
     req_date,
     req_decimal,
@@ -1457,47 +1456,88 @@ def exit_zone_get(g_exit_zone_id):
 @gas.route("/batches/<int:g_batch_id>/csv")
 def batch_csv_get(g_batch_id):
     g_batch = GBatch.get_by_id(g.sess, g_batch_id)
-    si = StringIO()
-    cw = csv.writer(si)
-    cw.writerow(
-        [
-            "Contract",
-            "Batch Reference",
-            "Bill Reference",
-            "Account",
-            "Issued",
-            "From",
-            "To",
-            "kWh",
-            "Net",
-            "VAT",
-            "Gross",
-            "Type",
-        ]
-    )
-    for g_bill in (
-        g.sess.query(GBill)
-        .filter(GBill.g_batch == g_batch)
+    rows = []
+    max_reads = 0
+    for g_bill in g.sess.scalars(
+        select(GBill)
+        .where(GBill.g_batch == g_batch)
         .order_by(GBill.reference, GBill.start_date)
-        .options(joinedload(GBill.bill_type))
-    ):
-        cw.writerow(
-            [
-                g_batch.g_contract.name,
-                g_batch.reference,
-                g_bill.reference,
-                g_bill.account,
-                hh_format(g_bill.issue_date),
-                hh_format(g_bill.start_date),
-                hh_format(g_bill.finish_date),
-                str(g_bill.kwh),
-                str(g_bill.net),
-                str(g_bill.vat),
-                str(g_bill.gross),
-                g_bill.bill_type.code,
-            ]
+        .options(
+            joinedload(GBill.bill_type),
+            joinedload(GBill.g_reads).joinedload(GRegisterRead.g_unit),
+            joinedload(GBill.g_reads).joinedload(GRegisterRead.pres_type),
+            joinedload(GBill.g_reads).joinedload(GRegisterRead.prev_type),
         )
+    ).unique():
+        row = [
+            g_batch.g_contract.name,
+            g_batch.reference,
+            g_bill.reference,
+            g_bill.account,
+            g_bill.issue_date,
+            g_bill.start_date,
+            g_bill.finish_date,
+            g_bill.kwh,
+            g_bill.net,
+            g_bill.vat,
+            g_bill.gross,
+            g_bill.bill_type.code,
+            g_bill.breakdown,
+        ]
+        g_reads = g_bill.g_reads
+        max_reads = max(max_reads, len(g_reads))
+        for g_read in g_reads:
+            row.extend(
+                [
+                    g_read.msn,
+                    g_read.g_unit.code,
+                    g_read.correction_factor,
+                    g_read.calorific_value,
+                    g_read.prev_date,
+                    g_read.prev_value,
+                    g_read.prev_type.code,
+                    g_read.pres_date,
+                    g_read.pres_value,
+                    g_read.pres_type.code,
+                ]
+            )
+        rows.append(row)
 
+    si = StringIO()
+    cw = csv.writer(si)
+    read_titles = [
+        "msn",
+        "unit",
+        "correction_factor",
+        "calorific_value",
+        "prev_date",
+        "prev_value",
+        "prev_type",
+        "pres_date",
+        "pres_value",
+        "pres_type",
+    ]
+    titles = [
+        "Contract",
+        "Batch Reference",
+        "Bill Reference",
+        "Account",
+        "Issued",
+        "From",
+        "To",
+        "kWh",
+        "Net",
+        "VAT",
+        "Gross",
+        "Type",
+        "breakdown",
+    ]
+    for i in range(max_reads):
+        for rt in read_titles:
+            titles.append(f"{i}_{rt}")
+    cw.writerow(titles)
+    for row in rows:
+        cw.writerow(csv_make_val(v) for v in row)
     disp = f'attachment; filename="g_batch_{g_batch.id}.csv"'
     output = make_response(si.getvalue())
     output.headers["Content-Disposition"] = disp

{chellow-1726737247.0.0 → chellow-1726827015.0.0}/chellow/reports/report_59.py

@@ -670,7 +670,7 @@ def _process_site(
 
                     _add_bills(era_vals, bills, chunk_start, chunk_finish)
 
-                    era_rows.append([make_val(vals.get(t)) for t in era_titles])
+                    era_rows.append([make_val(era_vals.get(t)) for t in era_titles])
                     for t in summary_titles:
                         v = era_vals.get(t)
                         if v is not None:
@@ -1066,7 +1066,9 @@ def content(
             ef.write(msg + "\n")
             ef.close()
         else:
-            write_spreadsheet(rf, compression, site_rows, era_rows, normal_read_rows)
+            write_spreadsheet(
+                rf, compression, site_rows, supply_rows, era_rows, normal_read_rows
+            )
     finally:
         if rf is not None:
             rf.close()

{chellow-1726737247.0.0 → chellow-1726827015.0.0}/test/gas/test_gas_views.py

@@ -184,6 +184,136 @@ def test_batch_edit_delete(sess, client):
     )
 
 
+def test_batch_csv_get(sess, client):
+    vf = to_utc(ct_datetime(2000, 1, 1))
+    site = Site.insert(sess, "22488", "Water Works")
+    g_dn = GDn.insert(sess, "EE", "East of England")
+    g_ldz = g_dn.insert_g_ldz(sess, "EA")
+    g_exit_zone = g_ldz.insert_g_exit_zone(sess, "EA1")
+    insert_g_units(sess)
+    g_unit_M3 = GUnit.get_by_code(sess, "M3")
+    g_contract = GContract.insert(sess, False, "Fusion 2020", "", {}, vf, None, {})
+    insert_g_reading_frequencies(sess)
+    g_reading_frequency_M = GReadingFrequency.get_by_code(sess, "M")
+    mprn = "750278673"
+    g_supply = site.insert_g_supply(
+        sess,
+        mprn,
+        "main",
+        g_exit_zone,
+        utc_datetime(2018, 1, 1),
+        None,
+        "hgeu8rhg",
+        1,
+        g_unit_M3,
+        g_contract,
+        "d7gthekrg",
+        g_reading_frequency_M,
+        1,
+        1,
+    )
+    g_batch = g_contract.insert_g_batch(sess, "b1", "Jan batch")
+    breakdown = {"units_consumed": 771}
+
+    insert_bill_types(sess)
+
+    bill_type_n = BillType.get_by_code(sess, "N")
+
+    g_bill = g_batch.insert_g_bill(
+        sess,
+        g_supply,
+        bill_type_n,
+        "55h883",
+        "dhgh883",
+        utc_datetime(2019, 4, 3),
+        utc_datetime(2020, 1, 1),
+        utc_datetime(2020, 1, 31, 23, 30),
+        Decimal("45"),
+        Decimal("12.40"),
+        Decimal("1.20"),
+        Decimal("14.52"),
+        "",
+        breakdown,
+    )
+    insert_g_read_types(sess)
+
+    g_read_type_A = GReadType.get_by_code(sess, "A")
+
+    g_bill.insert_g_read(
+        sess,
+        "ghu5438gt",
+        g_unit_M3,
+        1,
+        37,
+        Decimal(800),
+        utc_datetime(2020, 1, 1),
+        g_read_type_A,
+        Decimal(900),
+        utc_datetime(2020, 1, 31),
+        g_read_type_A,
+    )
+    sess.commit()
+
+    response = client.get(f"/g/batches/{g_batch.id}/csv")
+    match(response, 200)
+
+    lines = [
+        [
+            "Contract",
+            "Batch Reference",
+            "Bill Reference",
+            "Account",
+            "Issued",
+            "From",
+            "To",
+            "kWh",
+            "Net",
+            "VAT",
+            "Gross",
+            "Type",
+            "breakdown",
+            "0_msn",
+            "0_unit",
+            "0_correction_factor",
+            "0_calorific_value",
+            "0_prev_date",
+            "0_prev_value",
+            "0_prev_type",
+            "0_pres_date",
+            "0_pres_value",
+            "0_pres_type",
+        ],
+        [
+            "Fusion 2020",
+            "b1",
+            "55h883",
+            "dhgh883",
+            "2019-04-03 01:00",
+            "2020-01-01 00:00",
+            "2020-01-31 23:30",
+            "45",
+            "12.40",
+            "1.20",
+            "14.52",
+            "N",
+            '"{\n  ""units_consumed"": 771,\n}"',
+            "ghu5438gt",
+            "M3",
+            "1",
+            "37",
+            "2020-01-01 00:00",
+            "800",
+            "A",
+            "2020-01-31 00:00",
+            "900",
+            "A",
+        ],
+    ]
+    pattern = "\r\n".join(",".join(line) for line in lines) + "\r\n"
+    actual = response.get_data(as_text=True)
+    assert pattern == actual
+
+
 def test_bill_get(client, sess):
     site = Site.insert(sess, "22488", "Water Works")