diff --git a/dasettings/views.py b/dasettings/views.py index 62f67bb..10c414a 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -1818,13 +1818,12 @@ class BillPlanUpdate(UpdateView): self.object.save() mail_to_send = "" - if(self.request.user.profile.agency.payment_address == ""): + if(self.request.user.profile.agency.payment_address == None): mail_to_send = self.request.user.profile.agency.agency_email else: mail_to_send = self.request.user.profile.agency.payment_address msg_html = render_to_string('users/newbill_mail.html', {}) - # BCC Mail with Object - NICHT DEN IMPORT VERGESSEN!!! email = EmailMultiAlternatives( 'Digitale Agentur | Rechnung ' + str(response_text["voucherNumber"]), diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index bdd1625..e4934a8 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index e33f049..ca26fce 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -41,7 +41,8 @@ CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D" CRONAPIKEY_STATSTIC = "gCddsaz6NOnE9QbXZM5LasdEk122D" MAILINFOKEY = "jka7sd8iukashdna78skduJAHDsu6dilaksdjba65a68iadbhjak" # API KEY LEXOFFICE -#ALTER LEX_API = "8f9ba01f-9e84-42c7-9548-48c254f14c19" +#ALTER ZUM TESTEN +#LEX_API = "8f9ba01f-9e84-42c7-9548-48c254f14c19" # Gültig bis 17.10.2022 LEX_API = "8dcbd7a5-9447-417f-a4a4-989818742a36" diff --git a/dump.rdb b/dump.rdb index 971a776..61fc378 100644 Binary files a/dump.rdb and b/dump.rdb differ diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index 6e610c4..3b80938 100644 Binary files a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc and b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc differ diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py index d977cf6..49f9f35 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -138,7 +138,7 @@ def getLocalWeather(user): weatherinfo = r.json() weatherinfodata.append("| " + weatherinfo['weather'][0]['description']) weatherinfodata.append(weatherinfo['weather'][0]['icon']) - weatherinfodata.append(str(weatherinfo['main']['temp']) + " °C") + weatherinfodata.append(str(weatherinfo['main']['temp']).split(".")[0] + " °C") except: weatherinfodata = "" else: diff --git a/standards/views.py b/standards/views.py index 1c1e8bd..1f317d0 100644 --- a/standards/views.py +++ b/standards/views.py @@ -769,6 +769,7 @@ def CopyStandard(request, pk): tempdatafile = DataFile(file=f.file, name=f.name, owner=request.user, parent=datadir_parentid, agency=request.user.profile.agency) tempdatafile.save() new_standard.addedfiles.add(tempdatafile) + # TASK: Hier das kopieren der Dateien auf dem Server noch einfügen # Sende Info, dass ein Standard übernommen wurde, an die Erstelleragentur usersofagency = User.objects.filter(profile__agency=sc.agency) diff --git a/timemanagement/templates/timemanagement/timemanagement_singleview.html b/timemanagement/templates/timemanagement/timemanagement_singleview.html index b785bf8..25173d6 100644 --- a/timemanagement/templates/timemanagement/timemanagement_singleview.html +++ b/timemanagement/templates/timemanagement/timemanagement_singleview.html @@ -13,9 +13,9 @@ Start Ende - Arbeitszeit - Pausen Gesamtzeit + Pausen + Arbeitszeit Gleitzeit   diff --git a/timemanagement/templates/timemanagement/timemanagement_teamview_single.html b/timemanagement/templates/timemanagement/timemanagement_teamview_single.html index 3e3215a..bff0374 100644 --- a/timemanagement/templates/timemanagement/timemanagement_teamview_single.html +++ b/timemanagement/templates/timemanagement/timemanagement_teamview_single.html @@ -19,9 +19,9 @@ Start Ende - Arbeitszeit - Pausen Gesamtzeit + Pausen + Arbeitszeit Gleitzeit Manuell geändert   diff --git a/users/models.py b/users/models.py index e273f2d..c9898b6 100644 --- a/users/models.py +++ b/users/models.py @@ -318,7 +318,7 @@ class UserTime(models.Model): wd_fr = models.FloatField(default=0.0) wd_sa = models.FloatField(default=0.0) wd_so = models.FloatField(default=0.0) - loose_holidedate = models.CharField(default="30.04.", max_length=6) + loose_holidedate = models.CharField(default="31.03.", max_length=6) startdate = models.DateField(default=None, blank=True, null=True) startcount = models.FloatField(default=0.0) usetime = models.BooleanField(default=False) @@ -465,7 +465,7 @@ class UserYearAbsenceInfo(models.Model): user = models.ForeignKey(User, on_delete=models.CASCADE) year = models.IntegerField() days_inuse = models.FloatField(default=0.0) - days = models.FloatField(default=24.0) + days = models.FloatField(default=0.0) restdays = models.FloatField(default=0.0) diff --git a/users/templates/users/password_reset_mail.html b/users/templates/users/password_reset_mail.html index 2e4fa86..33bd321 100644 --- a/users/templates/users/password_reset_mail.html +++ b/users/templates/users/password_reset_mail.html @@ -116,7 +116,7 @@
-

