Добавлено редактирование полей модели.

Для корректного использования необходимо установить пакет django-inplaceedit:

sudo pip install django-inplaceedit

После установки пакета его необходимо доавить в INSTALLED_APPS в settings.py:

INSTALLED_APPS = (
    'django.contrib.admin',
    'django.contrib.auth',
    'django.contrib.contenttypes',
    'django.contrib.sessions',
    'django.contrib.messages',
    'django.contrib.staticfiles',
    'inplaceeditform',
    'asuzr',
)
This commit is contained in:
2015-05-31 17:28:52 +05:00
parent ad76fd423b
commit 382ec6fa21
5 changed files with 13 additions and 7 deletions

View File

@@ -1,6 +1,6 @@
from django.shortcuts import render from django.shortcuts import render
from django.http import HttpResponse from django.http import HttpResponse
from django.template import Context, loader from django.template import RequestContext, Context, loader
from asuzr.models import Product from asuzr.models import Product
from asuzr.models import Attendance from asuzr.models import Attendance
from asuzr.models import Order from asuzr.models import Order
@@ -57,7 +57,7 @@ def main(request, day, month, year):
d_date = p_date.strftime("%d/%m/%Y") d_date = p_date.strftime("%d/%m/%Y")
t = loader.get_template('asuzr/attend_order.html') t = loader.get_template('asuzr/attend_order.html')
c = Context({ c = RequestContext(request,{
'attend_list': filtered_attend_list, 'attend_list': filtered_attend_list,
'order_list': order_list, 'order_list': order_list,
'sum_calls': sum_calls, 'sum_calls': sum_calls,
@@ -79,7 +79,7 @@ def orders (request, archive):
order_list = Order.objects.filter(is_done=is_done_value).order_by('-id') order_list = Order.objects.filter(is_done=is_done_value).order_by('-id')
t=loader.get_template('asuzr/orders.html') t=loader.get_template('asuzr/orders.html')
c=Context({ c=RequestContext(request, {
'order_list': order_list, 'order_list': order_list,
'archive': is_done_value, 'archive': is_done_value,
}) })

View File

@@ -13,4 +13,5 @@ urlpatterns = patterns('',
url(r'^orders/(?P<archive>\d+)/$', 'asuzr.views.orders'), url(r'^orders/(?P<archive>\d+)/$', 'asuzr.views.orders'),
url(r'^desreport/$', 'asuzr.views.desreport'), url(r'^desreport/$', 'asuzr.views.desreport'),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
url(r'^inplaceeditform/', include('inplaceeditform.urls')),
) )

View File

@@ -1,3 +1,4 @@
{% load inplace_edit %}
<TABLE BORDER WIDTH="100%"> <TABLE BORDER WIDTH="100%">
{% if attend_list %} {% if attend_list %}
<ul> <ul>
@@ -13,8 +14,8 @@
<TR bgcolor={{attend.day_color}}> <TR bgcolor={{attend.day_color}}>
<TD>{{ attend.date_dd_mm_yy}}</TD> <TD>{{ attend.date_dd_mm_yy}}</TD>
<TD>{{ attend.week_day}}</TD> <TD>{{ attend.week_day}}</TD>
<TD>{{ attend.calls }}</TD> <TD>{% inplace_edit "attend.calls" %}</TD>
<TD>{{ attend.visits }}</TD> <TD>{% inplace_edit "attend.visits" %}</TD>
<TD><a href="{% url 'asuzr-main' attend.date.day attend.date.month attend.date.year %}">{{ attend.order_count}}</a></TD> <TD><a href="{% url 'asuzr-main' attend.date.day attend.date.month attend.date.year %}">{{ attend.order_count}}</a></TD>
<TD>{{ attend.orders_price}}</TD> <TD>{{ attend.orders_price}}</TD>
</TR> </TR>

View File

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

View File

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