chellow 1750591796.0.0__py3-none-any.whl → 1750675713.0.0__py3-none-any.whl

chellow/e/views.py

@@ -2172,54 +2172,7 @@ def era_edit_delete(era_id):
         return hx_redirect(f"/supplies/{supply.id}")
     except BadRequest as e:
         flash(e.description)
-        energisation_statuses = g.sess.query(EnergisationStatus).order_by(
-            EnergisationStatus.code
-        )
-        pcs = g.sess.query(Pc).order_by(Pc.code)
-        cops = g.sess.query(Cop).order_by(Cop.code)
-        comms = g.sess.execute(select(Comm).order_by(Comm.code)).scalars()
-        gsp_groups = g.sess.query(GspGroup).order_by(GspGroup.code)
-        mop_contracts = (
-            g.sess.query(Contract)
-            .join(MarketRole)
-            .filter(MarketRole.code == "M")
-            .order_by(Contract.name)
-        )
-        dc_contracts = (
-            g.sess.query(Contract)
-            .join(MarketRole)
-            .filter(MarketRole.code.in_(("C", "D")))
-            .order_by(Contract.name)
-        )
-        supplier_contracts = (
-            g.sess.query(Contract)
-            .join(MarketRole)
-            .filter(MarketRole.code == "X")
-            .order_by(Contract.name)
-        )
-        site_eras = (
-            g.sess.query(SiteEra)
-            .join(Site)
-            .filter(SiteEra.era == era)
-            .order_by(Site.code)
-            .all()
-        )
-        return make_response(
-            render_template(
-                "era_edit.html",
-                era=era,
-                pcs=pcs,
-                cops=cops,
-                comms=comms,
-                gsp_groups=gsp_groups,
-                mop_contracts=mop_contracts,
-                dc_contracts=dc_contracts,
-                supplier_contracts=supplier_contracts,
-                site_eras=site_eras,
-                energisation_statuses=energisation_statuses,
-            ),
-            400,
-        )
+        return hx_redirect(f"/eras/{era.id}/edit", code=307)
 
 
 @e.route("/eras/<int:era_id>/add_supplier_bill")

chellow/fake_batch_updater.py

@@ -144,7 +144,7 @@ def run_import(sess, log, set_progress):
         ).one_or_none()
 
         if fake_batch is not None:
-            log("Found existing fake batch")
+            log(f"Found existing fake batch {fake_batch_name}")
             first_fake_bill = sess.scalars(
                 select(GBill)
                 .where(GBill.g_batch == fake_batch)
@@ -157,10 +157,25 @@ def run_import(sess, log, set_progress):
                 fake_batch.delete(sess)
                 sess.flush()
                 fake_batch = None
+                log(f"Deleted fake batch {fake_batch_name}")
 
         if fake_batch is None:
-            log("Adding a new fake batch")
-            fake_batch = g_contract.insert_g_batch(sess, fake_batch_name, "Fake Batch")
+            latest_bill = sess.scalars(
+                select(GBill)
+                .join(GBatch)
+                .where(GBatch.g_contract == g_contract)
+                .order_by(GBill.finish_date.desc())
+            ).first()
+            if latest_bill is None:
+                log(
+                    "No actual bills found for this contract, so not creating fake "
+                    "batch"
+                )
+                continue
+            if latest_bill.finish_date >= last_month_start:
+                log("Actual bills found in the last month, so not creating fake batch")
+                continue
+
             raw_bills = fb_func(
                 sess,
                 log,
@@ -170,6 +185,10 @@ def run_import(sess, log, set_progress):
                 current_month_finish,
             )
             if raw_bills is not None and len(raw_bills) > 0:
+                log(f"Adding a new fake batch {fake_batch_name}")
+                fake_batch = g_contract.insert_g_batch(
+                    sess, fake_batch_name, "Fake Batch"
+                )
                 log("About to insert raw bills")
                 for raw_bill in raw_bills:
                     bill_type = BillType.get_by_code(sess, raw_bill["bill_type_code"])
@@ -213,6 +232,8 @@ def run_import(sess, log, set_progress):
                             pres_type,
                         )
                     sess.commit()
+            else:
+                log("No raw bills available, so not adding fake batch")
             sess.commit()
 
 

chellow/reports/report_missing_bills.py

@@ -18,6 +18,7 @@ from chellow.utils import (
     hh_range,
     req_date,
     req_int,
+    to_ct,
 )
 
 
@@ -44,10 +45,11 @@ def content(user_id, report_run_id, contract_id, months_length, finish_date):
             )
             writer.writerow(titles)
 
