chellow 1713259114.0.0__py3-none-any.whl → 1713275535.0.0__py3-none-any.whl

chellow/e/views.py

@@ -420,7 +420,7 @@ def channel_snag_edit_post(snag_id):
 
 @e.route("/comms")
 def comms_get():
-    comms = g.sess.execute(select(Cop).order_by(Cop.code)).scalars()
+    comms = g.sess.execute(select(Comm).order_by(Comm.code)).scalars()
     return render_template("comms.html", comms=comms)
 
 

chellow/general_import.py

@@ -1255,8 +1255,12 @@ def general_import_supply(sess, action, vals, args):
         cop = Cop.get_by_code(sess, cop_code)
         comm_code = add_arg(args, "Comms Type", vals, 16)
         comm = Comm.get_by_code(sess, comm_code)
-        ssc_code = add_arg(args, "Standard Settlement Configuration", vals, 17)
-        ssc = Ssc.get_by_code(sess, ssc_code) if len(ssc_code) > 0 else None
+        ssc_code_str = add_arg(args, "Standard Settlement Configuration", vals, 17)
+        if len(ssc_code_str) > 0:
+            ssc = Ssc.get_by_code(sess, ssc_code_str, start_date)
+            ssc_code = ssc.code
+        else:
+            ssc_code = None
         energisation_status_code = add_arg(args, "Energisation Status", vals, 18)
         energisation_status = EnergisationStatus.get_by_code(
             sess, energisation_status_code
@@ -1340,7 +1344,7 @@ def general_import_supply(sess, action, vals, args):
             mtc_code,
             cop,
             comm,
-            ssc,
+            ssc_code,
             energisation_status,
             properties,
             imp_mpan_core,

chellow/models.py

@@ -2845,44 +2845,21 @@ class MtcSsc(Base, PersistentClass):
     mtc_llfc_sscs = relationship("MtcLlfcSsc", backref="mtc_ssc")
     __table_args__ = (UniqueConstraint("mtc_participant_id", "ssc_id", "valid_from"),)
 
-    def __init__(
-        self,
-        mtc_participant,
-        ssc,
-        valid_from,
-        valid_to,
-    ):
+    def __init__(self, mtc_participant, ssc, valid_from, valid_to):
         self.mtc_participant = mtc_participant
         self.ssc = ssc
         self.valid_from = valid_from
-        self.update(
-            valid_to,
-        )
+        self.update(valid_to)
 
-    def update(
-        self,
-        valid_to,
-    ):
+    def update(self, valid_to):
         self.valid_to = valid_to
 
         if hh_after(self.valid_from, valid_to):
             raise BadRequest("The valid_from date can't be after the valid_to date.")
 
     @classmethod
-    def insert(
-        cls,
-        sess,
-        mtc_participant,
-        ssc,
-        valid_from,
-        valid_to,
-    ):
-        mtc_ssc = cls(
-            mtc_participant,
-            ssc,
-            valid_from,
-            valid_to,
-        )
+    def insert(cls, sess, mtc_participant, ssc, valid_from, valid_to):
+        mtc_ssc = cls(mtc_participant, ssc, valid_from, valid_to)
         sess.add(mtc_ssc)
         sess.flush()
         return mtc_ssc
@@ -2924,44 +2901,21 @@ class MtcLlfcSsc(Base, PersistentClass):
     mtc_llfc_ssc_pcs = relationship("MtcLlfcSscPc", backref="mtc_llfc_ssc")
     __table_args__ = (UniqueConstraint("mtc_ssc_id", "llfc_id", "valid_from"),)
 
-    def __init__(
-        self,
-        mtc_ssc,
-        llfc,
-        valid_from,
-        valid_to,
-    ):
+    def __init__(self, mtc_ssc, llfc, valid_from, valid_to):
         self.mtc_ssc = mtc_ssc
         self.llfc = llfc
         self.valid_from = valid_from
-        self.update(
-            valid_to,
-        )
+        self.update(valid_to)
 
-    def update(
-        self,
-        valid_to,
-    ):
+    def update(self, valid_to):
         self.valid_to = valid_to
 
         if hh_after(self.valid_from, valid_to):
             raise BadRequest("The valid_from date can't be after the valid_to date.")
 
     @classmethod
-    def insert(
-        cls,
-        sess,
-        mtc_ssc,
-        llfc,
-        valid_from,
-        valid_to,
-    ):
-        mtc_llfc_ssc = cls(
-            mtc_ssc,
-            llfc,
-            valid_from,
-            valid_to,
-        )
+    def insert(cls, sess, mtc_ssc, llfc, valid_from, valid_to):
+        mtc_llfc_ssc = cls(mtc_ssc, llfc, valid_from, valid_to)
         sess.add(mtc_llfc_ssc)
         sess.flush()
         return mtc_llfc_ssc

chellow/templates/base.html

@@ -107,6 +107,7 @@
 									<li><a href="/e/sscs" title="SSCs">SSCs</a></li>
 									<li><a href="/e/gsp_groups" title="GSP Groups">GSP Groups</a></li>
 									<li><a href="/e/cops" title="CoPs">CoPs</a></li>
+									<li><a href="/e/comms" title="Comms">Comms</a></li>
 									<li><a href="/bill_types" title="Bill Types">Bill Types</a></li>
 									<li><a href="/e/read_types" title="Read Types">Read Types</a></li>
 									<li>

chellow/templates/e/comm.html

@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block nav %}
-	<a href="/comms">Comms</a> &raquo; {{comms.description}}
+	<a href="/e/comms">Comms</a> &raquo; {{comm.description}}
 {% endblock %}
 
 {% block content %}
