chellow 1681398121.0.0__py3-none-any.whl → 1681477937.0.0__py3-none-any.whl

chellow/e/views.py

@@ -12,6 +12,7 @@ from dateutil.relativedelta import relativedelta
 
 from flask import (
     Blueprint,
+    Response,
     flash,
     g,
     make_response,
@@ -1900,6 +1901,53 @@ def llfcs_get():
     return render_template("llfcs.html", llfcs=llfcs, dno=dno)
 
 
+def _csv_response(fname, titles, rows):
+    with StringIO() as f:
+        writer = csv.writer(f)
+        writer.writerow(titles)
+        for row in rows:
+            writer.writerow([csv_make_val(v) for v in row])
+
+        return Response(
+            f.getvalue(),
+            mimetype="text/csv",
+            headers={"Content-disposition": f'attachment; filename="{fname}"'},
+        )
+
+
+@e.route("/llfcs/csv")
+def llfcs_csv_get():
+    dno_id = req_int("dno_id")
+    dno = Party.get_dno_by_id(g.sess, dno_id)
+    rows = g.sess.execute(
+        select(
+            Party.dno_code,
+            Llfc.code,
+            Llfc.description,
+            VoltageLevel.code,
+            Llfc.is_substation,
+            Llfc.is_import,
+            Llfc.valid_from,
+            Llfc.valid_to,
+        )
+        .join(Party)
+        .join(VoltageLevel)
+        .where(Llfc.dno == dno)
+        .order_by(Llfc.code)
+    ).all()
+    titles = (
+        "dno_code",
+        "code",
+        "description",
+        "voltage_level",
+        "is_substation",
+        "is_import",
+        "valid_from",
+        "valid_to",
+    )
+    return _csv_response(f"llfcs_{dno.dno_code}.csv", titles, rows)
+
+
 @e.route("/llfcs/<int:llfc_id>")
 def llfc_get(llfc_id):
     llfc = Llfc.get_by_id(g.sess, llfc_id)
@@ -2771,6 +2819,49 @@ def mtc_participants_get():
     )
 
 
+@e.route("/mtc_participants/csv")
+def mtc_participants_csv_get():
+    participant_id = req_int("participant_id")
+    participant = Participant.get_by_id(g.sess, participant_id)
+    titles = (
+        "participant_code",
+        "code",
+        "is_common",
+        "has_related_metering",
+        "description",
+        "has_comms",
+        "is_hh",
+        "meter_type",
+        "meter_payment_type",
+        "tpr_count",
+        "valid_from",
+        "valid_to",
+    )
+    rows = g.sess.execute(
+        select(
+            Participant.code,
+            Mtc.code,
+            Mtc.is_common,
+            Mtc.has_related_metering,
+            MtcParticipant.description,
+            MtcParticipant.has_comms,
+            MtcParticipant.is_hh,
+            MeterType.code,
+            MeterPaymentType.code,
+            MtcParticipant.tpr_count,
+            MtcParticipant.valid_from,
+            MtcParticipant.valid_to,
+        )
+        .join(Participant)
+        .join(Mtc)
+        .join(MeterType)
+        .join(MeterPaymentType)
+        .where(MtcParticipant.participant == participant)
+        .order_by(Mtc.code)
+    ).all()
+    return _csv_response(f"mtc_participants_{participant.code}.csv", titles, rows)
+
+
 @e.route("/mtc_participants/<int:mtc_participant_id>")
 def mtc_participant_get(mtc_participant_id):
     mtc_participant = MtcParticipant.get_by_id(g.sess, mtc_participant_id)
@@ -2801,6 +2892,36 @@ def mtc_sscs_get():
     return render_template("mtc_sscs.html", mtc_sscs=mtc_sscs, dno=dno)
 
 
