Bug Supportformuler

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

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"

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:

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)

timemanagement/templates/timemanagement/timemanagement_singleview.html

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

timemanagement/templates/timemanagement/timemanagement_teamview_single.html

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

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)
 
 

users/templates/users/password_reset_mail.html

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

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,7 +1278,6 @@ 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",
@@ -1614,6 +1614,8 @@ def recalculateAbsence(request, code):
 				abinfo_lastyear = UserYearAbsenceInfo.objects.get(user=user, year=str(int(year)-1))
 				abinfo_thisyear = UserYearAbsenceInfo.objects.get(user=user, year=year)
 				
+				if(abinfo_lastyear.days_inuse > 0.0):
+
 					abinfo_thisyear.restdays = abinfo_lastyear.days - abinfo_lastyear.days_inuse
 					abinfo_thisyear.save()
 
@@ -1631,6 +1633,8 @@ def recalculateAbsence(request, code):
 
 					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"]),