From fd0976c79b9db71c3cb7018dd4b56975e6914d96 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Wed, 16 Dec 2020 19:22:05 +0100
Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20zur=C3=BCcksetzen=20und=20Ausga?=
 =?UTF-8?q?ngsarbeitstage=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dasettings/forms.py                           |   4 +-
 .../templates/dasettings/user_usprof.html     |  93 +++++++++++++++++-
 dasettings/views.py                           |  16 ++-
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 20193 -> 20244 bytes
 standards/templatetags/counter_tag.py         |   5 +-
 users/models.py                               |   1 +
 6 files changed, 110 insertions(+), 9 deletions(-)

diff --git a/dasettings/forms.py b/dasettings/forms.py
index 1cfe334..cde0882 100644
--- a/dasettings/forms.py
+++ b/dasettings/forms.py
@@ -334,9 +334,10 @@ class UserTimeForm(forms.ModelForm):
 		"wd_sa" : "Samstag",
 		"wd_so" : "Sonntag",
 		"usetime" : "Zeiterfassung"	,
+		"startcount" : "Bisheriges Gleitzeitkonto",
 		"usetime_start" : "Zeiterfassung ab"
 		}
-		fields = ["startdate", "usetime", "usetime_start", "wd_mo", "wd_tu", "wd_we", "wd_th", "wd_fr", "wd_sa", "wd_so", "loose_holidedate"]
+		fields = ["startcount", "startdate", "usetime", "usetime_start", "wd_mo", "wd_tu", "wd_we", "wd_th", "wd_fr", "wd_sa", "wd_so", "loose_holidedate"]
 		widgets = {
 			"startdate" : DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'}),
 			"usetime_start" : DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'})
@@ -346,6 +347,7 @@ class UserTimeForm(forms.ModelForm):
 		super().__init__(*args, **kwargs)
 		self.fields['startdate'].required = True
 		self.fields['usetime_start'].required = False
+		self.fields['startcount'].required = False
 		self.fields['usetime'].required = False
 		#self.fields['usetime'].widget.attrs['readonly'] = True
 		#self.fields['usetime_start'].widget.attrs['readonly'] = True
diff --git a/dasettings/templates/dasettings/user_usprof.html b/dasettings/templates/dasettings/user_usprof.html
index ca993b0..b0bf7cf 100644
--- a/dasettings/templates/dasettings/user_usprof.html
+++ b/dasettings/templates/dasettings/user_usprof.html
@@ -166,13 +166,25 @@
         <input type="hidden" name="form_type" value="contract">
         <h5>Zeiterfassung&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie fest, ob dieser Mitarbeit seine Arbeitszeit erfassen soll." class="far fa-question-circle"></i></small></h5>
         <div class="row">
-          <div class="col-3">
+          <div class="col-2">
             {{usertime_form.usetime|as_crispy_field}}
           </div>
-          <div class="col-5">
+          <div class="col-3">
             {{usertime_form.usetime_start|as_crispy_field}}
           </div>
-        </div>
+          <div class="col-3">
+            {{usertime_form.startcount|as_crispy_field}}
+          </div>         
+          {% if usertochangefull.usertime.usetime %} 
+          <div class="col-3">
+            Zurücksetzen
+            {% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Setzen Sie hier alle bisherigen Arbeitstage zurück." class="far fa-question-circle"></i></small>{% endif %}
+            <br />
+            <button type="button" onclick="javascript:$('#resetTimeManagementConfirm').modal('toggle');" class="btn btn-primary mt-2" >Zeiterfassung zurücksetzen</button>
+          </div>
+          {% endif %}
+        </div>        
+        
         <!--
         <script type="text/javascript">
           $(document).ready(function(){
@@ -301,6 +313,81 @@
     </div>
   </div>
 </div>
+
+<!-- RESET TIMEMANAGEMENT -->
+  <div class="modal fade " id="resetTimeManagementConfirm" data-backdrop="static" data-keyboard="false">
+  <div class="modal-dialog modal-xl">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Zeiterfassung zurücksetzen</h4>
+      </div>
+      <div class="modal-body" id="">
+        <h3>Achtung!</h3>
+        Hiermit löschen Sie unwiderruflich alle vergangenen Arbeitstage, welche über die Zeiterfassung erstellt wurden, bis zum Datum des Beginns der Zeiterfassung. Dieser Vorgang kann nicht rückgängig gemacht werden.<br />
+        <hr>
+        <div class="form-check">
+          <input class="form-check-input" type="checkbox" value="" id="confirmDel" onclick="javascript:toggleDoDelBtn()">
+          <label class="form-check-label" for="confirmDel">
+            Ja, alle Arbeitstage bis zum {{usertochangefull.usertime.usetime_start|date:"d.m.Y"}} von <b>{{user_fullname}}</b> löschen!
+          </label>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Abbrechen</button>
+        <button type="button" class="btn btn-primary" disabled="true" id="dodeltmdata" onclick="javascript:delTMData({{vieweduser}})">Bestätigen</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+ <div class="modal fade " id="resetTimeManagementMessage" data-backdrop="static" data-keyboard="false">
+  <div class="modal-dialog modal-xl">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Zeiterfassung zurücksetzen</h4>
+      </div>
+      <div class="modal-body" id="">
+        Die Zeiterfassung von <b>{{user_fullname}}</b> wurde zurückgesetzt.
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>        
+      </div>
+    </div>
+  </div>
+</div>
+
+<script type="text/javascript">
+  function toggleDoDelBtn(){
+    if($('#confirmDel').prop('checked')){
+      $('#dodeltmdata').attr('disabled', false);  
+    }
+    else{
+      $('#dodeltmdata').attr('disabled', true);
+    }
+    
+  }
+
+  function delTMData(userid){
+    $("#resetTimeManagementConfirm").modal("toggle");
+    $.ajax(
+    {
+        type: "GET",
+        url: "{% url 'dasettings-ajax' %}",
+        data:{
+          action : "del_tmdata",
+          userid: {{vieweduser}}
+        },
+        success: function( data )
+        {
+            $("#resetTimeManagementMessage").modal("toggle");
+        }
+     });
+  }
+</script>
+
+
+
+
 <script>
 /*
     DYNAMIC HOLIDAY CHANGES
diff --git a/dasettings/views.py b/dasettings/views.py
index 90cbaa1..2601387 100644
--- a/dasettings/views.py
+++ b/dasettings/views.py
@@ -22,7 +22,7 @@ import webcolors
 import datetime
 from datetime import date
 from standards.models import Standards
-from timemanagement.models import AbsenceReason, FreeDays
+from timemanagement.models import AbsenceReason, FreeDays, Workday
 from django.core.mail import send_mail
 from django.conf import settings
 import re, os, csv, requests
@@ -958,8 +958,15 @@ def SettingsAjaxRouter(request):
 			"user_years" : UserYearAbsenceInfo.objects.filter(user=User.objects.get(pk=request.GET["userid"])),
 		}
 		return render(request, 'dasettings/data_absence_yeardata.html', context)
+	# RESET TIMEMANAGEMENT
+	elif request.method == "GET" and request.GET['action'] == "del_tmdata" : 
 
-
+		
+		tempuser = User.objects.get(pk=request.GET['userid'])
+		if(request.user.has_perm('users.usermanager') and request.user.profile.agency == tempuser.profile.agency):
+			deluntildate = tempuser.usertime.usetime_start
+			delete_days = Workday.objects.filter(user=tempuser, start__lt=deluntildate).delete()			
+		return JsonResponse({"success" : success, "data" : data})
 	else:
 		success = False
 	return JsonResponse({"success" : success, "data" : data})
@@ -1063,6 +1070,7 @@ def UserProfileUpdate(request, pk, newuser=0):
 					'usertime_form' : UserTimeForm(instance=UserTime.objects.get(user=usertochange)),
 					'user_years' : UserYearAbsenceInfo.objects.filter(user=usertochange),
 					'newuser' : newuser,
+					'usertochangefull' : usertochange,
 					'vieweduser' : usertochange.pk,
 					'parentuser' : parentuser,
 					'mail' : usertochange.email,
@@ -1086,6 +1094,7 @@ def UserProfileUpdate(request, pk, newuser=0):
 						'usertime_form' : UserTimeForm(instance=UserTime.objects.get(user=usertochange)),
 						'user_years' : UserYearAbsenceInfo.objects.filter(user=usertochange),
 						'newuser' : newuser,
+						'usertochangefull' : usertochange,
 						'vieweduser' : usertochange.pk,
 						'parentuser' : parentuser,
 						'mail' : usertochange.email,
@@ -1114,6 +1123,7 @@ def UserProfileUpdate(request, pk, newuser=0):
 							'newuser' : newuser,
 							'vieweduser' : usertochange.pk,
 							'parentuser' : parentuser,
+							'usertochangefull' : usertochange,
 							'mail' : usertochange.email,
 							'imagelink' : usertochange.profile.get_photo_url,
 							'profileform' : UserProfileForm(instance=usertochange.profile),
@@ -1124,6 +1134,7 @@ def UserProfileUpdate(request, pk, newuser=0):
 				messages.success(request, f'Fehlerhafte Eingabe! Das Verfallsdatum muss im Format TAG.MONAT. sein und existieren!')
 				context = {
 					'active_link' : 'dasettings',
+					'usertochangefull' : usertochange,
 					'user_fullname' : user_fullname,
 					'first_name' : usertochange.first_name,
 					'last_name' : usertochange.last_name,
@@ -1159,6 +1170,7 @@ def UserProfileUpdate(request, pk, newuser=0):
 				'newuser' : newuser,
 				'mail' : usertochange.email,
 				'vieweduser' : usertochange.pk,
+				'usertochangefull' : usertochange,
 				'imagelink' : usertochange.profile.get_photo_url,
 				'profileform' : UserProfileForm(instance=usertochange.profile),
 				'parentuser' : parentuser,
diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index d76885f4408c9ae21f11251382e7bca4481b0fca..b04ba1d3dde16e3830bc30ff5fc5a398416e4771 100644
GIT binary patch
delta 1091
zcmZWnOK22Z5WUsi>FMt2nIz*(GMU6A!X!H54@Defelw%SBx*p!jlU4=5S+x{O{<%3
zTtswZP*S2Bl?g7~_@2f=1l_2sw|OAp!Gqw&m7w?qH~y=}KQ`3qx^>R2x>ff+z69qk
zLuh*_WC{9SZI~O}G!xP?;9?}R;<&390<KX|3#KQWib*I~jy?&s!q+@?z1V%nuW-QE
z-Jn-du#2H-F#!&YYVzXuHEGg*zzY<@ju=(tA@VA}c{)dV9T$bFjPUithiF%rtQ_(5
zxbQa^d;khnb6MYXBc3q<gl2Ib7mEugP%nJTvm9fzLcZ{{vfgsENuZS4;myRD_%aha
zzS+}w4;@dO1-Z(xd~l;>_1Cx=6;5yxCcqCKh*ML)v)>pmSd2OLG&NZ#9J^NhSX*_1
zhGKiR2P4WhkqQk+pmC-YxtxCTt_TyJXZHz12cBND6l$=kF_A2C;3>m129seG!JIYj
z4oP?K!6OG;JeX{pYP*?Es)nj55hV;!h$;~XLtHT+!ls2mgM^|{yjhj+OOM)$06zNd
z86^Ny;Rc*-KLrNv=-AS5Q4wOiib@EQE6@l!CDK7xWC-w)z64)(tg)}NNMn&|;B;p*
zZtF}y7$0`V@nmOZ)vcej2C^FPZ!=w{TVi*aBBPx$LQ_b=9Hen;E`iCe6V(rx)tObe
ztgOSCd=&rfx*7Y2ner=CYN#WfOg7^{Za&U*Z-;seWLxLW=X`2;s5`X%$HraRgxPEZ
z%;N5BEhNk8sci4^deX^zRHS?j@;-YDC^mBD!P`Z<&b;ZCzht5uW^S4NnCsi56iN+R
z`Fh-w8-N!4E4M&z;&iR}UoH*L@pCSQH}Ww$vxzJ7ZNUVSoK804(R^#{-5-4@GDTfp
zsMXaU6?pIw8oC8?acOX!t-=Q!>*<D%c&(=kK9!#J>;y>Q#@-Rgm#+6N1n9>9`%*?b
z)k#@0hDQGiuyAd^2ZMOKzYY3IulrXk&U@}Oz=sJjR5DaCR5S2(%+)wU?(h+J-`Fxa
tJT~O+J38zPkI_@BV?{GVl3^jkB8C*hVun0JA3uW9l`Sg3O1wI-_6x0d`X~SZ

delta 1038
zcmZWnOK1~e5dLR(v)ODOO=C3MG)aBbwh7`}`>;)$Ry0)NrHbOCDy$S*tN0rbWml1k
z9;7IaS2eu|9@J{UgLv?Pf@i@)71ZKMMM3al6`V<}t++5BGv7DQpS^Mo-d}~__F&Ky
z^!4{l?9=WBwPx6Zk>*vWUCmK9ioFk9j}5L~G#t;MuVjvi5wKxMlV@jQ%E`E1$2;h^
z#gHm@k{9^n>CAF$iNRpAaP^}*smf1QVI18Ou2Iwny~KoU&nURQVwGcz0O4t0Da^wx
zVe7TRH67FT4teA&N2?T=wl)gXQaieq6eG$RbCi~8MdKc{uDAp;Vf$PtR#&R0d8)F_
zQ5XT&f7qfU|4~=ZNRGc0vHfFob&at7G4VI{)rgpI15Ut!0i{o*19+h&iMLwPFc0fe
z@lc5#ReognM1V)?Q@Ez}UM8R#s-{Gg5JVxWL?8r~VnBq=69Nt5ibniGRsJYfwUq!)
z;rNDTMTg6w1bW)fgBM5J3vd-*x7R2Ez&H9bT-?zT9#@1orqLjw8X&6xZ~GE>t|JaX
z9P4Nd-=CE=kYScH70JTdY%utcWiqOk)wnKuqxvZ`Ix{po1k%FK+2`|LFkAUulm)c0
zPA2Q{OfHEZI=4d{+qxQ7CP0X^DpyeHE^YYuv7$^7BNG%)Lz27+<Is@<c40@~wwHLR
zD+Ws{O`dh-SHwB_5hs%)<YR_~<PKbX^1W%##c!Q*&H$Oh_T2K=B(D{qOfj>T5(e2o
zJ^P^^-{ltRl@*qvw>uO2GMmh=PB(CJBi)z8gWawE8eV{B$RytEZdfq&-_43_0vxVQ
zAoQG!dDXwOHBcY|I+!3cG&_m~zps3!=c@u!czshR{KU7Lvhb^%+PoW}7Ek5}AXlEu
zHv(kQ>`fbOG&F6>C~oLo1wI_^bznb!>}`d7xqi!frS1p6h0dD=7(xtH3}J?9JW)ub
iEq3b|mM}ChG%_?XWEgS`dHOA^@~eUhum&f#w*3ZY6XR_F

diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index 8e8d408..2f6e837 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -589,7 +589,7 @@ def loadaccounttime(user):
 	today = date.today()
 	workdays = Workday.objects.filter(user=user, start__lt=today).exclude(end=None)
 
-	finalaccounttimesum = datetime.timedelta(minutes=0)
+	finalaccounttimesum = datetime.timedelta(minutes=0) + datetime.timedelta(hours=UserTime.objects.get(user=user).startcount)
 
 
 	for workday in workdays:
@@ -603,7 +603,7 @@ def loadaccounttime(user):
 				if ele.end != None and ele.start != None:
 					sum_break += (ele.end - ele.start).seconds
 
-		finalsum = ((workday.end - workday.start).seconds - sum_break)
+		finalsum = ((workday.end - workday.start).seconds - sum_break) 
 		hastowork = datetime.timedelta(hours=workday.target)
 		final_info = (int(finalsum) - int(hastowork.total_seconds()))/60
 
@@ -613,7 +613,6 @@ def loadaccounttime(user):
 			final_info = final_info * -1
 			finalaccounttimesum -= datetime.timedelta(minutes=final_info)
 
-
 	# Gesamtgleitzeit einmal schick darstellen mit rot und grün
 	# Wenn GLeitzeit NEGATIV ist
 	if(finalaccounttimesum.total_seconds() < 0):
diff --git a/users/models.py b/users/models.py
index 6fe0c6d..49be763 100644
--- a/users/models.py
+++ b/users/models.py
@@ -314,6 +314,7 @@ class UserTime(models.Model):
 	wd_so = models.FloatField(default=0.0)
 	loose_holidedate = models.CharField(default="30.04.", max_length=6)
 	startdate = models.DateField(default=None, blank=True, null=True)
+	startcount = models.FloatField(default=0.0)
 	usetime = models.BooleanField(default=False)
 	usetime_start = models.DateField(default=None, blank=True, null=True)
 '''