Добавлена Производственная таблица

asuzr/admin.py

@@ -8,6 +8,9 @@ from asuzr.models import AccessProtocol
 from asuzr.models import OrderPlan
 from asuzr.models import Attendance
 from asuzr.models import Schedule
+from asuzr.models import OrderCosts
+from asuzr.models import CostItem
+
 
 # Register your models here.
 #admin.site.register(Product)
@@ -21,6 +24,8 @@ admin.site.register(ProdPlan)
 admin.site.register(AccessProtocol)
 admin.site.register(OrderPlan)
 admin.site.register(Schedule)
+admin.site.register(OrderCosts)
+admin.site.register(CostItem)
 class AttendAdmin(admin.ModelAdmin):
   list_display=('date', 'calls', 'visits')
 admin.site.register(Attendance, AttendAdmin)

asuzr/models.py

@@ -49,6 +49,9 @@ class Attendance(models.Model):
 class CostItem(models.Model):
   name = models.CharField(max_length=150)
   default_item = models.BooleanField(default=False)
+  
+  def __unicode__(self):
+   return self.name
 
 #Заказы  
 class Order(models.Model):
@@ -132,7 +135,10 @@ class OrderPlan(models.Model):
 
 # Затраты по заказам
 class OrderCosts(models.Model):
-  order = models.ForeignKey(Order)
-  cost_item = models.ForeignKey(CostItem)
-  value = models.DecimalField(max_digits=12, decimal_places=2)
-  formula = models.CharField(max_length=150)
+  order = models.ForeignKey(Order, related_name='+')
+  cost_item = models.ForeignKey(CostItem, related_name='+')
+  value = models.DecimalField(max_digits=12, decimal_places=2, null=True, blank = True)
+  formula = models.CharField(max_length=150, null=True, blank = True)
+  
+  def __unicode__(self):
+   return ', '.join((self.order.product.name, self.cost_item.name))

asuzr/views.py

@@ -10,6 +10,7 @@ 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
 
 def prod_list(request):
   product_list = Product.objects.all()
@@ -99,18 +100,23 @@ def main(request, day, month, year):
     })
   return HttpResponse(t.render(c))
 
+@login_required 
 def orders (request, archive):
   if archive=='0':
-    is_done_value=False
+      is_done_value=False
   else:
-    is_done_value=True
-  
+      is_done_value=True
+  order_id=request.GET.get('order_id',0)
   order_list = Order.objects.filter(is_done=is_done_value).order_by('-id')
+  sel_order = Order.objects.filter(id=order_id)
+  cost_items = sel_order.values('cost_items')
   t=loader.get_template('asuzr/orders.html')
   c=RequestContext(request, {
-    'order_list': order_list,
-    'archive': is_done_value,
-    })
+      'order_list': order_list,
+      'archive': is_done_value,
+      'sel_order' : sel_order,
+      'cost_items' : cost_items,
+      })
   return HttpResponse(t.render(c))
 
 def desreport(request):
@@ -120,13 +126,24 @@ def desreport(request):
   edate = datetime.strptime(end_date, '%d.%m.%y')
   des_list = Order.objects.filter(cancelled=False, date__range=(sdate,edate)).values('designer__first_name','designer__last_name').annotate(Sum('price'),Count('designer'))
   t=loader.get_template('asuzr/desreport.html')
-  c=Context({
+  c=RequestContext(request,{
     'des_list' : des_list,
     'start_date' : start_date,
     'end_date' : end_date,
     })
   return HttpResponse(t.render(c))
 
+def production_table(request, order_id):
+  order_list = Order.objects.filter(is_done=False).order_by('-id')
+  sel_order = Order.objects.filter(id=order_id)
+  cost_items = sel_order.values('cost_items')
+  t=loader.get_template('asuzr/order_costs.html')
+  c=RequestContext(request,{
+    'order_list' : order_list,
+    'sel_order' : sel_order,
+    'cost_items' : cost_items,
+    })
+  return HttpResponse(t.render(c))