chellow 1737970902.0.0__py3-none-any.whl → 1738075773.0.0__py3-none-any.whl

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/reports/report_247.py

@@ -772,7 +772,7 @@ def content(scenario_props, base_name, user_id, compression, now):
             else:
                 forecast_from = to_utc(forecast_from)
 
-            sites = sess.query(Site).distinct().order_by(Site.code)
+            base_site_set = set()
 
             mpan_cores = scenario_props.get("mpan_cores")
             supply_ids = None
@@ -788,12 +788,14 @@ def content(scenario_props, base_name, user_id, compression, now):
                 else:
                     base_name.append("mpan_cores")
 
-                sites = (
-                    sites.join(SiteEra)
+                for site in sess.scalars(
+                    select(Site)
+                    .join(SiteEra)
                     .join(Era)
                     .join(Supply)
                     .where(Supply.id.in_(supply_ids))
-                )
+                ):
+                    base_site_set.add(site.id)
 
             site_codes = scenario_props.get("site_codes")
             if site_codes is not None:
@@ -802,7 +804,10 @@ def content(scenario_props, base_name, user_id, compression, now):
                     base_name.append(site_codes[0])
                 else:
                     base_name.append("sitecodes")
-                sites = sites.where(Site.code.in_(site_codes))
+
+                for site_code in site_codes:
+                    site = Site.get_by_code(sess, site_code)
+                    base_site_set.add(site.id)
 
             user = User.get_by_id(sess, user_id)
 
@@ -969,7 +974,6 @@ def content(scenario_props, base_name, user_id, compression, now):
             site_rows.append(site_header_titles + summary_titles)
             era_rows.append(era_titles)
 
-            sites = sites.all()
             normal_reads = set()
 
             for month_start, month_finish in month_pairs:
@@ -980,7 +984,40 @@ def content(scenario_props, base_name, user_id, compression, now):
                 else:
                     data_source_bill = None
                 org_month_data = defaultdict(int)
-                for site in sites:
+
+                if len(base_site_set) > 0:
+                    site_set = base_site_set
+                else:
+                    site_set = set()
+                    for site in sess.scalars(
+                        select(Site)
+                        .join(SiteEra)
+                        .join(Era)
+                        .where(
+                            Era.start_date <= month_finish,
+                            or_(
+                                Era.finish_date == null(),
+                                Era.finish_date >= month_start,
+                            ),
+                        )
+                    ):
+                        site_set.add(site.id)
+                    for site in sess.scalars(
+                        select(Site)
+                        .join(SiteEra)
+                        .join(Era)
+                        .join(Supply)
+                        .join(Bill)
+                        .where(
+                            Bill.start_date <= month_finish,
+                            Bill.finish_date >= month_start,
+                        )
+                    ):
+                        site_set.add(site.id)
+
+                for site in sess.scalars(
+                    select(Site).where(Site.id.in_(site_set)).order_by(Site.code)
+                ):
                     if by_hh:
                         sf = [
                             (d, d)

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-1737970902.0.0.dist-info → chellow-1738075773.0.0.dist-info}/METADATA

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

@@ -72,7 +72,7 @@ chellow/gas/cv.py,sha256=4cdYYQ8Qak6NeYdBCB4YaQ0jX8-UkaydIIdibCQuXxM,7344
 chellow/gas/dn_rate_parser.py,sha256=Mq8rAcUEUxIQOks59bsCKl8GrefvoHbrTCHqon9N0z0,11340
 chellow/gas/engine.py,sha256=d2rR1y8b3u2QhmfqyFwwLu_loeZxY_3WwwtDyGJfam0,25282
 chellow/gas/transportation.py,sha256=Bkg8TWOs-v0ES-4qqwbleiOhqbE_t2KauUx9JYMZELM,5300
-chellow/gas/views.py,sha256=1_bPHA6i0BlQmQ6YhQaGSMnIm-81dO3ksHW5uL2n2NE,59003
+chellow/gas/views.py,sha256=7ObrqTR-z6cRGpBcilUroSKL9C0hGfOo4GcCnGhBuYU,59737
 chellow/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/reports/report_109.py,sha256=Exb-FQ5f70-ier_h15CgHGysQ7vJ7k3gFZ1001zM3iM,11171
 chellow/reports/report_111.py,sha256=o_wWyrtmxpTnmT9DVlsG5h5wdm3JqojirRlx_7W5_kQ,28787
@@ -84,7 +84,7 @@ chellow/reports/report_219.py,sha256=3Zs16ka6dWWY_lCDoA-ZFrlPb4vHk1LQoa2yrlTMntA
 chellow/reports/report_231.py,sha256=WARLztV2HzBFSi5_xvY_DTXVyuBBbBYiU0RazfjKw-Y,5270
 chellow/reports/report_233.py,sha256=qJdPFuBgQAWD24BsljgGJ44L_RGdHOA1RqsxGjTWhFc,4975
 chellow/reports/report_241.py,sha256=lfivElRkV_CZAhck0rxAuhqzgponj3aWwmwGMNQvUxg,5343
-chellow/reports/report_247.py,sha256=Hhhk0XcDdS3SaA-BJxw6BtN7mOhdKjBdtBNV7zqqaAI,44509
+chellow/reports/report_247.py,sha256=A74EfUihmV4Pa3NyrJfkf28HJn61Ai4wN694ETfbO4Q,45894
 chellow/reports/report_29.py,sha256=ZXnq6Kg5on-IPquUsH4bn46mBVESY_WhwqDWZPXOJwo,2695
 chellow/reports/report_291.py,sha256=BnWtxe0eWN2QKKWpwjs5-RI5LbReBKL119QbkrkNhV8,7478
 chellow/reports/report_33.py,sha256=lt1EN_LNx6u-AgdaS3YRkPMZA33JgMcELolHF4oJUMw,16689
@@ -364,7 +364,7 @@ chellow/templates/g/reports.html,sha256=u3i8fKSdMYxRUAjBF31OhqHnK82WyOMyl_6X2at6
 chellow/templates/g/supplier_contract.html,sha256=SutQmo9VhqpjWIA6IuloAEzq54u9ng-f4b3wOzY2Enc,2144
 chellow/templates/g/supplier_contract_add.html,sha256=jLE-CwZ3Dt8hIkAGJ53hyjzIJPIeBkvNqQ5uMe9tSf0,656
 chellow/templates/g/supplier_contract_edit.html,sha256=p_IL0cKT9s-lV2W1kTZp9U1b7QdXzIiTsaVuVh4rztA,1119
-chellow/templates/g/supplier_contracts.html,sha256=GGS47UblUNZA5dPvvjE5SDPbFFfUCQzzHWN4X3_lvZM,710
+chellow/templates/g/supplier_contracts.html,sha256=Xzr0BRs92NT7haPXOgSS0zdw5trLdSrbv1pPqJMi6X8,1176
 chellow/templates/g/supplier_rate_script.html,sha256=e4dwskWTQcLv6qyX150VUeuaUvE4NuMWd27Zus6fHZ8,1283
 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
@@ -376,6 +376,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-1737970902.0.0.dist-info/METADATA,sha256=-PX-L_InK77KEH_JUnv2jKfvvmY1VKsDdHOZsJWuj5Y,12204
-chellow-1737970902.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1737970902.0.0.dist-info/RECORD,,
+chellow-1738075773.0.0.dist-info/METADATA,sha256=aGKA0SwgygLVeXzxGpu6ckA2rnsJ-HFnrizVUUw8IbI,12204
+chellow-1738075773.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1738075773.0.0.dist-info/RECORD,,