chellow 1755011219.0.0__tar.gz → 1755598989.0.0__tar.gz

{chellow-1755011219.0.0 → chellow-1755598989.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1755011219.0.0
+Version: 1755598989.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-1755598989.0.0/VERSION

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

{chellow-1755011219.0.0 → chellow-1755598989.0.0}/chellow/e/views.py

@@ -5730,6 +5730,51 @@ def supply_post(supply_id):
                         f"successfully updated with the MSN {msn}. "
                     )
             flash(msg)
+
+        if "new_llfc" in request.form:
+            start_date_str = req_str("start_date")
+            start_date = parse_hh_start(start_date_str)
+            if start_date is None:
+                raise BadRequest("The date of the MSN change is blank.")
+
+            llfc_code = req_str("llfc_code")
+            llfc = supply.dno.get_llfc_by_code(g.sess, llfc_code)
+            mpan_core = req_str("mpan_core")
+            msg = ""
+            era = supply.find_era_at(g.sess, start_date)
+            if era is not None and era.start_date != start_date:
+                era = supply.insert_era_at(g.sess, start_date)
+                g.sess.commit()
+            for era in supply.find_eras(g.sess, start_date, None):
+                if era.imp_mpan_core == mpan_core:
+                    if era.imp_llfc.code == llfc.code:
+                        msg += (
+                            f"The era at {hh_format(era.start_date)} already has the "
+                            f"import LLFC {llfc.code}. "
+                        )
+                    else:
+                        era.imp_llfc = llfc
+
+                        g.sess.commit()
+                        msg += (
+                            f"The era at {hh_format(era.start_date)} has been "
+                            f"successfully updated with the import LLFC {llfc.code}. "
+                        )
+                elif era.exp_mpan_core == mpan_core:
+                    if era.exp_llfc.code == llfc.code:
+                        msg += (
+                            f"The era at {hh_format(era.start_date)} already has the "
+                            f"export LLFC {llfc.code}. "
+                        )
+                    else:
+                        era.exp_llfc = llfc
+
+                        g.sess.commit()
+                        msg += (
+                            f"The era at {hh_format(era.start_date)} has been "
+                            f"successfully updated with the export LLFC {llfc.code}. "
+                        )
+            flash(msg)
         return render_template("supply_post.html")
 
     except BadRequest as e:

{chellow-1755011219.0.0 → chellow-1755598989.0.0}/chellow/gas/bill_parser_bgs_xlsx.py

@@ -11,7 +11,7 @@ from openpyxl import load_workbook
 
 from werkzeug.exceptions import BadRequest
 
-from chellow.utils import to_ct, to_utc
+from chellow.utils import hh_max, hh_min, to_ct, to_utc
 
 
 class Title(Enum):
@@ -159,6 +159,12 @@ def _parse_row(bills, sheet, row, title_row):
     charge_period_end_naive = get_date_naive(
         sheet, row, column_map[Title.CHARGE_PERIOD_END]
     )
+    if charge_period_end_naive is None:
+        charge_period_end = None
+    else:
+        charge_period_end = to_utc(
+            to_ct(charge_period_end_naive) + relativedelta(hours=23, minutes=30)
+        )
 
     try:
         mprn_values = bills[mprn]
@@ -174,18 +180,25 @@ def _parse_row(bills, sheet, row, title_row):
             "reference": reference,
             "account": account,
             "issue_date": issue_date,
-            "start_date": charge_period_from,
-            "finish_date": to_utc(
-                to_ct(charge_period_end_naive) + relativedelta(hours=23, minutes=30)
-            ),
             "kwh": Decimal("0"),
             "breakdown": defaultdict(int, {}),
             "net_gbp": Decimal("0.00"),
             "vat_gbp": Decimal("0.00"),
             "gross_gbp": Decimal("0.00"),
-            "raw_lines": str([(c.value) for c in sheet[row]]),
+            "raw_lines": [],
             "reads": [],
         }
+    if charge_period_from is not None:
+        if "start_date" in bill:
+            bill["start_date"] = hh_min(bill["start_date"], charge_period_from)
+        else:
+            bill["start_date"] = charge_period_from
+    if charge_period_end is not None:
+        if "finish_date" in bill:
+            bill["finish_date"] = hh_max(bill["finish_date"], charge_period_end)
+        else:
+            bill["finish_date"] = charge_period_end
+    bill["raw_lines"].append([c.value for c in sheet[row]])
 
     bd = bill["breakdown"]
     element_desc = get_value(sheet, row, column_map[Title.CHARGE_TYPE])