+@e.route("/mtc_sscs/csv")
+def mtc_sscs_csv_get():
+    participant_id = req_int("participant_id")
+    participant = Participant.get_by_id(g.sess, participant_id)
+    titles = (
+        "participant_code",
+        "mtc_code",
+        "ssc_code",
+        "valid_from",
+        "valid_to",
+    )
+    rows = g.sess.execute(
+        select(
+            Participant.code,
+            Mtc.code,
+            Ssc.code,
+            MtcSsc.valid_from,
+            MtcSsc.valid_to,
+        )
+        .select_from(MtcSsc)
+        .join(MtcParticipant)
+        .join(MtcParticipant.participant)
+        .join(Mtc)
+        .join(Ssc)
+        .where(MtcParticipant.participant == participant)
+        .order_by(Mtc.code, Ssc.code)
+    ).all()
+    return _csv_response(f"mtc_sscs_{participant.code}.csv", titles, rows)
+
+
 @e.route("/mtc_sscs/<int:mtc_ssc_id>")
 def mtc_ssc_get(mtc_ssc_id):
     mtc_ssc = MtcSsc.get_by_id(g.sess, mtc_ssc_id)
@@ -2829,6 +2950,36 @@ def mtc_llfcs_get():
     return render_template("mtc_llfcs.html", mtc_llfcs=mtc_llfcs, dno=dno)
 
 
+@e.route("/mtc_llfcs/csv")
+def mtc_llfcs_csv_get():
+    participant_id = req_int("participant_id")
+    participant = Participant.get_by_id(g.sess, participant_id)
+    titles = (
+        "participant_code",
+        "mtc_code",
+        "llfc_code",
+        "valid_from",
+        "valid_to",
+    )
+    rows = g.sess.execute(
+        select(
+            Participant.code,
+            Mtc.code,
+            Llfc.code,
+            MtcLlfc.valid_from,
+            MtcLlfc.valid_to,
+        )
+        .select_from(MtcLlfc)
+        .join(MtcParticipant)
+        .join(Participant)
+        .join(Mtc)
+        .join(Llfc)
+        .where(MtcParticipant.participant == participant)
+        .order_by(Mtc.code, Llfc.code)
+    ).all()
+    return _csv_response(f"mtc_sscs_{participant.code}.csv", titles, rows)
+
+
 @e.route("/mtc_llfcs/<int:mtc_llfc_id>")
 def mtc_llfc_get(mtc_llfc_id):
     mtc_llfc = MtcLlfc.get_by_id(g.sess, mtc_llfc_id)
@@ -2878,6 +3029,46 @@ def mtc_llfc_ssc_pcs_get():
     return render_template("mtc_llfc_ssc_pcs.html", mtc_llfc_ssc_pcs=combos, dno=dno)
 
 
+@e.route("/mtc_llfc_ssc_pcs/csv")
+def mtc_llfc_ssc_pcs_csv_get():
+    dno_id = req_int("dno_id")
+    dno = Party.get_dno_by_id(g.sess, dno_id)
+    titles = (
+        "dno_code",
+        "pc_code",
+        "llfc_code",
+        "ssc_code",
+        "mtc_code",
+        "valid_from",
+        "valid_to",
+    )
+    rows = g.sess.execute(
+        select(
+            Party.dno_code,
+            Pc.code,
+            Llfc.code,
+            Ssc.code,
+            Mtc.code,
+            MtcLlfcSscPc.valid_from,
+            MtcLlfcSscPc.valid_to,
+        )
+        .select_from(MtcLlfcSscPc)
+        .join(Pc)
+        .join(MtcLlfcSsc)
+        .join(Llfc)
+        .join(Party)
+        .join(MtcSsc)
+        .join(Ssc)
+        .join(MtcParticipant)
+        .join(Mtc)
+        .where(Llfc.dno == dno)
+        .order_by(
+            Pc.code, Llfc.code, Ssc.code, Mtc.code, MtcLlfcSscPc.valid_from.desc()
+        )
+    ).all()
+    return _csv_response(f"mtc_llfc_ssc_pcs_{dno.dno_code}.csv", titles, rows)
+
+
 @e.route("/mtc_llfc_ssc_pcs/<int:combo_id>")
 def mtc_llfc_ssc_pc_get(combo_id):
     combo = MtcLlfcSscPc.get_by_id(g.sess, combo_id)
@@ -2915,6 +3106,40 @@ def mtc_llfc_sscs_get():
     return render_template("mtc_llfc_sscs.html", mtc_llfc_sscs=combos, dno=dno)
 
 
