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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of chellow might be problematic. Click here for more details.

Files changed (5) hide show
  1. chellow/templates/report_run_row_bill_check.html +14 -77
  2. chellow/views.py +1 -1
  3. {chellow-1761300128.0.0.dist-info → chellow-1761312650.0.0.dist-info}/METADATA +1 -1
  4. {chellow-1761300128.0.0.dist-info → chellow-1761312650.0.0.dist-info}/RECORD +5 -5
  5. {chellow-1761300128.0.0.dist-info → chellow-1761312650.0.0.dist-info}/WHEEL +0 -0
chellow/templates/report_run_row_bill_check.html CHANGED
@@ -120,81 +120,6 @@
120
120
  </table>
121
121
 
122
122
  <section class="elements">
123
- <!--
124
- <table>
125
- <caption>GBP</caption>
126
- <thead>
127
- <tr>
128
- <th>Part</th>
129
- <th>Covered</th>
130
- <th>Virtual</th>
131
- <th>Difference</th>
132
- </tr>
133
- </thead>
134
- <tbody>
135
- <tr>
136
- <td>gross</td>
137
- <td>
138
- {% if 'covered-gross-gbp' in data and data['covered-gross-gbp'] is number %}
139
- {{"{:0,.2f}".format(data['covered-gross-gbp'])}}
140
- {% endif %}
141
- </td>
142
- <td>
143
- {% if 'virtual-gross-gbp' in data and data['virtual-gross-gbp'] is number %}
144
- {{"{:0,.2f}".format(data['virtual-gross-gbp'])}}
145
- {% endif %}
146
- </td>
147
- <td>
148
- {% if 'difference-gross-gbp' in data and data['difference-gross-gbp'] is number %}
149
- {{"{:0,.2f}".format(data['difference-gross-gbp'])}}
150
- {% endif %}
151
- </td>
152
- </tr>
153
- <tr>
154
- <td>net</td>
155
- <td>
156
- {% if 'covered-net-gbp' in data and data['covered-net-gbp'] is number %}
157
- {{"{:0,.2f}".format(data['covered-net-gbp'])}}</td>
158
- {% endif %}
159
- <td>
160
- {% if 'virtual-net-gbp' in data and data['virtual-net-gbp'] is number %}
161
- {{"{:0,.2f}".format(data['virtual-net-gbp'])}}</td>
162
- {% endif %}
163
- <td>
164
- {% if 'difference-net-gbp' in data and data['difference-net-gbp'] is number %}
165
- {{"{:0,.2f}".format(data['difference-net-gbp'])}}</td>
166
- {% endif %}
167
- </tr>
168
- <tr>
169
- <td>vat</td>
170
- <td>
171
- {% if 'covered-vat-gbp' in data and data['covered-vat-gbp'] is number %}
172
- {{"{:0,.2f}".format(data['covered-vat-gbp'])}}</td>
173
- {% endif %}
174
- <td>
175
- {% if 'virtual-vat-gbp' in data and data['virtual-vat-gbp'] is number %}
176
- {{"{:0,.2f}".format(data['virtual-vat-gbp'])}}</td>
177
- {% endif %}
178
- <td>
179
- {% if 'difference-vat-gbp' in data and data['difference-vat-gbp'] is number %}
180
- {{"{:0,.2f}".format(data['difference-vat-gbp'])}}</td>
181
- {% endif %}
182
- </tr>
183
- <tr>
184
- <td>vat-rate</td>
185
- <td>
186
- {{data['covered-vat-rate']}}</td>
187
- <td>{{data['virtual-vat-rate']}}</td>
188
- <td>
189
- {% if data['difference-vat-rate'] is number %}
190
- {{"{:0,.2f}".format(data['difference-vat-rate'])}}
191
- {% endif %}
192
- </td>
193
- </tr>
194
- </tbody>
195
- </table>
196
- -->
197
-
198
123
  {% for table in tables %}
199
124
  {% set element = data['elements'][table] %}
200
125
  {% set parts = element['parts'] %}
@@ -243,13 +168,25 @@
243
168
  {% endif %}
244
169
  {% if val is none %}
245
170
  {% elif val is number %}
246
- {{"{:0,.2f}".format(val)}}
171
+ {% if part_name in ('kwh', 'kvarh') or part_name.endswith('-kwh') %}
172
+ {{"{:0,.0f}".format(val)}}
173
+ {% elif part_name.endswith('-kw') %}
174
+ {{"{:0,.2f}".format(val)}}
175
+ {% else %}
176
+ {{val}}
177
+ {% endif %}
247
178
  {% elif (val is string) or (val is boolean) %}
248
179
  {{val}}
249
180
  {% else %}
250
181
  {% for v in val %}
251
182
  {% if v is number %}
