chellow 1761312650.0.0__tar.gz → 1761318293.0.0__tar.gz

{chellow-1761312650.0.0 → chellow-1761318293.0.0}/PKG-INFO

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

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

{chellow-1761312650.0.0 → chellow-1761318293.0.0}/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-1761312650.0.0 → chellow-1761318293.0.0}/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-1761312650.0.0 → chellow-1761318293.0.0}/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 → chellow-1761318293.0.0}/test/reports/test_report_111.py

@@ -340,10 +340,12 @@ def virtual_bill(ds):
                         "actual": Decimal("10.00"),
                         "difference": 9.0,
                         "virtual": 1.0,
+                        "passed": "❌",
                     },
                     "kwh": {
-                        "difference": 0.0,
+                        "difference": None,
                         "virtual": 0,
+                        "passed": "❔",
                     },
                     "rate": {
                         "actual": {
@@ -353,6 +355,7 @@ def virtual_bill(ds):
                         "virtual": {
                             0.1,
                         },
+                        "passed": "✅",
                     },
                 },
                 "actual_elements": [
@@ -598,10 +601,12 @@ def virtual_bill(ds):
                             "actual": Decimal("10.00"),
                             "difference": 9.0,
                             "virtual": 1.0,
+                            "passed": "❌",
                         },
                         "kwh": {
-                            "difference": 0.0,
+                            "difference": None,
                             "virtual": 0,
+                            "passed": "❔",
                         },
                         "rate": {
                             "actual": {
@@ -611,6 +616,7 @@ def virtual_bill(ds):
                             "virtual": {
                                 0.1,
                             },
+                            "passed": "✅",
                         },
                     },
                     "actual_elements": [

chellow-1761312650.0.0/VERSION

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