chellow 1700823345.0.0__py3-none-any.whl → 1701342365.0.0__py3-none-any.whl

chellow/reports/report_59.py

@@ -669,6 +669,11 @@ def _process_site(
     for _, vals in sorted(supplies_data.items()):
         supply_rows.append(make_val(vals.get(t)) for t in supply_titles)
 
+    site_md_used_kw = 0
+    for hh in site.hh_data(sess, start_date, finish_date, exclude_virtual=True):
+        used_kw = hh["used"] * 2
+        site_md_used_kw = max(used_kw, site_md_used_kw)
+
     site_row = [
         now,
         site.code,
@@ -679,6 +684,7 @@ def _process_site(
         site_category,
         site_sources,
         site_gen_types,
+        site_md_used_kw,
     ] + [site_data[k] for k in summary_titles]
 
     site_rows.append([make_val(v) for v in site_row])
@@ -879,6 +885,7 @@ def content(
                 "metering-type",
                 "sources",
                 "generator-types",
+                "md-used-kw",
             ]
             summary_titles = [
                 "import-net-kwh",

chellow/views.py

@@ -2429,6 +2429,13 @@ def input_date_get():
     year = req_int_none(year_name)
     if year is None:
         initial = ct_datetime_now()
+        year, month, day, hour, minute = (
+            initial.year,
+            initial.month,
+            initial.day,
+            initial.hour,
+            initial.minute,
+        )
     else:
         month = req_int(month_name)
         if resolution in ("day", "hour", "minute"):
@@ -2446,11 +2453,9 @@ def input_date_get():
         else:
             minute = 0
 
-        initial = ct_datetime(year, month, day, hour, minute)
+    month_max_day = (ct_datetime(year, month, 1) + relativedelta(months=1) - HH).day
 
-    month_max_day = (
-        ct_datetime(initial.year, initial.month, 1) + relativedelta(months=1) - HH
-    ).day
+    initial = ct_datetime(year, month, min(day, month_max_day), hour, minute)
 
     return render_template(
         "input_date.html",

{chellow-1700823345.0.0.dist-info → chellow-1701342365.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1700823345.0.0
+Version: 1701342365.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-1700823345.0.0.dist-info → chellow-1701342365.0.0.dist-info}/RECORD

@@ -11,7 +11,7 @@ chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=zXY0YZbkga5WL60i-rQ1K5RciZ8-UQ2NNNSlIJ_DFYk,5626
 chellow/testing.py,sha256=Od4HHH6pZrhJ_De118_F55RJEKmAvhUH2S24QE9qFQk,3635
 chellow/utils.py,sha256=32qPWEGzCPKPhSM7ztpzcR6ZG74sVZanScDIdK50Rq4,19308
-chellow/views.py,sha256=amq1KrO9822SRNiusWFV6qVpqvSE9GVAU7GrkW3P13c,78249
+chellow/views.py,sha256=cnbqRdHwFY90DvM9uxnY8ncTFPhVxXcKWiEQj4kIv_U,78420
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
 chellow/e/bill_importer.py,sha256=y1bpn49xDwltj0PRFowWsjAVamcD8eyxUbCTdGxEZiE,7389
@@ -81,7 +81,7 @@ chellow/reports/report_33.py,sha256=Dakqsl-2kGxl8rVnZuK2f0icIHKB0OlKs-6zoZ7kCMc,
 chellow/reports/report_387.py,sha256=cfEda5oL9j4Rbwh3PTw6FY6WwJT_It8MUZoSSqPMxyU,5793
 chellow/reports/report_41.py,sha256=3wNRv6yIAaI4zqM2lA1Fz-X706Hmc5vZSMvvfGmoPng,7571
 chellow/reports/report_429.py,sha256=zEFYcIw9bA9z7BHVoHRMnMOJt4OlTL4DJNsCX1yJEf0,12503
-chellow/reports/report_59.py,sha256=4sySc3r-LZsdJ9YyX9cBGI-v3gDGFrxyrRjTv_ILzQk,44390
+chellow/reports/report_59.py,sha256=Broxh8-8SpkXCgmn2XV-Xnob5zAAUD_E5SsPHiDr-rw,44640
 chellow/reports/report_81.py,sha256=XrBLfuwLtMsn8EfoMaPRO92TKHsu_3MW95ynknDtF4I,4385
 chellow/reports/report_87.py,sha256=aqii485kbYZAvl7ajL1rGsC4eHbXAxbkGoazGwDJj0Q,5717
 chellow/reports/report_asset_comparison.py,sha256=6kHiPOL5fiZXtPyKXQ0fHvi1zYX51Frb4NMMDwLdWvc,6140
@@ -357,6 +357,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-1700823345.0.0.dist-info/METADATA,sha256=SplPekVXqGzuvgCLmpcSwPVZqUEirH18gtNGPI5eOmo,12160
-chellow-1700823345.0.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
-chellow-1700823345.0.0.dist-info/RECORD,,
+chellow-1701342365.0.0.dist-info/METADATA,sha256=sSBEdkU0HgJn0qi-mowyGcLFIzgFToXUp-GAsoI-H4Y,12160
+chellow-1701342365.0.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
+chellow-1701342365.0.0.dist-info/RECORD,,