chellow 1733501869.0.0__py3-none-any.whl → 1736431515.0.0__py3-none-any.whl

chellow/e/bill_parsers/edf_export_xlsx.py

@@ -7,7 +7,7 @@ from openpyxl import load_workbook
 
 from werkzeug.exceptions import BadRequest
 
-from chellow.utils import HH, ct_datetime, parse_mpan_core, to_ct, to_utc
+from chellow.utils import c_months_u, ct_datetime, parse_mpan_core, to_ct, to_utc
 
 
 def get_cell(sheet, col, row):
@@ -86,6 +86,63 @@ ELEM_LOOKUP = {
 }
 
 
+def _parse_gduos_sheet(sheet, mpan_core, issue_date):
+    bills = []
+    for row in range(2, len(sheet["A"]) + 1):
+        val = get_cell(sheet, "A", row).value
+        if val is None or val == "":
+            break
+
+        start_date_str = get_str(sheet, "B", row)
+        start_date_ct = to_ct(Datetime.strptime(start_date_str, "%Y-%m"))
+        start_date, finish_date = next(
+            c_months_u(
+                start_year=start_date_ct.year, start_month=start_date_ct.month, months=1
+            )
+        )
+
+        element_desc = get_str(sheet, "D", row).strip()
+        units = get_dec(sheet, "E", row)
+        rate = get_dec(sheet, "F", row)
+        net = round(get_dec(sheet, "G", row), 2)
+
+        titles = ELEM_LOOKUP[element_desc]
+        if titles is None:
+            continue
+
+        breakdown = {
+            titles["gbp"]: net,
+            titles["units"]: units,
+            titles["rate"]: [rate],
+        }
+        bill = {
+            "bill_type_code": "N",
+            "kwh": Decimal(0),
+            "vat": Decimal("0.00"),
+            "net": net,
+            "gross": net,
+            "reads": [],
+            "breakdown": breakdown,
+            "account": mpan_core,
+            "issue_date": issue_date,
+            "start_date": start_date,
+            "finish_date": finish_date,
+            "mpan_core": mpan_core,
+            "reference": "_".join(
+                (
+                    to_ct(start_date).strftime("%Y%m%d"),
+                    to_ct(finish_date).strftime("%Y%m%d"),
+                    to_ct(issue_date).strftime("%Y%m%d"),
+                    mpan_core,
+                    titles["name"],
+                )
+            ),
+        }
+
+        bills.append(bill)
+    return bills
+
+
 def _make_raw_bills(book):
     bills = []
     sheet = book.worksheets[0]
@@ -135,56 +192,8 @@ def _make_raw_bills(book):
         }
     )
     sheet = book.worksheets[3]
-    for row in range(2, len(sheet["A"]) + 1):
-        val = get_cell(sheet, "A", row).value
-        if val is None or val == "":
-            break
+    bills.extend(_parse_gduos_sheet(sheet, mpan_core, issue_date))
 
-        start_date_str = get_str(sheet, "B", row)
-        start_date_ct = to_ct(Datetime.strptime(start_date_str, "%Y-%m"))
-        start_date = to_utc(start_date_ct)
-        finish_date = to_utc(start_date_ct + relativedelta(months=1) - HH)
-
-        element_desc = get_str(sheet, "D", row).strip()
-        units = get_dec(sheet, "E", row)
-        rate = get_dec(sheet, "F", row)
-        net = round(get_dec(sheet, "G", row), 2)
-
-        titles = ELEM_LOOKUP[element_desc]
-        if titles is None:
-            continue
-
-        breakdown = {
-            titles["gbp"]: net,
-            titles["units"]: units,
-            titles["rate"]: [rate],
-        }
-
-        bills.append(
-            {
-                "bill_type_code": "N",
-                "kwh": Decimal(0),
-                "vat": Decimal("0.00"),
-                "net": net,
-                "gross": net,
-                "reads": [],
-                "breakdown": breakdown,
-                "account": mpan_core,
-                "issue_date": issue_date,
-                "start_date": start_date,
-                "finish_date": finish_date,
-                "mpan_core": mpan_core,
-                "reference": "_".join(
-                    (
-                        to_ct(start_date).strftime("%Y%m%d"),
-                        to_ct(finish_date).strftime("%Y%m%d"),
-                        to_ct(issue_date).strftime("%Y%m%d"),
-                        mpan_core,
-                        titles["name"],
-                    )
-                ),
-            }
-        )
     return bills
 
 

