mirror/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00
Code Issues Projects Releases Wiki Activity

Fixed bug for trend indicators with unlimited time ranges

Browse Source
This commit is contained in:
Krateng 2020-08-23 01:38:56 +02:00
parent fa05c40660
commit 47087b4288
3 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maloja/__pkginfo__.py
View File

@ -5,7 +5,7 @@ author = {
"email":"maloja@krateng.dev", "email":"maloja@krateng.dev",
"github": "krateng" "github": "krateng"
} }
version = 2,7,5 version = 2,7,6
versionstr = ".".join(str(n) for n in version) versionstr = ".".join(str(n) for n in version)
links = { links = {
"pypi":"malojaserver", "pypi":"malojaserver",

23
maloja/web/jinja/partials/charts_artists.jinja
View File

@ -7,19 +7,22 @@
{% if compare %} {% if compare %}
{% if compare is true %} {% if compare is true %}
{% set compare = limitkeys.timerange.next(step=-1) %} {% set compare = limitkeys.timerange.next(step=-1) %}
{% if compare is none %}{% set compare = False %}{% endif %}
{% endif %} {% endif %}
{% set prevartists = dbp.get_charts_artists(filterkeys,{'timerange':compare}) %} {% if compare %}
{% set prevartists = dbp.get_charts_artists(filterkeys,{'timerange':compare}) %}
{% set lastranks = {} %} {% set lastranks = {} %}
{% for a in prevartists %} {% for a in prevartists %}
{% if lastranks.update({a.artist:a.rank}) %}{% endif %} {% if lastranks.update({a.artist:a.rank}) %}{% endif %}
{% endfor %} {% endfor %}
{% for a in charts %} {% for a in charts %}
{% if a.artist in lastranks %} {% if a.artist in lastranks %}
{% if a.update({'last_rank':lastranks[a.artist]}) %}{% endif %} {% if a.update({'last_rank':lastranks[a.artist]}) %}{% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %}
{% endif %} {% endif %}
{% set firstindex = amountkeys.page * amountkeys.perpage %} {% set firstindex = amountkeys.page * amountkeys.perpage %}

23
maloja/web/jinja/partials/charts_tracks.jinja
View File

@ -6,19 +6,22 @@
{% if compare %} {% if compare %}
{% if compare is true %} {% if compare is true %}
{% set compare = limitkeys.timerange.next(step=-1) %} {% set compare = limitkeys.timerange.next(step=-1) %}
{% if compare is none %}{% set compare = False %}{% endif %}
{% endif %} {% endif %}
{% set prevtracks = dbp.get_charts_tracks(filterkeys,{'timerange':compare}) %} {% if compare %}
{% set prevtracks = dbp.get_charts_tracks(filterkeys,{'timerange':compare}) %}
{% set lastranks = {} %} {% set lastranks = {} %}
{% for t in prevtracks %} {% for t in prevtracks %}
{% if lastranks.update({"|".join(t.track.artists)+"||"+t.track.title:t.rank}) %}{% endif %} {% if lastranks.update({"|".join(t.track.artists)+"||"+t.track.title:t.rank}) %}{% endif %}
{% endfor %} {% endfor %}
{% for t in charts %} {% for t in charts %}
{% if "|".join(t.track.artists)+"||"+t.track.title in lastranks %} {% if "|".join(t.track.artists)+"||"+t.track.title in lastranks %}
{% if t.update({'last_rank':lastranks["|".join(t.track.artists)+"||"+t.track.title]}) %}{% endif %} {% if t.update({'last_rank':lastranks["|".join(t.track.artists)+"||"+t.track.title]}) %}{% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %}
{% endif %} {% endif %}
{% set firstindex = amountkeys.page * amountkeys.perpage %} {% set firstindex = amountkeys.page * amountkeys.perpage %}