chellow 1733390302.0.0__py3-none-any.whl → 1734005435.0.0__py3-none-any.whl

chellow/reports/report_41.py

@@ -4,7 +4,7 @@ import threading
 import traceback
 from datetime import datetime as Datetime
 
-from flask import g, request
+from flask import g, redirect, request
 
 from sqlalchemy import or_
 from sqlalchemy.sql.expression import null, true
@@ -23,7 +23,6 @@ from chellow.utils import (
     req_int,
     to_utc,
 )
-from chellow.views import chellow_redirect
 
 
 def _make_eras(sess, nov_start, year_finish, supply_id):
@@ -211,4 +210,4 @@ def do_get(sess):
     year = req_int("year")
     supply_id = req_int("supply_id") if "supply_id" in request.values else None
     threading.Thread(target=content, args=(year, supply_id, g.user.id)).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_429.py

@@ -7,7 +7,7 @@ from datetime import datetime as Datetime
 from decimal import Decimal
 from itertools import combinations
 
-from flask import g, request
+from flask import g, redirect, request
 
 from sqlalchemy import null, or_, select, true
 from sqlalchemy.orm import joinedload
@@ -18,7 +18,6 @@ import chellow.gas.engine
 from chellow.dloads import open_file
 from chellow.models import GBatch, GBill, GContract, GEra, Session, Site, SiteGEra, User
 from chellow.utils import csv_make_val, hh_max, hh_min, req_date, req_int, to_utc
-from chellow.views import chellow_redirect
 
 
 def content(g_batch_id, g_bill_id, g_contract_id, start_date, finish_date, user_id):
@@ -361,4 +360,4 @@ def do_get(sess):
 
     args = g_batch_id, g_bill_id, g_contract_id, start_date, finish_date, g.user.id
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_59.py

@@ -5,7 +5,7 @@ from collections import defaultdict
 
 from dateutil.relativedelta import relativedelta
 
-from flask import flash, g, make_response, render_template, request
+from flask import flash, g, make_response, redirect, render_template, request
 
 import odio
 
@@ -50,7 +50,6 @@ from chellow.utils import (
     to_utc,
     utc_datetime_now,
 )
-from chellow.views import chellow_redirect
 
 
 CATEGORY_ORDER = {None: 0, "unmetered": 1, "nhh": 2, "amr": 3, "hh": 4}
@@ -1072,7 +1071,7 @@ def do_post(sess):
         sess.rollback()
         thread = threading.Thread(target=content, args=args)
         thread.start()
-        return chellow_redirect("/downloads", 303)
+        return redirect("/downloads", 303)
     except BadRequest as e:
         flash(e.description)
         if "scenario_id" in request.values:

chellow/reports/report_81.py

@@ -2,7 +2,7 @@ import csv
 import threading
 import traceback
 
-from flask import g
+from flask import g, redirect
 
 from sqlalchemy import or_
 from sqlalchemy.orm import joinedload
@@ -14,7 +14,6 @@ from chellow.dloads import open_file
 from chellow.e.computer import SupplySource, contract_func, forecast_date
 from chellow.models import Contract, Era, RSession, User
 from chellow.utils import c_months_u, csv_make_val, hh_format, hh_max, hh_min, req_int
-from chellow.views import chellow_redirect
 
 
 def content(user_id, contract_id, end_year, end_month, months):
@@ -147,4 +146,4 @@ def do_get(sess):
 
     args = g.user.id, contract_id, end_year, end_month, months
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_87.py

@@ -2,7 +2,7 @@ import csv
 import threading
 import traceback
 
-from flask import g
+from flask import g, redirect
 
 from sqlalchemy import or_, select
 from sqlalchemy.sql.expression import null, true
@@ -32,7 +32,6 @@ from chellow.utils import (
     req_int,
     to_ct,
 )
-from chellow.views import chellow_redirect
 
 
 def _process_era(
@@ -202,10 +201,7 @@ def create_csv(f, sess, start_date, finish_date, contract_id):
                 )
                 writer.writerow(csv_make_val(vals.get(t)) for t in titles)
             except BadRequest as e:
-                raise BadRequest(
-                    f"Problem with {chellow.utils.url_root}eras/{era.id}/edit "
-                    f"{e.description}"
-                )
+                raise BadRequest(f"Problem with /e/eras/{era.id}/edit {e.description}")
 
             sess.rollback()  # Avoid long-running transaction
 
