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

Bug Supportformuler

This commit is contained in:
holger.trampe 2021-01-17 19:36:59 +01:00
parent 94ea27b615
commit 64affeb80a
13 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dasettings/views.py
View File

@ -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"]),

BIN
digitaleagentur/__pycache__/settings.cpython-38.pyc
View File

Binary file not shown.

3
digitaleagentur/settings.py
View File

@ -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"

BIN
dump.rdb
View File

Binary file not shown.

BIN
standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
View File

Binary file not shown.

2
standards/templatetags/counter_tag.py
View File

@ -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:

1
standards/views.py
View File

@ -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)

4
timemanagement/templates/timemanagement/timemanagement_singleview.html
View File

@ -13,9 +13,9 @@
<th scope="col"></th>
<th scope="col">Start</th>
<th scope="col">Ende</th>
<th scope="col">Arbeitszeit</th>
<th scope="col">Pausen</th>
<th scope="col">Gesamtzeit</th>
<th scope="col">Pausen</th>
<th scope="col">Arbeitszeit</th>
<th scope="col">Gleitzeit</th>
<th scope="col">&nbsp;</th>
</tr>

4
timemanagement/templates/timemanagement/timemanagement_teamview_single.html
View File

@ -19,9 +19,9 @@
<th scope="col"></th>
<th scope="col">Start</th>
<th scope="col">Ende</th>
<th scope="col">Arbeitszeit</th>
<th scope="col">Pausen</th>
<th scope="col">Gesamtzeit</th>
<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>

4
users/models.py
View File

@ -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)

2
users/templates/users/password_reset_mail.html
View File

@ -116,7 +116,7 @@
<tr>
<td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
<div style="font-family:Roboto;font-size:20px;line-height:1;text-align:left;color:#000000;">
<h2>Digitale Agentur | Passwort vergessen</h2>
<h2>Digitale Agentur | Neues Passwort</h2>
</div>
</td>
</tr>

2
users/templates/users/register_mail.html
View File

@ -125,7 +125,7 @@
<div style="font-family:Roboto;font-size:18px;line-height:1;text-align:left;color:#000000;">
<p>Hallo {{username}},</p> Ihre Agentur wurde erstellt. Sie können sich nun mit Ihrer E-Mailadresse hier anmelden und Ihre Agentur gestalten:
<p> <a href="https://app.digitale-agentur.com">https://app.digitale-agentur.com</a> </p>
<br /> Weitere Informationen erhalten Sie in unserem Wiki <a href="https://digitale-agentur.com/">https://digitale-agentur.com/</a> oder per E-Mail an support@digitale-agentur.com! </p>
<br /> Weitere Informationen erhalten Sie in unserem Wiki <a href="https://digitale-agentur.com/">https://digitale-agentur.com/</a> oder per E-Mail an support@digitale-agentur.com! </p>
<p>Mit freundlichen Grüßen</p>
<p>Ihr Team von Digitale Agentur</p>
</div>

44
users/views.py
View File

@ -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"]),