chellow 1738661883.0.0__tar.gz → 1739889885.0.0__tar.gz

{chellow-1738661883.0.0 → chellow-1739889885.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1738661883.0.0
+Version: 1739889885.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-1739889885.0.0/VERSION

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

{chellow-1738661883.0.0 → chellow-1739889885.0.0}/chellow/e/views.py

@@ -4251,7 +4251,10 @@ def site_add_e_supply_form_get(site_id):
     try:
         ct_now = ct_datetime_now()
         cops = g.sess.query(Cop).order_by(Cop.code)
-        comms = g.sess.execute(select(Comm).order_by(Comm.code)).scalars()
+        comms = g.sess.scalars(select(Comm).order_by(Comm.code))
+        dtc_meter_types = g.sess.scalars(
+            select(DtcMeterType).order_by(DtcMeterType.code)
+        )
         energisation_statuses = g.sess.query(EnergisationStatus).order_by(
             EnergisationStatus.code
         )
@@ -4515,6 +4518,7 @@ def site_add_e_supply_form_get(site_id):
             start_date=start_date,
             imp_llfcs=imp_llfcs,
             exp_llfcs=exp_llfcs,
+            dtc_meter_types=dtc_meter_types,
         )
     except BadRequest as e:
         g.sess.rollback()

{chellow-1738661883.0.0 → chellow-1739889885.0.0}/chellow/gas/views.py

@@ -170,20 +170,20 @@ def supply_get(g_supply_id):
             )
 
             g_bills = (
-                g.sess.query(GBill)
-                .filter(GBill.g_supply == g_supply)
+                select(GBill)
+                .where(GBill.g_supply == g_supply)
                 .order_by(
                     GBill.start_date.desc(),
                     GBill.issue_date.desc(),
                     GBill.reference.desc(),
                 )
             )
-            if g_era.finish_date is not None:
-                g_bills = g_bills.filter(GBill.start_date <= g_era.finish_date)
+            if g_era != g_eras[0]:
+                g_bills = g_bills.where(GBill.start_date < g_era.finish_date)
             if g_era != g_eras[-1]:
-                g_bills = g_bills.filter(GBill.start_date >= g_era.start_date)
+                g_bills = g_bills.where(GBill.start_date >= g_era.start_date)
 
