diff --git a/kfet/views.py b/kfet/views.py index c522bb85..7f06b80e 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -1823,23 +1823,17 @@ def order_create(request, pk): ) scale = WeekScale(last=True, n_steps=5, std_chunk=False) chunks = scale.chunkify_qs(sales_q, field='group__at') - sales = [] - for chunk in chunks: - sales.append( - {d['article']: d['nb'] for d in chunk} - ) + sales = [ + {d['article']: d['nb'] for d in chunk} + for chunk in chunks + ] initial = [] for article in articles: # Get sales for each 5 last weeks - v_s1 = sales[0].get(article.pk, 0) - v_s2 = sales[1].get(article.pk, 0) - v_s3 = sales[2].get(article.pk, 0) - v_s4 = sales[3].get(article.pk, 0) - v_s5 = sales[4].get(article.pk, 0) - v_all = [v_s1, v_s2, v_s3, v_s4, v_s5] + v_all = [chunk.get(article.pk, 0) for chunk in sales] # Take the 3 greatest (eg to avoid 2 weeks of vacations) v_3max = heapq.nlargest(3, v_all) # Get average and standard deviation @@ -1869,11 +1863,7 @@ def order_create(request, pk): 'category__name': article.category.name, 'stock': article.stock, 'box_capacity': article.box_capacity, - 'v_s1': v_s1, - 'v_s2': v_s2, - 'v_s3': v_s3, - 'v_s4': v_s4, - 'v_s5': v_s5, + 'v_all': v_all, 'v_moy': round(v_moy), 'v_et': round(v_et), 'v_prev': round(v_prev),