chellow 1712838153.0.0__tar.gz → 1712909617.0.0__tar.gz

{chellow-1712838153.0.0 → chellow-1712909617.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1712838153.0.0
+Version: 1712909617.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-1712909617.0.0/VERSION

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

{chellow-1712838153.0.0 → chellow-1712909617.0.0}/chellow/e/bsuos.py

@@ -219,7 +219,9 @@ def _process_url(logger, sess, url, contract, s):
     for row in reader:
         date_str = row[0].strip()
         len_date_str = len(date_str)
-        if len_date_str == 19:
+        if len_date_str == 0:
+            continue
+        elif len_date_str == 19:
             sep_char = date_str[13]
             date_format = f"%Y-%m-%dT%H{sep_char}%M:%S"
         elif len_date_str == 20:

{chellow-1712838153.0.0 → chellow-1712909617.0.0}/chellow/e/views.py

@@ -105,7 +105,11 @@ from chellow.utils import (
     utc_datetime,
     utc_datetime_now,
 )
-from chellow.views import chellow_redirect as credirect, hx_redirect as chx_redirect
+from chellow.views import (
+    chellow_redirect as credirect,
+    hx_redirect as chx_redirect,
+    requires_editor,
+)
 
 
 def chellow_redirect(path, code=None):
@@ -1075,6 +1079,29 @@ def dc_contract_get(dc_contract_id):
             )
 
 
