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 %} +

{{ table1.verbose_name }}

{% render_table table1 %}
+

{{ table2.verbose_name }}

{% render_table table2 %}
+ {% if additional_info %} +
+
+
+

{{ additional_info.title }}

+
+
+ + {% for row in additional_info.rows %} + + {% endfor %} +
{{ row.title }}{{ row.value }}
+
+
+ {% 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 %} -

{{ table1.verbose_name }}

{% render_table table1 %}
-

{{ table2.verbose_name }}

{% render_table table2 %}
-

{{ table3.verbose_name }}

{% render_table table3 %}
-{% endblock %} -