From 1fdd765f8d85c2e4c294276aa6fa4631e457f97a Mon Sep 17 00:00:00 2001 From: Ambulance Clerc Date: Mon, 2 May 2022 16:53:56 +0200 Subject: [PATCH] =?UTF-8?q?D=C3=A9bug=20Export?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- collabs/templates/pdf_template.html | 1 + collabs/views.py | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/collabs/templates/pdf_template.html b/collabs/templates/pdf_template.html index 9a6bd77..e146807 100644 --- a/collabs/templates/pdf_template.html +++ b/collabs/templates/pdf_template.html @@ -32,6 +32,7 @@ +

Liste des heures supplémentaire pour {{start}} -> {{end}}

diff --git a/collabs/views.py b/collabs/views.py index 30a8d34..b4c34e4 100644 --- a/collabs/views.py +++ b/collabs/views.py @@ -14,10 +14,17 @@ from datetime import datetime def ExportPdfView(request): - start = request.GET['dtDate__range__gte'] + if not "dtDate__range__gte" in request.GET.keys(): + start = datetime.today().replace(day=1,hour=0, minute=0) + else: + start = request.GET['dtDate__range__gte'] + if not "dtDate__range__lte" in request.GET.keys(): + end = datetime.now() + else: + end = request.GET['dtDate__range__lte'] template_name = "pdf_template.html" - records = Collabs_hour.objects.filter(dtDate__range=[start,request.GET['dtDate__range__lte']]) - return render_to_pdf(template_name,{"record": records}) + records = Collabs_hour.objects.filter(dtDate__range=[start,end]) + return render_to_pdf(template_name,{"record": records, "start":start, "end":end}) class ExportView(generic.ListView):
N°