chellow 1714484335.0.0__py3-none-any.whl → 1715253565.0.0__py3-none-any.whl

chellow/e/computer.py

@@ -552,6 +552,7 @@ class DataSource:
         self.era_map_mop_contracts = self.era_map.get("mop_contracts", {})
         self.era_map_cops = self.era_map.get("cops", {})
         self.era_map_comms = self.era_map.get("comms", {})
+        self.era_map_dtc_meter_types = self.era_map.get("dtc_meter_types", {})
         self.era_map_mpan_cores = self.era_map.get("mpan_cores", {})
         self.era_map_dnos = self.era_map.get("dnos", {})
         self.era_map_gsp_groups = self.era_map.get("gsp_groups", {})
@@ -672,9 +673,16 @@ class SiteSource(DataSource):
             else:
                 self.sc = era.imp_sc
 
-            self.properties = self.era_map.get("properties_overwritten", {})
-            self.properties.update(era.props)
-            self.properties.update(self.era_map.get("properties_overwrite", {}))
+            if era.dtc_meter_type is None:
+                era_dtc_meter_type_code = None
+            else:
+                era_dtc_meter_type_code = era.dtc_meter_type.code
+            if era_dtc_meter_type_code in self.era_map_dtc_meter_types:
+                self.dtc_meter_type_code = self.era_map_dtc_meter_types[
+                    era_dtc_meter_type_code
+                ]
+            else:
+                self.dtc_meter_type_code = era_dtc_meter_type_code
 
             self.is_import = True
             self.voltage_level_code = self.llfc.voltage_level.code
@@ -1051,9 +1059,16 @@ class SupplySource(DataSource):
         else:
             self.comm_code = era.comm.code
 
-        self.properties = dict(self.era_map.get("properties_overwritten", {}))
-        self.properties.update(era.props)
-        self.properties.update(self.era_map.get("properties_overwrite", {}))
+        if era.dtc_meter_type is None:
+            era_dtc_meter_type_code = None
+        else:
+            era_dtc_meter_type_code = era.dtc_meter_type.code
+        if era_dtc_meter_type_code in self.era_map_dtc_meter_types:
+            self.dtc_meter_type_code = self.era_map_dtc_meter_types[
+                era_dtc_meter_type_code
+            ]
+        else:
+            self.dtc_meter_type_code = era_dtc_meter_type_code
 
         self.id = self.mpan_core
         self.msn = era.msn
@@ -1632,18 +1647,6 @@ def _read_generator(sess, supply, start, is_forwards, is_prev):
         if bill.id != r.bill.id:
             continue
 
-        era = supply.find_era_at(sess, dt)
-        if era is None:
-            era_coeff = None
-        else:
-            era_properties = PropDict(
-                chellow.utils.url_root + "eras/" + str(era.id), loads(era.properties)
-            )
-            try:
-                era_coeff = float(era_properties["coefficient"])
-            except KeyError:
-                era_coeff = None
-
         reads = {}
         coeffs = {}
         for coeff, value, tpr_code in sess.query(
@@ -1656,7 +1659,7 @@ def _read_generator(sess, supply, start, is_forwards, is_prev):
             r_dt == dt,
         ):
             reads[tpr_code] = value
