diff --git a/website/track.html b/website/track.html index 65bbfcf..5dba077 100644 --- a/website/track.html +++ b/website/track.html @@ -4,6 +4,7 @@ Maloja - KEY_TRACKTITLE + @@ -29,11 +30,31 @@

Pulse

- KEY_PULSE + 7 days + | 12 weeks + | 12 months + | 10 years + +

+ + KEY_PULSE_MONTHS + + +

Performance

- KEY_PERFORMANCE + 7 days + | 12 weeks + | 12 months + | 10 years + +

+ + KEY_PERFORMANCE_MONTHS + + + diff --git a/website/track.py b/website/track.py index aa602b3..25dafc5 100644 --- a/website/track.py +++ b/website/track.py @@ -1,5 +1,6 @@ import urllib import database +from malojatime import today,thisweek,thismonth,thisyear def instructions(keys): @@ -40,6 +41,17 @@ def instructions(keys): html_pulse = module_pulse(track=track,step="year",stepn=1,trail=1) html_performance = module_performance(track=track,step="year",stepn=1,trail=1) + # pulse and rankings + html_pulse_days = module_pulse(track=track,max_=7,since=today().next(-6),step="day",trail=1) + html_pulse_weeks = module_pulse(track=track,max_=12,since=thisweek().next(-11),step="week",trail=1) + html_pulse_months = module_pulse(track=track,max_=12,since=thismonth().next(-11),step="month",trail=1) + html_pulse_years = module_pulse(track=track,max_=10,since=thisyear().next(-9),step="year",trail=1) + + html_performance_days = module_performance(track=track,max_=7,since=today().next(-6),step="day",trail=1) + html_performance_weeks = module_performance(track=track,max_=12,since=thisweek().next(-11),step="week",trail=1) + html_performance_months = module_performance(track=track,max_=12,since=thismonth().next(-11),step="month",trail=1) + html_performance_years = module_performance(track=track,max_=10,since=thisyear().next(-9),step="year",trail=1) + replace = { "KEY_TRACKTITLE":track.get("title"), @@ -50,8 +62,16 @@ def instructions(keys): "KEY_SCROBBLELINK":compose_querystring(keys), "KEY_MEDALS":html_medals, "KEY_SCROBBLELIST":html_scrobbles, - "KEY_PULSE":html_pulse, - "KEY_PERFORMANCE":html_performance + # pulse + "KEY_PULSE_MONTHS":html_pulse_months, + "KEY_PULSE_YEARS":html_pulse_years, + "KEY_PULSE_DAYS":html_pulse_days, + "KEY_PULSE_WEEKS":html_pulse_weeks, + # performance + "KEY_PERFORMANCE_MONTHS":html_performance_months, + "KEY_PERFORMANCE_YEARS":html_performance_years, + "KEY_PERFORMANCE_DAYS":html_performance_days, + "KEY_PERFORMANCE_WEEKS":html_performance_weeks, } return (replace,pushresources)