+@e.route("/dc_contracts/<int:dc_contract_id>/properties")
+@requires_editor
+def dc_contract_properties_get(dc_contract_id):
+    contract = Contract.get_dc_by_id(g.sess, dc_contract_id)
+    return render_template("dc_contract_properties.html", dc_contract=contract)
+
+
+@e.route("/dc_contracts/<int:dc_contract_id>/properties/edit")
+@requires_editor
+def dc_contract_properties_edit_get(dc_contract_id):
+    dc_contract = Contract.get_dc_by_id(g.sess, dc_contract_id)
+    return render_template("dc_contract_properties_edit.html", dc_contract=dc_contract)
+
+
+@e.route("/dc_contracts/<int:contract_id>/properties/edit", methods=["POST"])
+def dc_contract_properties_edit_post(contract_id):
+    contract = Contract.get_dc_by_id(g.sess, contract_id)
+    properties = req_zish("properties")
+    contract.update(contract.name, contract.party, contract.charge_script, properties)
+    g.sess.commit()
+    return chellow_redirect(f"/dc_contracts/{contract.id}/properties", 303)
+
+
 @e.route("/dc_contracts/<int:dc_contract_id>/edit")
 def dc_contract_edit_get(dc_contract_id):
     parties = (
@@ -1127,9 +1154,8 @@ def dc_contract_edit_post(contract_id):
             party_id = req_int("party_id")
             name = req_str("name")
             charge_script = req_str("charge_script")
-            properties = req_zish("properties")
             party = Party.get_by_id(g.sess, party_id)
-            contract.update(name, party, charge_script, properties)
+            contract.update(name, party, charge_script, contract.properties)
             g.sess.commit()
             return chellow_redirect(f"/dc_contracts/{contract.id}", 303)
     except BadRequest as e:

{chellow-1712838153.0.0 → chellow-1712909617.0.0}/chellow/templates/e/dc_contract.html

@@ -66,6 +66,9 @@
 	</table>
 	<br>
 	<ul>
+		<li>
+			<a href="/e/dc_contracts/{{dc_contract.id}}/properties">Properties</a>
+		</li>
 		<li>
 			<a href="/e/dc_batches?dc_contract_id={{dc_contract.id}}">Batches</a>
 		</li>
@@ -99,10 +102,6 @@
 
 	<pre>{{dc_contract.charge_script}}</pre>
 
-	<h3>Properties</h3>
-
-	<pre>{{dc_contract.properties }}</pre>
-
 	<h3>State</h3>
 
 	<pre>{{dc_contract.state }}</pre>

{chellow-1712838153.0.0 → chellow-1712909617.0.0}/chellow/templates/e/dc_contract_edit.html

@@ -42,58 +42,10 @@
 				{{input_textarea(
 					'charge_script', dc_contract.charge_script, 40, 80)}}
 
-				<label>Properties</label>
-				{{ input_textarea(
-					'properties', dc_contract.properties, 40, 80) }}
-
 				<input type="submit" value="Update">
 			</fieldset>
 		</form>
 
-		<h4>Example</h4>
-
-		<p>For the SFTP protocol:</p>
-		<code>
-			<pre>
-{
-  "enabled": true,
-	"protocol": "sftp",
-	"file_type": ".df2",
-	"hostname": "example.com",
-	"username": "username",
-	"password": "password",
-	"directories": ["downloads1", "downloads2"]
-	"mpan_map": {  \\ Optional
-	  "99 0993 2821 985": null,  \\ Ignore MPAN
-	},
-}
-			</pre>
-		</code>
-		<p>For the HTTPS protocol:</p>
-		<code>
-			<pre>
-				{% raw %}
-{
-  "enabled": true,
-  "protocol": "https",
-  "download_days": 8,
-  "parser": "meniscus",
-  "url_template": "https://data.example.com/?from={{chunk_start.strftime('%d/%m/%Y')}}&amp;to={{chunk_finish.strftime('%d/%m/%Y')}}",
-  "url_values": {
-    "99 4298 4729 917": {
-      "name1": val1,
-      "name2": val2,
-    }
-  }
-	"mpan_map": {  \\ Optional
-	  "99 0993 2821 985": null,  \\ Ignore MPAN
-	},
-}
-
-				{% endraw %}
-			</pre>
-		</code>
-
 		<form action="/e/dc_contracts/{{dc_contract.id}}/edit" method="post">
 			<fieldset>
 				<legend>Update State</legend>

chellow-1712909617.0.0/chellow/templates/e/dc_contract_properties.html

@@ -0,0 +1,17 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» DC Contracts » {{dc_contract.name}} » Properties
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/dc_contracts">DC Contracts</a> &raquo;
+	<a href="/e/dc_contracts/{{dc_contract.id}}">dc_contract.name</a> &raquo;
+	Properties [<a href="/e/dc_contracts/{{dc_contract.id}}/properties/edit">edit</a>]
+{% endblock %}
+
+{% block content %}
+
+	<pre>{{dc_contract.properties }}</pre>
+
+{% endblock %}

chellow-1712909617.0.0/chellow/templates/e/dc_contract_properties_edit.html

@@ -0,0 +1,70 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» DC Contracts » {{dc_contract.name}} » Properties » Edit
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/dc_contracts">DC Contracts</a> &raquo;
+	<a href="/e/dc_contracts/{{dc_contract.id}}">{{dc_contract.name}}</a> &raquo;
+	<a href="/e/dc_contracts/{{dc_contract.id}}/properties">Properties</a> &raquo;
+ 	Edit
+{% endblock %}
+
+{% block content %}
+
+	<form action="/e/dc_contracts/{{dc_contract.id}}/properties/edit" method="post">
+		<fieldset>
+			<legend>Update Properties</legend>
+
+			<label>Properties</label>
+			{{ input_textarea('properties', dc_contract.properties, 40, 80) }}
+
+			<input type="submit" value="Update">
+		</fieldset>
+	</form>
+
+	<h4>Example</h4>
+
+	<p>For the SFTP protocol:</p>
+	<code>
+		<pre>
+{
+  "enabled": true,
+  "protocol": "sftp",
+  "file_type": ".df2",
+  "hostname": "example.com",
+  "username": "username",
+  "password": "password",
+  "directories": ["downloads1", "downloads2"]
+  "mpan_map": {  \\ Optional
+    "99 0993 2821 985": null,  \\ Ignore MPAN
+  },
+}
+		</pre>
+	</code>
+	<p>For the HTTPS protocol:</p>
+	<code>
+		<pre>
+			{% raw %}
+{
+  "enabled": true,
+  "protocol": "https",
+  "download_days": 8,
+  "parser": "meniscus",
+  "url_template": "https://data.example.com/?from={{chunk_start.strftime('%d/%m/%Y')}}&amp;to={{chunk_finish.strftime('%d/%m/%Y')}}",
+  "url_values": {
+    "99 4298 4729 917": {
+      "name1": val1,
+      "name2": val2,
+    }
+  }
+  "mpan_map": {  \\ Optional
+    "99 0993 2821 985": null,  \\ Ignore MPAN
+  },
+}
+
+			{% endraw %}
+		</pre>
+	</code>
+{% endblock %}

{chellow-1712838153.0.0 → chellow-1712909617.0.0}/chellow/views.py

@@ -11,6 +11,7 @@ import types
 from collections import OrderedDict
 from datetime import datetime as Datetime
 from decimal import Decimal
+from functools import wraps
 from importlib import import_module
 from io import DEFAULT_BUFFER_SIZE, StringIO
 from itertools import chain, islice
@@ -52,7 +53,7 @@ from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import joinedload
 from sqlalchemy.orm.attributes import flag_modified
 
-from werkzeug.exceptions import BadRequest
+from werkzeug.exceptions import BadRequest, Forbidden
 
 import chellow.bank_holidays
 import chellow.dloads
@@ -147,6 +148,17 @@ def hx_redirect(path, status=None):
     return res
 
 
+def requires_editor(f):
+    @wraps(f)
+    def decorated_function(*args, **kwargs):
+        if g.user.user_role.code == "editor":
+            return f(*args, **kwargs)
+        else:
+            raise Forbidden("You must be an editor to do this.")
+
+    return decorated_function
+
+
 @home.route("/configuration", methods=["GET"])
 def configuration():
     config = Contract.get_non_core_by_name(g.sess, "configuration")

chellow-1712838153.0.0/VERSION

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