diff --git a/fava_investor/templates/Investor.html b/fava_investor/templates/Investor.html index 540288e..975e238 100644 --- a/fava_investor/templates/Investor.html +++ b/fava_investor/templates/Investor.html @@ -202,24 +202,14 @@

What not to buy

{% endmacro %} -{% macro asset_allocation_hierarchy(serialised_tree, label='Asset Allocation') %} -{% do chart_data.append({ -'type': 'hierarchy', -'label': label, -'data': { - 'modifier': 1, - 'root': serialised_tree, -}, -}) %} -{% endmacro %} - {% if (module == 'aa_class') %}

Portfolio: Asset Allocation by Class

{% set chart_data = [] %} {% set results = extension.build_assetalloc_by_class() %} - {{ asset_allocation_hierarchy(results[0].serialise(results[0]['currency']), label='Asset Allocation') }} + {% set serialised_tree = results[0].serialise(results[0]['currency']) %} + {% set chart_data = [{ 'type': 'hierarchy', 'label': 'Asset Allocation', 'data': serialised_tree }] %} {{ asset_tree(results[0]) }} diff --git a/setup.py b/setup.py index 3c07e13..724f189 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ 'Click >= 7.0', 'beancount >= 2.3.2', 'click_aliases >= 1.0.1', - 'fava >= 1.23', + 'fava >= 1.26', 'packaging >= 20.3', 'python_dateutil >= 2.8.1', 'tabulate >= 0.8.9',