diff --git a/adm/templates/adm/adm_user_single.html b/adm/templates/adm/adm_user_single.html index db87cca..692dcb9 100644 --- a/adm/templates/adm/adm_user_single.html +++ b/adm/templates/adm/adm_user_single.html @@ -76,6 +76,7 @@ Beginn der Zeiterfassung: {{usertimedata.startdate|date:"d.m.Y"}} Start Ende + Ziel @@ -84,6 +85,7 @@ Beginn der Zeiterfassung: {{usertimedata.startdate|date:"d.m.Y"}} {{forloop.counter}} {{wd.start|date:"d.m.Y H:i"}} {{wd.end|date:"d.m.Y H:i"}} + {{wd.target}} {% endfor %} @@ -124,6 +126,7 @@ Beginn der Zeiterfassung: {{usertimedata.startdate|date:"d.m.Y"}} + Art Start Ende Halbstart @@ -140,6 +143,7 @@ Beginn der Zeiterfassung: {{usertimedata.startdate|date:"d.m.Y"}} {% for ab in absences %} {{forloop.counter}} + {{ab.reason.name}} {{ab.start|date:"d.m.Y"}} {{ab.end|date:"d.m.Y"}} {{ab.start_ishalf}} diff --git a/dump.rdb b/dump.rdb index b363220..95b37ee 100644 Binary files a/dump.rdb and b/dump.rdb differ diff --git a/users/views.py b/users/views.py index 92e1232..736e1f6 100644 --- a/users/views.py +++ b/users/views.py @@ -1727,7 +1727,7 @@ from dateutil.relativedelta import * def cronactionsbill(request, code): data = {} today = date.today() - mailstatus = "BEGIN CRONJOB BILL" + str(today) + mailstatus = "BEGIN CRONJOB BILL " + str(today) + " - " if(code == settings.CRONAPIKEY): # Check, ob Rechnungen bezahlt wurden @@ -1748,9 +1748,12 @@ def cronactionsbill(request, code): if(json.loads(r.text)["voucherStatus"] == "paid"): bill.billstatus="paid" bill.save() + mailstatus += "VOUCHERSTATUS BILL CHANGED TO PAID: " + str(bill.pk) else: bill.billstatus="open" bill.save() + + except: mailstatus += "VOUCHERSTATUS ERROR ON BILL " + str(bill.pk)