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

chellow/e/views.py

@@ -1137,6 +1137,14 @@ def dc_contract_edit_get(dc_contract_id):
     )
 
 
+@e.route("/dc_contracts/<int:contract_id>/edit", methods=["DELETE"])
+def dc_contract_edit_delete(contract_id):
+    contract = Contract.get_dc_by_id(g.sess, contract_id)
+    contract.delete(g.sess)
+    g.sess.commit()
+    return hx_redirect("/dc_contracts", 303)
+
+
 @e.route("/dc_contracts/<int:contract_id>/edit", methods=["POST"])
 def dc_contract_edit_post(contract_id):
     contract = None
@@ -1161,10 +1169,6 @@ def dc_contract_edit_post(contract_id):
             )
             g.sess.commit()
             return chellow_redirect(f"/dc_contracts/{contract.id}", 303)
-        elif "delete" in request.form:
-            contract.delete(g.sess)
-            g.sess.commit()
-            return chellow_redirect("/dc_contracts", 303)
         else:
             party_id = req_int("party_id")
             name = req_str("name")
@@ -3059,6 +3063,14 @@ def mop_contract_edit_get(contract_id):
     )
 
 
+@e.route("/mop_contracts/<int:contract_id>/edit", methods=["DELETE"])
+def mop_contract_edit_delete(contract_id):
+    contract = Contract.get_mop_by_id(g.sess, contract_id)
+    contract.delete(g.sess)
+    g.sess.commit()
+    return hx_redirect("/mop_contracts", 303)
+
+
 @e.route("/mop_contracts/<int:contract_id>/edit", methods=["POST"])
 def mop_contract_edit_post(contract_id):
     try:
@@ -3082,10 +3094,6 @@ def mop_contract_edit_post(contract_id):
             )
             g.sess.commit()
             return chellow_redirect(f"/mop_contracts/{contract.id}", 303)
-        elif "delete" in request.form:
-            contract.delete(g.sess)
-            g.sess.commit()
-            return chellow_redirect("/mop_contracts", 303)
         else:
             party_id = req_int("party_id")
             name = req_str("name")

chellow/reports/report_ecoes_comparison.py

@@ -25,7 +25,7 @@ from chellow.models import (
     Supply,
     User,
 )
-from chellow.utils import req_bool
+from chellow.utils import csv_make_val, req_bool
 from chellow.views import chellow_redirect
 
 
