chellow 1754645767.0.0__tar.gz → 1754662596.0.0__tar.gz

{chellow-1754645767.0.0 → chellow-1754662596.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1754645767.0.0
+Version: 1754662596.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-1754662596.0.0/VERSION

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

{chellow-1754645767.0.0 → chellow-1754662596.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-1754645767.0.0 → chellow-1754662596.0.0}/chellow/rrun.py

@@ -5,7 +5,7 @@ import traceback
 
 from dateutil.relativedelta import relativedelta
 
-from sqlalchemy import select
+from sqlalchemy import false, select
 
 from chellow.models import ReportRun, Session
 from chellow.utils import utc_datetime_now
@@ -48,7 +48,10 @@ class ReportRunDeleter(threading.Thread):
                     now = utc_datetime_now()
                     cutoff_date = now - relativedelta(years=1)
                     for report_run in sess.scalars(
-                        select(ReportRun).where(ReportRun.date_created < cutoff_date)
+                        select(ReportRun).where(
+                            ReportRun.date_created < cutoff_date,
+                            ReportRun.data["keep"].as_boolean() == false(),
+                        )
                     ):
                         report_run.delete(sess)
                         sess.commit()

chellow-1754662596.0.0/chellow/templates/dashboard.html

@@ -0,0 +1,54 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Dashboard}
+{% endblock %}
+
+{% block nav %}
+	Dashboard
+{% endblock %}
+
+{% block content %}
+
+	<div>
+	  <canvas id="ecoes_comparison"></canvas>
+	</div>
+
+	<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+
+
+
+	<script>
+		const ecoes_comparison = document.getElementById('ecoes_comparison');
+  	new Chart(ecoes_comparison, {
+			type: 'bar',
+			data: {
+				labels: [
+					{% for run in ecoes_runs %}
+						'{{run.date_created|hh_format}}',
+					{% endfor %}
+				],
+				datasets: [
+					{
+							label: 'Number Of Discrepancies',
+							data: [
+								{% for run in ecoes_runs %}
+									{{run.rows|length}},
+								{% endfor %}
+							],
+							borderWidth: 1
+					},
+				]
+			},
+			options: {
+				plugins: {
+					title: {
+						display: true,
+						text: 'Ecoes Comparison'
+					}
+				}
+			},
+		});
+	</script>
+
+{% endblock %}

{chellow-1754645767.0.0 → chellow-1754662596.0.0}/chellow/templates/home.html

@@ -226,6 +226,7 @@
 					<li><a href="/reports/batches">Batches</a></li>
 					<li><a href="/tester">Tester</a></li>
 					<li><a href="/e/site_snags">Site Snags</a></li>
+					<li><a href="/dashboard">Dashboard</a></li>
 				</ul>
 			</div>
 		</section>

chellow-1754662596.0.0/chellow/templates/report_run_ecoes_comparison.html

