chellow 1701963465.0.0__py3-none-any.whl → 1702999177.0.0__py3-none-any.whl

chellow/e/views.py

@@ -1552,6 +1552,7 @@ def era_edit_get(era_id):
 @e.route("/eras/<int:era_id>/edit/form")
 def era_edit_form_get(era_id):
     try:
+        era = Era.get_by_id(g.sess, era_id)
         ct_now = ct_datetime_now()
         cops = g.sess.scalars(select(Cop).order_by(Cop.code))
         comms = g.sess.scalars(select(Comm).order_by(Comm.code))
@@ -1565,7 +1566,17 @@ def era_edit_form_get(era_id):
         else:
             start_date = to_utc(ct_datetime(ct_now.year, ct_now.month, ct_now.day))
 
-        era = Era.get_by_id(g.sess, era_id)
+        is_ended = req_bool("is_ended")
+        if is_ended:
+            if "finish_year" in request.values:
+                finish_date = req_hh_date("finish")
+            elif era.finish_date is None:
+                finish_date = start_date
+            else:
+                finish_date = era.finish_date
+        else:
+            finish_date = None
+
         RateScriptAliasStart = aliased(RateScript)
         RateScriptAliasFinish = aliased(RateScript)
         mop_contracts = g.sess.scalars(
@@ -1703,20 +1714,26 @@ def era_edit_form_get(era_id):
             mtc_participant = None
 
         if pc.code == "00":
-            imp_llfcs = g.sess.scalars(
+            imp_llfcs_q = (
                 select(Llfc)
                 .join(MtcLlfc)
                 .where(
                     MtcLlfc.mtc_participant == mtc_participant,
                     start_date >= Llfc.valid_from,
-                    Llfc.valid_to == null(),
                     Llfc.is_import == true(),
                 )
                 .order_by(Llfc.code, Llfc.valid_from.desc())
                 .distinct()
             )
+            if finish_date is None:
+                imp_llfcs_q = imp_llfcs_q.where(Llfc.valid_to == null())
+            else:
+                imp_llfcs_q = imp_llfcs_q.where(
+                    or_(Llfc.valid_to == null(), Llfc.valid_to >= finish_date)
+                )
+            imp_llfcs = g.sess.scalars(imp_llfcs_q)
 
-            exp_llfcs = g.sess.scalars(
+            exp_llfcs_q = (
                 select(Llfc)
                 .join(MtcLlfc)
                 .where(
@@ -1728,6 +1745,13 @@ def era_edit_form_get(era_id):
                 .order_by(Llfc.code, Llfc.valid_from.desc())
                 .distinct()
             )
+            if finish_date is None:
+                exp_llfcs_q = exp_llfcs_q.where(Llfc.valid_to == null())
+            else:
+                exp_llfcs_q = exp_llfcs_q.where(
+                    or_(Llfc.valid_to == null(), Llfc.valid_to >= finish_date)
+                )
+            exp_llfcs = g.sess.scalars(exp_llfcs_q)
         else:
             mtc_ssc = MtcSsc.find_by_values(g.sess, mtc_participant, ssc, start_date)
             imp_llfcs = g.sess.scalars(
@@ -1763,6 +1787,7 @@ def era_edit_form_get(era_id):
         return render_template(
             "era_edit_form.html",
             era=era,
+            finish_date=finish_date,
             energisation_statuses=energisation_statuses,
             default_energisation_status=default_energisation_status,
             mop_contracts=mop_contracts,

chellow/reports/report_59.py

@@ -436,7 +436,7 @@ def _process_site(
 
             supply_data["imp-mpan-core"] = imp_mpan_core
             supply_data["exp-mpan-core"] = exp_mpan_core
-            supply_data["associated-site-ids"] |= era_associates
+            supply_data["associated-site-ids"].update(era_associates)
             supply_data["start-date"] = min(sss.start_date, supply_data["start-date"])
             supply_data["finish-date"] = max(
                 sss.finish_date, supply_data["finish-date"]
@@ -666,8 +666,9 @@ def _process_site(
 
                     era_rows.append([make_val(v) for v in out])
 
-    for _, vals in sorted(supplies_data.items()):
-        supply_rows.append(make_val(vals.get(t)) for t in supply_titles)
+    for _, v in sorted(supplies_data.items()):
+        row = [make_val(v.get(t)) for t in supply_titles]
+        supply_rows.append(row)
 
     site_md_used_kw = 0
     for hh in site.hh_data(sess, start_date, finish_date, exclude_virtual=True):
@@ -678,7 +679,7 @@ def _process_site(
         now,
         site.code,
         site.name,
-        site.find_linked_sites(sess, start_date, finish_date),
+        [s.code for s in site.find_linked_sites(sess, start_date, finish_date)],
         start_date,
         finish_date,
         site_category,

chellow/templates/e/era_edit_form.html

@@ -19,7 +19,7 @@
 
 	{% if request.values.is_ended == 'true' %}
 		<label>Finish Date</label>
-		{{input_date('finish', era.finish_date, is_dynamic=False)}}
+		{{input_date('finish', finish_date, is_dynamic=False)}}
 	{% endif %}
 
 	<label>MOP Contract</label>

{chellow-1701963465.0.0.dist-info → chellow-1702999177.0.0.dist-info}/METADATA

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

@@ -34,7 +34,7 @@ chellow/e/scenario.py,sha256=1tUxnvwTzr6cKqiw2wphdv5XDzV6JO6UVYkyQa67vHs,23263
 chellow/e/system_price.py,sha256=F2GF_TNapfpbhoYjuGYAUCtD4JnccOUfd3w2ClG55qc,8032
 chellow/e/tlms.py,sha256=m6bUY1LNRlPoZ8va7Y3TlXAIktlTz36UVygFoDqwXIc,9586
 chellow/e/tnuos.py,sha256=Ry5Re7h5lOwzDgFRg4KhhFX1HMJ2vVWEwPJKYeESecs,20806
-chellow/e/views.py,sha256=-yEGDquRtL8TfcT7xViScnJ_kFFT4atJhZ3roagI82w,208235
+chellow/e/views.py,sha256=pdqQtAjAsEK1Fk3Ongg8af5vlS25vEUauYCK2Dh99vA,209207
 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
@@ -81,7 +81,7 @@ chellow/reports/report_33.py,sha256=Dakqsl-2kGxl8rVnZuK2f0icIHKB0OlKs-6zoZ7kCMc,
 chellow/reports/report_387.py,sha256=cfEda5oL9j4Rbwh3PTw6FY6WwJT_It8MUZoSSqPMxyU,5793
 chellow/reports/report_41.py,sha256=3wNRv6yIAaI4zqM2lA1Fz-X706Hmc5vZSMvvfGmoPng,7571
 chellow/reports/report_429.py,sha256=zEFYcIw9bA9z7BHVoHRMnMOJt4OlTL4DJNsCX1yJEf0,12503
-chellow/reports/report_59.py,sha256=Broxh8-8SpkXCgmn2XV-Xnob5zAAUD_E5SsPHiDr-rw,44640
+chellow/reports/report_59.py,sha256=sDDXflp6m46WVxUr2EP3bIpkDekXJ0xtvGzdLq2EDJM,44677
 chellow/reports/report_81.py,sha256=XrBLfuwLtMsn8EfoMaPRO92TKHsu_3MW95ynknDtF4I,4385
 chellow/reports/report_87.py,sha256=aqii485kbYZAvl7ajL1rGsC4eHbXAxbkGoazGwDJj0Q,5717
 chellow/reports/report_asset_comparison.py,sha256=6kHiPOL5fiZXtPyKXQ0fHvi1zYX51Frb4NMMDwLdWvc,6140
@@ -205,7 +205,7 @@ chellow/templates/e/em_totals.html,sha256=D_H12qF6b8heVeSGzcl4u7xRvtPLUtM1zWYrwE
 chellow/templates/e/energisation_status.html,sha256=hvD1qMpLYjmWWGIrv-5Ko3KbRL3a6MdQXcO3Fr4_cHA,478
 chellow/templates/e/energisation_statuses.html,sha256=qwRIH7jqKA1MgajsWOeZAH89iRpOfsNW_fAqXymUQ3E,587
 chellow/templates/e/era_edit.html,sha256=hW2_8Yt1n6VbT15a3PJ4Tn7wwVKyU-IkYDSLC1ZWCRQ,4022
-chellow/templates/e/era_edit_form.html,sha256=dd2AjxZjrKw01CCEBkXEQZ8biuep0APcOm1cYjgcG9I,4749
+chellow/templates/e/era_edit_form.html,sha256=NhVp965vVnQw6fneGugkAc0nkojjUncbQdio6IeQwhE,4745
 chellow/templates/e/era_supplier_bill_add.html,sha256=TgcIFuX-_sXXYFsn9yGT-QqMrZe6uLxWoJ-G0f-VELU,2050
 chellow/templates/e/generator_type.html,sha256=En0lQSU_mc-QLMG5Hx-gDINVoqyfa4X9RYwopzpm33g,439
 chellow/templates/e/generator_types.html,sha256=672cXDYewLAk32pzp6c8fi2P48FikxRrzTEtx_PlR7Y,535
@@ -357,6 +357,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-1701963465.0.0.dist-info/METADATA,sha256=RGi21ZtVrdk78hDbhPj8X14ZhWr9jl_wu_xIfrXXABc,12160
-chellow-1701963465.0.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
-chellow-1701963465.0.0.dist-info/RECORD,,
+chellow-1702999177.0.0.dist-info/METADATA,sha256=n-t_5b5YhtN3u4JVBLMB28fU2zYztyaOExrN68FJTrA,12160
+chellow-1702999177.0.0.dist-info/WHEEL,sha256=mRYSEL3Ih6g5a_CVMIcwiF__0Ae4_gLYh01YFNwiq1k,87
+chellow-1702999177.0.0.dist-info/RECORD,,

{chellow-1701963465.0.0.dist-info → chellow-1702999177.0.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.18.0
+Generator: hatchling 1.21.0
 Root-Is-Purelib: true
 Tag: py3-none-any