chellow 1724334398.0.0__tar.gz → 1724747184.0.0__tar.gz

{chellow-1724334398.0.0 → chellow-1724747184.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1724334398.0.0
+Version: 1724747184.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-1724747184.0.0/VERSION

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

{chellow-1724334398.0.0 → chellow-1724747184.0.0}/chellow/e/bill_parsers/mm.py

@@ -278,6 +278,10 @@ def _handle_1500(headers, pre_record, record):
     }
 
 
+def _handle_1700(headers, pre_record, record):
+    pass
+
+
 def _handle_2000(headers, pre_record, record):
     pass
 
@@ -299,6 +303,7 @@ LINE_HANDLERS = {
     "1455": _handle_1455,
     "1460": _handle_1460,
     "1500": _handle_1500,
+    "1700": _handle_1700,
     "2000": _handle_2000,
     "9999": _handle_9999,
 }

{chellow-1724334398.0.0 → chellow-1724747184.0.0}/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-1724334398.0.0 → chellow-1724747184.0.0}/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-1724334398.0.0/VERSION

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