chellow 1724747184.0.0__tar.gz → 1724831616.0.0__tar.gz

{chellow-1724747184.0.0 → chellow-1724831616.0.0}/PKG-INFO

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

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

{chellow-1724747184.0.0 → chellow-1724831616.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-1724747184.0.0 → chellow-1724831616.0.0}/chellow/models.py

@@ -4865,7 +4865,7 @@ class SiteGroup:
                 if resolve_1_start is not None:
                     self.delete_snag(
                         sess,
-                        SiteGroup.EXPORT_GROSS_GT_IMPORT_GEN,
+                        SiteGroup.EXPORT_GRID_GT_IMPORT_GEN,
                         resolve_1_start,
                         resolve_1_finish,
                     )

{chellow-1724747184.0.0 → chellow-1724831616.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-1724747184.0.0 → chellow-1724831616.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-1724747184.0.0 → chellow-1724831616.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-1724747184.0.0 → chellow-1724831616.0.0}/test/test_models.py

@@ -950,6 +950,113 @@ def test_Contract_insert_batch_duplicate(sess):
         contract.insert_batch(sess, "a", "a ref")
 
 
+def test_Site_hh_check(sess):
+    vf = to_utc(ct_datetime(1996, 1, 1))
+    site = Site.insert(sess, "22488", "Water Works")
+    insert_sources(sess)
+    source = Source.get_by_code(sess, "grid")
+    gsp_group = GspGroup.insert(sess, "_L", "South Western")
+    participant = Participant.insert(sess, "hhak", "AK Industries")
+    market_role_X = MarketRole.insert(sess, "X", "Supplier")
+    market_role_M = MarketRole.insert(sess, "M", "Mop")
+    market_role_C = MarketRole.insert(sess, "C", "HH Dc")
+    market_role_R = MarketRole.insert(sess, "R", "Distributor")
+    participant.insert_party(sess, market_role_M, "Fusion Mop Ltd", vf, None, None)
+    participant.insert_party(sess, market_role_X, "Fusion Ltc", vf, None, None)
+    participant.insert_party(sess, market_role_C, "Fusion DC", vf, None, None)
+    mop_contract = Contract.insert_mop(
+        sess, "Fusion", participant, "", {}, vf, None, {}
+    )
+    dc_contract = Contract.insert_dc(
+        sess, "Fusion DC 2000", participant, "", {}, vf, None, {}
+    )
+    pc = Pc.insert(sess, "00", "hh", vf, None)
+    insert_cops(sess)
+    cop = Cop.get_by_code(sess, "5")
+    insert_comms(sess)
+    comm = Comm.get_by_code(sess, "GSM")
+    imp_supplier_contract = Contract.insert_supplier(
+        sess, "Fusion Supplier 2000", participant, "", {}, vf, None, {}
+    )
+    dno = participant.insert_party(sess, market_role_R, "WPD", vf, None, "22")
+    meter_type = MeterType.insert(sess, "C5", "COP 1-5", vf, None)
+    meter_payment_type = MeterPaymentType.insert(sess, "CR", "Credit", vf, None)
+    mtc = Mtc.insert(sess, "845", False, True, vf, None)
+    mtc_participant = MtcParticipant.insert(
+        sess,
+        mtc,
+        participant,
+        "HH COP5 And Above With Comms",
+        False,
+        True,
+        meter_type,
+        meter_payment_type,
+        0,
+        vf,
+        None,
+    )
+    insert_voltage_levels(sess)
+    voltage_level = VoltageLevel.get_by_code(sess, "HV")
+    llfc = dno.insert_llfc(
+        sess, "510", "PC 5-8 & HH HV", voltage_level, False, True, vf, None
+    )
+    MtcLlfc.insert(sess, mtc_participant, llfc, vf, None)
+    insert_energisation_statuses(sess)
+    energisation_status = EnergisationStatus.get_by_code(sess, "E")
+    insert_dtc_meter_types(sess)
+    dtc_meter_type = DtcMeterType.get_by_code(sess, "H")
+    supply = site.insert_e_supply(
+        sess,
+        source,
+        None,
+        "Bob",
+        utc_datetime(2020, 1, 1),
+        utc_datetime(2020, 1, 31),
+        gsp_group,
+        mop_contract,
+        "773",
+        dc_contract,
+        "ghyy3",
+        "hgjeyhuw",
+        dno,
+        pc,
+        "845",
+        cop,
+        comm,
+        None,
+        energisation_status,
+        dtc_meter_type,
+        "22 7867 6232 781",
+        "510",
+        imp_supplier_contract,
+        "7748",
+        361,
+        None,
+        None,
+        None,
+        None,
+        None,
+    )
+    era = supply.eras[0]
+    channel = era.insert_channel(sess, False, "ACTIVE")
+    channel.add_hh_data(
+        sess,
+        [
+            {
+                "start_date": to_utc(ct_datetime(2020, 1, 3, 0, 30)),
+                "status": "A",
+                "value": Decimal("10"),
+            }
+        ],
+    )
+
+    sess.commit()
+
+    start_date = to_utc(ct_datetime(2020, 1, 3))
+    finish_date = to_utc(ct_datetime(2020, 1, 3, 0, 30))
+    site.hh_check(sess, start_date, finish_date)
+
+
 def test_Tpr_get_by_code_not_found(sess):
     with pytest.raises(
         BadRequest,

chellow-1724747184.0.0/VERSION

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