chellow 1690534443.0.0__py3-none-any.whl → 1690962871.0.0__py3-none-any.whl

chellow/e/hh_importer.py

@@ -99,16 +99,19 @@ def start_hh_import_process(dc_contract_id, istream, file_name, file_size):
     return process
 
 
+lock = threading.RLock()
+
+
 class HhImportTask(threading.Thread):
     def __init__(self, contract_id):
         super().__init__(name=f"HH Automatic Import: contract {contract_id}")
-        self.lock = threading.RLock()
         self.messages = deque()
         self.contract_id = contract_id
         self.importer = None
         self.stopped = threading.Event()
         self.going = threading.Event()
         self.is_error = False
+        self.wait_seconds = 30 * 60
 
     def stop(self):
         self.stopped.set()
@@ -118,8 +121,8 @@ class HhImportTask(threading.Thread):
         self.going.set()
 
     def is_locked(self):
-        if self.lock.acquire(False):
-            self.lock.release()
+        if lock.acquire(False):
+            lock.release()
             return False
         else:
             return True
@@ -138,7 +141,6 @@ class HhImportTask(threading.Thread):
 
     def import_file(self, sess):
         found_new = False
-        self.wait_seconds = 30 * 60
 
         try:
             contract = Contract.get_dc_by_id(sess, self.contract_id)
@@ -173,7 +175,7 @@ class HhImportTask(threading.Thread):
         return found_new
 
     def import_now(self):
-        if self.lock.acquire(False):
+        if lock.acquire(False):
             sess = None
             try:
                 sess = Session()
@@ -185,7 +187,7 @@ class HhImportTask(threading.Thread):
             finally:
                 if sess is not None:
                     sess.close()
-                self.lock.release()
+                lock.release()
 
     def run(self):
         while not self.stopped.isSet():

chellow/e/views.py

@@ -3950,23 +3950,30 @@ def supplier_batch_edit_get(batch_id):
     return render_template("supplier_batch_edit.html", batch=batch)
 
 
+@e.route("/supplier_batches/<int:batch_id>/edit", methods=["DELETE"])
+def supplier_batch_edit_delete(batch_id):
+    try:
+        batch = Batch.get_by_id(g.sess, batch_id)
+        contract_id = batch.contract.id
+        batch.delete(g.sess)
+        g.sess.commit()
+        return hx_redirect(f"/supplier_batches?supplier_contract_id={contract_id}", 303)
+    except BadRequest as e:
+        flash(e.description)
+        return make_response(
+            render_template("supplier_batch_edit.html", batch=batch), 400
+        )
+
+
 @e.route("/supplier_batches/<int:batch_id>/edit", methods=["POST"])
 def supplier_batch_edit_post(batch_id):
     try:
         batch = Batch.get_by_id(g.sess, batch_id)
