chellow 1678873939.0.0__py3-none-any.whl → 1678964984.0.0__py3-none-any.whl

chellow/templates/g/batch.html

@@ -16,7 +16,7 @@
 {% endblock %}
 
 {% block content %}
-	<table>
+	<table class="sticky">
 		<tr>
 			<th>Reference</th>
 			<td>{{g_batch.reference}}</td>

chellow/templates/rate_server.html

@@ -54,6 +54,7 @@
 		<h4 id="latest">Latest Imported Files</h4>
 
 		<table>
+			<caption>Electricity</caption>
 			<tbody>
 				<tr>
 					<th>MDD Version</th>
@@ -98,6 +99,78 @@
 						</table>
 					</td>
 				</tr>
+				<tr>
+					<th>TNUoS Spreadsheet</th>
+					<td>
+						<table>
+							<thead>
+								<tr>
+									<th>Start Date</th>
+									<th>File Name</th>
+								</tr>
+							</thead>
+							<tbody>
+								{% for rs in tnuos_rs %}
+									{% set script = rs.make_script() %}
+									<tr>
+										<td>{{rs.start_date|hh_format}}</td>
+										<td>{{script.a_file_name}}</td>
+									</tr>
+								{% endfor %}
+							</tbody>
+						</table>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+
+		<table>
+			<caption>Gas</caption>
+			<tbody>
+				<tr>
+					<th>NTS Spreadsheet</th>
+					<td>
+						<table>
+							<thead>
+								<tr>
+									<th>Start Date</th>
+									<th>File Name</th>
+								</tr>
+							</thead>
+							<tbody>
+								{% for rs in nts_rs %}
+									{% set script = rs.make_script() %}
+									<tr>
+										<td>{{rs.start_date|hh_format}}</td>
+										<td>{{script.a_file_name}}</td>
+									</tr>
+								{% endfor %}
+							</tbody>
+						</table>
+					</td>
+				</tr>
+				<tr>
+					<th>DN Spreadsheet</th>
+					<td>
+						<table>
+							<thead>
+								<tr>
+									<th>Start Date</th>
+									<th>File Name</th>
+								</tr>
+							</thead>
+							<tbody>
+								{% for rs in dn_rs %}
+									{% set script = rs.make_script() %}
+									<tr>
+										<td>{{rs.start_date|hh_format}}</td>
+										<td>{{script.a_file_name}}</td>
+									</tr>
+								{% endfor %}
+							</tbody>
+						</table>
+					</td>
+				</tr>
 			</tbody>
 		</table>
 

chellow/views.py