Digitale Agentur | Passwort vergessen

+

Digitale Agentur | Neues Passwort

diff --git a/users/templates/users/register_mail.html b/users/templates/users/register_mail.html index 415d970..19d675e 100644 --- a/users/templates/users/register_mail.html +++ b/users/templates/users/register_mail.html @@ -125,7 +125,7 @@

Hallo {{username}},

Ihre Agentur wurde erstellt. Sie können sich nun mit Ihrer E-Mailadresse hier anmelden und Ihre Agentur gestalten:

https://app.digitale-agentur.com

-
Weitere Informationen erhalten Sie in unserem Wiki https://digitale-agentur.com/ oder per E-Mail an support@digitale-agentur.com!

+
Weitere Informationen erhalten Sie in unserem Wiki https://digitale-agentur.com/ oder per E-Mail an support@digitale-agentur.com!

Mit freundlichen Grüßen

Ihr Team von Digitale Agentur

diff --git a/users/views.py b/users/views.py index ee70588..817e513 100644 --- a/users/views.py +++ b/users/views.py @@ -65,6 +65,7 @@ import io as BytesIO import base64 from django.http import HttpResponse + def getICSFile(request, ag): if 'HTTP_AUTHORIZATION' in request.META: auth = request.META['HTTP_AUTHORIZATION'].split() @@ -1277,12 +1278,11 @@ def support(request): messages.warning(request, f'Supportanfrage fehlgeschlagen!' + str(r)) else: messages.success(request, f'Supportanfrage erfolgreich! Ihre Ticketnummer ist '+ str(r.json()) +'!') - # TASK: Hier Browserversion usw. mit einfügen beim TICKET! send_mail( - "Digitale Agentur: " + str(problemconc), - "Hallo " + name, ", wir haben Ihre Anfrage unter der Ticketnummer " + str(r.json()) + " aufgenommen. Vielen Dank. Ihr Team der Digitalen Agentur", - 'noreply@digitale-agentur.com', - [mail], + "Digitale Agentur: " + str(problemconc), + "Hallo " + name, ", wir haben Ihre Anfrage unter der Ticketnummer " + str(r.json()) + " aufgenommen. Vielen Dank. Ihr Team der Digitalen Agentur", + 'noreply@digitale-agentur.com', + [mail], fail_silently=True ) @@ -1613,24 +1613,28 @@ def recalculateAbsence(request, code): try: abinfo_lastyear = UserYearAbsenceInfo.objects.get(user=user, year=str(int(year)-1)) abinfo_thisyear = UserYearAbsenceInfo.objects.get(user=user, year=year) - - abinfo_thisyear.restdays = abinfo_lastyear.days - abinfo_lastyear.days_inuse - abinfo_thisyear.save() + + if(abinfo_lastyear.days_inuse > 0.0): - calcstat += " DAYS UPDATED - NEW RESTDAYS: " + str(abinfo_thisyear.restdays) + abinfo_thisyear.restdays = abinfo_lastyear.days - abinfo_lastyear.days_inuse + abinfo_thisyear.save() - for ab in Absence.objects.filter(user=user, start__year=year): - if(ab.reason.is_holiday): - calculateNewAbsenceDate(ab) + calcstat += " DAYS UPDATED - NEW RESTDAYS: " + str(abinfo_thisyear.restdays) - daysinuse_thisyear = 0.0 - for ab in Absence.objects.filter(user=user, start__year=year): - daysinuse_thisyear += ab.holidays_normal + for ab in Absence.objects.filter(user=user, start__year=year): + if(ab.reason.is_holiday): + calculateNewAbsenceDate(ab) - calcstat += " NEW DAYSINUSE THIS YEAR " + str(daysinuse_thisyear) + daysinuse_thisyear = 0.0 + for ab in Absence.objects.filter(user=user, start__year=year): + daysinuse_thisyear += ab.holidays_normal - abinfo_thisyear.days_inuse = daysinuse_thisyear - abinfo_thisyear.save() + calcstat += " NEW DAYSINUSE THIS YEAR " + str(daysinuse_thisyear) + + abinfo_thisyear.days_inuse = daysinuse_thisyear + abinfo_thisyear.save() + else: + calcstat += " NO DAYS IN 2020 USED " except: calcstat += "ERROR LASTYEAR/THISYEAR USER " + str(user.pk) @@ -1863,11 +1867,13 @@ def cronactionsbill(request, code): newbill.save() mail_to_send = "" - if(agency.payment_address == ""): + if(agency.payment_address == None): mail_to_send = agency.agency_email else: mail_to_send = agency.payment_address + + # BCC Mail with Object - NICHT DEN IMPORT VERGESSEN!!! email = EmailMultiAlternatives( 'Digitale Agentur | Rechnung ' + str(response_text["voucherNumber"]),