chellow 1753180539.0.0__py3-none-any.whl → 1753257333.0.0__py3-none-any.whl

chellow/e/dno_rate_parser.py

@@ -54,7 +54,7 @@ def get_rate(row, idx):
         return None
 
     val = cell.value
-    if val is None:
+    if val in (None, "-"):
         return None
     elif isinstance(val, str) and len(val) == 0:
         return None
@@ -318,10 +318,11 @@ def tab_ehv(sheet, gsp_rates):
                         band = 0
                     else:
                         band_val = get_value(row, band_col)
-                        if band_val is None:
+                        if band_val in (None, ""):
                             band = 0
                         else:
                             band = int(band_val)
+
                     tariffs[llfc] = {
                         "super-red-gbp-per-kwh": get_rate(
                             row, col_match(title_row, f"{polarity} super red")
@@ -457,6 +458,7 @@ GSP_MAP = (
     ("mide", "_E"),
     ("sepd", "_H"),
     ("sweb", "_L"),
+    ("spd", "_N"),
 )
 
 

chellow/e/views.py

@@ -5714,31 +5714,28 @@ def supply_post(supply_id):
             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.")
+                raise BadRequest("The date of the MSN change is blank.")
 
             msn = req_str("msn")
             msg = ""
             era = supply.find_era_at(g.sess, start_date)
-            if era is None:
-                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 is not None and 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
 
-                        g.sess.commit()
-                        msg += (
-                            f"The era at {hh_format(era.start_date)} has been "
-                            f"successfully updated with the MSN {msn}. "
-                        )
+                    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")
 

{chellow-1753180539.0.0.dist-info → chellow-1753257333.0.0.dist-info}/METADATA

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

@@ -22,7 +22,7 @@ chellow/e/bsuos.py,sha256=2L7pgiGbV4k1Udfzjj4B2Qye02sV_FhNjwh7_sIxXFg,15525
 chellow/e/ccl.py,sha256=30dh_SvlgzsTQPPAJNZWILaMvbeDsv9-P-S1JxS5_SQ,3184
 chellow/e/cfd.py,sha256=CWLdYeNjgqT6Ro8YRf4vhwXIAJ2aV4Wi6HLNClVSeaQ,14260
 chellow/e/computer.py,sha256=lt4Zlr8EOClL1acuuvKA-tNPCI5RRHnAZbsaGQnB9j4,68835
-chellow/e/dno_rate_parser.py,sha256=NOVfS9HRDsc0rO282hU-IdrcuvMlC7VE8RySqd_5eT0,21762
+chellow/e/dno_rate_parser.py,sha256=psJBBYHsZp1eQcrCyzPv7Tqo_AFhD5bneZSGpaQxDKs,21795
 chellow/e/duos.py,sha256=RHrn93I1ASO2uYkuF18qlhG4p-jpuJhd_g3o69wtP4U,31004
 chellow/e/elexon.py,sha256=eOmX_wpxj6Ty6eaEgGAgXX-MgyJkYQSAT6DtJeP1rUE,5544
 chellow/e/energy_management.py,sha256=aXC2qlGt3FAODlNl_frWzVYAQrJLP8FFOiNX3m-QE_Y,12388
@@ -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=pWLbcG04t8mZB6y9Dp8bkcJpnWrfF1x10eCGagMbDl8,220804
+chellow/e/views.py,sha256=7nvH0D3Q1Q1bmTtPTzHKmMt8uNnhhF9GYHWRxZIBWT0,220622
 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
@@ -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-1753180539.0.0.dist-info/METADATA,sha256=R7snYgxFJSS1VK-dHXFKW_4rRtTgBe4v6gzOXFUMX6A,12585
-chellow-1753180539.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1753180539.0.0.dist-info/RECORD,,
+chellow-1753257333.0.0.dist-info/METADATA,sha256=-Ap3LiI6IQUf4wShS13GeZg2nzWVwHSSXz5uqPcpaEE,12585
+chellow-1753257333.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1753257333.0.0.dist-info/RECORD,,