ded/record
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://192.168.100.6/repo/record

Browse Source 
Conflicts:
	asuzr/tables.py
	asuzr/views.py
	templates/asuzr/base.html
This commit is contained in:
Denis V. Dedkov
2015-06-17 00:45:47 +05:00
parent c677cbb3bf 49b67af7b7
commit f5f13f1e3b
8 changed files with 55 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/asuzr/attend_order.html
View File

@@ -4,8 +4,8 @@
{% block page %}
<table WIDTH="100%">
<TR VALIGN=top>
<TD WIDTH="50%">{% include 'asuzr/attendance.html' %}</TD>
<TD WIDTH="5%"></TD>
<TD WIDTH="51%">{% include 'asuzr/attendance.html' %}</TD>
<TD WIDTH="3%"></TD>
<TD WIDTH="45%">{% include 'asuzr/orders_detail.html' %}</TD>
</TR>
</table>

2
templates/asuzr/attendance.html
View File

@@ -17,7 +17,7 @@
<TD>{{ attend.date.weekday_name}}</TD>
<TD>{% if attend.attend %}{% inplace_edit "attend.attend.calls" %}{% endif %}</TD>
<TD>{% if attend.attend %}{% inplace_edit "attend.attend.visits" %}{% endif %}</TD>
<TD><a href="{% url 'asuzr-main' attend.date.day attend.date.month attend.date.year %}">{{ attend.orders_count}}</a></TD>
<TD><a href="{% url 'asuzr-main' %}{{attend.date.day}}/{{attend.date.month}}/{{attend.date.year}}">{{ attend.orders_count}}</a></TD>
<TD>{{ attend.orders_price}}</TD>
<TD>{{ attend.designers}}</TD>
</TR>

3
templates/asuzr/base.html
View File

@@ -3,7 +3,7 @@
<html>
<head>
<title>Автоматическая система учета заказов студии мебели Рекорд</title>
<title>Автоматизированная система учета заказов студии мебели Рекорд</title>
<script src="{{ STATIC_URL }}admin/js/jquery.min.js" type="text/javascript"></script>
{% inplace_static %}
<link rel="stylesheet" href="{{ STATIC_URL }}django_tables2/themes/paleblue/css/screen.css" />
@@ -44,6 +44,7 @@
<li><a href={% url 'asuzr.views.orders' 0 %}>Таблица выхода заказов</a></li>
<li><a href={% url 'asuzr.views.orders' 1 %}>Архивная таблица</a></li>
<li><a href={% url 'asuzr.views.desreport' %}>Отчет по дизайнерам</a></li>
<li><a href={% url 'asuzr.views.prod_plan_view' %}>Производственный план</a></li>
{% if request.user.is_staff %}<li><a href={% url 'admin:index' %}>Администрирование</a></li>{% endif %}
</ul>
<div id="user">