From 908f8bbf4a609d4ec17190e9cb3fb59692246de9 Mon Sep 17 00:00:00 2001 From: Felix Claessen <30658763+Flix6x@users.noreply.github.com> Date: Thu, 27 May 2021 17:26:47 +0200 Subject: [PATCH] Replaced isnan Jinja filter with more versatile isnull filter (#138) * Make isnan jinja filter more potent by switching to pandas function (now also works on timedelta objects, for example) * Rename jinja filter Co-authored-by: F.N. Claessen --- flexmeasures/ui/__init__.py | 4 ++-- flexmeasures/ui/templates/views/portfolio.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flexmeasures/ui/__init__.py b/flexmeasures/ui/__init__.py index 6348aa578..e23267095 100644 --- a/flexmeasures/ui/__init__.py +++ b/flexmeasures/ui/__init__.py @@ -4,7 +4,7 @@ from flask.blueprints import BlueprintSetupState from flask import send_from_directory from flask_security import login_required, roles_accepted -import numpy as np +import pandas as pd import rq_dashboard from humanize import naturaldelta @@ -124,7 +124,7 @@ def add_jinja_filters(app): app.jinja_env.filters["naturalized_timedelta"] = naturaldelta app.jinja_env.filters["capitalize"] = capitalize app.jinja_env.filters["parameterize"] = parameterize - app.jinja_env.filters["isnan"] = np.isnan + app.jinja_env.filters["isnull"] = pd.isnull app.jinja_env.filters["hide_nan_if_desired"] = ( lambda x: "" if x in ("nan", "nan%", "NAN") diff --git a/flexmeasures/ui/templates/views/portfolio.html b/flexmeasures/ui/templates/views/portfolio.html index 7feac15dc..2cd7c7886 100644 --- a/flexmeasures/ui/templates/views/portfolio.html +++ b/flexmeasures/ui/templates/views/portfolio.html @@ -147,7 +147,7 @@

Market status

{{ market.display_name }} {{ market.unit[:3] }} - {% if not average_prices[market.name] | isnan %} + {% if not average_prices[market.name] | isnull %} {{ "{:,.2f}".format( average_prices[market.name] ) }} {{ market.unit }} {% else %} Unknown for the requested period