From f5be3a8c3c799f8a8919c9fdaac16d2d5eb2cb4b Mon Sep 17 00:00:00 2001 From: Setyo Nugroho Date: Tue, 20 Sep 2022 06:07:23 +0700 Subject: [PATCH] - add currency on overview API --- api/views.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/api/views.py b/api/views.py index 02a7e77..b5d3cc1 100644 --- a/api/views.py +++ b/api/views.py @@ -252,11 +252,11 @@ class AdminOverviewViewSet(viewsets.ViewSet): 'data': [], } for k, v in INVOICE_COMPONENT_MODEL.items(): - sum_of_price = sum([q.price_charged.amount for q in + sum_of_price = sum([q.price_charged for q in v.objects.filter(invoice__state=Invoice.InvoiceState.IN_PROGRESS).all()]) - data['label'].append(k) - data['data'].append(sum_of_price) + data['label'].append(k + ' (' + str(sum_of_price.currency) + ')') + data['data'].append(sum_of_price.amount) return Response(data) @@ -267,11 +267,11 @@ class AdminOverviewViewSet(viewsets.ViewSet): 'data': [], } for k, v in INVOICE_COMPONENT_MODEL.items(): - sum_of_price = sum([q.price_charged.amount for q in + sum_of_price = sum([q.price_charged for q in v.objects.filter(invoice__state=Invoice.InvoiceState.IN_PROGRESS, end_date=None).all()]) - data['label'].append(k) - data['data'].append(sum_of_price) + data['label'].append(k + ' (' + str(sum_of_price.currency) + ')') + data['data'].append(sum_of_price.amount) return Response(data) @@ -341,12 +341,12 @@ class ProjectOverviewViewSet(viewsets.ViewSet): 'data': [], } for k, v in INVOICE_COMPONENT_MODEL.items(): - sum_of_price = sum([q.price_charged.amount for q in + sum_of_price = sum([q.price_charged for q in v.objects.filter(invoice__project=project, invoice__state=Invoice.InvoiceState.IN_PROGRESS).all()]) - data['label'].append(k) - data['data'].append(sum_of_price) + data['label'].append(k + ' (' + str(sum_of_price.currency) + ')') + data['data'].append(sum_of_price.amount) return Response(data) @@ -359,12 +359,12 @@ class ProjectOverviewViewSet(viewsets.ViewSet): 'data': [], } for k, v in INVOICE_COMPONENT_MODEL.items(): - sum_of_price = sum([q.price_charged.amount for q in + sum_of_price = sum([q.price_charged for q in v.objects.filter(invoice__project=project, invoice__state=Invoice.InvoiceState.IN_PROGRESS, end_date=None).all()]) - data['label'].append(k) - data['data'].append(sum_of_price) + data['label'].append(k + ' (' + str(sum_of_price.currency) + ')') + data['data'].append(sum_of_price.amount) return Response(data)