@@ -243,4 +239,4 @@ def do_get(sess):
     threading.Thread(
         target=content, args=(start_date, finish_date, contract_id, g.user.id)
     ).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_asset_comparison.py

@@ -4,7 +4,7 @@ import threading
 import traceback
 from io import StringIO
 
-from flask import g, request
+from flask import g, redirect, request
 
 from sqlalchemy import select
 from sqlalchemy.orm import joinedload
@@ -14,7 +14,6 @@ from werkzeug.exceptions import BadRequest
 
 from chellow.dloads import open_file
 from chellow.models import Contract, Era, ReportRun, Session, Site, SiteEra, User
-from chellow.views import chellow_redirect
 
 STATUSES_ACTIVE = ("IN USE / IN SERVICE", "STORED SPARE")
 STATUSES_INACTIVE = ("DEMOLISHED", "SOLD", "ABANDONED")
@@ -194,4 +193,4 @@ def do_post(sess):
     sess.commit()
     args = user.id, StringIO(file_item.read().decode("utf8")), report_run.id
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect(f"/report_runs/{report_run.id}", 303)
+    return redirect(f"/report_runs/{report_run.id}", 303)

chellow/reports/report_batches.py

@@ -2,7 +2,7 @@ import csv
 import threading
 import traceback
 
-from flask import g
+from flask import g, redirect
 
 from sqlalchemy.sql import func, select
 
@@ -16,7 +16,6 @@ from chellow.models import (
     User,
 )
 from chellow.utils import csv_make_val
-from chellow.views import chellow_redirect
 
 
 def content(user_id):
@@ -142,4 +141,4 @@ def content(user_id):
 
 def do_get(sess):
     threading.Thread(target=content, args=(g.user.id,)).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_bills.py

@@ -3,7 +3,7 @@ import threading
 import traceback
 from collections import defaultdict
 
-from flask import g
+from flask import g, redirect
 
 from sqlalchemy import select
 from sqlalchemy.orm import joinedload
@@ -11,7 +11,6 @@ from sqlalchemy.orm import joinedload
 from chellow.dloads import open_file
 from chellow.models import Batch, Bill, Session, User
 from chellow.utils import csv_make_val, req_int
-from chellow.views import chellow_redirect
 
 
 def _content(sess, writer, batch_id):
@@ -36,6 +35,7 @@ def _content(sess, writer, batch_id):
         "vat_2_percent",
         "vat_2_net",
         "vat_2_vat",
+        "breakdown",
     ]
     writer.writerow(titles)
 
@@ -79,6 +79,7 @@ def _content(sess, writer, batch_id):
             "vat_2_percent": None,
             "vat_2_net": None,
             "vat_2_vat": None,
+            "breakdown": bill.breakdown,
         }
         for i, (percentage, vbd) in enumerate(sorted(vat_breakdown.items()), 1):
             vals[f"vat_{i}_percentage"] = percentage
@@ -111,4 +112,4 @@ def do_get(sess):
     batch_id = req_int("batch_id")
     args = g.user.id, batch_id
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_csv_llfcs.py

@@ -2,14 +2,13 @@ import csv
 import threading
 import traceback
 
-from flask import g
+from flask import g, redirect
 
 from sqlalchemy.orm import joinedload
 
 from chellow.dloads import open_file
 from chellow.models import Llfc, Session, User
 from chellow.utils import hh_format
-from chellow.views import chellow_redirect
 
 
 def content(user_id):
@@ -64,4 +63,4 @@ def content(user_id):
 def do_get(sess):
     args = (g.user.id,)
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_csv_site_hh_data.py

@@ -3,7 +3,7 @@ import sys
 import threading
 import traceback
 
-from flask import g, request
+from flask import g, redirect, request
 
 from sqlalchemy import null, or_, select, true
 from sqlalchemy.orm import joinedload
@@ -11,7 +11,6 @@ from sqlalchemy.orm import joinedload
 from chellow.dloads import open_file
 from chellow.models import Era, Session, Site, SiteEra, Source, Supply, User
 from chellow.utils import req_date, req_int, write_row
-from chellow.views import chellow_redirect
 
 
 TYPE_ORDER = {"hh": 0, "amr": 1, "nhh": 2, "unmetered": 3}
