Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make sure vega view is embedded in page before attempting to change its dataset #472

Merged
merged 2 commits into from Aug 9, 2022
Merged

Make sure vega view is embedded in page before attempting to change its dataset #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d15142
Make sure vega view is embedded in page before attempting to change i…
Flix6x Aug 8, 2022
4b6c0c8
changelog entry
Flix6x Aug 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions documentation/changelog.rst
View file
Open in desktop
Expand Up @@ -18,6 +18,7 @@ New features
Bugfixes
-----------
* Do not fail asset page if entity addresses cannot be built [see `PR #457 <http://www.github.com/FlexMeasures/flexmeasures/pull/457>`_]
* Asynchronous reloading of a chart's dataset relies on that chart already having been embedded [see `PR #472 <http://www.github.com/FlexMeasures/flexmeasures/pull/472>`_]
* Time scale axes in sensor data charts now match the requested date range, rather than stopping at the edge of the available data [see `PR #449 <http://www.github.com/FlexMeasures/flexmeasures/pull/449>`_]
* The docker-based tutorial now works with UI on all platforms (port 5000 did not expose on MacOS) [see `PR #465 <http://www.github.com/FlexMeasures/flexmeasures/pull/465>`_]
* Fix interpretation of scheduling results in toy tutorial [see `PR #466 <http://www.github.com/FlexMeasures/flexmeasures/pull/466>`_]
Expand Down
5 changes: 3 additions & 2 deletions flexmeasures/ui/templates/crud/asset.html
View file
Open in desktop
Expand Up @@ -229,7 +229,6 @@ <h3>All sensors for {{ asset.name }}</h3>
signal = controller.signal

$("#spinner").show();
embedAndLoad(chartSpecsPath + 'event_starts_after=' + queryStartDate + '&event_ends_before=' + queryEndDate + '&', elementId, datasetName, previousResult, startDate, endDate);
Promise.all([
// Fetch time series data
fetch(assetPath + '/chart_data/?event_starts_after=' + queryStartDate + '&event_ends_before=' + queryEndDate, {
Expand All @@ -246,8 +245,10 @@ <h3>All sensors for {{ asset.name }}</h3>
headers: {"Content-Type": "application/json"},
signal: signal,
})
.then(function(response) { return response.json(); })
.then(function(response) { return response.json(); }),
*/

embedAndLoad(chartSpecsPath + 'event_starts_after=' + queryStartDate + '&event_ends_before=' + queryEndDate + '&', elementId, datasetName, previousResult, startDate, endDate),
]).then(function(result) {
$("#spinner").hide();
vegaView.change(datasetName, vega.changeset().remove(vega.truthy).insert(result[0])).resize().run();
Expand Down
6 changes: 4 additions & 2 deletions flexmeasures/ui/templates/views/sensors.html
View file
Open in desktop
Expand Up @@ -110,7 +110,6 @@
signal = controller.signal

$("#spinner").show();
embedAndLoad(chartSpecsPath + 'event_starts_after=' + queryStartDate + '&event_ends_before=' + queryEndDate + '&', elementId, datasetName, previousResult, startDate, endDate);
Promise.all([
// Fetch time series data
fetch(sensorPath + '/chart_data/?event_starts_after=' + queryStartDate + '&event_ends_before=' + queryEndDate, {
Expand All @@ -124,7 +123,10 @@
method: "GET",
headers: {"Content-Type": "application/json"},
})
.then(function(response) { return response.json(); })
.then(function(response) { return response.json(); }),

// Embed chart
embedAndLoad(chartSpecsPath + 'event_starts_after=' + queryStartDate + '&event_ends_before=' + queryEndDate + '&', elementId, datasetName, previousResult, startDate, endDate),
]).then(function(result) {
$("#spinner").hide();
vegaView.change(datasetName, vega.changeset().remove(vega.truthy).insert(result[0])).resize().run();
Expand Down