252
- {{"{:0,.2f}".format(v)}}
183
+ {% if part_name in ('kwh', 'kvarh') or part_name.endswith('-kwh') %}
184
+ {{"{:0,.0f}".format(v)}}
185
+ {% elif part_name.endswith('-kw') %}
186
+ {{"{:0,.2f}".format(v)}}
187
+ {% else %}
188
+ {{v}}
189
+ {% endif %}
253
190
  {% else %}
254
191
  {{v}}
255
192
  {% endif %}
chellow/views.py CHANGED
@@ -1416,7 +1416,7 @@ def report_run_get(run_id):
1416
1416
  )
1417
1417
  if element == "problem":
1418
1418
  order_by = (
1419
- ReportRunRow.data["data"]["problem"].as_string(),
1419
+ ReportRunRow.data["data"]["problem"].as_string().desc(),
1420
1420
  func.abs(
1421
1421
  func.coalesce(
1422
1422
  ReportRunRow.data["data"]["difference_net_gbp"].as_float(), 0
{chellow-1761300128.0.0.dist-info → chellow-1761312650.0.0.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: chellow
3
- Version: 1761300128.0.0
3
+ Version: 1761312650.0.0
4
4
  Summary: Web Application for checking UK energy bills.
5
5
  Project-URL: Homepage, https://github.com/WessexWater/chellow
6
6
  Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
{chellow-1761300128.0.0.dist-info → chellow-1761312650.0.0.dist-info}/RECORD RENAMED
@@ -12,7 +12,7 @@ chellow/rate_server.py,sha256=RwJo-AzBIdzxx7PAtboZEUH1nUjAeJckw0bk06-9oyM,5672
12
12
  chellow/rrun.py,sha256=sWm_tuJ_6xH3T28TY1w63k1Q44N_S_p_pYF5YCeztqU,2226
13
13
  chellow/testing.py,sha256=Dj2c1NX8lVlygueOrh2eyYawLW6qKEHxNhXVVUaNRO0,3637
14
14
  chellow/utils.py,sha256=x6yReQkhFaFGnsuhs6PqrEkE1OfZSPrrC7IqstRXKKU,19701
15
- chellow/views.py,sha256=9IUUbYjqEmQQzbYQB4w-ygCo25gecIxYVbxTXRF-YfY,86078
15
+ chellow/views.py,sha256=Qk8XFG2mnOIJB4MdFkcwS_ItehgWpSzr7kaNyYxC5RM,86085
16
16
  chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
17
17
  chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
18
18
  chellow/e/bill_importer.py,sha256=mEW4s_P5tp81uf1cYWCKcr5DW1EkeRi0JUHy9caz5mI,10353
@@ -152,7 +152,7 @@ chellow/templates/report_run_g_bill_check.html,sha256=tOXl_mjR__foYKiOYflJbK-459
152
152
  chellow/templates/report_run_missing_e_bills.html,sha256=l5idQhfaNhMvvzIRv-iqCpeDnYl_wgs6-mZMBOmuyR8,2447
153
153
  chellow/templates/report_run_monthly_duration_org.html,sha256=gGNGJ4Q50q4BtIMi98rhO-7NqRHcsFUmbj2qzeOLejw,1713
154
154
  chellow/templates/report_run_row.html,sha256=bmtcdqJaS1CXpL0i8PuqvmeF98jKNYX5-mnQu-OuDKQ,3791
155
- chellow/templates/report_run_row_bill_check.html,sha256=JzedUA9R4-0jnonnoluV7CYCnzGsSAPFQtEVgMt6GTc,8105
155
+ chellow/templates/report_run_row_bill_check.html,sha256=oEsgUZF417vFDepChkNjaMkqDa4M4dc1e9Dd5oHP9js,6422
156
156
  chellow/templates/report_run_row_g_bill_check.html,sha256=2Ym9mkwvA_DGDrgktDDwXQXlUK7tR2aR3gp3KUqMLoI,7017
157
157
  chellow/templates/report_run_supply_contacts.html,sha256=JNzwz9M6qbLRDMkCzFCxxANapUer5klxo7t5a48nAzg,2117
158
158
  chellow/templates/report_runs.html,sha256=ecoIkl2WtfYtifiTxnslmpMGYYGVQW-CVSBpqhXyiE4,1131
@@ -400,6 +400,6 @@ chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBe
400
400
  chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
401
401
  chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
402
402
  chellow/templates/reports/channel_snags.html,sha256=_aAgFgMlTkK2HuKFU8YisAIcUYfg6Hqhgyf5MZpdK8c,2629
403
- chellow-1761300128.0.0.dist-info/METADATA,sha256=P8R_gGwMFw4jdwYKRJX9X0ptfSwWCzDXCQBklJ9Arfo,12428
404
- chellow-1761300128.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
405
- chellow-1761300128.0.0.dist-info/RECORD,,
403
+ chellow-1761312650.0.0.dist-info/METADATA,sha256=Ml6Si3mp6fVXS2RoaAZhl7SZZkbD2cV0RIziFGKqHqI,12428
404
+ chellow-1761312650.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
405
+ chellow-1761312650.0.0.dist-info/RECORD,,