@@ -122,4 +121,4 @@ def do_get(sess):
 
     args = start_date, finish_date, site_id, g.user.id
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_csv_site_snags.py

@@ -3,7 +3,7 @@ import threading
 import traceback
 from datetime import datetime as Datetime, timedelta as Timedelta
 
-from flask import g
+from flask import g, redirect
 
 import pytz
 
@@ -13,7 +13,6 @@ from sqlalchemy.sql.expression import null
 from chellow.dloads import open_file
 from chellow.models import Session, Site, Snag, User
 from chellow.utils import hh_format
-from chellow.views import chellow_redirect
 
 
 def content(user_id):
@@ -81,4 +80,4 @@ def content(user_id):
 def do_get(sess):
     args = (g.user.id,)
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_ecoes_comparison.py

@@ -3,7 +3,7 @@ import sys
 import threading
 import traceback
 
-from flask import g
+from flask import g, redirect
 
 import requests
 
@@ -26,7 +26,6 @@ from chellow.models import (
     User,
 )
 from chellow.utils import csv_make_val, req_bool
-from chellow.views import chellow_redirect
 
 
 FNAME = "ecoes_comparison"
@@ -615,4 +614,4 @@ def do_get(sess):
     sess.commit()
     args = g.user.id, show_ignored, report_run.id
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect(f"/report_runs/{report_run.id}", 303)
+    return redirect(f"/report_runs/{report_run.id}", 303)

chellow/reports/report_g_monthly_duration.py

@@ -1,7 +1,7 @@
 import threading
 import traceback
 
-from flask import g, request
+from flask import g, redirect, request
 
 import odio
 
@@ -42,7 +42,6 @@ from chellow.utils import (
     to_utc,
     utc_datetime_now,
 )
-from chellow.views import chellow_redirect
 
 
 def write_spreadsheet(fl, compressed, site_rows, era_rows):
@@ -535,4 +534,4 @@ def do_get(sess):
     args = scenario_props, g.user.id, compression, now, base_name
 
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_g_supplies_snapshot.py

@@ -3,7 +3,7 @@ import sys
 import threading
 import traceback
 
-from flask import g, request
+from flask import g, redirect, request
 
 from sqlalchemy import or_
 from sqlalchemy.orm import joinedload
@@ -16,7 +16,6 @@ from chellow.e.computer import contract_func
 from chellow.gas.engine import GDataSource, forecast_date
 from chellow.models import GEra, GSupply, Session
 from chellow.utils import csv_make_val, req_date, req_int
-from chellow.views import chellow_redirect
 
 
 def content(date, g_supply_id, user):
@@ -136,4 +135,4 @@ def do_get(session):
 
     args = (date, g_supply_id, user)
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_g_supply_virtual_bill.py

@@ -2,7 +2,7 @@ import csv
 import threading
 import traceback
 
-from flask import g
+from flask import g, redirect
 
 from sqlalchemy import or_
 from sqlalchemy.sql.expression import null, true
@@ -14,7 +14,6 @@ from chellow.e.computer import forecast_date
 from chellow.gas.engine import GDataSource, g_contract_func
 from chellow.models import GEra, GSupply, Session, Site, SiteGEra
 from chellow.utils import csv_make_val, hh_format, hh_max, hh_min, req_date, req_int
-from chellow.views import chellow_redirect
 
 
 def content(g_supply_id, file_name, start_date, finish_date, user):
@@ -107,4 +106,4 @@ def do_get(sess):
     args = (g_supply_id, file_name, start_date, finish_date, g.user)
 
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_g_virtual_bills.py

@@ -4,7 +4,7 @@ import threading
 import traceback
 
 
-from flask import g
+from flask import g, redirect
 
 from sqlalchemy import or_
 from sqlalchemy.sql.expression import null, true
@@ -25,7 +25,6 @@ from chellow.utils import (
     req_int,
     to_ct,
 )
-from chellow.views import chellow_redirect
 
 
 def content(start_date, finish_date, g_contract_id, user_id):
@@ -137,4 +136,4 @@ def do_get(sess):
 
     args = start_date, finish_date, g_contract_id, g.user.id
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_g_virtual_bills_hh.py

@@ -3,7 +3,7 @@ import sys
 import threading
 import traceback
 
-from flask import g
+from flask import g, redirect
 
 from sqlalchemy import or_
 from sqlalchemy.sql.expression import null, true
