chellow 1754570085.0.0__py3-none-any.whl → 1754580326.0.0__py3-none-any.whl

chellow/e/energy_management.py

@@ -13,278 +13,262 @@ from chellow.e.computer import (
     forecast_date,
 )
 from chellow.models import Era, Session, Site, SiteEra, Source, Supply
-from chellow.utils import c_months_u, ct_datetime_now, hh_max, hh_min
+from chellow.utils import c_months_u, ct_datetime_now, hh_format, hh_max, hh_min
 
 
-def totals_runner(mem_id, site_id, start_date):
-    CATS = ("imp_net", "exp_net", "used", "displaced")
-    QUANTS = (
-        "kwh",
-        "gbp",
-        "p_per_kwh",
-        "triad_gbp",
-        "duos_gbp",
-        "red_duos_gbp",
-        "md_kw",
-    )
-    sess = None
-    titles = ["Quantity"]
-    titles.extend(CATS)
-    log_list = []
-    problem = ""
+CATS = ("imp_grid", "exp_grid", "used", "displaced")
+QUANTS = (
+    "kwh",
+    "net_gbp",
+    #    "p_per_kwh",
+    "triad_gbp",
+    "duos_gbp",
+    "red_duos_gbp",
+    "md_kw",
+)
 
-    jval = {"titles": titles, "rows": [], "status": "running", "log": log_list}
-    try:
-        with Session() as sess:
-            site = Site.get_by_id(sess, site_id)
 
-            def log(msg):
-                return
-                log_list.append(msg)
-                put_mem_val(mem_id, jval)
+def _process(sess, log, start_year, start_month, mem_id, jval, site):
+    log("started thread")
+    f_date = forecast_date()
+    report_context = {}
 
-            log("started thread")
-            f_date = forecast_date()
-            report_context = {}
-            vals = dict((cat, defaultdict(int)) for cat in CATS)
+    for month_num, (month_start, month_finish) in enumerate(
+        c_months_u(start_year=start_year, start_month=start_month, months=12)
+    ):
+        jval["progress"] = month_num
+        put_mem_val(mem_id, jval)
+        vals = {cat: defaultdict(int) for cat in CATS}
+        vals["problem"] = ""
 
-            if start_date is None:
-                now = ct_datetime_now()
-                start_year = now.year - 1
-                start_month = now.month
+        for era in sess.execute(
+            select(Era)
+            .join(SiteEra)
+            .join(Supply)
+            .join(Source)
+            .where(
+                SiteEra.site == site,
+                Era.start_date <= month_finish,
+                or_(Era.finish_date == null(), Era.finish_date >= month_start),
+                Era.imp_mpan_core != null(),
+                Source.code.in_(("grid", "gen-grid")),
+            )
+            .options(
+                joinedload(Era.imp_supplier_contract),
+                joinedload(Era.exp_supplier_contract),
+                joinedload(Era.mop_contract),
+                joinedload(Era.dc_contract),
+            )
+        ).scalars():
+            chunk_start = hh_max(era.start_date, month_start)
+            chunk_finish = hh_min(era.finish_date, month_finish)
+
+            log("about to call first supplysource")
+            supply_ds = SupplySource(
+                sess, chunk_start, chunk_finish, f_date, era, True, report_context
+            )
+
+            supplier_contract = era.imp_supplier_contract
+            import_vb_function = contract_func(
+                report_context, supplier_contract, "virtual_bill"
+            )
+            if import_vb_function is None:
+                raise Exception(
+                    "Can't find the import_virtual_bill function in the "
+                    "supplier contract. "
+                )
             else:
-                start_year = start_date.year
-                start_month = start_date.month
+                import_vb_function(supply_ds)
+                v_bill = supply_ds.supplier_bill
 
-            for progress, (month_start, month_finish) in enumerate(
-                c_months_u(start_year=start_year, start_month=start_month, months=12)
-            ):
-                jval["progress"] = progress
-                put_mem_val(mem_id, jval)
+                if "problem" in v_bill and len(v_bill["problem"]) > 0:
+                    raise Exception("Supplier Problem: " + v_bill["problem"])
 
