chellow 1723718933.0.0__tar.gz → 1724062841.0.0__tar.gz

{chellow-1723718933.0.0 → chellow-1724062841.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1723718933.0.0
+Version: 1724062841.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-1724062841.0.0/VERSION

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

{chellow-1723718933.0.0 → chellow-1724062841.0.0}/chellow/e/views.py

@@ -37,6 +37,7 @@ from chellow.models import (
     BatchFile,
     Bill,
     BillType,
+    CHANNEL_TYPES,
     Channel,
     ClockInterval,
     Comm,
@@ -193,13 +194,25 @@ def csv_bills_get():
 
 @e.route("/eras/<int:era_id>/add_channel")
 def channel_add_get(era_id):
+    channel_sets = {True: set(CHANNEL_TYPES), False: set(CHANNEL_TYPES)}
     era = Era.get_by_id(g.sess, era_id)
-    channels = (
-        g.sess.query(Channel)
-        .filter(Channel.era == era)
+    channels = g.sess.scalars(
+        select(Channel)
+        .where(Channel.era == era)
         .order_by(Channel.imp_related, Channel.channel_type)
+    ).all()
+    for channel in channels:
+        channel_sets[channel.imp_related].remove(channel.channel_type)
+    add_channels = [
+        {"imp_related": imp_related, "channel_type": channel_type}
+        for imp_related, channel_set in channel_sets.items()
+        for channel_type in CHANNEL_TYPES
+        if channel_type in channel_set
+    ]
+
+    return render_template(
+        "channel_add.html", era=era, channels=channels, add_channels=add_channels
     )
-    return render_template("channel_add.html", era=era, channels=channels)
 
 
 @e.route("/eras/<int:era_id>/add_channel", methods=["POST"])

{chellow-1723718933.0.0 → chellow-1724062841.0.0}/chellow/reports/report_59.py

@@ -152,7 +152,7 @@ def _process_site(
             for xname in ("kwh", "net-gbp"):
                 vals[f"{sname}-{xname}"] = 0
         for suf in ("kwh", "net-gbp", "vat-gbp", "gross-gbp"):
-            vals[f"billed-import-grid-{suf}"] = 0
+            vals[f"billed-import-{suf}"] = 0
 
         if imp_mpan_core == "displaced":
             try:
@@ -173,15 +173,15 @@ def _process_site(
                     },
                 )
 
-            vals["billed-supplier-import-grid-net-gbp"] = None
-            vals["billed-supplier-import-grid-vat-gbp"] = None
-            vals["billed-supplier-import-grid-gross-gbp"] = None
-            vals["billed-dc-import-grid-net-gbp"] = None
-            vals["billed-dc-import-grid-vat-gbp"] = None
-            vals["billed-dc-import-grid-gross-gbp"] = None
-            vals["billed-mop-import-grid-net-gbp"] = None
-            vals["billed-mop-import-grid-vat-gbp"] = None
-            vals["billed-mop-import-grid-gross-gbp"] = None
+            vals["billed-import-supplier-net-gbp"] = None
+            vals["billed-import-supplier-vat-gbp"] = None
+            vals["billed-import-supplier-gross-gbp"] = None
+            vals["billed-import-dc-net-gbp"] = None
+            vals["billed-import-dc-vat-gbp"] = None
+            vals["billed-import-dc-gross-gbp"] = None
+            vals["billed-import-mop-net-gbp"] = None
+            vals["billed-import-mop-vat-gbp"] = None
+            vals["billed-import-mop-gross-gbp"] = None
 
             vals["used-kwh"] = vals["displaced-kwh"] = sum(
                 hh["msp-kwh"] for hh in imp_ss.hh_data
@@ -225,9 +225,9 @@ def _process_site(
             site_sources.add(source_code)
 
             for suf in ("net-gbp", "vat-gbp", "gross-gbp"):
-                vals["billed-supplier-import-grid-{suf}"] = 0
-                vals["billed-dc-import-grid-{suf}"] = 0
-                vals["billed-mop-import-grid-{suf}"] = 0
+                vals[f"billed-import-supplier-{suf}"] = 0
+                vals[f"billed-import-dc-{suf}"] = 0
+                vals[f"billed-import-mop-{suf}"] = 0
 
             if imp_ss is None:
                 imp_bad_hhs = imp_bad_kwh = imp_supplier_contract_name = None
@@ -399,13 +399,13 @@ def _process_site(
                     min(bill_finish, sss.finish_date) - max(bill_start, sss.start_date)
                 ).total_seconds() + (30 * 60)
                 proportion = overlap_duration / bill_duration
-                vals["billed-import-grid-kwh"] += proportion * float(bill.kwh)
+                vals["billed-import-kwh"] += proportion * float(bill.kwh)
                 bill_prop_net_gbp = proportion * float(bill.net)
                 bill_prop_vat_gbp = proportion * float(bill.vat)
                 bill_prop_gross_gbp = proportion * float(bill.gross)
-                vals["billed-import-grid-net-gbp"] += bill_prop_net_gbp
-                vals["billed-import-grid-vat-gbp"] += bill_prop_vat_gbp
-                vals["billed-import-grid-gross-gbp"] += bill_prop_gross_gbp
+                vals["billed-import-net-gbp"] += bill_prop_net_gbp
+                vals["billed-import-vat-gbp"] += bill_prop_vat_gbp
+                vals["billed-import-gross-gbp"] += bill_prop_gross_gbp
                 if bill_role_code == "X":
                     role_name = "supplier"
                 elif bill_role_code == "C":
@@ -415,9 +415,9 @@ def _process_site(
                 else:
                     raise BadRequest("Role code not recognized.")
 
-                vals[f"billed-{role_name}-import-grid-net-gbp"] += bill_prop_net_gbp
-                vals[f"billed-{role_name}-import-grid-vat-gbp"] += bill_prop_vat_gbp
-                vals[f"billed-{role_name}-import-grid-gross-gbp"] += bill_prop_gross_gbp
+                vals[f"billed-import-{role_name}-net-gbp"] += bill_prop_net_gbp
+                vals[f"billed-import-{role_name}-vat-gbp"] += bill_prop_vat_gbp
+                vals[f"billed-import-{role_name}-gross-gbp"] += bill_prop_gross_gbp
 
             vals["imp-mpan-core"] = imp_mpan_core
             vals["exp-mpan-core"] = exp_mpan_core
@@ -555,10 +555,10 @@ def _process_site(
                         for sname in ("kwh", "net-gbp"):
                             vals[f"{name}-{sname}"] = 0
                     for suf in ("kwh", "net-gbp", "vat-gbp", "gross-gbp"):
-                        vals[f"billed-import-grid-{suf}"] = 0
-                        vals[f"billed-supplier-import-grid-{suf}"] = 0
-                        vals[f"billed-dc-import-grid-{suf}"] = 0
-                        vals[f"billed-mop-import-grid-{suf}"] = 0
+                        vals[f"billed-import-{suf}"] = 0
+                        vals[f"billed-import-supplier-{suf}"] = 0
+                        vals[f"billed-import-dc-{suf}"] = 0
+                        vals[f"billed-import-mop-{suf}"] = 0
 
                     for bill in bills:
                         bill_role_code = bill.batch.contract.market_role.code
@@ -586,16 +586,12 @@ def _process_site(
                             raise BadRequest("Role code not recognized.")
 
                         for data in vals, site_data:
-                            data["billed-import-grid-kwh"] += bill_prop_kwh
-                            data["billed-import-grid-net-gbp"] += bill_prop_net_gbp
+                            data["billed-import-kwh"] += bill_prop_kwh
+                            data["billed-import-net-gbp"] += bill_prop_net_gbp
+                            data[f"billed-import-{key}-net-gbp"] += bill_prop_net_gbp
+                            data[f"billed-import-{key}-vat-gbp"] += bill_prop_vat_gbp
                             data[
-                                f"billed-{key}-import-grid-net-gbp"
-                            ] += bill_prop_net_gbp
-                            data[
-                                f"billed-{key}-import-grid-vat-gbp"
-                            ] += bill_prop_vat_gbp
-                            data[
-                                f"billed-{key}-import-grid-gross-gbp"
+                                f"billed-import-{key}-gross-gbp"
                             ] += bill_prop_gross_gbp
 
                     era_rows.append([make_val(vals.get(t)) for t in era_titles])
@@ -644,10 +640,10 @@ def _process_site(
                         for sname in ("kwh", "net-gbp"):
                             month_data[f"{name}-{sname}"] = 0
                     for suf in ("kwh", "net-gbp", "vat-gbp", "gross-gbp"):
-                        month_data["billed-import-grid-{suf}"],
-                        month_data["billed-supplier-import-grid-{suf}"] = 0
-                        month_data["billed-dc-import-grid-{suf}"] = 0
-                        month_data["billed-mop-import-grid-{suf}"] = 0
+                        month_data["billed-import-{suf}"],
+                        month_data["billed-import-supplier-{suf}"] = 0
+                        month_data["billed-import-dc-{suf}"] = 0
+                        month_data["billed-import-mop-{suf}"] = 0
 
                     for bill in bills:
                         bill_role_code = bill.batch.contract.market_role.code
@@ -675,17 +671,17 @@ def _process_site(
                             raise BadRequest("Role code not recognized.")
 
                         for data in month_data, site_data:
-                            data["billed-import-grid-kwh"] += bill_prop_kwh
-                            data["billed-import-grid-net-gbp"] += bill_prop_net_gbp
-                            data[f"billed-{role_name}-import-grid-kwh"] += bill_prop_kwh
+                            data["billed-import-kwh"] += bill_prop_kwh
+                            data["billed-import-net-gbp"] += bill_prop_net_gbp
+                            data[f"billed-import-{role_name}-kwh"] += bill_prop_kwh
                             data[
-                                f"billed-{role_name}-import-grid-net-gbp"
+                                f"billed-import-{role_name}-net-gbp"
                             ] += bill_prop_net_gbp
                             data[
-                                f"billed-{role_name}-import-grid-vat-gbp"
+                                f"billed-import-{role_name}-vat-gbp"
                             ] += bill_prop_vat_gbp
                             data[
-                                f"billed-{role_name}-import-grid-gross-gbp"
+                                f"billed-import-{role_name}-gross-gbp"
                             ] += bill_prop_gross_gbp
 
                     imp_supplier_contract = first_era.imp_supplier_contract
@@ -957,19 +953,19 @@ def content(
                 "displaced-net-gbp",
                 "used-net-gbp",
                 "used-3rd-party-net-gbp",
-                "billed-import-grid-kwh",
-                "billed-import-grid-net-gbp",
-                "billed-import-grid-vat-gbp",
-                "billed-import-grid-gross-gbp",
-                "billed-supplier-import-grid-net-gbp",
-                "billed-supplier-import-grid-vat-gbp",
-                "billed-supplier-import-grid-gross-gbp",
-                "billed-dc-import-grid-net-gbp",
-                "billed-dc-import-grid-vat-gbp",
-                "billed-dc-import-grid-gross-gbp",
-                "billed-mop-import-grid-net-gbp",
-                "billed-mop-import-grid-vat-gbp",
-                "billed-mop-import-grid-gross-gbp",
+                "billed-import-kwh",
+                "billed-import-net-gbp",
+                "billed-import-vat-gbp",
+                "billed-import-gross-gbp",
+                "billed-import-supplier-net-gbp",
+                "billed-import-supplier-vat-gbp",
+                "billed-import-supplier-gross-gbp",
+                "billed-import-dc-net-gbp",
+                "billed-import-dc-vat-gbp",
+                "billed-import-dc-gross-gbp",
+                "billed-import-mop-net-gbp",
+                "billed-import-mop-vat-gbp",
+                "billed-import-mop-gross-gbp",
             ]
 
             title_dict = {}

chellow-1724062841.0.0/chellow/templates/e/channel_add.html

@@ -0,0 +1,81 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Supplies » Supply {{era.supply.id}} Era {{era.start_date|hh_format}} » 
+ 	Add Channel
+{% endblock %}
+
+{% block nav %}
+	<a href="/supplies">Supplies</a> &raquo; 
+	<a href="/e/supplies/{{era.supply.id}}">Supply {{era.supply.id}} Era
+	{{era.start_date|hh_format}}</a> &raquo; 
+	Add Channel
+{% endblock %}
+
+{% block content %}
+
+	<table>
+		<caption>Existing Channels</caption>	
+		<thead>
+			<tr>
+				<th>View</th>
+				<th>Import / Export Related?</th>
+				<th>Type</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for channel in channels %}
+				<tr>
+					<td><a href="/e/channels/{{channel.id}}">View</a></td>
+					<td>
+						{% if channel.imp_related %}
+							Import
+						{% else %}
+							Export
+						{% endif %}
+					</td>
+					<td>
+						{{channel.channel_type}}
+					</td>
+				</tr>
+			{% endfor %}
+		<tbody>
+	</table>
+
+	<table>
+		<caption>Add Channels</caption>	
+		<thead>
+			<tr>
+				<th>Import / Export Related?</th>
+				<th>Type</th>
+				<th>Add</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for channel in add_channels %}
+				<tr>
+					<td>
+						{% if channel.imp_related %}
+							Import
+						{% else %}
+							Export
+						{% endif %}
+					</td>
+					<td>
+						{{channel.channel_type}}
+					</td>
+					<td>
+						<form action="/e/eras/{{era.id}}/add_channel" method="post">
+							<fieldset>
+								<input type="hidden" name="imp_related" value="{{channel.imp_related|lower}}">
+								<input type="hidden" name="channel_type" value="{{channel.channel_type}}">
+								<input type="submit" value="Add">
+							</fieldset>
+						</form>
+					</td>
+				</tr>
+			{% endfor %}
+		<tbody>
+	</table>
+
+{% endblock %}