chellow 1757320031.0.0__py3-none-any.whl → 1759411815.0.0__py3-none-any.whl

chellow/templates/e/supplier_batch_upload_file.html

@@ -7,12 +7,9 @@
 
 {% block nav %}
 	<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
-	<a href="/e/supplier_contracts/{{batch.contract.id}}">{{batch.contract.name}}</a>
- 	&raquo; 
-	<a href="/e/supplier_batches?supplier_contract_id={{batch.contract.id}}">Batches</a>
- 	&raquo; 
-	<a href="/e/supplier_batches/{{batch.id}}">{{batch.reference}}</a> &raquo; 
- 	Upload Bill File
+	<a href="/e/supplier_contracts/{{batch.contract.id}}">{{batch.contract.name}}</a> &raquo; 
+	<a href="/e/supplier_batches/{{batch.contract.id}}/batches">Batches</a> &raquo; 
+	<a href="/e/supplier_batches/{{batch.id}}">{{batch.reference}}</a> &raquo; Upload Bill File
 {% endblock %}
 
 {% block content %}
@@ -50,6 +47,7 @@
 				<td>VAT</td>
 				<td>Gross</td>
 				<td>Breakdown</td>
+				<td>read</td>
 				<td>R1 Meter Serial Number</td>
 				<td>R1 MPAN</td>
 				<td>R1 Coefficient</td>
@@ -61,15 +59,91 @@
 				<td>R1 Present Read Date</td>
 				<td>R1 Present Read Value</td>
 				<td>R1 Present Read Type</td>
+				<td>element</td>
+				<td>Name</td>
+				<td>Start Date (YYY-mm-dd HH:MM)</td>
+				<td>Finish Date (YYY-mm-dd HH:MM)</td>
+				<td>Net</td>
+				<td>Breakdown</td>
 			</tr>
 		</tbody>
 	</table>
 
 	<p>
-		The register read block of fields can be repeated for each
-		register, or can be left out entirely if the bill doesn't have
-		any readings associated with it.
+		The columns after 'read' can be repeated for each register, or can be left out
+	 	entirely if the bill doesn't have any readings associated with it. The same applies to the 
+		columns after 'element'. Here's an example:
 	</p>
+
+	<table>
+		<caption>Example CSV File</caption>
+		<tbody>
+			<tr>
+				<td>N</td>
+				<td>JJih988</td>
+				<td>22 7338 1192 184</td>
+				<td>jhl449</td>
+				<td>2025-07-13 03:26</td>
+				<td>2025-06-01 00:00</td>
+				<td>2025-06-30 23:30</td>
+				<td>288</td>
+				<td>13.76</td>
+				<td>1.56</td>
+				<td>15.82</td>
+				<td>{}</td>
+				<td>element</td>
+				<td>nrg</td>
+				<td>2025-06-01 00:00</td>
+				<td>2025-06-30 23:30</td>
+				<td>5.88</td>
+				<td>{"kwh": 55, 'rate': 0.05}</td>
+				<td>element</td>
+				<td>ccl</td>
+				<td>2025-06-01 00:00</td>
+				<td>2025-06-30 23:30</td>
+				<td>0.92</td>
+				<td>{"kwh": 55, 'rate': 0.075}</td>
+			</tr>
+			<tr>
+				<td>N</td>
+				<td>jhgjfj8i</td>
+				<td>22 9981 4881 118</td>
+				<td>khghl</td>
+				<td>2025-07-13 03:26</td>
+				<td>2025-06-01 00:00</td>
+				<td>2025-06-30 23:30</td>
+				<td>8892</td>
+				<td>885.71</td>
+				<td>32.87</td>
+				<td>15.82</td>
+				<td>{}</td>
+				<td>element</td>
+				<td>day</td>
+				<td>2025-06-01 00:00</td>
+				<td>2025-06-30 23:30</td>
+				<td>881.77</td>
+				<td>{"kwh": 81, 'rate': 0.12}</td>
+				<td>read</td>
+				<td>xxiE90</td>
+				<td>22 9981 4881 118</td>
+				<td>1</td>
+				<td>kWh</td>
+				<td>00041</td>
+				<td>2025-05-31 00:00</td>
+				<td>276766</td>
+				<td>A</td>
+				<td>2025-06-30 00:00</td>
+				<td>277298</td>
+				<td>C</td>
+				<td>element</td>
+				<td>aahedc</td>
+				<td>2025-06-01 00:00</td>
+				<td>2025-06-30 23:30</td>
+				<td>88</td>
+				<td>{"kwh": 7754, 'rate': 0.0511}</td>
+			</tr>
+		</tbody>
+	</table>
 	<table>
 		<caption>
 			Mapping Between Read Types

chellow/templates/e/supplier_batches.html

@@ -7,12 +7,13 @@
 {% block nav %}
 	<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
 	<a href="/e/supplier_contracts/{{contract.id}}">{{contract.name}}</a> &raquo; 
-	Batches [<a href="/e/supplier_contracts/{{contract.id}}/add_batch">add</a>]
+	Batches [<a href="/e/supplier_contracts/{{contract.id}}/batches/edit">edit</a>]
 {% endblock %}
 
 {% block content %}
 	<table class="sticky">
-		<caption>Batches</caption>	
+		<caption>Batches [<a href="/e/supplier_contracts/{{contract.id}}/batches/add">add</a>]
+		</caption>	
 		<thead>
 			<tr>
 				<th>Reference</th>
@@ -29,8 +30,7 @@
 				{% set batch = row[0] %}
 				<tr>
 					<td>
-						<a href="/e/supplier_batches/{{batch.id}}?bill_limit=1000"
-							>{{batch.reference}}</a>
+						<a href="/e/supplier_batches/{{batch.id}}">{{batch.reference}}</a>
 					</td>
 					<td>{{batch.description}}</td>
 					<td>{{ "{:,}".format(row[1]) }}</td>

chellow/templates/e/supplier_batches_edit.html

@@ -0,0 +1,26 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Supplier Contracts » {{contract.name}} » Batches
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
+	<a href="/e/supplier_contracts/{{contract.id}}">{{contract.name}}</a> &raquo; 
+	<a href="/e/supplier_contracts/{{contract.id}}/batches">Batches</a> &raquo;
+	Edit
+{% endblock %}
+
+{% block content %}
+	<form hx-post="/e/supplier_contracts/{{contract.id}}/batches/edit"
+			hx-confirm="Are you sure you want to delete all the bills then re-import bills from the files for all batches in the contract that have batch files?"
+	>
+		<fieldset>
+			<legend>
+				For All Batches With At Least One Batch File, Delete All The Bills And Then Re-import Rrom The
+				Files
+			</legend>
+			<button name="delete_import_bills">Re-Import Bills</button>
+		</fieldset>
+	</form>
+{% endblock %}

chellow/templates/e/supplier_bill.html

@@ -7,13 +7,10 @@
 
 {% block nav %}
 	<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
-	<a href="/e/supplier_contracts/{{bill.batch.contract.id}}"
-		>{{bill.batch.contract.name}}</a> &raquo; 
-	<a href="/e/supplier_batches?supplier_contract_id={{bill.batch.contract.id}}"
-		>Batches</a> &raquo; 
+	<a href="/e/supplier_contracts/{{bill.batch.contract.id}}">{{bill.batch.contract.name}}</a> &raquo; 
+	<a href="/e/supplier_contracts/{{bill.batch.contract.id}}/batches">Batches</a> &raquo; 
 	<a href="/e/supplier_batches/{{bill.batch.id}}">{{bill.batch.reference}}</a> &raquo; 
-	Bill {{bill.id}}
-	[<a href="/e/supplier_bills/{{bill.id}}/edit">edit</a>]
+	Bill {{bill.id}} [<a href="/e/supplier_bills/{{bill.id}}/edit">edit</a>]
 {% endblock %}
 
 {% block content %}
@@ -122,6 +119,32 @@
 		</tbody>
 	</table>
 
+	<table>
+		<legend>Elements [<a href="/e/supplier_bills/{{bill.id}}/add_element">add</a>]</legend>	
+		<thead>
+			<tr>
+				<th>Edit</th>
+				<th>Name</th>
+    		<th>Start Date</th>
+				<th>Finish Date</th>
+				<th>Net GBP</th>
+				<th>Breakdown</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for element in elements %}
+				<tr>
+					<td>[<a href="/e/supplier_elements/{{element.id}}/edit">edit</a>]</td>
+					<td>{{element.name}}</td>
+					<td>{{element.start_date|hh_format}}</td>
+					<td>{{element.finish_date|hh_format}}</td>
+					<td style="text-align: right">{{element.net}}</td>
+					<td>{{element.breakdown}}</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+
 	<table>
 		<caption>Breakdown</caption>	
 		<thead>

chellow/templates/e/supplier_bill_add.html

@@ -42,11 +42,11 @@
 
 				<label>kWh</label> {{input_text('kwh', '0')}}
 
-				<label>Net</label> {{input_text('net', '0')}}
+				<label>Net</label> {{input_text('net', '0.00')}}
 
-				<label>VAT</label> {{input_text('vat', '0')}}
+				<label>VAT</label> {{input_text('vat', '0.00')}}
 
-				<label>Gross</label> {{input_text('gross', '0')}}
+				<label>Gross</label> {{input_text('gross', '0.00')}}
 
 				<label>Account</label> {{input_text('account', account)}}
 

chellow/templates/e/supplier_bill_import.html

@@ -9,7 +9,7 @@
 	<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
 	<a href="/e/supplier_contracts/{{batch.contract.id}}">{{batch.contract.name}}</a>
  	&raquo; 
-	<a href="/e/supplier_batches?supplier_contract_id={{batch.contract.id}}">Batches</a>
+	<a href="/e/supplier_contracts/{{batch.contract.id}}/batches">Batches</a>
  	&raquo; 
 	<a href="/e/supplier_batches/{{batch.id}}">{{batch.reference}}</a> &raquo; 
  	{{importer_id}}

chellow/templates/e/supplier_bill_import_contract.html

@@ -0,0 +1,118 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Supplier Contracts » {{contract.name}} »
+	Batches » {{importer_id}}
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
+	<a href="/e/supplier_contracts/{{contract.id}}">{{contract.name}}</a> &raquo; 
+	<a href="/e/supplier_contracts/{{contract.id}}/batches">Batches</a> &raquo; 
+ 	{{importer_id}}
+{% endblock %}
+
+{% block content %}
+	<h2>Bill Import</h2>	
+
+	{% if is_alive %}
+		<p>Still running. Refresh the page to see latest progress.</p>
+	{% endif %}
+
+	{% if status %}
+		<p>{{status}}</p>
+	{% endif %}
+
+	<ul>
+		{% for msg in log %}
+			<li>{{msg}}</li>
+		{% endfor %}
+	</ul>
+	
+	{% if failed_bills|length > 0 %}
+		<table class="sticky">
+			<caption>Failed Bills</caption>
+			<thead>
+				<tr>
+					<th>Error</th>
+					<th>MPAN Core</th>
+					<th>Account</th>
+					<th>Reference</th>
+					<th>Bill Type Code</th>
+					<th>Issue Date</th>
+					<th>Start Date</th>
+					<th>Finish Date</th>
+					<th>kWh</th>
+					<th>Net</th>
+					<th>VAT</th>
+					<th>Gross</th>
+					<th>Breakdown</th>
+					{% for i in range(failed_max_registers) %}
+						<th>R{{loop.index}} MPAN</th>
+						<th>R{{loop.index}} Meter Serial Number</th>
+						<th>R{{loop.index}} Coefficient</th>
+						<th>R{{loop.index}} Units</th>
+						<th>R{{loop.index}} TPR</th>
+						<th>R{{loop.index}} Previous Read Date</th>
+						<th>R{{loop.index}} Previous Read Value</th>
+						<th>R{{loop.index}} Previous Read Type</th>
+						<th>R{{loop.index}} Present Read Date</th>
+						<th>R{{loop.index}} Present Read Value</th>
+						<th>R{{loop.index}} Present Read Type</th>
+					{% endfor %}
+				</tr>
+			</thead>
+			<tbody>
+				{% for bill in failed_bills %}
+					<tr>
+						<td>{{bill.error}}</td>
+						<td>
+							<a href="/supplies?search_pattern={{bill.mpan_core}}"
+								>{{bill.mpan_core}}</a>
+						</td>
+						<td>{{bill.account}}</td>
+						<td>{{bill.reference}}</td>
+						<td>{{bill.bill_type_code}}</td>
+						<td>
+							{% if 'issue_date' in bill %}
+								{{bill.issue_date|hh_format}}
+							{% endif %}
+						</td>
+						<td>
+							{% if 'start_date' in bill %}
+								{{bill.start_date|hh_format}}
+							{% endif %}
+						</td>
+						<td>
+							{% if 'finish_date' in bill %}
+								{{bill.finish_date|hh_format}}</td>
+							{% endif %}
+						<td>{{bill.kwh}}</td>
+						<td>{{bill.net}}</td>
+						<td>{{bill.vat}}</td>
+						<td>{{bill.gross}}</td>
+						<td>
+							{% if 'breakdown' in bill %}
+								<pre>{{bill.breakdown|dumps}}</pre>
+							{% endif %}
+						</td>
+						{% for read in bill.reads %}
+							<td>{{read.mpan}}</td>
+							<td>{{read.msn}}</td>
+							<td>{{read.coefficient}}</td>
+							<td>{{read.units}}</td>
+							<td>{{read.tpr_code}}</td>
+							<td>{{read.prev_date|hh_format}}</td>
+							<td>{{read.prev_value}}</td>
+							<td>{{read.prev_type_code}}</td>
+							<td>{{read.pres_date|hh_format}}</td>
+							<td>{{read.pres_value}}</td>
+							<td>{{read.pres_type_code}}</td>
+						{% endfor %}
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	{% endif %}
+
+{% endblock %}

chellow/templates/e/supplier_contract.html

@@ -59,7 +59,7 @@
 
 	<ul>
 		<li>
-			<a href="/e/supplier_batches?supplier_contract_id={{contract.id}}">Batches</a>
+			<a href="/e/supplier_contracts/{{contract.id}}/batches">Batches</a>
 		</li>
 	</ul>
 

chellow/templates/e/supplier_element.html

@@ -0,0 +1,45 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Supplier Contracts » {{element.bill.batch.contract.name}} »
+ 	Batches » {{element.bill.batch.reference}} » {{element.bill.reference}} »
+	{{element.bill.reference}} » {{element.name}}
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
+	<a href="/e/supplier_contracts/{{element.bill.batch.contract.id}}"
+		>{{element.bill.batch.contract.name}}</a> &raquo; 
+	<a href="/e/supplier_contracts/{{element.bill.batch.contract.id}}/batches"
+		>Batches</a> &raquo; 
+	<a href="/e/supplier_batches/{{element.bill.batch.id}}"
+		  >{{element.bill.batch.reference}}</a> &raquo; 
+  <a href="/e/supplier_bills/{{element.bill.id}}">{{element.bill.reference}}</a> &raquo;
+  {{element.name}}</a> &raquo; [<a href="/e/supplier_elements/{{element.id}}/edit">edit</a>]
+{% endblock %}
+
+{% block content %}
+	<table>
+		<caption>Element</caption>	
+		<thead>
+			<tr>
+				<th>Name</th>
+				<th>Start Date</th>
+				<th>Finish Date</th>
+				<th>Net GBP</th>
+				<th>Breakdown</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td>{{element.name}}</td>
+				<td>{{element.start_date|hh_format }}</td>
+				<td>{{element.finish_date|hh_format }}</td>
+				<td>{{element.net}}</td>
+				<td><pre>{{element.breakdown}}</pre></td>
+			</tr>
+		</tbody>
+	</table>
+
+
+{% endblock %}

chellow/templates/e/supplier_element_add.html

@@ -0,0 +1,36 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Supplier Contracts » {{bill.batch.contract.name}} » Batches » 
+	{{bill.batch.reference}} » {{bill.reference}} » Add Element
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
+	<a href="/e/supplier_contracts/{{bill.batch.contract.id}}">{{bill.batch.contract.name}}</a> &raquo; 
+	<a href="/e/supplier_contract/{{bill.batch.contract.id}}/batches">Batches</a> &raquo; 
+	<a href="/e/supplier_batches/{{bill.batch.id}}">{{bill.batch.reference}}</a> &raquo; 
+	<a href="/e/supplier_bills/{{bill.id}}">{{bill.reference}}</a> &raquo;
+ 	Add Element
+{% endblock %}
+
+{% block content %}
+	<form action="/e/supplier_bills/{{bill.id}}/add_element" method="post">
+		<fieldset>
+			<legend>Add An Element</legend>
+
+			<label>Name</label> {{input_text('name')}}
+
+			<label>Start Date</label> {{input_date('start', start_date)}}
+
+			<label>Finish Date</label> {{input_date('finish')}}
+
+			<label>Net GBP</label> {{input_text('net', '0.00')}}
+
+			<label>Breakdown</label>
+			{{input_textarea('breakdown', '{}', 10, 80, show_pos=True)}}
+
+			<input type="submit" value="Add">
+		</fieldset>
+	</form>
+{% endblock %}

chellow/templates/e/supplier_element_edit.html

@@ -0,0 +1,51 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Supplier Contracts » {{element.bill.batch.contract.name}} »
+ 	Batches » {{element.bill.batch.reference}} » Bills »
+	{{element.bill.reference}} » {{element.name}} » Edit
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/supplier_contracts">Supplier Contracts</a> &raquo; 
+	<a href="/e/supplier_contracts/{{element.bill.batch.contract.id}}"
+		  >{{element.bill.batch.contract.name}}</a> &raquo; 
+	<a href="/e/supplier_contracts/{{element.bill.batch.contract.id}}/batches"
+		  >Batches</a> &raquo; 
+	<a href="/e/supplier_batches/{{element.bill.batch.id}}"
+		  >{{element.bill.batch.reference}}</a> &raquo; 
+	<a href="/e/supplier_bills/{{element.bill.id}}">{{element.bill.reference}}</a> &raquo;
+	<a href="/e/supplier_elements/{{element.id}}">{{element.name}}</a> &raquo;
+ 	Edit
+{% endblock %}
+
+{% block content %}
+
+	<form method="post" action="/e/supplier_elements/{{element.id}}/edit">
+		<fieldset>
+			<legend>Update This Element</legend>	
+			<label>Name</label> {{input_text('name', element.name)}}
+			<label>Start Date</label> {{input_date('start', element.start_date)}}
+			<label>Finish Date</label> {{input_date('finish', element.finish_date)}}
+			<label>Net GBP</label> {{input_text('net', element.net)}}
+			<label>Breakdown</label>
+			{{input_textarea('breakdown', element.breakdown, 10, 80, show_pos=True)}}
+			<input type="submit" name="update" value="Update">
+		</fieldset>
+  </form>
+
+		<h3>Example Breakdown</h3>
+
+		<pre>{
+  "nrg-kwh": 1000,
+  "nrg-rate": 0.1,
+}</pre>
+
+	<form hx-delete="/e/supplier_elements/{{element.id}}/edit"
+			hx-confirm="Are you sure you want to delete this element?">
+		<fieldset>
+			<legend>Delete This Element</legend>	
+			<input type="submit" name="confirm_delete" value="Delete">
+		</fieldset>
+	</form>
+{% endblock %}