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

chellow/e/views.py

@@ -1348,6 +1348,7 @@ def dc_contract_hh_imports_post(contract_id):
                     "dc_contract_hh_imports.html",
                     contract=contract,
                     processes=processes,
+                    parser_names=", ".join(chellow.e.hh_importer.extensions),
                 ),
                 400,
             )

chellow/templates/report_run_row_bill_check.html

@@ -120,81 +120,6 @@
 	</table>
   
 	<section class="elements">
-		<!--
-		<table>
-			<caption>GBP</caption>
-			<thead>
-				<tr>
-					<th>Part</th>
-					<th>Covered</th>
-					<th>Virtual</th>
-					<th>Difference</th>
-				</tr>
-			</thead>
-			<tbody>
-				<tr>
-					<td>gross</td>
-					<td>
-						{% if 'covered-gross-gbp' in data and data['covered-gross-gbp'] is number %}
-							{{"{:0,.2f}".format(data['covered-gross-gbp'])}}
-						{% endif %}
-					</td>
-					<td>
-						{% if 'virtual-gross-gbp' in data and data['virtual-gross-gbp'] is number %}
-							{{"{:0,.2f}".format(data['virtual-gross-gbp'])}}
-						{% endif %}
-					</td>
-					<td>
-						{% if 'difference-gross-gbp' in data and data['difference-gross-gbp'] is number %}
-							{{"{:0,.2f}".format(data['difference-gross-gbp'])}}
-						{% endif %}
-					</td>
-				</tr>
-				<tr>
-					<td>net</td>
-					<td>
-						{% if 'covered-net-gbp' in data and data['covered-net-gbp'] is number %}
-							{{"{:0,.2f}".format(data['covered-net-gbp'])}}</td>
-						{% endif %}
-					<td>
-						{% if 'virtual-net-gbp' in data and data['virtual-net-gbp'] is number %}
-							{{"{:0,.2f}".format(data['virtual-net-gbp'])}}</td>
-						{% endif %}
-					<td>
-						{% if 'difference-net-gbp' in data and data['difference-net-gbp'] is number %}
-							{{"{:0,.2f}".format(data['difference-net-gbp'])}}</td>
-						{% endif %}
-				</tr>
-				<tr>
-					<td>vat</td>
-					<td>
-						{% if 'covered-vat-gbp' in data and data['covered-vat-gbp'] is number %}
-							{{"{:0,.2f}".format(data['covered-vat-gbp'])}}</td>
-						{% endif %}
-					<td>
-						{% if 'virtual-vat-gbp' in data and data['virtual-vat-gbp'] is number %}
-							{{"{:0,.2f}".format(data['virtual-vat-gbp'])}}</td>
-						{% endif %}
-					<td>
-						{% if 'difference-vat-gbp' in data and data['difference-vat-gbp'] is number %}
-							{{"{:0,.2f}".format(data['difference-vat-gbp'])}}</td>
-						{% endif %}
-				</tr>
-				<tr>
-					<td>vat-rate</td>
-					<td>
-						{{data['covered-vat-rate']}}</td>
-					<td>{{data['virtual-vat-rate']}}</td>
-					<td>
-						{% if data['difference-vat-rate'] is number %}
-							{{"{:0,.2f}".format(data['difference-vat-rate'])}}
-						{% endif %}
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		-->
-
 		{% for table in tables %}
 			{% set element = data['elements'][table] %}
 			{% set parts = element['parts'] %}
@@ -243,13 +168,25 @@
 											{% endif %}
 											{% if val is none %}
 											{% elif val is number %}
-												{{"{:0,.2f}".format(val)}}
+												{% if part_name in ('kwh', 'kvarh') or part_name.endswith('-kwh') %}
+													{{"{:0,.0f}".format(val)}}
+												{% elif part_name.endswith('-kw') %}
+													{{"{:0,.2f}".format(val)}}
+												{% else %}
+													{{val}}
+												{% endif %}
 											{% elif (val is string) or (val is boolean) %}
 												{{val}}
 											{% else %}
 												{% for v in val %}
 													{% if v is number %}
-														{{"{:0,.2f}".format(v)}}
+														{% if part_name in ('kwh', 'kvarh') or part_name.endswith('-kwh') %}
+															{{"{:0,.0f}".format(v)}}
+														{% elif part_name.endswith('-kw') %}
+															{{"{:0,.2f}".format(v)}}
+														{% else %}
+															{{v}}
+														{% endif %}
 													{% else %}
 														{{v}}
 													{% endif %}

chellow/views.py

@@ -1416,7 +1416,7 @@ def report_run_get(run_id):
             )
         if element == "problem":
             order_by = (
-                ReportRunRow.data["data"]["problem"].as_string(),
+                ReportRunRow.data["data"]["problem"].as_string().desc(),
                 func.abs(
                     func.coalesce(
                         ReportRunRow.data["data"]["difference_net_gbp"].as_float(), 0

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

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

@@ -12,7 +12,7 @@ chellow/rate_server.py,sha256=RwJo-AzBIdzxx7PAtboZEUH1nUjAeJckw0bk06-9oyM,5672
 chellow/rrun.py,sha256=sWm_tuJ_6xH3T28TY1w63k1Q44N_S_p_pYF5YCeztqU,2226
 chellow/testing.py,sha256=Dj2c1NX8lVlygueOrh2eyYawLW6qKEHxNhXVVUaNRO0,3637
 chellow/utils.py,sha256=x6yReQkhFaFGnsuhs6PqrEkE1OfZSPrrC7IqstRXKKU,19701
-chellow/views.py,sha256=9IUUbYjqEmQQzbYQB4w-ygCo25gecIxYVbxTXRF-YfY,86078
+chellow/views.py,sha256=Qk8XFG2mnOIJB4MdFkcwS_ItehgWpSzr7kaNyYxC5RM,86085
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
 chellow/e/bill_importer.py,sha256=mEW4s_P5tp81uf1cYWCKcr5DW1EkeRi0JUHy9caz5mI,10353
@@ -44,7 +44,7 @@ chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,623
 chellow/e/tlms.py,sha256=pyL32hPiYd09FbpXVMnBjHsWFEQHs-Az945V7EShGiY,9116
 chellow/e/tnuos.py,sha256=NBmc-f3oezrl4gviAKobljHfICTpBKxxxEGBGJi_lRk,4927
 chellow/e/triad.py,sha256=uQIngSrz8irBXQ0Rp_s8nAUzu-y2Ms7aj4B38_Ff8y8,13720
-chellow/e/views.py,sha256=Duvdp5ZjtCHnOrAyk7uZZJr0jZcg0F2h3g1XNN25HtU,234669
+chellow/e/views.py,sha256=T2ETJT92bW3BdUGXPuvbIBx6RHh1agyEiQOv-DICtyk,234747
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=hcbjxqLOe7qkDjS7enCpmfyGwm3d-pq3u5VQIaUmVTw,3796
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=yoEGQS0qcrv3TWFfxELIIi8f1CyKcIzh0xVaPoz2w2s,4191
@@ -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=JzedUA9R4-0jnonnoluV7CYCnzGsSAPFQtEVgMt6GTc,8105
+chellow/templates/report_run_row_bill_check.html,sha256=oEsgUZF417vFDepChkNjaMkqDa4M4dc1e9Dd5oHP9js,6422
 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-1761297878.0.0.dist-info/METADATA,sha256=YJWJBO0S9POBAD-RG5IFnGyCsyecRLSoNm_xWroFfrw,12428
-chellow-1761297878.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1761297878.0.0.dist-info/RECORD,,
+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,,