-            coeffs[tpr_code] = coeff if era_coeff is None else era_coeff
+            coeffs[tpr_code] = coeff
 
         yield {
             "date": dt,

chellow/e/views.py

@@ -42,6 +42,7 @@ from chellow.models import (
     Comm,
     Contract,
     Cop,
+    DtcMeterType,
     EnergisationStatus,
     Era,
     GeneratorType,
@@ -49,7 +50,6 @@ from chellow.models import (
     HhDatum,
     Laf,
     Llfc,
-    METER_TYPES,
     MarketRole,
     MeasurementRequirement,
     MeterPaymentType,
@@ -1505,15 +1505,14 @@ def dno_get(dno_id):
 
 @e.route("/dtc_meter_types")
 def dtc_meter_types_get():
-    return render_template("dtc_meter_types.html", dtc_meter_types=METER_TYPES)
+    dtc_meter_types = g.sess.scalars(select(DtcMeterType).order_by(DtcMeterType.code))
+    return render_template("dtc_meter_types.html", dtc_meter_types=dtc_meter_types)
 
 
-@e.route("/dtc_meter_types/<code>")
-def dtc_meter_type_get(code):
-    desc = METER_TYPES[code]
-    return render_template(
-        "dtc_meter_type.html", dtc_meter_type_code=code, dtc_meter_type_description=desc
-    )
+@e.route("/dtc_meter_types/<int:dtc_meter_type_id>")
+def dtc_meter_type_get(dtc_meter_type_id):
+    dtc_meter_type = DtcMeterType.get_by_id(g.sess, dtc_meter_type_id)
+    return render_template("dtc_meter_type.html", dtc_meter_type=dtc_meter_type)
 
 
 @e.route("/duration_report")
@@ -1569,6 +1568,7 @@ def era_edit_get(era_id):
     cops = g.sess.query(Cop).order_by(Cop.code)
     comms = g.sess.query(Comm).order_by(Comm.code)
     gsp_groups = g.sess.query(GspGroup).order_by(GspGroup.code)
+    dtc_meter_types = g.sess.scalars(select(DtcMeterType).order_by(DtcMeterType.code))
     mop_contracts = (
         g.sess.query(Contract)
         .join(MarketRole)
@@ -1602,6 +1602,7 @@ def era_edit_get(era_id):
         cops=cops,
         comms=comms,
         gsp_groups=gsp_groups,
+        dtc_meter_types=dtc_meter_types,
         mop_contracts=mop_contracts,
         dc_contracts=dc_contracts,
         supplier_contracts=supplier_contracts,
@@ -1619,6 +1620,9 @@ def era_edit_form_get(era_id):
             select(EnergisationStatus).order_by(EnergisationStatus.code)
         )
         default_energisation_status = EnergisationStatus.get_by_code(g.sess, "E")
+        dtc_meter_types = g.sess.scalars(
+            select(DtcMeterType).order_by(DtcMeterType.code)
+        )
 
         if "start_year" in request.values:
             start_date = req_date("start")
@@ -1938,6 +1942,7 @@ def era_edit_form_get(era_id):
             start_date=start_date,
             imp_llfcs=imp_llfcs,
             exp_llfcs=exp_llfcs,
+            dtc_meter_types=dtc_meter_types,
         )
     except BadRequest as e:
         g.sess.rollback()
@@ -1954,6 +1959,7 @@ def era_edit_form_get(era_id):
             sscs=sscs,
             mtc_participants=mtc_participants,
             mtc_participant=mtc_participant,
+            dtc_meter_types=dtc_meter_types,
         )
 
 
@@ -2013,7 +2019,11 @@ def era_edit_post(era_id):
             energisation_status = EnergisationStatus.get_by_id(
                 g.sess, energisation_status_id
             )
-            properties = req_zish("properties")
+            dtc_meter_type_id = req_int_none("dtc_meter_type_id")
+            if dtc_meter_type_id is None:
+                dtc_meter_type = None
+            else:
+                dtc_meter_type = DtcMeterType.get_by_id(g.sess, dtc_meter_type_id)
 
             has_imp_mpan = req_bool("has_imp_mpan")
             has_exp_mpan = req_bool("has_exp_mpan")
@@ -2072,7 +2082,7 @@ def era_edit_post(era_id):
                 comm,
                 ssc_code,
                 energisation_status,
-                properties,
+                dtc_meter_type,
                 imp_mpan_core,
                 imp_llfc_code,
                 imp_supplier_contract,
@@ -4626,7 +4636,12 @@ def site_add_e_supply_post(site_id):
         energisation_status = EnergisationStatus.get_by_id(
             g.sess, energisation_status_id
         )
-        properties = req_zish("properties")
+        dtc_meter_type_id = req_int_none("dtc_meter_type_id")
+        if dtc_meter_type_id is None:
+            dtc_meter_type = None
+        else:
+            dtc_meter_type = DtcMeterType.get_by_id(g.sess, dtc_meter_type_id)
+
         if "generator_type_id" in request.form:
             generator_type_id = req_int("generator_type_id")
             generator_type = GeneratorType.get_by_id(g.sess, generator_type_id)
@@ -4703,7 +4718,7 @@ def site_add_e_supply_post(site_id):
             comm,
             None if ssc is None else ssc.code,
             energisation_status,
-            properties,
+            dtc_meter_type,
             imp_mpan_core,
             imp_llfc_code,
             imp_supplier_contract,

chellow/general_import.py

@@ -9,7 +9,7 @@ from sqlalchemy.sql.expression import false
 
 from werkzeug.exceptions import BadRequest
 
-from zish import ZishException, loads
+from zish import loads
 
 from chellow.models import (
     Bill,
@@ -18,6 +18,7 @@ from chellow.models import (
     Comm,
     Contract,
     Cop,
+    DtcMeterType,
     EnergisationStatus,
     Era,
     GContract,
@@ -389,11 +390,11 @@ def general_import_era(sess, action, vals, args):
         else:
             energisation_status = EnergisationStatus.get_by_code(sess, es_code)
 
-        properties_str = add_arg(args, "Properties", vals, 14)
-        if properties_str == NO_CHANGE:
-            properties = loads(existing_era.properties)
+        dtc_meter_type_code = add_arg(args, "DTC Meter Type", vals, 14)
+        if dtc_meter_type_code == NO_CHANGE:
+            dtc_meter_type = existing_era.dtc_meter_type
         else:
-            properties = loads(properties_str)
+            dtc_meter_type = DtcMeterType.get_by_code(sess, dtc_meter_type_code)
 
         imp_mpan_core = add_arg(args, "Import MPAN Core", vals, 15)
         if imp_mpan_core == NO_CHANGE:
@@ -519,7 +520,7 @@ def general_import_era(sess, action, vals, args):
             comm,
             ssc_code,
             energisation_status,
-            properties,
+            dtc_meter_type,
             imp_mpan_core,
             imp_llfc_code,
             imp_supplier_contract,
@@ -1275,11 +1276,8 @@ def general_import_supply(sess, action, vals, args):
         energisation_status = EnergisationStatus.get_by_code(
             sess, energisation_status_code
         )
-        properties_str = add_arg(args, "Properties", vals, 19)
-        try:
-            properties = loads(properties_str)
-        except ZishException as e:
-            raise BadRequest(f"Can't parse the properties field. {e}")
+        dtc_meter_type_code = add_arg(args, "DTC Meter Type", vals, 19)
+        dtc_meter_type = DtcMeterType.get_by_code(sess, dtc_meter_type_code)
         imp_mpan_core = add_arg(args, "Import MPAN Core", vals, 20)
         if len(imp_mpan_core) == 0:
             imp_mpan_core = None
@@ -1356,7 +1354,7 @@ def general_import_supply(sess, action, vals, args):
             comm,
             ssc_code,
             energisation_status,
-            properties,
+            dtc_meter_type,
             imp_mpan_core,
             imp_llfc_code,
             imp_supplier_contract,

chellow/models.py

@@ -2452,6 +2452,38 @@ class Laf(Base, PersistentClass):
         self.value = value
 
 
+# J0483 in https://www.electralink.co.uk/data-catalogues/dtc-catalogue/
+class DtcMeterType(Base, PersistentClass):
+    __tablename__ = "dtc_meter_type"
+    id = Column(Integer, primary_key=True)
+    code = Column(String, nullable=False, unique=True)
+    description = Column(String, nullable=False)
+    eras = relationship("Era", backref="dtc_meter_type")
+
+    def __init__(self, code, description):
+        self.code = code
+        self.description = description
+
+    @classmethod
+    def insert(cls, sess, code, description):
+        dtc_meter_type = cls(code, description)
+        sess.add(dtc_meter_type)
+        return dtc_meter_type
+
+    @staticmethod
+    def find_by_code(sess, code):
+        return sess.execute(
+            select(DtcMeterType).where(DtcMeterType.code == code)
+        ).scalar_one_or_none()
+
+    @classmethod
+    def get_by_code(cls, sess, code):
+        dtc_meter_type = cls.find_by_code(sess, code)
+        if dtc_meter_type is None:
+            raise Exception(f"Can't find the DTC meter type with code {code}.")
+        return dtc_meter_type
+
+
 class MeterType(Base, PersistentClass):
     __tablename__ = "meter_type"
     id = Column(Integer, primary_key=True)
@@ -3234,42 +3266,6 @@ class EnergisationStatus(Base, PersistentClass):
         return energisation_status
 
 
-METER_TYPES = {
-    "H": "Half Hourly",
-    "K": "Key",
-    "LAG": "Lag",
-    "LEAD": "Lead",
-    "MAIN": "Main",
-    "N": "Non-Half Hourly",
-    "NCAMR": "Non-remotely Configurable Automated Meter Reading",
-    "NSS": "A meter that meets the definition of an ADM but is not compliant "
-    "with any version of SMETS",
-    "RCAMR": "Remotely Configurable Automated Meter Reading without remote "
-    "enable/disable capability",
-    "RCAMY": "Remotely Configurable Automated Meter Reading with remote "
-    "enable/disable capability",
-    "S": "Smartcard Prepayment",
-    "S1": "A meter that is compliant with the Smart Metering Equipment "
-    "Technical Specifications 1 (SMETS1)",
-    "S2A": "A single element meter that is compliant with SMETS2",
-    "S2B": "A twin element meter that is compliant with SMETS2",
-    "S2C": "A polyphase meter that is compliant with SMETS2",
-    "S2AD": "A single element meter with one or more ALCS that is compliant "
-    "with SMETS2",
-    "S2BD": "A twin element meter with one or more ALCS that is compliant "
-    "with SMETS2",
-    "S2CD": "A polyphase meter with one or more ALCS that is compliant with " "SMETS2",
-    "S2ADE": "Single element meter with one or more ALCS and Boost Function "
-    "that is compliant with SMETS2",
-    "S2BDE": "A twin element meter with one or more ALCS and Boost Function "
-    "that is compliant with SMETS2",
-    "S2CDE": "A polyphase meter with one or more ALCS and Boost Function that "
-    "is compliant with SMETS2",
-    "SPECL": "Special",
-    "T": "Token",
-}
-
-
 class Era(Base, PersistentClass):
     __tablename__ = "era"
     id = Column(Integer, primary_key=True)
@@ -3298,7 +3294,7 @@ class Era(Base, PersistentClass):
     energisation_status_id = Column(
         Integer, ForeignKey("energisation_status.id"), nullable=False
     )
-    properties = Column(Text, nullable=False)
+    dtc_meter_type_id = Column(Integer, ForeignKey("dtc_meter_type.id"))
     imp_mpan_core = Column(String)
     imp_llfc_id = Column(Integer, ForeignKey("llfc.id"))
     imp_llfc = relationship("Llfc", primaryjoin="Llfc.id==Era.imp_llfc_id")
@@ -3441,7 +3437,7 @@ class Era(Base, PersistentClass):
                 self.comm,
                 None if self.ssc is None else self.ssc.code,
                 self.energisation_status,
-                loads(self.properties),
+                self.dtc_meter_type,
                 self.imp_mpan_core,
                 None if self.imp_llfc is None else self.imp_llfc.code,
                 self.imp_supplier_contract,
@@ -3470,7 +3466,7 @@ class Era(Base, PersistentClass):
         comm,
         ssc_code,
         energisation_status,
-        properties,
+        dtc_meter_type,
         imp_mpan_core,
         imp_llfc_code,
         imp_supplier_contract,
@@ -3521,22 +3517,7 @@ class Era(Base, PersistentClass):
                 "A NHH supply must have a Standard Settlement Configuration."
             )
         self.energisation_status = energisation_status
-
-        if isinstance(properties, dict):
-            try:
-                meter_type = properties["meter_type"]
-                if meter_type not in METER_TYPES:
-                    raise BadRequest(
-                        f"The meter type {meter_type} must be one of {METER_TYPES}."
-                    )
-            except KeyError:
-                pass
-
-            self.properties = dumps(properties)
-        else:
-            raise Exception(
-                f"The properties argument must be a dict, rather than {properties}."
-            )
+        self.dtc_meter_type = dtc_meter_type
 
         locs = locals()
         voltage_level = None
@@ -3775,29 +3756,13 @@ class Era(Base, PersistentClass):
         sess.delete(channel)
         sess.flush()
 
-    @property
-    def props(self):
-        if not hasattr(self, "_props"):
-            self._props = loads(self.properties)
-        return self._props
-
     @property
     def meter_category(self):
         if not hasattr(self, "_meter_category"):
-            meter_type = self.props.get("meter_type")
-            try:
-                cat = METER_CATEGORY[meter_type]
-            except KeyError:
-                if self.pc.code == "00":
-                    cat = "hh"
-                elif len(self.channels) > 0:
-                    cat = "amr"
-                elif self.mtc_participant.meter_type.code in ["UM", "PH"]:
-                    cat = "unmetered"
-                else:
-                    cat = "nhh"
+            self._meter_category = METER_CATEGORY[
+                None if self.dtc_meter_type is None else self.dtc_meter_type.code
+            ]
 
-            self._meter_category = cat
         return self._meter_category
 
     def get_physical_site(self, sess):
@@ -3808,7 +3773,42 @@ class Era(Base, PersistentClass):
         )
 
 
-METER_CATEGORY = {"H": "hh", "N": "nhh", "S1": "amr"}
+METER_CATEGORY = {
+    None: "unmetered",
+    "CHECK": "hh",
+    "H": "hh",
+    "K": "nhh",
+    "LAG_": "hh",
+    "LEAD_": "hh",
+    "MAIN_": "hh",
+    "N": "nhh",
+    "NCAMR": "amr",
+    "NSS": "amr",
+    "RCAMR": "amr",
+    "RCAMY": "amr",
+    "S": "nhh",
+    "S1": "amr",
+    "S2A": "amr",
+    "S2B": "amr",
+    "S2C": "amr",
+    "S2AD": "amr",
+    "S2BD": "amr",
+    "S2CDE": "amr",
+    "SPECL": "nhh",
+    "T": "nhh",
+    "2ADF": "amr",
+    "2ADEF": "amr",
+    "2AEF": "amr",
+    "2AF": "amr",
+    "2BF": "amr",
+    "2BDF": "amr",
+    "2BDEF": "amr",
+    "2BEF": "amr",
+    "2CDEF": "amr",
+    "2CF": "amr",
+    "2CDF": "amr",
+    "2CEF": "amr",
+}
 
 
 class Channel(Base, PersistentClass):
@@ -4521,7 +4521,7 @@ class Supply(Base, PersistentClass):
             template_era.comm,
             None if template_era.ssc is None else template_era.ssc.code,
             template_era.energisation_status,
-            loads(template_era.properties),
+            template_era.dtc_meter_type,
             template_era.imp_mpan_core,
             imp_llfc_code,
             template_era.imp_supplier_contract,
@@ -6567,6 +6567,94 @@ def insert_voltage_levels(sess):
         VoltageLevel.insert(sess, code, desc)
 
 
+def insert_dtc_meter_types(sess):
+    for code, desc in (
+        ("CHECK", "Check"),
+        ("H", "Half Hourly"),
+        ("K", "Key"),
+        ("LAG_", "Lag"),
+        ("LEAD_", "Lead"),
+        ("MAIN_", "Main"),
+        ("N", "Non-Half Hourly"),
+        ("NCAMR", "Non-remotely Configurable Automated Meter Reading"),
+        (
+            "NSS",
+            "A meter that meets the definition of an ADM but is not compliant with "
+            "any version of SMETS",
+        ),
+        (
+            "RCAMR",
+            "Remotely Configurable Automated Meter Reading without remote "
+            "enable/disable capability",
+        ),
+        (
+            "RCAMY",
+            "Remotely Configurable Automated Meter Reading with remote "
+            "enable/disable capability",
+        ),
+        ("S", "Smartcard Prepayment"),
+        (
+            "S1",
+            "A meter that is compliant with the Smart Metering Equipment Technical "
+            "Specifications 1 (SMETS1)",
+        ),
+        ("S2A", "A single element meter that is compliant with SMETS2"),
+        ("S2B", "A twin element meter that is compliant with SMETS2"),
+        ("S2C", "A polyphase meter that is compliant with SMETS2"),
+        (
+            "S2AD",
+            "A single element meter with one or more ALCS that is compliant with "
+            "SMETS2",
+        ),
+        (
+            "S2BD",
+            "A twin element meter with one or more ALCS that is compliant with "
+            "SMETS2",
+        ),
+        (
+            "S2CDE",
+            "A polyphase meter with one or more ALCS and Boost Function that is "
+            "compliant with SMETS2",
+        ),
+        ("SPECL", "Special"),
+        ("T", "Token"),
+        (
+            "2ADF",
+            "Single Element with ALCS and Auxiliary Proportional Controller (APC) "
+            "that is compliant with SMETS2",
+        ),
+        (
+            "2ADEF",
+            "Single Element with ALCS, Boost Function and APC that is compliant "
+            "with SMETS2",
+        ),
+        (
+            "2AEF",
+            "Single Element with Boost Function and APC that is compliant with SMETS2",
+        ),
+        ("2AF", "Single Element with APC that is compliant with SMETS2"),
+        ("2BF", "Twin Element with APC that is compliant with SMETS2"),
+        ("2BDF", "Twin Element with ALCS and APC that is compliant with SMETS2"),
+        (
+            "2BDEF",
+            "Twin Element with ALCS, Boost Function and APC that is compliant with "
+            "SMETS2",
+        ),
+        (
+            "2BEF",
+            "Twin Element with Boost Function and APC that is compliant with SMETS2",
+        ),
+        (
+            "2CDEF",
+            "Polyphase with ALCS, Boost Function and APC that is compliant with SMETS2",
+        ),
+        ("2CF", "Polyphase with APC that is compliant with SMETS2"),
+        ("2CDF", "Polyphase with ALCS and APC that is compliant with SMETS2"),
+        ("2CEF", "Polyphase with Boost Function and APC that is compliant with SMETS2"),
+    ):
+        DtcMeterType.insert(sess, code, desc)
+
+
 def db_init(sess, root_path):
     db_name = config["PGDATABASE"]
     log_message("Initializing database.")
@@ -6658,6 +6746,9 @@ def db_init(sess, root_path):
     ):
         Contract.insert_non_core(sess, name, "", properties, last_month_start, None, {})
 