+@e.route("/mtc_llfc_sscs/csv")
+def mtc_llfc_sscs_csv_get():
+    participant_id = req_int("participant_id")
+    participant = Participant.get_by_id(g.sess, participant_id)
+    titles = (
+        "participant_code",
+        "llfc_code",
+        "ssc_code",
+        "mtc_code",
+        "valid_from",
+        "valid_to",
+    )
+    rows = g.sess.execute(
+        select(
+            Participant.code,
+            Llfc.code,
+            Ssc.code,
+            Mtc.code,
+            MtcLlfcSsc.valid_from,
+            MtcLlfcSsc.valid_to,
+        )
+        .select_from(MtcLlfcSsc)
+        .join(MtcSsc)
+        .join(MtcParticipant)
+        .join(Participant)
+        .join(Mtc)
+        .join(Llfc)
+        .join(Ssc)
+        .where(MtcParticipant.participant == participant)
+        .order_by(Llfc.code, Ssc.code, Mtc.code, MtcLlfcSsc.valid_from.desc())
+    ).all()
+    return _csv_response(f"mtc_llfc_sscs_{participant.code}.csv", titles, rows)
+
+
 @e.route("/mtc_llfc_sscs/<int:combo_id>")
 def mtc_llfc_ssc_get(combo_id):
     combo = MtcLlfcSsc.get_by_id(g.sess, combo_id)

chellow/rate_server.py

@@ -14,7 +14,7 @@ from chellow.models import (
     Contract,
     Session,
 )
-from chellow.utils import hh_format, utc_datetime_now
+from chellow.utils import ct_datetime_now, hh_format, utc_datetime_now
 
 
 importer = None
@@ -111,7 +111,7 @@ class RateServer(threading.Thread):
 
     def log(self, message):
         self.messages.appendleft(
-            f"{utc_datetime_now().strftime('%Y-%m-%d %H:%M:%S')} - {message}"
+            f"{ct_datetime_now().strftime('%Y-%m-%d %H:%M:%S')} - {message}"
         )
 
     def set_progress(self, progress):

chellow/templates/e/llfcs.html

@@ -12,7 +12,10 @@
 {% block content %}
 
 	<table class="sticky">
-		<caption>Line Loss Factor Classes</caption>	
+		<caption>
+			Line Loss Factor Classes
+			(<a href="/e/llfcs/csv?dno_id={{dno.id}}">Download CSV</a>)
+		</caption>	
 		<thead>
 			<tr>
 				<th>Code</th>

chellow/templates/e/mtc_llfc_ssc_pcs.html

@@ -12,6 +12,10 @@
 
 {% block content %}
 	<table class="sticky">
+		<caption>
+			Valid MTC, LLFC, SSC and PC Combinations
+			(<a href="/e/mtc_llfc_ssc_pcs/csv?dno_id={{dno.id}}">Download CSV</a>)
+		</caption>	
 		<thead>
 			<tr>
 				<th>View</th>

chellow/templates/e/mtc_llfc_sscs.html

@@ -11,6 +11,11 @@
 
 {% block content %}
 	<table class="sticky">
+		<caption>
+			Valid MTC LLFC SSC Combinations
+			(<a href="/e/mtc_llfc_sscs/csv?participant_id={{dno.participant.id}}"
+				>Download CSV</a>)
+		</caption>	
 		<thead>
 			<tr>
 				<th>View</th>

chellow/templates/e/mtc_llfcs.html

@@ -11,6 +11,11 @@
 
 {% block content %}
 	<table class="sticky">
+		<caption>
+			Valid MTC LLFCs
+			(<a href="/e/mtc_llfcs/csv?participant_id={{dno.participant.id}}"
+				>Download CSV</a>)
+		</caption>	
 		<thead>
 			<tr>
 				<th>View</th>

chellow/templates/e/mtc_participants.html

@@ -11,7 +11,11 @@
 
 {% block content %}
 	<table class="sticky">
-		<caption>Meter Timeswitch Classes</caption>	
+		<caption>
+			Meter Timeswitch Classes
+			(<a href="/e/mtc_participants/csv?participant_id={{dno.participant.id}}"
+				>Download CSV</a>)
+		</caption>	
 		<thead>
 			<tr>
 				<th>View</th>

chellow/templates/e/mtc_sscs.html

@@ -11,6 +11,9 @@
 
 {% block content %}
 	<table class="sticky">
+		<caption>
+			MTC SSCs
+			(<a href="/e/mtc_sscs/csv?participant_id={{dno.participant.id}}">Download CSV</a>)
 		<thead>
 			<tr>
 				<th>View</th>

