chellow 1717768383.0.0__tar.gz → 1718704260.0.0__tar.gz

{chellow-1717768383.0.0 → chellow-1718704260.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1717768383.0.0
+Version: 1718704260.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-1718704260.0.0/VERSION

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

{chellow-1717768383.0.0 → chellow-1718704260.0.0}/chellow/gas/views.py

@@ -1,6 +1,7 @@
 import csv
 from collections import defaultdict
 from datetime import datetime as Datetime
+from decimal import Decimal
 from importlib import import_module
 from io import BytesIO, StringIO
 
@@ -22,6 +23,8 @@ from sqlalchemy.orm import joinedload
 
 from werkzeug.exceptions import BadRequest
 
+from zish import dumps, loads
+
 import chellow.gas.bill_import
 import chellow.gas.dn_rate_parser
 from chellow.models import (
@@ -231,24 +234,19 @@ def supply_get(g_supply_id):
             for report_id in properties["g_supply_reports"]:
                 batch_reports.append(Report.get_by_id(g.sess, report_id))
 
-        truncated_note = None
-        is_truncated = False
-        note = None
-        if len(g_supply.note.strip()) == 0:
-            note_str = "{'notes': []}"
-        else:
-            note_str = g_supply.note
+        note = truncated_line = None
+        g_supply_note = (
+            {"notes": []} if len(g_supply.note.strip()) == 0 else loads(g_supply.note)
+        )
 
-        supply_note = eval(note_str)
-        notes = supply_note["notes"]
+        notes = g_supply_note["notes"]
         if len(notes) > 0:
-            note = notes[0]
+            note = notes[-1]
             lines = note["body"].splitlines()
             if len(lines) > 0:
-                trunc_line = lines[0][:50]
-                if len(lines) > 1 or len(lines[0]) > len(trunc_line):
-                    is_truncated = True
-                    truncated_note = trunc_line
+                line0 = lines[0]
+                if len(lines) > 1 or len(line0) > 50:
+                    truncated_line = line0[:50]
         return render_template(
             "supply.html",
             triad_year=triad_year,
@@ -258,8 +256,7 @@ def supply_get(g_supply_id):
             g_era_bundles=g_era_bundles,
             g_supply=g_supply,
             system_properties=properties,
-            is_truncated=is_truncated,
-            truncated_note=truncated_note,
+            truncated_line=truncated_line,
             note=note,
             this_month_start=this_month_start,
             batch_reports=batch_reports,
@@ -447,8 +444,8 @@ def batch_get(g_batch_id):
                     except KeyError:
                         vbd = vat_breakdown[vat_percentage] = defaultdict(int)
 
-                    vbd["vat"] += vat_bd["vat"]
-                    vbd["net"] += vat_bd["net"]
+                    vbd["vat"] += vat_bd.get("vat", Decimal("0"))
+                    vbd["net"] += vat_bd.get("net", Decimal("0"))
 
     config_contract = Contract.get_non_core_by_name(g.sess, "configuration")
     properties = config_contract.make_properties()
@@ -720,10 +717,9 @@ def supply_notes_get(g_supply_id):
     g_supply = GSupply.get_by_id(g.sess, g_supply_id)
 
     if len(g_supply.note.strip()) > 0:
-        note_str = g_supply.note
+        g_supply_note = loads(g_supply.note)
     else:
-        note_str = "{'notes': []}"
-    g_supply_note = eval(note_str)
+        g_supply_note = {"notes": []}
 
     return render_template(
         "supply_notes.html", g_supply=g_supply, g_supply_note=g_supply_note
@@ -741,15 +737,13 @@ def supply_note_add_post(g_supply_id):
     try:
         g_supply = GSupply.get_by_id(g.sess, g_supply_id)
         body = req_str("body")
-        category = req_str("category")
-        is_important = req_bool("is_important")
         if len(g_supply.note.strip()) == 0:
-            g_supply.note = "{'notes': []}"
-        note_dict = eval(g_supply.note)
-        note_dict["notes"].append(
-            {"category": category, "is_important": is_important, "body": body}
-        )
-        g_supply.note = str(note_dict)
+            note_dict = {"notes": []}
+        else:
+            note_dict = loads(g_supply.note)
+
+        note_dict["notes"].append({"body": body, "timestamp": utc_datetime_now()})
+        g_supply.note = dumps(note_dict)
         g.sess.commit()
         return chellow_redirect(f"/supplies/{g_supply_id}", 303)
     except BadRequest as e:
@@ -762,36 +756,43 @@ def supply_note_add_post(g_supply_id):
 @gas.route("/supplies/<int:g_supply_id>/notes/<int:index>/edit")
 def supply_note_edit_get(g_supply_id, index):
     g_supply = GSupply.get_by_id(g.sess, g_supply_id)
-    g_supply_note = eval(g_supply.note)
+    g_supply_note = loads(g_supply.note)
     note = g_supply_note["notes"][index]
     note["index"] = index
     return render_template("supply_note_edit.html", g_supply=g_supply, note=note)
 
 
+@gas.route("/supplies/<int:g_supply_id>/notes/<int:index>/edit", methods=["DELETE"])
+def supply_note_edit_delete(g_supply_id, index):
+    try:
+        g_supply = GSupply.get_by_id(g.sess, g_supply_id)
+        g_supply_note = loads(g_supply.note)
+        del g_supply_note["notes"][index]
+        g_supply.note = dumps(g_supply_note)
+        g.sess.commit()
+        return hx_redirect(f"/supplies/{g_supply_id}/notes")
+    except BadRequest as e:
+        flash(e.description)
+        g_supply_note = loads(g_supply.note)
+        note = g_supply_note["notes"][index]
+        note["index"] = index
+        return render_template("supply_note_edit.html", g_supply=g_supply, note=note)
+
+
 @gas.route("/supplies/<int:g_supply_id>/notes/<int:index>/edit", methods=["POST"])
 def supply_note_edit_post(g_supply_id, index):
     try:
         g_supply = GSupply.get_by_id(g.sess, g_supply_id)
-        g_supply_note = eval(g_supply.note)
-        if "delete" in request.values:
-            del g_supply_note["notes"][index]
-            g_supply.note = str(g_supply_note)
-            g.sess.commit()
-            return chellow_redirect(f"/supplies/{g_supply_id}/notes", 303)
-        else:
-            category = req_str("category")
-            is_important = req_bool("is_important")
-            body = req_str("body")
-            note = g_supply_note["notes"][index]
-            note["category"] = category
-            note["is_important"] = is_important
-            note["body"] = body
-            g_supply.note = str(g_supply_note)
-            g.sess.commit()
-            return chellow_redirect(f"/supplies/{g_supply_id}/notes", 303)
+        g_supply_note = loads(g_supply.note)
+        body = req_str("body")
+        note = g_supply_note["notes"][index]
+        note["body"] = body
+        g_supply.note = dumps(g_supply_note)
+        g.sess.commit()
+        return hx_redirect(f"/supplies/{g_supply_id}/notes/{index}")
     except BadRequest as e:
         flash(e.description)
-        g_supply_note = eval(g_supply.note)
+        g_supply_note = loads(g_supply.note)
         note = g_supply_note["notes"][index]
         note["index"] = index
         return render_template("supply_note_edit.html", g_supply=g_supply, note=note)
@@ -800,7 +801,11 @@ def supply_note_edit_post(g_supply_id, index):
 @gas.route("/eras/<int:g_era_id>/edit")
 def era_edit_get(g_era_id):
     g_era = GEra.get_by_id(g.sess, g_era_id)
-    supplier_g_contracts = g.sess.query(GContract).order_by(GContract.name)
+    supplier_g_contracts = g.sess.scalars(
+        select(GContract)
+        .where(GContract.is_industry == false())
+        .order_by(GContract.name)
+    )
     site_g_eras = (
         g.sess.query(SiteGEra)
         .join(Site)

{chellow-1717768383.0.0 → chellow-1718704260.0.0}/chellow/templates/e/supply_notes.html

@@ -12,7 +12,6 @@
 
 {% block content %}
 	<table>
-		<legend>Notes</legend>
 		<thead>
 			<tr>
 				<th>Edit</th>

{chellow-1717768383.0.0 → chellow-1718704260.0.0}/chellow/templates/g/supply.html

@@ -97,30 +97,16 @@
 			<th><a href="/g/supplies/{{g_supply.id}}/notes">Notes</a></th>
 			<td>
 				{% if note %}
-					{% if is_truncated %}
-						<div id="truncated_note">
-							{{ truncated_note }} 
-						</div>
-						<div id="full_note" style="display: none;">
-							<pre
-									style=" white-space: pre-wrap;"
-									>{{ g_supply.note }}</pre>
-							<a
-									href="JavaScript:void()" onClick="hideText()"
-									>Less...</a>
-						</div>
-					{% else %}
-						Category: {{note.category}}
-						{% if note.is_important %}
-							Important
-						{% else %}
-							Not important
-						{% endif %}
-						<pre style="display: inline;">{{note.body}}</pre>
-					{% endif %}
+					<pre style="white-space pre-wrap;">
+						{%- if note.timestamp -%}<em>{{note.timestamp|hh_format}}</em>{%- endif %}
+						{%- if truncated_line -%}
+							<details><summary><span>{{truncated_line}}</span></summary>{{note.body}}</details>
+						{%- else %} {{note.body}}
+						{%- endif -%}
+					</pre>
 				{% endif %}
 			</td>
-		</tr>
+		<tr>
 	</table>
 				
 	{% for g_era_bundle in g_era_bundles %}

chellow-1718704260.0.0/chellow/templates/g/supply_note_add.html

@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Gas Supplies » {{g_supply.id}} » Notes » Add
+{% endblock %}
+
+{% block nav %}
+	<a href="/g/supplies">Gas Supplies</a>  &raquo;
+	<a href="/g/supplies/{{g_supply.id}}">{{g_supply.id}}</a>  &raquo;
+	<a href="/g/supplies/{{g_supply.id}}/notes">Notes</a>  &raquo; Add
+{% endblock %}
+
+{% block content %}
+	<form method="post" action="/g/supplies/{{g_supply.id}}/notes/add">
+		<fieldset>
+			<input type="hidden" name="g_supply_id" value="{{g_supply.id}}">
+			<label>Body</label> {{input_textarea('body', '', 30, 80)}}
+			<input type="submit" value="Add">
+		</fieldset>
+	</form>	
+{% endblock %}

chellow-1718704260.0.0/chellow/templates/g/supply_note_edit.html

@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+
+{% block title %}
+	Gas Supplies » {{g_supply.id}} » Notes » {{note.index}} Edit
+{% endblock %}
+
+{% block nav %}
+	<a href="/g/supplies">Gas Supplies</a>  &raquo;
+	<a href="/g/supplies/{{g_supply.id}}">{{g_supply.id}}</a>  &raquo;
+	<a href="/g/supplies/{{g_supply.id}}/notes">Notes</a>  &raquo; {{note.index}} Edit
+{% endblock %}
+
+{% block content %}
+	<form method="post" action="/g/supplies/{{g_supply.id}}/notes/{{note.index}}/edit">
+		<fieldset>
+			<legend>Update Supply Note</legend>
+			{% if note.timestamp %}
+				<label>Timestamp</label> {{ note.timestamp|hh_format }}
+			{% endif %}
+			<label>Body</label> {{input_textarea('body', note.body, 30, 80)}}
+			<input type="submit" value="Update">
+		</fieldset>
+	</form>
+
+	<form
+	    hx-delete="/g/supplies/{{g_supply.id}}/notes/{{note.index}}/edit"
+			hx-confirm="Are you sure you want to delete this note?"
+	>
+		<fieldset>
+			<legend>Delete Supply Note</legend>
+			<input type="submit" value="Delete">
+		</fieldset>
+	</form>
+{% endblock %}

{chellow-1717768383.0.0 → chellow-1718704260.0.0}/chellow/templates/g/supply_notes.html

@@ -5,9 +5,9 @@
 {% endblock %}
 
 {% block nav %}
-	<a href="/g_supplies">Gas Supplies</a>  &raquo;
-	<a href="/g_supplies/{{g_supply.id}}">{{g_supply.id}}</a> &raquo; Notes
-	[<a href="/g_supplies/{{g_supply.id}}/notes/add">add</a>]
+	<a href="/g/supplies">Gas Supplies</a>  &raquo;
+	<a href="/g/supplies/{{g_supply.id}}">{{g_supply.id}}</a> &raquo; Notes
+	[<a href="/g/supplies/{{g_supply.id}}/notes/add">add</a>]
 {% endblock %}
 
 {% block content %}
@@ -15,25 +15,17 @@
 		<thead>
 			<tr>
 				<th>Edit</th>
-				<th>Category</th>
-				<th>Importance</th>
+				<th>Timestamp</th>
 				<th>Body</th>
 			</tr>
 		</thead>
 		<tbody>
-			{% for note in g_supply_note.notes %}
+			{% for note in g_supply_note.notes|reverse %}
 				<tr>
 					<td>
-						[<a href="/g_supplies/{{g_supply.id}}/notes/{{loop.index0}}/edit">edit</a>]
-					</td>
-					<td>{{note.category}}</td>
-					<td>
-						{% if note.is_important %}
-							High
-						{% else %}
-							Low
-						{% endif %}
+						[<a href="/g/supplies/{{g_supply.id}}/notes/{{loop.index0}}/edit">edit</a>]
 					</td>
+					<td>{% if note.timestamp %}{{note.timestamp|hh_format}}{% endif %}</td>
 					<td>
 						<pre style=" white-space: pre-wrap;">{{note.body}}</pre>
 					</td>

{chellow-1717768383.0.0 → chellow-1718704260.0.0}/test/gas/test_gas_views.py

@@ -1216,6 +1216,51 @@ def test_read_add_post(sess, client):
     match(response, 303)
 
 
+def test_era_edit_get(sess, client):
+    vf = to_utc(ct_datetime(2000, 1, 1))
+    site = Site.insert(sess, "22488", "Water Works")
+    g_dn = GDn.insert(sess, "EE", "East of England")
+    g_ldz = g_dn.insert_g_ldz(sess, "EA")
+    g_exit_zone = g_ldz.insert_g_exit_zone(sess, "EA1")
+    insert_g_units(sess)
+    g_unit_M3 = GUnit.get_by_code(sess, "M3")
+    insert_g_reading_frequencies(sess)
+    g_reading_frequency_M = GReadingFrequency.get_by_code(sess, "M")
+    GContract.insert(sess, True, "Unidentified gas", "", {}, vf, None, {})
+    g_contract = GContract.insert(sess, False, "Fusion 2020", "", {}, vf, None, {})
+
+    g_supply = site.insert_g_supply(
+        sess,
+        "7y94u5",
+        "main",
+        g_exit_zone,
+        utc_datetime(2018, 1, 1),
+        None,
+        "hgeu8rhg",
+        1,
+        g_unit_M3,
+        g_contract,
+        "d7gthekrg",
+        g_reading_frequency_M,
+        1,
+        1,
+    )
+
+    g_era = g_supply.g_eras[0]
+
+    sess.commit()
+
+    response = client.get(f"/g/eras/{g_era.id}/edit")
+
+    match(
+        response,
+        200,
+        r'<select name="g_contract_id">\s*'
+        r'<option value="2" selected>Fusion 2020</option>\s*'
+        r"</select>",
+    )
+
+
 def test_era_post(sess, client):
     site = Site.insert(sess, "22488", "Water Works")
 

chellow-1717768383.0.0/VERSION

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

chellow-1717768383.0.0/chellow/templates/g/supply_note_add.html

@@ -1,21 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}
-	» Gas Supplies » {{g_supply.id}} » Notes » Add
-{% endblock %}
-
-{% block nav %}
-	<a href="/g_supplies">Gas Supplies</a>  &raquo;
-	<a href="/g_supplies/{{g_supply.id}}">{{g_supply.id}}</a>  &raquo;
-	<a href="/g_supplies/{{g_supply.id}}/notes">Notes</a>  &raquo; Add
-{% endblock %}
-
-{% block content %}
-	<form method="post" action="/g_supplies/{{g_supply.id}}/notes/add">
-		<input type="hidden" name="g_supply_id" value="{{g_supply.id}}">
-		<label>Category</label> {{input_text('category')}}
-		<label>Important?</label> {{input_checkbox('is_important')}}
-		<label>Body</label> {{input_textarea('body', '', 30, 80)}}
-		<input type="submit" value="Add">
-	</form>	
-{% endblock %}

chellow-1717768383.0.0/chellow/templates/g/supply_note_edit.html

@@ -1,31 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}
-	Gas Supplies » {{g_supply.id}} » Notes » {{note.index}} Edit
-{% endblock %}
-
-{% block nav %}
-	<a href="/g_supplies">Gas Supplies</a>  &raquo;
-	<a href="/g_supplies/{{g_supply.id}}">{{g_supply.id}}</a>  &raquo;
-	<a href="/g_supplies/{{g_supply.id}}/notes">Notes</a>  &raquo;
- 	{{note.index}} Edit
-{% endblock %}
-
-{% block content %}
-	<form method="post" action="/g_supplies/{{g_supply.id}}/notes/{{note.index}}/edit">
-		<fieldset>
-			<legend>Edit Note</legend>
-			<label>Category</label> {{input_text('category', note.category)}}
-			<label>Important?</label> {{input_checkbox('is_important', note.is_important)}}
-			<label>Body</label> {{input_textarea('body', note.body, 30, 80)}}
-			<input type="submit" name="update" value="Edit">
-		</fieldset>
-	</form>
-
-	<form action="/g_supplies/{{g_supply.id}}/notes/{{note.index}}/edit" method="post">
-		<fieldset>
-			<legend>Delete Note</legend>
-			<input type="submit" name="delete" value="Delete">
-		</fieldset>
-	</form>
-{% endblock %}