-                for era in sess.execute(
-                    select(Era)
-                    .join(SiteEra)
-                    .join(Supply)
-                    .join(Source)
-                    .where(
-                        SiteEra.site == site,
-                        Era.start_date <= month_finish,
-                        or_(Era.finish_date == null(), Era.finish_date >= month_start),
-                        Era.imp_mpan_core != null(),
-                        Source.code.in_(("net", "gen-net")),
-                    )
-                    .options(
-                        joinedload(Era.imp_supplier_contract),
-                        joinedload(Era.exp_supplier_contract),
-                        joinedload(Era.mop_contract),
-                        joinedload(Era.dc_contract),
+                try:
+                    vals["imp_grid"]["net_gbp"] += v_bill["net-gbp"]
+                    if "triad-gbp" in v_bill:
+                        vals["imp_grid"]["triad_gbp"] += v_bill["triad-gbp"]
+                    if "duos-red-gbp" in v_bill:
+                        vals["imp_grid"]["red_duos_gbp"] += v_bill["duos-red-gbp"]
+                    vals["imp_grid"]["duos_gbp"] += sum(
+                        v
+                        for k, v in v_bill.items()
+                        if k.endswith("-gbp") and k.startswith("duos-")
                     )
-                ).scalars():
-                    chunk_start = hh_max(era.start_date, month_start)
-                    chunk_finish = hh_min(era.finish_date, month_finish)
-
-                    log("about to call first supplysource")
-                    supply_ds = SupplySource(
-                        sess,
-                        chunk_start,
-                        chunk_finish,
-                        f_date,
-                        era,
-                        True,
-                        report_context,
+                except KeyError:
+                    raise Exception(
+                        f"For the era {era.id} the virtual bill {v_bill} "
+                        f"from the contract {supplier_contract} does not "
+                        f"contain the net-gbp key."
                     )
 
-                    supplier_contract = era.imp_supplier_contract
-                    import_vb_function = contract_func(
-                        report_context, supplier_contract, "virtual_bill"
-                    )
-                    if import_vb_function is None:
-                        raise Exception(
-                            "Can't find the import_virtual_bill function in the "
-                            "supplier contract. "
-                        )
-                    else:
-                        import_vb_function(supply_ds)
-                        v_bill = supply_ds.supplier_bill
-
-                        if "problem" in v_bill and len(v_bill["problem"]) > 0:
-                            raise Exception("Supplier Problem: " + v_bill["problem"])
-
-                        try:
-                            vals["imp_net"]["gbp"] += v_bill["net-gbp"]
-                            if "triad-gbp" in v_bill:
-                                vals["imp_net"]["triad_gbp"] += v_bill["triad-gbp"]
-                            if "duos-red-gbp" in v_bill:
-                                vals["imp_net"]["red_duos_gbp"] += v_bill[
-                                    "duos-red-gbp"
-                                ]
-                            vals["imp_net"]["duos_gbp"] += sum(
-                                v
-                                for k, v in v_bill.items()
-                                if k.endswith("-gbp") and k.startswith("duos-")
-                            )
-                        except KeyError:
-                            raise Exception(
-                                f"For the era {era.id} the virtual bill {v_bill} "
-                                f"from the contract {supplier_contract} does not "
-                                f"contain the net-gbp key."
-                            )
-
-                    dc_contract = era.dc_contract
-                    supply_ds.contract_func(dc_contract, "virtual_bill")(supply_ds)
-                    dc_bill = supply_ds.dc_bill
-                    vals["imp_net"]["gbp"] += dc_bill["net-gbp"]
-                    if "problem" in dc_bill and len(dc_bill["problem"]) > 0:
-                        problem += "DC Problem: " + dc_bill["problem"]
-
-                    mop_contract = era.mop_contract
-                    mop_bill_function = supply_ds.contract_func(
-                        mop_contract, "virtual_bill"
-                    )
-                    mop_bill_function(supply_ds)
-                    mop_bill = supply_ds.mop_bill
-                    vals["imp_net"]["gbp"] += mop_bill["net-gbp"]
-                    if "problem" in mop_bill and len(mop_bill["problem"]) > 0:
-                        problem += "MOP Problem: " + mop_bill["problem"]
-
-                    exp_supplier_contract = era.exp_supplier_contract
-                    if exp_supplier_contract is not None:
-                        log("about to call second supply source")
-                        exp_supply_ds = SupplySource(
-                            sess,
-                            chunk_start,
-                            chunk_finish,
-                            f_date,
-                            era,
-                            False,
-                            report_context,
-                        )
-                        exp_vb_function = contract_func(
-                            report_context, exp_supplier_contract, "virtual_bill"
-                        )
-                        if exp_vb_function is None:
-                            problem += (
-                                "Can't find the export_virtual_bill function in the "
-                                "supplier contract. "
-                            )
-                        else:
-                            exp_vb_function(exp_supply_ds)
-                            v_bill = exp_supply_ds.supplier_bill
-
-                            if "problem" in v_bill and len(v_bill["problem"]) > 0:
-                                problem += (
-                                    f"Export supplier Problem: {v_bill['problem']}"
-                                )
-
-                            try:
-                                vals["exp_net"]["gbp"] += v_bill["net-gbp"]
-                                if "triad-gbp" in v_bill:
-                                    vals["exp_net"]["triad_gbp"] += v_bill["triad-gbp"]
-                                if "duos-red-gbp" in v_bill:
-                                    vals["exp_net"]["red_duos_gbp"] += v_bill[
-                                        "duos-red-gbp"
-                                    ]
-                                vals["exp_net"]["duos_gbp"] += sum(
-                                    v
-                                    for k, v in v_bill.items()
-                                    if k.endswith("-gbp") and k.startswith("duos-")
-                                )
-                            except KeyError:
-                                problem += (
-                                    f"For the era {era.id} the virtual bill "
-                                    f"{v_bill} from the contract "
-                                    f"{supplier_contract} does not contain the "
-                                    f"net-gbp key."
-                                )
-                                problem += v_bill["problem"]
-
-                disp_era = displaced_era(
-                    sess, report_context, site, month_start, month_finish, f_date
-                )
-                log("about to call sitesource")
-                site_ds = SiteSource(
+            dc_contract = era.dc_contract
+            supply_ds.contract_func(dc_contract, "virtual_bill")(supply_ds)
+            dc_bill = supply_ds.dc_bill
+            vals["imp_grid"]["gbp"] += dc_bill["net-gbp"]
+            if "problem" in dc_bill and len(dc_bill["problem"]) > 0:
+                raise Exception(f'DC Problem: {dc_bill["problem"]}')
+
+            mop_contract = era.mop_contract
+            mop_bill_function = supply_ds.contract_func(mop_contract, "virtual_bill")
+            mop_bill_function(supply_ds)
+            mop_bill = supply_ds.mop_bill
+            vals["imp_grid"]["gbp"] += mop_bill["net-gbp"]
+            if "problem" in mop_bill and len(mop_bill["problem"]) > 0:
+                raise Exception(f'MOP Problem: {mop_bill["problem"]}')
+
+            exp_supplier_contract = era.exp_supplier_contract
+            if exp_supplier_contract is not None:
+                log("about to call second supply source")
+                exp_supply_ds = SupplySource(
                     sess,
-                    site,
-                    month_start,
-                    month_finish,
+                    chunk_start,
+                    chunk_finish,
                     f_date,
+                    era,
+                    False,
                     report_context,
-                    disp_era,
-                    exclude_virtual=False,
                 )
-
-                if disp_era is not None:
-                    disp_supplier_contract = disp_era.imp_supplier_contract
-                    disp_vb_function = contract_func(
-                        report_context, disp_supplier_contract, "displaced_virtual_bill"
+                exp_vb_function = contract_func(
+                    report_context, exp_supplier_contract, "virtual_bill"
+                )
+                if exp_vb_function is None:
+                    raise Exception(
+                        "Can't find the export_virtual_bill function in the "
+                        "supplier contract. "
                     )
-                    if disp_vb_function is None:
-                        raise Exception(
-                            f"The supplier contract {disp_supplier_contract} "
-                            "doesn't have the displaced_virtual_bill() function."
-                        )
-                    disp_vb_function(site_ds)
-                    disp_supplier_bill = site_ds.supplier_bill
+                else:
+                    exp_vb_function(exp_supply_ds)
+                    v_bill = exp_supply_ds.supplier_bill
+
+                    if "problem" in v_bill and len(v_bill["problem"]) > 0:
+                        raise Exception(f"Export supplier Problem: {v_bill['problem']}")
 
                     try:
-                        vals["displaced"]["gbp"] += disp_supplier_bill["net-gbp"]
-                    except KeyError:
-                        disp_supplier_bill["problem"] += (
-                            f"For the supply {site_ds.mpan_core} the virtual bill "
-                            f"{disp_supplier_bill} from the contract "
-                            f"{disp_supplier_contract} does not contain the net-gbp "
-                            f"key."
+                        vals["exp_grid"]["net_gbp"] += v_bill["net-gbp"]
+                        if "triad-gbp" in v_bill:
+                            vals["exp_grid"]["triad_gbp"] += v_bill["triad-gbp"]
+                        if "duos-red-gbp" in v_bill:
+                            vals["exp_grid"]["red_duos_gbp"] += v_bill["duos-red-gbp"]
+                        vals["exp_grid"]["duos_gbp"] += sum(
+                            v
+                            for k, v in v_bill.items()
+                            if k.endswith("-gbp") and k.startswith("duos-")
+                        )
+                    except KeyError as e:
+                        raise Exception(
+                            f"For the era {era.id} the virtual bill {v_bill} from the "
+                            f"contract {supplier_contract} does not contain the key {e}"
                         )
-                    log(str(disp_supplier_bill))
-                    if "triad-gbp" in disp_supplier_bill:
-                        vals["displaced"]["triad_gbp"] += disp_supplier_bill[
-                            "triad-gbp"
-                        ]
-                    if "duos-red-gbp" in disp_supplier_bill:
-                        vals["displaced"]["red_duos_gbp"] += disp_supplier_bill[
-                            "duos-red-gbp"
-                        ]
-                    vals["displaced"]["duos_gbp"] += sum(
-                        v
-                        for k, v in disp_supplier_bill.items()
-                        if k.endswith("-gbp") and k.startswith("duos-")
-                    )
 
-                for hh in site.hh_data(
-                    sess, month_start, month_finish, exclude_virtual=True
-                ):
-                    for cat in CATS:
-                        vals_cat = vals[cat]
-                        vals_cat["md_kw"] = max(vals_cat["md_kw"], hh[cat] * 2)
-                        vals_cat["kwh"] += float(hh[cat])
+        disp_era = displaced_era(
+            sess, report_context, site, month_start, month_finish, f_date
+        )
+        log("about to call sitesource")
+        site_ds = SiteSource(
+            sess,
+            site,
+            month_start,
+            month_finish,
+            f_date,
+            report_context,
+            disp_era,
+            exclude_virtual=False,
+        )
 
-            for quant in ("gbp", "triad_gbp", "duos_gbp", "red_duos_gbp"):
-                vals["used"][quant] += vals["imp_net"][quant] + vals["displaced"][quant]
+        if disp_era is not None:
+            disp_supplier_contract = disp_era.imp_supplier_contract
+            disp_vb_function = contract_func(
+                report_context, disp_supplier_contract, "displaced_virtual_bill"
+            )
+            if disp_vb_function is None:
+                raise Exception(
+                    f"The supplier contract {disp_supplier_contract} "
+                    "doesn't have the displaced_virtual_bill() function."
+                )
+            disp_vb_function(site_ds)
+            disp_supplier_bill = site_ds.supplier_bill
+
+            try:
+                vals["displaced"]["net_gbp"] += disp_supplier_bill["net-gbp"]
+            except KeyError:
+                disp_supplier_bill["problem"] += (
+                    f"For the supply {site_ds.mpan_core} the virtual bill "
+                    f"{disp_supplier_bill} from the contract {disp_supplier_contract} "
+                    f"does not contain the net-gbp key."
+                )
+            log(str(disp_supplier_bill))
+            if "triad-gbp" in disp_supplier_bill:
+                vals["displaced"]["triad_gbp"] += disp_supplier_bill["triad-gbp"]
+            if "duos-red-gbp" in disp_supplier_bill:
+                vals["displaced"]["red_duos_gbp"] += disp_supplier_bill["duos-red-gbp"]
+            vals["displaced"]["duos_gbp"] += sum(
+                v
+                for k, v in disp_supplier_bill.items()
+                if k.endswith("-gbp") and k.startswith("duos-")
+            )
 
+        for hh in site.hh_data(sess, month_start, month_finish, exclude_virtual=True):
             for cat in CATS:
                 vals_cat = vals[cat]
-                if vals_cat["kwh"] > 0:
-                    vals_cat["p_per_kwh"] = vals_cat["gbp"] / vals_cat["kwh"] * 100
-                else:
-                    vals_cat["p_per_kwh"] = 0
-
-            FORMAT_LOOKUP = {
-                "kwh": "{:,.0f}",
-                "gbp": "{:,.2f}",
-                "p_per_kwh": "{:,.2f}",
-                "triad_gbp": "{:,.2f}",
-                "duos_gbp": "{:,.2f}",
-                "red_duos_gbp": "{:,.2f}",
-                "md_kw": "{:,.2f}",
-            }
-
-            for quant in QUANTS:
-                row = [quant]
-                fmt = FORMAT_LOOKUP[quant]
-                for cat in CATS:
-                    row.append(fmt.format(vals[cat][quant]))
-                jval["rows"].append(row)
+                vals_cat["md_kw"] = max(vals_cat["md_kw"], hh[cat] * 2)
+                vals_cat["kwh"] += float(hh[cat])
+
+        for quant in ("net_gbp", "triad_gbp", "duos_gbp", "red_duos_gbp"):
+            vals["used"][quant] += vals["imp_grid"][quant] + vals["displaced"][quant]
+
+        """
+        for cat in CATS:
+            vals_cat = vals[cat]
+            if vals_cat["kwh"] > 0:
+                vals_cat["p_per_kwh"] = vals_cat["gbp"] / vals_cat["kwh"] * 100
+            else:
+                vals_cat["p_per_kwh"] = 0
+        """
+
+        FORMAT_LOOKUP = {
+            "kwh": "{:,.0f}",
+            "net_gbp": "{:,.2f}",
+            "p_per_kwh": "{:,.2f}",
+            "triad_gbp": "{:,.2f}",
+            "duos_gbp": "{:,.2f}",
+            "red_duos_gbp": "{:,.2f}",
+            "md_kw": "{:,.2f}",
+        }
+
+        for quant in QUANTS:
+            row = [hh_format(month_start)[:7], quant]
+            fmt = FORMAT_LOOKUP[quant]
+            for cat in CATS:
+                row.append(fmt.format(vals[cat][quant]))
+            jval["rows"].append(row)
+
+
+def totals_runner(mem_id, site_id, start_date):
+    sess = None
+    titles = ["month", "quantity"]
+    titles.extend(CATS)
+    log_list = []
+
+    jval = {"titles": titles, "rows": [], "status": "running", "log": log_list}
+    try:
+        with Session() as sess:
+            site = Site.get_by_id(sess, site_id)
+
+            def log(msg):
+                return
+                log_list.append(msg)
+                put_mem_val(mem_id, jval)
+
+            if start_date is None:
+                now = ct_datetime_now()
+                start_year = now.year - 1
+                start_month = now.month
+            else:
+                start_year = start_date.year
+                start_month = start_date.month
+
+            _process(sess, log, start_year, start_month, mem_id, jval, site)
 
     except BaseException:
         msg = traceback.format_exc()

chellow/e/views.py

@@ -6,7 +6,6 @@ from datetime import datetime as Datetime
 from decimal import Decimal
 from io import BytesIO, StringIO
 from itertools import chain, islice
-from random import random
 
 
 from dateutil.relativedelta import relativedelta
@@ -4156,16 +4155,10 @@ def em_totals(site_id):
     if "mem_id" in request.values:
         mem_id = req_int("mem_id")
         site_info = chellow.dloads.get_mem_val(mem_id)
-        random_number = random()
 
         status_code = 200 if site_info["status"] == "running" else 286
         return make_response(
-            render_template(
-                "em_totals.html",
-                site=site,
-                site_info=site_info,
-                random_number=random_number,
-            ),
+            render_template("em_totals.html", site=site, site_info=site_info),
             status_code,
         )
 

chellow/templates/e/em_totals.html

@@ -2,6 +2,12 @@
 	<div
 			hx-get="/e/sites/{{site.id}}/energy_management/totals?mem_id={{mem_id}}"
 		 	hx-trigger="every 3s">
+		<label>
+			Calculating:
+			<progress value="0" max="12">
+				0 months
+			</progress>
+		</label>
   </div>
 {% elif site_info.status == 'running' %}
 	<label>
@@ -11,6 +17,11 @@
 		</progress>
 	</label>
 {% else %}
+	{% if site_info['problem']|length > 0 %}
+		<pre>
+			{{site_info['problem']}}
+		</pre>
+	{% endif %}
   <table>
 		<caption>Last 12 months</caption>
 		<thead>
@@ -30,4 +41,12 @@
 			{% endfor %}
 		</tbody>
 	</table>
+
+	<h3>Log</h3>
+
+	<ul>
+		{% for line in site_info.log %}
+			<li>>{{line}}</li>
+		{% endfor %}
+	</ul>
 {% endif %}

{chellow-1754570085.0.0.dist-info → chellow-1754580326.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1754570085.0.0
+Version: 1754580326.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-1754570085.0.0.dist-info → chellow-1754580326.0.0.dist-info}/RECORD

@@ -25,7 +25,7 @@ chellow/e/computer.py,sha256=lt4Zlr8EOClL1acuuvKA-tNPCI5RRHnAZbsaGQnB9j4,68835
 chellow/e/dno_rate_parser.py,sha256=EO3uIYD0uiT8uumI5wnODMsFwYGrdB5HexuOu-2aFkw,21875
 chellow/e/duos.py,sha256=RHrn93I1ASO2uYkuF18qlhG4p-jpuJhd_g3o69wtP4U,31004
 chellow/e/elexon.py,sha256=eOmX_wpxj6Ty6eaEgGAgXX-MgyJkYQSAT6DtJeP1rUE,5544
-chellow/e/energy_management.py,sha256=aXC2qlGt3FAODlNl_frWzVYAQrJLP8FFOiNX3m-QE_Y,12388
+chellow/e/energy_management.py,sha256=tRQJ-7_caG91oKnh5qIuK9qE_Nr3BmZ3ddaj5GTHIKQ,10487
 chellow/e/hh_importer.py,sha256=JBVCNSpM-DMu9_io516KojvujwZEQq6upDSsMbtu_sI,21511
 chellow/e/hh_parser_bg_csv.py,sha256=W5SU2MSpa8BGA0VJw1JXF-IwbCNLFy8fe35yxLZ7gEw,2453
 chellow/e/hh_parser_df2.py,sha256=nZT198EZWo_G26IfJZncI_kOo-UdsXzFYDmDf3qyEs8,5089
@@ -44,7 +44,7 @@ chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,623
 chellow/e/tlms.py,sha256=pyL32hPiYd09FbpXVMnBjHsWFEQHs-Az945V7EShGiY,9116
 chellow/e/tnuos.py,sha256=NBmc-f3oezrl4gviAKobljHfICTpBKxxxEGBGJi_lRk,4927
 chellow/e/triad.py,sha256=uQIngSrz8irBXQ0Rp_s8nAUzu-y2Ms7aj4B38_Ff8y8,13720
-chellow/e/views.py,sha256=7nvH0D3Q1Q1bmTtPTzHKmMt8uNnhhF9GYHWRxZIBWT0,220622
+chellow/e/views.py,sha256=lHE1MAfVmv_4U8Yikirduf_DeDky8KAhbzSMReJLz7I,220455
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=opjXRrqrgBTbSKzL0JfTLP0fnz3DL3oRZZ4P0DifQ3I,4119
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
@@ -228,7 +228,7 @@ chellow/templates/e/elexon.html,sha256=QW2EKdTMBTIzUkiXpYIHVZidZHNca3GmyiwWKaWkv
 chellow/templates/e/em_hh_data.html,sha256=2Ndvpo2ngO2dOpEZa05-6xRCy3IKNkWHJwW6sVjhhWY,2032
 chellow/templates/e/em_months.html,sha256=_WdOxiQ8dMEke1_nmD2yglY2zYzMx0AsaQgOw_6kDk8,6657
 chellow/templates/e/em_site.html,sha256=vbax2Je_DNCSWNDM0XLuvegRXNlDs71Vf4l07LCABSE,3066
-chellow/templates/e/em_totals.html,sha256=D_H12qF6b8heVeSGzcl4u7xRvtPLUtM1zWYrwEFRFTM,678
+chellow/templates/e/em_totals.html,sha256=pg8XmCGj-40hLCuJ3pfjNUGFteXe_xUgp7w2A5-oPtE,976
 chellow/templates/e/energisation_status.html,sha256=hvD1qMpLYjmWWGIrv-5Ko3KbRL3a6MdQXcO3Fr4_cHA,478
 chellow/templates/e/energisation_statuses.html,sha256=qwRIH7jqKA1MgajsWOeZAH89iRpOfsNW_fAqXymUQ3E,587
 chellow/templates/e/era_edit.html,sha256=MoJ7yS8BWGz7ptqxDPpBio0cnYDYDOoa4jNcpz4NAbk,4094
@@ -385,6 +385,6 @@ chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1
 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-1754570085.0.0.dist-info/METADATA,sha256=cT0SgunJ0IL9NYi6VfbeqKP9zv6wvOrvhIOCz3t7v6U,12519
-chellow-1754570085.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1754570085.0.0.dist-info/RECORD,,
+chellow-1754580326.0.0.dist-info/METADATA,sha256=EbhUmrch9GYbSCjoziMmbow40xhY8rApLwP0V-TDTqw,12519
+chellow-1754580326.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1754580326.0.0.dist-info/RECORD,,