chellow 1727166948.0.0__tar.gz → 1727274025.0.0__tar.gz

{chellow-1727166948.0.0 → chellow-1727274025.0.0}/PKG-INFO

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

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

{chellow-1727166948.0.0 → chellow-1727274025.0.0}/chellow/e/views.py

@@ -3749,7 +3749,7 @@ def pc_get(pc_id):
 
 @e.route("/supplier_bills/<int:bill_id>/add_read")
 def read_add_get(bill_id):
-    read_types = g.sess.scalars(select(ReadType).order_by(ReadType.code))
+    read_types = g.sess.scalars(select(ReadType).order_by(ReadType.code)).all()
     estimated_read_type = ReadType.get_by_code(g.sess, "E")
     tprs = g.sess.scalars(select(Tpr).order_by(Tpr.code))
     bill = Bill.get_by_id(g.sess, bill_id)
@@ -3761,15 +3761,14 @@ def read_add_get(bill_id):
         mpan_str = era.imp_mpan_core
         msn = era.msn
 
-    prev_read = (
-        g.sess.query(RegisterRead)
+    prev_read = g.sess.scalars(
+        select(RegisterRead)
         .join(Bill)
-        .filter(
+        .where(
             Bill.supply == bill.supply, RegisterRead.present_date <= bill.finish_date
         )
         .order_by(RegisterRead.present_date.desc())
-        .first()
-    )
+    ).first()
     if prev_read is not None:
         previous_date = prev_read.present_date
         previous_value = prev_read.present_value

{chellow-1727166948.0.0 → chellow-1727274025.0.0}/chellow/gas/views.py

@@ -129,12 +129,11 @@ def supply_get(g_supply_id):
     try:
         g_era_bundles = []
         g_supply = GSupply.get_by_id(g.sess, g_supply_id)
-        g_eras = (
-            g.sess.query(GEra)
-            .filter(GEra.g_supply == g_supply)
+        g_eras = g.sess.scalars(
+            select(GEra)
+            .where(GEra.g_supply == g_supply)
             .order_by(GEra.start_date.desc())
-            .all()
-        )
+        ).all()
         for g_era in g_eras:
             physical_site = (
                 g.sess.query(Site)

{chellow-1727166948.0.0 → chellow-1727274025.0.0}/chellow/templates/e/read_add.html

@@ -33,9 +33,7 @@
 			</select>
 			<fieldset>
 				<legend>Previous Read</legend>
-				<fieldset>
-					<label>Date</label> {{input_date('previous', previous_date)}}
-				</fieldset>
+				<label>Date</label> {{input_date('previous', previous_date)}}
 				<label>Value</label> {{input_text('previous_value', previous_value)}}
 				<label>Type</label>
 				<select name="previous_type_id">
@@ -46,10 +44,7 @@
 			</fieldset>
 			<fieldset>
 				<legend>Present Read</legend>
-				<fieldset>
-					<label>Date</label>
-					{{input_date('present', None)}}
-				</fieldset>
+				<label>Date</label> {{input_date('present', None)}}
 				<label>Value</label> {{input_text('present_value', 0)}}
 				<label>Type</label>
 				<select name="present_type_id">

{chellow-1727166948.0.0 → chellow-1727274025.0.0}/chellow/templates/g/supply.html

@@ -242,22 +242,22 @@
 						{% endif %}
 					>
 						<td rowspan="{{rows_high}}">
-							<a href="/g/bills/{{g_bill.id}}">{{g_bill.id}}</a>
+							<a href="/g/bills/{{g_bill.id}}">view</a>
 						</td>
 						<td rowspan="{{rows_high}}">
-							<a
+							<span
 									title="{{g_bill.start_date|hh_format}}"
-							>{{g_bill.start_date|hh_format('date')}}</a>
+							>{{g_bill.start_date|hh_format('date')}}</span>
 						</td>
 						<td rowspan="{{rows_high}}">
-							<a
+							<span
 									title="{{g_bill.finish_date|hh_format}}"
-							>{{g_bill.finish_date|hh_format('date')}}</a>
+							>{{g_bill.finish_date|hh_format('date')}}</span>
 						</td>
 						<td rowspan="{{rows_high}}">
-							<a
+							<span
 									title="{{g_bill.issue_date|hh_format}}"
-							>{{g_bill.issue_date|hh_format('date')}}</a>
+							>{{g_bill.issue_date|hh_format('date')}}</span>
 						</td>
 						<td rowspan="{{rows_high}}">
 							<a
@@ -287,26 +287,34 @@
 								{% endif %}
 								<td style="border-right: none;">
 									{% if read %}
-										<a
+										<span
 												title="{{read.prev_date|hh_format}} {{read.msn }}"
-										>{{read.prev_value}}</a>
+										>{{read.prev_value}}</span>
 									{% endif %}
 								</td>
 								<td style="border-left: none; text-align: right;">
 									{% if read %}
-										{{ read.prev_type.code }}
+										<a
+											href="/g/read_types/{{read.prev_type.id}}"
+											title="{{read.prev_type.description}}"
+										>
+											{{ read.prev_type.code }}
+										</a>
 									{% endif %}
 								</td>
 								<td style="border-right: none;">
 									{% if read %}
-										<a
+										<span
 												title="{{read.pres_date|hh_format}} {{read.msn}}"
-										>{{read.pres_value}}</a>
+										>{{read.pres_value}}</span>
 									{% endif %}
 								</td>
 								<td style="border-left: none; text-align: right;">
 									{% if read %}
-										{{read.pres_type.code}}
+										<a
+											href="/g/read_types/{{read.pres_type.id}}"
+											title="{{read.pres_type.description}}"
+										>{{read.pres_type.code}}</a>
 									{% endif %}
 								</td>
 								{% if not loop.first %}

{chellow-1727166948.0.0 → chellow-1727274025.0.0}/test/e/test_e_views.py

@@ -2673,7 +2673,10 @@ def test_read_add_get_existing_era(sess, client):
     sess.commit()
 
     response = client.get(f"/e/supplier_bills/{bill.id}/add_read")
-    patterns = []
+    patterns = [
+        r'<select name="present_type_id">\s*'
+        r'<option value="1">A Actual Change of Supplier Read</option>'
+    ]
     match(response, 200, *patterns)
 
 

chellow-1727166948.0.0/VERSION

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