Merge branch 'main' into fix/report-offsets-in-local-time

Signed-off-by: Felix Claessen <30658763+Flix6x@users.noreply.github.com>

documentation/changelog.rst

@@ -30,6 +30,7 @@ Bugfixes
 * Avoid saving any :abbr:`NaN (not a number)` values to the database, when calling ``flexmeasures add report`` [see `PR #735 <https://www.github.com/FlexMeasures/flexmeasures/pull/735>`_]
 * Fix browser console error when loading asset or sensor page with only a single data point [see `PR #732 <https://www.github.com/FlexMeasures/flexmeasures/pull/732>`_]
 * Fix defaults for the ``--start-offset`` and ``--end-offset` options to ``flexmeasures add report``, which weren't being interpreted in the local timezone of the reporting sensor [see `PR #744 <https://www.github.com/FlexMeasures/flexmeasures/pull/744>`_]
+* Relax constraint for overlaying plot traces for sensors with various resolutions, making it possible to show e.g. two price sensors in one chart, where one of them records hourly prices and the other records quarter-hourly prices [see `PR #743 <https://www.github.com/FlexMeasures/flexmeasures/pull/743>`_]
 
 
 v0.14.0 | June 15, 2023

flexmeasures/data/models/charts/belief_charts.py

@@ -271,9 +271,9 @@ def create_line_layer(
     event_value_field_definition: dict,
 ):
     event_resolutions = list(set([sensor.event_resolution for sensor in sensors]))
-    assert (
-        len(event_resolutions) == 1
-    ), "Sensors shown within one row must share the same event resolution."
+    assert all(res == timedelta(0) for res in event_resolutions) or all(
+        res != timedelta(0) for res in event_resolutions
+    ), "Sensors shown within one row must all be instantaneous (zero event resolution) or all be non-instantatneous (non-zero event resolution)."
     event_resolution = event_resolutions[0]
     line_layer = {
         "mark": {