chellow 1713300425.0.0__py3-none-any.whl → 1713470986.0.0__py3-none-any.whl

chellow/general_import.py

@@ -557,6 +557,10 @@ def general_import_g_supply(sess, action, vals, args):
         g_reading_frequency = GReadingFrequency.get_by_code(
             sess, g_reading_frequency_code
         )
+        aq_str = add_arg(args, "AQ", vals, 12)
+        aq = Decimal(aq_str)
+        soq_str = add_arg(args, "SOQ", vals, 13)
+        soq = Decimal(soq_str)
 
         site.insert_g_supply(
             sess,
@@ -571,6 +575,8 @@ def general_import_g_supply(sess, action, vals, args):
             g_contract,
             account,
             g_reading_frequency,
+            aq,
+            soq,
         )
         sess.flush()
     elif action == "update":
@@ -1568,7 +1574,11 @@ def general_import_site(sess, action, vals, args):
             site.delete()
         elif action == "update":
             new_code = add_arg(args, "new_site_code", vals, 1)
+            if new_code == NO_CHANGE:
+                new_code = site.code
             name = add_arg(args, "new_site_name", vals, 2)
+            if name == NO_CHANGE:
+                name = site.name
             site.update(new_code, name)
 
 

chellow/reports/report_ecoes_comparison.py

@@ -64,7 +64,6 @@ def content(user_id, show_ignored, report_run_id):
             for key in (
                 "user_name",
                 "password",
-                "prefix",
                 "exclude_mpan_cores",
                 "ignore_mpan_cores_msn",
             ):
@@ -78,7 +77,7 @@ def content(user_id, show_ignored, report_run_id):
 
             exclude_mpan_cores = ecoes_props["exclude_mpan_cores"]
             ignore_mpan_cores_msn = ecoes_props["ignore_mpan_cores_msn"]
-            url_prefix = ecoes_props["prefix"]
+            url_prefix = "https://www.ecoes.co.uk/"
 
             proxies = props.get("proxies", {})
             s = requests.Session()

chellow/templates/g/bill_import.html

@@ -142,7 +142,7 @@
 							<td>{{g_read.pres_date|hh_format}}</td>
 							<td>{{g_read.pres_value}}</td>
 							<td>{{g_read.pres_type_code}}</td>
-							<td>{{g_read.units}}</td>                 
+							<td>{{g_read.unit}}</td>                 
 							<td>{{g_read.correction_factor}}</td>
 							<td>{{g_read.calorific_value}}</td>
 						{% endfor %}

{chellow-1713300425.0.0.dist-info → chellow-1713470986.0.0.dist-info}/METADATA

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

@@ -4,7 +4,7 @@ chellow/bank_holidays.py,sha256=T_utYMwe_g1dz5X-aOTdIPryg49SvB7QsWM1yphlqG8,4423
 chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=5SmP-0QPK6xCkd_wjIWh_8FAzN5OxNHCzyEQ1Xb-Y-M,5256
 chellow/edi_lib.py,sha256=het3R0DBGtXEo-Sy1zvXQuX9EWQ1X6Y33G4l1hYYuds,51859
-chellow/general_import.py,sha256=Su_JW28Wb2fG3x8fAbNmvB_YAEPieO_arhlhp31DHD8,65369
+chellow/general_import.py,sha256=xx4R0kQ6WKIty1UdXoF0igGJQZGm9lDNGynMi7LP0k8,65700
 chellow/models.py,sha256=POIL0dfwZFuqht7xHZaE6KJ7fk4kxMZC2aXzgg5kEFY,236921
 chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
@@ -92,7 +92,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=T-clGDmYdn0ej7zZfL3kDp4Vyd82WzptxEzxx9KqAZg,4270
 chellow/reports/report_csv_site_snags.py,sha256=gG2sYQrLoIBwCoMUC8rhmAL7Kffh_rvNb9UOX7cYDko,2668
-chellow/reports/report_ecoes_comparison.py,sha256=bTkbcvNB__UcNQtHncC41_Ql222vvPTJTnyVJbgjylM,21313
+chellow/reports/report_ecoes_comparison.py,sha256=hx4kb_y-5HKiSihFiAw2ZAQQM0mC_LOX6aXRSzvGnIs,21292
 chellow/reports/report_g_monthly_duration.py,sha256=vI5FKAU8_oThjR5oflPZont7Z7sVAunr0qlMfJsaPJI,12004
 chellow/reports/report_g_supplies_snapshot.py,sha256=0M0x_0o0985Hu45gUJJJwzfx0DDOAuXBJ1UVUDbQ36g,4718
 chellow/reports/report_g_supply_virtual_bill.py,sha256=x_KtQ02dwgmXvAEUXJ1poK0BRwqxa-GcbJ5pddEina0,3694
@@ -326,7 +326,7 @@ chellow/templates/g/batches.html,sha256=mnzLroYfhwvL5gFK1PNtI-vS7GcDtcggNd0E15Sh
 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
-chellow/templates/g/bill_import.html,sha256=jvTqahdh-3Jh8uQTtBlhL2E8p3PoUutz_cdcMzGlP74,4292
+chellow/templates/g/bill_import.html,sha256=z8qJMUrGShD-7UEg7DTL5L1IacAnz7N3qoqQro30e9A,4291
 chellow/templates/g/bill_imports.html,sha256=AHC0l0Wkr1RZ9fdGWTqihOEcn8lTZ63Uh9BHqPxfRCU,3157
 chellow/templates/g/dn.html,sha256=ttEdvFANFUCBV8e9tVrZy35-tzsC9dU-biZhAPxE2Bw,481
 chellow/templates/g/dns.html,sha256=RuxXvQ9eHs6B7nVGHtTbW8pdmSAaMbQw2f_BwiLZptM,403
@@ -363,6 +363,6 @@ chellow/templates/g/supply_note_edit.html,sha256=6UQf_qbhFDys3cVsTp-c7ABWZpggW9R
 chellow/templates/g/supply_notes.html,sha256=WR3YwGh_qqTklSJ7JqWX6BKBc9rk_jMff4RiWZiF2CM,936
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1713300425.0.0.dist-info/METADATA,sha256=vvz6LvRSO03nqzvbvDkbXejDg0ZiGZuWBgWJUHJiRk8,12205
-chellow-1713300425.0.0.dist-info/WHEEL,sha256=K0BPUNF1N3kQ9olb8aVEtkObePEjdr2JOLT1N83EVws,87
-chellow-1713300425.0.0.dist-info/RECORD,,
+chellow-1713470986.0.0.dist-info/METADATA,sha256=ByNk6hztVgBFxYsMfnRRmEOC1NT0bE1JVT27eitq3ZI,12205
+chellow-1713470986.0.0.dist-info/WHEEL,sha256=osohxoshIHTFJFVPhsi1UkZuLRGMHRXZzwEBW2ezjrc,87
+chellow-1713470986.0.0.dist-info/RECORD,,

{chellow-1713300425.0.0.dist-info → chellow-1713470986.0.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.24.0
+Generator: hatchling 1.24.1
 Root-Is-Purelib: true
 Tag: py3-none-any