chellow 1728658886.0.0__tar.gz → 1728924490.0.0__tar.gz

{chellow-1728658886.0.0 → chellow-1728924490.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1728658886.0.0
+Version: 1728924490.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-1728924490.0.0/VERSION

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

{chellow-1728658886.0.0 → chellow-1728924490.0.0}/chellow/e/scenario.py

@@ -83,7 +83,8 @@ def make_create_future_func_monthly(contract_name, fnames):
 def make_site_deltas(
     sess, report_context, site, scenario_hh, forecast_from, supply_ids
 ):
-    site_scenario_hh = scenario_hh.get(site.code, {})
+    site_scenario_hh_str = scenario_hh.get(site.code, {})
+    site_scenario_hh = {}
 
     site_deltas = {"hhs": {}}
     delts = site_deltas["supply_deltas"] = {}
@@ -97,7 +98,7 @@ def make_site_deltas(
 
     found_hh = False
     for typ in ("used", "generated", "parasitic", "gen_grid"):
-        hh_str = site_scenario_hh.get(typ, "")
+        hh_str = site_scenario_hh_str.get(typ, "")
         hh_data = site_scenario_hh[typ] = {}
         for row in csv.reader(StringIO(hh_str)):
             cells = [cell.strip() for cell in row]

{chellow-1728658886.0.0 → chellow-1728924490.0.0}/chellow/templates/user.html

@@ -31,62 +31,33 @@
 							{{ user.email_address }}
 						{%- endif -%}">
 
-				<label>Role</label>
-				<input type="radio" name="user_role_code" value="editor"
-						{%- if request.values.user_role_editor -%}
-							{%- if request.values.user_role_editor == 'editor' %}
-								checked
-							{%- endif -%}
-						{%- else -%}
-							{%- if user.user_role.code == 'editor' %}
-								checked
-							{%- endif -%}
-						{%- endif -%}
-				>
-				<label>Editor</label>
-				<input type="radio" name="user_role_code" value="viewer"
-				{% if request.values.user_role_code %}
-					{% if request.values.user_role_code == 'viewer' %}
-						checked
-					{% endif %}
-				{% else %}
-					{% if user.user_role.code == 'viewer' %}
-						checked
-					{% endif %}
-				{% endif %}
-				>
-				<label>Viewer</label>
-				<input
-						type="radio" name="user_role_code"
-						value="party-viewer"
-						{%- if request.values.user_role_code -%}
-							{%- if request.values.user_role_code == 'party-viewer' -%}
-								checked
-							{%- endif -%}
-						{%- else -%}
-							{%- if user.user_role.code == 'party-viewer' -%}
-								checked
-							{% endif %}
-						{% endif %}>
-				<label>Party Viewer</label>
-				<select name="party_id">
-					{% for party in parties %}
-						<option value="{{ party.id }}"
-							{%- if request.values.party_id -%}
-								{%- if request.values.party_id == party.id %}
-									selected
+				<fieldset>
+					<legend>Role</legend>
+					<label>Editor</label>
+					<input type="radio" name="user_role_code" value="editor"
+							{%- if request.values.user_role_editor -%}
+								{%- if request.values.user_role_editor == 'editor' %}
+									checked
 								{%- endif -%}
 							{%- else -%}
-								{%- if user.party.id == party.id %}
-									selected
+								{%- if user.user_role.code == 'editor' %}
+									checked
 								{%- endif -%}
 							{%- endif -%}
-						>
-							{{ party.name }} {{ party.participant.code }}
-							{{ party.market_role.description }}
-						</option>
-					{% endfor %}
-				</select>
+					>
+					<label>Viewer</label>
+					<input type="radio" name="user_role_code" value="viewer"
+					{% if request.values.user_role_code %}
+						{% if request.values.user_role_code == 'viewer' %}
+							checked
+						{% endif %}
+					{% else %}
+						{% if user.user_role.code == 'viewer' %}
+							checked
+						{% endif %}
+					{% endif %}
+					>
+				</fieldset>
 				<input type="submit" value="Update">
 			</fieldset>
 		</form>

{chellow-1728658886.0.0 → chellow-1728924490.0.0}/test/e/test_scenario.py

@@ -77,6 +77,72 @@ def test_make_site_deltas(mocker):
     assert len(res["supply_deltas"][False]["grid"]["site"]) == 0
 
 
+def test_make_site_deltas_hh_multi_month(mocker):
+    era_1 = mocker.Mock()
+    era_1.start_date = utc_datetime(2018, 1, 1)
+    era_1.finish_date = None
+    filter_returns = iter([[era_1], []])
+
+    class Sess:
+        def query(self, *args):
+            return self
+
+        def join(self, *args):
+            return self
+
+        def filter(self, *args):
+            return next(filter_returns)
+
+    sess = Sess()
+    report_context = {}
+    site = mocker.Mock()
+    site.code = "1"
+    scenario_hh = {site.code: {"used": "2019-03-01 00:00, 0"}}
+    forecast_from = utc_datetime(2019, 4, 1)
+    supply_id = None
+
+    ss = mocker.patch("chellow.e.scenario.SiteSource", autospec=True)
+    ss_instance = ss.return_value
+    ss_instance.hh_data = [
+        {
+            "start-date": utc_datetime(2019, 3, 1),
+            "used-kwh": 0,
+            "export-grid-kwh": 0,
+            "import-grid-kwh": 0,
+            "msp-kwh": 0,
+        }
+    ]
+
+    se = mocker.patch("chellow.e.scenario.SiteEra", autospec=True)
+    se.site = mocker.Mock()
+
+    sup_s = mocker.patch("chellow.e.scenario.SupplySource", autospec=True)
+    sup_s_instance = sup_s.return_value
+    sup_s_instance.hh_data = {}
+
+    res = make_site_deltas(
+        sess, report_context, site, scenario_hh, forecast_from, supply_id
+    )
+    filter_returns = iter([[era_1], []])
+
+    class Sess:
+        def query(self, *args):
+            return self
+
+        def join(self, *args):
+            return self
+
+        def filter(self, *args):
+            return next(filter_returns)
+
+    sess = Sess()
+    res = make_site_deltas(
+        sess, report_context, site, scenario_hh, forecast_from, supply_id
+    )
+
+    assert len(res["supply_deltas"][False]["grid"]["site"]) == 0
+
+
 def test_make_site_deltas_nhh(mocker):
     era_1 = mocker.Mock()
     era_1.start_date = utc_datetime(2018, 1, 1)

chellow-1728658886.0.0/VERSION

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