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

конфликты разрешены

Browse Source
This commit is contained in:
Anastasia
2015-05-31 18:35:54 +05:00
parent 89834caf1c ab866f2310
commit d789b53a8e
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
templates/asuzr/attendance.html
View File

@@ -1,3 +1,4 @@
{% load inplace_edit %}
<TABLE BORDER WIDTH="100%">
{% if attend_list %}
<ul>
@@ -14,8 +15,8 @@
<TR bgcolor={{attend.date.weekday_color}}>
<TD>{{ attend.date.date_dd_mm_yy}}</TD>
<TD>{{ attend.date.weekday_name}}</TD>
<TD>{{ attend.attend.calls }}</TD>
<TD>{{ attend.attend.visits }}</TD>
<TD>{% inplace_edit "attend.attend.calls" %}</TD>
<TD>{% inplace_edit "attend.attend.visits" %}</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>

3
templates/asuzr/base.html
View File

@@ -1,6 +1,9 @@
{% load inplace_edit %}
<html>
<head>
<title>Автоматическая система учета заказов студии мебели Рекорд</title>
<script src="{{ STATIC_URL }}admin/js/jquery.min.js" type="text/javascript"></script>
{% inplace_static %}
</head>
<body>
{% block menu %}

5
templates/asuzr/orders.html
View File

@@ -1,4 +1,5 @@
{% extends "asuzr/base.html" %}
{% load inplace_edit %}
{% block title %}{% if archive %} Архивная таблица заказов {% else %} Таблица выхода заказов {% endif %}{% endblock %}
@@ -27,10 +28,10 @@
<TR>
<TD>{{ order.date_dmy }}</TD>
<TD>{{ order.deadline_dmy }}</TD>
<TD>{{ order.product.name }}</TD>
<TD>{% inplace_edit "order.product.name" %}</TD>
<TD>{%if order.delivery%} Да {% else %} Нет {% endif %} </TD>
<TD>{%if order.lifting%} Да {% else %} Нет {% endif %}</TD>
<TD>{{ order.address }}</TD>
<TD>{% inplace_edit "order.address" %}</TD>
<TD>{{ order.price }}</TD>
<TD>{{ order.paid }}</TD>
<TD>{{ order.ostatok }}</TD>