Browse Source

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

Для корректного использования необходимо установить пакет 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',
)
Denis V. Dedkov 10 years ago
parent
commit
382ec6fa21
5 changed files with 13 additions and 7 deletions
  1. 3 3
      asuzr/views.py
  2. 1 0
      record/urls.py
  3. 3 2
      templates/asuzr/attendance.html
  4. 3 0
      templates/asuzr/base.html
  5. 3 2
      templates/asuzr/orders.html

+ 3 - 3
asuzr/views.py

@@ -1,6 +1,6 @@
 from django.shortcuts import render
 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 Attendance
 from asuzr.models import Order
@@ -57,7 +57,7 @@ def main(request, day, month, year):
   d_date = p_date.strftime("%d/%m/%Y")
     
   t = loader.get_template('asuzr/attend_order.html')
-  c = Context({
+  c = RequestContext(request,{
     'attend_list': filtered_attend_list,
     'order_list': order_list,
     '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')
   t=loader.get_template('asuzr/orders.html')
-  c=Context({
+  c=RequestContext(request, {
     'order_list': order_list,
     'archive': is_done_value,
     })

+ 1 - 0
record/urls.py

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

+ 3 - 2
templates/asuzr/attendance.html

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

+ 3 - 0
templates/asuzr/base.html

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

+ 3 - 2
templates/asuzr/orders.html

@@ -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>