From 4df3a767edfb82f882c151eaa67cf018d6bcb6ae Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Tue, 19 Jan 2021 19:56:02 +0100
Subject: [PATCH] Cronjob Bill Protokoll erweitert

---
 adm/templates/adm/adm_user_single.html |   4 ++++
 dump.rdb                               | Bin 28047 -> 23090 bytes
 users/views.py                         |   5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

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"}}
       <th scope="col"></th>
       <th scope="col">Start</th>
       <th scope="col">Ende</th>
+      <th scope="col">Ziel</th>
 	</tr>
 </thead>
 <tbody >
@@ -84,6 +85,7 @@ Beginn der Zeiterfassung: {{usertimedata.startdate|date:"d.m.Y"}}
 		<td>{{forloop.counter}}</td>
 		<td>{{wd.start|date:"d.m.Y H:i"}}</td>
 		<td>{{wd.end|date:"d.m.Y H:i"}}</td>
+		<td>{{wd.target}}</td>
 	</tr>
 	{% endfor %}
 </tbody>
@@ -124,6 +126,7 @@ Beginn der Zeiterfassung: {{usertimedata.startdate|date:"d.m.Y"}}
   <thead>
   	<tr>
       <th scope="col"></th>
+      <th scope="col">Art</th>
       <th scope="col">Start</th>
       <th scope="col">Ende</th>
       <th scope="col">Halbstart</th>
@@ -140,6 +143,7 @@ Beginn der Zeiterfassung: {{usertimedata.startdate|date:"d.m.Y"}}
 	{% for ab in absences %}
 	<tr>
 		<td>{{forloop.counter}}</td>
+		<td>{{ab.reason.name}}</td>
 		<td>{{ab.start|date:"d.m.Y"}}</td>
 		<td>{{ab.end|date:"d.m.Y"}}</td>
 		<td>{{ab.start_ishalf}}</td>
diff --git a/dump.rdb b/dump.rdb
index b36322010533349a0cca24b790cce6a6192f836f..95b37ee596bb55589d3b734a63bf77f1fd8b81a1 100644
GIT binary patch
delta 142
zcmV;90CE41+X1q)0gx~eekuoG`UrJ%Wn?XFWo^P>rjbDy1m0RCA(34fQUyRtb8uy2
zX=Z6-E;%_eHezLCFgas1V>B>jWjHc9F=aPnV>4tlVPs@tH6dYQGBsp5V>x6pG&VFc
wVK+HAWiVqmV_`UEIb=CDIXODXtDnk~j}|Ynq$B~ecoh#=2%MtLxn-@Ve1*C(SpWb4

delta 706
zcmW-feJs>*9LLA+``eDlozxKLtBw?QKhHuOb8!y$`-WmsiIbYA$WzP1(rj5b^o~s}
z)k^IwikjA9ZPu+nk`}ckYMyGd{z!|}Q0uq;dc9wtKVSO{KDKI|wrUd;KNt98YqH7;
zW4?c}v3Rs>qCM7`G~V!bYtM19)@U$i?KkjCWra$aA5vtLe=t7fRfQ58HCAPm3=V%=
z$4OfOT3bp?TE#Ww+6m~`MEMrFtg1x+W&>9{rn>A90Dn2<^5PO8${F8%xZ2K$HMtt^
zrE9@+1AfaHS5Op$WCi1*3YT$H!N_aAX8}JP1$a49k~K5di}tO7c(p~z?@Za#nvZ5@
z1J`8X@xhsK6Z3)ab75RdW-}Tk`mQ{Ik1Hclr_R*it*d}OS4!^g4><u(Hv#7Dlzi>f
zMf{gPlDI@P?8Rw!k;I$qU8EsEr=(n6zXOVtjFe|IEn~z(K$i#QN{3_^_F!D@r%cEx
zBhz;xMxmermMA5G{dMPIr4osI=p=(#8hVpH7|ct6zZd13(sF!`Bh_1t-QJYUJ_{em
z^<5$#RC48LCO-Qacx{rM{1EEZ1`=semBKSXK!!m17x8Da4`N%efon`KqcE6pi``c-
zEU|5N1o99@{??ClA~#fOA3{l7L;X3}gbDZ(N=f08V>SjPF@;gyJadH4KzEcHwNaF;
zZ1{deY_tIPXiAp#+DYt-5xGf+0<^_2?%ir079|?9oDi;IWc^LUZOmx|jA$s?QL%9m
z0dWGJ#!}wiX*@L@C5dY25~Z-^HB(R|Nk5^Z<bLVK5R6G8S+G>!gS}qLltjtP3uPwc
z>P4a~sY*mnvdG<<=I}6?@ubCd`~afU)v%;d(${lo0PX1_AGu)e(misvcFdGDf6t*E
IZu7nW0JSj(#sB~S

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)