chellow 1720006293.0.0__py3-none-any.whl → 1720600044.0.0__py3-none-any.whl

chellow/e/views.py

@@ -79,7 +79,6 @@ from chellow.models import (
 )
 from chellow.utils import (
     HH,
-    PropDict,
     c_months_u,
     csv_make_val,
     ct_datetime,
@@ -3732,24 +3731,15 @@ def pc_get(pc_id):
 
 @e.route("/supplier_bills/<int:bill_id>/add_read")
 def read_add_get(bill_id):
-    read_types = g.sess.query(ReadType).order_by(ReadType.code)
-    estimated_read_type_id = (
-        g.sess.query(ReadType.id).filter(ReadType.code == "E").scalar()
-    )
-    tprs = g.sess.query(Tpr).order_by(Tpr.code)
+    read_types = g.sess.scalars(select(ReadType).order_by(ReadType.code))
+    estimated_read_type = ReadType.get_by_code(g.sess, "E")
+    tprs = g.sess.scalars(select(Tpr).order_by(Tpr.code))
     bill = Bill.get_by_id(g.sess, bill_id)
     coefficient = 1
     mpan_str = msn = previous_date = previous_value = previous_type_id = None
 
     era = bill.supply.find_era_at(g.sess, bill.start_date)
     if era is not None:
-        era_properties = PropDict(
-            f"{chellow.utils.url_root}eras/{era.id}", loads(era.properties)
-        )
-        try:
-            coefficient = float(era_properties["coefficient"])
-        except KeyError:
-            pass
         mpan_str = era.imp_mpan_core
         msn = era.msn
 
@@ -3778,7 +3768,7 @@ def read_add_get(bill_id):
         previous_date=previous_date,
         previous_value=previous_value,
         previous_type_id=previous_type_id,
-        estimated_read_type_id=estimated_read_type_id,
+        estimated_read_type_id=estimated_read_type.id,
     )
 
 

chellow/models.py

@@ -6687,28 +6687,7 @@ def insert_dtc_meter_types(sess):
         DtcMeterType.insert(sess, code, desc)
 
 
-def db_init(sess, root_path):
-    db_name = config["PGDATABASE"]
-    log_message("Initializing database.")
-
-    ct_now = ct_datetime_now()
-    last_month_start, _ = list(
-        c_months_u(finish_year=ct_now.year, finish_month=ct_now.month, months=2)
-    )[0]
-
-    insert_voltage_levels(sess)
-    sess.commit()
-
-    for code in ("editor", "viewer", "party-viewer"):
-        UserRole.insert(sess, code)
-    sess.commit()
-
-    insert_sources(sess)
-    sess.commit()
-
-    insert_generator_types(sess)
-    sess.commit()
-
+def insert_read_types(sess):
     for code, desc in (
         ("A", "Actual Change of Supplier Read"),
         ("D", "Deemed (Settlement Registers) or Estimated (Non-Settlement Registers)"),
@@ -6731,6 +6710,31 @@ def db_init(sess, root_path):
         ("Z", "Actual Change of Tenancy Read"),
     ):
         sess.add(ReadType(code, desc))
+
+
+def db_init(sess, root_path):
+    db_name = config["PGDATABASE"]
+    log_message("Initializing database.")
+
+    ct_now = ct_datetime_now()
+    last_month_start, _ = list(
+        c_months_u(finish_year=ct_now.year, finish_month=ct_now.month, months=2)
+    )[0]
+
+    insert_voltage_levels(sess)
+    sess.commit()
+
+    for code in ("editor", "viewer", "party-viewer"):
+        UserRole.insert(sess, code)
+    sess.commit()
+
+    insert_sources(sess)
+    sess.commit()
+
+    insert_generator_types(sess)
+    sess.commit()
+
+    insert_read_types(sess)
     sess.commit()
 
     insert_cops(sess)

chellow/reports/report_429.py

