From 3465a404ae9ed28c70086d814bcbb8e7cbe90da9 Mon Sep 17 00:00:00 2001
From: bashmak <nerosketch@gmail.com>
Date: Tue, 23 May 2017 17:27:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=20=D0=B4=D0=B0=D1=82=D1=8B=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=81=D0=BC=D0=BE=D1=82=D1=80=D0=B0=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 abonapp/locale/ru/LC_MESSAGES/django.po | 12 ++++++++++++
 abonapp/templates/abonapp/charts.html   | 19 +++++++++++++++----
 abonapp/views.py                        | 19 +++++++++++++++----
 3 files changed, 42 insertions(+), 8 deletions(-)

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 %}
 
     <div class="row">
-        <div class="col-sm-12">
+        <div class="col-sm-10">
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <h3 class="panel-title">График использования</h3>
+                    <h3 class="panel-title">{% trans 'Graph of use' %}</h3>
                 </div>
                 <div class="panel-body">
                     {% if charts_data %}
@@ -16,7 +16,6 @@
                                 new Chartist.Line('#chrt', {
                                     series: [
                                         {
-                                            name: 'График траффика',
                                             data: [
                                                 {{ charts_data }}
                                             ]
@@ -39,11 +38,23 @@
                             });
                         </script>
                     {% else %}
-                        <h2>Траффик не найден</h2>
+                        <h2>{% trans 'Static info was Not found' %}</h2>
                     {% endif %}
                 </div>
             </div>
         </div>
+        <div class="col-sm-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">{% trans 'Graphs by dates' %}</div>
+                <div class="list-group">
+                    {% for dat in dates %}
+                        <a href="{% url 'abonapp:charts' abon_group.pk abon.pk %}?wantdate={{ dat|date:'dmY' }}" class="list-group-item{% if dat == now %} active{% endif %}">{{ dat|date:'j E' }}</a>
+                    {% empty %}
+                        {% trans 'Static info was Not found' %}
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
     </div>
 
 {% 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()
     })