{chellow-1681398121.0.0.dist-info → chellow-1681477937.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1681398121.0.0
+Version: 1681477937.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-1681398121.0.0.dist-info → chellow-1681477937.0.0.dist-info}/RECORD

@@ -7,7 +7,7 @@ chellow/edi_lib.py,sha256=het3R0DBGtXEo-Sy1zvXQuX9EWQ1X6Y33G4l1hYYuds,51859
 chellow/general_import.py,sha256=Xuiwl-yeM0MCmPstzQR2E6ASs8sYE8b1GNeDLStnizY,58470
 chellow/models.py,sha256=UhVekL4GM_4zs6ZGu83QFssyEMbwLHWerT1dWcby-ps,233497
 chellow/proxy.py,sha256=Mzssi9nTf6s_G4RSn8k5oAHqzVYIxMsfbudj1amYucI,1387
-chellow/rate_server.py,sha256=zk8E_0mjjrLOus5_43ntTv76dF2PRO8psDYnYTS8vJI,5551
+chellow/rate_server.py,sha256=Yj1Ax0RSQNJUAPXmnb13vmkj4xfM2nTgv02GIDgxysU,5567
 chellow/testing.py,sha256=rFkic1tj6IQ_QGctfpi-9qNle5WnshUX720ZGOSaoNQ,3915
 chellow/utils.py,sha256=IHC4Pcd_9CRbmJXAOlDvTyAcUoaWeLSH37zgjqVYYl4,18981
 chellow/views.py,sha256=PgfW3T0dRgEHIkAwLDQjyhZHmubvBHdmtrDswz-eoK0,82326
@@ -33,7 +33,7 @@ chellow/e/scenario.py,sha256=IuyE494XaBLq3FW7NdJePD6J4cTzPogfACO6dThiY00,23239
 chellow/e/system_price.py,sha256=IPBLSRPzGA3yca4tpR8PJemwPbgqVjn1WnljOMUyWnA,8145
 chellow/e/tlms.py,sha256=gXBZTHXqGVcaTGHaYGVA5Ir5pzoBDqFC1Kl1mQ0IDqU,9549
 chellow/e/tnuos.py,sha256=rFGQRLjqvJcaDUZyZcR9ScbDe0M26wUbUXlmui8xqLE,13863
-chellow/e/views.py,sha256=AY1t0vx-TCM-8Eh_DlYnXzgQjeeYfbLdFtTk4BX2FIQ,174281
+chellow/e/views.py,sha256=5pp-sbUHaiQ1N0RgY73XQbHlqrZP3y64HrZgPTmFxE4,180225
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=v1s4O8phVJVn9sOs9HKrKYcECAP0ApnUgqCaa2ARYiQ,4234
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=4dAWjaxsDnnGBnRAjgFe7IZLxIcLMGiTuXh1uqNnnlQ,4382
@@ -209,7 +209,7 @@ chellow/templates/e/hh_datum_edit.html,sha256=TJPvQ7FHw1yjkBwpXul0ZBs8UQtZR98wJ3
 chellow/templates/e/lafs.html,sha256=7MQvmoGCY-JCSDDos7vJVRKWAvqqM0eqhA0-hvaO1_o,996
 chellow/templates/e/llfc.html,sha256=B0tw7PHvEEvxJWhAGe9dZji_J9apAz-TpNlkqvYFKfE,1168
 chellow/templates/e/llfc_edit.html,sha256=YwtEf8DwoX_t3RHNxPbZYFzikBL-Ly7UyjHs-YuJ3bk,1038
-chellow/templates/e/llfcs.html,sha256=kiLtiuPKUiK8A2B0RnSZMcfYHzGL05iD03Scbme9t8w,1158
+chellow/templates/e/llfcs.html,sha256=OlY9x3XKs0OAoa4ZOZoRokYEjIZ_isfoBtn3DGL-u6o,1228
 chellow/templates/e/market_role.html,sha256=hQ62PwzByIKDfYRWMLsg8uuA2Yh6u_X9iaee5u31p80,1025
 chellow/templates/e/market_roles.html,sha256=5nzQuKz0QDoZe1Vf9kAc8THSpmFgYqTE8CYCUFYnVdg,464
 chellow/templates/e/meter_payment_type.html,sha256=r_9k2GmkfpPflZOXxoC7bi2st4tHVDp4daMmmpGIUfQ,659
