chellow 1713453402.0.0__py3-none-any.whl → 1713861169.0.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of chellow might be problematic. Click here for more details.

Files changed (7) hide show
  1. chellow/e/triad.py +7 -3
  2. chellow/general_import.py +4 -0
  3. chellow/reports/report_ecoes_comparison.py +1 -2
  4. chellow/templates/g/bill_import.html +1 -1
  5. {chellow-1713453402.0.0.dist-info → chellow-1713861169.0.0.dist-info}/METADATA +1 -1
  6. {chellow-1713453402.0.0.dist-info → chellow-1713861169.0.0.dist-info}/RECORD +7 -7
  7. {chellow-1713453402.0.0.dist-info → chellow-1713861169.0.0.dist-info}/WHEEL +1 -1
chellow/e/triad.py CHANGED
@@ -68,10 +68,14 @@ def _process_triad_hh(ds, rate_period, est_kw, hh):
68
68
  chellow.e.duos.duos_vb(d)
69
69
  triad_hh = d.hh_data[0]
70
70
 
71
- while dt < financial_year_start:
72
- dt += relativedelta(years=1)
71
+ fdt = dt
72
+ while fdt < financial_year_start:
73
+ fdt += relativedelta(years=1)
73
74
 
74
- for d in ds.get_data_sources(dt, dt, financial_year_start):
75
+ while fdt.weekday() != dt.weekday():
76
+ fdt += relativedelta(days=1)
77
+
78
+ for d in ds.get_data_sources(fdt, fdt, financial_year_start):
75
79
  chellow.e.duos.duos_vb(d)
76
80
  datum = d.hh_data[0]
77
81
  triad_hh["laf"] = datum["laf"]
chellow/general_import.py CHANGED
@@ -1574,7 +1574,11 @@ def general_import_site(sess, action, vals, args):
1574
1574
  site.delete()
1575
1575
  elif action == "update":
1576
1576
  new_code = add_arg(args, "new_site_code", vals, 1)
1577
+ if new_code == NO_CHANGE:
1578
+ new_code = site.code
1577
1579
  name = add_arg(args, "new_site_name", vals, 2)
1580
+ if name == NO_CHANGE:
1581
+ name = site.name
1578
1582
  site.update(new_code, name)
1579
1583
 
1580
1584
 
chellow/reports/report_ecoes_comparison.py CHANGED
@@ -64,7 +64,6 @@ def content(user_id, show_ignored, report_run_id):
64
64
  for key in (
65
65
  "user_name",
66
66
  "password",
67
- "prefix",
68
67
  "exclude_mpan_cores",
69
68
  "ignore_mpan_cores_msn",
70
69
  ):
@@ -78,7 +77,7 @@ def content(user_id, show_ignored, report_run_id):
78
77
 
79
78
  exclude_mpan_cores = ecoes_props["exclude_mpan_cores"]
80
79
  ignore_mpan_cores_msn = ecoes_props["ignore_mpan_cores_msn"]
81
- url_prefix = ecoes_props["prefix"]
80
+ url_prefix = "https://www.ecoes.co.uk/"
82
81
 
83
82
  proxies = props.get("proxies", {})
84
83
  s = requests.Session()
chellow/templates/g/bill_import.html CHANGED
@@ -142,7 +142,7 @@
142
142
  <td>{{g_read.pres_date|hh_format}}</td>
143
143
  <td>{{g_read.pres_value}}</td>
144
144
  <td>{{g_read.pres_type_code}}</td>
145
- <td>{{g_read.units}}</td>
145
+ <td>{{g_read.unit}}</td>
146
146
  <td>{{g_read.correction_factor}}</td>
147
147
  <td>{{g_read.calorific_value}}</td>
