chellow 1754580326.0.0__tar.gz → 1754648581.0.0__tar.gz

{chellow-1754580326.0.0 → chellow-1754648581.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1754580326.0.0
+Version: 1754648581.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-1754648581.0.0/VERSION

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

{chellow-1754580326.0.0 → chellow-1754648581.0.0}/chellow/reports/report_ecoes_comparison.py

@@ -329,40 +329,44 @@ def _process(
 
         if current_chell:
             mpans.remove(mpan_spaces)
-            era = sess.execute(
-                select(Era)
-                .filter(
-                    Era.finish_date == null(),
-                    or_(
-                        Era.imp_mpan_core == mpan_spaces,
-                        Era.exp_mpan_core == mpan_spaces,
-                    ),
-                )
-                .options(
-                    joinedload(Era.supply).joinedload(Supply.gsp_group),
-                    joinedload(Era.mop_contract)
-                    .joinedload(Contract.party)
-                    .joinedload(Party.participant),
-                    joinedload(Era.dc_contract)
-                    .joinedload(Contract.party)
-                    .joinedload(Party.participant),
-                    joinedload(Era.imp_supplier_contract)
-                    .joinedload(Contract.party)
-                    .joinedload(Party.participant),
-                    joinedload(Era.exp_supplier_contract)
-                    .joinedload(Contract.party)
-                    .joinedload(Party.participant),
-                    joinedload(Era.pc),
-                    joinedload(Era.imp_llfc),
-                    joinedload(Era.exp_llfc),
-                    joinedload(Era.mtc_participant).joinedload(
-                        MtcParticipant.meter_type
-                    ),
-                    joinedload(Era.ssc),
-                    joinedload(Era.energisation_status),
-                    joinedload(Era.channels),
+            era = (
+                sess.scalars(
+                    select(Era)
+                    .where(
+                        Era.finish_date == null(),
+                        or_(
+                            Era.imp_mpan_core == mpan_spaces,
+                            Era.exp_mpan_core == mpan_spaces,
+                        ),
+                    )
+                    .options(
+                        joinedload(Era.supply).joinedload(Supply.gsp_group),
+                        joinedload(Era.mop_contract)
+                        .joinedload(Contract.party)
+                        .joinedload(Party.participant),
+                        joinedload(Era.dc_contract)
+                        .joinedload(Contract.party)
+                        .joinedload(Party.participant),
+                        joinedload(Era.imp_supplier_contract)
+                        .joinedload(Contract.party)
+                        .joinedload(Party.participant),
+                        joinedload(Era.exp_supplier_contract)
+                        .joinedload(Contract.party)
+                        .joinedload(Party.participant),
+                        joinedload(Era.pc),
+                        joinedload(Era.imp_llfc),
+                        joinedload(Era.exp_llfc),
+                        joinedload(Era.mtc_participant).joinedload(
+                            MtcParticipant.meter_type
+                        ),
+                        joinedload(Era.ssc),
+                        joinedload(Era.energisation_status),
+                        joinedload(Era.channels),
+                    )
                 )
-            ).scalar()
+                .unique()
+                .one()
+            )
             chellow_supply_id = era.supply.id
             chellow_era_id = era.id
             chellow_es = era.energisation_status.code
@@ -489,6 +493,7 @@ def _process(
                     diffs.append("meter_type")
 
         if len(problem) > 0 and not (not show_ignored and ignore):
+            address_lines = [ecoes[f"address-line-{i}"] for i in range(1, 10)]
             values = {
                 "mpan_core": mpan_spaces,
                 "mpan_core_no_spaces": ecoes["mpan-core"],
@@ -525,6 +530,9 @@ def _process(
                 "chellow_meter_type": chellow_meter_type,
                 "ignored": ignore,
                 "problem": problem,
+                "address": ", ".join(
+                    [a for a in address_lines if len(a) > 0 and a != "NULL"]
+                ),
             }
             writer.writerow(csv_make_val(values[t]) for t in titles)
             values["chellow_supplier_contract_id"] = chellow_supplier_contract_id

{chellow-1754580326.0.0 → chellow-1754648581.0.0}/chellow/templates/report_run_ecoes_comparison.html

@@ -73,6 +73,7 @@
 						{% endfor %}
 						<th rowspan="2">Problem</th>
 						<th rowspan="2">Fix</th>
+						<th rowspan="2">ECOES Address</th>
 					</tr>
 					<tr>
 						{% for diff in vals['diffs'] %}
@@ -84,19 +85,24 @@
 				<tbody>
 					<tr>
 						<td>
-							<a href="/e/supplies/{{vals['chellow_supply_id']}}"
-								>{{vals['mpan_core']}}</a>
+							{% if vals['chellow_supply_id'] is none %}
+								{{vals['mpan_core']}}
+							{% else %}
+								<a href="/e/supplies/{{vals['chellow_supply_id']}}">{{vals['mpan_core']}}</a>
+							{% endif %}
 						</td>
 						<td>
-							<a href="/e/supplier_contracts/{{vals['chellow_supplier_contract_id']}}"
-								>{{vals['chellow_supplier_contract_name']}}</a>
+							{% if vals['chellow_supplier_contract_id'] is not none %}
+								<a href="/e/supplier_contracts/{{vals['chellow_supplier_contract_id']}}"
+									>{{vals['chellow_supplier_contract_name']}}</a>
+							{% endif %}
 						</td>
 						<td>
-							{% if 'chellow_era_id' in vals %}
+							{% if vals['chellow_era_id'] is not none %}
 								[<a href="/e/eras/{{vals['chellow_era_id']}}/edit">edit</a>]</td>
 							{% endif %}
 						<td>
-							{% if 'chellow_supply_id' in vals %}
+							{% if vals['chellow_supply_id'] is not none %}
 								[<a href="/e/supplies/{{vals['chellow_supply_id']}}/edit">edit</a>]
 							{% endif %}
 						</td>
@@ -131,6 +137,7 @@
 								</form>
 							{% endif %}
 						</td>
+						<td>{{vals['address']}}</td>
 					</tr>
 				</tbody>
 			</table>

chellow-1754580326.0.0/VERSION

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