@@ -13,11 +13,11 @@
 	<table>
 		<tr>
 			<th>Code</th>
-			<td>{{comms.code}}</td>
+			<td>{{comm.code}}</td>
 		</tr>
 		<tr>
 			<th>Description</th>
-			<td>{{comms.description}}</td>
+			<td>{{comm.description}}</td>
 		</tr>
 	</table>
 	

{chellow-1713259114.0.0.dist-info → chellow-1713275535.0.0.dist-info}/METADATA

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

@@ -4,8 +4,8 @@ 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=d_bDfUW8VulF6FqT5q7jiQ0a_NmVpUVyzXNgNBLpn0k,65263
-chellow/models.py,sha256=9SDx150OdxFnw4tfpvLn2fB0NsqlrE57VqdRPYz9OnE,237335
+chellow/general_import.py,sha256=Su_JW28Wb2fG3x8fAbNmvB_YAEPieO_arhlhp31DHD8,65369
+chellow/models.py,sha256=POIL0dfwZFuqht7xHZaE6KJ7fk4kxMZC2aXzgg5kEFY,236921
 chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=vNuKzlr0lkAzZ4zG7zboStoo92_6iLKAxbw1yZ-ucII,5626
@@ -38,7 +38,7 @@ chellow/e/system_price.py,sha256=3cPWohHmmBI9v7fENLBzXQkpAeC3r0s5xV29Nmr6k_E,583
 chellow/e/tlms.py,sha256=kHAy2A2d1Mma7x4GdNDyrzscJd5DpJtDBYiZEg241Dw,8538
 chellow/e/tnuos.py,sha256=KoMPJDIXfE4zwhSDuywGF1ooxjTYLVjtF7BkSFm6X24,4158
 chellow/e/triad.py,sha256=S6LEMHvUKhAZe0-yfLIRciYDZ8IKMn1jh1TmmsbQD3s,13588
-chellow/e/views.py,sha256=8Rmm6XuNGXACFSSX_LpomyTC4oS2-nljRlisjEyUVJ4,213975
+chellow/e/views.py,sha256=ccA5ebQA8Oefwi9L71rbStvHenDMB4rhAu0iRMandLc,213977
 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
