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

Regression: analytics selections malfunctioning #117

Merged
merged 6 commits into from May 7, 2021
Merged

Regression: analytics selections malfunctioning #117

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae3c717
Create draft PR for #116
Flix6x May 4, 2021
ee70e96
Fix bug due to redefining older javascript content as a js module.
Flix6x May 4, 2021
9584b4b
Merge branch 'main' into issue-116-Regression_analytics_selections_ma…
Flix6x May 7, 2021
84ba2f6
Changelog entry
Flix6x May 7, 2021
8c4f4dd
More targeted loading of js functions from module
Flix6x May 7, 2021
f874283
Merge branch 'main' into issue-116-Regression_analytics_selections_ma…
Flix6x May 7, 2021
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 @@ -25,6 +25,7 @@ v0.4.1 | May XX, 2021

Bugfixes
-----------
* Fixed a regression that stopped asset, market and sensor selection from working [see `PR #117 <http://www.github.com/SeitaBV/flexmeasures/pull/117>`_]
* Prevent logging out user when clearing the session [see `PR #112 <http://www.github.com/SeitaBV/flexmeasures/pull/112>`_]
* Prevent user type data source to be created without setting a user [see `PR #111 <https://github.com/SeitaBV/flexmeasures/pull/111>`_]

Expand Down
19 changes: 19 additions & 0 deletions flexmeasures/ui/static/js/flexmeasures-module.js
View file
Open in desktop
@@ -0,0 +1,19 @@
// Date range utils
export function subtract(oldDate, nDays) {
var newDate = new Date(oldDate)
newDate.setDate(newDate.getDate() - nDays);
return newDate;
}
export function thisMonth(oldDate) {
var d1 = new Date(oldDate)
d1.setDate(1);
var d2 = new Date(d1.getFullYear(), d1.getMonth() + 1, 0);
return [d1, d2];
};
export function lastNMonths(oldDate, nMonths) {
var d0 = new Date(oldDate)
var d1 = new Date(d0.getFullYear(), d0.getMonth() - nMonths + 2, 0);
d1.setDate(1);
var d2 = new Date(d0.getFullYear(), d0.getMonth() + 1, 0);
return [d1, d2];
};
21 changes: 0 additions & 21 deletions flexmeasures/ui/static/js/flexmeasures.js
View file
Open in desktop
Expand Up @@ -310,24 +310,3 @@ function submit_market() {
function submit_sensor_type() {
$("#sensor_type-form").attr("action", empty_location).submit();
}


// Date range utils
export function subtract(oldDate, nDays) {
var newDate = new Date(oldDate)
newDate.setDate(newDate.getDate() - nDays);
return newDate;
}
export function thisMonth(oldDate) {
var d1 = new Date(oldDate)
d1.setDate(1);
var d2 = new Date(d1.getFullYear(), d1.getMonth() + 1, 0);
return [d1, d2];
};
export function lastNMonths(oldDate, nMonths) {
var d0 = new Date(oldDate)
var d1 = new Date(d0.getFullYear(), d0.getMonth() - nMonths + 2, 0);
d1.setDate(1);
var d2 = new Date(d0.getFullYear(), d0.getMonth() + 1, 0);
return [d1, d2];
};
3 changes: 2 additions & 1 deletion flexmeasures/ui/templates/base.html
View file
Open in desktop
Expand Up @@ -209,7 +209,8 @@
<script src="https://cdn.jsdelivr.net/npm/ion-rangeslider@2.3.1/js/ion.rangeSlider.min.js"></script>

<!-- Custom scripts -->
<script type="module" src="{{ url_for('flexmeasures_ui.static', filename='js/flexmeasures.js') }}"></script>
<script src="{{ url_for('flexmeasures_ui.static', filename='js/flexmeasures.js') }}"></script>
<script type="module" src="{{ url_for('flexmeasures_ui.static', filename='js/flexmeasures-module.js') }}"></script>
{% if show_datepicker %}
<script src="{{ url_for('flexmeasures_ui.static', filename='js/daterangepicker-init.js') }}"></script>
{% endif %}
Expand Down