chellow 1726737247.0.0__py3-none-any.whl → 1726827015.0.0__py3-none-any.whl

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/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.dist-info → chellow-1726827015.0.0.dist-info}/METADATA

@@ -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-1726737247.0.0.dist-info → chellow-1726827015.0.0.dist-info}/RECORD

@@ -67,7 +67,7 @@ chellow/gas/cv.py,sha256=4cdYYQ8Qak6NeYdBCB4YaQ0jX8-UkaydIIdibCQuXxM,7344
 chellow/gas/dn_rate_parser.py,sha256=Mq8rAcUEUxIQOks59bsCKl8GrefvoHbrTCHqon9N0z0,11340
 chellow/gas/engine.py,sha256=jT7m6vddi5GnWd51wCYEVhBS-LZEn1T9ggZX7Y9HGK0,25263
 chellow/gas/transportation.py,sha256=Bkg8TWOs-v0ES-4qqwbleiOhqbE_t2KauUx9JYMZELM,5300
-chellow/gas/views.py,sha256=zOlJnL6eVq7Tag-0NMabzCPQk5AoTrclEz-923pbwAE,57851
+chellow/gas/views.py,sha256=vwGz4Go2qcebH9Pm2_H0UtJbrtpUIMvxgn5JYc2Zn3g,59027
 chellow/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/reports/report_109.py,sha256=FmRWG8wQC97cj0nqQH7mrfbYesRIKWXQLh6ERHvtHrU,11212
 chellow/reports/report_111.py,sha256=rgwoOPfvbfwIC_IjBqs2e8umF_YTtpyejLrX_uCgyHE,28145
@@ -86,7 +86,7 @@ chellow/reports/report_33.py,sha256=laVz-itDbJTdvC6LxLEeuY0eKpYx43Un4adiExPTEEE,
 chellow/reports/report_387.py,sha256=kmBZopb0AOivcowO2nPjRj6LnV0_QjCDXLwqPL7IGVE,5672
 chellow/reports/report_41.py,sha256=QQeTshA1Og7N3wPaoZ8ynJzwsvZ1mgSFc7DDkVqIZoM,7447
 chellow/reports/report_429.py,sha256=8WlLqyfMyvIF5Kc6CE0MKwcT5xwmR_Ao99Ef72yAOVc,12668
-chellow/reports/report_59.py,sha256=X3zWhc18AukwzhCZEj9ZnGA73I3nPBISWoms6Fc2s80,44630
+chellow/reports/report_59.py,sha256=BPeXKF3BJFDY6tsP2-SehBGKXO_t_uRX7MwVgyNbDpo,44677
 chellow/reports/report_81.py,sha256=NkT6dZeMo7Z0AkJemD_Xv8Ut5PIZ9vn8Ia1Q_DS9v54,5611
 chellow/reports/report_87.py,sha256=j2gdBOapaVY1ZnlNlw14RPx58_k8eUkc3oRSnKuCsNA,7057
 chellow/reports/report_asset_comparison.py,sha256=UN298MHuzyUDUiiZr7F_Ua6SrdVOlFLjgKjnIbrA-14,6118
@@ -366,6 +366,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-1726737247.0.0.dist-info/METADATA,sha256=wBmQto7B3ObM92iQVscFqANnSgOFH9lwv0AAP5mCCu0,12204
-chellow-1726737247.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1726737247.0.0.dist-info/RECORD,,
+chellow-1726827015.0.0.dist-info/METADATA,sha256=_RtwmQ5grjvRyA7QXWSTTrJffG-mtTxPlzLPA0XudjU,12204
+chellow-1726827015.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1726827015.0.0.dist-info/RECORD,,