@@ -78,6 +78,7 @@ from chellow.models import (
     GContract,
     GEra,
     GExitZone,
+    GRateScript,
     GReadingFrequency,
     GUnit,
     GeneratorType,
@@ -2129,7 +2130,7 @@ def rate_server_get():
     config = Contract.get_non_core_by_name(g.sess, "configuration")
     props = config.make_properties()
     now_ct = ct_datetime_now()
-    fy_year = now_ct.year if now_ct.year > 3 else now_ct.year - 1
+    fy_year = now_ct.year if now_ct.month > 3 else now_ct.year - 1
     fy_start = to_utc(ct_datetime(fy_year, 4, 1))
     dno_rs = g.sess.execute(
         select(RateScript)
@@ -2138,6 +2139,37 @@ def rate_server_get():
         .where(MarketRole.code == "R", RateScript.start_date >= fy_start)
         .order_by(Contract.name, RateScript.start_date.desc())
     ).scalars()
+    tnuos_rs = g.sess.execute(
+        select(RateScript)
+        .join(RateScript.contract)
+        .join(MarketRole)
+        .where(
+            MarketRole.code == "Z",
+            RateScript.start_date >= fy_start,
+            Contract.name == "tnuos",
+        )
+        .order_by(RateScript.start_date.desc())
+    ).scalars()
+    nts_rs = g.sess.execute(
+        select(GRateScript)
+        .join(GRateScript.g_contract)
+        .where(
+            GContract.is_industry == true(),
+            GRateScript.start_date >= fy_start,
+            GContract.name == "nts_commodity",
+        )
+        .order_by(GRateScript.start_date.desc())
+    ).scalars()
+    dn_rs = g.sess.execute(
+        select(GRateScript)
+        .join(GRateScript.g_contract)
+        .where(
+            GContract.is_industry == true(),
+            GRateScript.start_date >= fy_start,
+            GContract.name == "dn",
+        )
+        .order_by(GRateScript.start_date.desc())
+    ).scalars()
 
     return render_template(
         "rate_server.html",
@@ -2145,6 +2177,9 @@ def rate_server_get():
         config_state=config.make_state(),
         config_properties=props.get("rate_server", {}),
         dno_rs=dno_rs,
+        tnuos_rs=tnuos_rs,
+        nts_rs=nts_rs,
+        dn_rs=dn_rs,
     )
 
 

{chellow-1678873939.0.0.dist-info → chellow-1678964984.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1678873939.0.0
+Version: 1678964984.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-1678873939.0.0.dist-info → chellow-1678964984.0.0.dist-info}/RECORD

@@ -10,7 +10,7 @@ chellow/proxy.py,sha256=Mzssi9nTf6s_G4RSn8k5oAHqzVYIxMsfbudj1amYucI,1387
 chellow/rate_server.py,sha256=Ur9iT9InmUuGVSUZuuy3gQJcTbsTD4ZgvN0yhn6wRjY,4226
 chellow/testing.py,sha256=rFkic1tj6IQ_QGctfpi-9qNle5WnshUX720ZGOSaoNQ,3915
 chellow/utils.py,sha256=IHC4Pcd_9CRbmJXAOlDvTyAcUoaWeLSH37zgjqVYYl4,18981
-chellow/views.py,sha256=7THhdijzXuXH1i8QZA9SXhaVJMpyn1Irg3vFfeyBw4Q,80910
+chellow/views.py,sha256=3RddLzrWoP1MR9vhOFikNkuLSSe9FGP4xRaaQZakqdM,81969
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=DUrYAlrn4jzf6y6C2wivxlFosdVIibG69BWy_KMekGM,706
 chellow/e/bill_importer.py,sha256=OhZKRB8G001Mj14TILgSJMRobGI7KDazFYepgSgKlK8,7069
@@ -122,7 +122,7 @@ chellow/templates/non_core_rate_script.html,sha256=CqGnuWdzhk_o_2xNFcF8rgk0p7SNh
 chellow/templates/non_core_rate_script_add.html,sha256=Qx8_cYFRQZrXSyR3uf_8OxUAUz3PqyYc4V11lTU18sE,690
 chellow/templates/non_core_rate_script_edit.html,sha256=14jFqalqmFg9_2LUlEy7Q4yUx4pVGTHc9fbYnpm-3Y8,1868
 chellow/templates/object_summary.html,sha256=VGCAAYcWTzgNfL0mxEef2Fa8dP3FcBhzj0fmF82_S4I,244
-chellow/templates/rate_server.html,sha256=l3VhIRasadVS5zP0cz3QZQzkso4pZrr7llWymbbJZAI,2504
+chellow/templates/rate_server.html,sha256=LWlaDc-x0rGqgOTYMOc_JQG9lNTRY_fx3vlsFIB_jvI,3991
 chellow/templates/report_run.html,sha256=O_wjIu43S-mKVyZyku3dJJdvyck3rAgEdhw59TsCcK0,4040
 chellow/templates/report_run_asset_comparison.html,sha256=VYCCUmIC7Mfe7uuaAHb6ihiK6zsqeTlQbzgtzLqR3zg,2305
 chellow/templates/report_run_bill_check.html,sha256=eL9XiZwmeXerO1Q6YWJdKtu4ELp5GojwIg1eVT_HZvc,6330
@@ -304,7 +304,7 @@ chellow/templates/e/supply_post.html,sha256=o4BBLCtazj-AMCieclBDHNk2jN1G1N9MABXL
 chellow/templates/e/supply_virtual_bill.html,sha256=fAexhs9brfZ_hMb52uMqSQRe8lHMde7qi0GGKav0Tq0,1239
 chellow/templates/e/tpr.html,sha256=cdUan1kf9dc3Gg0SrvarMrEj986_D3XnKtXNVQeG1TQ,1452
 chellow/templates/e/tprs.html,sha256=jk1jm8CTcO3zYOOZFu9XOOLSG_ZFAgblReh-Di-bkug,258
-chellow/templates/g/batch.html,sha256=0o6S51chVWGUNSFb3wPuXG1WmTrTsuHkzlfw3e-uOAA,3487
+chellow/templates/g/batch.html,sha256=IC29PozsT45bfqkXdqrzWshTuh8wvkLY3-X6C2-2hWU,3502
 chellow/templates/g/batch_add.html,sha256=WEK6NAvxsRd0gmJOqYSBS5ehZKVahbX49uiHAoyCwhg,1035
 chellow/templates/g/batch_edit.html,sha256=-ec5u4-2bfHuL4r5IXq0lCqJBeAJNusDYVzUwqyb6R4,2132
 chellow/templates/g/batches.html,sha256=mnzLroYfhwvL5gFK1PNtI-vS7GcDtcggNd0E15Shtfw,730
@@ -348,6 +348,6 @@ chellow/templates/g/supply_note_edit.html,sha256=6UQf_qbhFDys3cVsTp-c7ABWZpggW9R
 chellow/templates/g/supply_notes.html,sha256=WR3YwGh_qqTklSJ7JqWX6BKBc9rk_jMff4RiWZiF2CM,936
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1678873939.0.0.dist-info/METADATA,sha256=rDaGMH8sKq7Z1ikf14MuiR1MOb342_GFO7vdy3BKT64,12132
-chellow-1678873939.0.0.dist-info/WHEEL,sha256=Fd6mP6ydyRguakwUJ05oBE7fh2IPxgtDN9IwHJ9OqJQ,87
-chellow-1678873939.0.0.dist-info/RECORD,,
+chellow-1678964984.0.0.dist-info/METADATA,sha256=4tDZvwo8URVeGIbuC8KMIq1QZ9DXL7p4rH9ybfeA1vo,12132
+chellow-1678964984.0.0.dist-info/WHEEL,sha256=Fd6mP6ydyRguakwUJ05oBE7fh2IPxgtDN9IwHJ9OqJQ,87
+chellow-1678964984.0.0.dist-info/RECORD,,