chellow 1724751676.0.0__tar.gz → 1724868336.0.0__tar.gz

{chellow-1724751676.0.0 → chellow-1724868336.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1724751676.0.0
+Version: 1724868336.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-1724868336.0.0/VERSION

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

{chellow-1724751676.0.0 → chellow-1724868336.0.0}/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-1724751676.0.0 → chellow-1724868336.0.0}/chellow/reports/report_59.py

@@ -57,17 +57,7 @@ from chellow.views import chellow_redirect
 CATEGORY_ORDER = {None: 0, "unmetered": 1, "nhh": 2, "amr": 3, "hh": 4}
 
 
-def write_spreadsheet(
-    fl,
-    compressed,
-    site_rows,
-    supply_rows,
-    era_rows,
-    read_rows,
-    bill_check_site_rows,
-    bill_check_era_rows,
-    is_bill_check,
-):
+def write_spreadsheet(fl, compressed, site_rows, supply_rows, era_rows, read_rows):
     fl.seek(0)
     fl.truncate()
     with odio.create_spreadsheet(fl, "1.2", compressed=compressed) as f:
@@ -75,9 +65,6 @@ def write_spreadsheet(
         f.append_table("Supply Level", supply_rows)
         f.append_table("Era Level", era_rows)
         f.append_table("Normal Reads", read_rows)
-        if is_bill_check:
-            f.append_table("Bill Check Site", bill_check_site_rows)
-            f.append_table("Bill Check Era", bill_check_era_rows)
 
 
 def make_bill_row(titles, bill):
@@ -627,8 +614,41 @@ def _process_site(
                     .scalars()
                     .all()
                 )
+                imp_supplier_contract = first_era.imp_supplier_contract
+                exp_supplier_contract = first_era.exp_supplier_contract
                 if len(bills) > 0:
-                    month_data = {}
+                    era_vals = {
+                        "creation-date": now,
+                        "start-date": start_date,
+                        "finish-date": finish_date,
+                        "imp-mpan-core": last_era.imp_mpan_core,
+                        "exp-mpan-core": last_era.exp_mpan_core,
+                        "site-code": site.code,
+                        "site-name": site.name,
+                        "associated-site-codes": None,
+                        "era-start-date": None,
+                        "era-finish-date": None,
+                        "imp-supplier-contract": (
+                            None
+                            if imp_supplier_contract is None
+                            else imp_supplier_contract.name
+                        ),
+                        "imp-non-actual-hhs": None,
+                        "imp-non-actual-kwh": None,
+                        "exp-supplier-contract": (
+                            None
+                            if exp_supplier_contract is None
+                            else exp_supplier_contract.name
+                        ),
+                        "exp-non-actual-hhs": None,
+                        "exp-non-actual-kwh": None,
+                        "metering-type": last_era.meter_category,
+                        "source": last_era.supply.source.code,
+                        "generator-type": None,
+                        "supply-name": last_era.supply.name,
+                        "msn": last_era.msn,
+                        "pc": last_era.pc.code,
+                    }
                     for name in (
                         "import-grid",
                         "export-grid",
@@ -641,48 +661,18 @@ def _process_site(
                         "used-3rd-party",
                     ):
                         for sname in ("kwh", "net-gbp"):
-                            month_data[f"{name}-{sname}"] = 0
+                            era_vals[f"{name}-{sname}"] = 0
                     for suf in ("kwh", "net-gbp", "vat-gbp", "gross-gbp"):
-                        month_data[f"billed-import-{suf}"] = 0
-                        month_data[f"billed-import-supplier-{suf}"] = 0
-                        month_data[f"billed-import-dc-{suf}"] = 0
-                        month_data[f"billed-import-mop-{suf}"] = 0
-
-                    _add_bills(month_data, bills, chunk_start, chunk_finish)
-
-                    imp_supplier_contract = first_era.imp_supplier_contract
-                    exp_supplier_contract = first_era.exp_supplier_contract
-                    out = [
-                        now,
-                        last_era.imp_mpan_core,
-                        (
-                            None
-                            if imp_supplier_contract is None
-                            else imp_supplier_contract.name
-                        ),
-                        last_era.exp_mpan_core,
-                        (
-                            None
-                            if exp_supplier_contract is None
-                            else exp_supplier_contract.name
-                        ),
-                        None,
-                        last_era.meter_category,
-                        last_era.supply.source.code,
-                        None,
-                        last_era.supply.name,
-                        last_era.msn,
-                        last_era.pc.code,
-                        site.code,
-                        site.name,
-                        None,
-                        start_date,
-                        finish_date,
-                    ] + [month_data[t] for t in summary_titles]
-
-                    era_rows.append([make_val(v) for v in out])
+                        era_vals[f"billed-import-{suf}"] = 0
+                        era_vals[f"billed-import-supplier-{suf}"] = 0
+                        era_vals[f"billed-import-dc-{suf}"] = 0
+                        era_vals[f"billed-import-mop-{suf}"] = 0
+
+                    _add_bills(era_vals, bills, chunk_start, chunk_finish)
+
+                    era_rows.append([make_val(vals.get(t)) for t in era_titles])
                     for t in summary_titles:
-                        v = month_data.get(t)
+                        v = era_vals.get(t)
                         if v is not None:
                             site_data[t] += v
 
@@ -746,9 +736,6 @@ def content(
     supply_rows = []
     era_rows = []
     normal_read_rows = []
-    bill_check_site_rows = []
-    bill_check_supply_rows = []
-    bill_check_era_rows = []
 
     try:
         with RSession() as rsess:
@@ -850,6 +837,7 @@ def content(
                     )
 
             by_hh = scenario_props.get("by_hh", False)
+            is_bill_check = scenario_props.get("is_bill_check", False)
 
             era_header_titles = [
                 "creation-date",
@@ -1009,14 +997,15 @@ def content(
             supply_titles = supply_header_titles + summary_titles
             supply_rows.append(supply_titles)
             era_rows.append(era_titles)
-            bill_check_site_rows.append(site_header_titles + summary_titles)
-            bill_check_era_rows.append(era_titles)
 
             normal_reads = set()
 
-            data_source_bill = Object()
-            data_source_bill.start_date = start_date
-            data_source_bill.finish_date = finish_date
+            if is_bill_check:
+                data_source_bill = Object()
+                data_source_bill.start_date = start_date
+                data_source_bill.finish_date = finish_date
+            else:
+                data_source_bill = None
 
             for site in rsess.scalars(sites):
                 if by_hh:
@@ -1046,28 +1035,8 @@ def content(
                             supply_titles,
                             supply_rows,
                             site_rows,
-                            None,
+                            data_source_bill,
                         )
-                        if is_bill_check:
-                            _process_site(
-                                rsess,
-                                report_context,
-                                forecast_from,
-                                start,
-                                finish,
-                                site,
-                                scenario_props,
-                                supply_ids,
-                                now,
-                                summary_titles,
-                                title_dict,
-                                era_titles,
-                                bill_check_era_rows,
-                                supply_titles,
-                                bill_check_supply_rows,
-                                bill_check_site_rows,
-                                data_source_bill,
-                            )
                     except BadRequest as e:
                         raise BadRequest(f"Site Code {site.code}: {e.description}")
 
@@ -1078,31 +1047,14 @@ def content(
 
                 rsess.rollback()  # Evict from cache
             write_spreadsheet(
-                rf,
-                compression,
-                site_rows,
-                supply_rows,
-                era_rows,
-                normal_read_rows,
-                bill_check_site_rows,
-                bill_check_era_rows,
-                is_bill_check,
+                rf, compression, site_rows, supply_rows, era_rows, normal_read_rows
             )
     except BadRequest as e:
         msg = e.description + traceback.format_exc()
         sys.stderr.write(msg + "\n")
         site_rows.append(["Problem " + msg])
         write_spreadsheet(
-            rf,
-            compression,
-            site_rows,
-            supply_rows,
-            era_rows,
-            normal_read_rows,
-            bill_check_site_rows,
-            bill_check_supply_rows,
-            bill_check_era_rows,
-            is_bill_check,
+            rf, compression, site_rows, supply_rows, era_rows, normal_read_rows
         )
     except BaseException:
         msg = traceback.format_exc()
@@ -1114,17 +1066,7 @@ def content(
             ef.write(msg + "\n")
             ef.close()
         else:
-            write_spreadsheet(
-                rf,
-                compression,
-                site_rows,
-                era_rows,
-                normal_read_rows,
-                bill_check_site_rows,
-                bill_check_supply_rows,
-                bill_check_era_rows,
-                is_bill_check,
-            )
+            write_spreadsheet(rf, compression, site_rows, era_rows, normal_read_rows)
     finally:
         if rf is not None:
             rf.close()

{chellow-1724751676.0.0 → chellow-1724868336.0.0}/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-1724751676.0.0 → chellow-1724868336.0.0}/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-1724751676.0.0 → chellow-1724868336.0.0}/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 → chellow-1724868336.0.0}/chellow/templates/site.html

@@ -181,8 +181,6 @@ Table of site level monthly kWh, MD kWh etc.</a>
 			{{ input_number('months', initial='1', size='2', maxlength='2', required=True) }}
 			<label>Final Month</label>
 			{{ input_date('finish', last_month_finish, resolution='month') }}
-			<label>Include bill check tabs?</label>
-			{{input_checkbox('is_bill_check')}}
 			<input type="submit" value="Download">
 		</fieldset>
 	</form>			

{chellow-1724751676.0.0 → chellow-1724868336.0.0}/test/reports/test_report_59.py

@@ -2304,8 +2304,18 @@ def virtual_bill(ds):
         ],
         [
             Datetime(2020, 1, 1, 0, 0),
+            Datetime(2000, 1, 15, 0, 0),
+            Datetime(2000, 1, 31, 23, 30),
             "22 7867 6232 781",
+            None,
+            "CI017",
+            "Water Works",
+            None,
+            Datetime(2000, 1, 15, 0, 0),
+            None,
             "Fusion Supplier 2000",
+            816.0,
+            0.0,
             None,
             None,
             None,
@@ -2315,11 +2325,13 @@ def virtual_bill(ds):
             "Bob",
             "hgjeyhuw",
             "00",
-            "CI017",
-            "Water Works",
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
+            0.0,
             None,
-            Datetime(2000, 1, 1, 0, 0),
-            Datetime(2000, 1, 31, 23, 30),
             0.0,
             0.0,
             0.0,
@@ -2328,6 +2340,7 @@ def virtual_bill(ds):
             0.0,
             0.0,
             0.0,
+            None,
             0.0,
             0.0,
             0.0,
@@ -2338,19 +2351,28 @@ def virtual_bill(ds):
             0.0,
             0.0,
             0.0,
-            10.0,
-            10.0,
             0.0,
             0.0,
-            10.0,
-            10.0,
-            10.0,
             0.0,
             0.0,
             0.0,
+            None,
+            0.0,
+            None,
+            None,
+            0.0,
+            None,
+            None,
+            None,
+            None,
+            None,
+            0.0,
+            0.0,
             0.0,
             0.0,
             0.0,
+            None,
+            None,
         ],
     ]
     match_tables(era_expected, era_table)

chellow-1724751676.0.0/VERSION

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