chellow 1752504067.0.0__py3-none-any.whl → 1753106469.0.0__py3-none-any.whl

chellow/e/views.py

@@ -5714,20 +5714,34 @@ def supply_post(supply_id):
         if "new_msn" 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 data of the MSN change is blank in ECOES.")
 
             msn = req_str("msn")
+            msg = ""
             era = supply.find_era_at(g.sess, start_date)
             if era is None:
-                raise BadRequest(f"There isn't an era at {start_date}")
-            if era.msn == msn:
-                raise BadRequest(f"The era at {start_date} already has the MSN {msn}")
+                raise BadRequest(f"There are no eras from {start_date|hh_format}")
+            else:
+                if 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.msn == msn:
+                        msg += (
+                            f"The era at {hh_format(era.start_date)} already has the "
+                            f"MSN {msn}. "
+                        )
+                    else:
+                        era.msn = msn
 
-            if era.start_date != start_date:
-                era = supply.insert_era_at(g.sess, start_date)
-            era.msn = msn
-            g.sess.commit()
-            flash("MSN updated successfully")
-            return render_template("supply_post.html")
+                        g.sess.commit()
+                        msg += (
+                            f"The era at {hh_format(era.start_date)} has been "
+                            f"successfully updated with the MSN {msn}. "
+                        )
+            flash(msg)
+        return render_template("supply_post.html")
 
     except BadRequest as e:
         flash(e.description)

chellow/models.py

@@ -4271,16 +4271,16 @@ class Supply(Base, PersistentClass):
 
     def find_eras(self, sess, start, finish):
         eras = (
-            sess.query(Era)
-            .filter(
+            select(Era)
+            .where(
                 Era.supply == self,
                 or_(Era.finish_date == null(), Era.finish_date >= start),
             )
             .order_by(Era.start_date)
         )
         if finish is not None:
-            eras = eras.filter(Era.start_date <= finish)
-        return eras.all()
+            eras = eras.where(Era.start_date <= finish)
+        return sess.scalars(eras).all()
 
     def update_era(
         self,

chellow/reports/report_ecoes_comparison.py

@@ -479,7 +479,7 @@ def _process(
 
                 chellow_dtc_meter_type = era.dtc_meter_type
                 if chellow_dtc_meter_type is None:
-                    chellow_meter_type = None
+                    chellow_meter_type = ""
                 else:
                     chellow_meter_type = chellow_dtc_meter_type.code
 

{chellow-1752504067.0.0.dist-info → chellow-1753106469.0.0.dist-info}/METADATA

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

@@ -6,7 +6,7 @@ chellow/dloads.py,sha256=dixp-O0MF2_mlwrnKx3D9DH09Qu05BjTo0rZfigTjR4,5534
 chellow/edi_lib.py,sha256=alu20x9ZX06iPfnNI9dEJzuP6RIf4We3Y_M_bl7RrcY,51789
 chellow/fake_batch_updater.py,sha256=khAmvSUn9qN04w8C92kRg1UeyQvfLztE7QXv9tUz6nE,11611
 chellow/general_import.py,sha256=bm8FoaC9xUajGvJYShuS5GEwPwcL5eCF9D9g6o_AkB0,68089
-chellow/models.py,sha256=XD5wl3Pa8vZFGA0aB1Pu-xJs3iBoBoeX44E8Myho_68,244648
+chellow/models.py,sha256=n6vjsY6jgY98gOY5MGzKuHEEhOs73Pr3XO-auLeQ3es,244656
 chellow/national_grid.py,sha256=-c_vqNRtpNIQOcm0F1NDhS3_QUiOaLgEJYWzysSNc5Y,4369
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
@@ -44,7 +44,7 @@ chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,623
 chellow/e/tlms.py,sha256=K2n-dF6qNW7VQp4m_sVK1HWnXarmAIzpotWXYqWQacY,9363
 chellow/e/tnuos.py,sha256=NBmc-f3oezrl4gviAKobljHfICTpBKxxxEGBGJi_lRk,4927
 chellow/e/triad.py,sha256=uQIngSrz8irBXQ0Rp_s8nAUzu-y2Ms7aj4B38_Ff8y8,13720
-chellow/e/views.py,sha256=e5rMZFT2fNO3P14_0nCyOEwNWnMiayx2wqo4PJmBwRM,220111
+chellow/e/views.py,sha256=tCzoVreBLEcNmBDbWWqhQ3qIp-0v93dBhF8yoDeT9mI,220738
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=opjXRrqrgBTbSKzL0JfTLP0fnz3DL3oRZZ4P0DifQ3I,4119
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
@@ -104,7 +104,7 @@ chellow/reports/report_bills.py,sha256=LP7XDxzO0Fp10c8xDE67e4tHTEc7nN74ESQBy762N
 chellow/reports/report_csv_llfcs.py,sha256=mMB06b6Jems5kcQU4H4Le_fyKgVr8THP8BCx3pkvg5E,1903
 chellow/reports/report_csv_site_hh_data.py,sha256=ik0OkGVo1bfTXLdcT3gPUHnxSkSdorzZheP3qgnOR5c,4331
 chellow/reports/report_csv_site_snags.py,sha256=AuAy6vjL0g7vwPPAZhBqxOyITL9_jnyFj012MnUcxxk,2627
-chellow/reports/report_ecoes_comparison.py,sha256=wEwJrFMOz74CidONkTmgWD1Ghhgo9DT0V7Vddkspkqg,21403
+chellow/reports/report_ecoes_comparison.py,sha256=u0L2D1z8j63btdypIRd1NMMqFKgeMz_zK-SAjn7b5b4,21401
 chellow/reports/report_g_monthly_duration.py,sha256=VQq5xTLvdu9Z_vqrgWNP2S4xm2uCSSZA9HVNiQv9Dus,18264
 chellow/reports/report_g_supplies_snapshot.py,sha256=9xB6RDrnbgxuomMcP1b1yEP4kOnEJ34WgKpyxLTprOQ,3998
 chellow/reports/report_g_supply_virtual_bill.py,sha256=EaYrB8PHJIXrUuhiZ7dwUlbNBkuyJebQHrdc308_z1o,3653
@@ -385,6 +385,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-1752504067.0.0.dist-info/METADATA,sha256=JQ87OvQ3HN2PaX1yRXgOmoz27nNcRqBOAk1vT73Rn7Q,12585
-chellow-1752504067.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1752504067.0.0.dist-info/RECORD,,
+chellow-1753106469.0.0.dist-info/METADATA,sha256=YMm8-MduiWKqPWeENv_u33zI391ioRp-tDbKrowYsVo,12585
+chellow-1753106469.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1753106469.0.0.dist-info/RECORD,,