chellow 1711032714.0.0__tar.gz → 1712589951.0.0__tar.gz

{chellow-1711032714.0.0 → chellow-1712589951.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1711032714.0.0
+Version: 1712589951.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-1712589951.0.0/VERSION

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

{chellow-1711032714.0.0 → chellow-1712589951.0.0}/chellow/e/views.py

@@ -1569,7 +1569,6 @@ 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))
         energisation_statuses = g.sess.scalars(
             select(EnergisationStatus).order_by(EnergisationStatus.code)
@@ -1781,6 +1780,11 @@ def era_edit_form_get(era_id):
         else:
             mtc_participant = None
 
+        if mtc_participant is None:
+            cops = g.sess.scalars(select(Cop).order_by(Cop.code))
+        else:
+            cops = Cop.get_valid(g.sess, mtc_participant.meter_type)
+
         if pc.code == "00":
             imp_llfcs_q = (
                 select(Llfc)

{chellow-1711032714.0.0 → chellow-1712589951.0.0}/chellow/models.py

@@ -510,6 +510,17 @@ class Cop(Base, PersistentClass):
             raise BadRequest(f"The CoP with code {code} can't be found.")
         return typ
 
+    @staticmethod
+    def get_valid(sess, meter_type):
+
+        if meter_type.code == "C5":
+            q = select(Cop).where(Cop.code.in_(["1", "2", "3", "4", "5"]))
+        elif meter_type.code in ["6A", "6B", "6C", "6D"]:
+            q = select(Cop).where(Cop.code == meter_type.code.lower())
+        else:
+            q = select(Cop)
+        return sess.scalars(q.order_by(Cop.code))
+
     __tablename__ = "cop"
     id = Column(Integer, primary_key=True)
     code = Column(String, unique=True, nullable=False)
@@ -3700,12 +3711,9 @@ class Era(Base, PersistentClass):
                             f"{hh_format(finish_date)}."
                         )
 
-        if (
-            self.mtc_participant.meter_type.code == "C5"
-            and cop.code not in ["1", "2", "3", "4", "5"]
-            or self.mtc_participant.meter_type.code in ["6A", "6B", "6C", "6D"]
-            and cop.code.upper() != self.mtc_participant.meter_type.code
-        ):
+        if cop.code not in [
+            c.code for c in Cop.get_valid(sess, self.mtc_participant.meter_type)
+        ]:
             raise BadRequest(
                 f"The CoP of {cop.code} is not compatible with the meter type code "
                 f"of {self.mtc_participant.meter_type.code}."

chellow-1711032714.0.0/VERSION

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