From b9242d843e04762f5665c52b33df7accc49f4b9c Mon Sep 17 00:00:00 2001 From: krateng Date: Thu, 19 Oct 2023 17:26:52 +0200 Subject: [PATCH] Added UI for artist chart separation --- maloja/jinjaenv/context.py | 4 ++++ maloja/web/jinja/charts_artists.jinja | 2 +- maloja/web/jinja/snippets/timeselection.jinja | 13 +++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/maloja/jinjaenv/context.py b/maloja/jinjaenv/context.py index 25aa039..2952649 100644 --- a/maloja/jinjaenv/context.py +++ b/maloja/jinjaenv/context.py @@ -76,6 +76,10 @@ def update_jinja_environment(): "xassociated": [ {"identifier":"include_associated","replacekeys":{"associated":True},"localisation":"Associated"}, {"identifier":"exclude_associated","replacekeys":{"associated":False},"localisation":"Exclusive"} + ], + "xseparate": [ + {"identifier":"count_combined","replacekeys":{"separate":False},"localisation":"Combined"}, + {"identifier":"count_separate","replacekeys":{"separate":True},"localisation":"Separate"} ] } diff --git a/maloja/web/jinja/charts_artists.jinja b/maloja/web/jinja/charts_artists.jinja index cd1be3a..b306578 100644 --- a/maloja/web/jinja/charts_artists.jinja +++ b/maloja/web/jinja/charts_artists.jinja @@ -32,7 +32,7 @@

Artist Charts

View #1 Artists
{{ filterdesc.desc(filterkeys,limitkeys) }}

- {% with delimitkeys = {} %} + {% with delimitkeys = {}, artistchart=True %} {% include 'snippets/timeselection.jinja' %} {% endwith %} diff --git a/maloja/web/jinja/snippets/timeselection.jinja b/maloja/web/jinja/snippets/timeselection.jinja index efd5f4c..efd4e60 100644 --- a/maloja/web/jinja/snippets/timeselection.jinja +++ b/maloja/web/jinja/snippets/timeselection.jinja @@ -75,3 +75,16 @@ {% endif %} + + {% if artistchart %} +
+ {% for o in xseparate %} + {% if o.replacekeys | map('compare_key_in_dicts',o.replacekeys,allkeys) | alltrue %} + {{ o.localisation }} + {% else %} + {{ o.localisation }} + {% endif %} + {{ "|" if not loop.last }} + {% endfor %} +
+ {% endif %}