chellow 1723459091.0.0__py3-none-any.whl → 1723718933.0.0__py3-none-any.whl

chellow/reports/report_247.py

@@ -259,12 +259,13 @@ def _process_site(
             ):
                 for sname in ("kwh", "net-gbp"):
                     month_data[f"{name}-{sname}"] = 0
-            month_data["billed-import-kwh"] = 0
-            for suf in ("net-gbp", "vat-gbp", "gross-gbp"):
-                month_data[f"billed-import-{suf}"] = 0
-                month_data[f"billed-supplier-import-{suf}"] = 0
-                month_data[f"billed-dc-import-{suf}"] = 0
-                month_data[f"billed-mop-import-{suf}"] = 0
+            for polarity in ("import", "export"):
+                month_data[f"billed-{polarity}-kwh"] = 0
+                for suf in ("net-gbp", "vat-gbp", "gross-gbp"):
+                    month_data[f"billed-{polarity}-{suf}"] = 0
+                    month_data[f"billed-supplier-{polarity}-{suf}"] = 0
+                    month_data[f"billed-dc-{polarity}-{suf}"] = 0
+                    month_data[f"billed-mop-{polarity}-{suf}"] = 0
 
             if imp_ss is not None:
                 imp_supplier_contract = imp_ss.supplier_contract
@@ -286,7 +287,7 @@ def _process_site(
                     month_data["import-3rd-party-kwh"] += kwh
                     month_data["used-3rd-party-net-gbp"] += gbp
                     month_data["used-3rd-party-kwh"] += kwh
-                    month_data["used-gbp"] += gbp
+                    month_data["used-net-gbp"] += gbp
                     month_data["used-kwh"] += kwh
                 elif source_code == "3rd-party-reverse":
                     month_data["export-3rd-party-net-gbp"] += gbp
@@ -1032,7 +1033,6 @@ def content(
                 data_source_bill = Object()
                 data_source_bill.start_date = month_start
                 data_source_bill.finish_date = month_finish
-
                 for site in sites:
                     if by_hh:
                         sf = [

chellow/templates/report_run_bill_check.html

@@ -38,7 +38,7 @@
 					<td>{{run.creator}}</td>
 					<td>{{run.title}}</td>
 					<td>{{run.state}}</td>
-					<td>{{rows|length}}</td>
+					<td>{{rows|length}} (truncated at {{ROW_LIMIT}})</td>
 					<td>
 						{% if 'sum_difference' in summary %}
 							{{"%.2f"|format(summary.sum_difference)}}</td>

chellow/views.py

@@ -1341,12 +1341,12 @@ def report_run_get(run_id):
             q = q.filter(
                 ReportRunRow.data["properties"]["is_checked"].as_boolean() == false()
             )
-
+        ROW_LIMIT = 200
         rows = (
             q.order_by(
                 func.abs(ReportRunRow.data["values"][order_by].as_float()).desc()
             )
-            .limit(200)
+            .limit(ROW_LIMIT)
             .all()
         )
         return render_template(
@@ -1357,6 +1357,7 @@ def report_run_get(run_id):
             elements=elements,
             element=element,
             hide_checked=hide_checked,
+            ROW_LIMIT=ROW_LIMIT,
         )
 
     elif run.name == "asset_comparison":

{chellow-1723459091.0.0.dist-info → chellow-1723718933.0.0.dist-info}/METADATA

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

@@ -11,7 +11,7 @@ chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
 chellow/testing.py,sha256=Od4HHH6pZrhJ_De118_F55RJEKmAvhUH2S24QE9qFQk,3635
 chellow/utils.py,sha256=32qPWEGzCPKPhSM7ztpzcR6ZG74sVZanScDIdK50Rq4,19308
-chellow/views.py,sha256=nlX0JjJGTU8ydVFUK1d_oeexszOL3HIjZGouMRVg4Yc,79612
+chellow/views.py,sha256=njFHK_sT9k5OQyAJoLUWGSzMiM5rLuusYjdmK0ijS3c,79674
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
 chellow/e/bill_importer.py,sha256=7UcnqNlKbJc2GhW9gy8sDp9GuqambJVpZLvbafOZztA,7411
@@ -78,7 +78,7 @@ chellow/reports/report_219.py,sha256=cA0lfJKnJg41Zc4_gZB1KUXZ9JeJo0TiTlu5jm1bdDM
 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=KmigazTTyh6kGTnDylJZxfVVfZpJGPUVlCLPd46mVsw,46125
+chellow/reports/report_247.py,sha256=LMq3QQ5h1ipTYRxiE79kbkDEMEZuNDjAHnXwWbECT6Y,46223
 chellow/reports/report_29.py,sha256=KDFjgrLBv4WbG9efCdu_geMR7gT_QV9N97Wfdt7aDc4,2736
 chellow/reports/report_291.py,sha256=rqBXy6s7hMeYWw-yNX6w_L5t2yz6rNEeos_4xO7wf90,7519
 chellow/reports/report_33.py,sha256=laVz-itDbJTdvC6LxLEeuY0eKpYx43Un4adiExPTEEE,16730
@@ -134,7 +134,7 @@ chellow/templates/object_summary.html,sha256=VGCAAYcWTzgNfL0mxEef2Fa8dP3FcBhzj0f
 chellow/templates/rate_server.html,sha256=SezuwdKhHRZ00-R_S6ttKiZ-nvRpwozV9QcIMf9StG8,5360
 chellow/templates/report_run.html,sha256=O_wjIu43S-mKVyZyku3dJJdvyck3rAgEdhw59TsCcK0,4040
 chellow/templates/report_run_asset_comparison.html,sha256=VYCCUmIC7Mfe7uuaAHb6ihiK6zsqeTlQbzgtzLqR3zg,2305
-chellow/templates/report_run_bill_check.html,sha256=yAVFBi0zdamnlRpO2VqKY3UAmAJchSjwSmrmaITLmEA,5055
+chellow/templates/report_run_bill_check.html,sha256=H2ayoBL7EgKMq2Nwq5VjE_TNvcIKcqeCm0alQWLIw78,5084
 chellow/templates/report_run_ecoes_comparison.html,sha256=VmkT5ypWLP8qZS6NbDTC4yDaG7mnUlxZz7EV8xkHGZw,4086
 chellow/templates/report_run_row.html,sha256=bmtcdqJaS1CXpL0i8PuqvmeF98jKNYX5-mnQu-OuDKQ,3791
 chellow/templates/report_run_row_bill_check.html,sha256=aC2LMu_6NvmTN3ZdxHJPPPczyxPN6hg0F-PPcqIWUws,4683
@@ -365,6 +365,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-1723459091.0.0.dist-info/METADATA,sha256=5gZoqYI4n575kdIiDxsGRg2h3Ex-9guCkXwhQOtsqnc,12241
-chellow-1723459091.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1723459091.0.0.dist-info/RECORD,,
+chellow-1723718933.0.0.dist-info/METADATA,sha256=Pj9x-7DgnxlbYYRG35DTxqJVuCQvUJZF4yAxLjM8i_k,12241
+chellow-1723718933.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1723718933.0.0.dist-info/RECORD,,