From 57358fd8a2f798ba901fc8c17fcd4d742c2c9944 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Mon, 18 Jan 2021 11:23:40 +0100
Subject: [PATCH] Zeiterfassung weiter gebaut, rdy fuer hochladen damit die
 Berechnung wieder passt

---
 dasettings/forms.py                           |   5 +-
 .../modulesettings_timemanagement.html        |   2 +
 .../templates/dasettings/user_usprof.html     |  26 ++-
 dasettings/views.py                           | 179 +++++++++++++++++-
 dump.rdb                                      | Bin 29602 -> 42940 bytes
 .../standards/standards_management.html       |   3 -
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 22291 -> 22729 bytes
 standards/templatetags/counter_tag.py         |  23 +++
 timemanagement/models.py                      |   1 +
 .../timemanagement_singleview.html            |  23 ++-
 .../timemanagement_teamview_single.html       |  65 +++++--
 users/signals.py                              |   3 +-
 .../templates/users/password_reset_mail.html  |   2 +-
 users/urls.py                                 |   2 +-
 users/views.py                                | 175 +----------------
 15 files changed, 314 insertions(+), 195 deletions(-)

diff --git a/dasettings/forms.py b/dasettings/forms.py
index cde0882..688d3e4 100644
--- a/dasettings/forms.py
+++ b/dasettings/forms.py
@@ -465,6 +465,7 @@ class AbsenceReasonForm(forms.ModelForm):
 			"name" : "Bezeichnung",
 			"need_confirm" : "Muss bestätigt werden",
 			"need_rep" : "Muss vertreten werden",
-			"is_holiday" : "Geht vom Urlaub ab"
+			"is_holiday" : "Geht vom Urlaub ab",
+			"is_time" : "Geht vom Gleitzeitkonto ab"
 		}
-		fields = ["name", "need_confirm", "need_rep", "is_holiday", "rgb_color"]
+		fields = ["name", "need_confirm", "need_rep", "is_holiday", "is_time", "rgb_color"]
diff --git a/dasettings/templates/dasettings/modulesettings_timemanagement.html b/dasettings/templates/dasettings/modulesettings_timemanagement.html
index 570c9e7..df4a99a 100644
--- a/dasettings/templates/dasettings/modulesettings_timemanagement.html
+++ b/dasettings/templates/dasettings/modulesettings_timemanagement.html
@@ -9,6 +9,7 @@
 	      <th scope="col">Bezeichnung</th>
 	      <th scope="col">Bestätigung</th>
 	      <th scope="col">Vertretung</th>
+	      <th scope="col">Gleitzeit</th>
 	      <th scope="col">Urlaubstag</th>
 	      <th scope="col">Farbe</th>	  		  	      
 	      <th scope="col">&nbsp;</th>
@@ -20,6 +21,7 @@
 	      <td><b>{{ab.name}}</b></td>
 	      <td>{% if ab.need_confirm %} <i class="fas fa-check"></i> {% else %}  {% endif %}</td>
 	      <td>{% if ab.need_rep %} <i class="fas fa-check"></i> {% else %}  {% endif %}</td>
+	      <td>{% if ab.is_time %} <i class="fas fa-check"></i> {% endif %}</td>
 	      <td>{% if ab.is_holiday %} <i class="fas fa-check"></i> {% endif %}</td>
 	      <td><i style="color: {{ab.color}}" class="fas fa-square-full"></i></td>
 	      <td>
diff --git a/dasettings/templates/dasettings/user_usprof.html b/dasettings/templates/dasettings/user_usprof.html
index b0bf7cf..2bc3663 100644
--- a/dasettings/templates/dasettings/user_usprof.html
+++ b/dasettings/templates/dasettings/user_usprof.html
@@ -223,7 +223,7 @@
           </div>
         <h5 class="mt-2 mb-1">Urlaub Jahresübersicht&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Hier sehen Sie die aktuelle Jahresübersicht des Mitarbeiters. Beachten Sie das Format beim manuellen anpassen: XX,0 oder XX,5!" class="far fa-question-circle"></i></small>
           <button type="button" id="changeHolidayData" style="float: right" class="btn btn-secondary btn-sm" onclick="javascript:loadUpdateTableHolidays()" data-toggle="tooltip" data-placement="top" title="Passen Sie die Urlaubstage und Resturlaubstage manuell an."><small><i class="fas fa-pen"></i></small></button>
-          <button type="button" id="changeHolidayDataSave" style="float: right; display: none" class="btn  btn-primary btn-sm" onclick="javascript:saveUpdateTableHolidays()" data-toggle="tooltip" data-placement="top" title="Urlaub- und Resttage speichern."><small><i class="fas fa-check"></i></small></button>
+          <button type="button" id="changeHolidayDataSave" style="float: right; display: none" class="btn  btn-primary btn-sm" onclick="javascript:saveUpdateTableHolidays()" data-toggle="tooltip" data-placement="top" title="Urlaub- und Resttage speichern."><small>Speichern</small></button>
         </h5>
       <div id="year_overview">
         <table class="table table-hover">
