chellow 1689753379.0.0__py3-none-any.whl → 1689935721.0.0__py3-none-any.whl

chellow/e/views.py

@@ -3528,9 +3528,9 @@ def site_snag_edit_post(snag_id):
 @e.route("/sites/<int:site_id>/site_snags")
 def site_site_snags_get(site_id):
     site = Site.get_by_id(g.sess, site_id)
-    snags = (
-        g.sess.query(Snag)
-        .filter(Snag.is_ignored == false(), Snag.site == site)
+    snags = g.sess.scalars(
+        select(Snag)
+        .where(Snag.is_ignored == false(), Snag.site == site)
         .order_by(Snag.start_date.desc(), Snag.id)
     )
     return render_template("site_site_snags.html", site=site, snags=snags)
@@ -4192,8 +4192,7 @@ def supplier_bill_add_post(batch_id):
         gross = req_decimal("gross")
         bill_type_id = req_int("bill_type_id")
         bill_type = BillType.get_by_id(g.sess, bill_type_id)
-        breakdown_str = req_str("breakdown")
-        breakdown = loads(breakdown_str)
+        breakdown = req_zish("breakdown")
         bill_type = BillType.get_by_id(g.sess, bill_type_id)
         bill = batch.insert_bill(
             g.sess,

chellow/models.py

@@ -67,6 +67,8 @@ from chellow.utils import (
     hh_after,
     hh_before,
     hh_format,
+    hh_max,
+    hh_min,
     hh_range,
     next_hh,
     parse_mpan_core,
@@ -4759,6 +4761,7 @@ class Report(Base, PersistentClass):
 class SiteGroup:
     EXPORT_NET_GT_IMPORT_GEN = "Export to net > import from generators."
     EXPORT_GEN_GT_IMPORT = "Export to generators > import."
+    EXPORT_3P_GT_IMPORT = "Export to 3rd party > import."
 
     def __init__(self, start_date, finish_date, sites, supplies):
         self.start_date = start_date
@@ -4775,9 +4778,22 @@ class SiteGroup:
             "3rd-party": {True: ["imp_3p"], False: ["exp_3p"]},
             "3rd-party-reverse": {True: ["exp_3p"], False: ["imp_3p"]},
         }
-        data = []
 
-        channels = sess.scalars(
+        data = {
+            hh_start: {
+                "start_date": hh_start,
+                "status": "A",
+                "imp_net": 0,
+                "exp_net": 0,
+                "imp_gen": 0,
+                "exp_gen": 0,
+                "imp_3p": 0,
+                "exp_3p": 0,
+            }
+            for hh_start in hh_range(caches, self.start_date, self.finish_date)
+        }
+
+        for channel in sess.scalars(
             select(Channel)
             .join(Era)
             .join(Supply)
@@ -4789,49 +4805,48 @@ class SiteGroup:
                 Source.code != "sub",
                 Channel.channel_type == "ACTIVE",
             )
-        ).all()
-        channel_keys = dict(
-            (c.id, keys[c.era.supply.source.code][c.imp_related]) for c in channels
-        )
+        ):
+            channel_keys = keys[channel.era.supply.source.code][channel.imp_related]
 
-        db_data = iter(
-            sess.execute(
-                text(
-                    "select start_date, value, channel_id from hh_datum "
-                    "where channel_id = any(:channel_ids) "
-                    "and start_date >= :start_date "
-                    "and start_date <= :finish_date order by start_date"
-                ),
-                {
-                    "channel_ids": [c.id for c in channels],
-                    "start_date": self.start_date,
-                    "finish_date": self.finish_date,
-                },
+            chunk_start = hh_max(self.start_date, channel.era.start_date)
+            chunk_finish = hh_min(self.finish_date, channel.era.finish_date)
+
+            db_data = iter(
+                sess.execute(
+                    text(
+                        "select start_date, value, channel_id, status from hh_datum "
+                        "where channel_id = :channel_id "
+                        "and start_date >= :start_date "
+                        "and start_date <= :finish_date order by start_date"
+                    ),
+                    {
+                        "channel_id": channel.id,
+                        "start_date": chunk_start,
+                        "finish_date": chunk_finish,
+                    },
+                )
             )
-        )
 
-        hh = next(db_data, None)
+            hh = next(db_data, None)
 
-        for hh_start in hh_range(caches, self.start_date, self.finish_date):
-            dd = {
-                "start_date": hh_start,
-                "imp_net": 0,
-                "exp_net": 0,
-                "imp_gen": 0,
-                "exp_gen": 0,
-                "imp_3p": 0,
-                "exp_3p": 0,
-            }
-            data.append(dd)
-            while hh is not None and hh.start_date == hh_start:
-                for key in channel_keys[hh.channel_id]:
-                    dd[key] += hh.value
-                hh = next(db_data, None)
+            for hh_start in hh_range(caches, chunk_start, chunk_finish):
+                dd = data[hh_start]
+                if hh is not None and hh.start_date == hh_start:
+                    if dd["status"] == "A" and hh.status != "A":
+                        dd["status"] = "E"
+                    for key in channel_keys:
+                        dd[key] += hh.value
+                    hh = next(db_data, None)
+                else:
+                    if dd["status"] == "A":
+                        dd["status"] = "E"
 
-            dd["displaced"] = dd["imp_gen"] - dd["exp_gen"] - dd["exp_net"]
-            dd["used"] = dd["displaced"] + dd["imp_net"] + dd["imp_3p"] - dd["exp_3p"]
+                dd["displaced"] = dd["imp_gen"] - dd["exp_gen"] - dd["exp_net"]
+                dd["used"] = (
+                    dd["displaced"] + dd["imp_net"] + dd["imp_3p"] - dd["exp_3p"]
+                )
 
-        return data
+        return data.values()
 
     def add_snag(self, sess, description, start_date, finish_date):
         return Snag.add_snag(
@@ -4848,11 +4863,13 @@ class SiteGroup:
         snag_1_start = snag_1_finish = None
         resolve_2_start = resolve_2_finish = None
         snag_2_start = snag_2_finish = None
+        resolve_3_start = resolve_3_finish = None
+        snag_3_start = snag_3_finish = None
 
         for hh in self.hh_data(sess):
             hh_start_date = hh["start_date"]
 
-            if hh["exp_net"] > hh["imp_gen"]:
+            if hh["exp_net"] > hh["imp_gen"] and hh["status"] == "A":
                 if snag_1_start is None:
                     snag_1_start = hh_start_date
 
@@ -4881,7 +4898,7 @@ class SiteGroup:
                     )
                     snag_1_start = None
 
-            if hh["exp_gen"] > hh["imp_net"] + hh["imp_gen"]:
+            if hh["exp_gen"] > hh["imp_net"] + hh["imp_gen"] and hh["status"] == "A":
                 if snag_2_start is None:
                     snag_2_start = hh_start_date
 
@@ -4910,6 +4927,38 @@ class SiteGroup:
                     )
                     snag_2_start = None
 
+            if (
+                hh["exp_3p"] > hh["imp_net"] + hh["imp_gen"] + hh["imp_3p"]
+                and hh["status"] == "A"
+            ):
+                if snag_3_start is None:
+                    snag_3_start = hh_start_date
+
+                snag_3_finish = hh_start_date
+
+                if resolve_3_start is not None:
+                    self.delete_snag(
+                        sess,
+                        SiteGroup.EXPORT_3P_GT_IMPORT,
+                        resolve_3_start,
+                        resolve_3_finish,
+                    )
+                    resolve_3_start = None
+            else:
+                if resolve_3_start is None:
+                    resolve_3_start = hh_start_date
+
+                resolve_3_finish = hh_start_date
+
+                if snag_3_start is not None:
+                    self.add_snag(
+                        sess,
+                        SiteGroup.EXPORT_3P_GT_IMPORT,
+                        snag_3_start,
+                        snag_3_finish,
+                    )
+                    snag_3_start = None
+
         if snag_1_start is not None:
             self.add_snag(
                 sess, SiteGroup.EXPORT_NET_GT_IMPORT_GEN, snag_1_start, snag_1_finish
@@ -4933,6 +4982,16 @@ class SiteGroup:
                 sess, SiteGroup.EXPORT_GEN_GT_IMPORT, resolve_2_start, resolve_2_finish
             )
 
+        if snag_3_start is not None:
+            self.add_snag(
+                sess, SiteGroup.EXPORT_3P_GT_IMPORT, snag_3_start, snag_3_finish
+            )
+
+        if resolve_3_start is not None:
+            self.delete_snag(
+                sess, SiteGroup.EXPORT_3P_GT_IMPORT, resolve_3_start, resolve_3_finish
+            )
+
 
 class Scenario(Base, PersistentClass):
     @staticmethod

chellow/templates/e/channel_edit.html

@@ -42,8 +42,8 @@
 
 		<form method="post" action="/e/channels/{{channel.id}}/edit">
 			<fieldset>
-				<label>Insert HH datum</label>	
-				<label>Start Date </label> {{input_date('start', None, 'minute')}}
+				<legend>Insert HH datum</legend>
+				<label>Start Date</label> {{input_date('start', None, 'minute')}}
 				<label>Value</label> {{input_text('value', '')}}
 				<label>Status </label>
 				<select name="status">

chellow/templates/e/site_snags.html

@@ -20,32 +20,35 @@
 		There are {{snags|length}} snag(s), over {{site_count}} site(s)
 	</p>
 
-	<table>
+	<table class="sticky">
 		<caption>Site Snags</caption>	
 		<thead>
 			<tr>
-				<th></th>
+				<th>View</th>
+				<th>Edit</th>
 				<th>Creation Date</th>
-				<th>Site ID</th>
+				<th>Site Code</th>
 				<th>Site Name</th>
 				<th>Snag Description</th>
 				<th>Start Date</th>
 				<th>Finish Date</th>
+				<th>HH Data</th>
 			</tr>
 		</thead>
 		<tbody>
 			{% for snag in snags %}
 				<tr>
-					<td>
-						<a href="/e/site_snags/{{snag.id}}">view</a>
-						[<a href="/e/site_snags/{{snag.id}}/edit">edit</a>]
-					</td>
+					<td><a href="/e/site_snags/{{snag.id}}">View</a></td>
+					<td><a href="/e/site_snags/{{snag.id}}/edit">Edit</a></td>
 					<td>{{snag.date_created|hh_format}}</td>
-					<td><a href="/e/sites/{{snag.site.id}}">{{snag.site.code}}</a></td>
+					<td><a href="/sites/{{snag.site.id}}">{{snag.site.code}}</a></td>
 					<td>{{snag.site.name}}</td>
 					<td>{{snag.description}}</td>
 					<td>{{snag.start_date|hh_format}}</td>
 					<td>{{snag.finish_date|hh_format}}</td>
+					<td>
+						<a href="/sites/{{snag.site.id}}/hh_data?year={{snag.start_date.year}}&amp;month={{snag.start_date.month}}#:~:text={{snag.start_date|hh_format|urlencode}}">HH Data</a>
+					</td>
 				</tr>
 			{% endfor %}
 		</tbody>

chellow/templates/home.html

@@ -222,6 +222,7 @@
 					<li><a href="/e/scenarios">Scenarios</a></li>
 					<li><a href="/reports/batches">Batches</a></li>
 					<li><a href="/tester">Tester</a></li>
+					<li><a href="/e/site_snags">Site Snags</a></li>
 				</ul>
 			</div>
 		</section>

chellow/templates/site.html

@@ -161,7 +161,7 @@ Table of site level monthly kWh, MD kWh etc.</a>
 			<a href="/sites/{{site.id}}/hh_data?year={{month_finish.year}}&amp;month={{month_finish.month}}">Table of hh data</a>
 		</li>
 		<li>
-			<a href="/sites/{{site.id}}/site_snags">Site Snags</a>
+			<a href="/e/sites/{{site.id}}/site_snags">Site Snags</a>
 		</li>
 		<li>
 			<a href="/e/sites/{{site.id}}/energy_management">Energy Managment Summary</a>

{chellow-1689753379.0.0.dist-info → chellow-1689935721.0.0.dist-info}/METADATA

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

@@ -5,7 +5,7 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=n6VI_zxScCn_Hn2daOnHauhEpqH68ZKeCwvDQ2ObFUI,3941
 chellow/edi_lib.py,sha256=het3R0DBGtXEo-Sy1zvXQuX9EWQ1X6Y33G4l1hYYuds,51859
 chellow/general_import.py,sha256=Xuiwl-yeM0MCmPstzQR2E6ASs8sYE8b1GNeDLStnizY,58470
-chellow/models.py,sha256=Pph2VAOjjMwqZlwSk7uXZtEFFjz0nzJoCad-6kna6GM,232440
+chellow/models.py,sha256=3iCwWh2NAHdATUrC_keQ8SBzQUocLTJXwgeFVItBkc4,234629
 chellow/national_grid.py,sha256=Y0ckPONIpMnip2qB9ptXBLxs6jJCk14c98eCkyd2fNM,4427
 chellow/proxy.py,sha256=Mzssi9nTf6s_G4RSn8k5oAHqzVYIxMsfbudj1amYucI,1387
 chellow/rate_server.py,sha256=xVk15pdSovcD8K8BWcOmjwo_L3a8LYry7L2Gvw56OEQ,5696
@@ -34,7 +34,7 @@ chellow/e/scenario.py,sha256=IuyE494XaBLq3FW7NdJePD6J4cTzPogfACO6dThiY00,23239
 chellow/e/system_price.py,sha256=IPBLSRPzGA3yca4tpR8PJemwPbgqVjn1WnljOMUyWnA,8145
 chellow/e/tlms.py,sha256=gXBZTHXqGVcaTGHaYGVA5Ir5pzoBDqFC1Kl1mQ0IDqU,9549
 chellow/e/tnuos.py,sha256=kxp9EXPCXv_yAbMRbpqa5b6fsw3KJ290zNaGU3piWgo,20647
-chellow/e/views.py,sha256=3f3oG9VHuhNApSfGFeZPH9_L7SQUx0itzQllh2TgI9k,179056
+chellow/e/views.py,sha256=JC6phMmKpu-NmLEkDvFpMCiruQj-nmt9KSQRu0Q0I30,179019
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=v1s4O8phVJVn9sOs9HKrKYcECAP0ApnUgqCaa2ARYiQ,4234
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=4dAWjaxsDnnGBnRAjgFe7IZLxIcLMGiTuXh1uqNnnlQ,4382
@@ -113,7 +113,7 @@ chellow/templates/downloads.html,sha256=m_Mm6yqq42HjahYiL2NyGfrkm8JLqOEWuC7Qy9T0
 chellow/templates/edi_viewer.html,sha256=szUthgHOdph6Of-7f_1LeC_zYlNJaMeS5ctn6xTAeiM,1437
 chellow/templates/general_import.html,sha256=SMemHGu466Be3_cAWSS6Hn-Kv-1psbEMDD6NQG6bfbI,1013
 chellow/templates/general_imports.html,sha256=Jqv9koKywQR4dqhePT8-khV_B5s-Cu41V90GE4yMgcQ,12208
-chellow/templates/home.html,sha256=NU6MI5VA9KmkQOhGfRKNbWtO7UUyp_aJ0RGt64k1XAg,5463
+chellow/templates/home.html,sha256=5GXzbgFeceQAnr8nQEg911v0xT4hJN1H0-5Npo9GbAE,5516
 chellow/templates/local_report.html,sha256=pV7_0QwyQ-D3OS9LXrly5pq3qprZnwTCoq6vCnMTkS4,1332
 chellow/templates/local_reports.html,sha256=4wbfVkY4wUfSSfWjxqIsvCpIsa9k7H_dGAjznrG5jNM,701
 chellow/templates/national_grid.html,sha256=8W92tsjlqPSB0J--nyFIi-wzFae9CyDr6fODXLZp8ic,991
@@ -134,7 +134,7 @@ chellow/templates/report_run_row.html,sha256=bmtcdqJaS1CXpL0i8PuqvmeF98jKNYX5-mn
 chellow/templates/report_run_row_bill_check.html,sha256=aC2LMu_6NvmTN3ZdxHJPPPczyxPN6hg0F-PPcqIWUws,4683
 chellow/templates/report_run_supply_contacts.html,sha256=JNzwz9M6qbLRDMkCzFCxxANapUer5klxo7t5a48nAzg,2117
 chellow/templates/report_runs.html,sha256=Xef2nilmHHSnyRNKUQJrU2qWsQfslFL_wWD5rR92SOo,667
-chellow/templates/site.html,sha256=uzDElAOtlS5H3J3nFdEP0BDx1enPJtEixXYqqAPnvl8,10016
+chellow/templates/site.html,sha256=Pf3t3HC8Apzg283ZQz_Tnh3VWxvKorKiGQ1BA72dgMc,10018
 chellow/templates/site_add.html,sha256=NxYmOIZQH6X8EBOuJUbhUJ8IYB3t0BukjR1yVRhnJhM,422
 chellow/templates/site_edit.html,sha256=R1HTFzSuBzujAuYOcE5lXcBmktY_5RQAPz85Cg1wnt0,7803
 chellow/templates/site_gen_graph.html,sha256=LXkD4n_aC_sFm9JJTCmBRrczpyTn2UUEgBToFiM5RPo,3468
@@ -151,7 +151,7 @@ chellow/templates/users.html,sha256=dBB0yOvsoYbY_I9le1XGqZ0SlesUbWMqfRGlZOtOgNs,
 chellow/templates/e/asset_comparison.html,sha256=QyN3WMw8YoFaSWUvD2NOnRLdLdB3Kv6m3t8Id8Mb6_A,678
 chellow/templates/e/channel.html,sha256=R5fhdsHvhB7k57Rw_gviUQ7_EXBGwP05E691V1BUNSQ,2056
 chellow/templates/e/channel_add.html,sha256=X1hi0b-ZjchlQ2m7uZYCyqkqU-Qd1s3_5u4zsB_yySA,1479
-chellow/templates/e/channel_edit.html,sha256=4JE3O41838Jp42guKiAbT_R7WJ6cjbxjq9YEP4bAIh0,2198
+chellow/templates/e/channel_edit.html,sha256=OUkdiS2NBQ_w4gmxRxXAcRToM5BT8DWWJrtQMFs-GUU,2198
 chellow/templates/e/channel_snag.html,sha256=wBJ5KBfeJdAeRmaB0qu0AD9Z4nM5fn6tJ_8bNqTWtoo,1477
 chellow/templates/e/channel_snag_edit.html,sha256=sUFI4Ml3F1B35x8_t_Pz3hWuQN9Xtxr3kt4u8hdxNwY,1911
 chellow/templates/e/channel_snags.html,sha256=1dzC5FoCJ8bg6PBsQrVqGLn-DbPE2EHQklfm_pg3w0c,2899
@@ -270,7 +270,7 @@ chellow/templates/e/site_hh_data.html,sha256=1Ld5IIM3G84tVCAwtlJNGJTnrASS7d84Aga
 chellow/templates/e/site_site_snags.html,sha256=vWpsFyxZj7GOrMXQz2rKq9zOQdVsqeUVtdBzehp9J5w,847
 chellow/templates/e/site_snag.html,sha256=eZt1H-t-hsoKZBteU9ILpKqKLD0Pf0Uybp8pPQYuTAc,924
 chellow/templates/e/site_snag_edit.html,sha256=O-m95S-ig9sXmFFkQmjfNnF9zJkgSIuPizuF7ieNi7s,1436
-chellow/templates/e/site_snags.html,sha256=V1B585p4tF9K2gXgHIH8vszGUMlh_uTCZI8oMJQ4bB8,1175
+chellow/templates/e/site_snags.html,sha256=6MKZQVJQJ61dhwYhcdro-ZyWQotu2iapHC9_qS92zSg,1421
 chellow/templates/e/site_snags_edit.html,sha256=MEkRBEKtLUusS0_H9h-M1XXWi5-U8QAbfYN4q7giDm4,427
 chellow/templates/e/source.html,sha256=6cLjZWKS2w9Zy1C4hzi1lTKXAdKKFQ8wSxbwAjhP3jU,373
 chellow/templates/e/sources.html,sha256=AW_ysj5ZzArTLz0-FWappMsUEU1AO9gw7D4XSHbINu4,453
@@ -351,6 +351,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-1689753379.0.0.dist-info/METADATA,sha256=Ya6h0C6NMPRpGw5QpxzDCo11NePRCgW2WchmYeJX9ZM,12161
-chellow-1689753379.0.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
-chellow-1689753379.0.0.dist-info/RECORD,,
+chellow-1689935721.0.0.dist-info/METADATA,sha256=Oyqja1WTIYohyoew87-PlpKLKOvD-iQc8kwbTJeEYCw,12161
+chellow-1689935721.0.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
+chellow-1689935721.0.0.dist-info/RECORD,,