chellow 1723459091.0.0__tar.gz → 1723718933.0.0__tar.gz

{chellow-1723459091.0.0 → chellow-1723718933.0.0}/PKG-INFO

@@ -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-1723718933.0.0/VERSION

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

{chellow-1723459091.0.0 → chellow-1723718933.0.0}/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-1723459091.0.0 → chellow-1723718933.0.0}/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-1723459091.0.0 → chellow-1723718933.0.0}/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":