Таблица выхода заказов

asuzr/models.py

@@ -63,18 +63,30 @@ class Order(models.Model):
   delivery = models.BooleanField(default=False)				#доставка
   lifting = models.BooleanField(default=False)				#подъем
   paid = models.DecimalField(max_digits=12, decimal_places=2)		#оплачено
-  approved = models.DateTimeField(null=True, blank = True)				#согласовано
+  approved = models.DateTimeField(null=True, blank = True)		#согласовано
   executor = models.ForeignKey(User, related_name='+')			#id исполнителя
   is_done = models.BooleanField(default=False)				#сдан
-  calls = models.TextField(null=True, blank = True)					#обзвон
-  contact = models.CharField(max_length=150, null=True, blank = True)				#контактное лицо
-  phone_num = models.CharField(max_length=150,null=True, blank = True)				#контактный телефон
+  calls = models.TextField(null=True, blank = True)			#обзвон
+  contact = models.CharField(max_length=150, null=True, blank = True)	#контактное лицо
+  phone_num = models.CharField(max_length=150,null=True, blank = True)	#контактный телефон
   cancelled = models.BooleanField(default=False)			#отменен
   
+  @property
+  def date_dmy(self):
+    return self.date.strftime("%d/%m/%Y")
+  
   @property
   def deadline_dmy(self):
     return self.deadline.strftime("%d/%m/%Y")
   
+  @property
+  def approved_date(self):
+    return self.approved.strftime("%d/%m/%Y")
+  
+  @property
+  def ostatok(self):
+    return self.price-self.paid
+  
 #Эскизы
 class Sketch(models.Model):
   sketch_file = models.FileField(upload_to = 'sketches')	#путь к файу

asuzr/views.py

@@ -20,39 +20,6 @@ def prod_detail(request, prod_id):
   return HttpResponse("This is %s" % prod_id)
 
 
-def attend_table(request, year, month):
-  attend_list = Attendance.objects.all().order_by('date')
-  filtered_list=[]
-  for a in attend_list:
-    a_date = a.date
-    if a_date.strftime('%m/%Y') == month+'/'+year:
-      filtered_list.append(a)
-      
-  sum_calls = sum(l.calls for l in filtered_list)
-  sum_visits = sum(l.visits for l in filtered_list)
-  sum_orders = sum(l.order_count for l in filtered_list)
-  sum_price = sum(l.orders_price for l in filtered_list)
-  t = loader.get_template('asuzr/attendance.html')
-  c = Context({
-    'attend_list': filtered_list,
-    'sum_calls': sum_calls,
-    'sum_visits': sum_visits,
-    'sum_orders': sum_orders,
-    'sum_price': sum_price,
-    })
-  return HttpResponse(t.render(c))
-
-def orders_table(request, year, month, day):
-  p_date = datetime.strptime(day+'/'+month+'/'+year, '%d/%m/%Y')
-  order_list = Order.objects.filter(date=p_date).order_by('id')
-  sum_price = sum(l.price for l in order_list)
-  t = loader.get_template('asuzr/orders.html')
-  c = Context({
-    'order_list': order_list,
-    'sum_price': sum_price,
-    })
-  return HttpResponse(t.render(c))
-
 def get_filtered_list(p_list, year, month):
   filtered_list=[]
   for a in p_list:
@@ -66,35 +33,6 @@ def get_orders_by_date(dt):
   order_list = Order.objects.filter(date=dt).order_by('id')
   return order_list
 
-def attend_order_table(request, year, month):
-  attend_list = Attendance.objects.all().order_by('date')
-  filtered_attend_list=get_filtered_list(attend_list, year, month)
-  
-  order_list = Order.objects.all().order_by('id')
-  filtered_order_list  = get_filtered_list(order_list, year, month)
-  
-  plan = OrderPlan.objects.all()
-  filtered_plan = get_filtered_list(plan, year, month)
-  
-  sum_calls = sum(l.calls for l in filtered_attend_list)
-  sum_visits = sum(l.visits for l in filtered_attend_list)
-  sum_orders = sum(l.order_count for l in filtered_attend_list)
-  sum_price = sum(l.orders_price for l in filtered_attend_list)
-  
-  sum_order_price = sum(l.price for l in filtered_order_list)
-   
-  t = loader.get_template('asuzr/attend_order.html')
-  c = Context({
-    'attend_list': filtered_attend_list,
-    'order_list': filtered_order_list,
-    'sum_calls': sum_calls,
-    'sum_visits': sum_visits,
-    'sum_orders': sum_orders,
-    'sum_price': sum_price,
-    'sum_order_price': sum_order_price,
-    'plan': filtered_plan[0],  
-    })
-  return HttpResponse(t.render(c))
 
 def main(request, day, month, year):
   attend_list = Attendance.objects.all().order_by('date')
@@ -130,6 +68,13 @@ def main(request, day, month, year):
     'd_date': d_date,
     })
   return HttpResponse(t.render(c))
-  
+
+def orders (request):
+  order_list = Order.objects.filter(is_done=False).order_by('-id')
+  t=loader.get_template('asuzr/orders.html')
+  c=Context({
+    'order_list': order_list,
+    })
+  return HttpResponse(t.render(c))