chellow 1724416862.0.0__py3-none-any.whl → 1724751676.0.0__py3-none-any.whl

chellow/e/views.py

@@ -4012,7 +4012,8 @@ def site_energy_management_get(site_id):
     now = utc_datetime_now()
     last_month = now - relativedelta(months=1)
 
-    eras = g.sess.execute(
+    supply_dicts = []
+    for era in g.sess.scalars(
         select(Era)
         .join(SiteEra)
         .join(Supply)
@@ -4022,12 +4023,16 @@ def site_energy_management_get(site_id):
             Era.finish_date == null(),
             Party.dno_code != "88",
         )
-    ).scalars()
+    ):
+        first_era = g.sess.scalars(
+            select(Era).where(Era.supply == era.supply).order_by(Era.start_date)
+        ).first()
+        supply_dicts.append({"last_era": era, "first_era": first_era})
 
     return render_template(
         "em_site.html",
         site=site,
-        eras=eras,
+        supply_dicts=supply_dicts,
         now=now,
         last_month=last_month,
     )

chellow/models.py

@@ -4865,7 +4865,7 @@ class SiteGroup:
                 if resolve_1_start is not None:
                     self.delete_snag(
                         sess,
-                        SiteGroup.EXPORT_GROSS_GT_IMPORT_GEN,
+                        SiteGroup.EXPORT_GRID_GT_IMPORT_GEN,
                         resolve_1_start,
                         resolve_1_finish,
                     )

chellow/templates/e/em_site.html

@@ -22,6 +22,7 @@
 			<tr>
 				<th>View</th>
 				<th>Name</th>
+				<th>From</th>
 				<th>Source</th>
 				<th>Generator Type</th>
 				<th>DNO</th>
@@ -34,24 +35,26 @@
 			</tr>
 		</thead>
 		<tbody>
-			{% for era in eras %}
-				{% set supply = era.supply %}
+			{% for supply_dict in supply_dicts %}
+				{% set last_era = supply_dict.last_era %}
+				{% set supply = last_era.supply %}
 				<tr>
 					<td>
 						<a href="/e/supplies/{{supply.id}}">view</a>
 					</td>
 					<td>{{supply.name}}</td>
+					<td>{{supply_dict.first_era.start_date|hh_format}}</td>
 					<td>{{supply.source.code}}</td>
 					<td>{{supply.generator_type.code}}</td>
 					<td><a href="/dnos/{{supply.dno.id}}">{{supply.dno.dno_code}}</a></td>
 					<td>
-						{% if era.imp_mpan_core %}
-							{{era.imp_mpan_core}}
+						{% if last_era.imp_mpan_core %}
+							{{last_era.imp_mpan_core}}
 						{% endif %}
 					</td>
 					<td>
-						{% if era.exp_mpan_core %}
-							{{era.exp_mpan_core}}
+						{% if last_era.exp_mpan_core %}
+							{{last_era.exp_mpan_core}}
 						{% endif %}
 					</td>
 					<td>
@@ -70,8 +73,8 @@
 							<a href="/reports/5/output/?site_id={{osite.id}}">{{osite.code}}</a>
 						{% endfor %}
 					</td>
-					<td>{{era.meter_category}}</td>
-					<td>{{era.msn}}</td>
+					<td>{{last_era.meter_category}}</td>
+					<td>{{last_era.msn}}</td>
 				</tr>
 			{% endfor %}
 		</tbody>

{chellow-1724416862.0.0.dist-info → chellow-1724751676.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1724416862.0.0
+Version: 1724751676.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-1724416862.0.0.dist-info → chellow-1724751676.0.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=dixp-O0MF2_mlwrnKx3D9DH09Qu05BjTo0rZfigTjR4,5534
 chellow/edi_lib.py,sha256=alu20x9ZX06iPfnNI9dEJzuP6RIf4We3Y_M_bl7RrcY,51789
 chellow/general_import.py,sha256=l3EHq9zG9Vfl5Ee6XTVrC1nusXo4YGGB4VBmZ_JaJR8,65798
-chellow/models.py,sha256=rQLMIpGqFQk0fm7SQsAJbb51j3OM55e-4-MVfh0mBAc,243511
+chellow/models.py,sha256=YtU1lnJWdNKB4z5shDsNXSHJROpiuuJ5K5UUH-X22to,243510
 chellow/national_grid.py,sha256=czwIZqzJndSGhEMQ5YzI6hRBhvjkM6VRVYXybf4_KXg,4377
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
@@ -38,7 +38,7 @@ chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,623
 chellow/e/tlms.py,sha256=M33D6YpMixu2KkwSCzDRM3kThLgShg8exp63Obo75l8,8905
 chellow/e/tnuos.py,sha256=XseYztPUsQXNKuBmystO2kzzwAG9ehCZgpGBTdgSk-A,4313
 chellow/e/triad.py,sha256=lIQj7EdUrcFwEqleuHZXYU_bfzIwNOqUVVxB3NPQt4A,13710
-chellow/e/views.py,sha256=gxBqMpDaQ41MHEFhx6oZ1OgeDNYu700PBeRJCNvrVAQ,215951
+chellow/e/views.py,sha256=-0Ys7XVdBgFYaWWnKfRRwcVeQ7YyrHNS1HVXuFNk8wY,216190
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=UgWXDPzQkQghyj_lfgBqoSJpHB-t-qOdSaB8qY6GLog,4071
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
@@ -207,7 +207,7 @@ chellow/templates/e/duration_report.html,sha256=MrDgLDzbXdGLfpUbZ9U3xSP2H1VF0eK2
 chellow/templates/e/elexon.html,sha256=QW2EKdTMBTIzUkiXpYIHVZidZHNca3GmyiwWKaWkvIY,997
 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=LQJ1RJe7IJCZ-dsmd-Ku3hhNEeKUq3BimEBKJPNZ-do,2890
+chellow/templates/e/em_site.html,sha256=vbax2Je_DNCSWNDM0XLuvegRXNlDs71Vf4l07LCABSE,3066
 chellow/templates/e/em_totals.html,sha256=D_H12qF6b8heVeSGzcl4u7xRvtPLUtM1zWYrwEFRFTM,678
 chellow/templates/e/energisation_status.html,sha256=hvD1qMpLYjmWWGIrv-5Ko3KbRL3a6MdQXcO3Fr4_cHA,478
 chellow/templates/e/energisation_statuses.html,sha256=qwRIH7jqKA1MgajsWOeZAH89iRpOfsNW_fAqXymUQ3E,587
@@ -365,6 +365,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-1724416862.0.0.dist-info/METADATA,sha256=KLu5Vx3wXCtMoLUmwd5ZZzWmBbXGkUYMtps6zMGue70,12241
-chellow-1724416862.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1724416862.0.0.dist-info/RECORD,,
+chellow-1724751676.0.0.dist-info/METADATA,sha256=7AN6Q_gJi4wcmNKLFhGNag5Ra0i2ZpULKIMFyECV2OE,12241
+chellow-1724751676.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1724751676.0.0.dist-info/RECORD,,