@@ -236,25 +236,30 @@ def _process(
         "ecoes_pc",
         "chellow_pc",
         "ecoes_mtc",
+        "ecoes_mtc_date",
         "chellow_mtc",
         "ecoes_llfc",
+        "ecoes_llfc_from",
         "chellow_llfc",
         "ecoes_ssc",
         "chellow_ssc",
         "ecoes_es",
         "chellow_es",
         "ecoes_supplier",
+        "ecoes_supplier_registration_from",
         "chellow_supplier",
         "chellow_supplier_contract_name",
         "ecoes_dc",
         "chellow_dc",
         "ecoes_mop",
+        "ecoes_mop_appoint_date",
         "chellow_mop",
         "ecoes_gsp_group",
+        "ecoes_gsp_effective_from",
         "chellow_gsp_group",
         "ecoes_msn",
-        "chellow_msn",
         "ecoes_msn_install_date",
+        "chellow_msn",
         "ecoes_meter_type",
         "chellow_meter_type",
         "ignored",
@@ -493,8 +498,8 @@ def _process(
                 "ecoes_pc": ecoes["pc"],
                 "chellow_pc": chellow_pc,
                 "ecoes_mtc": ecoes["mtc"],
+                "ecoes_mtc_date": _parse_date(ecoes["mtc-date"]),
                 "chellow_mtc": chellow_mtc,
-                "chellow_mtc_date": _parse_date(ecoes["mtc-date"]),
                 "ecoes_llfc": ecoes["llfc"],
                 "ecoes_llfc_from": _parse_date(ecoes["llfc-from"]),
                 "chellow_llfc": chellow_llfc,
@@ -524,7 +529,7 @@ def _process(
                 "ignored": ignore,
                 "problem": problem,
             }
-            writer.writerow(values[t] for t in titles)
+            writer.writerow(csv_make_val(values[t]) for t in titles)
             values["chellow_supplier_contract_id"] = chellow_supplier_contract_id
             values["chellow_supply_id"] = chellow_supply_id
             values["diffs"] = diffs
@@ -563,21 +568,26 @@ def _process(
             "ecoes_pc": "",
             "chellow_pc": era.pc.code,
             "ecoes_mtc": "",
+            "ecoes_mtc_date": "",
             "chellow_mtc": era.mtc_participant.mtc.code,
             "ecoes_llfc": "",
+            "ecoes_llfc_from": "",
             "chellow_llfc": llfc.code,
             "ecoes_ssc": "",
             "chellow_ssc": ssc,
             "ecoes_es": "",
             "chellow_es": es,
             "ecoes_supplier": "",
+            "ecoes_supplier_registration_from": "",
             "chellow_supplier": supplier_contract.party.participant.code,
             "chellow_supplier_contract_name": supplier_contract.name,
             "ecoes_dc": "",
             "chellow_dc": dc,
             "ecoes_mop": "",
+            "ecoes_mop_appoint_date": "",
             "chellow_mop": mop,
             "ecoes_gsp_group": "",
+            "ecoes_gsp_effective_from": "",
             "chellow_gsp_group": supply.gsp_group.code,
             "ecoes_msn": "",
             "chellow_msn": msn,
@@ -587,7 +597,7 @@ def _process(
             "ignored": False,
             "problem": "In Chellow, but not in ECOES.",
         }
-        writer.writerow(values[t] for t in titles)
+        writer.writerow(csv_make_val(values[t]) for t in titles)
         values["chellow_supplier_contract_id"] = supplier_contract.id
         values["chellow_supply_id"] = era.supply.id
         values["diffs"] = []

chellow/templates/e/dc_contract_edit.html

@@ -11,64 +11,52 @@
 {% endblock %}
 
 {% block content %}
-	{% if request.method == 'GET' and request.values.view == 'confirm_delete' %}
-		<form method="post" action="/e/dc_contracts/{{dc_contract.id}}/edit">
-			<fieldset>
-				<legend>Are you sure you want to delete this contract?</legend>
-				<input type="submit" name="delete" value="delete">
-				<a href="/e/dc_contracts/{{dc_contract.id}}/edit">Cancel</a>
-			</fieldset>
-		</form>
-		
-	{% else %}
-
-		<form action="/e/dc_contracts/{{dc_contract.id}}/edit" method="post">
-			<fieldset>
-				<legend>Update Contract</legend>
-
-				<label>Party</label>
-				<select name="party_id">
-					{% for party in parties %}
-						{{ input_option(
-								'party_id', party.id,
-								party.participant.code + ' : ' + party.name,
-								dc_contract.party.id) }}
-					{% endfor %}
-				</select>
-
-				<label>Name</label> {{input_text('name', dc_contract.name)}}
-
-				<label>Charge script</label>
-				{{input_textarea(
-					'charge_script', dc_contract.charge_script, 40, 80)}}
-
-				<input type="submit" value="Update">
-			</fieldset>
-		</form>
-
-		<form action="/e/dc_contracts/{{dc_contract.id}}/edit" method="post">
-			<fieldset>
-				<legend>Update State</legend>
-				<label>State</label>
-				{{input_textarea('state', dc_contract.state, 40, 80)}}
-				<input type="submit" name="update_state" value="Update">
-			</fieldset>
-		</form>
-
-		<form action="/e/dc_contracts/{{dc_contract.id}}/edit">
-			<fieldset>
-				<legend>Delete This Contract</legend>
-				<input type="hidden" name="view" value="confirm_delete">
-				<input type="submit" value="Delete">
-			</fieldset>
-		</form>
-
-		<form method="post" action="/e/dc_contracts/{{dc_contract.id}}/edit">
-			<fieldset>
-				<legend>Ignore all snags before</legend>
-				{{ input_date('ignore', initial_date) }}
-				<input type="submit" name="ignore_snags" value="Ignore">
-			</fieldset>
-		</form>
-	{% endif %}
+	<form action="/e/dc_contracts/{{dc_contract.id}}/edit" method="post">
+		<fieldset>
+			<legend>Update Contract</legend>
+
+			<label>Party</label>
+			<select name="party_id">
+				{% for party in parties %}
+					{{ input_option(
+							'party_id', party.id,
+							party.participant.code + ' : ' + party.name,
+							dc_contract.party.id) }}
+				{% endfor %}
+			</select>
+
+			<label>Name</label> {{input_text('name', dc_contract.name)}}
+
+			<label>Charge script</label>
+			{{input_textarea(
+				'charge_script', dc_contract.charge_script, 40, 80)}}
+
+			<input type="submit" value="Update">
+		</fieldset>
+	</form>
+
+	<form action="/e/dc_contracts/{{dc_contract.id}}/edit" method="post">
+		<fieldset>
+			<legend>Update State</legend>
+			<label>State</label>
+			{{input_textarea('state', dc_contract.state, 40, 80)}}
+			<input type="submit" name="update_state" value="Update">
+		</fieldset>
+	</form>
+
+	<form hx-delete="/e/dc_contracts/{{dc_contract.id}}/edit"
+		hx-confirm="Are you sure you want to delete this contract?">
+		<fieldset>
+			<legend>Delete This Contract</legend>
+			<input type="submit" value="Delete">
+		</fieldset>
+	</form>
+
+	<form method="post" action="/e/dc_contracts/{{dc_contract.id}}/edit">
+		<fieldset>
+			<legend>Ignore all snags before</legend>
+			{{ input_date('ignore', initial_date) }}
+			<input type="submit" name="ignore_snags" value="Ignore">
+		</fieldset>
+	</form>
 {% endblock %}

chellow/templates/e/mop_contract_edit.html

@@ -10,38 +10,24 @@
 {% endblock %}
 
 {% block content %}
-	{% if request.method == 'GET' and request.values.view == 'confirm_delete' %}
-		
-		<form method="post">
-			<fieldset>
-				<legend>Are you sure you want to delete this contract?</legend>
-				<input type="hidden" name="mop_contract_id"
-					value="{{contract.id}}">
-				<input type="submit" name="delete" value="Delete">
-				<a href="/e/mop_contracts/{{contract.id}}/edit">Cancel</a>
-			</fieldset>
-		</form>
-			
-	{% else %}
-		
-		<form method="post">
-			<fieldset>
-				<legend>Update Contract</legend>
-				<input type="hidden" name="mop_contract_id" value="{{contract.id}}">
-				<label>Party</label>
-				<select name="party_id">
-					{% for party in parties %}
-						{{input_option('party_id', party.id,
-								party.participant.code + ' : ' + party.name, contract.party.id) }}
-					{% endfor %}
-				</select>
-				<label>Name </label> {{input_text('name', contract.name)}}
-				<label>Charge script</label>
-				{{input_textarea('charge_script', contract.charge_script, 40, 80)}}
-				<label>Properties</label>
-				{{input_textarea('properties', contract.properties, 40, 80)}}
-				<label>Example</label>
-				<code><pre>
+	<form method="post">
+		<fieldset>
+			<legend>Update Contract</legend>
+			<input type="hidden" name="mop_contract_id" value="{{contract.id}}">
+			<label>Party</label>
+			<select name="party_id">
+				{% for party in parties %}
+					{{input_option('party_id', party.id,
+							party.participant.code + ' : ' + party.name, contract.party.id) }}
+				{% endfor %}
+			</select>
+			<label>Name </label> {{input_text('name', contract.name)}}
+			<label>Charge script</label>
+			{{input_textarea('charge_script', contract.charge_script, 40, 80)}}
+			<label>Properties</label>
+			{{input_textarea('properties', contract.properties, 40, 80)}}
+			<label>Example</label>
+			<code><pre>
 has.importer=yes
 file.type=.df2
 hostname=example.com
@@ -49,26 +35,25 @@ username=username
 password=password
 directory0=downloads1
 directory1=downloads2
-				</pre></code>
-				<input type="submit" value="Update">
-			</fieldset>
-		</form>						
+			</pre></code>
+			<input type="submit" value="Update">
+		</fieldset>
+	</form>						
 
-		<form action="/e/mop_contracts/{{contract.id}}/edit" method="post">
-			<fieldset>
-				<legend>Update State</legend>	
-				<label>State</label>
-				{{input_textarea('state', contract.state, 40, 80)}}
-				<input type="submit" name="update_state" value="Update">
-			</fieldset>
-		</form>
+	<form action="/e/mop_contracts/{{contract.id}}/edit" method="post">
+		<fieldset>
+			<legend>Update State</legend>	
+			<label>State</label>
+			{{input_textarea('state', contract.state, 40, 80)}}
+			<input type="submit" name="update_state" value="Update">
+		</fieldset>
+	</form>
 
-		<form action="/e/mop_contracts/{{contract.id}}/edit" method="post">
-			<fieldset>
-				<legend>Delete this contract</legend>
-				<input type="hidden" name="view" value="confirm_delete">
-				<input type="submit" value="Delete">
-			</fieldset>
-		</form>
-	{% endif %}
+	<form hx-delete="/e/mop_contracts/{{contract.id}}/edit"
+		hx-confirm="Are you sure you want to delete this contract?">
+		<fieldset>
+			<legend>Delete this contract</legend>
+			<input type="submit" value="Delete">
+		</fieldset>
+	</form>
 {% endblock %}

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

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

@@ -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=ccA5ebQA8Oefwi9L71rbStvHenDMB4rhAu0iRMandLc,213977
+chellow/e/views.py,sha256=ZezsZhpsf1kH0BywUWdMMjxdYAYTIclksUOWTh_AOrE,214186
 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
@@ -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=C7LhYMdOeIH9-jEY6OF_gypQ0WVD2Y9HQiRnhJTt0lo,21408
+chellow/reports/report_ecoes_comparison.py,sha256=xjTvyfYAZhJeAzRJQmKk3xo5rPB1-QbSF-ARuyeKuTs,21822
 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
@@ -184,7 +184,7 @@ chellow/templates/e/dc_bill_edit.html,sha256=0GsN-ZIc4q-z_xs8igC2ZS6t4soo2SvB3qR
 chellow/templates/e/dc_bill_import.html,sha256=NHjMSoFizvFQIaPWuVE3nTCtMDTzJB0XmH8jXfV1tiA,2188
 chellow/templates/e/dc_bill_imports.html,sha256=lCaUR47r9KPr0VrQhEvVEaKexM5R_nmkxtzgpWZ0e9s,2135
 chellow/templates/e/dc_contract.html,sha256=b6DLDrGdzN9Rri56pFvfpE7QZKYXGHib2veYAztuHlg,2352
-chellow/templates/e/dc_contract_edit.html,sha256=YraU0_MTBjmzBCMdsuvtIYm7K58hnDly5wUZ-6n8XzY,2148
+chellow/templates/e/dc_contract_edit.html,sha256=IObmbHQmeZ_LSpnYgabmhoSNUR3aPmm-Jk5nJLM_u74,1706
 chellow/templates/e/dc_contract_hh_import.html,sha256=UODiBFNohb60MjH1w-9JW1JE0O9GR2uKPGw-lD7Da5g,848
 chellow/templates/e/dc_contract_hh_imports.html,sha256=eXFDGyzSgag4JRism81_p5yTzQOjCIXaVkQ8tl3dDcM,8172
 chellow/templates/e/dc_contract_properties.html,sha256=2EmA91gYWZcTOHQ3PxXQrpTOb8dm0OGjwRWsW6qNI9s,455
@@ -242,7 +242,7 @@ chellow/templates/e/mop_bill_import.html,sha256=sSVCZnarru0GKYFW1uuP0f1Ix9iNFDtE
 chellow/templates/e/mop_bill_imports.html,sha256=jIhWaOuk4hYj9jhXBUxQ7C8v9HJljWfOGGeu1rZa1PI,1610
 chellow/templates/e/mop_contract.html,sha256=CyuBhj6da1-TiaomXSDD8JD449Ksu8QvIZODHmsE804,1748
 chellow/templates/e/mop_contract_add.html,sha256=qyjDNz_pOVgfrsKaju0KwxBKJnWF9RxUa-8gUtaOc60,738
-chellow/templates/e/mop_contract_edit.html,sha256=zTAqLgMk334WhOoEr-1a20Jjw_fSvSKdxmKoXU0PXW4,2204
+chellow/templates/e/mop_contract_edit.html,sha256=4DbyiKbWRdliQGPh0wlh4dEuhD-R4-3XRzXoNMLfFD4,1719
 chellow/templates/e/mop_contracts.html,sha256=2TPVkeUefsYOVZIiiLMPJgwcrxhvjk8Io4UKvgdQ2AY,768
 chellow/templates/e/mop_rate_script.html,sha256=dEP4S4A3H_ld41ub8xbrTuBozSbgTdePBzzkroyNh5k,1170
 chellow/templates/e/mop_rate_script_add.html,sha256=H_VO8rc9E2jl-xU4ffOwhaZ28UM1PLC5G0aVbtH8P-M,643
@@ -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-1714470909.0.0.dist-info/METADATA,sha256=PSjGjb6-c3psTPFGyoKg-bktL3qTUbDmXUpzJrQkVDQ,12205
-chellow-1714470909.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-chellow-1714470909.0.0.dist-info/RECORD,,
+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,,