@@ -339,7 +339,6 @@
     </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">
@@ -355,7 +354,6 @@
     </div>
   </div>
 </div>
-
 <script type="text/javascript">
   function toggleDoDelBtn(){
     if($('#confirmDel').prop('checked')){
@@ -386,7 +384,22 @@
 </script>
 
 
-
+<!-- Modal -->
+<div class="modal" id="calculatingAbsences" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">Aktualisieren der Urlaubstage</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        Urlaubstage werden neu berechnet. Bitte warten und nicht das Fenster aktualisieren!
+      </div>
+    </div>
+  </div>
+</div>
 
 <script>
 /*
@@ -427,8 +440,13 @@ function saveUpdateTableHolidays(){
           new_data_info : new_data_arr,
           userid: {{vieweduser}}
         },
+        beforeSend: function(){
+          $("#calculatingAbsences").modal("show");
+        },
         success: function( data )
         {
+
+          $("#calculatingAbsences").modal("hide");
           $("#year_overview").html(data);
           $("#changeHolidayDataSave").hide();
           $("#changeHolidayData").show();
diff --git a/dasettings/views.py b/dasettings/views.py
index 10c414a..d83f5b9 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, Workday
+from timemanagement.models import AbsenceReason, FreeDays, Workday, Absence
 from django.core.mail import send_mail
 from django.conf import settings
 import re, os, csv, requests
@@ -35,7 +35,7 @@ import re
 import json
 from django.conf import settings # import the settings file
 from PIL import Image
-
+from datetime import date, timedelta
 ''' MAIL '''
 from django.core.mail import EmailMessage
 from django.core.mail import EmailMultiAlternatives
@@ -997,6 +997,14 @@ def SettingsAjaxRouter(request):
 		context = {
 			"user_years" : UserYearAbsenceInfo.objects.filter(user=User.objects.get(pk=request.GET["userid"])),
 		}
+
+		user_to_recalculate = User.objects.get(pk=request.GET["userid"])
+
+		absences = Absence.objects.filter(user=user_to_recalculate)
+
+		for ab in absences:
+			getFinalHolidayData(ab)
+
 		return render(request, 'dasettings/data_absence_yeardata.html', context)
 	# RESET TIMEMANAGEMENT
 	elif request.method == "GET" and request.GET['action'] == "del_tmdata" : 
@@ -1030,6 +1038,171 @@ def SettingsAjaxRouter(request):
 		success = False
 	return JsonResponse({"success" : success, "data" : data})
 
+
+''' BERECHNUNG URLAUBSTAGE USW. '''
+
+''' AB HIER WIEDER RAUSNEHMEN '''
+def getFinalHolidayData(abscence):		
+	user = abscence.user
+	usertimedata = UserTime.objects.get(user=user)	
+	today = date.today()			
+	start_day_obj = abscence.start
+	end_day_obj = abscence.end
+	
+	try:
+		holidayloose_date = datetime.date(start_day_obj.year, int(usertimedata.loose_holidedate.split(".")[1]), int(usertimedata.loose_holidedate.split(".")[0]))
+	except:
+		holidayloose_date = datetime.date(2020, int(usertimedata.loose_holidedate.split(".")[1]), int(usertimedata.loose_holidedate.split(".")[0]))
+	
+	#start_half = abscence.start_ishalf
+	#end_half = abscence.end_ishalf
+
+	start_half = False
+	if abscence.startday_info == "1" or abscence.startday_info == "2":
+		start_half = True
+
+	end_half = False
+	if abscence.endday_info == "1" or abscence.endday_info == "2":
+		end_half = True
+	
+	choosenyear = abscence.start.year
+	yeardata = list(UserYearAbsenceInfo.objects.filter(user=user, agency=user.profile.agency, year=choosenyear))[0]
+	
+	holiday_thisyear = 0
+	holiday_lastyear = yeardata.restdays
+	holiday_nextyear = 0
+
+	try:
+		holiday_nextyear = list(UserYearAbsenceInfo.objects.filter(user=user, agency=user.profile.agency, 
+			year=choosenyear+1))[0].days - list(UserYearAbsenceInfo.objects.filter(user=user, agency=user.profile.agency, 
+			year=choosenyear+1))[0].days_inuse
+		holiday_nextyear_rest = list(UserYearAbsenceInfo.objects.filter(user=user, agency=user.profile.agency, 
+						year=choosenyear+1))[0].restdays
+	except:
+		holiday_nextyear = yeardata.days				
+	
+	# Urlaub innerhalb eines Jahres inkl. Prüfung auf Resturlaubsanspruch
+	if(end_day_obj.year == start_day_obj.year):
+		# Startt des Urlaubs NACH Verfallsdatum - nur aktuelles JAhr und die Zahl interessiert
+		if(start_day_obj > holidayloose_date):						
+			need_days = (calculateHolidays(user, start_day_obj, end_day_obj, start_half, end_half))*(-1)
+			holiday_thisyear =  yeardata.days - yeardata.days_inuse - need_days
+		else:						
+			need_days = (calculateHolidays(user, start_day_obj, end_day_obj, start_half, end_half))*(-1)
+			# Kein Resturlaub
+			if(yeardata.restdays == 0.0):
+				holiday_thisyear =  yeardata.days - yeardata.days_inuse - need_days
+			# Resturlaub vorhanden, berechne mit Resturlaub
+			else:
+				holiday_lastyear = yeardata.restdays
+				holiday_thisyear = yeardata.days - yeardata.days_inuse
+				temp_holiday = holiday_lastyear - need_days
+				if(temp_holiday < 0):
+					holiday_lastyear = 0
+					holiday_thisyear =  yeardata.days - yeardata.days_inuse + temp_holiday 
+					need_days = [temp_holiday, holiday_thisyear, False]
+				else:
+					holiday_lastyear =  yeardata.restdays - need_days 
+					need_days = [temp_holiday, holiday_lastyear, False]
+	# Urlaub geht über das nächstes Jahr hinweg
+	else:		
+		two_years = True
+		holiday_lastyear =  yeardata.restdays
+		date_splitter = datetime.date(end_day_obj.year, 1, 1)
+
+		need_days_this = (calculateHolidays(user, start_day_obj, date_splitter, start_half, False))*(-1)
+							
+		need_days_next = (calculateHolidays(user, date_splitter, end_day_obj, False, end_half))*(-1)
+							
+		need_days = (calculateHolidays(user, start_day_obj, date_splitter, start_half, False))*(-1) + (calculateHolidays(user, date_splitter, end_day_obj, False, end_half))*(-1)
+		holiday_thisyear = yeardata.days - yeardata.days_inuse - need_days_this
+		days_nextyear_normal = 0
+		days_nextyear_rest = 0
+		# Urlaub nächstes Jahr MIT und OHNE Rest
+		if(holiday_nextyear_rest == 0.0):
+			holiday_nextyear = holiday_nextyear - (calculateHolidays(user, date_splitter, end_day_obj, False, end_half))*(-1)
+		else:
+			temprest = holiday_nextyear_rest - need_days_next
+			# Rest reicht!
+			if(temprest >= 0):
+				holiday_nextyear_rest = temprest
+				days_nextyear_normal = 0
+				days_nextyear_rest = need_days_next						
+			# Rest reicht nicht
+			else:
+				holiday_nextyear_rest = 0
+				holiday_nextyear += temprest
+				days_nextyear_rest = need_days_next + temprest
+				days_nextyear_normal = temprest * -1
+		
+					# TAGE NORMAL, TAGE NEXT NORMAL, TRUE für 2jahre, TAGE NEXT REST
+		need_days = [need_days_this, days_nextyear_normal, True, days_nextyear_rest]
+
+	data = [ holiday_thisyear, holiday_lastyear, holiday_nextyear, need_days ]
+	return data
+	
+
+def calculateHolidays(user, start, end, start_half, end_half):
+	restdays = 0
+	allfreedays = FreeDays.objects.filter(agency=user.profile.agency)
+	if(end == start):
+		if(start_half):
+			return restdays - 0.5
+		else:
+			return restdays - 1		
+	else:
+		if(end < start):
+			return False
+		else:
+			counter = 0
+			if(start_half):
+				counter -= 0.5
+			if(end_half):
+				counter -= 0.5
+
+			weekdays = []
+			freedaycounter = 0
+			for dt in daterange(start, end):
+				day_found = False
+				if dt.isoweekday() not in weekdays:
+					counter += 1					
+					for freeday in allfreedays.all():
+						if(dt == freeday.day):											
+							freedaycounter += 1
+							day_found = True
+				if day_found == False:
+					if(dt.isoweekday() == 1):
+						if user.usertime.wd_mo == 0.0:
+							freedaycounter += 1
+					elif(dt.isoweekday() == 2):
+						if user.usertime.wd_tu == 0.0:
+							freedaycounter += 1
+					elif(dt.isoweekday() == 3):
+						if user.usertime.wd_we == 0.0:
+							freedaycounter += 1
+					elif(dt.isoweekday() == 4):
+						if user.usertime.wd_th == 0.0:
+							freedaycounter += 1
+					elif(dt.isoweekday() == 5):			
+						if user.usertime.wd_fr == 0.0:
+							freedaycounter += 1
+					elif(dt.isoweekday() == 6):			
+						if user.usertime.wd_sa == 0.0:
+							freedaycounter += 1
+					elif(dt.isoweekday() == 7):			
+						if user.usertime.wd_so == 0.0:
+							freedaycounter += 1
+
+			return restdays - counter + freedaycounter
+
+# Gibt die Woche als Wochentage zurück
+def daterange(date1, date2):
+    for n in range(int ((date2 - date1).days)+1):
+        yield date1 + timedelta(n)
+
+''' BERECHNUNG URLAUBSTAGE USW ENDE '''
+
+
 def randomStringNum(stringLength=20):
     """Generate a random string of fixed length """
     lettersAndNumbers = string.ascii_lowercase + string.digits + string.ascii_uppercase
@@ -1281,7 +1454,7 @@ def NewUserFirstStep(request):
         newuserform = UserNewUserForm(request.POST)
         if newuserform.is_valid():
             if(request.POST.get("sendmailnewuser")):
-                msg_html = render_to_string('users/register_mail.html', {'username': newuserform.cleaned_data.get('first_name') + " " + newuserform.cleaned_data.get('last_name')})
+                msg_html = render_to_string('users/newusers_email.html', {'username': newuserform.cleaned_data.get('first_name') + " " + newuserform.cleaned_data.get('last_name')})
                 send_mail(request.user.profile.agency.name + ' Account', 'Hallo ' + newuserform.cleaned_data.get('first_name') + ' ' + newuserform.cleaned_data.get('last_name') + '! Bitte setzen sie sich auf https://app.digitale-agentur.com/password-reset/ ein Passwort.','noreply@digitale-agentur.com',[newuserform.cleaned_data.get('email')],html_message=msg_html,fail_silently=True)
             newuser = newuserform.save(commit=False)
             newuser.username = newuser.email
diff --git a/dump.rdb b/dump.rdb
index d21c9aa7709458793d3d3f7eb84c4e1c9f71a21f..723ed7396325ffcd332a5b8dbff06b9bcbce16e6 100644
GIT binary patch
literal 42940
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
G-v0w$co*gX

delta 4046
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

diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html
index 32ec1b0..b00fb7e 100644
--- a/standards/templates/standards/standards_management.html
+++ b/standards/templates/standards/standards_management.html
@@ -264,10 +264,7 @@
           $('#area_tabs li:first-child a').tab('show');
         }
 
-
-
         $('[data-toggle="popover"]').popover();
-
         $('#userownstandards').DataTable({
       responsive: true,
       columnDefs: [
diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index 3b80938be811e06fd2cd0c95f4d6da9b0ffbea7e..bce2a8bb6785b6fbd20b05af59c0a0a2f6d20da6 100644
GIT binary patch
delta 3449
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
H-#qaj;sG?T

delta 3030
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
NCk6-hqJ8aw{{kne-Vgu)

diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index 49f9f35..290a1ce 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -341,6 +341,29 @@ def getactualworkingday(user):
 		returnstat = list(wd)[0].start
 	return returnstat
 
+# Berechnet die gesamte Arbeitszeit im Monat und gibt diese zurück
+@register.simple_tag
+def loadmonthwork(nextmonth, user):
+	nextmonth = int(nextmonth)
+	month = nextmonth - 1
+
+	if month == 0:
+		month = 12
+
+	workdays = Workday.objects.filter(user=user, agency=user.profile.agency, start__month=month)
+	
+	finalsum = 0	
+
+	for ele in workdays.all():
+		if ele.end != None:
+			print(ele)
+			finalsum += (ele.end - ele.start).seconds
+	mon, sec = divmod(finalsum, 60)
+	hr, mon = divmod(mon, 60)
+	#return ("%d Stunden und %02d:%02d" % (hr, mon, sec))
+	return ("%d:%02d" % (hr, mon))
+	
+
 # Return formatted Time-String
 @register.simple_tag
 def getformatedstarttime(user):
diff --git a/timemanagement/models.py b/timemanagement/models.py
index cbc7bd2..0a85135 100644
--- a/timemanagement/models.py
+++ b/timemanagement/models.py
@@ -32,6 +32,7 @@ class AbsenceReason(models.Model):
 	need_confirm = models.BooleanField(default=True)
 	need_rep = models.BooleanField(default=True)
 	is_holiday = models.BooleanField(default=True)
+	is_time = models.BooleanField(default=False)
 	color = RGBColorField(colors=['#FFB900', '#E74856', '#0078D7', '#0099BC', '#7A7574'], default='#0099BC', blank=True)
 
 	def __str__(self):
diff --git a/timemanagement/templates/timemanagement/timemanagement_singleview.html b/timemanagement/templates/timemanagement/timemanagement_singleview.html
index 9660519..bcf8a41 100644
--- a/timemanagement/templates/timemanagement/timemanagement_singleview.html
+++ b/timemanagement/templates/timemanagement/timemanagement_singleview.html
@@ -1,9 +1,27 @@
 {% load counter_tag %}
+
 <div class="btn-group" role="group" aria-label="" style="min-width: 100% !important">
             <a type="button" class="btn btn-primary mr-1" href="{% url 'tm-management' prev_month prev_year %}" ><i class="fas fa-arrow-circle-left"></i></a>
             <button type="button" class="btn btn-primary mr-1" style="min-width: 150px !important;" onclick="javascript:fastChangeModal()">{{active_month}} {{active_year}}</button>
             <a type="button" class="btn btn-primary mr-1" href="{% url 'tm-management' next_month next_year %}"><i class="fas fa-arrow-circle-right"></i></a>
+
+
+<span style="float: right !important; text-align: right; min-width: 82%; margin-bottom: -20px; margin-top: -10px; ">
+  {% loadmonthwork next_month user as monthwork %}
+
+
+  Arbeitszeit im Monat: {{monthwork}}<br />
+  {% loadaccounttime user as actualaccounttime %}
+  Gleitzeitkonto: 
+  {% if actualaccounttime.1 == 0 %}
+    <b><span style="color: green">+{{actualaccounttime.0}}&nbsp;Stunden</span></b>
+  {% else %}
+    <b><span style="color: red">-{{actualaccounttime.0}}&nbsp;Stunden</span></b>
+  {% endif %}
+</span>
+
 </div>
+
 <hr>
 <div class="table-responsive ">
     <table class="table table-hover" id="table_timemanagement" >
@@ -17,6 +35,7 @@
           <th scope="col">Pausen</th>
           <th scope="col">Arbeitszeit</th>
           <th scope="col">Gleitzeit</th>
+          <!--<th scope="col">Gleitzeitstand</th>-->
           <th scope="col">&nbsp;</th>
         </tr>
       </thead>
@@ -293,6 +312,9 @@
               {% endfor %}
 
             </td>
+           <!-- <td style="text-align: center;">
+              
+            </td>-->
             <td style="text-align: right;">
 
                 {% counterWDreset %}
@@ -330,7 +352,6 @@
                       </div>
                     </div>
 
-
                   {% endif %}
 
                   {% if breakmonthline < da %}
diff --git a/timemanagement/templates/timemanagement/timemanagement_teamview_single.html b/timemanagement/templates/timemanagement/timemanagement_teamview_single.html
index 0392dd1..c3f6124 100644
--- a/timemanagement/templates/timemanagement/timemanagement_teamview_single.html
+++ b/timemanagement/templates/timemanagement/timemanagement_teamview_single.html
@@ -9,6 +9,22 @@
             <a type="button" class="btn btn-primary mr-1" href="{% url 'tm-team-single' user.pk prev_month prev_year %}" ><i class="fas fa-arrow-circle-left"></i></a>
             <button type="button" class="btn btn-primary mr-1" style="min-width: 150px !important;" onclick="javascript:fastChangeModal()">{{active_month}} {{active_year}}</button>
             <a type="button" class="btn btn-primary mr-1" href="{% url 'tm-team-single' user.pk next_month next_year %}"><i class="fas fa-arrow-circle-right"></i></a>
+
+<span style="float: right !important; text-align: right; min-width: 82%; margin-bottom: -20px; margin-top: -10px; ">
+  {% loadmonthwork next_month user as monthwork %}
+
+
+  Arbeitszeit im Monat: {{monthwork}}<br />
+  {% loadaccounttime user as actualaccounttime %}
+  Gleitzeitkonto: 
+  {% if actualaccounttime.1 == 0 %}
+    <b><span style="color: green">+{{actualaccounttime.0}}&nbsp;Stunden</span></b>
+  {% else %}
+    <b><span style="color: red">-{{actualaccounttime.0}}&nbsp;Stunden</span></b>
+  {% endif %}
+</span>
+
+            
 </div>
 <hr>
 <div class="table-responsive ">
@@ -23,7 +39,6 @@
           <th scope="col">Pausen</th>
           <th scope="col">Arbeitszeit</th>
           <th scope="col">Gleitzeit</th>
-          <th scope="col">Manuell geändert</th>
           <th scope="col">&nbsp;</th>
         </tr>
       </thead>
@@ -37,6 +52,15 @@
               style="background-color: #d3d3d3;"
             {% elif abday != False %}
               style="background-color: {{abday.reason.color}}; color: #ffffff"
+            {% else %}
+                {% for workday in workdays %}
+                  {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+                      {% getWorkDayHistory workday as wd_history %}
+                      {% if wd_history.history_user != None %}
+                        style="background-color: #fdcc98;"
+                      {% endif %}
+                  {% endif %}
+                {% endfor %}
             {% endif %}>
             <td>
              {{da|date:"l"}}
@@ -298,18 +322,6 @@
               {% endfor %}
 
             </td>
-            <td>
-              {% for workday in workdays %}
-                 {% if workday.end|date:"d-m-y" == da|date:"d-m-y" %}
-
-                  {% getWorkDayHistory workday as wd_history %}
-
-                  {% if wd_history.history_user != None %}
-                    {{wd_history.history_date|date:"d.m.Y, H:i"}} von {{wd_history.history_user.first_name}} {{wd_history.history_user.last_name}}
-                  {% endif %}
-                 {% endif %}
-              {% endfor %}
-            </td>
             <td style="text-align: right;">
 
                 {% counterWDreset %}
@@ -324,6 +336,31 @@
 
 
                 {% counterWDUp %}
+                {% getWorkDayHistory workday as wd_history %}
+
+                  {% if wd_history.history_user != None %}
+                    
+                    <a href="#/" onclick="javascript:$('#wd_history_{{workday.pk}}').modal('toggle');"><i class="fas fa-cog"></i></a>
+                    <div class="modal fade" id="wd_history_{{workday.pk}}" tabindex="-1" role="dialog" data-backdrop="static">
+                      <div class="modal-dialog" role="document">
+                        <div class="modal-content">
+                          <div class="modal-header">
+                            <h5 class="modal-title">Manuelle Änderung vom {{workday.start|date:"d.m.Y"}}</h5>
+                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                              <span aria-hidden="true">&times;</span>
+                            </button>
+                          </div>
+                          <div class="modal-body" style="text-align: left;">
+                            <p>Geändert am {{wd_history.history_date|date:"d.m.Y, H:i"}} von {{wd_history.history_user.first_name}} {{wd_history.history_user.last_name}}</p>
+                          </div>
+                          <div class="modal-footer">
+                            <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  {% endif %}
+                
                   
                 {% if workday.freefield != "" %}
                     
@@ -358,7 +395,7 @@
               {% endfor %}
             </td>
             {% else %}
-            <td></td><td></td><td></td><td></td><td></td><td style="display: none;"></td><td style="display: none;"></td>
+            <td></td><td></td><td></td><td></td><td style="display: none;"></td><td style="display: none;"></td>
             {% endif %}
         </tr>
       {% endfor %}
diff --git a/users/signals.py b/users/signals.py
index a3e5cd1..8076f38 100644
--- a/users/signals.py
+++ b/users/signals.py
@@ -79,13 +79,14 @@ def checkDefaultAbsenceReasons(sender, user, request, **kwargs):
 		new_ar_ill = AbsenceReason(agency=user.profile.agency, name="Krankheit", color="#E74C3C", need_confirm=False, need_rep=False, is_holiday=False)
 		new_ar_ill.save()
 
+
 		new_ar_school = AbsenceReason(agency=user.profile.agency, name="Berufsschule", color="#16A085", need_confirm=False, need_rep=False, is_holiday=False)
 		new_ar_school.save()
 
 		new_ar_education = AbsenceReason(agency=user.profile.agency, name="Fortbildung", color="#2ECC71", need_confirm=True, need_rep=True, is_holiday=False)
 		new_ar_education.save()
 
-		new_ar_time = AbsenceReason(agency=user.profile.agency, name="Gleitzeit", color="#9B59B6", need_confirm=True, need_rep=False, is_holiday=False)
+		new_ar_time = AbsenceReason(agency=user.profile.agency, name="Gleitzeit", color="#9B59B6", need_confirm=True, need_rep=False, is_holiday=False, is_time=True)
 		new_ar_time.save()
 		
 	today = date.today()	
diff --git a/users/templates/users/password_reset_mail.html b/users/templates/users/password_reset_mail.html
index 33bd321..38f7fc7 100644
--- a/users/templates/users/password_reset_mail.html
+++ b/users/templates/users/password_reset_mail.html
@@ -127,7 +127,7 @@
                         <p>
                         {% block reset_link %}
                           <h4><a href="{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}">{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}</a></h4> {% endblock %}
-                          <h4>Ihr Benutzername: {{ user.get_username }}</h4>
+                          <h4>Ihre E-Mailadresse: {{ user.email }}</h4>
                         </p> Sollten Sie kein Passwort angefordert haben, ignorieren Sie diese E-Mail.
                         <p>Mit freundlichen Grüßen</p>
                         <p>Ihr Team von Digitale Agentur</p>
diff --git a/users/urls.py b/users/urls.py
index 04fa6c3..939b72b 100644
--- a/users/urls.py
+++ b/users/urls.py
@@ -46,7 +46,7 @@ urlpatterns = [
     path('icsall/<int:ag>', views.getICSFileAll, name="geticsall"),
     path('icspublic/<slug:code>/<int:ag>', views.getICSFileEx, name="getics"),
     path('icspublicall/<slug:code>/<int:ag>', views.getICSFileExAll, name="geticsall"),
-    path('recalculateabsence/<slug:code>', views.recalculateAbsence, name="recalculateabsence"),
+    #path('recalculateabsence/<slug:code>', views.recalculateAbsence, name="recalculateabsence"),
 
 ]
 
diff --git a/users/views.py b/users/views.py
index b9781c9..e028568 100644
--- a/users/views.py
+++ b/users/views.py
@@ -1450,16 +1450,19 @@ class landingPage(TemplateView):
 		context = super().get_context_data(**kwargs)
 
 '''
-    Gibt False zurück, wenn der User an diesem Tag KEINE Abwesenheiten hat, ansonsten True!
+    Gibt False zurück, wenn der User an diesem Tag KEINE Abwesenheiten hat, ansonsten True! Zudem wird gecheckt, ob der Tag tatsächlich Urlaub ist.
 
 '''
 def absencecheck(user, daytocheck):
-    returnstat = False
-    absencedays = Absence.objects.filter(agency=user.profile.agency, user=user, confirm_status=0) & (Absence.objects.filter(agency=user.profile.agency, user=user, start=daytocheck) | (Absence.objects.filter(agency=user.profile.agency, user=user, start__lt=daytocheck) & Absence.objects.filter(agency=user.profile.agency, user=user, end__gt=daytocheck)) | Absence.objects.filter(agency=user.profile.agency, user=user, end=daytocheck))
-    if(len(absencedays) > 0):
-        returnstat = True
-
-    return returnstat
+	returnstat = False
+	absencedays = Absence.objects.filter(agency=user.profile.agency, user=user, confirm_status=0) & (Absence.objects.filter(agency=user.profile.agency, user=user, start=daytocheck) | (Absence.objects.filter(agency=user.profile.agency, user=user, start__lt=daytocheck) & Absence.objects.filter(agency=user.profile.agency, user=user, end__gt=daytocheck)) | Absence.objects.filter(agency=user.profile.agency, user=user, end=daytocheck))
+	if(len(absencedays) > 0):
+		for ab in absencedays:
+			if ab.reason.is_time == True:
+				returnstat = False
+			else:
+				returnstat = True
+	return returnstat
 
 
 
@@ -1935,161 +1938,3 @@ def sendMailNoti(notificationtext, user_touched, linktarget=""):
 def isAlive(request):
 	return JsonResponse({"status" : True})
 
-''' AB HIER WIEDER RAUSNEHMEN '''
-def getFinalHolidayData(abscence):		
-	user = abscence.user
-	usertimedata = UserTime.objects.get(user=user)	
-	today = date.today()			
-	start_day_obj = abscence.start
-	end_day_obj = abscence.end
-	
-	try:
-		holidayloose_date = datetime.date(start_day_obj.year, int(usertimedata.loose_holidedate.split(".")[1]), int(usertimedata.loose_holidedate.split(".")[0]))
-	except:
-		holidayloose_date = datetime.date(2020, int(usertimedata.loose_holidedate.split(".")[1]), int(usertimedata.loose_holidedate.split(".")[0]))
-	
-	#start_half = abscence.start_ishalf
-	#end_half = abscence.end_ishalf
-
-	start_half = False
-	if abscence.startday_info == "1" or abscence.startday_info == "2":
-		start_half = True
-
-	end_half = False
-	if abscence.endday_info == "1" or abscence.endday_info == "2":
-		end_half = True
-	
-	choosenyear = abscence.start.year
-	yeardata = list(UserYearAbsenceInfo.objects.filter(user=user, agency=user.profile.agency, year=choosenyear))[0]
-	
-	holiday_thisyear = 0
-	holiday_lastyear = yeardata.restdays
-	holiday_nextyear = 0
-
-	try:
-		holiday_nextyear = list(UserYearAbsenceInfo.objects.filter(user=user, agency=user.profile.agency, 
-			year=choosenyear+1))[0].days - list(UserYearAbsenceInfo.objects.filter(user=user, agency=user.profile.agency, 
-			year=choosenyear+1))[0].days_inuse
-		holiday_nextyear_rest = list(UserYearAbsenceInfo.objects.filter(user=user, agency=user.profile.agency, 
-						year=choosenyear+1))[0].restdays
-	except:
-		holiday_nextyear = yeardata.days				
-	
-	# Urlaub innerhalb eines Jahres inkl. Prüfung auf Resturlaubsanspruch
-	if(end_day_obj.year == start_day_obj.year):
-		# Startt des Urlaubs NACH Verfallsdatum - nur aktuelles JAhr und die Zahl interessiert
-		if(start_day_obj > holidayloose_date):						
-			need_days = (calculateHolidays(user, start_day_obj, end_day_obj, start_half, end_half))*(-1)
-			holiday_thisyear =  yeardata.days - yeardata.days_inuse - need_days
-		else:						
-			need_days = (calculateHolidays(user, start_day_obj, end_day_obj, start_half, end_half))*(-1)
-			# Kein Resturlaub
-			if(yeardata.restdays == 0.0):
-				holiday_thisyear =  yeardata.days - yeardata.days_inuse - need_days
-			# Resturlaub vorhanden, berechne mit Resturlaub
-			else:
-				holiday_lastyear = yeardata.restdays
-				holiday_thisyear = yeardata.days - yeardata.days_inuse
-				temp_holiday = holiday_lastyear - need_days
-				if(temp_holiday < 0):
-					holiday_lastyear = 0
-					holiday_thisyear =  yeardata.days - yeardata.days_inuse + temp_holiday 
-					need_days = [temp_holiday, holiday_thisyear, False]
-				else:
-					holiday_lastyear =  yeardata.restdays - need_days 
-					need_days = [temp_holiday, holiday_lastyear, False]
-	# Urlaub geht über das nächstes Jahr hinweg
-	else:		
-		two_years = True
-		holiday_lastyear =  yeardata.restdays
-		date_splitter = datetime.date(end_day_obj.year, 1, 1)
-
-		need_days_this = (calculateHolidays(user, start_day_obj, date_splitter, start_half, False))*(-1)
-							
-		need_days_next = (calculateHolidays(user, date_splitter, end_day_obj, False, end_half))*(-1)
-							
-		need_days = (calculateHolidays(user, start_day_obj, date_splitter, start_half, False))*(-1) + (calculateHolidays(user, date_splitter, end_day_obj, False, end_half))*(-1)
-		holiday_thisyear = yeardata.days - yeardata.days_inuse - need_days_this
-		days_nextyear_normal = 0
-		days_nextyear_rest = 0
-		# Urlaub nächstes Jahr MIT und OHNE Rest
-		if(holiday_nextyear_rest == 0.0):
-			holiday_nextyear = holiday_nextyear - (calculateHolidays(user, date_splitter, end_day_obj, False, end_half))*(-1)
-		else:
-			temprest = holiday_nextyear_rest - need_days_next
-			# Rest reicht!
-			if(temprest >= 0):
-				holiday_nextyear_rest = temprest
-				days_nextyear_normal = 0
-				days_nextyear_rest = need_days_next						
-			# Rest reicht nicht
-			else:
-				holiday_nextyear_rest = 0
-				holiday_nextyear += temprest
-				days_nextyear_rest = need_days_next + temprest
-				days_nextyear_normal = temprest * -1
-		
-					# TAGE NORMAL, TAGE NEXT NORMAL, TRUE für 2jahre, TAGE NEXT REST
-		need_days = [need_days_this, days_nextyear_normal, True, days_nextyear_rest]
-
-	data = [ holiday_thisyear, holiday_lastyear, holiday_nextyear, need_days ]
-	return data
-	
-
-def calculateHolidays(user, start, end, start_half, end_half):
-	restdays = 0
-	allfreedays = FreeDays.objects.filter(agency=user.profile.agency)
-	if(end == start):
-		if(start_half):
-			return restdays - 0.5
-		else:
-			return restdays - 1		
-	else:
-		if(end < start):
-			return False
-		else:
-			counter = 0
-			if(start_half):
-				counter -= 0.5
-			if(end_half):
-				counter -= 0.5
-
-			weekdays = []
-			freedaycounter = 0
-			for dt in daterange(start, end):
-				day_found = False
-				if dt.isoweekday() not in weekdays:
-					counter += 1					
-					for freeday in allfreedays.all():
-						if(dt == freeday.day):											
-							freedaycounter += 1
-							day_found = True
-				if day_found == False:
-					if(dt.isoweekday() == 1):
-						if user.usertime.wd_mo == 0.0:
-							freedaycounter += 1
-					elif(dt.isoweekday() == 2):
-						if user.usertime.wd_tu == 0.0:
-							freedaycounter += 1
-					elif(dt.isoweekday() == 3):
-						if user.usertime.wd_we == 0.0:
-							freedaycounter += 1
-					elif(dt.isoweekday() == 4):
-						if user.usertime.wd_th == 0.0:
-							freedaycounter += 1
-					elif(dt.isoweekday() == 5):			
-						if user.usertime.wd_fr == 0.0:
-							freedaycounter += 1
-					elif(dt.isoweekday() == 6):			
-						if user.usertime.wd_sa == 0.0:
-							freedaycounter += 1
-					elif(dt.isoweekday() == 7):			
-						if user.usertime.wd_so == 0.0:
-							freedaycounter += 1
-
-			return restdays - counter + freedaycounter
-
-# Gibt die Woche als Wochentage zurück
-def daterange(date1, date2):
-    for n in range(int ((date2 - date1).days)+1):
-        yield date1 + timedelta(n)