Bugs
This commit is contained in:
Holger Trampe
parent
d5b3dd9288
commit
8af1eeb37a
146
users/views.py
146
users/views.py
|
|
@ -963,6 +963,7 @@ def cronactions(request, code):
|
||||||
json_data = json.dumps(lexdata)
|
json_data = json.dumps(lexdata)
|
||||||
r = requests.get("https://api.lexoffice.io/v1/invoices/0f9b6a1d-1912-4a10-9926-7909e5580202", data=json_data, headers=headers)
|
r = requests.get("https://api.lexoffice.io/v1/invoices/0f9b6a1d-1912-4a10-9926-7909e5580202", data=json_data, headers=headers)
|
||||||
print(r)
|
print(r)
|
||||||
|
|
||||||
print(r.text)
|
print(r.text)
|
||||||
'''
|
'''
|
||||||
|
|
||||||
|
|
@ -988,90 +989,89 @@ def absencecheck(user, daytocheck):
|
||||||
|
|
||||||
# CRONJOBS UM 00:01!
|
# CRONJOBS UM 00:01!
|
||||||
def cronactionsdaily(request, code):
|
def cronactionsdaily(request, code):
|
||||||
data = {}
|
data = {}
|
||||||
if(code == settings.CRONAPIKEY):
|
if(code == settings.CRONAPIKEY):
|
||||||
allusers = User.objects.all()
|
allusers = User.objects.all()
|
||||||
'''
|
'''
|
||||||
Pro User gibt es das Feld loose_holiday in der UserTime-Info. Ist dieser Tag vorbei, muss die Differenz der days_inuse des VORJHARES in den Rest das AKTUELLEN JAHRES gespeichert werden!
|
Pro User gibt es das Feld loose_holiday in der UserTime-Info. Ist dieser Tag vorbei, muss die Differenz der days_inuse des VORJHARES in den Rest das AKTUELLEN JAHRES gespeichert werden!
|
||||||
'''
|
'''
|
||||||
today = date.today()
|
today = date.today()
|
||||||
for user in allusers:
|
for user in allusers:
|
||||||
# REST URLAUB BERECHNUNG
|
# REST URLAUB BERECHNUNG
|
||||||
usertimedata = UserTime.objects.get(user=user)
|
try:
|
||||||
day_tocheck = usertimedata.loose_holidedate.split(".")[0]
|
usertimedata = UserTime.objects.get(user=user)
|
||||||
month_tocheck = usertimedata.loose_holidedate.split(".")[1]
|
day_tocheck = usertimedata.loose_holidedate.split(".")[0]
|
||||||
month = today.month
|
month_tocheck = usertimedata.loose_holidedate.split(".")[1]
|
||||||
if month < 10:
|
month = today.month
|
||||||
month = "0" + str(month)
|
if month < 10:
|
||||||
day = today.day
|
month = "0" + str(month)
|
||||||
if day < 10:
|
day = today.day
|
||||||
day = "0" + str(day)
|
if day < 10:
|
||||||
|
day = "0" + str(day)
|
||||||
|
# Restetag erreicht, Reste ins nächste Jahr übertragen
|
||||||
|
if(str(day_tocheck) == str(day) and str(month_tocheck) == str(month)):
|
||||||
|
sourceyear = today.year
|
||||||
|
this_year = list(UserYearAbsenceInfo.objects.filter(year=sourceyear, user=user))[0]
|
||||||
|
next_year = list(UserYearAbsenceInfo.objects.filter(year=sourceyear+1, user=user))[0]
|
||||||
|
next_year.restdays = this_year.days - this_year.days_inuse
|
||||||
|
next_year.save()
|
||||||
|
|
||||||
# Restetag erreicht, Reste ins nächste Jahr übertragen
|
if(user.usertime.usetime):
|
||||||
if(str(day_tocheck) == str(day) and str(month_tocheck) == str(month)):
|
workdays = Workday.objects.filter(user=user, end=None)
|
||||||
sourceyear = today.year
|
for wd in workdays:
|
||||||
this_year = list(UserYearAbsenceInfo.objects.filter(year=sourceyear, user=user))[0]
|
wd.end = datetime(wd.start.year, wd.start.month, wd.start.day, 23, 59)
|
||||||
next_year = list(UserYearAbsenceInfo.objects.filter(year=sourceyear+1, user=user))[0]
|
wd.save()
|
||||||
next_year.restdays = this_year.days - this_year.days_inuse
|
|
||||||
next_year.save()
|
|
||||||
|
|
||||||
# ARBEITSTAGE BEENDEN
|
yesterday = date.today() - timedelta(days=1)
|
||||||
# Benutzer hat Zeiterfassung aktiv
|
weekday = yesterday.weekday()
|
||||||
if(user.usertime.usetime):
|
workdays_yesterday = len(Workday.objects.filter(user=user, start__day=yesterday.day, start__month=yesterday.month, start__year=yesterday.year))
|
||||||
workdays = Workday.objects.filter(user=user, end=None)
|
|
||||||
for wd in workdays:
|
|
||||||
wd.end = datetime(wd.start.year, wd.start.month, wd.start.day, 23, 59)
|
|
||||||
wd.save()
|
|
||||||
|
|
||||||
yesterday = date.today() - timedelta(days=1)
|
targettworktime = 0.0
|
||||||
weekday = yesterday.weekday()
|
# Mitarbeiter hat für den gestrigen Tag keine Zeiten erfasst, daher automatisch auf null wenn KEINE Abwesenheit eingetragen wurde
|
||||||
workdays_yesterday = len(Workday.objects.filter(user=user, start__day=yesterday.day, start__month=yesterday.month, start__year=yesterday.year))
|
if(weekday == 0):
|
||||||
# Mitarbeiter hat für den gestrigen Tag keine Zeiten erfasst, daher automatisch auf null wenn KEINE Abwesenheit eingetragen wurde
|
targettworktime = user.usertime.wd_mo
|
||||||
|
if(weekday == 1):
|
||||||
|
targettworktime = user.usertime.wd_tu
|
||||||
|
if(weekday == 2):
|
||||||
|
targettworktime = user.usertime.wd_we
|
||||||
|
if(weekday == 3):
|
||||||
|
targettworktime = user.usertime.wd_th
|
||||||
|
if(weekday == 4):
|
||||||
|
targettworktime = user.usertime.wd_fr
|
||||||
|
if(weekday == 5):
|
||||||
|
targettworktime = user.usertime.wd_sa
|
||||||
|
if(weekday == 6):
|
||||||
|
targettworktime = user.usertime.wd_so
|
||||||
|
|
||||||
targettworktime = 0.0
|
# Es wird nur ein Arbeitstag erstellt, wenn KEINE Abwesenheiten vorliegen und der Nutzer an diesem Tag arbeiten muss
|
||||||
if(weekday == 0):
|
if(workdays_yesterday == 0 and absencecheck(user, yesterday) == False and targettworktime > 0.0):
|
||||||
targettworktime = user.usertime.wd_mo
|
workdaytemp = Workday(user=user, agency=user.profile.agency, start=datetime(yesterday.year, yesterday.month, yesterday.day, 8, 0), end=datetime(yesterday.year, yesterday.month, yesterday.day, 8, 0), target=targettworktime)
|
||||||
if(weekday == 1):
|
workdaytemp.save()
|
||||||
targettworktime = user.usertime.wd_tu
|
|
||||||
if(weekday == 2):
|
|
||||||
targettworktime = user.usertime.wd_we
|
|
||||||
if(weekday == 3):
|
|
||||||
targettworktime = user.usertime.wd_th
|
|
||||||
if(weekday == 4):
|
|
||||||
targettworktime = user.usertime.wd_fr
|
|
||||||
if(weekday == 5):
|
|
||||||
targettworktime = user.usertime.wd_sa
|
|
||||||
if(weekday == 6):
|
|
||||||
targettworktime = user.usertime.wd_so
|
|
||||||
|
|
||||||
# Es wird nur ein Arbeitstag erstellt, wenn KEINE Abwesenheiten vorliegen und der Nutzer an diesem Tag arbeiten muss
|
|
||||||
if(workdays_yesterday == 0 and absencecheck(user, yesterday) == False and targettworktime > 0.0):
|
|
||||||
|
|
||||||
workdaytemp = Workday(user=user, agency=user.profile.agency, start=datetime(yesterday.year, yesterday.month, yesterday.day, 8, 0), end=datetime(yesterday.year, yesterday.month, yesterday.day, 8, 0), target=targettworktime)
|
|
||||||
workdaytemp.save()
|
|
||||||
|
|
||||||
|
|
||||||
# Erinnerungsmails/Push bei Vertretung verschicken
|
# Erinnerungsmails/Push bei Vertretung verschicken
|
||||||
one_week_later = date.today() + timedelta(days=7)
|
one_week_later = date.today() + timedelta(days=7)
|
||||||
repre_absence = Absence.objects.filter(representator=user, start=one_week_later, confirm_status=0)
|
repre_absence = Absence.objects.filter(representator=user, start=one_week_later, confirm_status=0)
|
||||||
|
|
||||||
for r in repre_absence:
|
for r in repre_absence:
|
||||||
if(r.representator.usernotifications.absence_user_is_rep_reminder_mail):
|
if(r.representator.usernotifications.absence_user_is_rep_reminder_mail):
|
||||||
sendMailNoti(" in einer Woche startet Ihre Vertretung für " + r.user.first_name + " " + r.user.last_name + "!", user)
|
sendMailNoti(" in einer Woche startet Ihre Vertretung für " + r.user.first_name + " " + r.user.last_name + "!", user)
|
||||||
|
|
||||||
if(r.representator.usernotifications.absence_user_is_rep_reminder_push):
|
if(r.representator.usernotifications.absence_user_is_rep_reminder_push):
|
||||||
newnotification = UserNotification(touser=user, notificationtext="Erinnerung für Abwesenheitsvertretung!", notificationtype="", elementid=r.pk)
|
newnotification = UserNotification(touser=user, notificationtext="Erinnerung für Abwesenheitsvertretung!", notificationtype="", elementid=r.pk)
|
||||||
newnotification.save()
|
newnotification.save()
|
||||||
|
|
||||||
channel_layer = channels.layers.get_channel_layer()
|
channel_layer = channels.layers.get_channel_layer()
|
||||||
async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Abwesenheit | In einer Woche startet Ihre Vertretung für " + r.user.first_name + " " + r.user.last_name + "!"})
|
async_to_sync(channel_layer.group_send)("user_" + str(user.pk), {'type' : 'pushhandler', 'pushtext' : "pushnotification__Abwesenheit | In einer Woche startet Ihre Vertretung für " + r.user.first_name + " " + r.user.last_name + "!"})
|
||||||
data.update({"status" : "ok"})
|
data.update({"status" : "ok"})
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
else:
|
else:
|
||||||
print("API CODE FAILED")
|
print("API CODE FAILED")
|
||||||
data.update({"status" : "failed"})
|
data.update({"status" : "failed"})
|
||||||
|
|
||||||
return JsonResponse(data)
|
return JsonResponse(data)
|
||||||
|
|
||||||
|
|
||||||
def sendMailNoti(notificationtext, user_touched, linktarget=""):
|
def sendMailNoti(notificationtext, user_touched, linktarget=""):
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue