chellow 1724751676.0.0__py3-none-any.whl → 1724831616.0.0__py3-none-any.whl

chellow/gas/views.py

@@ -17,7 +17,7 @@ from flask import (
     request,
 )
 
-from sqlalchemy import false, select, text, true
+from sqlalchemy import false, func, select, text, true
 from sqlalchemy.orm import joinedload
 
 
@@ -352,9 +352,18 @@ def supply_edit_post(g_supply_id):
 def batches_get():
     g_contract_id = req_int("g_contract_id")
     g_contract = GContract.get_by_id(g.sess, g_contract_id)
-    g_batches = (
-        g.sess.query(GBatch)
-        .filter(GBatch.g_contract == g_contract)
+    g_batches = g.sess.execute(
+        select(
+            GBatch,
+            func.count(GBill.id),
+            func.coalesce(func.sum(GBill.net), 0),
+            func.coalesce(func.sum(GBill.vat), 0),
+            func.coalesce(func.sum(GBill.gross), 0),
+            func.coalesce(func.sum(GBill.kwh), 0),
+        )
+        .join(GBill, isouter=True)
+        .where(GBatch.g_contract == g_contract)
+        .group_by(GBatch.id)
         .order_by(GBatch.reference.desc())
     )
     return render_template("batches.html", g_contract=g_contract, g_batches=g_batches)

chellow/reports/report_ecoes_comparison.py

@@ -225,9 +225,12 @@ def _process(
         ecoes_row["mpan_spaces"] = mpan_spaces
         if mpan_spaces in ecoes_mpans:
             prev_row = ecoes_mpans[mpan_spaces]
-            prev_row["meter_count"] += 1
+            msn = ecoes_row["msn"]
+            if len(msn) > 0:
+                prev_msns = prev_row["msn"].split(",")
+                prev_msns.append(msn)
+                prev_row["msn"] = ", ".join(prev_msns)
         else:
-            ecoes_row["meter_count"] = 1
             ecoes_mpans[mpan_spaces] = ecoes_row
 
     titles = (
@@ -295,15 +298,6 @@ def _process(
         ecoes_disconnected = ecoes_es == ""
         current_chell = mpan_spaces in mpans
 
-        if ecoes["meter_count"] > 1:
-            problem += (
-                f"There are {ecoes['meter_count']} meters associated with this MPAN "
-                f"core in ECOES, but Chellow only supports one meter per supply at the "
-                f"moment. If there really should be multiple meters for this supply, "
-                f"let me know and I'll add support for it in Chellow."
-            )
-            ignore = False
-
         if ecoes_disconnected and current_chell:
             problem += "Disconnected in ECOES, but current in Chellow. "
             ignore = False
@@ -471,7 +465,9 @@ def _process(
 
                 chellow_msn = era.msn
 
-                if chellow_msn.split(",")[0] != ecoes["msn"]:
+                if set([m.strip() for m in chellow_msn.split(",")]) != set(
+                    [m.strip() for m in ecoes["msn"].split(",")]
+                ):
                     problem += "The meter serial numbers don't match. "
                     diffs.append("msn")
                     if mpan_spaces not in ignore_mpan_cores_msn:

chellow/templates/e/supply_eras.html

@@ -243,114 +243,114 @@
 							{% set bill = bill_dict['bill'] %}
 							{% set rows_high = bill_dict['rows_high'] %}
 							{% if bill_dict.first_collapsible %}
-							<tr style="background-color: silver; cursor: pointer;">
-									<td style="text-decoration: none; padding-top: 0px; padding-bottom: 0px; font-size: x-small;"
-											colspan="{{9 + imp_bills['inner_headers']|length * 4 + imp_bills['num_outer_cols'] * 5}}"
-											class="expander_{{bill_dict.collapse_id}}"
-											onClick="expandBills({{bill_dict.collapse_id}})">
-											+
-									</td>
-									<td style="text-decoration: none; display: none; padding-top: 0px; padding-bottom: 0px; font-size: x-small;"
-											colspan="{{9 + imp_bills['inner_headers']|length * 4 + imp_bills['num_outer_cols'] * 5}}"
-											class="collapser_{{bill_dict.collapse_id}}"
-											onClick="collapseBills({{bill_dict.collapse_id}})">
-											-
-									</td>
-							</tr>
+								<tr style="background-color: silver; cursor: pointer;">
+										<td style="text-decoration: none; padding-top: 0px; padding-bottom: 0px; font-size: x-small;"
+												colspan="{{9 + imp_bills['inner_headers']|length * 4 + imp_bills['num_outer_cols'] * 5}}"
+												class="expander_{{bill_dict.collapse_id}}"
+												onClick="expandBills({{bill_dict.collapse_id}})">
+												+
+										</td>
+										<td style="text-decoration: none; display: none; padding-top: 0px; padding-bottom: 0px; font-size: x-small;"
+												colspan="{{9 + imp_bills['inner_headers']|length * 4 + imp_bills['num_outer_cols'] * 5}}"
+												class="collapser_{{bill_dict.collapse_id}}"
+												onClick="collapseBills({{bill_dict.collapse_id}})">
+												-
+										</td>
+								</tr>
 							{% endif %}
 
 							<tr {% if bill_dict.collapsible %}
 									class="collapsible_{{bill_dict.collapse_id}}"
 									style="display: none; background-color: silver;"
 									{% endif %}>
-									<td rowspan="{{ rows_high }}">
+								<td rowspan="{{ rows_high }}">
 											<a href="/e/supplier_bills/{{bill.id}}">View</a>
-									</td>
-									<td rowspan="{{ rows_high }}">
-											<label title="{{bill.start_date|hh_format}}">{{bill.start_date|hh_format('date')}}</label>
-									</td>
-									<td rowspan="{{ rows_high }}">
-											<label title="{{ bill.finish_date|hh_format }}">{{ bill.finish_date|hh_format('date') }}</label>
-									</td>
-									<td rowspan="{{ rows_high }}">
-											<a href="/e/supplier_batches/{{bill.batch.id}}">{{bill.batch.reference}}</a>
-									</td>
-									<td rowspan="{{ rows_high }}">{{ bill.reference }}</td>
-									<td rowspan="{{ rows_high }}">{{ bill.kwh }}</td>
-									<td rowspan="{{ rows_high }}">{{ bill.net }}</td>
-									<td rowspan="{{ rows_high }}">{{ bill.vat }}</td>
-									<td rowspan="{{ rows_high }}">
-											<a href="/bill_types/{{bill.bill_type.id}}"
+								</td>
+								<td rowspan="{{ rows_high }}">
+									<label title="{{bill.start_date|hh_format}}">{{bill.start_date|hh_format('date')}}</label>
+								</td>
+								<td rowspan="{{ rows_high }}">
+									<label title="{{ bill.finish_date|hh_format }}">{{ bill.finish_date|hh_format('date') }}</label>
+								</td>
+								<td rowspan="{{ rows_high }}">
+									<a href="/e/supplier_batches/{{bill.batch.id}}">{{bill.batch.reference}}</a>
+								</td>
+								<td rowspan="{{ rows_high }}">{{ bill.reference }}</td>
+								<td rowspan="{{ rows_high }}">{{ bill.kwh }}</td>
+								<td rowspan="{{ rows_high }}">{{ bill.net }}</td>
+								<td rowspan="{{ rows_high }}">{{ bill.vat }}</td>
+								<td rowspan="{{ rows_high }}">
+									<a href="/bill_types/{{bill.bill_type.id}}"
 												 title="{{bill.bill_type.description}}">{{bill.bill_type.code}}</a>
-									</td>
-									{% for read_row in read_rows %}
+								</td>
+								{% for read_row in read_rows %}
 									{% if not loop.first %}
-							<tr {% if bill_dict.collapsible %}
-									class="collapsible_{{bill_dict.collapse_id}}"
-									style="display: none; background-color: silver;"
-									{% endif %}>
+										<tr {% if bill_dict.collapsible %}
+											class="collapsible_{{bill_dict.collapse_id}}"
+											style="display: none; background-color: silver;"
+										{% endif %}>
 									{% endif %}
 									{% for read in read_row['inner_reads'] %}
-									<td style="border-right: none;">
+										<td style="border-right: none;">
 											{% if read %}
-											<a title="{{ read.previous_date|hh_format }} {{ read.msn }}">{{ read.previous_value }}</a>
+												<label title="{{ read.previous_date|hh_format }} {{ read.msn }}">{{ read.previous_value }}</label>
 											{% endif %}
-									</td>
-									<td style="border-left: none; text-align: right;">
+										</td>
+										<td style="border-left: none; text-align: right;">
 											{% if read %}
-											{{ read.previous_type.code }}
+												<a href="/e/read_types/{{read.previous_type.id}}" title="{{read.previous_type.description}}">{{ read.previous_type.code }}</a>
 											{% endif %}
-									</td>
-									<td style="border-right: none;">
+										</td>
+										<td style="border-right: none;">
 											{% if read %}
-											<a title="{{ read.present_date|hh_format }} {{ read.msn }}">{{ read.present_value }}</a>
+												<label title="{{ read.present_date|hh_format }} {{ read.msn }}">{{ read.present_value }}</label>
 											{% endif %}
-									</td>
-									<td style="border-left: none; text-align: right;">
+										</td>
+										<td style="border-left: none; text-align: right;">
 											{% if read %}
-											{{ read.present_type.code }}
+												<a href="/e/read_types/{{read.present_type.id}}" title="{{read.present_type.description}}">{{ read.present_type.code }}</a>
 											{% endif %}
-									</td>
+										</td>
 									{% endfor %}
 									{% for read in read_row['outer_reads'] %}
-									<td>
+										<td>
 											{% if read %}
-											{% if read.tpr %}
-											<a href="/e/tprs/{{read.tpr.id}}">{{read.tpr.code}}</a>
-											{% else %}
-											MD
-											{% endif %}
+												{% if read.tpr %}
+													<a href="/e/tprs/{{read.tpr.id}}">{{read.tpr.code}}</a>
+												{% else %}
+													MD
+												{% endif %}
 											{% endif %}
-									</td>
-									<td style="border-right: none;">
+										</td>
+										<td style="border-right: none;">
 											{% if read %}
-											<a title="{{read.previous_date|hh_format}} {{read.msn}}">{{read.previous_value}}</a>
+												<label title="{{read.previous_date|hh_format}} {{read.msn}}">{{read.previous_value}}</label>
 											{% endif %}
-									</td>
-									<td style="border-left: none; text-align: right;">
+										</td>
+										<td style="border-left: none; text-align: right;">
 											{% if read %}
-											{{read.previous_type.code}}
+											<a href="/e/read_types/{{read.previous_type.id}}" title="{{read.previous_type.description}}">{{read.previous_type.code}}</a>
 											{% endif %}
-									</td>
-									<td style="border-right: none;">
+										</td>
+										<td style="border-right: none;">
 											{% if read %}
-											<a title="{{read.present_date|hh_format}} {{read.msn}}">{{read.present_value}}</a>
+												<label title="{{read.present_date|hh_format}} {{read.msn}}">{{read.present_value}}</label>
 											{% endif %}
-									</td>
-									<td style="border-left: none; text-align: right;">
+										</td>
+										<td style="border-left: none; text-align: right;">
 											{% if read %}
-											{{read.present_type.code}}
+											<a href="/e/read_types/{{read.present_type.id}}" title="{{read.present_type.description}}">{{read.present_type.code}}</a>
 											{% endif %}
-									</td>
-									{% if not loop.first %}
-							</tr>
-							{% endif %}
-							{% endfor %}
-							{% endfor %}
+										</td>
+										{% if not loop.first %}
+											</tr>
+										{% endif %}
+									{% endfor %}
+								{% endfor %}
 							</tr>
-							{% endfor %}
+						{% endfor %}
 					</tbody>
-			</table>
+				</table>
 
 				<table>
 						{% set exp_bills = era_bundle['exp_bills'] %}

chellow/templates/g/batches.html

@@ -14,17 +14,28 @@
 	<table>
 		<thead>
 			<tr>
+				<th>View</th>
 				<th>Reference</th>
 				<th>Description</th>
+				<th>Number Of Bills</th>
+				<th>Net GBP</th>
+				<th>VAT GBP</th>
+				<th>Gross GBP</th>
+				<th>kWh</th>
 			</tr>
 		</thead>
 		<tbody>
-			{% for g_batch in g_batches %}
+			{% for row in g_batches %}
+				{% set g_batch = row[0] %}
 				<tr>
-					<td>
-						<a href="/g/batches/{{g_batch.id}}">{{g_batch.reference}}</a>
-					</td>
+					<td><a href="/g/batches/{{g_batch.id}}">View</a></td>
+					<td>{{g_batch.reference}}</td>
 					<td>{{g_batch.description}}</td>
+					<td>{{ "{:,}".format(row[1]) }}</td>
+					<td>{{ "£{:,}".format(row[2]) }}</td>
+					<td>{{ "£{:,}".format(row[3]) }}</td>
+					<td>{{ "£{:,}".format(row[4]) }}</td>
+					<td>{{ "{:,}".format(row[5]) }}</td>
 				</tr>
 			{% endfor %}
 		</tbody>

{chellow-1724751676.0.0.dist-info → chellow-1724831616.0.0.dist-info}/METADATA

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

@@ -66,7 +66,7 @@ chellow/gas/cv.py,sha256=4cdYYQ8Qak6NeYdBCB4YaQ0jX8-UkaydIIdibCQuXxM,7344
 chellow/gas/dn_rate_parser.py,sha256=Mq8rAcUEUxIQOks59bsCKl8GrefvoHbrTCHqon9N0z0,11340
 chellow/gas/engine.py,sha256=jT7m6vddi5GnWd51wCYEVhBS-LZEn1T9ggZX7Y9HGK0,25263
 chellow/gas/transportation.py,sha256=Bkg8TWOs-v0ES-4qqwbleiOhqbE_t2KauUx9JYMZELM,5300
-chellow/gas/views.py,sha256=N_vj5A3ia0FmLm2M18bcZQTGpVQXd7oHrIiFXa44aLo,57511
+chellow/gas/views.py,sha256=zOlJnL6eVq7Tag-0NMabzCPQk5AoTrclEz-923pbwAE,57851
 chellow/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/reports/report_109.py,sha256=FmRWG8wQC97cj0nqQH7mrfbYesRIKWXQLh6ERHvtHrU,11212
 chellow/reports/report_111.py,sha256=AlYjvCDpGNe1qBuzW52EONWDsFaIVElug0Vpe9qm1PY,28169
@@ -94,7 +94,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=yWhEoGGyg_ctM8T55raksTPRJ5ycVO6lVfUx5tRBzTQ,4372
 chellow/reports/report_csv_site_snags.py,sha256=gG2sYQrLoIBwCoMUC8rhmAL7Kffh_rvNb9UOX7cYDko,2668
-chellow/reports/report_ecoes_comparison.py,sha256=PGDJKI2f6DCVCH0xcp--BzXWAWFfTDGgcKVQnfqxBKg,21653
+chellow/reports/report_ecoes_comparison.py,sha256=CaeMCpLifP-kh2O9MZPs0EYf4UqksL-xFjwki41DTRA,21444
 chellow/reports/report_g_monthly_duration.py,sha256=FMMFIWFfGW2Bd9Excpf4LLXXqQ-fbnZZ_KfNa1VaPqA,13034
 chellow/reports/report_g_supplies_snapshot.py,sha256=0M0x_0o0985Hu45gUJJJwzfx0DDOAuXBJ1UVUDbQ36g,4718
 chellow/reports/report_g_supply_virtual_bill.py,sha256=x_KtQ02dwgmXvAEUXJ1poK0BRwqxa-GcbJ5pddEina0,3694
@@ -311,7 +311,7 @@ chellow/templates/e/supplier_rate_script_add.html,sha256=Yf2LZEIHbL7qT6oxBCtPf0Z
 chellow/templates/e/supplier_rate_script_edit.html,sha256=VaYJt8nxHdnuP-zEAuBJC-ibEpjDU1b80hXtdBQH1dg,1968
 chellow/templates/e/supply.html,sha256=No26xivLm4hA8kRufVvPjrEOE3of7pmZaW_jgTcKSY0,8511
 chellow/templates/e/supply_edit.html,sha256=Ef4ivmSvj9NAb1Uy43S3TCwheCffV457bdpaoD8XZ_s,2723
-chellow/templates/e/supply_eras.html,sha256=y_Y2V20Q-tyyw6iRP3lE1ZQCAZM7CaRtEr1_CcDICuc,19539
+chellow/templates/e/supply_eras.html,sha256=5lB7_oC-sTWRQoASuPgBWj5XSZa9ajR0s6V6xKHvf6E,19996
 chellow/templates/e/supply_hh_data.html,sha256=d9ho4Tq3ZkR5GmxSZr_zHGwCU68PH3aSc4OwFG9i9zE,3587
 chellow/templates/e/supply_months.html,sha256=2EUF_SWCcjG9GiAw86gco8xR6LXaqCPXfQE5A33TqqI,1927
 chellow/templates/e/supply_note_add.html,sha256=wsrG7P38h8fj63zVAZXfLogdYxIKnn8qxEJFr3Fna4k,553
@@ -324,7 +324,7 @@ chellow/templates/e/tprs.html,sha256=jk1jm8CTcO3zYOOZFu9XOOLSG_ZFAgblReh-Di-bkug
 chellow/templates/g/batch.html,sha256=jOr_6OmS4sgFFV4y4NG1KZMM7r7w25qtMuApN_jTyBI,3909
 chellow/templates/g/batch_add.html,sha256=WEK6NAvxsRd0gmJOqYSBS5ehZKVahbX49uiHAoyCwhg,1035
 chellow/templates/g/batch_edit.html,sha256=hA0eowzmwaA5vwt4L23DZNKtT_PD8FLCBuSo5IktWmI,1428
-chellow/templates/g/batches.html,sha256=mnzLroYfhwvL5gFK1PNtI-vS7GcDtcggNd0E15Shtfw,730
+chellow/templates/g/batches.html,sha256=T6_2ndBfIYyzHrZzwaELYGCcvdFvsLFmn3zSQENnCNE,1108
 chellow/templates/g/bill.html,sha256=S8moZ06CDl4_nQQgqyy4mdkyhfvgoQJGZS8ppsluT_E,3455
 chellow/templates/g/bill_add.html,sha256=sDSpUgEbdalDsea1Ma5lgVRgtbFf0bZ042jUdOFeDDk,1674
 chellow/templates/g/bill_edit.html,sha256=ynfUR_lZXLgTK3T0x9GjzAHahuR823ykMpjCWrY8ot8,2754
@@ -365,6 +365,6 @@ chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1
 chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBeyRzQe3Rg,854
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1724751676.0.0.dist-info/METADATA,sha256=7AN6Q_gJi4wcmNKLFhGNag5Ra0i2ZpULKIMFyECV2OE,12241
-chellow-1724751676.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1724751676.0.0.dist-info/RECORD,,
+chellow-1724831616.0.0.dist-info/METADATA,sha256=OyyLnpyN4SIdhUqdsS2mrvsqFjReOeJWjUcyx-LKFeU,12241
+chellow-1724831616.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1724831616.0.0.dist-info/RECORD,,