chellow 1681460579.0.0__tar.gz → 1681482204.0.0__tar.gz

{chellow-1681460579.0.0 → chellow-1681482204.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1681460579.0.0
+Version: 1681482204.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-1681482204.0.0/VERSION

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

{chellow-1681460579.0.0 → chellow-1681482204.0.0}/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-1681460579.0.0 → chellow-1681482204.0.0}/chellow/templates/e/era_supplier_bill_add.html

@@ -26,6 +26,7 @@
 	<form action="/e/eras/{{era.id}}/add_supplier_bill" method="post">
 		<fieldset>
 			<legend>Add Import Supplier Batch And Bill</legend>
+
 			<fieldset>
 				<legend>Batch</legend>
 				<label>Reference</label>
@@ -33,25 +34,16 @@
 				<label>Description</label>
 				{{input_text('batch_description', placeholder=next_batch_description)}}
 			</fieldset>
-			<br>
+
 			<fieldset>
 				<legend>Bill</legend>
 				<label>Reference</label> {{input_text('bill_reference', size_20)}}
 						
-				<label>Issue Date</label>
-				<fieldset>
-					{{input_date('issue')}}
-				</fieldset>
+				<label>Issue Date</label> {{input_date('issue')}}
 						
-				<label>Start Date</label>
-				<fieldset>
-					{{input_date('start', start_date)}}
-				</fieldset>
+				<label>Start Date</label> {{input_date('start', start_date)}}
 						
-				<label>Finish Date</label>
-				<fieldset>
-					{{input_date('finish')}}
-				</fieldset>
+				<label>Finish Date</label> {{input_date('finish')}}
 														
 				<label>kWh</label> {{input_text('kwh', '0')}}
 				<label>Net</label> {{input_text('net', '0.00')}}
@@ -62,11 +54,12 @@
 				<select name="bill_type_id">
 					{% for bill_type in bill_types %}
 						<p>{{normal_bill_type_id}} {{bill_type.id}}</p>
-							{{input_option('bill_type_id', bill_type.id, bill_type.code, normal_bill_type_id)}}
+							{{input_option(
+								'bill_type_id', bill_type.id, bill_type.code, normal_bill_type_id)}}
 					{% endfor %}
 				</select>
 				<label>Breakdown</label>
-				{{input_text('breakdown', '{}')}}
+				{{input_textarea('breakdown', '{}', 10, 80, show_pos=True)}}
 			</fieldset>
 			<input type="submit" value="Add">
 		</fieldset>

{chellow-1681460579.0.0 → chellow-1681482204.0.0}/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-1681460579.0.0 → chellow-1681482204.0.0}/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-1681460579.0.0 → chellow-1681482204.0.0}/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-1681460579.0.0 → chellow-1681482204.0.0}/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-1681460579.0.0 → chellow-1681482204.0.0}/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-1681460579.0.0 → chellow-1681482204.0.0}/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-1681460579.0.0 → chellow-1681482204.0.0}/chellow/templates/e/supplier_bill_add.html

@@ -29,22 +29,16 @@
 		<form action="/e/supplier_batches/{{batch.id}}/add_bill" method="post">
 			<fieldset>
 				<legend>Add A Bill</legend>
+
 				<label>MPAN Core</label> {{input_text('mpan_core')}}
+
 				<label>Reference</label> {{input_text('reference')}}
-				<fieldset>
-					<legend>Issue Date</legend>
-					{{input_date('issue')}}
-				</fieldset>
-							
-				<fieldset>
-					<label>Start Date</label>
-					{{input_date('start', start_date)}}
-				</fieldset>
-							
-				<fieldset>
-					<label>Finish Date</label>
-					{{input_date('finish')}}
-				</fieldset>
+
+				<label>Issue Date</label> {{input_date('issue')}}
+
+				<label>Start Date</label> {{input_date('start', start_date)}}
+
+				<label>Finish Date</label> {{input_date('finish')}}
 
 				<label>kWh</label> {{input_text('kwh', '0')}}
 
@@ -61,10 +55,13 @@
 				<select name="bill_type_id">
 					{% for bill_type in bill_types %}
 						<p>{{normal_bill_type_id}} {{bill_type.id}}</p>
-						{{input_option('bill_type_id', bill_type.id, bill_type.code, normal_bill_type_id)}}
+						{{input_option(
+							'bill_type_id', bill_type.id, bill_type.code, normal_bill_type_id)}}
 					{% endfor %}
 				</select>
-				<label>Breakdown</label> {{input_text('breakdown', '{}')}}
+
+				<label>Breakdown</label>
+				{{input_textarea('breakdown', '{}', 10, 80, show_pos=True)}}
 
 				<input type="submit" value="Add">
 			</fieldset>

chellow-1681460579.0.0/VERSION

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