{chellow-1755011219.0.0 → chellow-1755598989.0.0}/chellow/reports/report_ecoes_comparison.py

@@ -25,7 +25,7 @@ from chellow.models import (
     Supply,
     User,
 )
-from chellow.utils import csv_make_val, req_bool
+from chellow.utils import csv_make_val, req_bool, utc_datetime_now
 
 
 FNAME = "ecoes_comparison"
@@ -146,6 +146,7 @@ def _process(
     report_run,
 ):
     writer = csv.writer(f, lineterminator="\n")
+    now = utc_datetime_now()
 
     mpans = []
 
@@ -274,6 +275,7 @@ def _process(
         chellow_pc = ""
         chellow_mtc = ""
         chellow_llfc = ""
+        chellow_llfc_desc = ""
         chellow_ssc = ""
         chellow_es = ""
         chellow_supplier = ""
@@ -287,6 +289,11 @@ def _process(
         chellow_supply_id = None
         chellow_era_id = None
         ignore = True
+        ecoes_dno_code = ecoes["mpan-core"][:2]
+        ecoes_dno = Party.get_dno_by_code(sess, ecoes_dno_code, now)
+        ecoes_llfc_desc = ""
+        chellow_site_code = ""
+        chellow_site_name = ""
         diffs = []
 
         try:
@@ -404,11 +411,17 @@ def _process(
                     ignore = False
 
                 chellow_llfc = llfc.code
-                if ecoes["llfc"].zfill(3) != chellow_llfc:
+                chellow_llfc_desc = llfc.description
+                ecoes_llfc_code = ecoes["llfc"].zfill(3)
+                if ecoes_llfc_code != chellow_llfc:
                     problem += "The LLFCs don't match. "
                     ignore = False
                     diffs.append("llfc")
 
+                ecoes_llfc = ecoes_dno.find_llfc_by_code(sess, ecoes_llfc_code, now)
+                if ecoes_llfc is not None:
+                    ecoes_llfc_desc = ecoes_llfc.description
+
                 chellow_ssc = era.ssc
                 if chellow_ssc is None:
                     chellow_ssc = ""
@@ -466,6 +479,10 @@ def _process(
                     ignore = False
                     diffs.append("gsp_group")
 
+                chellow_site = era.get_physical_site(sess)
+                chellow_site_code = chellow_site.code
+                chellow_site_name = chellow_site.name
+
                 chellow_msn = era.msn
 
                 if set([m.strip() for m in chellow_msn.split(",")]) != set(
@@ -503,8 +520,10 @@ def _process(
                 "ecoes_mtc_date": _parse_date(ecoes["mtc-date"]),
                 "chellow_mtc": chellow_mtc,
                 "ecoes_llfc": ecoes["llfc"],
+                "ecoes_llfc_desc": ecoes_llfc_desc,
                 "ecoes_llfc_from": _parse_date(ecoes["llfc-from"]),
                 "chellow_llfc": chellow_llfc,
+                "chellow_llfc_desc": chellow_llfc_desc,
                 "ecoes_ssc": ecoes["ssc"],
                 "chellow_ssc": chellow_ssc,
                 "ecoes_es": ecoes["energisation-status"],
@@ -533,6 +552,8 @@ def _process(
                 "address": ", ".join(
                     [a for a in address_lines if len(a) > 0 and a != "NULL"]
                 ),
+                "chellow_site_code": chellow_site_code,
+                "chellow_site_name": chellow_site_name,
             }
             writer.writerow(csv_make_val(values[t]) for t in titles)
             values["chellow_supplier_contract_id"] = chellow_supplier_contract_id

{chellow-1755011219.0.0 → chellow-1755598989.0.0}/chellow/templates/report_run_ecoes_comparison.html

@@ -64,26 +64,21 @@
 			<caption>{{vals['mpan_core_no_spaces']}}</caption>
 			<thead>
 				<tr>
-					<th rowspan="2">Mpan Core</th>
-					<th rowspan="2">Supplier Contract</th>
-					<th rowspan="2">Edit Era</th>
-					<th rowspan="2">Edit Supply</th>
+					<th>Source</th>
+					<th>Mpan Core</th>
+					<th>Supplier Contract</th>
+					<th>Edit Era</th>
+					<th>Edit Supply</th>
 					{% for diff in vals['diffs'] %}
-						<th colspan="2">{{diff}}</th>
-					{% endfor %}
-					<th rowspan="2">Problem</th>
-					<th rowspan="2">Fix</th>
-					<th rowspan="2">ECOES Address</th>
-				</tr>
-				<tr>
-					{% for diff in vals['diffs'] %}
-						<th>Chellow</th>
-						<th>ECOES</th>
+						<th>{{diff}}</th>
 					{% endfor %}
+					<th>Problem</th>
+					<th>Site</th>
 				</tr>
 			</thead>
 			<tbody>
 				<tr>
+					<td>Chellow</td>
 					<td>
 						{% if vals['chellow_supply_id'] is none %}
 							{{vals['mpan_core']}}
@@ -99,15 +94,55 @@
 					</td>
 					<td>
 						{% if vals['chellow_era_id'] is not none %}
-							[<a href="/e/eras/{{vals['chellow_era_id']}}/edit">edit</a>]</td>
+							[<a href="/e/eras/{{vals['chellow_era_id']}}/edit">edit</a>]
 						{% endif %}
+					</td>
 					<td>
 						{% if vals['chellow_supply_id'] is not none %}
 							[<a href="/e/supplies/{{vals['chellow_supply_id']}}/edit">edit</a>]
 						{% endif %}
 					</td>
 					{% for diff in vals['diffs'] %}
-						<td>{{vals['chellow_' + diff]}}</td>
+						<td>
+							{{vals['chellow_' + diff]}}
+							{% if diff == 'llfc' %}
+								- {{vals['chellow_' + diff + '_desc']}}
+								<form hx-post="/e/supplies/{{vals['chellow_supply_id']}}">
+									<fieldset>
+										<input type="hidden" name="llfc_code" value="{{vals['ecoes_llfc']}}">
+										<input type="hidden" name="mpan_core" value="{{vals['mpan_core']}}">
+										<input type="hidden" name="start_date"
+											value="{{vals['ecoes_llfc_from_date']}}">
+										<input type="submit" name="new_llfc" value="Fix">
+									</fieldset>
+								</form>
+							{% elif diff == 'msn' %}
+								<form hx-post="/e/supplies/{{vals['chellow_supply_id']}}">
+									<fieldset>
+										<input type="hidden" name="msn" value="{{vals['ecoes_msn']}}">
+										<input type="hidden" name="start_date"
+											value="{{vals['ecoes_msn_install_date']}}">
+										<input type="submit" name="new_msn" value="Fix MSN">
+									</fieldset>
+								</form>
+							{% endif %}
+						</td>
+					{% endfor %}
+					<td rowspan="2">{{vals['problem']}}</td>
+					<td>{{vals['chellow_site_code']}} {{vals['chellow_site_name']}}</td>
+				</tr>
+				<tr>
+					<td>
+						ECOES
+					</td>
+					<td>
+					</td>
+					<td>
+					</td>
+					<td>
+					<td>
+					</td>
+					{% for diff in vals['diffs'] %}
 						<td>{{vals['ecoes_' + diff]}}
 							{% if diff == 'msn' %}
 								- {{vals['ecoes_msn_install_date']}}
@@ -116,7 +151,7 @@
 							{% elif diff == 'mtc' %}
 								- {{vals['ecoes_mtc_date']}}
 							{% elif diff == 'llfc' %}
-								- {{vals['ecoes_llfc_from']}}
+								{{vals['ecoes_llfc_desc']}} - From {{vals['ecoes_llfc_from']}}
 							{% elif diff == 'mop' %}
 								- {{vals['ecoes_mop_appoint_date']}}
 							{% elif diff == 'gsp_group' %}
@@ -124,19 +159,6 @@
 							{% endif %}
 						</td>
 					{% endfor %}
-					<td>{{vals['problem']}}</td>
-					<td>
-						{% if 'msn' in vals['diffs'] %}
-							<form hx-post="/e/supplies/{{vals['chellow_supply_id']}}">
-								<fieldset>
-									<input type="hidden" name="msn" value="{{vals['ecoes_msn']}}">
-									<input type="hidden" name="start_date"
-										value="{{vals['ecoes_msn_install_date']}}">
-									<input type="submit" name="new_msn" value="Fix MSN">
-								</fieldset>
-							</form>
-						{% endif %}
-					</td>
 					<td>{{vals['address']}}</td>
 				</tr>
 			</tbody>