From 11305d6b51d214223b46bde4eca2a2fab057e90c Mon Sep 17 00:00:00 2001
From: "Denis V. Dedkov" <denis.v.dedkov@gmail.com>
Date: Thu, 18 Jun 2015 14:52:30 +0500
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D1=8D=D1=81=D0=BA=D0=B8=D0=B7=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Реализована загрузка эскизов
---
 asuzr/views.py             | 24 +++++++++++++++---------
 record/settings.py         |  4 +++-
 templates/asuzr/table.html |  6 +++++-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/asuzr/views.py b/asuzr/views.py
index 1902bfa..eb7673c 100644
--- a/asuzr/views.py
+++ b/asuzr/views.py
@@ -1,20 +1,15 @@
 # -*- coding: utf-8 -*-
 
-from django.shortcuts import render
+from django.shortcuts import render, redirect
 from django.http import HttpResponse
 from django.template import RequestContext, Context, loader
-from asuzr.models import Product
-from asuzr.models import Attendance
-from asuzr.models import Order
-from asuzr.models import OrderPlan
-from asuzr.models import Schedule
-from asuzr.models import ProdPlan
+from asuzr.models import *
 from datetime import datetime, date, timedelta
 import calendar
 from django.db.models import Count, Sum
 from asuzr.common import custom_date
 from django.contrib.auth.decorators import login_required
-from tables import *
+from asuzr.tables import *
 from django_tables2 import RequestConfig
 
 @login_required 
@@ -193,9 +188,19 @@ def main(request, day, month, year):
 @login_required
 def sketches(request, order_id):
   curr_order = Order.objects.get(pk = order_id)
+  if request.method == 'POST':
+    if 'sketch_file' in request.FILES:
+      for f in request.FILES.getlist('sketch_file'):
+        instance = Sketch(sketch_file = f, order = curr_order)
+        instance.save()
+        return redirect(sketches, order_id = order_id)
+
   table = SketchesTable(Sketch.objects.filter(order = curr_order))
   RequestConfig(request).configure(table)
-  return render(request, 'asuzr/table.html', {'table': table, 'title': 'Эскизы заказа %s' % curr_order})
+  return render(request, 'asuzr/sketches.html', { 
+                                                 'order_id': order_id, 
+                                                 'table': table, 
+                                                 'title': 'Эскизы заказа %s' % curr_order})
 
 @login_required 
 def orders(request, archive):
@@ -250,3 +255,4 @@ def prod_plan_view(request):
   title = u'Производственный план на %s - %s' % (sdate.strftime('%d.%m.%Y'), edate.strftime('%d.%m.%Y'))
   RequestConfig(request).configure(table)
   return render(request, 'asuzr/table.html', {'table': table, 'title': title})
+
diff --git a/record/settings.py b/record/settings.py
index 110b536..f881ad9 100644
--- a/record/settings.py
+++ b/record/settings.py
@@ -87,7 +87,9 @@ STATIC_URL = '/static/'
 
 TEMPLATE_DIRS = ('templates/')
 
-TEMPLATE_CONTEXT_PROCESSORS += ('django.core.context_processors.request',)
+TEMPLATE_CONTEXT_PROCESSORS += ('django.core.context_processors.request',
+                                'django.core.context_processors.csrf',
+                               )
 
 MEDIA_ROOT = 'media/'
 
diff --git a/templates/asuzr/table.html b/templates/asuzr/table.html
index 03283a7..da835f0 100644
--- a/templates/asuzr/table.html
+++ b/templates/asuzr/table.html
@@ -3,6 +3,10 @@
 {% load render_table from django_tables2 %}
 
 {% block page %}
-  {% render_table table %}
+  {% block table %}
+    {% render_table table %}
+  {% endblock %}
+  {% block additional %}
+  {% endblock %}
 {% endblock %}