chellow 1727166948.0.0__py3-none-any.whl → 1727274025.0.0__py3-none-any.whl

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/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/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/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.dist-info → chellow-1727274025.0.0.dist-info}/METADATA

@@ -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-1727166948.0.0.dist-info → chellow-1727274025.0.0.dist-info}/RECORD

@@ -39,7 +39,7 @@ chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,623
 chellow/e/tlms.py,sha256=M33D6YpMixu2KkwSCzDRM3kThLgShg8exp63Obo75l8,8905
 chellow/e/tnuos.py,sha256=XseYztPUsQXNKuBmystO2kzzwAG9ehCZgpGBTdgSk-A,4313
 chellow/e/triad.py,sha256=lIQj7EdUrcFwEqleuHZXYU_bfzIwNOqUVVxB3NPQt4A,13710
-chellow/e/views.py,sha256=AL7h9vqFUoCKjHmm769CScuaW2APy61poK2SIS0yN-c,220804
+chellow/e/views.py,sha256=sXOg_V5PpZbY7Ufq2dv3NpjI8odYODQpSKdRbVz3XI4,220808
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=UgWXDPzQkQghyj_lfgBqoSJpHB-t-qOdSaB8qY6GLog,4071
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
@@ -67,7 +67,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=vwGz4Go2qcebH9Pm2_H0UtJbrtpUIMvxgn5JYc2Zn3g,59027
+chellow/gas/views.py,sha256=R4Ky8syioWSQJLTuSKVLsc266eDv8a6WEo_e60u_4ug,59021
 chellow/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/reports/report_109.py,sha256=FmRWG8wQC97cj0nqQH7mrfbYesRIKWXQLh6ERHvtHrU,11212
 chellow/reports/report_111.py,sha256=rgwoOPfvbfwIC_IjBqs2e8umF_YTtpyejLrX_uCgyHE,28145
@@ -269,7 +269,7 @@ chellow/templates/e/parties.html,sha256=gx0fhzcbiUBstkty8M11dYosRZZ4RgF6X3kdVOFS
 chellow/templates/e/party.html,sha256=1Vmo6bu0NAV1wtLTn23xuLMsifL2ai3Ri1VaE-V772s,1915
 chellow/templates/e/pc.html,sha256=p6JjmzvO_P4zumxH--E8BkZG0vYc9NNbRGOpOgkppLY,521
 chellow/templates/e/pcs.html,sha256=k_eBu7f-dc1b5eXg7K0YpDxQpOrhIA1PV4FBJc0Zck0,560
-chellow/templates/e/read_add.html,sha256=PGNPKTQiXkTEANMKOXCzBLGwJJJfQIkIgpGRAb-Thho,2289
+chellow/templates/e/read_add.html,sha256=qMyvk3x8Otj1UjXB_TGeYs0lZ4ibG_nvbJI1m25hq8I,2220
 chellow/templates/e/read_edit.html,sha256=JWnHn8Dcq3t_LUGLUV9IAMnhuacw38On7552kGn4QiU,3147
 chellow/templates/e/read_type.html,sha256=volKteZB79famXrzN_Bgqy9JT9C4a50vXLkuZ0ObBq0,403
 chellow/templates/e/read_types.html,sha256=CknHXNEkBnsAprqI66ftvnnMFBdR_kqI7o26rxjlrJA,473
@@ -359,13 +359,13 @@ chellow/templates/g/supplier_rate_script.html,sha256=e4dwskWTQcLv6qyX150VUeuaUvE
 chellow/templates/g/supplier_rate_script_add.html,sha256=zMjTkjupOsHFu-peUXL4IKjjc2OaSL-2ah4T9OdKp_o,620
 chellow/templates/g/supplier_rate_script_edit.html,sha256=GoUqXf52gWEH1iApmNdxOcKLItzpA-o7iQPQ1_in9BA,1950
 chellow/templates/g/supplies.html,sha256=oEAEfZaAuKv7EA6fd3blWjPwv_XKoNHLPlkRJ_afZHs,1267
-chellow/templates/g/supply.html,sha256=gr4Ivz5JkwmP09GPuWgwl6hhie1dJcAyyaAU0TKo5JE,10713
+chellow/templates/g/supply.html,sha256=HMR2haS4-k24rGqWApA74Ufi_IODN0oNIa9d7L9Xe1o,11001
 chellow/templates/g/supply_edit.html,sha256=F2Ip4xCXLl4eFiRjMLZyUMIiznWw97GF7mN_50QAEWA,1653
 chellow/templates/g/supply_note_add.html,sha256=zWwppQTxBfN7Dw6Cgr330mw7SgDRoTcaIdAucNisZRE,658
 chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1nAPevz-AgkhQ,1036
 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-1727166948.0.0.dist-info/METADATA,sha256=OFqmReMcR3x1oI4pDpOfuE-psdPEqI8sF4QQV5SPCsE,12204
-chellow-1727166948.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1727166948.0.0.dist-info/RECORD,,
+chellow-1727274025.0.0.dist-info/METADATA,sha256=feQ4vMzLIgL6radY06s1TZ7qu60qhFpC_KvbVABRUcs,12204
+chellow-1727274025.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1727274025.0.0.dist-info/RECORD,,