148
148
  {% endfor %}
{chellow-1713453402.0.0.dist-info → chellow-1713861169.0.0.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: chellow
3
- Version: 1713453402.0.0
3
+ Version: 1713861169.0.0
4
4
  Summary: Web Application for checking UK energy bills.
5
5
  Project-URL: Homepage, https://github.com/WessexWater/chellow
6
6
  Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
{chellow-1713453402.0.0.dist-info → chellow-1713861169.0.0.dist-info}/RECORD RENAMED
@@ -4,7 +4,7 @@ chellow/bank_holidays.py,sha256=T_utYMwe_g1dz5X-aOTdIPryg49SvB7QsWM1yphlqG8,4423
4
4
  chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
5
5
  chellow/dloads.py,sha256=5SmP-0QPK6xCkd_wjIWh_8FAzN5OxNHCzyEQ1Xb-Y-M,5256
6
6
  chellow/edi_lib.py,sha256=het3R0DBGtXEo-Sy1zvXQuX9EWQ1X6Y33G4l1hYYuds,51859
7
- chellow/general_import.py,sha256=_IaxpltSdfjhy1Dn9-pgBIB5PRmGWbDvEJyYHFkcOGU,65558
7
+ chellow/general_import.py,sha256=xx4R0kQ6WKIty1UdXoF0igGJQZGm9lDNGynMi7LP0k8,65700
8
8
  chellow/models.py,sha256=POIL0dfwZFuqht7xHZaE6KJ7fk4kxMZC2aXzgg5kEFY,236921
9
9
  chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
10
10
  chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
@@ -37,7 +37,7 @@ chellow/e/scenario.py,sha256=1tUxnvwTzr6cKqiw2wphdv5XDzV6JO6UVYkyQa67vHs,23263
37
37
  chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,6232
38
38
  chellow/e/tlms.py,sha256=M33D6YpMixu2KkwSCzDRM3kThLgShg8exp63Obo75l8,8905
39
39
  chellow/e/tnuos.py,sha256=XseYztPUsQXNKuBmystO2kzzwAG9ehCZgpGBTdgSk-A,4313
40
- chellow/e/triad.py,sha256=S6LEMHvUKhAZe0-yfLIRciYDZ8IKMn1jh1TmmsbQD3s,13588
40
+ chellow/e/triad.py,sha256=ehYZRQd0I65BkEBvx5CXhREIgEY8m3ImTk3jZcdBC8k,13708
41
41
  chellow/e/views.py,sha256=ccA5ebQA8Oefwi9L71rbStvHenDMB4rhAu0iRMandLc,213977
42
42
  chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
43
43
  chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=UgWXDPzQkQghyj_lfgBqoSJpHB-t-qOdSaB8qY6GLog,4071
@@ -92,7 +92,7 @@ chellow/reports/report_bills.py,sha256=AHW6tiZAOE0gXDfencPvemE4zqK6eTqfN8_bWQ4RT
92
92
  chellow/reports/report_csv_llfcs.py,sha256=OHSbP64lQ6dlAMcQYgvdANlA4lQyF0iBlwk7V9c9nuo,1944
93
93
  chellow/reports/report_csv_site_hh_data.py,sha256=T-clGDmYdn0ej7zZfL3kDp4Vyd82WzptxEzxx9KqAZg,4270
94
94
  chellow/reports/report_csv_site_snags.py,sha256=gG2sYQrLoIBwCoMUC8rhmAL7Kffh_rvNb9UOX7cYDko,2668
95
- chellow/reports/report_ecoes_comparison.py,sha256=bTkbcvNB__UcNQtHncC41_Ql222vvPTJTnyVJbgjylM,21313
95
+ chellow/reports/report_ecoes_comparison.py,sha256=hx4kb_y-5HKiSihFiAw2ZAQQM0mC_LOX6aXRSzvGnIs,21292
96
96
  chellow/reports/report_g_monthly_duration.py,sha256=vI5FKAU8_oThjR5oflPZont7Z7sVAunr0qlMfJsaPJI,12004
97
97
  chellow/reports/report_g_supplies_snapshot.py,sha256=0M0x_0o0985Hu45gUJJJwzfx0DDOAuXBJ1UVUDbQ36g,4718
98
98
  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
326
326
  chellow/templates/g/bill.html,sha256=S8moZ06CDl4_nQQgqyy4mdkyhfvgoQJGZS8ppsluT_E,3455
327
327
  chellow/templates/g/bill_add.html,sha256=sDSpUgEbdalDsea1Ma5lgVRgtbFf0bZ042jUdOFeDDk,1674
328
328
  chellow/templates/g/bill_edit.html,sha256=ynfUR_lZXLgTK3T0x9GjzAHahuR823ykMpjCWrY8ot8,2754
329
- chellow/templates/g/bill_import.html,sha256=jvTqahdh-3Jh8uQTtBlhL2E8p3PoUutz_cdcMzGlP74,4292
329
+ chellow/templates/g/bill_import.html,sha256=z8qJMUrGShD-7UEg7DTL5L1IacAnz7N3qoqQro30e9A,4291
330
330
  chellow/templates/g/bill_imports.html,sha256=AHC0l0Wkr1RZ9fdGWTqihOEcn8lTZ63Uh9BHqPxfRCU,3157
331
331
  chellow/templates/g/dn.html,sha256=ttEdvFANFUCBV8e9tVrZy35-tzsC9dU-biZhAPxE2Bw,481
332
332
  chellow/templates/g/dns.html,sha256=RuxXvQ9eHs6B7nVGHtTbW8pdmSAaMbQw2f_BwiLZptM,403
@@ -363,6 +363,6 @@ chellow/templates/g/supply_note_edit.html,sha256=6UQf_qbhFDys3cVsTp-c7ABWZpggW9R
363
363
  chellow/templates/g/supply_notes.html,sha256=WR3YwGh_qqTklSJ7JqWX6BKBc9rk_jMff4RiWZiF2CM,936
364
364
  chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
365
365
  chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
366
- chellow-1713453402.0.0.dist-info/METADATA,sha256=RobDE04PcgQzlT8CKH37XijphYEe9f9tRzmv0BYtf4c,12205
367
- chellow-1713453402.0.0.dist-info/WHEEL,sha256=osohxoshIHTFJFVPhsi1UkZuLRGMHRXZzwEBW2ezjrc,87
368
- chellow-1713453402.0.0.dist-info/RECORD,,
366
+ chellow-1713861169.0.0.dist-info/METADATA,sha256=6HsFq53gBl956mQOtR2_5fizf-oSG1WKAGbZ0FgSDWs,12205
367
+ chellow-1713861169.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
368
+ chellow-1713861169.0.0.dist-info/RECORD,,
{chellow-1713453402.0.0.dist-info → chellow-1713861169.0.0.dist-info}/WHEEL RENAMED
@@ -1,4 +1,4 @@
1
1
  Wheel-Version: 1.0
2
- Generator: hatchling 1.24.1
2
+ Generator: hatchling 1.24.2
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any