-        if "update" in request.values:
-            reference = req_str("reference")
-            description = req_str("description")
-            batch.update(g.sess, reference, description)
-            g.sess.commit()
-            return chellow_redirect(f"/supplier_batches/{batch.id}", 303)
-        elif "delete" in request.values:
-            contract_id = batch.contract.id
-            batch.delete(g.sess)
-            g.sess.commit()
-            return chellow_redirect(
-                f"/supplier_batches?supplier_contract_id={contract_id}", 303
-            )
+        reference = req_str("reference")
+        description = req_str("description")
+        batch.update(g.sess, reference, description)
+        g.sess.commit()
+        return chellow_redirect(f"/supplier_batches/{batch.id}", 303)
     except BadRequest as e:
         flash(e.description)
         return make_response(

chellow/models.py

@@ -29,6 +29,7 @@ from sqlalchemy import (
     Text,
     and_,
     create_engine,
+    delete,
     event,
     not_,
     null,
@@ -932,9 +933,7 @@ class Batch(Base, PersistentClass):
             )
 
     def delete(self, sess):
-        sess.execute(
-            "delete from bill where batch_id = :batch_id", {"batch_id": self.id}
-        )
+        sess.execute(delete(Bill).where(Bill.batch == self))
         sess.delete(self)
 
     def insert_bill(

chellow/templates/e/supplier_batch_edit.html

@@ -16,31 +16,21 @@
 {% endblock %}
 
 {% block content %}
-	{% if request.method == 'GET' and request.values.confirm_delete %}
-		<form method="post" action="">
-			<fieldset>
-				<legend>Are you sure you want to delete this batch and all its bills?</legend>	
-				<input type="submit" name="delete" value="Delete">
-				<a href="/e/supplier_batches/{{batch.id}}/edit">Cancel</a>
-			</fieldset>
-		</form>
-
-	{% else %}
 	
-		<form action="" method="post">
-			<fieldset>
-				<legend>Update batch</legend>	
-				<label>Reference</label> {{input_text('reference', batch.reference)}}
-				<label>Description</label> {{input_text('description', batch.description)}}
-				<input type="submit" name="update" value="Update">
-			</fieldset>
-		</form>
+<form action="/e/supplier_batches/{{batch.id}}/edit" method="post">
+		<fieldset>
+			<legend>Update batch</legend>
+			<label>Reference</label> {{input_text('reference', batch.reference)}}
+			<label>Description</label> {{input_text('description', batch.description)}}
+			<input type="submit" name="update" value="Update">
+		</fieldset>
+	</form>
 
-		<form action="">
-			<fieldset>
-				<legend>Delete this batch</legend>	
-				<input type="submit" name="confirm_delete" value="Delete">
-			</fieldset>
-		</form>
-	{% endif %}
+	<form hx-delete="/e/supplier_batches/{{batch.id}}/edit"
+			hx-confirm="Are you sure you want to delete this batch and all its bills?">
+		<fieldset>
+			<legend>Delete this batch</legend>
+			<input type="submit" name="confirm_delete" value="Delete">
+		</fieldset>
+	</form>
 {% endblock %}

{chellow-1690534443.0.0.dist-info → chellow-1690962871.0.0.dist-info}/METADATA

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

@@ -5,7 +5,7 @@ chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=ZeHIu75t71FWJBfew_8sqi03KcMZmDlTWVn7QyyADu4,3942
 chellow/edi_lib.py,sha256=het3R0DBGtXEo-Sy1zvXQuX9EWQ1X6Y33G4l1hYYuds,51859
 chellow/general_import.py,sha256=BIv7SLjNVQuDSclWG1-ePCUsethlwm7_NVHI4SlyI8g,58612
-chellow/models.py,sha256=3iCwWh2NAHdATUrC_keQ8SBzQUocLTJXwgeFVItBkc4,234629
+chellow/models.py,sha256=T6tFYr_yXf56xgRWRrSk5g7_eM5ix2F_-20xRiVS6qk,234589
 chellow/national_grid.py,sha256=Y0ckPONIpMnip2qB9ptXBLxs6jJCk14c98eCkyd2fNM,4427
 chellow/proxy.py,sha256=Mzssi9nTf6s_G4RSn8k5oAHqzVYIxMsfbudj1amYucI,1387
 chellow/rate_server.py,sha256=xVk15pdSovcD8K8BWcOmjwo_L3a8LYry7L2Gvw56OEQ,5696
@@ -22,7 +22,7 @@ chellow/e/computer.py,sha256=P-8ZaLnD5GrAKkzuuLs314Ci-umszNuvYK03HysYkeA,66311
 chellow/e/dno_rate_parser.py,sha256=3IqGM2v6Str7S3Rc9FZ7lRWBKthfb3zSjpJLSETPcEE,20631
 chellow/e/duos.py,sha256=SLP2KpHlllMBMNzE70u0V3SHnScxWNOLQMjat28mu8U,29089
 chellow/e/energy_management.py,sha256=AnmaWsYqX4RTisqXx8AuWJJ_QG9vKy_GXEAFVYVaJ5M,11490
-chellow/e/hh_importer.py,sha256=P9KiHxpVUsD2Hqn_DfASw2w0KobmAjHYje7Z8-0QV4Y,16466
+chellow/e/hh_importer.py,sha256=xnonyt-XkxF04EzBeno_Xk0t5IAA_5zlJfikcHw-7Wc,16435
 chellow/e/hh_parser_bg_csv.py,sha256=IOjM-QliKzvSXyhslmxz504XWnsGkVKEaCQ48SNeNeQ,2423
 chellow/e/hh_parser_df2.py,sha256=G4kt4N4mNjUa1Z7B1Ov6rAyZmWDyGEVFYscdghToMRo,3558
 chellow/e/hh_parser_simple_csv.py,sha256=lVRprIEjDpTQdeXm2xcLmRAyre2LWec8ueVwcCISZPo,2082
@@ -34,7 +34,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=kxp9EXPCXv_yAbMRbpqa5b6fsw3KJ290zNaGU3piWgo,20647
-chellow/e/views.py,sha256=JC6phMmKpu-NmLEkDvFpMCiruQj-nmt9KSQRu0Q0I30,179019
+chellow/e/views.py,sha256=0R7pmtYQnaW3vCBA5ipCUhWFXcbBcRluric5wqEs4w8,179212
 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
@@ -279,7 +279,7 @@ chellow/templates/e/ssc.html,sha256=NiTbn9yLYYG_DV4j9S73rnIVmzTAzTbyaXomverHNnI,
 chellow/templates/e/sscs.html,sha256=r4uVLWSCMVhYeN_r5e9QVJGLPc4R9yhdJxGXON9Xma8,983
 chellow/templates/e/supplier_batch.html,sha256=xr17ydDxKALMOcs8rfz-9T4wGyHKJqPpOQqz9brT9eY,5013
 chellow/templates/e/supplier_batch_add.html,sha256=RabJ20yLpsF_npSLL5aeLlPDa2tL99fENaIzDYZJy1w,1240
-chellow/templates/e/supplier_batch_edit.html,sha256=imgRWTg4W0Db8BwqYnN8ZYno5SBZxRTj2Mkhi113HQg,1420
+chellow/templates/e/supplier_batch_edit.html,sha256=wFnhGHLo51omagJdE8viIYgmift7Y3n0C39sMru7XWU,1190
 chellow/templates/e/supplier_batch_file.html,sha256=fohdthY3ibO9a_2BJsYWyJhZL369F0gaUV7McFzWhMQ,1226
 chellow/templates/e/supplier_batch_file_add.html,sha256=q3rvpNOVFYmLjce-9qi2pACRXCicVvnnIqknphzWWiE,7618
 chellow/templates/e/supplier_batch_file_edit.html,sha256=g_1NKT3B79qKjbItZ4od7VyRXyS3cOsUvEiBN6kGWXQ,2009
@@ -352,6 +352,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-1690534443.0.0.dist-info/METADATA,sha256=Jpn1zGsNMQmtmEyZPXOKlR0xY4NPnXI14IsVYZeoBhQ,12161
-chellow-1690534443.0.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
-chellow-1690534443.0.0.dist-info/RECORD,,
+chellow-1690962871.0.0.dist-info/METADATA,sha256=0YbEgijfjNOQ6hPQ1jq5jbGrvGpx1U5z6XCUHc9spOM,12161
+chellow-1690962871.0.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
+chellow-1690962871.0.0.dist-info/RECORD,,