-            for g_bill in g_bills:
+            for g_bill in g.sess.scalars(g_bills):
                 g_reads = (
                     g.sess.query(GRegisterRead)
                     .filter(GRegisterRead.g_bill == g_bill)
@@ -220,7 +220,7 @@ def supply_get(g_supply_id):
 
         RELATIVE_YEAR = relativedelta(years=1)
 
-        now = Datetime.utcnow()
+        now = utc_datetime_now()
         triad_year = (now - RELATIVE_YEAR).year if now.month < 3 else now.year
         this_month_start = Datetime(now.year, now.month, 1)
         last_month_start = this_month_start - relativedelta(months=1)

{chellow-1738661883.0.0 → chellow-1739889885.0.0}/chellow/models.py

@@ -6416,6 +6416,13 @@ class ReportRun(Base, PersistentClass):
             report_run.update(state)
             wsess.commit()
 
+    @staticmethod
+    def w_update_data(report_run_id, data):
+        with Session() as wsess:
+            report_run = ReportRun.get_by_id(wsess, report_run_id)
+            report_run.update_data(data)
+            wsess.commit()
+
     @staticmethod
     def w_insert_row(report_run_id, tab, titles, values, properties):
         with Session() as wsess:

{chellow-1738661883.0.0 → chellow-1739889885.0.0}/chellow/reports/report_429.py

@@ -16,16 +16,34 @@ from werkzeug.exceptions import BadRequest
 
 import chellow.gas.engine
 from chellow.dloads import open_file
-from chellow.models import GBatch, GBill, GContract, GEra, Session, Site, SiteGEra, User
+from chellow.models import (
+    GBatch,
+    GBill,
+    GContract,
+    GEra,
+    RSession,
+    ReportRun,
+    Site,
+    SiteGEra,
+    User,
+)
 from chellow.utils import csv_make_val, hh_max, hh_min, req_date, req_int, to_utc
 
 
-def content(g_batch_id, g_bill_id, g_contract_id, start_date, finish_date, user_id):
+def content(
+    g_batch_id,
+    g_bill_id,
+    g_contract_id,
+    start_date,
+    finish_date,
+    user_id,
+    report_run_id,
+):
     forecast_date = to_utc(Datetime.max)
     report_context = {}
     sess = tmp_file = None
     try:
-        with Session() as sess:
+        with RSession() as sess:
             user = User.get_by_id(sess, user_id)
 
             tmp_file = open_file("g_bill_check.csv", user, mode="w")
@@ -108,13 +126,17 @@ def content(g_batch_id, g_bill_id, g_contract_id, start_date, finish_date, user_
                         vbf,
                         titles,
                         csv_writer,
+                        report_run_id,
                     )
+        ReportRun.w_update(report_run_id, "finished")
     except BadRequest as e:
         tmp_file.write(f"Problem: {e.description}")
+        ReportRun.w_update(report_run_id, "problem")
     except BaseException:
         msg = traceback.format_exc()
         sys.stderr.write(msg + "\n")
         tmp_file.write(f"Problem {msg}")
+        ReportRun.w_update(report_run_id, "interrupted")
     finally:
         tmp_file.close()
 
@@ -129,6 +151,7 @@ def _process_g_bill_ids(
     vbf,
     titles,
     csv_writer,
+    report_run_id,
 ):
     g_bill_id = list(sorted(g_bill_ids))[0]
     g_bill_ids.remove(g_bill_id)
@@ -144,6 +167,7 @@ def _process_g_bill_ids(
         "covered_bill_ids": [],
         "virtual_problem": "",
     }
+    site_id = None
     read_dict = defaultdict(set)
     for g_read in g_bill.g_reads:
         if not all(
@@ -264,7 +288,7 @@ def _process_g_bill_ids(
                     else:
                         v = getattr(g_read, title)
                     vals[k].add(v)
-
+    elements = set()
     for g_era in sess.execute(
         select(GEra).where(
             GEra.g_supply == g_supply,
@@ -283,6 +307,7 @@ def _process_g_bill_ids(
             .filter(SiteGEra.is_physical == true(), SiteGEra.g_era == g_era)
             .one()
         )
+        site_id = site.id
         vals["site_code"] = site.code
         vals["site_name"] = site.name
 
@@ -313,6 +338,9 @@ def _process_g_bill_ids(
             except TypeError as detail:
                 raise BadRequest(f"For key {vk} and value {v}. {detail}")
 
+            if k.endswith("_gbp"):
+                elements.add(k[:-4])
+
     if g_bill.id not in covered_bills.keys():
         g_bill = covered_bills[sorted(covered_bills.keys())[0]]
 
@@ -324,22 +352,36 @@ def _process_g_bill_ids(
     vals["mprn"] = g_supply.mprn
     vals["supply_name"] = g_supply.name
 
-    for k, v in vals.items():
-        if k == "covered_bill_ids":
-            vals[k] = " | ".join(str(b) for b in v)
-        else:
-            vals[k] = csv_make_val(v)
-
     for i, title in enumerate(titles):
         if title.startswith("difference_"):
-            try:
-                covered_val = float(vals[titles[i - 2]])
-                virtual_val = float(vals[titles[i - 1]])
-                vals[title] = covered_val - virtual_val
-            except KeyError:
-                vals[title] = None
+            covered_val = float(vals.get(titles[i - 2], 0))
+            virtual_val = float(vals.get(titles[i - 1], 0))
+            vals[title] = covered_val - virtual_val
 
     csv_writer.writerow([csv_make_val(vals.get(k)) for k in titles])
+    vals["g_bill_id"] = g_bill.id
+    vals["g_batch_id"] = g_bill.g_batch.id
+    vals["g_supply_id"] = g_supply.id
+    vals["site_id"] = site_id
+    for element in sorted(elements):
+        rate_name = f"difference_{element}_rate"
+        covered_rates = vals.get(f"covered_{element}_rate", [0])
+        virtual_rates = vals.get(f"virtual_{element}_rate", [0])
+        if len(covered_rates) == 1 and len(virtual_rates) == 1:
+            vals[rate_name] = (
+                float(covered_rates.pop()) * 100 - float(virtual_rates.pop()) * 100
+            )
+        else:
+            vals[rate_name] = 0
+
+    try:
+        covered_kwh = float(vals["covered_kwh"])
+        virtual_kwh = float(vals["virtual_kwh"])
+        vals["difference_kwh"] = covered_kwh - virtual_kwh
+    except KeyError:
+        vals["difference_kwh"] = None
+
+    ReportRun.w_insert_row(report_run_id, "", titles, vals, {"is_checked": False})
 
 
 def do_get(sess):
@@ -347,17 +389,39 @@ def do_get(sess):
 
     if "g_batch_id" in request.values:
         g_batch_id = req_int("g_batch_id")
+        g_batch = GBatch.get_by_id(g.sess, g_batch_id)
+        run_g_contract_id = g_batch.g_contract.id
     elif "g_bill_id" in request.values:
         g_bill_id = req_int("g_bill_id")
+        g_bill = GBill.get_by_id(g.sess, g_bill_id)
+        run_g_contract_id = g_bill.g_batch.g_contract.id
     elif "g_contract_id" in request.values:
         g_contract_id = req_int("g_contract_id")
         start_date = req_date("start_date")
         finish_date = req_date("finish_date")
+        run_g_contract_id = g_contract_id
     else:
         raise BadRequest(
             "The bill check needs a g_batch_id, g_bill_id or g_contract_id."
         )
 
-    args = g_batch_id, g_bill_id, g_contract_id, start_date, finish_date, g.user.id
+    report_run = ReportRun.insert(
+        sess,
+        "g_bill_check",
+        g.user,
+        "g_bill_check",
+        {"g_contract_id": run_g_contract_id},
+    )
+    sess.commit()
+
+    args = (
+        g_batch_id,
+        g_bill_id,
+        g_contract_id,
+        start_date,
+        finish_date,
+        g.user.id,
+        report_run.id,
+    )
     threading.Thread(target=content, args=args).start()
-    return redirect("/downloads", 303)
+    return redirect(f"/report_runs/{report_run.id}", 303)

{chellow-1738661883.0.0 → chellow-1739889885.0.0}/chellow/static/css/chellow.css

@@ -230,7 +230,7 @@ table.sticky {
   position: relative;
 }
 
-table.sticky th {
+table.sticky thead {
   position: sticky;
   top: 0;
   background: white;

chellow-1739889885.0.0/chellow/templates/report_run_g_bill_check.html

@@ -0,0 +1,182 @@
+{% 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>
+				<legend>Are you sure you want to delete this report run?</legend>
+				<input type="submit" name="delete" value="delete"> 
+				<a href="/report_runs/{{run.id}}">Cancel</a>
+			</fieldset>
+		</form>
+	{% else %}
+		<table>
+			<caption>Bill Check</caption>
+			<thead>
+				<tr>
+					<th>Date Created</th>
+					<th>Created By</th>
+					<th>Title</th>
+					<th>State</th>
+					<th>Number Of Rows</th>
+					<th>Sum Of Difference GBP</th>
+					<th>Delete</th>
+					<th>Download Spreadsheet</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td>{{run.date_created|hh_format}}</td>
+					<td>{{run.creator}}</td>
+					<td>{{run.title}}</td>
+					<td>{{run.state}}</td>
+					<td>{{rows|length}} (truncated at {{ROW_LIMIT}})</td>
+					<td>
+						{% if 'sum_difference' in summary and summary.sum_difference is not none %}
+							{{"%.2f"|format(summary.sum_difference)}}</td>
+						{% endif %}
+					<td>
+						<form action="/report_runs/{{run.id}}">
+							<fieldset style="border: none;">
+								<input type="submit" name="delete" value="Delete">
+							</fieldset>
+						</form>
+					</td>
+					<td><a href="/report_runs/{{run.id}}/spreadsheet">Download</a></td>
+				</tr>
+			</tbody>
+		</table>
+
+		{% if summary.missing_bills|length > 0 %}
+			<table class="sticky">
+				<caption>
+					Some Missing Bills (<a href="/report_runs/{{report_run}}">x</a>)
+				</caption>
+				<thead>
+					<tr>
+						<th>View</th>
+						<th>Import MPAN Core</th>
+						<th>Export MPAN Core</th>
+						<th>Start</th>
+						<th>Finish</th>
+						<th>Problem</th>
+						<th>Estimated Difference GBP</th>
+					</tr>
+				</thead>
+				<tbody>
+					{% for row in rows %}
+						<tr>
+							<td><a href="/report_run_rows/{{row.id}}">View</a></td>
+							{% for title in row.data.titles %}
+								<td>{{row.data['values'][title]}}</td>
+							{% endfor %}
+						</tr>
+					{% endfor %}
+				</tbody>
+			</table>
+		{% endif %}
+
+		{% if show_elements %}
+			<table class="sticky">
+				<caption>Elements</caption>
+				<thead>
+					<tr>
+						<th>Element</th>
+						{% for elname, diff in elements  %}
+							<th>{{elname}}</th>
+						{% endfor %}
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td>Sum of differences (GBP)</td>
+						{% for elname, diff in elements  %}
+							{% if diff is not none %}
+								<td>{{"%.2f"|format(diff)}}</td>
+							{% endif %}
+						{% endfor %}
+					</tr>
+				</tbody>
+			</table>
+		{% endif %}
+
+		<table class="sticky">
+			<caption>
+				Rows - Ordered By
+				{% if sort_absolute %}
+					Absolute
+				{% endif %}
+				{{order_by}}
+			</caption>
+			<thead>
+				<tr>
+					<th rowspan="2">View</th>
+					<th rowspan="2">Batch</th>
+					<th rowspan="2">Site</th>
+					<th rowspan="2">MPRN</th>
+					<th rowspan="2">Covered Bills</th>
+					<th rowspan="2">Covered Start</th>
+					<th rowspan="2">Covered Finish</th>
+					<th colspan="{{columns|length}}">Difference</th>
+					<th rowspan="2">Problem</th>
+				</tr>
+				<tr>
+					{% for column in columns %}
+						<th>
+							{{' '.join(column.split('_')[1:])}}
+							{% if order_by == column %}
+								↑
+							{% else %}
+								<a href="/report_runs/{{run.id}}?order_by={{column}}">↑</a>
+							{% endif %}
+						</th>
+					{% endfor %}
+				</tr>
+			</thead>
+			<tbody>
+				{% for row in rows %}
+					{% set values = row.data['values'] %}
+					<tr>
+						<td><a href="/report_run_rows/{{row.id}}">View</a></td>
+						<td><a href="/g/batches/{{values.g_batch_id}}">{{values.batch}}</a></td>
+						<td>
+							<a href="/sites/{{values.site_id}}" title="{{values.site_name}}">{{values.site_code}}</a>
+						</td>
+						<td>
+							<a href="/g/supplies/{{values.g_supply_id}}">{{values.mprn}}</a>
+						</td>
+						<td>	
+							{% if values['covered_bill_ids'] is not none %}
+								{% for bill_id in values['covered_bill_ids'] %}
+										<a href="/g/bills/{{bill_id}}">{{bill_id}}</a>
+										{% if bill_id == values.g_bill_id %}
+										{% endif %}
+								{% endfor %}
+							{% endif %}
+						</td>
+						<td><span title="{{values.covered_start}}">{{values.covered_start[:10]}}</span></td>
+						<td><span title="{{values.covered_finish}}">{{values.covered_finish[:10]}}</span></td>
+						{% for title in columns %}
+							<td>	
+								{% if title in values and values[title] is not none %}
+									{{"%.2f"|format(values[title])}}
+								{% endif %}
+							</td>
+						{% endfor %}
+						<td>
+							{{ values.covered_problem }} {{ values.virtual_problem }}
+						</td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	{% endif %}
+{% endblock %}

chellow-1739889885.0.0/chellow/templates/report_run_row_g_bill_check.html

@@ -0,0 +1,191 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Report Runs » {{row.report_run.id}} » Row {{row.id}}
+{% endblock %}
+
+{% block nav %}
+	<a href="/report_runs">Report Runs</a> &raquo;
+	<a href="/report_runs/{{row.report_run.id}}">{{row.report_run.id}}</a>
+	&raquo; Row {{row.id}}
+{% endblock %}
+
+{% block content %}
+	{% set values = row.data['values'] %}
+	{% set properties = row.data.get('properties', {}) %}
+	{% if row.report_run.name == 'bill_check' %}
+		<table>
+			<caption>Bill Check</caption>	
+			<thead>
+				<tr>
+					<th rowspan="2">Batch</th>
+					<th colspan="8">Bill</th>
+					<th colspan="2">MPAN Core</th>
+					<th colspan="2">Site</th>
+					<th rowspan="2">Checking</th>
+				</tr>
+				<tr>
+					<th>Reference</th>
+					<th>Type</th>
+					<th>kWh</th>
+					<th>Net GBP</th>
+					<th>VAT GBP</th>
+					<th>Gross GBP</th>
+					<th>Start</th>
+					<th>Finish</th>
+					<th>Import</th>
+					<th>Export</th>
+					<th>Code</th>
+					<th>Name</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td>
+						{% if values.batch_id != None %}
+							<a href="/e/supplier_batches/{{values.batch_id}}">{{values['batch']}}</a>
+						{% endif %}
+					</td>
+					<td>
+						{% if values.bill_id != None %}
+							<a href="/e/supplier_bills/{{values.bill_id}}">{{
+								values['bill-reference']}}</a>
+						{% endif %}
+					</td>
+					<td>{{values['bill-type']}}</td>
+					<td>{{values['bill-kwh']}}</td>
+					<td>{{values['bill-net-gbp']}}</td>
+					<td>{{values['bill-vat-gbp']}}</td>
+					<td>{{values['bill-gross-gbp']}}</td>
+					<td>{{values['bill-start-date']}}</td>
+					<td>{{values['bill-finish-date']}}</td>
+					<td>
+						{% if values['imp-mpan-core'] != None %}
+						<a href="/e/supplies/{{values.supply_id}}">{{
+							values['imp-mpan-core']}}</a>
+						{% endif %}
+					</td>
+					<td>
+						{% if values['exp-mpan-core'] != None %}
+							<a href="/e/supplies/{{values.supply_id}}">{{
+								values['exp-mpan-core']}}</a>
+						{% endif %}
+					</td>
+					<td>
+						{% if values.site_id != None %}
+							<a href="/sites/{{values.site_id}}">{{
+								values['site-code']}}</a>
+						{% endif %}
+					</td>
+					<td>{{values['site-name']}}</td>
+					<td>
+						<form action="/report_run_rows/{{row.id}}" method="post">
+							<fieldset>
+								{{input_textarea(
+									'note', properties.note, 5, 40,
+									placeholder='Notes on checking go here...')}}
+								<br>
+								<br>
+								<label>Checked?
+									{{input_checkbox('is_checked', properties.is_checked)}}
+								</label>
+								<input type="submit" name="update" value="Update">
+							</fieldset>
+						</form>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+
+		<table>
+			<caption>Covered</caption>
+			<thead>
+				<tr>
+					<th>From</th>
+					<th>To</th>
+					<th>Bills</th>
+					<th>Metered kWh</th>
+					<th>Net GBP</th>
+					<th>Virtual Net GBP</th>
+					<th>Difference GBP</th>
+					<th>Problem</th>
+					<th>Virtual Problem</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td>{{values['covered-from']}}</td>
+					<td>{{values['covered-to']}}</td>
+					<td>
+						{% if values['covered-bills'] != None %}
+							<ul>
+								{% for bill_id in values['covered-bills'] %}
+									<li>
+										<a href="/e/supplier_bills/{{bill_id}}">{{bill_id}}</a>
+										{% if bill_id == values.bill_id %}
+											(This bill)
+										{% endif %}
+									</li>
+								{% endfor %}
+							</ul>
+						{% endif %}
+					</td>
+					<td>
+						{% if values['metered-kwh'] != None %}
+							{{"%.0f"|format(values['metered-kwh'])}}
+						{% endif %}
+					</td>
+					<td>{{values['covered-net-gbp']}}</td>
+					<td>
+						{% if values['virtual-net-gbp'] != None %}
+							{{"%.2f"|format(values['virtual-net-gbp'])}}
+						{% endif %}
+					</td>
+					<td>
+						{% if values['difference-net-gbp'] != None %}
+							{{"%.2f"|format(values['difference-net-gbp'])}}
+						{% endif %}
+					</td>
+					<td>{{values['covered-problem']}}</td>
+					<td>{{values['virtual-problem']}}</td>
+				</tr>
+			</tbody>
+		</table>
+
+		{% for table in tables %}
+			<table>
+				<caption>{{table.name}}</caption>
+				<thead>
+					<tr>
+						{% for title in table.titles %}
+							<th>{{title}}</th>
+						{% endfor %}
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						{% for v in table['values'] %}
+							<td>{{v}}</td>
+						{% endfor %}
+					</tr>
+				</tbody>
+			</table>
+		{% endfor %}
+
+		<h2>Raw</h2>	
+		<pre>{{raw_data}}</pre>
+
+	{% else %}
+		<table>
+			<caption>Report Run Row</caption>	
+			<tbody>
+				{% for title in row.data.titles %}
+					<tr>
+						<th>{{title}}</th>
+						<td>{{row.data['values'][title]}}</td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	{% endif %}
+{% endblock %}