chellow 1754645767.0.0__py3-none-any.whl → 1754648581.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/reports/report_ecoes_comparison.py +41 -33
  2. chellow/templates/report_run_ecoes_comparison.html +2 -0
  3. {chellow-1754645767.0.0.dist-info → chellow-1754648581.0.0.dist-info}/METADATA +1 -1
  4. {chellow-1754645767.0.0.dist-info → chellow-1754648581.0.0.dist-info}/RECORD +5 -5
  5. {chellow-1754645767.0.0.dist-info → chellow-1754648581.0.0.dist-info}/WHEEL +0 -0
chellow/reports/report_ecoes_comparison.py CHANGED
@@ -329,40 +329,44 @@ def _process(
329
329
 
330
330
  if current_chell:
331
331
  mpans.remove(mpan_spaces)
332
- era = sess.execute(
333
- select(Era)
334
- .filter(
335
- Era.finish_date == null(),
336
- or_(
337
- Era.imp_mpan_core == mpan_spaces,
338
- Era.exp_mpan_core == mpan_spaces,
339
- ),
340
- )
341
- .options(
342
- joinedload(Era.supply).joinedload(Supply.gsp_group),
343
- joinedload(Era.mop_contract)
344
- .joinedload(Contract.party)
345
- .joinedload(Party.participant),
346
- joinedload(Era.dc_contract)
347
- .joinedload(Contract.party)
348
- .joinedload(Party.participant),
349
- joinedload(Era.imp_supplier_contract)
350
- .joinedload(Contract.party)
351
- .joinedload(Party.participant),
352
- joinedload(Era.exp_supplier_contract)
353
- .joinedload(Contract.party)
354
- .joinedload(Party.participant),
355
- joinedload(Era.pc),
356
- joinedload(Era.imp_llfc),
357
- joinedload(Era.exp_llfc),
358
- joinedload(Era.mtc_participant).joinedload(
359
- MtcParticipant.meter_type
360
- ),
361
- joinedload(Era.ssc),
362
- joinedload(Era.energisation_status),
363
- joinedload(Era.channels),
332
+ era = (
333
+ sess.scalars(
334
+ select(Era)
335
+ .where(
336
+ Era.finish_date == null(),
337
+ or_(
338
+ Era.imp_mpan_core == mpan_spaces,
339
+ Era.exp_mpan_core == mpan_spaces,
340
+ ),
341
+ )
342
+ .options(
343
+ joinedload(Era.supply).joinedload(Supply.gsp_group),
344
+ joinedload(Era.mop_contract)
345
+ .joinedload(Contract.party)
346
+ .joinedload(Party.participant),
347
+ joinedload(Era.dc_contract)
348
+ .joinedload(Contract.party)
349
+ .joinedload(Party.participant),
350
+ joinedload(Era.imp_supplier_contract)
351
+ .joinedload(Contract.party)
352
+ .joinedload(Party.participant),
353
+ joinedload(Era.exp_supplier_contract)
354
+ .joinedload(Contract.party)
355
+ .joinedload(Party.participant),
356
+ joinedload(Era.pc),
357
+ joinedload(Era.imp_llfc),
358
+ joinedload(Era.exp_llfc),
359
+ joinedload(Era.mtc_participant).joinedload(
360
+ MtcParticipant.meter_type
361
+ ),
362
+ joinedload(Era.ssc),
363
+ joinedload(Era.energisation_status),
364
+ joinedload(Era.channels),
365
+ )
364
366
  )
365
- ).scalar()
367
+ .unique()
368
+ .one()
369
+ )
366
370
  chellow_supply_id = era.supply.id
367
371
  chellow_era_id = era.id
368
372
  chellow_es = era.energisation_status.code
@@ -489,6 +493,7 @@ def _process(
489
493
  diffs.append("meter_type")
490
494
 
491
495
  if len(problem) > 0 and not (not show_ignored and ignore):
496
+ address_lines = [ecoes[f"address-line-{i}"] for i in range(1, 10)]
492
497
  values = {
493
498
  "mpan_core": mpan_spaces,
494
499
  "mpan_core_no_spaces": ecoes["mpan-core"],
@@ -525,6 +530,9 @@ def _process(
525
530
  "chellow_meter_type": chellow_meter_type,
526
531
  "ignored": ignore,
527
532
  "problem": problem,
533
+ "address": ", ".join(
534
+ [a for a in address_lines if len(a) > 0 and a != "NULL"]
535
+ ),
528
536
  }
529
537
  writer.writerow(csv_make_val(values[t]) for t in titles)
530
538
  values["chellow_supplier_contract_id"] = chellow_supplier_contract_id
chellow/templates/report_run_ecoes_comparison.html CHANGED
@@ -73,6 +73,7 @@
73
73
  {% endfor %}
74
74
  <th rowspan="2">Problem</th>
75
75
  <th rowspan="2">Fix</th>
76
+ <th rowspan="2">ECOES Address</th>
76
77
  </tr>
77
78
  <tr>
78
79
  {% for diff in vals['diffs'] %}
@@ -136,6 +137,7 @@
136
137
  </form>
137
138
  {% endif %}
138
139
  </td>
140
+ <td>{{vals['address']}}</td>
139
141
  </tr>
140
142
  </tbody>
141
143
  </table>
{chellow-1754645767.0.0.dist-info → chellow-1754648581.0.0.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: chellow
3
- Version: 1754645767.0.0
3
+ Version: 1754648581.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-1754645767.0.0.dist-info → chellow-1754648581.0.0.dist-info}/RECORD RENAMED
@@ -104,7 +104,7 @@ chellow/reports/report_bills.py,sha256=LP7XDxzO0Fp10c8xDE67e4tHTEc7nN74ESQBy762N
104
104
  chellow/reports/report_csv_llfcs.py,sha256=mMB06b6Jems5kcQU4H4Le_fyKgVr8THP8BCx3pkvg5E,1903
105
105
  chellow/reports/report_csv_site_hh_data.py,sha256=ik0OkGVo1bfTXLdcT3gPUHnxSkSdorzZheP3qgnOR5c,4331
106
106
  chellow/reports/report_csv_site_snags.py,sha256=AuAy6vjL0g7vwPPAZhBqxOyITL9_jnyFj012MnUcxxk,2627
107
- chellow/reports/report_ecoes_comparison.py,sha256=u0L2D1z8j63btdypIRd1NMMqFKgeMz_zK-SAjn7b5b4,21401
107
+ chellow/reports/report_ecoes_comparison.py,sha256=T2jeXQQfD_DyCwzVKyAOpyLKKtPP1uxx0erNFkptFX8,21817
108
108
  chellow/reports/report_g_monthly_duration.py,sha256=aEY3hSBaCxjOBgWZYWZH38TmZEO5MpOfpOQe2Lhfpmo,18288
109
109
  chellow/reports/report_g_supplies_snapshot.py,sha256=9xB6RDrnbgxuomMcP1b1yEP4kOnEJ34WgKpyxLTprOQ,3998
110
110
  chellow/reports/report_g_supply_virtual_bill.py,sha256=EaYrB8PHJIXrUuhiZ7dwUlbNBkuyJebQHrdc308_z1o,3653
@@ -147,7 +147,7 @@ chellow/templates/rate_server.html,sha256=SezuwdKhHRZ00-R_S6ttKiZ-nvRpwozV9QcIMf
147
147
  chellow/templates/report_run.html,sha256=O_wjIu43S-mKVyZyku3dJJdvyck3rAgEdhw59TsCcK0,4040
148
148
  chellow/templates/report_run_asset_comparison.html,sha256=VYCCUmIC7Mfe7uuaAHb6ihiK6zsqeTlQbzgtzLqR3zg,2305
149
149
  chellow/templates/report_run_bill_check.html,sha256=I4VLSTOGE7cjjZggG3EAI9EW-2b7e0oOTs-S7FlknS4,5110
150
- chellow/templates/report_run_ecoes_comparison.html,sha256=bglglt_Ck2U4y9EWlTufmBY8FYGUaDboNdaDS_MGnxI,4301
150
+ chellow/templates/report_run_ecoes_comparison.html,sha256=-GTx83swNgf51OOAkNZ1ngdRo5m6DLmBbDT6UZdqMSo,4377
151
151
  chellow/templates/report_run_g_bill_check.html,sha256=tOXl_mjR__foYKiOYflJbK-459actAtjzv8rfuL3TwM,4851
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
@@ -385,6 +385,6 @@ chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1
385
385
  chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBeyRzQe3Rg,854
386
386
  chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
387
387
  chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
388
- chellow-1754645767.0.0.dist-info/METADATA,sha256=Szz9wOSLBik68q2TwUaf-Cv5cl7ast0hyQOqp33DgZ8,12519
389
- chellow-1754645767.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
390
- chellow-1754645767.0.0.dist-info/RECORD,,
388
+ chellow-1754648581.0.0.dist-info/METADATA,sha256=1glJ1bQkzNZcm-4EDZBAgVTdKKeNLrxmQbtK-m51K0M,12519
389
+ chellow-1754648581.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
390
+ chellow-1754648581.0.0.dist-info/RECORD,,