chellow 1761322486.0.0__py3-none-any.whl → 1761338924.0.0__py3-none-any.whl

chellow/reports/report_111.py

@@ -688,8 +688,13 @@ def _process_period(
 
     for elname, val_elem in val_elems.items():
         for part_name, part in val_elem["parts"].items():
-            virtual_part = part.get("virtual")
-            actual_part = part.get("actual")
+            if part_name == "gbp":
+                default = 0
+            else:
+                default = None
+            virtual_part = part.get("virtual", default)
+            actual_part = part.get("actual", default)
+
             if isinstance(virtual_part, set) and len(virtual_part) == 1:
                 virtual_part = next(iter(virtual_part))
             if isinstance(actual_part, set) and len(actual_part) == 1:

chellow/templates/report_run_bill_check.html

@@ -146,9 +146,8 @@
 					{% for elem, diff in elements %}
 						<td style="text-align: right;">	
 							{% if elem in data.elements %}
-								{% set val = data.elements[elem]['parts']['gbp']['difference'] %}
 								{% if val is not none %}
-									{{"{:0,.2f}".format(val)}}
+									{{"{:0,.2f}".format(data.elements[elem]['parts']['gbp']['difference'])}}
 								{% endif %}
 							{% endif %}
 						</td>

chellow/templates/report_run_row_bill_check.html

@@ -133,15 +133,15 @@
 							<th>Actual</th>
 							<th>Virtual</th>
 							<th>Difference</th>
-							<th>Passed</th>
+							<th>Status</th>
 						</tr>
 					</thead>
 					<tbody>
 						<tr>
 							<td>gbp</td>
+							{% set part = parts['gbp'] %}
 							{% for k in ('actual', 'virtual', 'difference') %}
 								<td style="text-align: right;">
-									{% set part = parts['gbp'] %}
 									{% if k in part %}
 										{% set val = part[k] %}
 									{% else %}
@@ -155,6 +155,7 @@
 									{% endif %}
 								</td>
 							{% endfor %}
+							<td>{{part['passed']}}</td>
 						</tr>
 						{% for part_name, part in parts.items()|sort %}
 							{% if part_name != 'gbp' %}

{chellow-1761322486.0.0.dist-info → chellow-1761338924.0.0.dist-info}/METADATA

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

@@ -78,7 +78,7 @@ chellow/gas/transportation.py,sha256=uWFh0v-ViA02nH9Vof9JG3PiyAPXwhYZ1SvPxuzsQ0I
 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=lI-d-tT3GMfZzKpCtgaR7o5ySaDFOmD4qc9CFfr8wvY,26314
+chellow/reports/report_111.py,sha256=I1a6ajORfxDJNdijHGm728Xx5MfSHLSRgWtA_ohxax4,26445
 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
@@ -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=E8CkzLOg0fN0xvVpUp79SNh8-nT0aFVrVgHK2FuMiZQ,4586
+chellow/templates/report_run_bill_check.html,sha256=c7lHmq0l9GMBVXdgWVbLibS1vudCh8znLnD8COdZO3I,4558
 chellow/templates/report_run_ecoes_comparison.html,sha256=EYjmdiQ14lt_CW7e6mdyQYec1t-rg8g85wFb1757YpI,4812
 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=EDDIgtPbEtjjrSEw5wpuPVor8o-M7aO0fN7yu1WZ8mY,6482
+chellow/templates/report_run_row_bill_check.html,sha256=QXhPXRZLuFGfWlA93SUIW3LUIYVJOyzV662k5UTmoOU,6515
 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
@@ -400,6 +400,6 @@ chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBe
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
 chellow/templates/reports/channel_snags.html,sha256=_aAgFgMlTkK2HuKFU8YisAIcUYfg6Hqhgyf5MZpdK8c,2629
-chellow-1761322486.0.0.dist-info/METADATA,sha256=iI_ihxfowRRM3J2bj2YoDeMetF6z-tns_TTnjg4c4uk,12428
-chellow-1761322486.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1761322486.0.0.dist-info/RECORD,,
+chellow-1761338924.0.0.dist-info/METADATA,sha256=Y3aJGfAXFmhpyUvNacl8BUCN0jttvfj5N6fRczygvgg,12428
+chellow-1761338924.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1761338924.0.0.dist-info/RECORD,,