Cronjob Bill Protokoll erweitert

This commit is contained in:
holger.trampe 2021-01-19 19:56:02 +01:00
parent d55067678d
commit 4df3a767ed
3 changed files with 8 additions and 1 deletions

View File

@ -76,6 +76,7 @@ Beginn der Zeiterfassung: {{usertimedata.startdate|date:"d.m.Y"}}
<th scope="col"></th> <th scope="col"></th>
<th scope="col">Start</th> <th scope="col">Start</th>
<th scope="col">Ende</th> <th scope="col">Ende</th>
<th scope="col">Ziel</th>
</tr> </tr>
</thead> </thead>
<tbody > <tbody >
@ -84,6 +85,7 @@ Beginn der Zeiterfassung: {{usertimedata.startdate|date:"d.m.Y"}}
<td>{{forloop.counter}}</td> <td>{{forloop.counter}}</td>
<td>{{wd.start|date:"d.m.Y H:i"}}</td> <td>{{wd.start|date:"d.m.Y H:i"}}</td>
<td>{{wd.end|date:"d.m.Y H:i"}}</td> <td>{{wd.end|date:"d.m.Y H:i"}}</td>
<td>{{wd.target}}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
@ -124,6 +126,7 @@ Beginn der Zeiterfassung: {{usertimedata.startdate|date:"d.m.Y"}}
<thead> <thead>
<tr> <tr>
<th scope="col"></th> <th scope="col"></th>
<th scope="col">Art</th>
<th scope="col">Start</th> <th scope="col">Start</th>
<th scope="col">Ende</th> <th scope="col">Ende</th>
<th scope="col">Halbstart</th> <th scope="col">Halbstart</th>
@ -140,6 +143,7 @@ Beginn der Zeiterfassung: {{usertimedata.startdate|date:"d.m.Y"}}
{% for ab in absences %} {% for ab in absences %}
<tr> <tr>
<td>{{forloop.counter}}</td> <td>{{forloop.counter}}</td>
<td>{{ab.reason.name}}</td>
<td>{{ab.start|date:"d.m.Y"}}</td> <td>{{ab.start|date:"d.m.Y"}}</td>
<td>{{ab.end|date:"d.m.Y"}}</td> <td>{{ab.end|date:"d.m.Y"}}</td>
<td>{{ab.start_ishalf}}</td> <td>{{ab.start_ishalf}}</td>

BIN
dump.rdb

Binary file not shown.

View File

@ -1727,7 +1727,7 @@ from dateutil.relativedelta import *
def cronactionsbill(request, code): def cronactionsbill(request, code):
data = {} data = {}
today = date.today() today = date.today()
mailstatus = "BEGIN CRONJOB BILL" + str(today) mailstatus = "BEGIN CRONJOB BILL " + str(today) + " - "
if(code == settings.CRONAPIKEY): if(code == settings.CRONAPIKEY):
# Check, ob Rechnungen bezahlt wurden # Check, ob Rechnungen bezahlt wurden
@ -1748,9 +1748,12 @@ def cronactionsbill(request, code):
if(json.loads(r.text)["voucherStatus"] == "paid"): if(json.loads(r.text)["voucherStatus"] == "paid"):
bill.billstatus="paid" bill.billstatus="paid"
bill.save() bill.save()
mailstatus += "VOUCHERSTATUS BILL CHANGED TO PAID: " + str(bill.pk)
else: else:
bill.billstatus="open" bill.billstatus="open"
bill.save() bill.save()
except: except:
mailstatus += "VOUCHERSTATUS ERROR ON BILL " + str(bill.pk) mailstatus += "VOUCHERSTATUS ERROR ON BILL " + str(bill.pk)