chellow 1689753379.0.0__tar.gz → 1689935721.0.0__tar.gz

{chellow-1689753379.0.0 → chellow-1689935721.0.0}/PKG-INFO

@@ -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-1689935721.0.0/VERSION

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

{chellow-1689753379.0.0 → chellow-1689935721.0.0}/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-1689753379.0.0 → chellow-1689935721.0.0}/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-1689753379.0.0 → chellow-1689935721.0.0}/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-1689753379.0.0 → chellow-1689935721.0.0}/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-1689753379.0.0 → chellow-1689935721.0.0}/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-1689753379.0.0 → chellow-1689935721.0.0}/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 → chellow-1689935721.0.0}/test/e/test_e_views.py

@@ -2379,6 +2379,129 @@ def test_supplier_batch_file_edit_get(sess, client):
     match(response, 200)
 
 
+def test_supplier_bill_add_post(sess, client):
+    vf = to_utc(ct_datetime(1996, 1, 1))
+    site = Site.insert(sess, "22488", "Water Works")
+    insert_sources(sess)
+    source = Source.get_by_code(sess, "net")
+    gsp_group = GspGroup.insert(sess, "_L", "South Western")
+    participant = Participant.insert(sess, "hhak", "AK Industries")
+    market_role_X = MarketRole.insert(sess, "X", "Supplier")
+    market_role_M = MarketRole.insert(sess, "M", "Mop")
+    market_role_C = MarketRole.insert(sess, "C", "HH Dc")
+    market_role_R = MarketRole.insert(sess, "R", "Distributor")
+    participant.insert_party(sess, market_role_M, "Fusion Mop Ltd", vf, None, None)
+    participant.insert_party(sess, market_role_X, "Fusion Ltc", vf, None, None)
+    participant.insert_party(sess, market_role_C, "Fusion DC", vf, None, None)
+    mop_contract = Contract.insert_mop(
+        sess, "Fusion", participant, "", {}, vf, None, {}
+    )
+    dc_contract = Contract.insert_dc(
+        sess, "Fusion DC 2000", participant, "", {}, vf, None, {}
+    )
+    pc = Pc.insert(sess, "00", "hh", vf, None)
+    insert_cops(sess)
+    cop = Cop.get_by_code(sess, "5")
+    insert_comms(sess)
+    comm = Comm.get_by_code(sess, "GSM")
+    imp_supplier_contract = Contract.insert_supplier(
+        sess, "Fusion Supplier 2000", participant, "", {}, vf, None, {}
+    )
+    dno = participant.insert_party(sess, market_role_R, "WPD", vf, None, "22")
+    meter_type = MeterType.insert(sess, "C5", "COP 1-5", vf, None)
+    meter_payment_type = MeterPaymentType.insert(sess, "CR", "Credit", vf, None)
+    mtc = Mtc.insert(sess, "845", False, True, vf, None)
+    mtc_participant = MtcParticipant.insert(
+        sess,
+        mtc,
+        participant,
+        "HH COP5 And Above With Comms",
+        False,
+        True,
+        meter_type,
+        meter_payment_type,
+        0,
+        vf,
+        None,
+    )
+    insert_voltage_levels(sess)
+    voltage_level = VoltageLevel.get_by_code(sess, "HV")
+    llfc = dno.insert_llfc(
+        sess, "510", "PC 5-8 & HH HV", voltage_level, False, True, vf, None
+    )
+    MtcLlfc.insert(sess, mtc_participant, llfc, vf, None)
+    insert_energisation_statuses(sess)
+    energisation_status = EnergisationStatus.get_by_code(sess, "E")
+    site.insert_e_supply(
+        sess,
+        source,
+        None,
+        "Bob",
+        utc_datetime(2020, 1, 1),
+        utc_datetime(2020, 1, 31),
+        gsp_group,
+        mop_contract,
+        "773",
+        dc_contract,
+        "ghyy3",
+        "hgjeyhuw",
+        pc,
+        "845",
+        cop,
+        comm,
+        None,
+        energisation_status,
+        {},
+        "22 7867 6232 781",
+        "510",
+        imp_supplier_contract,
+        "7748",
+        361,
+        None,
+        None,
+        None,
+        None,
+        None,
+    )
+    batch = imp_supplier_contract.insert_batch(sess, "b1", "batch 1")
+    insert_bill_types(sess)
+    bill_type_N = BillType.get_by_code(sess, "N")
+    sess.commit()
+
+    data = {
+        "mpan_core": "22 7867 6232 781",
+        "account": "hrghj88",
+        "reference": "74hjkgjk",
+        "issue_year": "2020",
+        "issue_month": "02",
+        "issue_day": "10",
+        "issue_hour": "00",
+        "issue_minute": "00",
+        "start_year": "2020",
+        "start_month": "02",
+        "start_day": "02",
+        "start_hour": "00",
+        "start_minute": "00",
+        "finish_year": "2020",
+        "finish_month": "03",
+        "finish_day": "01",
+        "finish_hour": "00",
+        "finish_minute": "00",
+        "kwh": "0",
+        "net": "0.0",
+        "vat": "0.0",
+        "gross": "0.0",
+        "bill_type_id": bill_type_N.id,
+        "breakdown": "",
+    }
+    response = client.post(f"/e/supplier_batches/{batch.id}/add_bill", data=data)
+    match(
+        response,
+        400,
+        "<li>Problem parsing the field breakdown as Zish: No Zish value found.</li>",
+    )
+
+
 def test_supplier_bill_edit_post_breakdown_malformed(sess, client):
     valid_from = to_utc(ct_datetime(1996, 1, 1))
     site = Site.insert(sess, "22488", "Water Works")

chellow-1689753379.0.0/VERSION

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