chellow 1737990669.0.0__tar.gz → 1738660675.0.0__tar.gz

{chellow-1737990669.0.0 → chellow-1738660675.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1737990669.0.0
+Version: 1738660675.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-1738660675.0.0/VERSION

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

{chellow-1737990669.0.0 → chellow-1738660675.0.0}/chellow/gas/views.py

@@ -18,8 +18,8 @@ from flask import (
     request,
 )
 
-from sqlalchemy import false, func, select, text, true
-from sqlalchemy.orm import joinedload
+from sqlalchemy import false, func, null, select, text, true
+from sqlalchemy.orm import aliased, joinedload
 
 
 from werkzeug.exceptions import BadRequest
@@ -1547,12 +1547,38 @@ def batch_csv_get(g_batch_id):
 
 @gas.route("/supplier_contracts")
 def supplier_contracts_get():
-    contracts = g.sess.execute(
+    GRateScriptAliasFinish = aliased(GRateScript)
+
+    current_contracts = g.sess.scalars(
         select(GContract)
-        .where(GContract.is_industry == false())
+        .join(
+            GRateScriptAliasFinish,
+            GContract.finish_g_rate_script_id == GRateScriptAliasFinish.id,
+        )
+        .where(
+            GContract.is_industry == false(),
+            GRateScriptAliasFinish.finish_date == null(),
+        )
         .order_by(GContract.name)
-    ).scalars()
-    return render_template("supplier_contracts.html", contracts=contracts)
+    )
+    ended_contracts = g.sess.scalars(
+        select(GContract)
+        .join(
+            GRateScriptAliasFinish,
+            GContract.finish_g_rate_script_id == GRateScriptAliasFinish.id,
+        )
+        .where(
+            GContract.is_industry == false(),
+            GRateScriptAliasFinish.finish_date != null(),
+        )
+        .order_by(GContract.name)
+    )
+
+    return render_template(
+        "supplier_contracts.html",
+        current_contracts=current_contracts,
+        ended_contracts=ended_contracts,
+    )
 
 
 @gas.route("/supplier_contracts/<int:contract_id>")

{chellow-1737990669.0.0 → chellow-1738660675.0.0}/chellow/reports/report_247.py

@@ -629,15 +629,16 @@ def _process_site(
                         "displaced",
                         "used",
                         "used-3rd-party",
-                        "billed-export",
                     ):
                         for sname in ("kwh", "net-gbp"):
                             month_data[f"{name}-{sname}"] = 0
                     month_data["billed-import-kwh"] = 0
+                    month_data["billed-export-kwh"] = 0
                     month_data["import-grid-kwh"] = 0
                     month_data["export-grid-kwh"] = 0
                     for suf in ("net-gbp", "vat-gbp", "gross-gbp"):
                         month_data[f"billed-import-{suf}"] = 0
+                        month_data[f"billed-export-{suf}"] = 0
                         month_data[f"import-grid-{suf}"] = 0
                         month_data[f"export-grid-{suf}"] = 0
                         month_data[f"billed-supplier-import-{suf}"] = 0

{chellow-1737990669.0.0 → chellow-1738660675.0.0}/chellow/templates/g/supplier_contracts.html

@@ -11,6 +11,29 @@
 {% block content %}
 
 	<table>
+		<caption>Current Contracts</caption>
+		<thead>
+			<tr>
+				<th>Name</th>
+				<th>Start Date</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for g_contract in current_contracts %}
+				<tr>
+					<td>
+						<a href="/g/supplier_contracts/{{g_contract.id}}">{{g_contract.name}}</a>
+					</td>
+					<td>
+						{{g_contract.start_g_rate_script.start_date|hh_format}}
+					</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+
+	<table>
+		<caption>Ended Contracts</caption>
 		<thead>
 			<tr>
 				<th>Name</th>
@@ -19,7 +42,7 @@
 			</tr>
 		</thead>
 		<tbody>
-			{% for g_contract in contracts %}
+			{% for g_contract in ended_contracts %}
 				<tr>
 					<td>
 						<a href="/g/supplier_contracts/{{g_contract.id}}">{{g_contract.name}}</a>
@@ -34,5 +57,4 @@
 			{% endfor %}
 		</tbody>
 	</table>
-
 {% endblock %}

chellow-1737990669.0.0/VERSION

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