+    insert_dtc_meter_types(sess)
+    sess.commit()
+
     insert_g_read_types(sess)
     sess.commit()
 
@@ -7295,6 +7386,53 @@ def db_upgrade_45_to_46(sess, root_path):
     )
 
 
+def db_upgrade_46_to_47(sess, root_path):
+    insert_dtc_meter_types(sess)
+    sess.flush()
+
+    sess.execute(
+        text(
+            "alter table era add dtc_meter_type_id integer references dtc_meter_type "
+            "(id);"
+        )
+    )
+    for era_id, pc_id, era_properties, mtc_participant_id in sess.execute(
+        text("select era.id, era.pc_id, era.properties, mtc_participant_id from era")
+    ):
+        dtc_meter_type_id = None
+        props = loads(era_properties)
+        if "meter_type" in props:
+            mt_code = props["meter_type"]
+            dtc_meter_type = DtcMeterType.find_by_code(sess, mt_code)
+            dtc_meter_type_id = dtc_meter_type.id
+
+        if dtc_meter_type_id is None:
+            mtc_participant = MtcParticipant.get_by_id(sess, mtc_participant_id)
+            if mtc_participant.meter_type.code not in ["UM", "PH"]:
+                pc = Pc.get_by_id(sess, pc_id)
+                if pc.code == "00":
+                    dtc_meter_type_code = "H"
+                else:
+                    channels = sess.scalars(
+                        select(Channel).where(Channel.era_id == era_id)
+                    ).all()
+                    if len(channels) > 0:
+                        dtc_meter_type_code = "RCAMR"
+                    else:
+                        dtc_meter_type_code = "N"
+                dtc_meter_type = DtcMeterType.get_by_code(sess, dtc_meter_type_code)
+                dtc_meter_type_id = dtc_meter_type.id
+
+        sess.execute(
+            text(
+                "UPDATE era SET dtc_meter_type_id = :dtc_meter_type_id "
+                "where id = :era_id"
+            ),
+            params={"dtc_meter_type_id": dtc_meter_type_id, "era_id": era_id},
+        )
+    sess.execute(text("alter table era drop column properties;"))
+
+
 upgrade_funcs = [None] * 18
 upgrade_funcs.extend(
     [
@@ -7326,6 +7464,7 @@ upgrade_funcs.extend(
         db_upgrade_43_to_44,
         db_upgrade_44_to_45,
         db_upgrade_45_to_46,
+        db_upgrade_46_to_47,
     ]
 )
 

chellow/reports/report_33.py

@@ -375,7 +375,7 @@ limit 3
             latest_mop_bill_date,
             supply_start_date,
             supply_finish_date,
-            era.properties,
+            None if era.dtc_meter_type is None else era.dtc_meter_type.code,
             imp_tnuos_band,
         ]
         + channel_values