chellow/e/views.py

@@ -3,6 +3,7 @@ import os
 import threading
 from collections import defaultdict
 from datetime import datetime as Datetime
+from decimal import Decimal
 from io import BytesIO, StringIO
 from itertools import chain, islice
 from random import random
@@ -4729,6 +4730,127 @@ def site_add_e_supply_post(site_id):
         )
 
 
+@e.route("/sites/<int:site_id>/hh_data")
+def site_hh_data_get(site_id):
+    caches = {}
+    site = Site.get_by_id(g.sess, site_id)
+
+    start_year = req_int("start_year")
+    start_month = req_int("start_month")
+    start_date, finish_date = next(
+        c_months_u(start_year=start_year, start_month=start_month, months=1)
+    )
+
+    supplies = (
+        g.sess.query(Supply)
+        .join(Era)
+        .join(SiteEra)
+        .join(Source)
+        .filter(
+            SiteEra.site == site,
+            SiteEra.is_physical == true(),
+            Era.start_date <= finish_date,
+            or_(Era.finish_date == null(), Era.finish_date >= start_date),
+            Source.code != "sub",
+        )
+        .order_by(Supply.id)
+        .distinct()
+        .options(joinedload(Supply.source), joinedload(Supply.generator_type))
+        .all()
+    )
+
+    data = iter(
+        g.sess.query(HhDatum)
+        .join(Channel)
+        .join(Era)
+        .filter(
+            Channel.channel_type == "ACTIVE",
+            Era.supply_id.in_([s.id for s in supplies]),
+            HhDatum.start_date >= start_date,
+            HhDatum.start_date <= finish_date,
+        )
+        .order_by(HhDatum.start_date, Era.supply_id)
+        .options(
+            joinedload(HhDatum.channel)
+            .joinedload(Channel.era)
+            .joinedload(Era.supply)
+            .joinedload(Supply.source)
+        )
+    )
+    datum = next(data, None)
+
+    hh_data = []
+    for hh_date in hh_range(caches, start_date, finish_date):
+        sups = []
+        hh_dict = {
+            "start_date": hh_date,
+            "supplies": sups,
+            "export_kwh": Decimal(0),
+            "import_kwh": Decimal(0),
+            "parasitic_kwh": Decimal(0),
+            "generated_kwh": Decimal(0),
+            "third_party_import_kwh": Decimal(0),
+            "third_party_export_kwh": Decimal(0),
+        }
+        hh_data.append(hh_dict)
+        for supply in supplies:
+            sup_hh = {}
+            sups.append(sup_hh)
+            while (
+                datum is not None
+                and datum.start_date == hh_date
+                and datum.channel.era.supply_id == supply.id
+            ):
+                channel = datum.channel
+                imp_related = channel.imp_related
+                source_code = channel.era.supply.source.code
+
+                prefix = "import_" if imp_related else "export_"
+                sup_hh[f"{prefix}kwh"] = datum.value
+                sup_hh[f"{prefix}status"] = datum.status
+
+                if not imp_related and source_code in ("grid", "gen-grid"):
+                    hh_dict["export_kwh"] += datum.value
+                if imp_related and source_code in ("grid", "gen-grid"):
+                    hh_dict["import_kwh"] += datum.value
+                if (imp_related and source_code == "gen") or (
+                    not imp_related and source_code == "gen-grid"
+                ):
+                    hh_dict["generated_kwh"] += datum.value
+                if (not imp_related and source_code == "gen") or (
+                    imp_related and source_code == "gen-grid"
+                ):
+                    hh_dict["parasitic_kwh"] += datum.value
+                if (imp_related and source_code == "3rd-party") or (
+                    not imp_related and source_code == "3rd-party-reverse"
+                ):
+                    hh_dict["third_party_import_kwh"] += datum.value
+                if (not imp_related and source_code == "3rd-party") or (
+                    imp_related and source_code == "3rd-party-reverse"
+                ):
+                    hh_dict["third_party_export_kwh"] += datum.value
+                datum = next(data, None)
+
+        hh_dict["displaced_kwh"] = (
+            hh_dict["generated_kwh"] - hh_dict["export_kwh"] - hh_dict["parasitic_kwh"]
+        )
+        hh_dict["used_kwh"] = sum(
+            (
+                hh_dict["import_kwh"],
+                hh_dict["displaced_kwh"],
+                hh_dict["third_party_import_kwh"] - hh_dict["third_party_export_kwh"],
+            )
+        )
+
+    return render_template(
+        "site_hh_data.html",
+        site=site,
+        supplies=supplies,
+        hh_data=hh_data,
+        start_date=start_date,
+    )
+
+
 @e.route("/sources")
 def sources_get():
     sources = g.sess.query(Source).order_by(Source.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/e/supply.html

@@ -218,8 +218,6 @@
 				{{ input_number('months', initial='1', size='2', maxlength='2', required=True) }}
 				<label>Final Month</label>
 				{{ input_date('finish', last_month_finish, 'month') }}
-				<label>Include bill check tabs?</label>
-				{{input_checkbox('is_bill_check')}}
 				<input type="submit" value="Download">
 			</fieldset>
 		</form>

chellow/templates/g/supply.html

@@ -366,10 +366,8 @@
 		<fieldset>
 			<input type="hidden" name="g_supply_id" value="{{g_supply.id}}">
 			<legend>Monthly Duration</legend>
-			<br>
-			For <input name="months" maxlength="2" size="2" value="1">
-			month(s) finishing at the end of
-			{{ input_date('finish', last_month_finish, 'month') }}
+			<label>Months Long</label> <input name="months" maxlength="2" size="2" value="1">
+			<label>Last Month</label> {{ input_date('finish', last_month_finish, 'month') }}
 			<input type="submit" value="Download">
 		</fieldset>
 	</form>

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/views.py

@@ -10,7 +10,6 @@ import traceback
 import types
 from collections import OrderedDict
 from datetime import datetime as Datetime
-from decimal import Decimal
 from functools import wraps
 from importlib import import_module
 from io import DEFAULT_BUFFER_SIZE, StringIO
@@ -50,7 +49,6 @@ from sqlalchemy import (
     true,
 )
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import joinedload
 from sqlalchemy.orm.attributes import flag_modified
 
 from werkzeug.exceptions import BadRequest, Forbidden
@@ -1155,123 +1153,6 @@ def report_post(report_id):
     return report_module.do_post(g.sess)
 
 
-@home.route("/sites/<int:site_id>/hh_data")
-def site_hh_data_get(site_id):
-    caches = {}
-    site = Site.get_by_id(g.sess, site_id)
-
-    year = req_int("year")
-    month = req_int("month")
-    start_date, finish_date = next(
-        c_months_u(start_year=year, start_month=month, months=1)
-    )
-
-    supplies = (
-        g.sess.query(Supply)
-        .join(Era)
-        .join(SiteEra)
-        .join(Source)
-        .filter(
-            SiteEra.site == site,
-            SiteEra.is_physical == true(),
-            Era.start_date <= finish_date,
-            or_(Era.finish_date == null(), Era.finish_date >= start_date),
-            Source.code != "sub",
-        )
-        .order_by(Supply.id)
-        .distinct()
-        .options(joinedload(Supply.source), joinedload(Supply.generator_type))
-        .all()
-    )
-
-    data = iter(
-        g.sess.query(HhDatum)
-        .join(Channel)
-        .join(Era)
-        .filter(
-            Channel.channel_type == "ACTIVE",
-            Era.supply_id.in_([s.id for s in supplies]),
-            HhDatum.start_date >= start_date,
-            HhDatum.start_date <= finish_date,
-        )
-        .order_by(HhDatum.start_date, Era.supply_id)
-        .options(
-            joinedload(HhDatum.channel)
-            .joinedload(Channel.era)
-            .joinedload(Era.supply)
-            .joinedload(Supply.source)
-        )
-    )
-    datum = next(data, None)
-
-    hh_data = []
-    for hh_date in hh_range(caches, start_date, finish_date):
-        sups = []
-        hh_dict = {
-            "start_date": hh_date,
-            "supplies": sups,
-            "export_kwh": Decimal(0),
-            "import_kwh": Decimal(0),
-            "parasitic_kwh": Decimal(0),
-            "generated_kwh": Decimal(0),
-            "third_party_import_kwh": Decimal(0),
-            "third_party_export_kwh": Decimal(0),
-        }
-        hh_data.append(hh_dict)
-        for supply in supplies:
-            sup_hh = {}
-            sups.append(sup_hh)
-            while (
-                datum is not None
-                and datum.start_date == hh_date
-                and datum.channel.era.supply_id == supply.id
-            ):
-                channel = datum.channel
-                imp_related = channel.imp_related
-                source_code = channel.era.supply.source.code
-
-                prefix = "import_" if imp_related else "export_"
-                sup_hh[f"{prefix}kwh"] = datum.value
-                sup_hh[f"{prefix}status"] = datum.status
-
-                if not imp_related and source_code in ("grid", "gen-grid"):
-                    hh_dict["export_kwh"] += datum.value
-                if imp_related and source_code in ("grid", "gen-grid"):
-                    hh_dict["import_kwh"] += datum.value
-                if (imp_related and source_code == "gen") or (
-                    not imp_related and source_code == "gen-grid"
-                ):
-                    hh_dict["generated_kwh"] += datum.value
-                if (not imp_related and source_code == "gen") or (
-                    imp_related and source_code == "gen-grid"
-                ):
-                    hh_dict["parasitic_kwh"] += datum.value
-                if (imp_related and source_code == "3rd-party") or (
-                    not imp_related and source_code == "3rd-party-reverse"
-                ):
-                    hh_dict["third_party_import_kwh"] += datum.value
-                if (not imp_related and source_code == "3rd-party") or (
-                    imp_related and source_code == "3rd-party-reverse"
-                ):
-                    hh_dict["third_party_export_kwh"] += datum.value
-                datum = next(data, None)
-
-        hh_dict["displaced_kwh"] = (
-            hh_dict["generated_kwh"] - hh_dict["export_kwh"] - hh_dict["parasitic_kwh"]
-        )
-        hh_dict["used_kwh"] = sum(
-            (
-                hh_dict["import_kwh"],
-                hh_dict["displaced_kwh"],
-                hh_dict["third_party_import_kwh"] - hh_dict["third_party_export_kwh"],
-            )
-        )
-
-    return render_template(
-        "site_hh_data.html", site=site, supplies=supplies, hh_data=hh_data
-    )
-
-
 @home.route("/sites/<int:site_id>")
 def site_get(site_id):
     configuration_contract = Contract.get_non_core_by_name(g.sess, "configuration")

{chellow-1733501869.0.0.dist-info → chellow-1736431515.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: chellow
-Version: 1733501869.0.0
+Version: 1736431515.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-1733501869.0.0.dist-info → chellow-1736431515.0.0.dist-info}/RECORD

@@ -12,7 +12,7 @@ chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
 chellow/rrun.py,sha256=1Kt2q_K9UoDG_nsZz-Q6XJiMNKroWqlqFdxn2M6Q8CA,2088
 chellow/testing.py,sha256=Od4HHH6pZrhJ_De118_F55RJEKmAvhUH2S24QE9qFQk,3635
 chellow/utils.py,sha256=Ej7dsbQ6Ee8X2aZ7B2Vs-hUFCsMABioAdOV1DJjwY-0,19293
-chellow/views.py,sha256=d1q8OL3GL9dsyQARmiVe-somkj900MkG9lwaWpWduoA,83700
+chellow/views.py,sha256=OlNGtFB9OatQPMzHiXTjBoGOSnFT7cC38GA2x7rtcFg,79490
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
 chellow/e/bill_importer.py,sha256=7UcnqNlKbJc2GhW9gy8sDp9GuqambJVpZLvbafOZztA,7411
@@ -43,13 +43,13 @@ chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,623
 chellow/e/tlms.py,sha256=M33D6YpMixu2KkwSCzDRM3kThLgShg8exp63Obo75l8,8905
 chellow/e/tnuos.py,sha256=NBmc-f3oezrl4gviAKobljHfICTpBKxxxEGBGJi_lRk,4927
 chellow/e/triad.py,sha256=lIQj7EdUrcFwEqleuHZXYU_bfzIwNOqUVVxB3NPQt4A,13710
-chellow/e/views.py,sha256=8xNeBgr4LFPPPYD-lcOV4S5tlV19zSMF66zoeBKrc8U,216492
+chellow/e/views.py,sha256=VkoB3-jgydp-2RMdlYVvSL4UVUmt7wMnCJpHSBdf1jM,220753
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=UgWXDPzQkQghyj_lfgBqoSJpHB-t-qOdSaB8qY6GLog,4071
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
 chellow/e/bill_parsers/bgb_edi.py,sha256=GuwHeYbAGk7BVg5n19FcTANFDyKI-y0z3f9niQaPSSw,4828
 chellow/e/bill_parsers/csv.py,sha256=U5zcIaZ6B5QTTpFDAcBnk4G2r8B3j5kJhDPL4AJNkEk,5640
-chellow/e/bill_parsers/edf_export_xlsx.py,sha256=t-M9-dGNWXu3VDI1DbS5Ez1oHW33oopJryNgMTvTjys,6307
+chellow/e/bill_parsers/edf_export_xlsx.py,sha256=weVvtnXVBSNtz-CMiUHCTI2W8kV19lX7UDMZilxybKk,6440
 chellow/e/bill_parsers/engie_edi.py,sha256=CTobTskDjzdcqqf_qk2ukDSaTLrVpGZMM0sYlwehog4,14985
 chellow/e/bill_parsers/engie_export_xlsx.py,sha256=oZO0qHdDlOxjJ6J5Ate82CkAoX4bxed1EJyUKHxBcpk,4690
 chellow/e/bill_parsers/engie_xls.py,sha256=jrut2heH_ZWmSjcn7celOydZS9Y49GfpYjDk_EKwamI,14453
@@ -152,11 +152,10 @@ chellow/templates/scenario_add.html,sha256=xFTb9CaA-qV2iwnVqcS44vD8JlYatBQet8Rat
 chellow/templates/scenario_docs.html,sha256=0YP_h8GYkqCFLBoCj2w4PE4Js15DT_WoxYlK9nRSMlA,6949
 chellow/templates/scenario_edit.html,sha256=x2Eicq_eFs7ax2EtL4GrD73qKF-LhN41OQdPFbDivrc,1060
 chellow/templates/scenarios.html,sha256=FIDOSWs9VO_3bJkQoNHh-DdRzVfUyJGK9WbdEHRxxdM,841
-chellow/templates/site.html,sha256=dj0VgcmjaKJHuTOZDESO2E2MOyluYJtx4YaSOaWOkwU,10024
+chellow/templates/site.html,sha256=rvK4VnSsiSswyYTPJrKn4iKpT_-t1nfH-4yCPF7OKQc,10038
 chellow/templates/site_add.html,sha256=NxYmOIZQH6X8EBOuJUbhUJ8IYB3t0BukjR1yVRhnJhM,422
 chellow/templates/site_edit.html,sha256=TJ_ZDDkodj-uDB3GPP9Cel3FGZY2oP42KCzHOydPWVc,2909
 chellow/templates/site_gen_graph.html,sha256=LXkD4n_aC_sFm9JJTCmBRrczpyTn2UUEgBToFiM5RPo,3468
-chellow/templates/site_hh_data.html,sha256=xmSJ5h_DvI1-bnV7FdBodDUvDCU0-q-UHYj2MuyLOTg,1907
 chellow/templates/site_months.html,sha256=ToqH42dym82Q4ihFIT3St-EwPlhDAfwskNMh4cZ2EsM,6572
 chellow/templates/site_used_graph.html,sha256=NXuQYcPXnk2mHb2O4mxVPZ1R-X-MWPwneUV-J6z285w,3094
 chellow/templates/sites.html,sha256=4ouJ5xYqYHjXCv3cDucTjgbOd_whReFPPHopLBdW6Go,621
@@ -291,7 +290,7 @@ chellow/templates/e/scenario_edit.html,sha256=Uf64v_qsBP0BxaFEIz214CC_dZXlvro4zv
 chellow/templates/e/scenarios.html,sha256=zlNhZvQEcuwLgHObVHS-4THur5Lz9Jf1G6xD98-jamI,847
 chellow/templates/e/site_add_e_supply.html,sha256=_gi1ejI4TMTMX9vCW7z2kToR2XKR6qoVh67qp_VrDsM,2731
 chellow/templates/e/site_add_e_supply_form.html,sha256=q5LfSmp_eamph4FLKslMrxKGOtGCkSFRe9I5AVn-hgM,5553
-chellow/templates/e/site_hh_data.html,sha256=1Ld5IIM3G84tVCAwtlJNGJTnrASS7d84AgaPwwHNEMI,1413
+chellow/templates/e/site_hh_data.html,sha256=qCmqQcPKWhNiZ7eSVs8NhMIiBXJHVHF5OAzjEdppyjM,1982
 chellow/templates/e/site_site_snags.html,sha256=vWpsFyxZj7GOrMXQz2rKq9zOQdVsqeUVtdBzehp9J5w,847
 chellow/templates/e/site_snag.html,sha256=eZt1H-t-hsoKZBteU9ILpKqKLD0Pf0Uybp8pPQYuTAc,924
 chellow/templates/e/site_snag_edit.html,sha256=O-m95S-ig9sXmFFkQmjfNnF9zJkgSIuPizuF7ieNi7s,1436
@@ -321,7 +320,7 @@ chellow/templates/e/supplier_contracts.html,sha256=VwWD4q88Fynz7vioFSAsyH6RR_1Sy
 chellow/templates/e/supplier_rate_script.html,sha256=tjWeCUAgNip3VLHzbXqe19Msiasys3Wm5Vra936qJjI,1245
 chellow/templates/e/supplier_rate_script_add.html,sha256=Yf2LZEIHbL7qT6oxBCtPf0ZX7vJsSo_ZeOKJhJoVh3o,690
 chellow/templates/e/supplier_rate_script_edit.html,sha256=VaYJt8nxHdnuP-zEAuBJC-ibEpjDU1b80hXtdBQH1dg,1968
-chellow/templates/e/supply.html,sha256=No26xivLm4hA8kRufVvPjrEOE3of7pmZaW_jgTcKSY0,8511
+chellow/templates/e/supply.html,sha256=kFyYPIzMgRZz7tHY_TfmjYzUkc1zXyaJses6X372Ozg,8427
 chellow/templates/e/supply_edit.html,sha256=2BRGU35nb0ZpUHKCi_fgAPMU6SlHI7ve3_Ne8LXHtms,2333
 chellow/templates/e/supply_eras.html,sha256=5lB7_oC-sTWRQoASuPgBWj5XSZa9ajR0s6V6xKHvf6E,19996
 chellow/templates/e/supply_hh_data.html,sha256=d9ho4Tq3ZkR5GmxSZr_zHGwCU68PH3aSc4OwFG9i9zE,3587
@@ -370,13 +369,13 @@ chellow/templates/g/supplier_rate_script.html,sha256=e4dwskWTQcLv6qyX150VUeuaUvE
 chellow/templates/g/supplier_rate_script_add.html,sha256=zMjTkjupOsHFu-peUXL4IKjjc2OaSL-2ah4T9OdKp_o,620
 chellow/templates/g/supplier_rate_script_edit.html,sha256=GoUqXf52gWEH1iApmNdxOcKLItzpA-o7iQPQ1_in9BA,1950
 chellow/templates/g/supplies.html,sha256=oEAEfZaAuKv7EA6fd3blWjPwv_XKoNHLPlkRJ_afZHs,1267
-chellow/templates/g/supply.html,sha256=HMR2haS4-k24rGqWApA74Ufi_IODN0oNIa9d7L9Xe1o,11001
+chellow/templates/g/supply.html,sha256=eWuSDHh8de-LgLVlrNPWLX-_jiRn1uB3CZNpGK1xBYA,11006
 chellow/templates/g/supply_edit.html,sha256=F2Ip4xCXLl4eFiRjMLZyUMIiznWw97GF7mN_50QAEWA,1653
 chellow/templates/g/supply_note_add.html,sha256=zWwppQTxBfN7Dw6Cgr330mw7SgDRoTcaIdAucNisZRE,658
 chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1nAPevz-AgkhQ,1036
 chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBeyRzQe3Rg,854
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1733501869.0.0.dist-info/METADATA,sha256=zC5NZQjT__VbhNTac6EOSjZEHQZ-ARkcIUf38_BNTQc,12204
-chellow-1733501869.0.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-chellow-1733501869.0.0.dist-info/RECORD,,
+chellow-1736431515.0.0.dist-info/METADATA,sha256=78QJHzK7SfEhS31W3L2h1zcoNfkEVk9udgaEMeqXepU,12204
+chellow-1736431515.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1736431515.0.0.dist-info/RECORD,,

{chellow-1733501869.0.0.dist-info → chellow-1736431515.0.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

chellow/templates/site_hh_data.html

@@ -1,75 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}
-	Sites » {{site.code}} {{site.name}} » 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>
-		<fieldset>						
-			<label>Month</label> {{input_date(resolution='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 %}
-				{% 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 %}