Fixed averages for weekdays.

This commit is contained in:
A. Svensson 2015-03-09 16:36:17 +01:00
parent b1b712ebee
commit cd3c9d0fd9
3 changed files with 7 additions and 1 deletions

View File

@ -1,6 +1,7 @@
from datetime import timedelta from datetime import timedelta
import calendar import calendar
from ast import literal_eval
from django.db import models from django.db import models
from django.utils import timezone from django.utils import timezone
@ -85,6 +86,10 @@ class Server(models.Model):
tmp = self.measure_weekdays() tmp = self.measure_weekdays()
self.averages_for_weekdays = ','.join([str(i) for day, i in tmp]) self.averages_for_weekdays = ','.join([str(i) for day, i in tmp])
def get_averages_for_weekdays(self):
tmp = literal_eval(self.averages_for_weekdays)
return zip(calendar.day_name, tmp)
class ServerHistory(models.Model): class ServerHistory(models.Model):
server = models.ForeignKey(Server) server = models.ForeignKey(Server)
created = models.DateTimeField(default=timezone.now) created = models.DateTimeField(default=timezone.now)

View File

@ -14,5 +14,6 @@ class ServerDetailView(generic.DetailView):
context = super(ServerDetailView, self).get_context_data(**kwargs) context = super(ServerDetailView, self).get_context_data(**kwargs)
server = context['server'] server = context['server']
context['weekly_history'] = server.get_stats_history(days=7) context['weekly_history'] = server.get_stats_history(days=7)
context['averages_for_weekdays'] = server.get_averages_for_weekdays()
return context return context

View File

@ -78,7 +78,7 @@
}); });
var data= [ var data= [
{% for day, players in weekday_averages %} {% for day, players in averages_for_weekdays %}
["{{day}}", {{players}}], ["{{day}}", {{players}}],
{% endfor %} {% endfor %}
]; ];