DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bugs

This commit is contained in:
Holger Trampe 2020-08-30 20:45:21 +02:00
parent d5b3dd9288
commit 8af1eeb37a
1 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
users/views.py
View File

@ -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)
''' '''
@ -997,6 +998,7 @@ def cronactionsdaily(request, code):
today = date.today() today = date.today()
for user in allusers: for user in allusers:
# REST URLAUB BERECHNUNG # REST URLAUB BERECHNUNG
try:
usertimedata = UserTime.objects.get(user=user) usertimedata = UserTime.objects.get(user=user)
day_tocheck = usertimedata.loose_holidedate.split(".")[0] day_tocheck = usertimedata.loose_holidedate.split(".")[0]
month_tocheck = usertimedata.loose_holidedate.split(".")[1] month_tocheck = usertimedata.loose_holidedate.split(".")[1]
@ -1006,7 +1008,6 @@ def cronactionsdaily(request, code):
day = today.day day = today.day
if day < 10: if day < 10:
day = "0" + str(day) day = "0" + str(day)
# Restetag erreicht, Reste ins nächste Jahr übertragen # Restetag erreicht, Reste ins nächste Jahr übertragen
if(str(day_tocheck) == str(day) and str(month_tocheck) == str(month)): if(str(day_tocheck) == str(day) and str(month_tocheck) == str(month)):
sourceyear = today.year sourceyear = today.year
@ -1015,8 +1016,6 @@ def cronactionsdaily(request, code):
next_year.restdays = this_year.days - this_year.days_inuse next_year.restdays = this_year.days - this_year.days_inuse
next_year.save() next_year.save()
# ARBEITSTAGE BEENDEN
# Benutzer hat Zeiterfassung aktiv
if(user.usertime.usetime): if(user.usertime.usetime):
workdays = Workday.objects.filter(user=user, end=None) workdays = Workday.objects.filter(user=user, end=None)
for wd in workdays: for wd in workdays:
@ -1026,9 +1025,9 @@ def cronactionsdaily(request, code):
yesterday = date.today() - timedelta(days=1) yesterday = date.today() - timedelta(days=1)
weekday = yesterday.weekday() weekday = yesterday.weekday()
workdays_yesterday = len(Workday.objects.filter(user=user, start__day=yesterday.day, start__month=yesterday.month, start__year=yesterday.year)) workdays_yesterday = len(Workday.objects.filter(user=user, start__day=yesterday.day, start__month=yesterday.month, start__year=yesterday.year))
# Mitarbeiter hat für den gestrigen Tag keine Zeiten erfasst, daher automatisch auf null wenn KEINE Abwesenheit eingetragen wurde
targettworktime = 0.0 targettworktime = 0.0
# Mitarbeiter hat für den gestrigen Tag keine Zeiten erfasst, daher automatisch auf null wenn KEINE Abwesenheit eingetragen wurde
if(weekday == 0): if(weekday == 0):
targettworktime = user.usertime.wd_mo targettworktime = user.usertime.wd_mo
if(weekday == 1): if(weekday == 1):
@ -1046,7 +1045,6 @@ def cronactionsdaily(request, code):
# Es wird nur ein Arbeitstag erstellt, wenn KEINE Abwesenheiten vorliegen und der Nutzer an diesem Tag arbeiten muss # 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): 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 = 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() workdaytemp.save()
@ -1066,6 +1064,8 @@ def cronactionsdaily(request, code):
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")