@@ -102,6 +102,7 @@ def content(g_batch_id, g_bill_id, g_contract_id, start_date, finish_date, user_
                     _process_g_bill_ids(
                         sess,
                         report_context,
+                        g_contract,
                         g_bill_ids,
                         forecast_date,
                         bill_titles,
@@ -122,6 +123,7 @@ def content(g_batch_id, g_bill_id, g_contract_id, start_date, finish_date, user_
 def _process_g_bill_ids(
     sess,
     report_context,
+    g_contract,
     g_bill_ids,
     forecast_date,
     bill_titles,
@@ -132,15 +134,24 @@ def _process_g_bill_ids(
     g_bill_id = list(sorted(g_bill_ids))[0]
     g_bill_ids.remove(g_bill_id)
     g_bill = sess.query(GBill).filter(GBill.id == g_bill_id).one()
-    problem = ""
     g_supply = g_bill.g_supply
+    vals = {
+        "covered_vat_gbp": Decimal("0.00"),
+        "covered_net_gbp": Decimal("0.00"),
+        "covered_gross_gbp": Decimal("0.00"),
+        "covered_kwh": Decimal(0),
+        "covered_start": g_bill.start_date,
+        "covered_finish": g_bill.finish_date,
+        "covered_bill_ids": [],
+        "virtual_problem": "",
+    }
     read_dict = defaultdict(set)
     for g_read in g_bill.g_reads:
         if not all(
             g_read.msn == era.msn
             for era in g_supply.find_g_eras(sess, g_read.prev_date, g_read.pres_date)
         ):
-            problem += (
+            vals["virtual_problem"] += (
                 f"The MSN {g_read.msn} of the register read {g_read.id} doesn't match "
                 f"the MSN of all the relevant eras."
             )
@@ -152,17 +163,9 @@ def _process_g_bill_ids(
             typ_set = read_dict[str(dt) + "-" + g_read.msn]
             typ_set.add(typ)
             if len(typ_set) > 1:
-                problem += f" Reads taken on {dt} have differing read types."
-
-    vals = {
-        "covered_vat_gbp": Decimal("0.00"),
-        "covered_net_gbp": Decimal("0.00"),
-        "covered_gross_gbp": Decimal("0.00"),
-        "covered_kwh": Decimal(0),
-        "covered_start": g_bill.start_date,
-        "covered_finish": g_bill.finish_date,
-        "covered_bill_ids": [],
-    }
+                vals[
+                    "virtual_problem"
+                ] += f" Reads taken on {dt} have differing read types."
 
     covered_primary_bill = None
     enlarged = True
@@ -270,12 +273,19 @@ def _process_g_bill_ids(
             or_(GEra.finish_date == null(), GEra.finish_date >= vals["covered_start"]),
         )
     ).scalars():
+        if g_era.g_contract != g_contract:
+            vals[
+                "virtual_problem"
+            ] += "The contract of the bill is different from the contract of the era."
+            continue
         site = (
             sess.query(Site)
             .join(SiteGEra)
             .filter(SiteGEra.is_physical == true(), SiteGEra.g_era == g_era)
             .one()
         )
+        vals["site_code"] = site.code
+        vals["site_name"] = site.name
 
         chunk_start = hh_max(vals["covered_start"], g_era.start_date)
         chunk_finish = hh_min(vals["covered_finish"], g_era.finish_date)
@@ -314,8 +324,6 @@ def _process_g_bill_ids(
     vals["bill_finish_date"] = g_bill.finish_date
     vals["mprn"] = g_supply.mprn
     vals["supply_name"] = g_supply.name
-    vals["site_code"] = site.code
-    vals["site_name"] = site.name
 
     for k, v in vals.items():
         if k == "covered_bill_ids":
@@ -332,9 +340,7 @@ def _process_g_bill_ids(
             except KeyError:
                 vals[title] = None
 
-    csv_writer.writerow(
-        [(vals.get(k) if vals.get(k) is not None else "") for k in titles]
-    )
+    csv_writer.writerow([csv_make_val(vals.get(k)) for k in titles])
 
 
 def do_get(sess):

chellow/templates/general_imports.html

@@ -445,6 +445,7 @@
 				<td><em>update</em></td>
 				<td><em>g_era</em></td>
 				<td>MPRN</td>
+				<td>Date</td>
 				<td>Start date</td>
 				<td>Finish date</td>
 				<td>Meter Serial Number</td>

{chellow-1720006293.0.0.dist-info → chellow-1720600044.0.0.dist-info}/METADATA

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

@@ -5,7 +5,7 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=5SmP-0QPK6xCkd_wjIWh_8FAzN5OxNHCzyEQ1Xb-Y-M,5256
 chellow/edi_lib.py,sha256=alu20x9ZX06iPfnNI9dEJzuP6RIf4We3Y_M_bl7RrcY,51789
 chellow/general_import.py,sha256=l3EHq9zG9Vfl5Ee6XTVrC1nusXo4YGGB4VBmZ_JaJR8,65798
-chellow/models.py,sha256=SYLBU6olcoYlrqSGeF6YYDHP_1pf4xT_M1QpHDOYCIs,243088
+chellow/models.py,sha256=7fCVyf9aCDb9natETLHzC2XIQkYxJhyLQhOQsTMWjFI,243147
 chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
 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=AiafJQsK5pY7_bTiPq3zfJT1wEmcx5hhqkhIdX7fl8U,215342
+chellow/e/views.py,sha256=l2G7IZiCi3krcTokE18DAJGQvAXiZQHKwAdpdCiNxso,215060
 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
@@ -83,7 +83,7 @@ chellow/reports/report_291.py,sha256=rqBXy6s7hMeYWw-yNX6w_L5t2yz6rNEeos_4xO7wf90
 chellow/reports/report_33.py,sha256=laVz-itDbJTdvC6LxLEeuY0eKpYx43Un4adiExPTEEE,16730
 chellow/reports/report_387.py,sha256=kmBZopb0AOivcowO2nPjRj6LnV0_QjCDXLwqPL7IGVE,5672
 chellow/reports/report_41.py,sha256=QQeTshA1Og7N3wPaoZ8ynJzwsvZ1mgSFc7DDkVqIZoM,7447
-chellow/reports/report_429.py,sha256=0GCc0rQnOSG0fusw69yMMOCxnWApBd3P2sGWIg1py9M,12359
+chellow/reports/report_429.py,sha256=8WlLqyfMyvIF5Kc6CE0MKwcT5xwmR_Ao99Ef72yAOVc,12668
 chellow/reports/report_59.py,sha256=CCFPUspUFgoMt6sMFsdtLYW-inA9rN6D-6Kted6vskA,45458
 chellow/reports/report_81.py,sha256=f7sKPZUbl2VDbDHIg7B5rMDxcx_xnV1Y6PbjJyiTPLA,5609
 chellow/reports/report_87.py,sha256=j2gdBOapaVY1ZnlNlw14RPx58_k8eUkc3oRSnKuCsNA,7057
@@ -115,7 +115,7 @@ chellow/templates/csv_sites_monthly_duration.html,sha256=59gErG6KwA57z-qh2EJsVGv
 chellow/templates/downloads.html,sha256=R9QPcFz-PLJOX7rDlmquIk-Hp9Iq-thzWCTfOexSpXg,937
 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=aPCS_oxOYOCU25koK9lgF3HSiT8GkLeLYpm6NBjT-mo,13051
+chellow/templates/general_imports.html,sha256=VRmBqYsXsirm880WiFrJ3CknAXAoLR9Mnpz9cKjIeM8,13069
 chellow/templates/home.html,sha256=_ANKmcnlk_PDyZl6SCmejU8d90f3t8EH_rDDPDyYUwE,5657
 chellow/templates/input_date.html,sha256=rpgB5n0LfN8Y5djN_ZiuSxqdskxzCoKrEqI7hyJkVQo,1248
 chellow/templates/local_report.html,sha256=pV7_0QwyQ-D3OS9LXrly5pq3qprZnwTCoq6vCnMTkS4,1332
@@ -364,6 +364,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-1720006293.0.0.dist-info/METADATA,sha256=4Fg3yXTfYZ7JKwEwREZI72dTqsSTGAwudXblzYPbCUY,12205
-chellow-1720006293.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1720006293.0.0.dist-info/RECORD,,
+chellow-1720600044.0.0.dist-info/METADATA,sha256=a62z_0cUvruY5SbuPBQeyCb1_GLDsaUZNCewzbwjAYo,12205
+chellow-1720600044.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1720600044.0.0.dist-info/RECORD,,