From ed6301e2a1cc3a95df1b2b979cfbd275261c2e72 Mon Sep 17 00:00:00 2001
From: "Denis V. Dedkov" <denis.v.dedkov@gmail.com>
Date: Wed, 17 Jun 2015 00:14:53 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BF=D1=80=D0=B0=D0=B2=D0=BE=D1=87?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=86=D1=8B=20=D0=BF=D0=BE=D1=81=D0=B5=D1=89?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Добавил блок справочной информации для таблицы посещений
---
 asuzr/views.py              | 19 +++++++++++++++----
 templates/asuzr/table2.html | 24 ++++++++++++++++++++++++
 templates/asuzr/table3.html | 10 ----------
 3 files changed, 39 insertions(+), 14 deletions(-)
 create mode 100644 templates/asuzr/table2.html
 delete mode 100644 templates/asuzr/table3.html

diff --git a/asuzr/views.py b/asuzr/views.py
index d381f39..a3bb3d4 100644
--- a/asuzr/views.py
+++ b/asuzr/views.py
@@ -71,6 +71,17 @@ def get_attendance_table(year, month, prefix):
     else:
       month_days[day]['designer'] = designer
 
+  month_plan = OrderPlan.objects.filter(date = sdate).first()
+  month_plan = 0 if month_plan == None else month_plan.plan
+  month_balance = month_plan - order_sum['price__sum']
+
+  additional_info = {'title': 'Справочно', 
+                     'rows': [
+                              {'title': 'ПЛАН', 'value': month_plan},
+                              {'title': 'Осталось до выполнения', 'value': month_balance},
+                             ]
+                    }
+
   table = VisitTable(month_days.values(), prefix = prefix)
   table.verbose_name = 'Сводная информация'
   table.set_summaries({
@@ -80,7 +91,7 @@ def get_attendance_table(year, month, prefix):
                         'cost': order_sum['price__sum'],
                       })
  
-  return table
+  return table, additional_info
 
 def get_day_orders_table(date, prefix):
   orders = Order.objects.filter(date = date)
@@ -94,17 +105,17 @@ def get_day_orders_table(date, prefix):
 @login_required
 def visit_view(request):
   curr_date = datetime.strptime(request.GET.get('date', date.today().strftime('%d.%m.%Y')), '%d.%m.%Y')
-  attendance_table = get_attendance_table(curr_date.year, curr_date.month, 'attendance-')
+  attendance_table, add_info = get_attendance_table(curr_date.year, curr_date.month, 'attendance-')
   RequestConfig(request, paginate={'per_page': 32}).configure(attendance_table)
 
   orders_table = get_day_orders_table(curr_date, 'orders-')
   RequestConfig(request).configure(orders_table)
 
   title = 'Таблица посещаемости на %s' % curr_date.strftime('%B %Y г')
-  return render(request, 'asuzr/table3.html', {
+  return render(request, 'asuzr/table2.html', {
                                                'table1': attendance_table, 
                                                'table2': orders_table,
-                                               'table3': attendance_table,
+                                               'additional_info': add_info,
                                                'title': title})
 
 @login_required 
diff --git a/templates/asuzr/table2.html b/templates/asuzr/table2.html
new file mode 100644
index 0000000..d42a7f0
--- /dev/null
+++ b/templates/asuzr/table2.html
@@ -0,0 +1,24 @@
+{% extends "asuzr/base.html" %}
+{% load inplace_edit %}
+{% load render_table from django_tables2 %}
+
+{% block page %}
+  <div class="inline"><div><h3>{{ table1.verbose_name }}</h3></div>{% render_table table1 %}</div>
+  <div class="inline"><div><h3>{{ table2.verbose_name }}</h3></div>{% render_table table2 %}</div>
+  {% if additional_info %}
+   <div>
+    <hr>
+     <div>
+      <h3>{{ additional_info.title }}</h3>
+     </div>
+     <div class="table-container">
+      <table class="paleblue">
+       {% for row in additional_info.rows %}
+        <tr><td>{{ row.title }}</td><td>{{ row.value }}</td></tr>
+       {% endfor %}
+      </table>
+     </div>
+   </div>
+  {% endif %}
+{% endblock %}
+
diff --git a/templates/asuzr/table3.html b/templates/asuzr/table3.html
deleted file mode 100644
index afac64e..0000000
--- a/templates/asuzr/table3.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "asuzr/base.html" %}
-{% load inplace_edit %}
-{% load render_table from django_tables2 %}
-
-{% block page %}
-  <div class="inline"><div><h3>{{ table1.verbose_name }}</h3></div>{% render_table table1 %}</div>
-  <div class="inline"><div><h3>{{ table2.verbose_name }}</h3></div>{% render_table table2 %}</div>
-  <div><hr><div><h3>{{ table3.verbose_name }}</h3></div>{% render_table table3 %}</div>
-{% endblock %}
-