From 42e5ff919bb21b0a66ddfab5c53a0b13ce5d470e Mon Sep 17 00:00:00 2001 From: Dominik George <nik@naturalnet.de> Date: Thu, 2 May 2013 17:31:19 +0200 Subject: [PATCH] Added display of order count in menu_budget view. --- src/tomaculum/templates/views/manage/menu_budget.html | 2 ++ src/tomaculum/view.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/tomaculum/templates/views/manage/menu_budget.html b/src/tomaculum/templates/views/manage/menu_budget.html index 12568e2..e009a3f 100644 --- a/src/tomaculum/templates/views/manage/menu_budget.html +++ b/src/tomaculum/templates/views/manage/menu_budget.html @@ -16,6 +16,7 @@ <th>Referenz-Nr.</th> <th>Name</th> <th>Betrag</th> + <th>Anzahl</th> </tr> </thead> @@ -25,6 +26,7 @@ <td>{{ employee[0] }}</td> <td>{{ employee[1] }}</td> <td>{{ "{0:.2f} €".format(employee[2]) }}</td> + <td>{{ employee[3] }}</td> </tr> {% endfor %} </tbody> diff --git a/src/tomaculum/view.py b/src/tomaculum/view.py index df1a8cc..831297f 100644 --- a/src/tomaculum/view.py +++ b/src/tomaculum/view.py @@ -156,11 +156,13 @@ def manage_menu_budget(): for e in Customer.get(session["customer_id"]).employees.order_by(Employee.name).all(): price = 0.0 + count = 0 for o in e.orders.filter(Order.date >= date.strftime("%Y-%m-01")).filter(Order.date <= date.strftime("%Y-%m-31")).order_by(Order.date).all(): price += o.price + count += 1 - month_employees.append((e.reference, e.name, price)) + month_employees.append((e.reference, e.name, price, count)) return render_template("views/manage/menu_budget.html", forms = forms, date = date, month_employees = month_employees) -- GitLab