diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po
index ea0fd05..12832bc 100644
--- a/abonapp/locale/ru/LC_MESSAGES/django.po
+++ b/abonapp/locale/ru/LC_MESSAGES/django.po
@@ -857,3 +857,15 @@ msgstr "Графики"
msgid "Sub information"
msgstr "Информация абонента"
+
+msgid "Streets"
+msgstr "Улицы"
+
+msgid "Static info was Not found"
+msgstr "Статистика не найдена"
+
+msgid "Graphs by dates"
+msgstr "Графики по датам"
+
+msgid "Graph of use"
+msgstr "График использования"
diff --git a/abonapp/templates/abonapp/charts.html b/abonapp/templates/abonapp/charts.html
index a740699..99dcd37 100644
--- a/abonapp/templates/abonapp/charts.html
+++ b/abonapp/templates/abonapp/charts.html
@@ -3,10 +3,10 @@
{% block content %}
-
+
-
График использования
+ {% trans 'Graph of use' %}
{% if charts_data %}
@@ -16,7 +16,6 @@
new Chartist.Line('#chrt', {
series: [
{
- name: 'График траффика',
data: [
{{ charts_data }}
]
@@ -39,11 +38,23 @@
});
{% else %}
-
Траффик не найден
+ {% trans 'Static info was Not found' %}
{% endif %}
+
+
+
{% trans 'Graphs by dates' %}
+
+ {% for dat in dates %}
+
{{ dat|date:'j E' }}
+ {% empty %}
+ {% trans 'Static info was Not found' %}
+ {% endfor %}
+
+
+
{% endblock %}
diff --git a/abonapp/views.py b/abonapp/views.py
index ca493d4..43c3605 100644
--- a/abonapp/views.py
+++ b/abonapp/views.py
@@ -18,7 +18,7 @@ from . import forms
from . import models
import mydefs
from devapp.models import Device
-from datetime import datetime
+from datetime import datetime, date
from taskapp.models import Task
@@ -717,8 +717,14 @@ def charts(request, gid, uid):
from statistics.models import getModel
high = 100
+ wandate = request.GET.get('wantdate')
+ if wandate:
+ wandate = datetime.strptime(wandate, '%d%m%Y').date()
+ else:
+ wandate = date.today()
+
try:
- StatElem = getModel()
+ StatElem = getModel(wandate)
abon = models.Abon.objects.get(pk=uid)
if abon.group is None:
abon.group = models.AbonGroup.objects.get(pk=gid)
@@ -728,7 +734,11 @@ def charts(request, gid, uid):
if abon.ip_address is None:
charts_data = None
else:
- charts_data = StatElem.objects.chart(abon.ip_address)
+ charts_data = StatElem.objects.chart(
+ abon.ip_address,
+ count_of_parts=24,
+ want_date=wandate
+ )
abontariff = abon.active_tariff()
if abontariff is not None:
@@ -750,7 +760,8 @@ def charts(request, gid, uid):
'abon_group': abongroup,
'abon': abon,
'charts_data': ',\n'.join(charts_data) if charts_data is not None else None,
- 'high': high
+ 'high': high,
+ 'dates': StatElem.objects.get_dates()
})