@@ -14,7 +14,6 @@ from chellow.e.computer import contract_func
 from chellow.gas.engine import GDataSource
 from chellow.models import GEra, GSupply, Session, Site, SiteGEra
 from chellow.utils import csv_make_val, hh_format, hh_range, req_date, req_int
-from chellow.views import chellow_redirect
 
 
 def content(g_supply_id, start_date, finish_date, user):
@@ -105,4 +104,4 @@ def do_get(sess):
 
     args = g_supply_id, start_date, finish_date, g.user
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_sscs.py

@@ -3,7 +3,7 @@ import threading
 import traceback
 
 
-from flask import g, request
+from flask import g, redirect, request
 
 import odio
 
@@ -15,7 +15,6 @@ from werkzeug.exceptions import BadRequest
 from chellow.dloads import open_file
 from chellow.models import MeasurementRequirement, Session, Ssc, Tpr, User
 from chellow.utils import req_bool
-from chellow.views import chellow_redirect
 
 
 def write_spreadsheet(
@@ -114,4 +113,4 @@ def do_get(sess):
 
     args = (user.id, compression)
     threading.Thread(target=content, args=args).start()
-    return chellow_redirect("/downloads", 303)
+    return redirect("/downloads", 303)

chellow/reports/report_supply_contacts.py

@@ -3,7 +3,7 @@ import sys
 import threading
 import traceback
 
-from flask import g
+from flask import g, redirect
 
 from sqlalchemy import select
 from sqlalchemy.orm import joinedload
@@ -21,7 +21,6 @@ from chellow.models import (
     Supply,
     User,
 )
-from chellow.views import chellow_redirect
 
 
 FNAME = "supply_contacts"
@@ -127,4 +126,4 @@ def do_get(sess):
     report_run = ReportRun.insert(sess, FNAME, g.user, FNAME, {})
     sess.commit()
     threading.Thread(target=content, args=(g.user.id, report_run.id)).start()
-    return chellow_redirect(f"/report_runs/{report_run.id}", 303)
+    return redirect(f"/report_runs/{report_run.id}", 303)

chellow/templates/e/dc_contract_properties_edit.html

@@ -39,17 +39,17 @@
   "private_key": "private_key", /* Remove if using password */
   "directories": ["downloads1", "downloads2"],
   "mpan_map": {  /* Optional */
-		"99 0993 2821 985": {
-			"mpan": null,  /* Ignore MPAN */
-			"from": 2024-12-04T10:00:00Z,
+    "99 0993 2821 985": {
+      "mpan": null,  /* Ignore MPAN */
+      "from": 2024-12-04T10:00:00Z,
 			"to": 2025-01-12:00:00Z,
-		},
-		"99 0873 1942 952": {
-			"mpan": "99 7821 8541 389",
-			"from": 2024-11-16T22:00:00Z,
-			"to": 2025-02-18:00:00Z,
-		},
-	},
+    },
+    "99 0873 1942 952": {
+      "mpan": "99 7821 8541 389",
+      "from": 2024-11-16T22:00:00Z,
+      "to": 2025-02-18:00:00Z,
+    },
+  },
 }
 		</pre>
 	</code>

chellow/templates/e/site_hh_data.html

@@ -1,52 +1,76 @@
-<form>
-	<fieldset>						
-		<label>Site Code </label>
-		{{input_text('site_code', site.code)}}
-		<label>Month</label>
-		{{input_date(None, None, 'month')}}
-		<input type="submit" value="Show">
-	</fieldset>
-</form>
-<table class="sticky">
-	<caption>HH Data</caption>
-	<thead>
-		<tr>
-			<th>HH Starting</th>
-			<th>Imported kWh</th>
-			<th>Used kWh</th>
-			<th>Displaced kWh</th>
-			<th>Generated kWh</th>
-			<th>Exported kWh</th>
-			<th>Parasitic kWh</th>
-			{% for supply in supplies %}
-				{% set pref = supply.name + ' '+ supply.source.code +
-				(' ' + supply.generator_type.code if
-				supply.generator_type != None else '') %}
-				<th style="border-left-width: medium;">{{pref}} Imp kWh</th>
-				<th>{{pref}} Imp Status</th>
-				<th>{{pref}} Exp kWh</th>
-				<th>{{pref}} Exp Status</th>
-			{% endfor %}
-		</tr>
-	</thead>
-	<tbody>
-		{% for hh in hh_data %}
+{% extends "base.html" %}
+
+{% block title %}
+	Sites &raquo; {{site.code}} {{site.name}} &raquo; HH data
+{% endblock %}
+
+{% block inside_head %}
+	<style>
+		tbody > tr {
+			scroll-margin-top: 8em;
+		}
+
+		tbody > tr:target {
+			background-color: yellow;
+		}
+	</style>
+{% endblock %}
+
+{% block nav %}
+	<a href="/sites">Sites</a> &raquo;
+	<a href="/sites/{{site.id}}">{{site.code}} {{site.name}}</a> &raquo; HH data
+{% endblock %}
+
+{% block content %}
+	<form action="/e/sites/{{site.id}}/hh_data">
+		<fieldset>						
+			<label>Month</label> {{input_date(prefix='start', initial=start_date, resolution='month')}}
+			<input type="submit" value="Show">
+		</fieldset>
+	</form>
+
+	<table class="sticky">
+		<caption>HH Data</caption>
+		<thead>
 			<tr>
-				<td style="white-space: nowrap">{{hh.start_date|hh_format}}</td>
-				<td>{{hh.import_kwh}}</td>
-				<td>{{hh.used_kwh}}</td>
-				<td>{{hh.displaced_kwh}}</td>
-				<td>{{hh.generated_kwh}}</td>
-				<td>{{hh.export_kwh}}</td>
-				<td>{{hh.parasitic_kwh}}</td>
-				{% for datum in hh.supplies %}
-					<td style="border-left-width: medium;"
-						>{{datum.import_kwh}}</td>
-					<td>{{datum.import_status}}</td>
-					<td>{{datum.export_kwh}}</td>
-					<td>{{datum.export_status}}</td>
+				<th>HH Starting</th>
+				<th>Imported kWh</th>
+				<th>Used kWh</th>
+				<th>Displaced kWh</th>
+				<th>Generated kWh</th>
+				<th>Exported kWh</th>
+				<th>Parasitic kWh</th>
+				{% for supply in supplies %}
+					{% set pref = supply.name + ' '+ supply.source.code +
+					(' ' + supply.generator_type.code if
+					supply.generator_type != None else '') %}
+					<th style="border-left-width: medium;">{{pref}} Imp kWh</th>
+					<th>{{pref}} Imp Status</th>
+					<th>{{pref}} Exp kWh</th>
+					<th>{{pref}} Exp Status</th>
 				{% endfor %}
 			</tr>
-		{% endfor %}
-	</tbody>
-</table>
+		</thead>
+		<tbody>
+			{% for hh in hh_data %}
+				{% set start_str = hh.start_date|hh_format %}
+				<tr id="{{start_str}}">
+					<td style="white-space: nowrap">{{start_str}}</td>
+					<td>{{hh.import_kwh}}</td>
+					<td>{{hh.used_kwh}}</td>
+					<td>{{hh.displaced_kwh}}</td>
+					<td>{{hh.generated_kwh}}</td>
+					<td>{{hh.export_kwh}}</td>
+					<td>{{hh.parasitic_kwh}}</td>
+					{% for datum in hh.supplies %}
+						<td style="border-left-width: medium;"
+							>{{datum.import_kwh}}</td>
+						<td>{{datum.import_status}}</td>
+						<td>{{datum.export_kwh}}</td>
+						<td>{{datum.export_status}}</td>
+					{% endfor %}
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+{% endblock %}

chellow/templates/site.html

@@ -161,7 +161,7 @@
 Table of site level monthly kWh, MD kWh etc.</a>
 		</li>
 		<li>
-			<a href="/sites/{{site.id}}/hh_data?year={{month_finish.year}}&amp;month={{month_finish.month}}">Table of hh data</a>
+			<a href="/e/sites/{{site.id}}/hh_data?start_year={{month_finish.year}}&amp;start_month={{month_finish.month}}">Table of hh data</a>
 		</li>
 		<li>
 			<a href="/e/sites/{{site.id}}/site_snags">Site Snags</a>

chellow/utils.py

@@ -17,8 +17,6 @@ from werkzeug.exceptions import BadRequest
 
 from zish import ZishException, loads
 
-url_root = ""
-
 HH = relativedelta(minutes=30)
 MONTH = relativedelta(months=1)
 YEAR = relativedelta(years=1)