@@ -447,7 +447,7 @@ def _process(sess, f, date, supply_id, mpan_cores):
         "Latest MOP Bill Date",
         "Supply Start Date",
         "Supply Finish Date",
-        "Properties",
+        "DTC Meter Type",
         "tnuos_band",
         "Import ACTIVE?",
         "Import REACTIVE_IMPORT?",

chellow/reports/report_ecoes_comparison.py

@@ -484,7 +484,11 @@ def _process(
                         "serial numbers do match. "
                     )
 
-                chellow_meter_type = _meter_type(era)
+                chellow_dtc_meter_type = era.dtc_meter_type
+                if chellow_dtc_meter_type is None:
+                    chellow_meter_type = None
+                else:
+                    chellow_meter_type = chellow_dtc_meter_type.code
 
                 if chellow_meter_type != ecoes["meter-type"]:
                     problem += "The DTC meter types don't match."
@@ -560,7 +564,8 @@ def _process(
 
         msn = "" if era.msn is None else era.msn
 
-        meter_type = _meter_type(era)
+        dtc_meter_type = era.dtc_meter_type
+        meter_type = "" if dtc_meter_type is None else dtc_meter_type.code
 
         values = {
             "mpan_core": mpan_core,
@@ -605,21 +610,6 @@ def _process(
         report_run.insert_row(sess, "", titles, values, {})
 
 
-def _meter_type(era):
-    props = era.props
-    try:
-        return props["meter_type"]
-    except KeyError:
-        if era.pc.code == "00":
-            return "H"
-        elif len(era.channels) > 0:
-            return "RCAMR"
-        elif era.mtc_participant.meter_type.code in ["UM", "PH"]:
-            return ""
-        else:
-            return "N"
-
-
 def do_get(sess):
     show_ignored = req_bool("show_ignored")
     report_run = ReportRun.insert(

chellow/templates/e/dtc_meter_type.html

@@ -1,11 +1,11 @@
 {% extends "base.html" %}
 
 {% block title %}
-	» DTC Meter Types » {{dtc_meter_type_code}}
+	» DTC Meter Types » {{dtc_meter_type.code}}
 {% endblock %}
 
 {% block nav %}
-	<a href="/e/dtc_meter_types">DTC Meter Types</a> &raquo; {{dtc_meter_type_code}}
+	<a href="/e/dtc_meter_types">DTC Meter Types</a> &raquo; {{dtc_meter_type.code}}
 {% endblock %}
 
 {% block content %}
@@ -13,11 +13,11 @@
 	<table>
 		<tr>
 			<th>Code</th>
-			<td>{{dtc_meter_type_code}}</td>
+			<td>{{dtc_meter_type.code}}</td>
 		</tr>
 		<tr>
 				<th>Description</th>
-				<td>{{dtc_meter_type_description}}</td>
+				<td>{{dtc_meter_type.description}}</td>
 		</tr>
 	</table>
 

chellow/templates/e/dtc_meter_types.html

@@ -18,10 +18,10 @@
 			</tr>
 		</thead>
 		<tbody>
-			{% for code, desc in dtc_meter_types.items() %}
+			{% for dtc_meter_type in dtc_meter_types %}
 				<tr>
-					<td><a href="/e/dtc_meter_types/{{code}}">{{code}}</a></td>
-					<td>{{desc}}</td>
+					<td><a href="/e/dtc_meter_types/{{dtc_meter_type.id}}">{{dtc_meter_type.code}}</a></td>
+					<td>{{dtc_meter_type.description}}</td>
 				</tr>
 			{% endfor %}
 		</tbody>

chellow/templates/e/era_edit.html

@@ -80,6 +80,7 @@
 			{{input_hidden('gsp_group_id', initial=era.supply.gsp_group.id)}}
 			{{input_hidden('mtc_participant_id', initial=era.mtc_participant.id)}}
 			{{input_hidden('ssc_id', initial=era.ssc.id)}}
+			{{input_hidden('dtc_meter_type_id', initial=era.dtc_meter_type.id)}}
 			{{input_hidden('name', initial=era.name)}}
 			{{input_hidden('msn', initial=era.msn)}}
 			{{input_hidden('mop_contract_id', initial=era.mop_contract_id)}}

chellow/templates/e/era_edit_form.html

@@ -89,14 +89,14 @@
 		{% endfor %}
 	</select>
 
-	<label>Properties</label>
-	<div>
-		{{input_textarea('properties', era.properties, 10, 80)}}
-		<p>
-			The <code>meter_type</code> property contains a
-			<a href="/e/dtc_meter_types">DTC Meter Type Code</a>.
-		</p>
-	</div>
+	<label>DTC Meter Type</label>
+	<select name="dtc_meter_type_id">
+		{{input_option('dtc_meter_type_id', '', 'Unmetered')}}
+		{% for dtc_meter_type in dtc_meter_types %}
+			{{input_option('dtc_meter_type_id', dtc_meter_type.id,
+		 		dtc_meter_type.code + ' ' + dtc_meter_type.description, era.dtc_meter_type.id)}}
+		{% endfor %}
+	</select>
 
 	<label>Has An Import MPAN?</label>
 	{{input_checkbox('has_imp_mpan')}}

chellow/templates/e/scenario_docs.html

@@ -94,16 +94,8 @@
 			  "*": "_L"
       },
 
-      /* Properties are combined with the existing era properties, with the
-         ones here overwriting any duplicates */
-      "properties_overwrite": {
-        "comms_type": "GSM"
-      },
-
-      /* Properties are combined with the existing era properties, with the
-         ones here being overwritten by any duplicates */
-      "properties_overwritten": {
-        "meter_type": "H"
+      "dtc_meter_types": {
+			  "*": "H"
       },
 
       /* Use hh data  rather than register reads for AMRs */

chellow/templates/e/site_add_e_supply.html

@@ -20,6 +20,7 @@
 			<input type="hidden" name="energisation_status_id"
 					value="{{request.values.energisation_status_id}}">
 			<input type="hidden" name="pc_id" value="{{request.values.pc_id}}">
+			<input type="hidden" name="dtc_meter_type_id" value="{{request.values.dtc_meter_type_id}}">
 			<input type="hidden" name="dno_id" value="{{request.values.dno_id}}">
 			<input type="hidden" name="gsp_group_id" value="{{request.values.gsp_group_id}}">
 			<input type="hidden" name="mtc_participant_id"

chellow/templates/e/site_add_e_supply_form.html

@@ -116,7 +116,14 @@
 		{% endfor %}
 	</select>
 
-	<label>Properties</label> {{input_textarea('properties', '{}', 10, 80)}}
+	<label>DTC Meter Type</label>
+	<select name="dtc_meter_type_id">
+		{{input_option('dtc_meter_type_id', '', 'Unmetered')}}
+		{% for dtc_meter_type in dtc_meter_types %}
+			{{input_option( 'dtc_meter_type_id', dtc_meter_type.id,
+		 			dtc_meter_type.code + ' ' + dtc_meter_type.description)}}
+		{% endfor %}
+	</select>
 
 	<label>Has An Import MPAN?</label> {{input_checkbox('has_imp_mpan')}}
 

chellow/templates/e/supply_eras.html

@@ -21,7 +21,7 @@
 					<th rowspan="2">
 						<span title="Standard Settlement Configuration">SSC</span>
 					</th>
-					<th rowspan="2"><span title="Properties">Props</span></th>
+					<th rowspan="2"><span title="DTC Meter Type">Meter</span></th>
 					<th colspan="2"><span title="Meter Operator">MOP</span></th>
 					<th colspan="2"><span title="Data Collector">DC</span></th>
 					<th rowspan="2">
@@ -75,7 +75,8 @@
 					</td>
 					<td rowspan="4">{{ era.msn }}</td>
 					<td rowspan="4">
-							<a href="/e/mtc_participants/{{era.mtc_participant.id}}" title="{{era.mtc_participant.description}}">{{era.mtc_participant.mtc.code}}</a>
+							<a href="/e/mtc_participants/{{era.mtc_participant.id}}"
+							 	title="{{era.mtc_participant.description}}">{{era.mtc_participant.mtc.code}}</a>
 					</td>
 					<td rowspan="4">
 							<a href="/e/cops/{{era.cop.id}}" title="{{era.cop.description}}">{{era.cop.code}}</a>
@@ -88,7 +89,9 @@
 							<a href="/e/sscs/{{era.ssc.id}}" title="{{era.ssc.description}}">{{era.ssc.code}}</a>
 							{% endif %}
 					</td>
-					<td rowspan="4">{{era.properties}}</td>
+					<td rowspan="4">
+						<a href="/e/dtc_meter_types/{{era.dtc_meter_type.id}}">{{era.dtc_meter_type.code}}</a>
+					</td>
 					<td rowspan="4">
 						<a href="/e/mop_contracts/{{era.mop_contract.id}}">{{era.mop_contract.name}}</a>
 					</td>

chellow/templates/general_imports.html

@@ -90,11 +90,9 @@
 				<td>Meter Timeswitch Class</td>
 				<td>CoP</td>
 				<td>Comms Type</td>
-				<td>
-					Standard Settlement Configuration (blank for HH supplies)
-				</td>
+				<td>Standard Settlement Configuration (blank for HH supplies)</td>
 				<td>Energisation Status</td>
-				<td>Properties</td>
+				<td>DTC Meter Type</td>
 				<td>Import MPAN Core</td>
 				<td>Import LLFC</td>
 				<td>Import Supply Capacity</td>
@@ -137,7 +135,7 @@
 				<td>Comms Type</td>
 				<td>SSC</td>
 				<td>Energisation Status</td>
-				<td>Properties</td>
+				<td>DTC Meter Type</td>
 				<td>Import MPAN Core</td>
 				<td>Import LLFC</td>
 				<td>Import Supply Capacity</td>
@@ -173,7 +171,7 @@
 				<td>Comms Type</td>
 				<td>SSC</td>
 				<td>Energisation Status</td>
-				<td>Properties</td>
+				<td>DTC Meter Type</td>
 				<td>Import MPAN Core</td>
 				<td>Import LLFC</td>
 				<td>Import Supply Capacity</td>

chellow/templates/macros.html

@@ -31,7 +31,7 @@
 
 {%- macro input_option(name, item_id, desc, initial=None) -%}
     <option value="{{ item_id }}"
-        {%- if request.values[name] -%}
+        {%- if name in request.values -%}
             {%- if request.values[name] == '' ~ item_id %} selected
             {%- endif -%}
         {%- else -%}

chellow/views.py

@@ -1246,7 +1246,7 @@ def downloads_get():
         files.append(
             {
                 "name": fl,
-                "last_modified": Datetime.utcfromtimestamp(statinfo.st_mtime),
+                "last_modified": to_utc(Datetime.utcfromtimestamp(statinfo.st_mtime)),
                 "size": statinfo.st_size,
             }
         )

{chellow-1714484335.0.0.dist-info → chellow-1715253565.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1714484335.0.0
+Version: 1715253565.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-1714484335.0.0.dist-info → chellow-1715253565.0.0.dist-info}/RECORD

@@ -4,14 +4,14 @@ chellow/bank_holidays.py,sha256=T_utYMwe_g1dz5X-aOTdIPryg49SvB7QsWM1yphlqG8,4423
 chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=5SmP-0QPK6xCkd_wjIWh_8FAzN5OxNHCzyEQ1Xb-Y-M,5256
 chellow/edi_lib.py,sha256=het3R0DBGtXEo-Sy1zvXQuX9EWQ1X6Y33G4l1hYYuds,51859
-chellow/general_import.py,sha256=FuDinyFxWJ22plUojTaH6wchU-5AQuHuaI_RjVEeJi8,65818
-chellow/models.py,sha256=POIL0dfwZFuqht7xHZaE6KJ7fk4kxMZC2aXzgg5kEFY,236921
+chellow/general_import.py,sha256=l3EHq9zG9Vfl5Ee6XTVrC1nusXo4YGGB4VBmZ_JaJR8,65798
+chellow/models.py,sha256=fZpQAHf4gDoXJXH8GB2-wRPrBYD9o-n8QlvfcSctcxU,241038
 chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
 chellow/testing.py,sha256=Od4HHH6pZrhJ_De118_F55RJEKmAvhUH2S24QE9qFQk,3635
 chellow/utils.py,sha256=32qPWEGzCPKPhSM7ztpzcR6ZG74sVZanScDIdK50Rq4,19308
-chellow/views.py,sha256=KiT4yXI5utC4woQY_-Lh15Tu9HbqnspNKZ1HD9kxLVA,79542
+chellow/views.py,sha256=L_mlM8Xi6u850SXMD2XgWdQmZVRB0QAkSdIN_BIHi-M,79550
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
 chellow/e/bill_importer.py,sha256=y1bpn49xDwltj0PRFowWsjAVamcD8eyxUbCTdGxEZiE,7389
@@ -19,7 +19,7 @@ chellow/e/bmarketidx.py,sha256=0JCBBnP3xfLq2eFjXO_u-gzHyTizab4Pp6PRK6OZLcw,7134
 chellow/e/bsuos.py,sha256=hdP9vnOJSuZl46OAkJeUg1XJYvYIBj4J6Sqce1Hy9Vs,15542
 chellow/e/ccl.py,sha256=30dh_SvlgzsTQPPAJNZWILaMvbeDsv9-P-S1JxS5_SQ,3184
 chellow/e/cfd.py,sha256=V1DTT5XBQbt8hO1gae1u3315fZ4iuYk3XC7J2sUbhKQ,14352
-chellow/e/computer.py,sha256=YL1JFUYfFW-i9DODfvSnp6gTL_MwIfwoWj1TWtOsxPg,67105
+chellow/e/computer.py,sha256=KjHE57I3I7-1zPkyqX0mSjORlyUNfSEhQb2df4sCNkU,67244
 chellow/e/dno_rate_parser.py,sha256=thNjT7HeAcvwV5vACvyGZ-yYzCs4keiIJEoCL8FjJ3E,21488
 chellow/e/duos.py,sha256=nwviRjz-qIt3GxIMHk0hItIT4dtKsxOWq9TUC1z-hO8,30864
 chellow/e/elexon.py,sha256=ALhXS9Es7PV0z9ukPbIramn3cf3iLyFi-PMWPSm5iOs,5487
@@ -38,7 +38,7 @@ chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,623
 chellow/e/tlms.py,sha256=M33D6YpMixu2KkwSCzDRM3kThLgShg8exp63Obo75l8,8905
 chellow/e/tnuos.py,sha256=XseYztPUsQXNKuBmystO2kzzwAG9ehCZgpGBTdgSk-A,4313
 chellow/e/triad.py,sha256=lIQj7EdUrcFwEqleuHZXYU_bfzIwNOqUVVxB3NPQt4A,13710
-chellow/e/views.py,sha256=ZezsZhpsf1kH0BywUWdMMjxdYAYTIclksUOWTh_AOrE,214186
+chellow/e/views.py,sha256=iKnzFWNvANSB0yNDhZHo5nKw1Ptl6Q8KHuK003ZTDfg,215030
 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
@@ -79,7 +79,7 @@ chellow/reports/report_241.py,sha256=AlFmSHnfG2HWv_ICmWX7fNpPwLHjq7mo1QtOTjSKO3k
 chellow/reports/report_247.py,sha256=ozgCcee8XeqYbOpZCyU2STJKaz6h2x7TYQogagTaYLw,46626
 chellow/reports/report_29.py,sha256=KDFjgrLBv4WbG9efCdu_geMR7gT_QV9N97Wfdt7aDc4,2736
 chellow/reports/report_291.py,sha256=rqBXy6s7hMeYWw-yNX6w_L5t2yz6rNEeos_4xO7wf90,7519
-chellow/reports/report_33.py,sha256=O-7vsNcSyY_bErtm7NA-yYBsrjRFdBULsRe_SbE8XJk,16677
+chellow/reports/report_33.py,sha256=laVz-itDbJTdvC6LxLEeuY0eKpYx43Un4adiExPTEEE,16730
 chellow/reports/report_387.py,sha256=KcClrEOK5IRvePp0Jgbzs1Gwf-_CqYmEtFFlXrr_Z3E,5670
 chellow/reports/report_41.py,sha256=QQeTshA1Og7N3wPaoZ8ynJzwsvZ1mgSFc7DDkVqIZoM,7447
 chellow/reports/report_429.py,sha256=0GCc0rQnOSG0fusw69yMMOCxnWApBd3P2sGWIg1py9M,12359
@@ -92,7 +92,7 @@ chellow/reports/report_bills.py,sha256=AHW6tiZAOE0gXDfencPvemE4zqK6eTqfN8_bWQ4RT
 chellow/reports/report_csv_llfcs.py,sha256=OHSbP64lQ6dlAMcQYgvdANlA4lQyF0iBlwk7V9c9nuo,1944
 chellow/reports/report_csv_site_hh_data.py,sha256=T-clGDmYdn0ej7zZfL3kDp4Vyd82WzptxEzxx9KqAZg,4270
 chellow/reports/report_csv_site_snags.py,sha256=gG2sYQrLoIBwCoMUC8rhmAL7Kffh_rvNb9UOX7cYDko,2668
-chellow/reports/report_ecoes_comparison.py,sha256=xjTvyfYAZhJeAzRJQmKk3xo5rPB1-QbSF-ARuyeKuTs,21822
+chellow/reports/report_ecoes_comparison.py,sha256=s6d69cORezon-h3RmgewT8_cMpLrpMElmP2TnT-y7yY,21743
 chellow/reports/report_g_monthly_duration.py,sha256=vI5FKAU8_oThjR5oflPZont7Z7sVAunr0qlMfJsaPJI,12004
 chellow/reports/report_g_supplies_snapshot.py,sha256=0M0x_0o0985Hu45gUJJJwzfx0DDOAuXBJ1UVUDbQ36g,4718
 chellow/reports/report_g_supply_virtual_bill.py,sha256=x_KtQ02dwgmXvAEUXJ1poK0BRwqxa-GcbJ5pddEina0,3694
@@ -114,12 +114,12 @@ chellow/templates/csv_sites_monthly_duration.html,sha256=59gErG6KwA57z-qh2EJsVGv
 chellow/templates/downloads.html,sha256=R9QPcFz-PLJOX7rDlmquIk-Hp9Iq-thzWCTfOexSpXg,937
 chellow/templates/edi_viewer.html,sha256=szUthgHOdph6Of-7f_1LeC_zYlNJaMeS5ctn6xTAeiM,1437
 chellow/templates/general_import.html,sha256=SMemHGu466Be3_cAWSS6Hn-Kv-1psbEMDD6NQG6bfbI,1013
-chellow/templates/general_imports.html,sha256=9rFbve28ADnfJ4CL45vJbOPG-mAYBETWVa_ctgcXvHg,13050
+chellow/templates/general_imports.html,sha256=aPCS_oxOYOCU25koK9lgF3HSiT8GkLeLYpm6NBjT-mo,13051
 chellow/templates/home.html,sha256=_ANKmcnlk_PDyZl6SCmejU8d90f3t8EH_rDDPDyYUwE,5657
 chellow/templates/input_date.html,sha256=rpgB5n0LfN8Y5djN_ZiuSxqdskxzCoKrEqI7hyJkVQo,1248
 chellow/templates/local_report.html,sha256=pV7_0QwyQ-D3OS9LXrly5pq3qprZnwTCoq6vCnMTkS4,1332
 chellow/templates/local_reports.html,sha256=4wbfVkY4wUfSSfWjxqIsvCpIsa9k7H_dGAjznrG5jNM,701
-chellow/templates/macros.html,sha256=9sGRgLxLmhYTIstfL3MgUDFIoRV89SlwPHmuvMqh-UI,5029
+chellow/templates/macros.html,sha256=zd5P3irbRMXiK6LnWdbv5M0SYX2roZKhEzNTt2_uPyM,5031
 chellow/templates/national_grid.html,sha256=8W92tsjlqPSB0J--nyFIi-wzFae9CyDr6fODXLZp8ic,991
 chellow/templates/non_core_auto_importer.html,sha256=s9SluRN1bHTHjd8GP6uFhk6LrZYG8dqBG3y94zUKe5Q,944
 chellow/templates/non_core_contract.html,sha256=BdGtxErTvw4DwXLb6B2vimuU6ode3fFA-90kBmHCwYc,1754
@@ -199,8 +199,8 @@ chellow/templates/e/dno_rate_script.html,sha256=8wK2GqDyPAPxLsK3waEuGwqerGtWPCu-
 chellow/templates/e/dno_rate_script_add.html,sha256=LRHN86z1oBceQLtzVbLs9rrcav8DfcDrPYzyvvc7cQA,559
 chellow/templates/e/dno_rate_script_edit.html,sha256=5hNwZWMdesZywOiUAS_OIAapT8jjebc9qp_U9pkXUgs,1275
 chellow/templates/e/dnos.html,sha256=j9JV0yU7EFvjT5OKBLXfpweYyE9XZT0CxrzsXQSoNPE,702
-chellow/templates/e/dtc_meter_type.html,sha256=8h8elG7YlP27wry6sd7MuVZUdIMqdsd6kdV97dxmo-c,440
-chellow/templates/e/dtc_meter_types.html,sha256=TBUU4TVQxmyI6srggoMlXjOlFEd_3wy11rxAu47stFs,467
+chellow/templates/e/dtc_meter_type.html,sha256=iqmF07NcKvepHhYA5YjK0f7zdPgBqDIAbl-xndMKwck,440
+chellow/templates/e/dtc_meter_types.html,sha256=dTAIoaCh8DMUAHil0WQ40auLsjsni8z0MNam_2jl_VI,513
 chellow/templates/e/duration_report.html,sha256=MrDgLDzbXdGLfpUbZ9U3xSP2H1VF0eK225LM_1U9azA,1493
 chellow/templates/e/elexon.html,sha256=QW2EKdTMBTIzUkiXpYIHVZidZHNca3GmyiwWKaWkvIY,997
 chellow/templates/e/em_hh_data.html,sha256=2Ndvpo2ngO2dOpEZa05-6xRCy3IKNkWHJwW6sVjhhWY,2032
@@ -209,8 +209,8 @@ chellow/templates/e/em_site.html,sha256=LQJ1RJe7IJCZ-dsmd-Ku3hhNEeKUq3BimEBKJPNZ
 chellow/templates/e/em_totals.html,sha256=D_H12qF6b8heVeSGzcl4u7xRvtPLUtM1zWYrwEFRFTM,678
 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=NhVp965vVnQw6fneGugkAc0nkojjUncbQdio6IeQwhE,4745
+chellow/templates/e/era_edit.html,sha256=MoJ7yS8BWGz7ptqxDPpBio0cnYDYDOoa4jNcpz4NAbk,4094
+chellow/templates/e/era_edit_form.html,sha256=Yh5SdMVuyJCCeSQH5FgZ1qhWzI_SsuraIvitwtUMGes,4862
 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
@@ -272,11 +272,11 @@ chellow/templates/e/read_type.html,sha256=volKteZB79famXrzN_Bgqy9JT9C4a50vXLkuZ0
 chellow/templates/e/read_types.html,sha256=CknHXNEkBnsAprqI66ftvnnMFBdR_kqI7o26rxjlrJA,473
 chellow/templates/e/scenario.html,sha256=apBfJY3RcieKsVmNIgyRJEJ89bEYlN-dmX9yXgOkJ7w,1153
 chellow/templates/e/scenario_add.html,sha256=qQpxvhlrQqrNYiIQTHu_NvSoeSKuRNEJQYwLqRlQ8_U,516
-chellow/templates/e/scenario_docs.html,sha256=dvl-2wppHGaVqG16w9PERE_65u2eJAIOTh-lHCX_dW4,5162
+chellow/templates/e/scenario_docs.html,sha256=1nTudJvQSbSAqlMoTojQue7krVO9BAc_YFnz4bDGDi0,4814
 chellow/templates/e/scenario_edit.html,sha256=Uf64v_qsBP0BxaFEIz214CC_dZXlvro4zvQXH_towhA,1070
 chellow/templates/e/scenarios.html,sha256=zlNhZvQEcuwLgHObVHS-4THur5Lz9Jf1G6xD98-jamI,847
-chellow/templates/e/site_add_e_supply.html,sha256=GqPtk8yYJzMij14SzNREGSpCaVD2YcOJSmu-Dn00bGo,2636
-chellow/templates/e/site_add_e_supply_form.html,sha256=rL-hEdT6ORiBHC8yxxoQA-ofFKozOdk47olRkzusvhY,5308
+chellow/templates/e/site_add_e_supply.html,sha256=_gi1ejI4TMTMX9vCW7z2kToR2XKR6qoVh67qp_VrDsM,2731
+chellow/templates/e/site_add_e_supply_form.html,sha256=e6jovPUzquy5E-jsdGD1zt_-62NAgc1rhmbP2M5FoM0,5552
 chellow/templates/e/site_hh_data.html,sha256=1Ld5IIM3G84tVCAwtlJNGJTnrASS7d84AgaPwwHNEMI,1413
 chellow/templates/e/site_site_snags.html,sha256=vWpsFyxZj7GOrMXQz2rKq9zOQdVsqeUVtdBzehp9J5w,847
 chellow/templates/e/site_snag.html,sha256=eZt1H-t-hsoKZBteU9ILpKqKLD0Pf0Uybp8pPQYuTAc,924
@@ -309,7 +309,7 @@ chellow/templates/e/supplier_rate_script_add.html,sha256=Yf2LZEIHbL7qT6oxBCtPf0Z
 chellow/templates/e/supplier_rate_script_edit.html,sha256=VaYJt8nxHdnuP-zEAuBJC-ibEpjDU1b80hXtdBQH1dg,1968
 chellow/templates/e/supply.html,sha256=No26xivLm4hA8kRufVvPjrEOE3of7pmZaW_jgTcKSY0,8511
 chellow/templates/e/supply_edit.html,sha256=Ef4ivmSvj9NAb1Uy43S3TCwheCffV457bdpaoD8XZ_s,2723
-chellow/templates/e/supply_eras.html,sha256=dkWAvTe2tdRW9EUmcGvEcHpsR-XXkXV9DyewHDQvED0,19445
+chellow/templates/e/supply_eras.html,sha256=y_Y2V20Q-tyyw6iRP3lE1ZQCAZM7CaRtEr1_CcDICuc,19539
 chellow/templates/e/supply_hh_data.html,sha256=d9ho4Tq3ZkR5GmxSZr_zHGwCU68PH3aSc4OwFG9i9zE,3587
 chellow/templates/e/supply_months.html,sha256=2EUF_SWCcjG9GiAw86gco8xR6LXaqCPXfQE5A33TqqI,1927
 chellow/templates/e/supply_note_add.html,sha256=wsrG7P38h8fj63zVAZXfLogdYxIKnn8qxEJFr3Fna4k,553
@@ -363,6 +363,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-1714484335.0.0.dist-info/METADATA,sha256=rv1vLsnUMaxKwBmYgJWpNOmlQzBggEhB_-nRSxb6x8I,12205
-chellow-1714484335.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-chellow-1714484335.0.0.dist-info/RECORD,,
+chellow-1715253565.0.0.dist-info/METADATA,sha256=zfAMXSPn0ZYoHngICWZa83lQPQHUn7KeDFIouk05-lk,12205
+chellow-1715253565.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+chellow-1715253565.0.0.dist-info/RECORD,,