@@ -239,13 +239,13 @@ chellow/templates/e/mtc.html,sha256=buHTHmV5Ldqgk72Bt7hVSSq75mg0mr0oJrhH_J6CLeU,
 chellow/templates/e/mtc_llfc.html,sha256=FiqWDNAwYDAxSmGufmpjNQtqRD0FOD34n_ZTN6Rz1tY,1004
 chellow/templates/e/mtc_llfc_ssc.html,sha256=G_Gqn4Avf2GDzvvW4OnFCJR_Oa2yrN18-AKZgtRKnnw,1400
 chellow/templates/e/mtc_llfc_ssc_pc.html,sha256=-QpyNMAqoQh3iub7Oz6BA1SOmiBEFmgexF4y7Z30oFA,1516
-chellow/templates/e/mtc_llfc_ssc_pcs.html,sha256=NtPlH-yM1XILWLsyF6YMDwg7dskfgPrvtcjyPCh9D8U,1519
-chellow/templates/e/mtc_llfc_sscs.html,sha256=Yyjrfb2Damfvuz-0koip3aJ_VH_UMuMsGSNgsSLmWmc,1611
-chellow/templates/e/mtc_llfcs.html,sha256=ekwnUMvpftcu77An30g692tn3Xam7xmxeOJU6GgIuZk,1315
+chellow/templates/e/mtc_llfc_ssc_pcs.html,sha256=-NLolWBMHWhlYcTZdBfbU92v_nXFu8wa36APXMakzBg,1663
+chellow/templates/e/mtc_llfc_sscs.html,sha256=lRq3D5LOs3h5-lntQfN7bTgZYBw4fOjQne1TDcL6SwE,1768
+chellow/templates/e/mtc_llfcs.html,sha256=z_maAgtaeNERgaRUvjf5Kp6kChpyYnNRO6thq9uMmsM,1452
 chellow/templates/e/mtc_participant.html,sha256=URmZviX13A-PY8-zMZ-CecytAhbh1_GVFkKgo2vBncg,2232
-chellow/templates/e/mtc_participants.html,sha256=-SuIG3ZoMRN24zrp-sYm9enqr_TlmgLacz9D81Oeb0E,1515
+chellow/templates/e/mtc_participants.html,sha256=QhJ7CCvio7HiCT3QWVeMN425EzJAob3M5VWIG7dywZI,1621
 chellow/templates/e/mtc_ssc.html,sha256=4-N2CFEHXTjWTEbo8De2QVlKFRraW6z7V6ISSWXjrGg,985
-chellow/templates/e/mtc_sscs.html,sha256=dU3sy-U27IxNGBHwTy4iMCjsxb7WrTK04qTvnUREZhk,1295
+chellow/templates/e/mtc_sscs.html,sha256=aiC8h7xETnxB77tj4Jll0d0ECBxvsVhxYKRootAPbE4,1405
 chellow/templates/e/mtcs.html,sha256=1VC5VTNF6t7QNReDILHJh0vaVSx-ajKjjKe_KinRdgY,853
 chellow/templates/e/ods_monthly_duration.html,sha256=8B-eDtHOnW5KYrRLX1R9ylg1_lyuOe5n8aHicyqhJfY,1367
 chellow/templates/e/participant.html,sha256=1GnUAavaektvmznO2UyA4LfHI96wtYpNZ_RNgjV2ivg,1022
@@ -348,6 +348,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-1681398121.0.0.dist-info/METADATA,sha256=Mx_iD6QSwXextqFc-nP1svFV5pYPI6x4KtlskfccQfU,12160
-chellow-1681398121.0.0.dist-info/WHEEL,sha256=EI2JsGydwUL5GP9t6kzZv7G3HDPi7FuZDDf9In6amRM,87
-chellow-1681398121.0.0.dist-info/RECORD,,
+chellow-1681477937.0.0.dist-info/METADATA,sha256=WOmFLi6H_nw__yPpIBZzAsN5GnW6aCCdU7m5arvheAw,12160
+chellow-1681477937.0.0.dist-info/WHEEL,sha256=EI2JsGydwUL5GP9t6kzZv7G3HDPi7FuZDDf9In6amRM,87
+chellow-1681477937.0.0.dist-info/RECORD,,