chellow 1700823345.0.0__tar.gz → 1701342365.0.0__tar.gz

{chellow-1700823345.0.0 → chellow-1701342365.0.0}/PKG-INFO

@@ -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-1701342365.0.0/VERSION

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

{chellow-1700823345.0.0 → chellow-1701342365.0.0}/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-1700823345.0.0 → chellow-1701342365.0.0}/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 → chellow-1701342365.0.0}/test/reports/test_report_59.py

@@ -449,6 +449,7 @@ def displaced_virtual_bill(ds):
             "metering-type",
             "sources",
             "generator-types",
+            "md-used-kw",
             "import-net-kwh",
             "export-net-kwh",
             "import-gen-kwh",
@@ -498,6 +499,7 @@ def displaced_virtual_bill(ds):
             0.0,
             0.0,
             0.0,
+            0.0,
             19.67999999999967,
             19.67999999999967,
             0.0,
@@ -508,7 +510,7 @@ def displaced_virtual_bill(ds):
             0.0,
         ],
     ]
-
+    print(site_table)
     assert site_expected == site_table
 
     supply_table = list(sheet.tables[1].rows)

{chellow-1700823345.0.0 → chellow-1701342365.0.0}/test/test_views.py

@@ -69,6 +69,19 @@ def test_home(client, sess, mocker):
     match(response, 200, f"/e/dc_contracts/{dc_contract.id}/auto_importer")
 
 
+def test_input_date(client, sess, mocker):
+    query_string = {
+        "prefix": "timestamp",
+        "resolution": "day",
+        "timestamp_year": "2022",
+        "timestamp_month": "11",
+        "timestamp_day": "31",
+    }
+    response = client.get("/input_date", query_string=query_string)
+
+    match(response, 200)
+
+
 def test_local_report_home(client, sess):
     script = """from flask import render_template_string
 

chellow-1700823345.0.0/VERSION

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