From 1d8bd15c955d35529d18d1b54acdf3621973b056 Mon Sep 17 00:00:00 2001 From: bashmak Date: Tue, 23 May 2017 14:56:21 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=B3=D1=80?= =?UTF-8?q?=D0=B0=D1=84=D0=B8=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abonapp/locale/ru/LC_MESSAGES/django.po | 3 +++ statistics/models.py | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po index 0d37ee5..ea0fd05 100644 --- a/abonapp/locale/ru/LC_MESSAGES/django.po +++ b/abonapp/locale/ru/LC_MESSAGES/django.po @@ -854,3 +854,6 @@ msgstr "Ошибка в SNMP на устройстве" msgid "Charts" msgstr "Графики" + +msgid "Sub information" +msgstr "Информация абонента" diff --git a/statistics/models.py b/statistics/models.py index 50ec5df..468aba9 100644 --- a/statistics/models.py +++ b/statistics/models.py @@ -35,10 +35,10 @@ class StatManager(models.Manager): charts_data = self.filter(ip=ip_addr) charts_times = [cd.cur_time.timestamp()*1000 for cd in charts_data] - charts_octets = [byte_to_mbit(cd.octets) for cd in charts_data] + charts_octets = [cd.octets for cd in charts_data] if len(charts_octets) > 0 and len(charts_octets) == len(charts_times): charts_octets = split_list(charts_octets, count_of_parts) - charts_octets = [avarage(c) for c in charts_octets] + charts_octets = [byte_to_mbit(avarage(c)) for c in charts_octets] charts_times = split_list(charts_times, count_of_parts) charts_times = [avarage(t) for t in charts_times] @@ -46,6 +46,7 @@ class StatManager(models.Manager): charts_data = map(lambda x, y: (x, y), charts_times, charts_octets) charts_data = ["{x: new Date(%d), y: %.2f}" % (cd[0], cd[1]) for cd in charts_data] midnight = datetime.combine(date.today(), time.min) + charts_data.append("{x:new Date(%d),y:0}" % (int(charts_times[-1:][0]) + 1)) charts_data.append("{x:new Date(%d),y:0}" % (int((midnight + timedelta(days=1)).timestamp()) * 1000)) return charts_data else: