chellow 1753706177.0.0__py3-none-any.whl → 1754570085.0.0__py3-none-any.whl

chellow/e/bill_parsers/drax_edi.py

@@ -449,11 +449,18 @@ def _process_MTR(elements, headers):
 
 
 def _process_VAT(elements, headers):
+    breakdown = headers["breakdown"]
     vat = Decimal("0.00") + to_decimal(elements["UVTT"]) / Decimal("100")
     vat_percentage = to_decimal(elements["VATP"]) / Decimal("1000")
+
+    if "vat_rate" in breakdown:
+        vat_rate = breakdown["vat-rate"]
+    else:
+        vat_rate = breakdown["vat-rate"] = set()
+    vat_rate.add(vat_percentage / Decimal("100"))
     vat_net = Decimal("0.00") + to_decimal(elements["UVLA"]) / Decimal("100")
 
-    headers["breakdown"]["vat"][vat_percentage] = {"vat": vat, "net": vat_net}
+    breakdown["vat"][vat_percentage] = {"vat": vat, "net": vat_net}
 
 
 def _process_NOOP(elements, headers):

chellow/e/bill_parsers/engie_edi.py

@@ -54,7 +54,7 @@ TCOD_MAP = {
     "839829": ("cfd-fit-gbp", "cfd-fit-rate", "cfd-fit-kwh"),
     "649282": ("cfd-fit-gbp", "cfd-fit-rate", "cfd-fit-kwh"),
     "068476": ("day-gbp", "day-rate", "day-kwh"),
-    "133186": ("day-gbp", "day-rate", "day-kwh"),
+    "133186": ("nrg-gbp", "nrg-rate", "nrg-kwh"),
     "400434": ("day-gbp", "day-rate", "day-kwh"),
     "219182": (
         "duos-availability-gbp",
@@ -109,7 +109,7 @@ TCOD_MAP = {
     "220894": ("winter-night-gbp", "winter-night-rate", "winter-night-kwh"),
     "264929": ("winter-weekday-gbp", "winter-weekday-rate", "winter-weekday-kwh"),
     "638187": ("winter-weekend-gbp", "winter-weekend-rate", "winter-weekend-kwh"),
-    "700285": ("duos-fixed-gbp", "duos-fixed-rate", "duos-fixed-days"),
+    "700285": ("standing-gbp", "standing-rate", "standing-days"),
 }
 
 TPR_LOOKUP = {

chellow/e/bill_parsers/haven_edi_tprs.py

@@ -330,6 +330,13 @@ def _process_VAT(elements, headers):
     else:
         vat_breakdown = bd["vat"] = {}
 
+    if "vat-rate" in bd:
+        vat_rate = bd["vat-rate"]
+    else:
+        vat_rate = bd["vat-rate"] = set()
+
+    vat_rate.add(vat_percentage / Decimal("100"))
+
     try:
         vat_values = vat_breakdown[vat_percentage]
     except KeyError:

chellow/e/ro.py

@@ -15,4 +15,5 @@ def hh(supply_source):
 
         ro_kwh = hh["msp-kwh"]
         hh["ro-msp-kwh"] = ro_kwh
+        hh["ro-kwh"] = ro_kwh
         hh["ro-gbp"] = ro_kwh * ro_rate

chellow/reports/report_111.py

@@ -6,6 +6,7 @@ from collections import defaultdict
 from datetime import datetime as Datetime
 from decimal import Decimal
 from itertools import combinations
+from numbers import Number
 
 from dateutil.relativedelta import relativedelta
 
@@ -775,6 +776,33 @@ def _process_supply(
         values["batch_id"] = bill.batch.id
         values["supply_id"] = supply.id
         values["site_id"] = None if site_code is None else site.id
+        for key in tuple(values.keys()):
+            for element in sorted(long_map.keys(), key=len, reverse=True):
+                if not key.endswith("-gbp"):
+                    covered_prefix = f"covered-{element}-"
+                    virtual_prefix = f"virtual-{element}-"
+                    if key.startswith(covered_prefix):
+                        part_name = key[len(covered_prefix) :]
+                    elif key.startswith(virtual_prefix):
+                        part_name = key[len(virtual_prefix) :]
+                    else:
+                        continue
+                    virtual_part = values.get(f"virtual-{element}-{part_name}", {0})
+                    covered_part = values.get(f"covered-{element}-{part_name}", {0})
+                    if isinstance(virtual_part, set) and len(virtual_part) == 1:
+                        virtual_part = next(iter(virtual_part))
+                    if isinstance(covered_part, set) and len(covered_part) == 1:
+                        covered_part = next(iter(covered_part))
+
+                    if isinstance(virtual_part, Number) and isinstance(
+                        covered_part, Number
+                    ):
+                        diff = float(covered_part) - float(virtual_part)
+                    else:
+                        diff = None
+
+                    values[f"difference-{element}-{part_name}"] = diff
+                    break
         ReportRun.w_insert_row(
             report_run_id, "", report_run_titles, values, {"is_checked": False}
         )

chellow/reports/report_247.py

@@ -8,7 +8,7 @@ from dateutil.relativedelta import relativedelta
 
 from flask import flash, g, make_response, redirect, render_template, request
 
-import odio
+from odio import create_spreadsheet
 
 from sqlalchemy import or_, select, true
 from sqlalchemy.sql.expression import null
@@ -63,10 +63,10 @@ def write_spreadsheet(
 ):
     fl.seek(0)
     fl.truncate()
-    with odio.create_spreadsheet(fl, "1.2", compressed=compressed) as f:
-        f.append_table("Site Level", site_rows)
-        f.append_table("Era Level", era_rows)
-        f.append_table("Normal Reads", read_rows)
+    with create_spreadsheet(fl, compressed=compressed) as sheet:
+        sheet.append_table("Site Level", site_rows)
+        sheet.append_table("Era Level", era_rows)
+        sheet.append_table("Normal Reads", read_rows)
 
 
 def make_bill_row(titles, bill):

chellow/reports/report_59.py

@@ -7,7 +7,7 @@ from dateutil.relativedelta import relativedelta
 
 from flask import flash, g, make_response, redirect, render_template, request
 
-import odio
+from odio import create_spreadsheet
 
 from sqlalchemy import or_, select, true
 from sqlalchemy.sql.expression import null
@@ -58,11 +58,11 @@ CATEGORY_ORDER = {None: 0, "unmetered": 1, "nhh": 2, "amr": 3, "hh": 4}
 def write_spreadsheet(fl, compressed, site_rows, supply_rows, era_rows, read_rows):
     fl.seek(0)
     fl.truncate()
-    with odio.create_spreadsheet(fl, "1.2", compressed=compressed) as f:
-        f.append_table("Site Level", site_rows)
-        f.append_table("Supply Level", supply_rows)
-        f.append_table("Era Level", era_rows)
-        f.append_table("Normal Reads", read_rows)
+    with create_spreadsheet(fl, compressed=compressed) as sheet:
+        sheet.append_table("Site Level", site_rows)
+        sheet.append_table("Supply Level", supply_rows)
+        sheet.append_table("Era Level", era_rows)
+        sheet.append_table("Normal Reads", read_rows)
 
 
 def make_bill_row(titles, bill):

chellow/reports/report_g_monthly_duration.py

@@ -3,7 +3,7 @@ import traceback
 
 from flask import g, redirect, request
 
-import odio
+from odio import create_spreadsheet
 
 from sqlalchemy import or_, select, true
 from sqlalchemy.orm import joinedload
@@ -47,9 +47,9 @@ from chellow.utils import (
 def write_spreadsheet(fl, compressed, site_rows, era_rows):
     fl.seek(0)
     fl.truncate()
-    with odio.create_spreadsheet(fl, "1.2", compressed=compressed) as f:
-        f.append_table("Site Level", site_rows)
-        f.append_table("Era Level", era_rows)
+    with create_spreadsheet(fl, compressed=compressed) as sheet:
+        sheet.append_table("Site Level", site_rows)
+        sheet.append_table("Era Level", era_rows)
 
 
 def _process_era(

chellow/reports/report_missing_bills.py

@@ -46,15 +46,12 @@ def content(user_id, report_run_id, contract_id, months_length, finish_date):
             writer.writerow(titles)
 
             finish_date_ct = to_ct(finish_date)
-            months = list(
-                c_months_u(
-                    finish_year=finish_date_ct.year,
-                    finish_month=finish_date_ct.month,
-                    months=months_length,
-                )
-            )
 
-            for month_start, month_finish in months:
+            for month_start, month_finish in c_months_u(
+                finish_year=finish_date_ct.year,
+                finish_month=finish_date_ct.month,
+                months=months_length,
+            ):
                 missing_bills = {}
                 missing_account = {}
                 account_missing_tuple = hh_range(caches, month_start, month_finish)
@@ -127,10 +124,10 @@ def content(user_id, report_run_id, contract_id, months_length, finish_date):
                             "market_role_code": contract.market_role.code,
                         }
                         missing_bills[era.id] = values
-        for era_id, values in missing_bills.items():
-            if len(missing_account[values["account"]]) > 0:
-                writer.writerow(csv_make_val(values[t]) for t in titles)
-                ReportRun.w_insert_row(report_run_id, "", titles, values, {})
+                for era_id, values in missing_bills.items():
+                    if len(missing_account[values["account"]]) > 0:
+                        writer.writerow(csv_make_val(values[t]) for t in titles)
+                        ReportRun.w_insert_row(report_run_id, "", titles, values, {})
 
     except BaseException:
         msg = traceback.format_exc()

chellow/reports/report_sscs.py

@@ -5,7 +5,7 @@ import traceback
 
 from flask import g, redirect, request
 
-import odio
+from odio import create_spreadsheet
 
 from sqlalchemy import select
 from sqlalchemy.orm import joinedload
@@ -26,10 +26,10 @@ def write_spreadsheet(
 ):
     fl.seek(0)
     fl.truncate()
-    with odio.create_spreadsheet(fl, "1.2", compressed=compressed) as f:
-        f.append_table("SSCs", ssc_rows)
-        f.append_table("MRs", mr_rows)
-        f.append_table("TPRs", tpr_rows)
+    with create_spreadsheet(fl, compressed=compressed) as sheet:
+        sheet.append_table("SSCs", ssc_rows)
+        sheet.append_table("MRs", mr_rows)
+        sheet.append_table("TPRs", tpr_rows)
 
 
 def content(

chellow/templates/report_run_bill_check.html

@@ -175,7 +175,7 @@
 											</li>
 										{% endfor %}
 									</ul>
-								{% else %}
+								{% elif values[title] is not none %}
 									{{values[title]}}
 								{% endif %}
 							</td>

chellow/templates/report_run_row_bill_check.html

@@ -13,141 +13,214 @@
 {% block content %}
 	{% set values = row.data['values'] %}
 	{% set properties = row.data.get('properties', {}) %}
-	{% if row.report_run.name == 'bill_check' %}
+	<table>
+		<caption>Bill Check</caption>	
+		<thead>
+			<tr>
+				<th rowspan="2">Batch</th>
+				<th colspan="8">Bill</th>
+				<th colspan="2">MPAN Core</th>
+				<th colspan="2">Site</th>
+				<th rowspan="2">Checking</th>
+			</tr>
+			<tr>
+				<th>Reference</th>
+				<th>Type</th>
+				<th>kWh</th>
+				<th>Net GBP</th>
+				<th>VAT GBP</th>
+				<th>Gross GBP</th>
+				<th>Start</th>
+				<th>Finish</th>
+				<th>Import</th>
+				<th>Export</th>
+				<th>Code</th>
+				<th>Name</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td>
+					{% if values.batch_id != None %}
+						<a href="/e/supplier_batches/{{values.batch_id}}">{{values['batch']}}</a>
+					{% endif %}
+				</td>
+				<td>
+					{% if values.bill_id != None %}
+						<a href="/e/supplier_bills/{{values.bill_id}}">{{
+							values['bill-reference']}}</a>
+					{% endif %}
+				</td>
+				<td>{{values['bill-type']}}</td>
+				<td>{{values['bill-kwh']}}</td>
+				<td>{{values['bill-net-gbp']}}</td>
+				<td>{{values['bill-vat-gbp']}}</td>
+				<td>{{values['bill-gross-gbp']}}</td>
+				<td>{{values['bill-start-date']}}</td>
+				<td>{{values['bill-finish-date']}}</td>
+				<td>
+					{% if values['imp-mpan-core'] != None %}
+					<a href="/e/supplies/{{values.supply_id}}">{{
+						values['imp-mpan-core']}}</a>
+					{% endif %}
+				</td>
+				<td>
+					{% if values['exp-mpan-core'] != None %}
+						<a href="/e/supplies/{{values.supply_id}}">{{
+							values['exp-mpan-core']}}</a>
+					{% endif %}
+				</td>
+				<td>
+					{% if values.site_id != None %}
+						<a href="/sites/{{values.site_id}}">{{
+							values['site-code']}}</a>
+					{% endif %}
+				</td>
+				<td>{{values['site-name']}}</td>
+				<td>
+					<form action="/report_run_rows/{{row.id}}" method="post">
+						<fieldset>
+							{{input_textarea(
+								'note', properties.note, 5, 40,
+								placeholder='Notes on checking go here...')}}
+							<br>
+							<br>
+							<label>Checked?
+								{{input_checkbox('is_checked', properties.is_checked)}}
+							</label>
+							<input type="submit" name="update" value="Update">
+						</fieldset>
+					</form>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+	<table>
+		<caption>Covered</caption>
+		<thead>
+			<tr>
+				<th>From</th>
+				<th>To</th>
+				<th>Bills</th>
+				<th>Metered kWh</th>
+				<th>Net GBP</th>
+				<th>Virtual Net GBP</th>
+				<th>Difference GBP</th>
+				<th>Problem</th>
+				<th>Virtual Problem</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td>{{values['covered-from']}}</td>
+				<td>{{values['covered-to']}}</td>
+				<td>
+					{% if values['covered-bills'] != None %}
+						<ul>
+							{% for bill_id in values['covered-bills'] %}
+								<li>
+									<a href="/e/supplier_bills/{{bill_id}}">{{bill_id}}</a>
+									{% if bill_id == values.bill_id %}
+										(This bill)
+									{% endif %}
+								</li>
+							{% endfor %}
+						</ul>
+					{% endif %}
+				</td>
+				<td>
+					{% if values['metered-kwh'] != None %}
+						{{"%.0f"|format(values['metered-kwh'])}}
+					{% endif %}
+				</td>
+				<td>{{values['covered-net-gbp']}}</td>
+				<td>
+					{% if values['virtual-net-gbp'] != None %}
+						{{"%.2f"|format(values['virtual-net-gbp'])}}
+					{% endif %}
+				</td>
+				<td>
+					{% if values['difference-net-gbp'] != None %}
+						{{"%.2f"|format(values['difference-net-gbp'])}}
+					{% endif %}
+				</td>
+				<td>{{values['covered-problem']}}</td>
+				<td>{{values['virtual-problem']}}</td>
+			</tr>
+		</tbody>
+	</table>
+  
+	<section class="elements">
 		<table>
-			<caption>Bill Check</caption>	
+			<caption>GBP</caption>
 			<thead>
 				<tr>
-					<th rowspan="2">Batch</th>
-					<th colspan="8">Bill</th>
-					<th colspan="2">MPAN Core</th>
-					<th colspan="2">Site</th>
-					<th rowspan="2">Checking</th>
-				</tr>
-				<tr>
-					<th>Reference</th>
-					<th>Type</th>
-					<th>kWh</th>
-					<th>Net GBP</th>
-					<th>VAT GBP</th>
-					<th>Gross GBP</th>
-					<th>Start</th>
-					<th>Finish</th>
-					<th>Import</th>
-					<th>Export</th>
-					<th>Code</th>
-					<th>Name</th>
+					<th>Part</th>
+					<th>Covered</th>
+					<th>Virtual</th>
+					<th>Difference</th>
 				</tr>
 			</thead>
 			<tbody>
 				<tr>
+					<td>gross</td>
 					<td>
-						{% if values.batch_id != None %}
-							<a href="/e/supplier_batches/{{values.batch_id}}">{{values['batch']}}</a>
+						{% if 'covered-gross-gbp' in values and values['covered-gross-gbp'] is number %}
+							{{"{:0,.2f}".format(values['covered-gross-gbp'])}}
 						{% endif %}
 					</td>
 					<td>
-						{% if values.bill_id != None %}
-							<a href="/e/supplier_bills/{{values.bill_id}}">{{
-								values['bill-reference']}}</a>
+						{% if 'virtual-gross-gbp' in values and values['virtual-gross-gbp'] is number %}
+							{{"{:0,.2f}".format(values['virtual-gross-gbp'])}}
 						{% endif %}
 					</td>
-					<td>{{values['bill-type']}}</td>
-					<td>{{values['bill-kwh']}}</td>
-					<td>{{values['bill-net-gbp']}}</td>
-					<td>{{values['bill-vat-gbp']}}</td>
-					<td>{{values['bill-gross-gbp']}}</td>
-					<td>{{values['bill-start-date']}}</td>
-					<td>{{values['bill-finish-date']}}</td>
 					<td>
-						{% if values['imp-mpan-core'] != None %}
-						<a href="/e/supplies/{{values.supply_id}}">{{
-							values['imp-mpan-core']}}</a>
+						{% if 'difference-gross-gbp' in values and values['difference-gross-gbp'] is number %}
+							{{"{:0,.2f}".format(values['difference-gross-gbp'])}}
 						{% endif %}
 					</td>
+				</tr>
+				<tr>
+					<td>net</td>
 					<td>
-						{% if values['exp-mpan-core'] != None %}
-							<a href="/e/supplies/{{values.supply_id}}">{{
-								values['exp-mpan-core']}}</a>
+						{% if 'covered-net-gbp' in values and values['covered-net-gbp'] is number %}
+							{{"{:0,.2f}".format(values['covered-net-gbp'])}}</td>
 						{% endif %}
-					</td>
 					<td>
-						{% if values.site_id != None %}
-							<a href="/sites/{{values.site_id}}">{{
-								values['site-code']}}</a>
+						{% if 'virtual-net-gbp' in values and values['virtual-net-gbp'] is number %}
+							{{"{:0,.2f}".format(values['virtual-net-gbp'])}}</td>
 						{% endif %}
-					</td>
-					<td>{{values['site-name']}}</td>
 					<td>
-						<form action="/report_run_rows/{{row.id}}" method="post">
-							<fieldset>
-								{{input_textarea(
-									'note', properties.note, 5, 40,
-									placeholder='Notes on checking go here...')}}
-								<br>
-								<br>
-								<label>Checked?
-									{{input_checkbox('is_checked', properties.is_checked)}}
-								</label>
-								<input type="submit" name="update" value="Update">
-							</fieldset>
-						</form>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-
-		<table>
-			<caption>Covered</caption>
-			<thead>
-				<tr>
-					<th>From</th>
-					<th>To</th>
-					<th>Bills</th>
-					<th>Metered kWh</th>
-					<th>Net GBP</th>
-					<th>Virtual Net GBP</th>
-					<th>Difference GBP</th>
-					<th>Problem</th>
-					<th>Virtual Problem</th>
+						{% if 'difference-net-gbp' in values and values['difference-net-gbp'] is number %}
+							{{"{:0,.2f}".format(values['difference-net-gbp'])}}</td>
+						{% endif %}
 				</tr>
-			</thead>
-			<tbody>
 				<tr>
-					<td>{{values['covered-from']}}</td>
-					<td>{{values['covered-to']}}</td>
+					<td>vat</td>
 					<td>
-						{% if values['covered-bills'] != None %}
-							<ul>
-								{% for bill_id in values['covered-bills'] %}
-									<li>
-										<a href="/e/supplier_bills/{{bill_id}}">{{bill_id}}</a>
-										{% if bill_id == values.bill_id %}
-											(This bill)
-										{% endif %}
-									</li>
-								{% endfor %}
-							</ul>
+						{% if 'covered-vat-gbp' in values and values['covered-vat-gbp'] is number %}
+							{{"{:0,.2f}".format(values['covered-vat-gbp'])}}</td>
 						{% endif %}
-					</td>
 					<td>
-						{% if values['metered-kwh'] != None %}
-							{{"%.0f"|format(values['metered-kwh'])}}
+						{% if 'virtual-vat-gbp' in values and values['virtual-vat-gbp'] is number %}
+							{{"{:0,.2f}".format(values['virtual-vat-gbp'])}}</td>
 						{% endif %}
-					</td>
-					<td>{{values['covered-net-gbp']}}</td>
 					<td>
-						{% if values['virtual-net-gbp'] != None %}
-							{{"%.2f"|format(values['virtual-net-gbp'])}}
+						{% if 'difference-vat-gbp' in values and values['difference-vat-gbp'] is number %}
+							{{"{:0,.2f}".format(values['difference-vat-gbp'])}}</td>
 						{% endif %}
-					</td>
+				</tr>
+				<tr>
+					<td>vat-rate</td>
 					<td>
-						{% if values['difference-net-gbp'] != None %}
-							{{"%.2f"|format(values['difference-net-gbp'])}}
+						{{values['covered-vat-rate']}}</td>
+					<td>{{values['virtual-vat-rate']}}</td>
+					<td>
+						{% if values['difference-vat-rate'] is number %}
+							{{"{:0,.2f}".format(values['difference-vat-rate'])}}
 						{% endif %}
 					</td>
-					<td>{{values['covered-problem']}}</td>
-					<td>{{values['virtual-problem']}}</td>
 				</tr>
 			</tbody>
 		</table>
@@ -157,35 +230,70 @@
 				<caption>{{table.name}}</caption>
 				<thead>
 					<tr>
-						{% for title in table.titles %}
-							<th>{{title}}</th>
-						{% endfor %}
+						<th>Part</th>
+						<th>Covered</th>
+						<th>Virtual</th>
+						<th>Difference</th>
 					</tr>
 				</thead>
 				<tbody>
 					<tr>
-						{% for v in table['values'] %}
-							<td>{{v}}</td>
+						<td>gbp</td>
+						{% for pref in ('covered-', 'virtual-', 'difference-') %}
+							<td>
+								{% set k = pref + table.name + "-gbp" %}
+								{% if k in values %}
+									{% set val = values[k] %}
+								{% else %}
+									{% set val = '' %}
+								{% endif %}
+								{% if val is none %}
+								{% elif val is number %}
+									{{"{:0,.2f}".format(val)}}
+								{% else %}
+									{{val}}
+								{% endif %}
+							</td>
 						{% endfor %}
 					</tr>
+					{% for part in table['parts']|sort %}
+						<tr>
+							<td>{{part}}</td>
+							{% for pref in ('covered-', 'virtual-', 'difference-') %}
+								<td>
+									{% set k = pref + table.name + "-" + part %}
+									{% if k in values %}
+										{% set val = values[k] %}
+									{% else %}
+										{% set val = '' %}
+									{% endif %}
+									{% if val is none %}
+									{% elif val is number %}
+										{{"{:0,.2f}".format(val)}}
+									{% elif (val is string) or (val is boolean) %}
+										{{val}}
+									{% else %}
+										{% for v in val %}
+											{% if v is number %}
+												{{"{:0,.2f}".format(v)}}
+											{% else %}
+												{{v}}
+											{% endif %}
+											{% if not loop.last %}
+												|
+											{% endif %}
+										{% endfor %}
+									{% endif %}
+								</td>
+							{% endfor %}
+						</tr>
+					{% endfor %}
 				</tbody>
 			</table>
 		{% endfor %}
 
-		<h2>Raw</h2>	
-		<pre>{{raw_data}}</pre>
+	</section>
 
-	{% else %}
-		<table>
-			<caption>Report Run Row</caption>	
-			<tbody>
-				{% for title in row.data.titles %}
-					<tr>
-						<th>{{title}}</th>
-						<td>{{row.data['values'][title]}}</td>
-					</tr>
-				{% endfor %}
-			</tbody>
-		</table>
-	{% endif %}
+	<h2>Raw</h2>	
+	<pre>{{raw_data}}</pre>
 {% endblock %}

chellow/views.py

@@ -1629,42 +1629,40 @@ def report_run_row_get(row_id):
     if row.report_run.name == "bill_check":
         values = row.data["values"]
         elements = {}
-        for t in row.data["values"].keys():
-            if t == "difference-tpr-gbp":
-                continue
+        for t in values.keys():
 
             if (
                 t.startswith("covered-")
                 or t.startswith("virtual-")
                 or t.startswith("difference-")
-            ) and t not in (
-                "covered-from",
-                "covered-to",
-                "covered-bills",
-                "covered-problem",
-                "virtual-problem",
-            ):
+            ) and t.endswith("-gbp"):
                 toks = t.split("-")
                 name = "-".join(toks[1:-1])
+                if name in ("vat", "gross", "net", "tpr"):
+                    continue
                 try:
                     table = elements[name]
                 except KeyError:
-                    table = elements[name] = {"order": 0}
-
-                if "titles" not in table:
-                    table["titles"] = []
-                table["titles"].append(toks[0] + "-" + "-".join(toks[2:]))
-                if "values" not in table:
-                    table["values"] = []
-                table["values"].append(values[t])
-                if t.startswith("difference-") and t.endswith("-gbp"):
+                    table = elements[name] = {"order": 0, "name": name, "parts": set()}
+                    tables.append(table)
+
+                if t.startswith("difference-"):
                     table["order"] = abs(values[t])
 
-        for k, v in elements.items():
-            if k == "net":
-                continue
-            v["name"] = k
-            tables.append(v)
+        for t in values.keys():
+
+            toks = t.split("-")
+            if toks[0] in ("covered", "virtual", "difference"):
+                tail = "-".join(toks[1:])
+                for element in sorted(elements.keys(), key=len, reverse=True):
+
+                    table = elements[element]
+                    elstr = f"{element}-"
+                    if tail.startswith(elstr):
+                        part = tail[len(elstr) :]
+                        if part != "gbp":
+                            table["parts"].add(part)
+                        break
 
         tables.sort(key=lambda t: t["order"], reverse=True)
         return render_template(
@@ -1678,7 +1676,7 @@ def report_run_row_get(row_id):
 
         values = row.data["values"]
         elements = {}
-        for t in row.data["values"].keys():
+        for t in values.keys():
 
             if (
                 t.startswith("covered_")
@@ -1695,7 +1693,7 @@ def report_run_row_get(row_id):
                     table = elements[name] = {"order": 0, "name": name, "parts": set()}
                     tables.append(table)
 
-        for t in row.data["values"].keys():
+        for t in values.keys():
 
             toks = t.split("_")
             if toks[0] in ("covered", "virtual", "difference"):

{chellow-1753706177.0.0.dist-info → chellow-1754570085.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1753706177.0.0
+Version: 1754570085.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-1753706177.0.0.dist-info → chellow-1754570085.0.0.dist-info}/RECORD

@@ -13,7 +13,7 @@ chellow/rate_server.py,sha256=RwJo-AzBIdzxx7PAtboZEUH1nUjAeJckw0bk06-9oyM,5672
 chellow/rrun.py,sha256=1Kt2q_K9UoDG_nsZz-Q6XJiMNKroWqlqFdxn2M6Q8CA,2088
 chellow/testing.py,sha256=Dj2c1NX8lVlygueOrh2eyYawLW6qKEHxNhXVVUaNRO0,3637
 chellow/utils.py,sha256=i3GQK9MIcweosZk2gi-nX_IFq2DxURAJDyNoLBg6YwM,19421
-chellow/views.py,sha256=oVZTSQ7k-VCwxzeDpj9sAfERtFw0rEHc58IxtvrhBi0,85431
+chellow/views.py,sha256=eFQTFnvz59_BC-lXIU7N8G6cpLCvTIszim-YN3n_Co8,85418
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
 chellow/e/bill_importer.py,sha256=7UcnqNlKbJc2GhW9gy8sDp9GuqambJVpZLvbafOZztA,7411
@@ -38,7 +38,7 @@ chellow/e/lafs.py,sha256=SUUFtvn_IQQTrZue1zefCYgzuscA0FVX2ySZ9u8BDPw,7776
 chellow/e/lcc.py,sha256=OkpynN8_iAdHRlu-yyU6BhRUqYYOZsUnl0HbHULYo_4,4670
 chellow/e/mdd_importer.py,sha256=NugJr2JhuzkPTsEMl_5UdQuw5K2p8lVJ-hyz4MK6Hfg,35762
 chellow/e/rcrc.py,sha256=92CA1uIotIHd1epQ_jEPdJKzXqDFV-AoJOJeRO6MEyA,4274
-chellow/e/ro.py,sha256=dZKZv_9wXSWuwcb3jiKavoD_9ot-PZseNVeEEe0siLo,596
+chellow/e/ro.py,sha256=cpeJQMY_6SpVxL1nySSj9we58A6E2KwJEAb6fK7cZKY,626
 chellow/e/scenario.py,sha256=FLgh03r_SgXx0hMWFbAvwsz2ScDL8LUwYWSWVv2rQlg,24973
 chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,6232
 chellow/e/tlms.py,sha256=pyL32hPiYd09FbpXVMnBjHsWFEQHs-Az945V7EShGiY,9116
@@ -50,17 +50,17 @@ chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=opjXRrqrgBTbSKzL0JfTLP0
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
 chellow/e/bill_parsers/bgb_edi.py,sha256=GuwHeYbAGk7BVg5n19FcTANFDyKI-y0z3f9niQaPSSw,4828
 chellow/e/bill_parsers/csv.py,sha256=U5zcIaZ6B5QTTpFDAcBnk4G2r8B3j5kJhDPL4AJNkEk,5640
-chellow/e/bill_parsers/drax_edi.py,sha256=PakbtmBEVvshJxZR_8LXeqPyUBrwtKO3GiNIlVFZETE,15191
+chellow/e/bill_parsers/drax_edi.py,sha256=mzYaPYMVj2dFb1HIGV-HFtqYjhZ2g9V3xl_w8Z1ECfc,15400
 chellow/e/bill_parsers/drax_element_edi.py,sha256=kxjg1KA4UheMa8doGp9skXtQYrNK8Eisy9ksafR5TQo,13661
 chellow/e/bill_parsers/edf_export_xlsx.py,sha256=J4lY8epiSTIePZ6D1SGD76TXRoev35KrUC2sjHkNqlE,6632
-chellow/e/bill_parsers/engie_edi.py,sha256=PDMDI0aqUM1lalgzxih1YmMho11n1rMqE0vyL-aEIs8,15840
+chellow/e/bill_parsers/engie_edi.py,sha256=yC5Tz5xFIcJmKZbvK_xcl0s-1fZsse1z4HEbwpC7fxU,15834
 chellow/e/bill_parsers/engie_export_xlsx.py,sha256=oZO0qHdDlOxjJ6J5Ate82CkAoX4bxed1EJyUKHxBcpk,4690
 chellow/e/bill_parsers/engie_xls.py,sha256=jrut2heH_ZWmSjcn7celOydZS9Y49GfpYjDk_EKwamI,14453
 chellow/e/bill_parsers/engie_xlsx.py,sha256=4Hu3ls1uNMH7vjDHgcP6QARlGlvb616CqG3xZVjAKWo,16888
 chellow/e/bill_parsers/gdf_csv.py,sha256=ZfK3Oc6oP28p_P9DIevLNB_zW2WLcEJ3Lvb1gL310YU,7382
 chellow/e/bill_parsers/haven_csv.py,sha256=0uENq8IgVNqdxfBQMBxLTSZWCOuDHXZC0xzk52SbfyE,13652
 chellow/e/bill_parsers/haven_edi.py,sha256=YGPHRxPOhje9s32jqPHHELni2tooOYj3cMC_qaZVPq4,16107
-chellow/e/bill_parsers/haven_edi_tprs.py,sha256=ZVX9CCqUybsot_Z0BEOJPvl9x5kSr7fEWyuJXvZDcz4,11841
+chellow/e/bill_parsers/haven_edi_tprs.py,sha256=JtCSUM4h6QFB76KaHY5gGWhCOtlSEEy7MLCUtOrJjPY,12004
 chellow/e/bill_parsers/mm.py,sha256=1myKrms3yVAhKFCzk3swWJjCwepZYk8GkD0wK0bpsj4,11184
 chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=YvQ0Q6HlZ4XSk6Phx1UWaTSj8FREVjwQe8nrpiLVzbU,5458
 chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=osCpUYUdLcPtlo7ngXWGw0ImnxssLa1fOSejMwe51-k,6381
@@ -79,7 +79,7 @@ chellow/gas/transportation.py,sha256=Bkg8TWOs-v0ES-4qqwbleiOhqbE_t2KauUx9JYMZELM
 chellow/gas/views.py,sha256=GeCvi6BGTUN7bu7sVkypNckwG3Crl6AbUcRob9qMi0E,59733
 chellow/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/reports/report_109.py,sha256=Exb-FQ5f70-ier_h15CgHGysQ7vJ7k3gFZ1001zM3iM,11171
-chellow/reports/report_111.py,sha256=o_wWyrtmxpTnmT9DVlsG5h5wdm3JqojirRlx_7W5_kQ,28787
+chellow/reports/report_111.py,sha256=_ipuMuvhjWLBVjK4wV08tbDG6s8cspQ_bzRZu1mPuXE,30224
 chellow/reports/report_169.py,sha256=wortJyvgXTrnjjXhLzqwaksKKu63K5IgdzU5f4SkHMI,9246
 chellow/reports/report_181.py,sha256=ypfYWYVNC1X2fMlJyDzwNiNTTRrpPW49DirXE_xDKa0,4958
 chellow/reports/report_183.py,sha256=fGONpKEIXTqIT_3dE5jZKBIesWPgLq-chHO6X22dIv0,8768
@@ -88,14 +88,14 @@ chellow/reports/report_219.py,sha256=3Zs16ka6dWWY_lCDoA-ZFrlPb4vHk1LQoa2yrlTMntA
 chellow/reports/report_231.py,sha256=WARLztV2HzBFSi5_xvY_DTXVyuBBbBYiU0RazfjKw-Y,5270
 chellow/reports/report_233.py,sha256=qJdPFuBgQAWD24BsljgGJ44L_RGdHOA1RqsxGjTWhFc,4975
 chellow/reports/report_241.py,sha256=lfivElRkV_CZAhck0rxAuhqzgponj3aWwmwGMNQvUxg,5343
-chellow/reports/report_247.py,sha256=00a-shl3TRRWyana42OZHvPnjE803rQc_2HzlSA5xKE,46029
+chellow/reports/report_247.py,sha256=FY0eFi5gPfN3LtL82eCpcaLXNh2PC8pHl8yyCPaZuNw,46057
 chellow/reports/report_29.py,sha256=ZXnq6Kg5on-IPquUsH4bn46mBVESY_WhwqDWZPXOJwo,2695
 chellow/reports/report_291.py,sha256=BnWtxe0eWN2QKKWpwjs5-RI5LbReBKL119QbkrkNhV8,7478
 chellow/reports/report_33.py,sha256=lt1EN_LNx6u-AgdaS3YRkPMZA33JgMcELolHF4oJUMw,16689
 chellow/reports/report_387.py,sha256=bBqtnGGDWIXzXe2zVm9yeDRZKNgkUaOS3XTX6k09f18,5631
 chellow/reports/report_41.py,sha256=8xUIN9D5dtT0Dn1RmbnWsLRmM-QbGA5xGhWCK3ljAzA,7406
 chellow/reports/report_429.py,sha256=1LzrhfePeLg98eczzxy9HrR0EYcPYINw1LSJKk9kKAM,15812
-chellow/reports/report_59.py,sha256=PkdRA6ctvDGWTQd5vb9cQH6MG920TxcD6aHh268zrj8,42221
+chellow/reports/report_59.py,sha256=cnsAzelRwxzKuO0NTfOiNEPpREveK0goBxRLFN39a0s,42253
 chellow/reports/report_81.py,sha256=bBpV6MtvKGtoLiqzZoK2h21KDs4vfDwy-etpfL9oiEI,5570
 chellow/reports/report_87.py,sha256=udzbCuXcckWD-OHmfJCT6bwg_paYhm4vfDWlL8WM-jA,6933
 chellow/reports/report_asset_comparison.py,sha256=Cl2NgvbclqhOVvKuUu3sajTVO2JupMfzK3bV0_K8eNs,6077
@@ -105,13 +105,13 @@ chellow/reports/report_csv_llfcs.py,sha256=mMB06b6Jems5kcQU4H4Le_fyKgVr8THP8BCx3
 chellow/reports/report_csv_site_hh_data.py,sha256=ik0OkGVo1bfTXLdcT3gPUHnxSkSdorzZheP3qgnOR5c,4331
 chellow/reports/report_csv_site_snags.py,sha256=AuAy6vjL0g7vwPPAZhBqxOyITL9_jnyFj012MnUcxxk,2627
 chellow/reports/report_ecoes_comparison.py,sha256=u0L2D1z8j63btdypIRd1NMMqFKgeMz_zK-SAjn7b5b4,21401
-chellow/reports/report_g_monthly_duration.py,sha256=VQq5xTLvdu9Z_vqrgWNP2S4xm2uCSSZA9HVNiQv9Dus,18264
+chellow/reports/report_g_monthly_duration.py,sha256=aEY3hSBaCxjOBgWZYWZH38TmZEO5MpOfpOQe2Lhfpmo,18288
 chellow/reports/report_g_supplies_snapshot.py,sha256=9xB6RDrnbgxuomMcP1b1yEP4kOnEJ34WgKpyxLTprOQ,3998
 chellow/reports/report_g_supply_virtual_bill.py,sha256=EaYrB8PHJIXrUuhiZ7dwUlbNBkuyJebQHrdc308_z1o,3653
 chellow/reports/report_g_virtual_bills.py,sha256=20vHa5LGQwOAlJlaGJaGszZrrbT0PMOZJf6hSxU2hIQ,4528
 chellow/reports/report_g_virtual_bills_hh.py,sha256=gaiLEmKTpq6JsfZ1p0SdCDuPvzvigXp6z88gHRCA63w,3416
-chellow/reports/report_missing_bills.py,sha256=aCgpVpwjN7jKg1S_pnmnHgo9FKFFSThSkiEKAUYvtSo,6021
-chellow/reports/report_sscs.py,sha256=fQWyVG-gdg37DyNHgpNARpSxIwTl7mCn20fDLwx9oHg,3214
+chellow/reports/report_missing_bills.py,sha256=-hVjmWctLtHBEBfCmYjKlVD3YT3R50cyb_fp2Ah88qE,5973
+chellow/reports/report_sscs.py,sha256=IZKSJJxWmqEV8PDs4YYGET0J_EKOQ6QHCKdVltA5haA,3242
 chellow/reports/report_supply_contacts.py,sha256=pvwlInaPYV_pa9MMK6vh854plHFwv3m5zo5xulR1g5I,3599
 chellow/static/css/chellow.css,sha256=dnkuj9Z1BCOV_L2Y26lDd2QlTmFFhATa1YvwPVch1Oc,5375
 chellow/static/images/favicon.svg,sha256=ySFHoVJYmr-xU93QrE-jLYn-ZNythh2vsemnR8dkvg0,2339
@@ -146,13 +146,13 @@ 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=H2ayoBL7EgKMq2Nwq5VjE_TNvcIKcqeCm0alQWLIw78,5084
+chellow/templates/report_run_bill_check.html,sha256=I4VLSTOGE7cjjZggG3EAI9EW-2b7e0oOTs-S7FlknS4,5110
 chellow/templates/report_run_ecoes_comparison.html,sha256=VmkT5ypWLP8qZS6NbDTC4yDaG7mnUlxZz7EV8xkHGZw,4086
 chellow/templates/report_run_g_bill_check.html,sha256=tOXl_mjR__foYKiOYflJbK-459actAtjzv8rfuL3TwM,4851
 chellow/templates/report_run_missing_e_bills.html,sha256=l5idQhfaNhMvvzIRv-iqCpeDnYl_wgs6-mZMBOmuyR8,2447
 chellow/templates/report_run_monthly_duration_org.html,sha256=gGNGJ4Q50q4BtIMi98rhO-7NqRHcsFUmbj2qzeOLejw,1713
 chellow/templates/report_run_row.html,sha256=bmtcdqJaS1CXpL0i8PuqvmeF98jKNYX5-mnQu-OuDKQ,3791
-chellow/templates/report_run_row_bill_check.html,sha256=aC2LMu_6NvmTN3ZdxHJPPPczyxPN6hg0F-PPcqIWUws,4683
+chellow/templates/report_run_row_bill_check.html,sha256=F3wkVO7fJgc2_66p4p91RB9AqcR6OaLx5zk7iCiwDxs,7779
 chellow/templates/report_run_row_g_bill_check.html,sha256=2Ym9mkwvA_DGDrgktDDwXQXlUK7tR2aR3gp3KUqMLoI,7017
 chellow/templates/report_run_supply_contacts.html,sha256=JNzwz9M6qbLRDMkCzFCxxANapUer5klxo7t5a48nAzg,2117
 chellow/templates/report_runs.html,sha256=ecoIkl2WtfYtifiTxnslmpMGYYGVQW-CVSBpqhXyiE4,1131
@@ -385,6 +385,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-1753706177.0.0.dist-info/METADATA,sha256=hDTpywwjrBXlrUqUeORa0HKtxpXIs3ddk90kZhStmmw,12519
-chellow-1753706177.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1753706177.0.0.dist-info/RECORD,,
+chellow-1754570085.0.0.dist-info/METADATA,sha256=cT0SgunJ0IL9NYi6VfbeqKP9zv6wvOrvhIOCz3t7v6U,12519
+chellow-1754570085.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1754570085.0.0.dist-info/RECORD,,