From cd3c9d0fd9b99007c8fc32a3a295671a193cc8ad Mon Sep 17 00:00:00 2001 From: "A. Svensson" Date: Mon, 9 Mar 2015 16:36:17 +0100 Subject: [PATCH] Fixed averages for weekdays. --- src/gameservers/models.py | 5 +++++ src/gameservers/views.py | 1 + src/templates/gameservers/server_detail.html | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/gameservers/models.py b/src/gameservers/models.py index 0bec41e..c2600e1 100644 --- a/src/gameservers/models.py +++ b/src/gameservers/models.py @@ -1,6 +1,7 @@ from datetime import timedelta import calendar +from ast import literal_eval from django.db import models from django.utils import timezone @@ -85,6 +86,10 @@ class Server(models.Model): tmp = self.measure_weekdays() 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): server = models.ForeignKey(Server) created = models.DateTimeField(default=timezone.now) diff --git a/src/gameservers/views.py b/src/gameservers/views.py index ca20963..50a31d6 100644 --- a/src/gameservers/views.py +++ b/src/gameservers/views.py @@ -14,5 +14,6 @@ class ServerDetailView(generic.DetailView): context = super(ServerDetailView, self).get_context_data(**kwargs) server = context['server'] context['weekly_history'] = server.get_stats_history(days=7) + context['averages_for_weekdays'] = server.get_averages_for_weekdays() return context diff --git a/src/templates/gameservers/server_detail.html b/src/templates/gameservers/server_detail.html index 882bc6f..21c7b14 100644 --- a/src/templates/gameservers/server_detail.html +++ b/src/templates/gameservers/server_detail.html @@ -78,7 +78,7 @@ }); var data= [ - {% for day, players in weekday_averages %} + {% for day, players in averages_for_weekdays %} ["{{day}}", {{players}}], {% endfor %} ];