chellow 1702908341.0.0__tar.gz → 1702999177.0.0__tar.gz

{chellow-1702908341.0.0 → chellow-1702999177.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1702908341.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-1702999177.0.0/VERSION

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

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

@@ -1012,6 +1012,126 @@ def test_era_edit_form_get(client, sess):
     match(response, 200, *patterns)
 
 
+def test_era_edit_form_get_ended_llfc(client, sess):
+    vf = to_utc(ct_datetime(1996, 1, 1))
+    site = Site.insert(sess, "CI017", "Water Works")
+
+    market_role_Z = MarketRole.get_by_code(sess, "Z")
+    participant = Participant.insert(sess, "CALB", "AK Industries")
+    participant.insert_party(sess, market_role_Z, "None core", vf, None, None)
+    bank_holiday_rate_script = {"bank_holidays": []}
+    Contract.insert_non_core(
+        sess, "bank_holidays", "", {}, vf, None, bank_holiday_rate_script
+    )
+    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", 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,
+        to_utc(ct_datetime(2023, 1, 1)),
+    )
+    MtcLlfc.insert(sess, mtc_participant, llfc, vf, None)
+    insert_sources(sess)
+    source = Source.get_by_code(sess, "net")
+    insert_energisation_statuses(sess)
+    energisation_status = EnergisationStatus.get_by_code(sess, "E")
+    gsp_group = GspGroup.insert(sess, "_L", "South Western")
+    supply = site.insert_e_supply(
+        sess,
+        source,
+        None,
+        "Bob",
+        utc_datetime(2000, 1, 1),
+        utc_datetime(2020, 1, 1),
+        gsp_group,
+        mop_contract,
+        "773",
+        dc_contract,
+        "ghyy3",
+        "hgjeyhuw",
+        dno,
+        pc,
+        "845",
+        cop,
+        comm,
+        None,
+        energisation_status,
+        {},
+        "22 0470 7514 535",
+        "510",
+        imp_supplier_contract,
+        "7748",
+        361,
+        None,
+        None,
+        None,
+        None,
+        None,
+    )
+    era = supply.eras[0]
+
+    sess.commit()
+
+    query_string = {
+        "is_ended": "true",
+        "pc_id": pc.id,
+        "mtc_participant_id": mtc_participant.id,
+        "has_imp_mpan": "true",
+    }
+
+    response = client.get(f"/e/eras/{era.id}/edit/form", query_string=query_string)
+
+    patterns = [
+        r'<select name="imp_llfc_id">\s*'
+        r'<option value="1">510 PC 5-8 &amp; HH HV</option>\s*'
+        r"</select>",
+    ]
+    match(response, 200, *patterns)
+
+
 def test_dno_rate_script_edit_post(sess, client):
     valid_from = to_utc(ct_datetime(2000, 1, 1))
     participant = Participant.insert(sess, "CALB", "AK Industries")

chellow-1702908341.0.0/VERSION

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