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

Deprecate portfolio and analytics views #321

Merged
merged 6 commits into from Jan 19, 2022
Merged

Deprecate portfolio and analytics views #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ea627c5
Remove portfolio and analytics from default menu views
Flix6x Jan 19, 2022
6482a0b
Unlink portfolio and analytics from UI documentation
Flix6x Jan 19, 2022
8c930b1
Unlink control page from UI documentation
Flix6x Jan 19, 2022
d4dc727
Comment out links to analytics page on dashboard
Flix6x Jan 19, 2022
44960d2
Comment out links to analytics page on asset pages
Flix6x Jan 19, 2022
dc1ff59
Changelog entry
Flix6x Jan 19, 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
4 changes: 4 additions & 0 deletions documentation/changelog.rst
View file
Open in desktop
Expand Up @@ -14,6 +14,10 @@ New features
* Mobile friendly (responsive) charts of sensor data, and such charts can be requested with a custom width and height [see `PR #313 <http://www.github.com/FlexMeasures/flexmeasures/pull/313>`_]
* Schedulers take into account round-trip efficiency if set [see `PR #291 <http://www.github.com/FlexMeasures/flexmeasures/pull/291>`_]

Deprecations
------------
* The Portfolio and Analytics views are deprecated [see `PR #321 <http://www.github.com/FlexMeasures/flexmeasures/pull/321>`_]

Bugfixes
-----------
* Fix recording time of schedules triggered by UDI events [see `PR #300 <http://www.github.com/FlexMeasures/flexmeasures/pull/300>`_]
Expand Down
3 changes: 0 additions & 3 deletions documentation/index.rst
View file
Open in desktop
Expand Up @@ -89,9 +89,6 @@ The platform operator of FlexMeasures can be an Aggregator.
:maxdepth: 1

views/dashboard
views/portfolio
views/control
views/analytics
views/admin

.. toctree::
Expand Down
12 changes: 6 additions & 6 deletions flexmeasures/ui/templates/crud/asset.html
View file
Open in desktop
Expand Up @@ -8,12 +8,12 @@

<div class="container-fluid">
<div class="row">
<div class="col-sm-1">
<form action="../../analytics" method="get">
<input type="hidden" name="resource" value="{{ asset.name }}">
<button class="btn btn-sm btn-responsive btn-info" type="submit">Analyse this asset</button>
</form>
</div>
<!-- <div class="col-sm-1">-->
<!-- <form action="../../analytics" method="get">-->
<!-- <input type="hidden" name="resource" value="{{ asset.name }}">-->
<!-- <button class="btn btn-sm btn-responsive btn-info" type="submit">Analyse this asset</button>-->
<!-- </form>-->
<!-- </div>-->
{% if user_is_admin %}
<div class="col-sm-1">
<form action="/assets/new" method="get" style="float:right">
Expand Down
10 changes: 5 additions & 5 deletions flexmeasures/ui/templates/crud/assets.html
View file
Open in desktop
Expand Up @@ -52,11 +52,11 @@ <h2>All assets owned by account {{account.name}}</h2>
{{ asset.sensors | length }}
</td>
<td class="text-right">
<form action="../../analytics" method="get">
<input type="hidden" name="resource" value="{{ asset.name }}">
<button class="btn btn-sm btn-responsive btn-info" type="submit">Analyse this
asset</button>
</form>
<!-- <form action="../../analytics" method="get">-->
<!-- <input type="hidden" name="resource" value="{{ asset.name }}">-->
<!-- <button class="btn btn-sm btn-responsive btn-info" type="submit">Analyse this-->
<!-- asset</button>-->
<!-- </form>-->
</td>