@@ -106,7 +106,7 @@ chellow/static/images/favicon_test.svg,sha256=HnLS_BjNt8M0Ikko5Z-f_E2aed7y6RRU6j
 chellow/static/images/logo.png,sha256=XMW2XwukTicKVJ46E2SnbHJYh77uFLVYlwR4xN43YKg,1569
 chellow/static/js/htmx.min.js,sha256=_TRunIY51GJIk_xFXyQHoJtBgwFzbdGOu7B3ZGN_tHg,42819
 chellow/templates/403.html,sha256=49f75OKp0eS8wi2D1YBhdv7bKTNtfs6BTXZPXlxCbDs,344
-chellow/templates/base.html,sha256=v14n4jr4eGYG9i7IduibJKCgNLbPQrCQLCGc416SK7M,6520
+chellow/templates/base.html,sha256=tilhJHj1oTB7H802TSobnuIDip9o2Ws4zJSleM3bgUM,6581
 chellow/templates/bill_type.html,sha256=dNNEaQ9ZVghLCAvxQ6IDalw0K0-BIjEQap6u1zu6TW8,402
 chellow/templates/bill_types.html,sha256=YKy6cnzzch756dlTnl01ZU0K5NVuTZtBJQV32ZphHvc,471
 chellow/templates/chain.html,sha256=iOnSoDQOO_-1tfcxUHQKDAUnV4QbCYu5PPNmS4RkOg4,775
@@ -159,7 +159,7 @@ chellow/templates/e/channel_edit.html,sha256=OUkdiS2NBQ_w4gmxRxXAcRToM5BT8DWWJrt
 chellow/templates/e/channel_snag.html,sha256=wBJ5KBfeJdAeRmaB0qu0AD9Z4nM5fn6tJ_8bNqTWtoo,1477
 chellow/templates/e/channel_snag_edit.html,sha256=sUFI4Ml3F1B35x8_t_Pz3hWuQN9Xtxr3kt4u8hdxNwY,1911
 chellow/templates/e/channel_snags.html,sha256=1dzC5FoCJ8bg6PBsQrVqGLn-DbPE2EHQklfm_pg3w0c,2899
-chellow/templates/e/comm.html,sha256=te-e05H2RiVXCgMOFizaL_yAmK_XZXxUUEB4Y9syymo,384
+chellow/templates/e/comm.html,sha256=DSlAaDg1r4KYq9VUgDtt2lgW6apZjZvwhMujIJINmps,383
 chellow/templates/e/comms.html,sha256=bUXZePnMfpKk1E71qLGOSkx8r3GxdPPD_-MosIXXq4s,434
 chellow/templates/e/cop.html,sha256=ULv7ALFJHMUgPX96hQNm2irc3edtKYHS6fYAxvmzj8M,376
 chellow/templates/e/cops.html,sha256=2uFpVZOZtEe8fBE9NU-hElVvT_gTLk9peHNfPKW0PAY,425
@@ -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-1713259114.0.0.dist-info/METADATA,sha256=0JTJ-zEXssG25w46B8KcvxriKareIsEE-kKNQW4JvuI,12205
-chellow-1713259114.0.0.dist-info/WHEEL,sha256=K0BPUNF1N3kQ9olb8aVEtkObePEjdr2JOLT1N83EVws,87
-chellow-1713259114.0.0.dist-info/RECORD,,
+chellow-1713275535.0.0.dist-info/METADATA,sha256=deT9VNOc5rczl9Wi1rWFkM5DP5iaUsrzz3zpqim0Je4,12205
+chellow-1713275535.0.0.dist-info/WHEEL,sha256=K0BPUNF1N3kQ9olb8aVEtkObePEjdr2JOLT1N83EVws,87
+chellow-1713275535.0.0.dist-info/RECORD,,