+            finish_date_ct = to_ct(finish_date)
             months = list(
                 c_months_u(
-                    finish_year=finish_date.year,
-                    finish_month=finish_date.month,
+                    finish_year=finish_date_ct.year,
+                    finish_month=finish_date_ct.month,
                     months=months_length,
                 )
             )

{chellow-1750591796.0.0.dist-info → chellow-1750675713.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1750591796.0.0
+Version: 1750675713.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-1750591796.0.0.dist-info → chellow-1750675713.0.0.dist-info}/RECORD

@@ -4,7 +4,7 @@ chellow/bank_holidays.py,sha256=T_utYMwe_g1dz5X-aOTdIPryg49SvB7QsWM1yphlqG8,4423
 chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=dixp-O0MF2_mlwrnKx3D9DH09Qu05BjTo0rZfigTjR4,5534
 chellow/edi_lib.py,sha256=alu20x9ZX06iPfnNI9dEJzuP6RIf4We3Y_M_bl7RrcY,51789
-chellow/fake_batch_updater.py,sha256=RH43yx0ndVM0xrMaNXdla_ZVMoyMp_zXzSvyt-jM62o,10759
+chellow/fake_batch_updater.py,sha256=khAmvSUn9qN04w8C92kRg1UeyQvfLztE7QXv9tUz6nE,11611
 chellow/general_import.py,sha256=y8X-FzQJzVrfvVMyErNHns2MGI511KwDC19AjIX3nTk,65325
 chellow/models.py,sha256=XD5wl3Pa8vZFGA0aB1Pu-xJs3iBoBoeX44E8Myho_68,244648
 chellow/national_grid.py,sha256=-c_vqNRtpNIQOcm0F1NDhS3_QUiOaLgEJYWzysSNc5Y,4369
@@ -44,7 +44,7 @@ chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,623
 chellow/e/tlms.py,sha256=Wb9ZuxscMzxXs0FT06Iu5YXeccmO6ai_mUjnJGJwTM4,9045
 chellow/e/tnuos.py,sha256=NBmc-f3oezrl4gviAKobljHfICTpBKxxxEGBGJi_lRk,4927
 chellow/e/triad.py,sha256=lIQj7EdUrcFwEqleuHZXYU_bfzIwNOqUVVxB3NPQt4A,13710
-chellow/e/views.py,sha256=i_AGJgJf7MZPNHwVUrEnzOoxSO3qIag7ZG8pNVC6xCE,220822
+chellow/e/views.py,sha256=jNm52QtQLUcm25WEy480Lj5gyJnCnxyUSpAeYSWHCew,219257
 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
@@ -109,7 +109,7 @@ chellow/reports/report_g_supplies_snapshot.py,sha256=9xB6RDrnbgxuomMcP1b1yEP4kOn
 chellow/reports/report_g_supply_virtual_bill.py,sha256=EaYrB8PHJIXrUuhiZ7dwUlbNBkuyJebQHrdc308_z1o,3653
 chellow/reports/report_g_virtual_bills.py,sha256=20vHa5LGQwOAlJlaGJaGszZrrbT0PMOZJf6hSxU2hIQ,4528
 chellow/reports/report_g_virtual_bills_hh.py,sha256=gaiLEmKTpq6JsfZ1p0SdCDuPvzvigXp6z88gHRCA63w,3416
-chellow/reports/report_missing_bills.py,sha256=3uWA6Wyskn30tUDOV_W6u_009flfKzua7vDh_jsBDaM,5956
+chellow/reports/report_missing_bills.py,sha256=aCgpVpwjN7jKg1S_pnmnHgo9FKFFSThSkiEKAUYvtSo,6021
 chellow/reports/report_sscs.py,sha256=fQWyVG-gdg37DyNHgpNARpSxIwTl7mCn20fDLwx9oHg,3214
 chellow/reports/report_supply_contacts.py,sha256=pvwlInaPYV_pa9MMK6vh854plHFwv3m5zo5xulR1g5I,3599
 chellow/static/css/chellow.css,sha256=dnkuj9Z1BCOV_L2Y26lDd2QlTmFFhATa1YvwPVch1Oc,5375
@@ -384,6 +384,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-1750591796.0.0.dist-info/METADATA,sha256=DRXh-odYMTSn96sdP_y_qaRPg7WlsxNGoWrnWVjiiow,12238
-chellow-1750591796.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1750591796.0.0.dist-info/RECORD,,
+chellow-1750675713.0.0.dist-info/METADATA,sha256=u_m0k6YJsGsmxkP2OMuolkwQHXalamspQAjqTZ78H8c,12238
+chellow-1750675713.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1750675713.0.0.dist-info/RECORD,,