diff --git a/maloja/web/jinja/charts_artists.jinja b/maloja/web/jinja/charts_artists.jinja index bb14dff..8f65da2 100644 --- a/maloja/web/jinja/charts_artists.jinja +++ b/maloja/web/jinja/charts_artists.jinja @@ -36,7 +36,7 @@ {% import 'partials/charts_artists.jinja' as charts_artists %} -{{ charts_artists.charts_artists(limitkeys,amountkeys,compare=False) }} +{{ charts_artists.charts_artists(limitkeys,amountkeys,compare=true) }} {% import 'snippets/pagination.jinja' as pagination %} diff --git a/maloja/web/jinja/charts_tracks.jinja b/maloja/web/jinja/charts_tracks.jinja index e38752b..d8ba310 100644 --- a/maloja/web/jinja/charts_tracks.jinja +++ b/maloja/web/jinja/charts_tracks.jinja @@ -36,7 +36,7 @@ {% import 'partials/charts_tracks.jinja' as charts_tracks %} -{{ charts_tracks.charts_tracks(filterkeys,limitkeys,amountkeys,charts=charts,compare=false) }} +{{ charts_tracks.charts_tracks(filterkeys,limitkeys,amountkeys,charts=charts,compare=true) }} {% import 'snippets/pagination.jinja' as pagination %} diff --git a/maloja/web/jinja/partials/charts_artists.jinja b/maloja/web/jinja/partials/charts_artists.jinja index 3049384..56fb6d2 100644 --- a/maloja/web/jinja/partials/charts_artists.jinja +++ b/maloja/web/jinja/partials/charts_artists.jinja @@ -5,6 +5,21 @@ {% endif %} {% if compare %} + {% if compare is true %} + {% set compare = limitkeys.timerange.next(step=-1) %} + {% endif %} + {% set prevartists = dbp.get_charts_artists(filterkeys,{'timerange':compare}) %} + + {% set lastranks = {} %} + {% for a in prevartists %} + {% if lastranks.update({a.artist:a.rank}) %}{% endif %} + {% endfor %} + + {% for a in charts %} + {% if a.artist in lastranks %} + {% if a.update({'last_rank':lastranks[a.artist]}) %}{% endif %} + {% endif %} + {% endfor %} {% endif %} {% set firstindex = amountkeys.page * amountkeys.perpage %} @@ -20,9 +35,12 @@
{%if loop.changed(e.scrobbles) %}#{{ e.rank }}{% endif %} | - {% if false %} - {% if e not in prevtracks %}🆕 | {% endif %} - + {% if compare %} + {% if e.last_rank is undefined %}🆕 | + {% elif e.last_rank < e.rank %}↘ | + {% elif e.last_rank > e.rank %}↗ | + {% elif e.last_rank == e.rank %}➡ | + {% endif %} {% endif %}