chellow 1761312650.0.0__py3-none-any.whl → 1761318293.0.0__py3-none-any.whl

chellow/e/bill_parsers/drax_edi.py

@@ -106,6 +106,9 @@ ELEMENT_MAP = {
             "091890": ("shape", "rate", "kwh"),
             "122568": ("nrg-msp", "rate", "kwh"),
         },
+        "R10001": {
+            "700285": ("standing", "rate", "days"),
+        },
     },
     "REN": {
         "REN001": {

chellow/reports/report_111.py

@@ -688,8 +688,8 @@ 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", 0)
-            actual_part = part.get("actual", 0)
+            virtual_part = part.get("virtual")
+            actual_part = part.get("actual")
             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:
@@ -697,12 +697,16 @@ def _process_period(
 
             if virtual_part is None or actual_part is None:
                 diff = None
+                passed = "❔"
             elif isinstance(virtual_part, Number) and isinstance(actual_part, Number):
                 diff = float(actual_part) - float(virtual_part)
+                passed = "✅" if diff == 0 else "❌"
             else:
-                diff = "✔" if virtual_part == actual_part else "❌"
+                diff = None
+                passed = "✅" if virtual_part == actual_part else "❌"
 
             part["difference"] = diff
+            part["passed"] = passed
 
     if first_era is None:
         site = None

chellow/templates/report_run_row_bill_check.html

@@ -133,6 +133,7 @@
 							<th>Actual</th>
 							<th>Virtual</th>
 							<th>Difference</th>
+							<th>Passed</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -169,7 +170,7 @@
 											{% if val is none %}
 											{% elif val is number %}
 												{% if part_name in ('kwh', 'kvarh') or part_name.endswith('-kwh') %}
-													{{"{:0,.0f}".format(val)}}
+													{{"{:0,.1f}".format(val)}}
 												{% elif part_name.endswith('-kw') %}
 													{{"{:0,.2f}".format(val)}}
 												{% else %}
@@ -181,7 +182,7 @@
 												{% for v in val %}
 													{% if v is number %}
 														{% if part_name in ('kwh', 'kvarh') or part_name.endswith('-kwh') %}
-															{{"{:0,.0f}".format(v)}}
+															{{"{:0,.1f}".format(v)}}
 														{% elif part_name.endswith('-kw') %}
 															{{"{:0,.2f}".format(v)}}
 														{% else %}
@@ -197,6 +198,7 @@
 											{% endif %}
 										</td>
 									{% endfor %}
+									<td>{{part['passed']}}</td>
 								</tr>
 							{% endif %}
 						{% endfor %}

{chellow-1761312650.0.0.dist-info → chellow-1761318293.0.0.dist-info}/METADATA

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

@@ -50,7 +50,7 @@ chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=hcbjxqLOe7qkDjS7enCpmfy
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=yoEGQS0qcrv3TWFfxELIIi8f1CyKcIzh0xVaPoz2w2s,4191
 chellow/e/bill_parsers/bgb_edi.py,sha256=GuwHeYbAGk7BVg5n19FcTANFDyKI-y0z3f9niQaPSSw,4828
 chellow/e/bill_parsers/csv.py,sha256=mLwGaEkLIygBg8Zl5aHs--GurHh1RPPGlF4g6nWAp1Q,5965
-chellow/e/bill_parsers/drax_edi.py,sha256=z1skUO7hd62T2sfGCGDhMUyGJCN-w7mr8PhlRzrzShg,14162
+chellow/e/bill_parsers/drax_edi.py,sha256=nkJtLnBImXWu4LYCaQqyo7-Ls7rlYyITyLd8Zk_cx-k,14245
 chellow/e/bill_parsers/edf_export_xlsx.py,sha256=J4lY8epiSTIePZ6D1SGD76TXRoev35KrUC2sjHkNqlE,6632
 chellow/e/bill_parsers/engie_edi.py,sha256=4KAyZpQrZhhGLM7WLZS1z8rOn5A8HgwBBvr5Jkf6cxE,12579
 chellow/e/bill_parsers/engie_export_xlsx.py,sha256=oZO0qHdDlOxjJ6J5Ate82CkAoX4bxed1EJyUKHxBcpk,4690
@@ -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=LNrSqXb_oIShjWj5KewciAc2KCtOZiSIVr4lhZkif1I,26168
+chellow/reports/report_111.py,sha256=lI-d-tT3GMfZzKpCtgaR7o5ySaDFOmD4qc9CFfr8wvY,26314
 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
@@ -152,7 +152,7 @@ chellow/templates/report_run_g_bill_check.html,sha256=tOXl_mjR__foYKiOYflJbK-459
 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=oEsgUZF417vFDepChkNjaMkqDa4M4dc1e9Dd5oHP9js,6422
+chellow/templates/report_run_row_bill_check.html,sha256=EDDIgtPbEtjjrSEw5wpuPVor8o-M7aO0fN7yu1WZ8mY,6482
 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-1761312650.0.0.dist-info/METADATA,sha256=Ml6Si3mp6fVXS2RoaAZhl7SZZkbD2cV0RIziFGKqHqI,12428
-chellow-1761312650.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1761312650.0.0.dist-info/RECORD,,
+chellow-1761318293.0.0.dist-info/METADATA,sha256=tEhiVeVet3NH3UUtaV6iNlZm2pHTlCSng3JxIdv3vj4,12428
+chellow-1761318293.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1761318293.0.0.dist-info/RECORD,,