</tr>
Expand Down
18 changes: 10 additions & 8 deletions flexmeasures/ui/templates/views/dashboard.html
View file
Open in desktop
Expand Up @@ -87,8 +87,10 @@ <h3>
{% if (FLEXMEASURES_MODE == "demo" and asset_groups[asset_group].count_all > 0) or (FLEXMEASURES_MODE != "demo" and asset_groups[asset_group].count > 0)%}
<th {% if asset_groups[asset_group].hover_label %}
title="{{ asset_groups[asset_group].hover_label | capitalize }}" {% endif %}
class="text-center{% if asset_group in aggregate_groups %} agg-group{% endif %}"><a
href="analytics?resource={{ asset_group }}">{{ asset_group | capitalize }}</a>
class="text-center{% if asset_group in aggregate_groups %} agg-group{% endif %}">
<!-- <a href="analytics?resource={{ asset_group }}">-->
{{ asset_group | capitalize }}
<!-- </a>-->
</th>
{% endif %}
{% endfor %}
Expand Down Expand Up @@ -214,12 +216,12 @@ <h4>{{ asset.display_name }}</h4>
<div class="col-sm-5 bokeh-state-plot"></div>
<div class="col-sm-7">
<div class="row top-buffer">
<div class="col-sm-12">
<form action="analytics" method="get">
<input type="hidden" name="resource" value="{{ asset.name }}">
<button class="btn btn-sm btn-responsive btn-info" type="submit">Analyse this asset</button>
</form>
</div>
<!-- <div class="col-sm-12">-->
<!-- <form action="analytics" method="get">-->
<!-- <input type="hidden" name="resource" value="{{ asset.name }}">-->
<!-- <button class="btn btn-sm btn-responsive btn-info" type="submit">Analyse this asset</button>-->
<!-- </form>-->
<!-- </div>-->
</div>
<div class="row top-buffer">
<div class="col-sm-12">
Expand Down
18 changes: 10 additions & 8 deletions flexmeasures/ui/templates/views/new_dashboard.html
View file
Open in desktop
Expand Up @@ -24,8 +24,10 @@ <h3>
{# On demo, show all non-empty groups, otherwise show all groups that are non-empty for the current user #}
<th {% if asset_groups[asset_group_name].hover_label %}
title="{{ asset_groups[asset_group_name].hover_label | capitalize }}" {% endif %}
class="text-center{% if asset_group_name in aggregate_groups %} agg-group{% endif %}"><a
href="analytics?resource={{ asset_group_name }}">{{ asset_group_name | capitalize }}</a>
class="text-center{% if asset_group_name in aggregate_groups %} agg-group{% endif %}">
<!-- <a href="analytics?resource={{ asset_group_name }}">-->
{{ asset_group_name | capitalize }}
<!-- </a>-->
</th>
{% endfor %}
</tr>
Expand Down Expand Up @@ -142,12 +144,12 @@ <h4>{{ asset.name }}</h4>
<div class="col-sm-5 bokeh-state-plot"></div>
<div class="col-sm-7">
<div class="row top-buffer">
<div class="col-sm-12">
<form action="analytics" method="get">
<input type="hidden" name="resource" value="{{ asset.name }}">
<button class="btn btn-sm btn-responsive btn-info" type="submit">Analyse this asset</button>
</form>
</div>
<!-- <div class="col-sm-12">-->
<!-- <form action="analytics" method="get">-->
<!-- <input type="hidden" name="resource" value="{{ asset.name }}">-->
<!-- <button class="btn btn-sm btn-responsive btn-info" type="submit">Analyse this asset</button>-->
<!-- </form>-->
<!-- </div>-->
</div>
<div class="row top-buffer">
<div class="col-sm-12">
Expand Down
2 changes: 0 additions & 2 deletions flexmeasures/utils/config_defaults.py
View file
Open in desktop
Expand Up @@ -102,8 +102,6 @@ class Config(object):
FLEXMEASURES_ROOT_VIEW: Union[str, List[Union[str, Tuple[str, List[str]]]]] = []
FLEXMEASURES_MENU_LISTED_VIEWS: List[Union[str, Tuple[str, List[str]]]] = [
"dashboard",
"analytics",
"portfolio",
"assets",
"users",
]
Expand Down