@@ -0,0 +1,145 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Report Runs » {{run.id}}
+{% endblock %}
+
+{% block nav %}
+	<a href="/report_runs">Report Runs</a> &raquo; {{run.id}}
+{% endblock %}
+
+{% block content %}
+	<table>
+		<caption>ECOES Comparison</caption>
+		<thead>
+			<tr>
+				<th>Date Created</th>
+				<th>Created By</th>
+				<th>State</th>
+				<th>Number Of Rows</th>
+				<th>Delete</th>
+				<th>Download Spreadsheet</th>
+				<th>Re-run Report</th>
+				<th>Configuration</th>
+				<th>Update Report Run</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td>{{run.date_created|hh_format}}</td>
+				<td>{{run.creator}}</td>
+				<td>{{run.state}}</td>
+				<td>{{rows|length}}</td>
+				<td>
+					<form action="/report_runs/{{run.id}}">
+						<fieldset>
+							<input type="submit" name="delete" value="Delete">
+						</fieldset>
+					</form>
+				</td>
+				<td><a href="/report_runs/{{run.id}}/spreadsheet">Download</a></td>
+				<td><a href="/reports/ecoes_comparison">Re-run</a></td>
+				<td>
+					The <a href="/configuration">configuration</a> is held under the
+					<code>ecoes</code> section and has keys <code>user_name</code>,
+					<code>password</code>, <code>prefix</code>,
+					<code>exclude_mpan_cores</code> and
+					<code>ignore_mpan_cores_msn</code>.
+				</td>
+				<td>
+					<form action="/report_runs/{{run.id}}" method="post">
+						<fieldset>
+							<label>Keep</label> {{input_checkbox('keep', run.data['keep'])}}
+							<input type="submit" name="update" value="Update">
+						</fieldset>
+					</form>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+	{% for row in rows %}
+		{% set vals = row.data['values'] %}
+		<table>
+			<caption>{{vals['mpan_core_no_spaces']}}</caption>
+			<thead>
+				<tr>
+					<th rowspan="2">Mpan Core</th>
+					<th rowspan="2">Supplier Contract</th>
+					<th rowspan="2">Edit Era</th>
+					<th rowspan="2">Edit Supply</th>
+					{% for diff in vals['diffs'] %}
+						<th colspan="2">{{diff}}</th>
+					{% endfor %}
+					<th rowspan="2">Problem</th>
+					<th rowspan="2">Fix</th>
+					<th rowspan="2">ECOES Address</th>
+				</tr>
+				<tr>
+					{% for diff in vals['diffs'] %}
+						<th>Chellow</th>
+						<th>ECOES</th>
+					{% endfor %}
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td>
+						{% 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>
+						{% 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 vals['chellow_era_id'] is not none %}
+							[<a href="/e/eras/{{vals['chellow_era_id']}}/edit">edit</a>]</td>
+						{% endif %}
+					<td>
+						{% if vals['chellow_supply_id'] is not none %}
+							[<a href="/e/supplies/{{vals['chellow_supply_id']}}/edit">edit</a>]
+						{% endif %}
+					</td>
+					{% for diff in vals['diffs'] %}
+						<td>{{vals['chellow_' + diff]}}</td>
+						<td>{{vals['ecoes_' + diff]}}
+							{% if diff == 'msn' %}
+								- {{vals['ecoes_msn_install_date']}}
+							{% elif diff == 'supplier' %}
+								- {{vals['ecoes_supplier_registration_from']}}
+							{% elif diff == 'mtc' %}
+								- {{vals['ecoes_mtc_date']}}
+							{% elif diff == 'llfc' %}
+								- {{vals['ecoes_llfc_from']}}
+							{% elif diff == 'mop' %}
+								- {{vals['ecoes_mop_appoint_date']}}
+							{% elif diff == 'gsp_group' %}
+								- {{vals['ecoes_gsp_effective_from']}}
+							{% endif %}
+						</td>
+					{% endfor %}
+					<td>{{vals['problem']}}</td>
+					<td>
+						{% if 'msn' in vals['diffs'] %}
+							<form hx-post="/e/supplies/{{vals['chellow_supply_id']}}">
+								<fieldset>
+									<input type="hidden" name="msn" value="{{vals['ecoes_msn']}}">
+									<input type="hidden" name="start_date"
+										value="{{vals['ecoes_msn_install_date']}}">
+									<input type="submit" name="new_msn" value="Fix MSN">
+								</fieldset>
+							</form>
+						{% endif %}
+					</td>
+					<td>{{vals['address']}}</td>
+				</tr>
+			</tbody>
+		</table>
+	{% endfor %}
+{% endblock %}

{chellow-1754645767.0.0 → chellow-1754662596.0.0}/chellow/views.py

@@ -157,6 +157,20 @@ def configuration():
     return redirect(f"/non_core_contracts/{config.id}")
 
 
+@home.route("/dashboard", methods=["GET"])
+def dashboard():
+    ecoes_runs = g.sess.scalars(
+        select(ReportRun)
+        .where(
+            ReportRun.name == "ecoes_comparison",
+            ReportRun.state == "finished",
+            ReportRun.data["keep"].as_boolean() == true(),
+        )
+        .order_by(ReportRun.date_created.desc())
+    ).all()
+    return render_template("dashboard.html", ecoes_runs=ecoes_runs)
+
+
 @home.route("/fake_batch_updater")
 def fake_batch_updater_get():
     importer = chellow.fake_batch_updater.importer
@@ -1586,6 +1600,19 @@ def report_run_delete(run_id):
     return hx_redirect("/report_runs", 303)
 
 
+@home.route("/report_runs/<int:run_id>", methods=["POST"])
+def report_run_post(run_id):
+    run = g.sess.scalar(select(ReportRun).where(ReportRun.id == run_id))
+    keep = req_bool("keep")
+
+    run_data = run.data
+    run_data["keep"] = keep
+    run.update_data(run_data)
+    g.sess.commit()
+    flash("Report Run Updated successfully")
+    return redirect(f"/report_runs/{run_id}", 303)
+
+
 @home.route("/report_runs/<int:run_id>/spreadsheet")
 def report_run_spreadsheet_get(run_id):
     run = g.sess.query(ReportRun).filter(ReportRun.id == run_id).one()

chellow-1754645767.0.0/VERSION

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

chellow-1754645767.0.0/chellow/templates/report_run_ecoes_comparison.html

@@ -1,144 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}
-	» Report Runs » {{run.id}}
-{% endblock %}
-
-{% block nav %}
-	<a href="/report_runs">Report Runs</a> &raquo; {{run.id}}
-{% endblock %}
-
-{% block content %}
-	{% if request.method == "GET" and request.values.delete %}
-		<form method="post" action="/report_runs/{{run.id}}">
-			<fieldset>
-				<caption>Are you sure you want to delete this report run?</caption>
-				<input type="submit" name="delete" value="delete"> 
-				<a href="/report_runs/{{run.id}}">Cancel</a>
-			</fieldset>
-		</form>
-	{% else %}
-		<table>
-			<caption>ECOES Comparison</caption>
-			<thead>
-				<tr>
-					<th>Date Created</th>
-					<th>Created By</th>
-					<th>State</th>
-					<th>Number Of Rows</th>
-					<th>Delete</th>
-					<th>Download Spreadsheet</th>
-					<th>Re-run Report</th>
-					<th>Configuration</th>
-				</tr>
-			</thead>
-			<tbody>
-				<tr>
-					<td>{{run.date_created|hh_format}}</td>
-					<td>{{run.creator}}</td>
-					<td>{{run.state}}</td>
-					<td>{{rows|length}}</td>
-					<td>
-						<form action="/report_runs/{{run.id}}">
-							<fieldset>
-								<input type="submit" name="delete" value="Delete">
-							</fieldset>
-						</form>
-					</td>
-					<td><a href="/report_runs/{{run.id}}/spreadsheet">Download</a></td>
-					<td><a href="/reports/ecoes_comparison">Re-run</a></td>
-					<td>
-						The <a href="/configuration">configuration</a> is held under the
-						<code>ecoes</code> section and has keys <code>user_name</code>,
-						<code>password</code>, <code>prefix</code>,
-						<code>exclude_mpan_cores</code> and
-						<code>ignore_mpan_cores_msn</code>.
-					</td>
-				</tr>
-			</tbody>
-		</table>
-
-		{% for row in rows %}
-			{% set vals = row.data['values'] %}
-			<table>
-				<caption>{{vals['mpan_core_no_spaces']}}</caption>
-				<thead>
-					<tr>
-						<th rowspan="2">Mpan Core</th>
-						<th rowspan="2">Supplier Contract</th>
-						<th rowspan="2">Edit Era</th>
-						<th rowspan="2">Edit Supply</th>
-						{% for diff in vals['diffs'] %}
-							<th colspan="2">{{diff}}</th>
-						{% endfor %}
-						<th rowspan="2">Problem</th>
-						<th rowspan="2">Fix</th>
-					</tr>
-					<tr>
-						{% for diff in vals['diffs'] %}
-							<th>Chellow</th>
-							<th>ECOES</th>
-						{% endfor %}
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>
-							{% 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>
-							{% 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 vals['chellow_era_id'] is not none %}
-								[<a href="/e/eras/{{vals['chellow_era_id']}}/edit">edit</a>]</td>
-							{% endif %}
-						<td>
-							{% if vals['chellow_supply_id'] is not none %}
-								[<a href="/e/supplies/{{vals['chellow_supply_id']}}/edit">edit</a>]
-							{% endif %}
-						</td>
-						{% for diff in vals['diffs'] %}
-							<td>{{vals['chellow_' + diff]}}</td>
-							<td>{{vals['ecoes_' + diff]}}
-								{% if diff == 'msn' %}
-									- {{vals['ecoes_msn_install_date']}}
-								{% elif diff == 'supplier' %}
-									- {{vals['ecoes_supplier_registration_from']}}
-								{% elif diff == 'mtc' %}
-									- {{vals['ecoes_mtc_date']}}
-								{% elif diff == 'llfc' %}
-									- {{vals['ecoes_llfc_from']}}
-								{% elif diff == 'mop' %}
-									- {{vals['ecoes_mop_appoint_date']}}
-								{% elif diff == 'gsp_group' %}
-									- {{vals['ecoes_gsp_effective_from']}}
-								{% endif %}
-							</td>
-						{% endfor %}
-						<td>{{vals['problem']}}</td>
-						<td>
-							{% if 'msn' in vals['diffs'] %}
-								<form hx-post="/e/supplies/{{vals['chellow_supply_id']}}">
-									<fieldset>
-										<input type="hidden" name="msn" value="{{vals['ecoes_msn']}}">
-										<input type="hidden" name="start_date"
-											value="{{vals['ecoes_msn_install_date']}}">
-										<input type="submit" name="new_msn" value="Fix MSN">
-									</fieldset>
-								</form>
-							{% endif %}
-						</td>
-					</tr>
-				</tbody>
-			</table>
-		{% endfor %}
-	{% endif %}
-{% endblock %}